@sveltejs/kit 1.0.0-next.405 → 1.0.0-next.406

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.405",
+  "version": "1.0.0-next.406",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -12,12 +12,20 @@
   "dependencies": {
     "@sveltejs/vite-plugin-svelte": "^1.0.1",
     "chokidar": "^3.5.3",
+    "cookie": "^0.5.0",
+    "devalue": "^2.0.1",
+    "kleur": "^4.1.4",
+    "magic-string": "^0.26.2",
+    "mime": "^3.0.0",
+    "node-fetch": "^3.2.4",
     "sade": "^1.8.1",
-    "tiny-glob": "^0.2.9"
+    "set-cookie-parser": "^2.4.8",
+    "sirv": "^2.0.2",
+    "tiny-glob": "^0.2.9",
+    "undici": "^5.8.1"
   },
   "devDependencies": {
     "@playwright/test": "^1.23.4",
-    "@rollup/plugin-replace": "^4.0.0",
     "@types/connect": "^3.4.35",
     "@types/cookie": "^0.5.1",
     "@types/marked": "^4.0.3",
@@ -25,25 +33,12 @@
     "@types/node": "^16.11.36",
     "@types/sade": "^1.7.4",
     "@types/set-cookie-parser": "^2.4.2",
-    "cookie": "^0.5.0",
-    "cross-env": "^7.0.3",
-    "devalue": "^2.0.1",
-    "kleur": "^4.1.4",
-    "locate-character": "^2.0.5",
     "marked": "^4.0.16",
-    "mime": "^3.0.0",
-    "node-fetch": "^3.2.4",
     "rollup": "^2.75.7",
-    "selfsigned": "^2.0.1",
-    "set-cookie-parser": "^2.4.8",
-    "sirv": "^2.0.2",
     "svelte": "^3.48.0",
-    "svelte-check": "^2.7.1",
     "svelte-preprocess": "^4.10.6",
     "svelte2tsx": "~0.5.10",
-    "tiny-glob": "^0.2.9",
     "typescript": "^4.7.4",
-    "undici": "^5.8.1",
     "uvu": "^0.5.3",
     "vite": "^3.0.0"
   },
@@ -55,27 +50,31 @@
     "svelte-kit": "svelte-kit.js"
   },
   "files": [
-    "assets",
-    "dist",
+    "src",
+    "!src/**/*.spec.js",
+    "!src/packaging/test",
+    "!src/core/**/fixtures",
+    "!src/core/sync/create_manifest_data/test",
     "types",
     "svelte-kit.js"
   ],
   "exports": {
     "./package.json": "./package.json",
     ".": {
+      "import": "./src/index/index.js",
       "types": "./types/index.d.ts"
     },
     "./node": {
-      "import": "./dist/node.js"
+      "import": "./src/node/index.js"
     },
     "./node/polyfills": {
-      "import": "./dist/node/polyfills.js"
+      "import": "./src/node/polyfills.js"
     },
     "./hooks": {
-      "import": "./dist/hooks.js"
+      "import": "./src/hooks.js"
     },
     "./vite": {
-      "import": "./dist/vite.js"
+      "import": "./src/vite/index.js"
     }
   },
   "types": "types/index.d.ts",
@@ -83,16 +82,15 @@
     "node": ">=16.9"
   },
   "scripts": {
-    "build": "rollup -c && node scripts/cp.js src/runtime/components assets/components && npm run types",
+    "build": "npm run types",
     "dev": "rollup -cw",
     "lint": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
     "check": "tsc",
     "check:all": "tsc && pnpm -r --filter=\"./**\" check",
     "format": "npm run lint -- --write",
-    "test": "npm run test:unit && npm run test:typings && npm run test:packaging && npm run test:integration",
+    "test": "npm run test:unit && npm run test:packaging && npm run test:integration",
     "test:integration": "pnpm run -r --workspace-concurrency 1 --filter=\"./test/**\" test",
     "test:unit": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\" -i packaging",
-    "test:typings": "tsc --project test/typings",
     "test:packaging": "uvu src/packaging \"(spec\\.js|test[\\\\/]index\\.js)\"",
     "types": "node scripts/extract-types.js",
     "postinstall": "node svelte-kit.js sync"

package/{dist → src}/cli.js

@@ -1,9 +1,9 @@
-import fs__default from 'fs';
-import path__default from 'path';
-import { l as load_config, $ } from './chunks/index.js';
+import fs from 'fs';
+import path from 'path';
+import colors from 'kleur';
 import sade from 'sade';
-import { c as coalesce_to_error } from './chunks/error.js';
-import 'url';
+import { load_config } from './core/config/index.js';
+import { coalesce_to_error } from './utils/error.js';
 
 /** @param {unknown} e */
 function handle_error(e) {
@@ -11,15 +11,16 @@ function handle_error(e) {
 
 	if (error.name === 'SyntaxError') throw error;
 
-	console.error($.bold().red(`> ${error.message}`));
+	console.error(colors.bold().red(`> ${error.message}`));
 	if (error.stack) {
-		console.error($.gray(error.stack.split('\n').slice(1).join('\n')));
+		console.error(colors.gray(error.stack.split('\n').slice(1).join('\n')));
 	}
 
 	process.exit(1);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.405');
+const pkg = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.url), 'utf-8'));
+const prog = sade('svelte-kit').version(pkg.version);
 
 prog
 	.command('package')
@@ -28,7 +29,7 @@ prog
 	.action(async ({ watch }) => {
 		try {
 			const config = await load_config();
-			const packaging = await import('./chunks/index2.js');
+			const packaging = await import('./packaging/index.js');
 
 			await (watch ? packaging.watch(config) : packaging.build(config));
 		} catch (error) {
@@ -45,13 +46,13 @@ prog
 
 		// TODO remove for 1.0
 		if (event === 'prepare') {
-			const pkg = JSON.parse(fs__default.readFileSync('package.json', 'utf8'));
+			const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8'));
 			const message =
 				pkg.scripts.prepare === 'svelte-kit sync'
 					? `\`svelte-kit sync\` now runs on "postinstall" — please remove the "prepare" script from your package.json\n`
 					: `\`svelte-kit sync\` now runs on "postinstall" — please remove it from your "prepare" script\n`;
 
-			console.error($.bold().red(message));
+			console.error(colors.bold().red(message));
 			return;
 		}
 
@@ -59,15 +60,15 @@ prog
 			process.chdir(process.env.INIT_CWD);
 		}
 
-		if (!fs__default.existsSync('svelte.config.js')) {
-			console.warn(`Missing ${path__default.resolve('svelte.config.js')} — skipping`);
+		if (!fs.existsSync('svelte.config.js')) {
+			console.warn(`Missing ${path.resolve('svelte.config.js')} — skipping`);
 			return;
 		}
 
 		try {
 			const config = await load_config();
-			const sync = await import('./chunks/sync.js').then(function (n) { return n.f; });
-			sync.all(config, mode);
+			const sync = await import('./core/sync/sync.js');
+			await sync.all(config, mode);
 		} catch (error) {
 			handle_error(error);
 		}
@@ -87,7 +88,7 @@ function replace(command) {
 		.describe(`No longer available — use vite ${command} instead`)
 		.action(async () => {
 			const message = `\n> svelte-kit ${command} is no longer available — use vite ${command} instead`;
-			console.error($.bold().red(message));
+			console.error(colors.bold().red(message));
 
 			const steps = [
 				'Install vite as a devDependency with npm/pnpm/etc',
@@ -96,12 +97,12 @@ function replace(command) {
 			];
 
 			steps.forEach((step, i) => {
-				console.error(`  ${i + 1}. ${$.cyan(step)}`);
+				console.error(`  ${i + 1}. ${colors.cyan(step)}`);
 			});
 
 			console.error(
 				`
-				${$.grey('// vite.config.js')}
+				${colors.grey('// vite.config.js')}
 				import { sveltekit } from '@sveltejs/kit/vite';
 
 				/** @type {import('vite').UserConfig} */

package/{dist/chunks/index3.js → src/core/adapt/builder.js}

@@ -1,45 +1,10 @@
-import { $ } from './index.js';
 import glob from 'tiny-glob';
 import zlib from 'zlib';
 import { existsSync, statSync, createReadStream, createWriteStream } from 'fs';
 import { pipeline } from 'stream';
 import { promisify } from 'util';
-import { r as rimraf, m as mkdirp, c as copy } from './filesystem.js';
-import { g as generate_manifest } from '../vite.js';
-import 'path';
-import 'url';
-import 'node:child_process';
-import 'node:fs';
-import 'node:path';
-import '@sveltejs/vite-plugin-svelte';
-import 'vite';
-import './sync.js';
-import './utils.js';
-import './write_tsconfig.js';
-import 'querystring';
-import '../node.js';
-import '../node/polyfills.js';
-import 'assert';
-import 'net';
-import 'http';
-import 'buffer';
-import 'stream/web';
-import 'perf_hooks';
-import 'util/types';
-import 'events';
-import 'tls';
-import 'async_hooks';
-import 'console';
-import 'node:http';
-import 'node:https';
-import 'node:zlib';
-import 'node:stream';
-import 'node:buffer';
-import 'node:util';
-import 'node:url';
-import 'node:net';
-import 'crypto';
-import './error.js';
+import { copy, rimraf, mkdirp } from '../../utils/filesystem.js';
+import { generate_manifest } from '../generate_manifest/index.js';
 
 /**
  * Creates the Builder which is passed to adapters for building the application.
@@ -51,15 +16,16 @@ import './error.js';
  * }} opts
  * @returns {import('types').Builder}
  */
-function create_builder({ config, build_data, prerendered, log }) {
+export function create_builder({ config, build_data, prerendered, log }) {
 	/** @type {Set<string>} */
 	const prerendered_paths = new Set(prerendered.paths);
 
 	/** @param {import('types').RouteData} route */
 	// TODO routes should come pre-filtered
 	function not_prerendered(route) {
-		if (route.type === 'page' && route.path) {
-			return !prerendered_paths.has(route.path) && !prerendered_paths.has(route.path + '/');
+		const path = route.type === 'page' && !route.id.includes('[') && `/${route.id}`;
+		if (path) {
+			return !prerendered_paths.has(path) && !prerendered_paths.has(path + '/');
 		}
 
 		return true;
@@ -239,22 +205,3 @@ function create_builder({ config, build_data, prerendered, log }) {
 		}
 	};
 }
-
-/**
- * @param {import('types').ValidatedConfig} config
- * @param {import('types').BuildData} build_data
- * @param {import('types').Prerendered} prerendered
- * @param {{ log: import('types').Logger }} opts
- */
-async function adapt(config, build_data, prerendered, { log }) {
-	const { name, adapt } = config.kit.adapter;
-
-	console.log($.bold().cyan(`\n> Using ${name}`));
-
-	const builder = create_builder({ config, build_data, prerendered, log });
-	await adapt(builder);
-
-	log.success('done');
-}
-
-export { adapt };

package/src/core/adapt/index.js

@@ -0,0 +1,19 @@
+import colors from 'kleur';
+import { create_builder } from './builder.js';
+
+/**
+ * @param {import('types').ValidatedConfig} config
+ * @param {import('types').BuildData} build_data
+ * @param {import('types').Prerendered} prerendered
+ * @param {{ log: import('types').Logger }} opts
+ */
+export async function adapt(config, build_data, prerendered, { log }) {
+	const { name, adapt } = config.kit.adapter;
+
+	console.log(colors.bold().cyan(`\n> Using ${name}`));
+
+	const builder = create_builder({ config, build_data, prerendered, log });
+	await adapt(builder);
+
+	log.success('done');
+}

package/src/core/config/index.js

@@ -0,0 +1,86 @@
+import fs from 'fs';
+import path from 'path';
+import * as url from 'url';
+import options from './options.js';
+
+/**
+ * Loads the template (src/app.html by default) and validates that it has the
+ * required content.
+ * @param {string} cwd
+ * @param {import('types').ValidatedConfig} config
+ */
+export function load_template(cwd, config) {
+	const { template } = config.kit.files;
+	const relative = path.relative(cwd, template);
+
+	if (fs.existsSync(template)) {
+		const contents = fs.readFileSync(template, 'utf8');
+
+		// TODO remove this for 1.0
+		const match = /%svelte\.([a-z]+)%/.exec(contents);
+		if (match) {
+			throw new Error(
+				`%svelte.${match[1]}% in ${relative} should be replaced with %sveltekit.${match[1]}%`
+			);
+		}
+
+		const expected_tags = ['%sveltekit.head%', '%sveltekit.body%'];
+		expected_tags.forEach((tag) => {
+			if (contents.indexOf(tag) === -1) {
+				throw new Error(`${relative} is missing ${tag}`);
+			}
+		});
+	} else {
+		throw new Error(`${relative} does not exist`);
+	}
+
+	return fs.readFileSync(template, 'utf-8');
+}
+
+/**
+ * Loads and validates svelte.config.js
+ * @param {{ cwd?: string }} options
+ * @returns {Promise<import('types').ValidatedConfig>}
+ */
+export async function load_config({ cwd = process.cwd() } = {}) {
+	const config_file = path.join(cwd, 'svelte.config.js');
+
+	if (!fs.existsSync(config_file)) {
+		return process_config({}, { cwd });
+	}
+
+	const config = await import(`${url.pathToFileURL(config_file).href}?ts=${Date.now()}`);
+
+	return process_config(config.default, { cwd });
+}
+
+/**
+ * @param {import('types').Config} config
+ * @returns {import('types').ValidatedConfig}
+ */
+function process_config(config, { cwd = process.cwd() } = {}) {
+	const validated = validate_config(config);
+
+	validated.kit.outDir = path.resolve(cwd, validated.kit.outDir);
+
+	for (const key in validated.kit.files) {
+		// @ts-expect-error this is typescript at its stupidest
+		validated.kit.files[key] = path.resolve(cwd, validated.kit.files[key]);
+	}
+
+	return validated;
+}
+
+/**
+ * @param {import('types').Config} config
+ * @returns {import('types').ValidatedConfig}
+ */
+export function validate_config(config) {
+	if (typeof config !== 'object') {
+		throw new Error(
+			'svelte.config.js must have a configuration object as its default export. See https://kit.svelte.dev/docs/configuration'
+		);
+	}
+
+	return options(config, 'config');
+}

package/{dist/chunks/index.js → src/core/config/options.js}

@@ -1,113 +1,4 @@
-import fs__default from 'fs';
-import path__default, { join } from 'path';
-import * as url from 'url';
-
-let FORCE_COLOR, NODE_DISABLE_COLORS, NO_COLOR, TERM, isTTY=true;
-if (typeof process !== 'undefined') {
-	({ FORCE_COLOR, NODE_DISABLE_COLORS, NO_COLOR, TERM } = process.env || {});
-	isTTY = process.stdout && process.stdout.isTTY;
-}
-
-const $ = {
-	enabled: !NODE_DISABLE_COLORS && NO_COLOR == null && TERM !== 'dumb' && (
-		FORCE_COLOR != null && FORCE_COLOR !== '0' || isTTY
-	),
-
-	// modifiers
-	reset: init(0, 0),
-	bold: init(1, 22),
-	dim: init(2, 22),
-	italic: init(3, 23),
-	underline: init(4, 24),
-	inverse: init(7, 27),
-	hidden: init(8, 28),
-	strikethrough: init(9, 29),
-
-	// colors
-	black: init(30, 39),
-	red: init(31, 39),
-	green: init(32, 39),
-	yellow: init(33, 39),
-	blue: init(34, 39),
-	magenta: init(35, 39),
-	cyan: init(36, 39),
-	white: init(37, 39),
-	gray: init(90, 39),
-	grey: init(90, 39),
-
-	// background colors
-	bgBlack: init(40, 49),
-	bgRed: init(41, 49),
-	bgGreen: init(42, 49),
-	bgYellow: init(43, 49),
-	bgBlue: init(44, 49),
-	bgMagenta: init(45, 49),
-	bgCyan: init(46, 49),
-	bgWhite: init(47, 49)
-};
-
-function run(arr, str) {
-	let i=0, tmp, beg='', end='';
-	for (; i < arr.length; i++) {
-		tmp = arr[i];
-		beg += tmp.open;
-		end += tmp.close;
-		if (!!~str.indexOf(tmp.close)) {
-			str = str.replace(tmp.rgx, tmp.close + tmp.open);
-		}
-	}
-	return beg + str + end;
-}
-
-function chain(has, keys) {
-	let ctx = { has, keys };
-
-	ctx.reset = $.reset.bind(ctx);
-	ctx.bold = $.bold.bind(ctx);
-	ctx.dim = $.dim.bind(ctx);
-	ctx.italic = $.italic.bind(ctx);
-	ctx.underline = $.underline.bind(ctx);
-	ctx.inverse = $.inverse.bind(ctx);
-	ctx.hidden = $.hidden.bind(ctx);
-	ctx.strikethrough = $.strikethrough.bind(ctx);
-
-	ctx.black = $.black.bind(ctx);
-	ctx.red = $.red.bind(ctx);
-	ctx.green = $.green.bind(ctx);
-	ctx.yellow = $.yellow.bind(ctx);
-	ctx.blue = $.blue.bind(ctx);
-	ctx.magenta = $.magenta.bind(ctx);
-	ctx.cyan = $.cyan.bind(ctx);
-	ctx.white = $.white.bind(ctx);
-	ctx.gray = $.gray.bind(ctx);
-	ctx.grey = $.grey.bind(ctx);
-
-	ctx.bgBlack = $.bgBlack.bind(ctx);
-	ctx.bgRed = $.bgRed.bind(ctx);
-	ctx.bgGreen = $.bgGreen.bind(ctx);
-	ctx.bgYellow = $.bgYellow.bind(ctx);
-	ctx.bgBlue = $.bgBlue.bind(ctx);
-	ctx.bgMagenta = $.bgMagenta.bind(ctx);
-	ctx.bgCyan = $.bgCyan.bind(ctx);
-	ctx.bgWhite = $.bgWhite.bind(ctx);
-
-	return ctx;
-}
-
-function init(open, close) {
-	let blk = {
-		open: `\x1b[${open}m`,
-		close: `\x1b[${close}m`,
-		rgx: new RegExp(`\\x1b\\[${close}m`, 'g')
-	};
-	return function (txt) {
-		if (this !== void 0 && this.has !== void 0) {
-			!!~this.has.indexOf(open) || (this.has.push(open),this.keys.push(blk));
-			return txt === void 0 ? this : $.enabled ? run(this.keys, txt+'') : txt+'';
-		}
-		return txt === void 0 ? chain([open], [blk]) : $.enabled ? run([blk], txt+'') : txt+'';
-	};
-}
+import { join } from 'path';
 
 /** @typedef {import('./types').Validator} Validator */
 
@@ -400,7 +291,11 @@ const options = object(
 			// TODO remove for 1.0
 			router: error((keypath) => `${keypath} has been moved to config.kit.browser.router`),
 
-			routes: fun((filepath) => !/(?:(?:^_|\/_)|(?:^\.|\/\.)(?!well-known))/.test(filepath)),
+			// TODO remove for 1.0
+			routes: error(
+				(keypath) =>
+					`${keypath} has been removed. See https://github.com/sveltejs/kit/discussions/5774 for details`
+			),
 
 			serviceWorker: object({
 				register: boolean(true),
@@ -590,86 +485,4 @@ function error(fn) {
 	});
 }
 
-/**
- * Loads the template (src/app.html by default) and validates that it has the
- * required content.
- * @param {string} cwd
- * @param {import('types').ValidatedConfig} config
- */
-function load_template(cwd, config) {
-	const { template } = config.kit.files;
-	const relative = path__default.relative(cwd, template);
-
-	if (fs__default.existsSync(template)) {
-		const contents = fs__default.readFileSync(template, 'utf8');
-
-		// TODO remove this for 1.0
-		const match = /%svelte\.([a-z]+)%/.exec(contents);
-		if (match) {
-			throw new Error(
-				`%svelte.${match[1]}% in ${relative} should be replaced with %sveltekit.${match[1]}%`
-			);
-		}
-
-		const expected_tags = ['%sveltekit.head%', '%sveltekit.body%'];
-		expected_tags.forEach((tag) => {
-			if (contents.indexOf(tag) === -1) {
-				throw new Error(`${relative} is missing ${tag}`);
-			}
-		});
-	} else {
-		throw new Error(`${relative} does not exist`);
-	}
-
-	return fs__default.readFileSync(template, 'utf-8');
-}
-
-/**
- * Loads and validates svelte.config.js
- * @param {{ cwd?: string }} options
- * @returns {Promise<import('types').ValidatedConfig>}
- */
-async function load_config({ cwd = process.cwd() } = {}) {
-	const config_file = path__default.join(cwd, 'svelte.config.js');
-
-	if (!fs__default.existsSync(config_file)) {
-		return process_config({}, { cwd });
-	}
-
-	const config = await import(`${url.pathToFileURL(config_file).href}?ts=${Date.now()}`);
-
-	return process_config(config.default, { cwd });
-}
-
-/**
- * @param {import('types').Config} config
- * @returns {import('types').ValidatedConfig}
- */
-function process_config(config, { cwd = process.cwd() } = {}) {
-	const validated = validate_config(config);
-
-	validated.kit.outDir = path__default.resolve(cwd, validated.kit.outDir);
-
-	for (const key in validated.kit.files) {
-		// @ts-expect-error this is typescript at its stupidest
-		validated.kit.files[key] = path__default.resolve(cwd, validated.kit.files[key]);
-	}
-
-	return validated;
-}
-
-/**
- * @param {import('types').Config} config
- * @returns {import('types').ValidatedConfig}
- */
-function validate_config(config) {
-	if (typeof config !== 'object') {
-		throw new Error(
-			'svelte.config.js must have a configuration object as its default export. See https://kit.svelte.dev/docs/configuration'
-		);
-	}
-
-	return options(config, 'config');
-}
-
-export { $, load_template as a, load_config as l };
+export default options;

package/src/core/config/types.d.ts

@@ -0,0 +1 @@
+export type Validator<T = any> = (input: T, keypath: string) => T;

package/src/core/constants.js

@@ -0,0 +1,3 @@
+// in `vite dev` and `vite preview`, we use a fake asset path so that we can
+// serve local assets while verifying that requests are correctly prefixed
+export const SVELTE_KIT_ASSETS = '/_svelte_kit_assets';