[chore] ambient modules and imports (#2266)

packages/adapter-begin/index.js

@@ -3,7 +3,7 @@ export default function () {
 	const adapter = {
 		name: '@sveltejs/adapter-begin',
 
-		async adapt({ utils }) {
+		async adapt() {
 			console.log('@sveltejs/adapter-begin can now be found at architect/sveltekit-adapter.');
 		}
 	};

packages/adapter-cloudflare-workers/files/entry.js

@@ -1,6 +1,6 @@
 // TODO hardcoding the relative location makes this brittle
-import { init, render } from '../output/server/app.js'; // eslint-disable-line import/no-unresolved
-import { getAssetFromKV, NotFoundError } from '@cloudflare/kv-asset-handler'; // eslint-disable-line import/no-unresolved
+import { init, render } from '../output/server/app.js';
+import { getAssetFromKV, NotFoundError } from '@cloudflare/kv-asset-handler';
 
 init();
 

packages/adapter-cloudflare-workers/index.d.ts

@@ -1,6 +1,9 @@
-type BuildOptions = import('esbuild').BuildOptions;
-declare function plugin(options?: {
-	esbuild?: (defaultOptions: BuildOptions) => Promise<BuildOptions> | BuildOptions;
-}): import('@sveltejs/kit').Adapter;
+import { Adapter } from '@sveltejs/kit';
+import { BuildOptions } from 'esbuild';
 
+interface AdapterOptions {
+	esbuild?: (options: BuildOptions) => Promise<BuildOptions> | BuildOptions;
+}
+
+declare function plugin(options?: AdapterOptions): Adapter;
 export = plugin;

packages/adapter-cloudflare-workers/index.js

@@ -8,15 +8,11 @@ import { fileURLToPath } from 'url';
  * @typedef {import('esbuild').BuildOptions} BuildOptions
  */
 
-/**
- * @param {{
- *   esbuild?: (defaultOptions: BuildOptions) => Promise<BuildOptions> | BuildOptions;
- * }} [options]
- **/
+/** @type {import('.')} */
 export default function (options) {
-	/** @type {import('@sveltejs/kit').Adapter} */
-	const adapter = {
+	return {
 		name: '@sveltejs/adapter-cloudflare-workers',
+
 		async adapt({ utils }) {
 			const { site } = validate_config(utils);
 
@@ -39,18 +35,18 @@ export default function (options) {
 			utils.copy(`${files}/entry.js`, '.svelte-kit/cloudflare-workers/entry.js');
 
 			/** @type {BuildOptions} */
-			const defaultOptions = {
+			const default_options = {
 				entryPoints: ['.svelte-kit/cloudflare-workers/entry.js'],
 				outfile: `${entrypoint}/index.js`,
 				bundle: true,
 				target: 'es2020',
 				platform: 'browser'
 			};
 
-			const buildOptions =
-				options && options.esbuild ? await options.esbuild(defaultOptions) : defaultOptions;
+			const build_options =
+				options && options.esbuild ? await options.esbuild(default_options) : default_options;
 
-			await esbuild.build(buildOptions);
+			await esbuild.build(build_options);
 
 			fs.writeFileSync(`${entrypoint}/package.json`, JSON.stringify({ main: 'index.js' }));
 
@@ -64,8 +60,6 @@ export default function (options) {
 			utils.copy_client_files(bucket);
 		}
 	};
-
-	return adapter;
 }
 
 function validate_config(utils) {

packages/adapter-netlify/files/entry.js

@@ -1,5 +1,5 @@
 // TODO hardcoding the relative location makes this brittle
-import { init, render } from '../output/server/app.js'; // eslint-disable-line import/no-unresolved
+import { init, render } from '../output/server/app.js';
 
 init();
 

packages/adapter-netlify/files/shims.js

@@ -1 +1 @@
-export { fetch, Response, Request, Headers } from '@sveltejs/kit/install-fetch'; // eslint-disable-line import/no-unresolved
+export { fetch, Response, Request, Headers } from '@sveltejs/kit/install-fetch';

packages/adapter-netlify/index.d.ts

@@ -1,6 +1,9 @@
-type BuildOptions = import('esbuild').BuildOptions;
-declare function plugin(options?: {
-	esbuild?: (defaultOptions: BuildOptions) => Promise<BuildOptions> | BuildOptions;
-}): import('@sveltejs/kit').Adapter;
+import { Adapter } from '@sveltejs/kit';
+import { BuildOptions } from 'esbuild';
 
+interface AdapterOptions {
+	esbuild?: (options: BuildOptions) => Promise<BuildOptions> | BuildOptions;
+}
+
+declare function plugin(options?: AdapterOptions): Adapter;
 export = plugin;

packages/adapter-netlify/index.js

@@ -8,14 +8,9 @@ import toml from '@iarna/toml';
  * @typedef {import('esbuild').BuildOptions} BuildOptions
  */
 
-/**
- * @param {{
- *   esbuild?: (defaultOptions: BuildOptions) => Promise<BuildOptions> | BuildOptions;
- * }} [options]
- **/
+/** @type {import('.')} */
 export default function (options) {
-	/** @type {import('@sveltejs/kit').Adapter} */
-	const adapter = {
+	return {
 		name: '@sveltejs/adapter-netlify',
 
 		async adapt({ utils }) {
@@ -32,7 +27,7 @@ export default function (options) {
 			utils.copy(join(files, 'entry.js'), '.svelte-kit/netlify/entry.js');
 
 			/** @type {BuildOptions} */
-			const defaultOptions = {
+			const default_options = {
 				entryPoints: ['.svelte-kit/netlify/entry.js'],
 				// Any functions in ".netlify/functions-internal" are bundled in addition to user-defined Netlify functions.
 				// See https://github.com/netlify/build/pull/3213 for more details
@@ -42,10 +37,10 @@ export default function (options) {
 				platform: 'node'
 			};
 
-			const buildOptions =
-				options && options.esbuild ? await options.esbuild(defaultOptions) : defaultOptions;
+			const build_options =
+				options && options.esbuild ? await options.esbuild(default_options) : default_options;
 
-			await esbuild.build(buildOptions);
+			await esbuild.build(build_options);
 
 			writeFileSync(join('.netlify', 'package.json'), JSON.stringify({ type: 'commonjs' }));
 
@@ -65,8 +60,6 @@ export default function (options) {
 			appendFileSync(redirectPath, '\n\n/* /.netlify/functions/__render 200');
 		}
 	};
-
-	return adapter;
 }
 /**
  * @param {import('@sveltejs/kit').AdapterUtils} utils

packages/adapter-node/index.d.ts

@@ -1,12 +1,16 @@
-type BuildOptions = import('esbuild').BuildOptions;
-declare function plugin(options?: {
+import { Adapter } from '@sveltejs/kit';
+import { BuildOptions } from 'esbuild';
+
+interface AdapterOptions {
 	out?: string;
 	precompress?: boolean;
 	env?: {
+		path?: string;
 		host?: string;
 		port?: string;
 	};
-	esbuild?: (defaultOptions: BuildOptions) => Promise<BuildOptions> | BuildOptions;
-}): import('@sveltejs/kit').Adapter;
+	esbuild?: (options: BuildOptions) => Promise<BuildOptions> | BuildOptions;
+}
 
+declare function plugin(options?: AdapterOptions): Adapter;
 export = plugin;

packages/adapter-node/index.js

@@ -20,26 +20,14 @@ const pipe = promisify(pipeline);
  * @typedef {import('esbuild').BuildOptions} BuildOptions
  */
 
-/**
- * @param {{
- *   out?: string;
- *   precompress?: boolean;
- *   env?: {
- *     path?: string;
- *     host?: string;
- *     port?: string;
- *   };
- *   esbuild?: (defaultOptions: BuildOptions) => Promise<BuildOptions> | BuildOptions;
- * }} options
- */
+/** @type {import('.')} */
 export default function ({
 	out = 'build',
 	precompress,
 	env: { path: path_env = 'SOCKET_PATH', host: host_env = 'HOST', port: port_env = 'PORT' } = {},
 	esbuild: esbuildConfig
 } = {}) {
-	/** @type {import('@sveltejs/kit').Adapter} */
-	const adapter = {
+	return {
 		name: '@sveltejs/adapter-node',
 
 		async adapt({ utils, config }) {
@@ -93,8 +81,6 @@ export default function ({
 			}
 		}
 	};
-
-	return adapter;
 }
 
 /**
@@ -127,9 +113,7 @@ async function compress_file(file, format = 'gz') {
 						[zlib.constants.BROTLI_PARAM_SIZE_HINT]: statSync(file).size
 					}
 			  })
-			: zlib.createGzip({
-					level: zlib.constants.Z_BEST_COMPRESSION
-			  });
+			: zlib.createGzip({ level: zlib.constants.Z_BEST_COMPRESSION });
 
 	const source = createReadStream(file);
 	const destination = createWriteStream(`${file}.${format}`);

packages/adapter-node/src/index.js

@@ -1,6 +1,8 @@
 // TODO hardcoding the relative location makes this brittle
-import { init, render } from '../output/server/app.js'; // eslint-disable-line import/no-unresolved
-import { path, host, port } from './env.js'; // eslint-disable-line import/no-unresolved
+// @ts-ignore
+import { init, render } from '../output/server/app.js';
+// @ts-ignore
+import { path, host, port } from './env.js';
 import { createServer } from './server';
 
 init();

packages/adapter-node/src/server.js

@@ -1,4 +1,4 @@
-import { getRawBody } from '@sveltejs/kit/node'; // eslint-disable-line import/no-unresolved
+import { getRawBody } from '@sveltejs/kit/node';
 import compression from 'compression';
 import fs from 'fs';
 import { dirname, join } from 'path';
@@ -16,6 +16,8 @@ const paths = {
 	prerendered: join(__dirname, '/prerendered')
 };
 
+// TODO: type render function from @sveltejs/kit/adapter
+// @ts-ignore
 export function createServer({ render }) {
 	const prerendered_handler = fs.existsSync(paths.prerendered)
 		? sirv(paths.prerendered, {
@@ -28,9 +30,9 @@ export function createServer({ render }) {
 
 	const assets_handler = fs.existsSync(paths.assets)
 		? sirv(paths.assets, {
-				setHeaders: (res, pathname, stats) => {
-					// eslint-disable-next-line no-undef
-					if (pathname.startsWith(APP_DIR)) {
+				setHeaders: (res, pathname) => {
+					// @ts-expect-error - dynamically replaced with define
+					if (pathname.startsWith(/* eslint-disable-line no-undef */ APP_DIR)) {
 						res.setHeader('cache-control', 'public, max-age=31536000, immutable');
 					}
 				},
@@ -40,6 +42,8 @@ export function createServer({ render }) {
 		: noop_handler;
 
 	const server = polka().use(
+		// https://github.com/lukeed/polka/issues/173
+		// @ts-ignore - nothing we can do about so just ignore it
 		compression({ threshold: 0 }),
 		assets_handler,
 		prerendered_handler,

packages/adapter-node/src/shims.js

@@ -1,5 +1,5 @@
 import { createRequire } from 'module';
-export { fetch, Response, Request, Headers } from '@sveltejs/kit/install-fetch'; // eslint-disable-line import/no-unresolved
+export { fetch, Response, Request, Headers } from '@sveltejs/kit/install-fetch';
 
 // esbuild automatically renames "require"
 // So we still have to use Object.defineProperty here

packages/adapter-static/index.d.ts

@@ -1,7 +1,10 @@
-declare function plugin(options?: {
+import { Adapter } from '@sveltejs/kit';
+
+interface AdapterOptions {
 	pages?: string;
 	assets?: string;
 	fallback?: string;
-}): import('@sveltejs/kit').Adapter;
+}
 
+declare function plugin(options?: AdapterOptions): Adapter;
 export = plugin;

packages/adapter-vercel/files/entry.js

@@ -1,7 +1,7 @@
-import { getRawBody } from '@sveltejs/kit/node'; // eslint-disable-line import/no-unresolved
+import { getRawBody } from '@sveltejs/kit/node';
 
 // TODO hardcoding the relative location makes this brittle
-import { init, render } from '../output/server/app.js'; // eslint-disable-line import/no-unresolved
+import { init, render } from '../output/server/app.js';
 
 init();
 

packages/adapter-vercel/files/shims.js

@@ -1 +1 @@
-export { fetch, Response, Request, Headers } from '@sveltejs/kit/install-fetch'; // eslint-disable-line import/no-unresolved
+export { fetch, Response, Request, Headers } from '@sveltejs/kit/install-fetch';

packages/adapter-vercel/index.d.ts

@@ -1,6 +1,9 @@
-type BuildOptions = import('esbuild').BuildOptions;
-declare function plugin(options?: {
-	esbuild?: (defaultOptions: BuildOptions) => Promise<BuildOptions> | BuildOptions;
-}): import('@sveltejs/kit').Adapter;
+import { Adapter } from '@sveltejs/kit';
+import { BuildOptions } from 'esbuild';
 
+interface AdapterOptions {
+	esbuild?: (options: BuildOptions) => Promise<BuildOptions> | BuildOptions;
+}
+
+declare function plugin(options?: AdapterOptions): Adapter;
 export = plugin;

packages/adapter-vercel/index.js

@@ -7,14 +7,9 @@ import esbuild from 'esbuild';
  * @typedef {import('esbuild').BuildOptions} BuildOptions
  */
 
-/**
- * @param {{
- *   esbuild?: (defaultOptions: BuildOptions) => Promise<BuildOptions> | BuildOptions;
- * }} [options]
- **/
+/** @type {import('.')} **/
 export default function (options) {
-	/** @type {import('@sveltejs/kit').Adapter} */
-	const adapter = {
+	return {
 		name: '@sveltejs/adapter-vercel',
 
 		async adapt({ utils }) {
@@ -37,18 +32,18 @@ export default function (options) {
 			utils.copy(join(files, 'entry.js'), '.svelte-kit/vercel/entry.js');
 
 			/** @type {BuildOptions} */
-			const defaultOptions = {
+			const default_options = {
 				entryPoints: ['.svelte-kit/vercel/entry.js'],
 				outfile: join(dirs.lambda, 'index.js'),
 				bundle: true,
 				inject: [join(files, 'shims.js')],
 				platform: 'node'
 			};
 
-			const buildOptions =
-				options && options.esbuild ? await options.esbuild(defaultOptions) : defaultOptions;
+			const build_options =
+				options && options.esbuild ? await options.esbuild(default_options) : default_options;
 
-			await esbuild.build(buildOptions);
+			await esbuild.build(build_options);
 
 			writeFileSync(join(dirs.lambda, 'package.json'), JSON.stringify({ type: 'commonjs' }));
 
@@ -65,6 +60,4 @@ export default function (options) {
 			utils.copy(join(files, 'routes.json'), join(dir, 'config/routes.json'));
 		}
 	};
-
-	return adapter;
 }

packages/kit/src/core/node/index.js

@@ -1,7 +1,4 @@
-/**
- * @param {import('http').IncomingMessage} req
- * @returns {Promise<import('types/helper').RawBody>}
- */
+/** @type {import('@sveltejs/kit/node').GetRawBody} */
 export function getRawBody(req) {
 	return new Promise((fulfil, reject) => {
 		const h = req.headers;

packages/kit/src/runtime/client/start.js

@@ -1,7 +1,7 @@
-// @ts-ignore - value will be replaced on build step
-import Root from 'ROOT'; // eslint-disable-line import/no-unresolved
-// @ts-ignore - value will be replaced on build step
-import { routes, fallback } from 'MANIFEST'; // eslint-disable-line import/no-unresolved
+// @ts-expect-error - value will be replaced on build step
+import Root from 'ROOT';
+// @ts-expect-error - value will be replaced on build step
+import { routes, fallback } from 'MANIFEST';
 import { Router } from './router.js';
 import { Renderer } from './renderer.js';
 import { init } from './singletons.js';