@sveltejs/kit 1.0.0-next.291 → 1.0.0-next.292

package/dist/chunks/url.js

@@ -0,0 +1,56 @@
+const absolute = /^([a-z]+:)?\/?\//;
+const scheme = /^[a-z]+:/;
+
+/**
+ * @param {string} base
+ * @param {string} path
+ */
+function resolve(base, path) {
+	if (scheme.test(path)) return path;
+
+	const base_match = absolute.exec(base);
+	const path_match = absolute.exec(path);
+
+	if (!base_match) {
+		throw new Error(`bad base path: "${base}"`);
+	}
+
+	const baseparts = path_match ? [] : base.slice(base_match[0].length).split('/');
+	const pathparts = path_match ? path.slice(path_match[0].length).split('/') : path.split('/');
+
+	baseparts.pop();
+
+	for (let i = 0; i < pathparts.length; i += 1) {
+		const part = pathparts[i];
+		if (part === '.') continue;
+		else if (part === '..') baseparts.pop();
+		else baseparts.push(part);
+	}
+
+	const prefix = (path_match && path_match[0]) || (base_match && base_match[0]) || '';
+
+	return `${prefix}${baseparts.join('/')}`;
+}
+
+/** @param {string} path */
+function is_root_relative(path) {
+	return path[0] === '/' && path[1] !== '/';
+}
+
+/**
+ * @param {string} path
+ * @param {import('types').TrailingSlash} trailing_slash
+ */
+function normalize_path(path, trailing_slash) {
+	if (path === '/' || trailing_slash === 'ignore') return path;
+
+	if (trailing_slash === 'never') {
+		return path.endsWith('/') ? path.slice(0, -1) : path;
+	} else if (trailing_slash === 'always' && /\/[^./]+$/.test(path)) {
+		return path + '/';
+	}
+
+	return path;
+}
+
+export { is_root_relative as i, normalize_path as n, resolve as r };

package/dist/cli.js

@@ -4,7 +4,6 @@ import { exec as exec$1 } from 'child_process';
 import { createConnection, createServer } from 'net';
 import fs__default from 'fs';
 import * as url from 'url';
-import { fileURLToPath } from 'url';
 import { networkInterfaces, release } from 'os';
 
 let FORCE_COLOR, NODE_DISABLE_COLORS, NO_COLOR, TERM, isTTY=true;
@@ -214,115 +213,6 @@ function check_weird(port) {
 	});
 }
 
-/** @param {string} dir */
-function mkdirp(dir) {
-	try {
-		fs__default.mkdirSync(dir, { recursive: true });
-	} catch (/** @type {any} */ e) {
-		if (e.code === 'EEXIST') return;
-		throw e;
-	}
-}
-
-/** @param {string} path */
-function rimraf(path) {
-	(fs__default.rmSync || fs__default.rmdirSync)(path, { recursive: true, force: true });
-}
-
-/**
- * @param {string} source
- * @param {string} target
- * @param {{
- *   filter?: (basename: string) => boolean;
- *   replace?: Record<string, string>;
- * }} opts
- */
-function copy(source, target, opts = {}) {
-	if (!fs__default.existsSync(source)) return [];
-
-	/** @type {string[]} */
-	const files = [];
-
-	const prefix = posixify(target) + '/';
-
-	const regex = opts.replace
-		? new RegExp(`\\b(${Object.keys(opts.replace).join('|')})\\b`, 'g')
-		: null;
-
-	/**
-	 * @param {string} from
-	 * @param {string} to
-	 */
-	function go(from, to) {
-		if (opts.filter && !opts.filter(path__default.basename(from))) return;
-
-		const stats = fs__default.statSync(from);
-
-		if (stats.isDirectory()) {
-			fs__default.readdirSync(from).forEach((file) => {
-				go(path__default.join(from, file), path__default.join(to, file));
-			});
-		} else {
-			mkdirp(path__default.dirname(to));
-
-			if (opts.replace) {
-				const data = fs__default.readFileSync(from, 'utf-8');
-				fs__default.writeFileSync(
-					to,
-					data.replace(
-						/** @type {RegExp} */ (regex),
-						(match, key) => /** @type {Record<string, string>} */ (opts.replace)[key]
-					)
-				);
-			} else {
-				fs__default.copyFileSync(from, to);
-			}
-
-			files.push(to === target ? posixify(path__default.basename(to)) : posixify(to).replace(prefix, ''));
-		}
-	}
-
-	go(source, target);
-
-	return files;
-}
-
-/**
- * Get a list of all files in a directory
- * @param {string} cwd - the directory to walk
- * @param {boolean} [dirs] - whether to include directories in the result
- */
-function walk(cwd, dirs = false) {
-	/** @type {string[]} */
-	const all_files = [];
-
-	/** @param {string} dir */
-	function walk_dir(dir) {
-		const files = fs__default.readdirSync(path__default.join(cwd, dir));
-
-		for (const file of files) {
-			const joined = path__default.join(dir, file);
-			const stats = fs__default.statSync(path__default.join(cwd, joined));
-			if (stats.isDirectory()) {
-				if (dirs) all_files.push(joined);
-				walk_dir(joined);
-			} else {
-				all_files.push(joined);
-			}
-		}
-	}
-
-	return walk_dir(''), all_files;
-}
-
-/** @param {string} str */
-function posixify(str) {
-	return str.replace(/\\/g, '/');
-}
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path__default.dirname(__filename);
-
 const get_runtime_path = /** @param {import('types').ValidatedConfig} config */ (config) =>
 			posixify_path(path__default.join(config.kit.outDir, 'runtime'))
 	;
@@ -333,25 +223,6 @@ function posixify_path(str) {
 	return `/${parsed.dir.slice(parsed.root.length).split(path__default.sep).join('/')}/${parsed.base}`;
 }
 
-/** @param {string} dest */
-function copy_assets(dest) {
-	{
-		let prefix = '..';
-		do {
-			// we jump through these hoops so that this function
-			// works whether or not it's been bundled
-			const resolved = path__default.resolve(__dirname, `${prefix}/assets`);
-
-			if (fs__default.existsSync(resolved)) {
-				copy(resolved, dest);
-				return;
-			}
-
-			prefix = `../${prefix}`;
-		} while (true); // eslint-disable-line
-	}
-}
-
 function noop() {}
 
 /** @param {{ verbose: boolean }} opts */
@@ -401,7 +272,7 @@ function resolve_entry(entry) {
 	return null;
 }
 
-/** @param {import('./create_app/index.js').ManifestData} manifest_data */
+/** @param {import('types').ManifestData} manifest_data */
 function get_mime_lookup(manifest_data) {
 	/** @type {Record<string, string>} */
 	const mime = {};
@@ -526,6 +397,8 @@ const options = object(
 				})
 			}),
 
+			endpointExtensions: string_array(['.js', '.ts']),
+
 			files: object({
 				assets: string('static'),
 				hooks: string(join('src', 'hooks')),
@@ -619,6 +492,7 @@ const options = object(
 					(keypath) =>
 						`${keypath} has been removed — it is now controlled by the trailingSlash option. See https://kit.svelte.dev/docs/configuration#trailingslash`
 				),
+				default: boolean(false),
 				enabled: boolean(true),
 				entries: validate(['*'], (input, keypath) => {
 					if (!Array.isArray(input) || !input.every((page) => typeof page === 'string')) {
@@ -996,7 +870,7 @@ async function launch(port, https) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.291');
+const prog = sade('svelte-kit').version('1.0.0-next.292');
 
 prog
 	.command('dev')
@@ -1048,8 +922,10 @@ prog
 			process.env.NODE_ENV = process.env.NODE_ENV || 'production';
 			const config = await load_config();
 
+			const log = logger({ verbose });
+
 			const { build } = await import('./chunks/index2.js');
-			const build_data = await build(config);
+			const { build_data, prerendered } = await build(config, { log });
 
 			console.log(
 				`\nRun ${$.bold().cyan('npm run preview')} to preview your production build locally.`
@@ -1057,7 +933,7 @@ prog
 
 			if (config.kit.adapter) {
 				const { adapt } = await import('./chunks/index4.js');
-				await adapt(config, build_data, { verbose });
+				await adapt(config, build_data, prerendered, { log });
 
 				// this is necessary to close any open db connections, etc
 				process.exit(0);
@@ -1117,6 +993,19 @@ prog
 		}
 	});
 
+prog
+	.command('sync')
+	.describe('Synchronise generated files')
+	.action(async () => {
+		try {
+			const config = await load_config();
+			const sync = await import('./chunks/sync.js');
+			sync.all(config);
+		} catch (error) {
+			handle_error(error);
+		}
+	});
+
 prog.parse(process.argv, { unknown: (arg) => `Unknown option: ${arg}` });
 
 /** @param {number} port */
@@ -1154,7 +1043,7 @@ async function check_port(port) {
 function welcome({ port, host, https, open, loose, allow, cwd }) {
 	if (open) launch(port, https);
 
-	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.291'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.292'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';
@@ -1191,4 +1080,4 @@ function welcome({ port, host, https, open, loose, allow, cwd }) {
 	console.log('\n');
 }
 
-export { $, get_mime_lookup as a, copy_assets as b, coalesce_to_error as c, get_aliases as d, print_config_conflicts as e, rimraf as f, get_runtime_path as g, copy as h, logger as i, load_template as l, mkdirp as m, posixify as p, resolve_entry as r, walk as w };
+export { $, get_mime_lookup as a, get_aliases as b, coalesce_to_error as c, get_runtime_path as g, load_template as l, print_config_conflicts as p, resolve_entry as r };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.291",
+  "version": "1.0.0-next.292",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -79,29 +79,15 @@
     "build": "rollup -c && node scripts/cp.js src/runtime/components assets/components && npm run types",
     "dev": "rollup -cw",
     "lint": "eslint --ignore-path .gitignore --ignore-pattern \"src/packaging/test/**\" \"{src,test}/**/*.{ts,mjs,js,svelte}\" && npm run check-format",
-    "check": "tsc && npm run check:integration && npm run check:prerendering",
-    "check:integration": "npm run check:integration:amp && npm run check:integration:basics && npm run check:integration:options && npm run check:integration:options-2",
-    "check:integration:amp": "cd test/apps/amp && pnpm check",
-    "check:integration:basics": "cd test/apps/basics && pnpm check",
-    "check:integration:options": "cd test/apps/options && pnpm check",
-    "check:integration:options-2": "cd test/apps/options-2 && pnpm check",
-    "check:prerendering": "npm run check:prerendering:basics && npm run check:prerendering:options",
-    "check:prerendering:basics": "cd test/prerendering/basics && pnpm check",
-    "check:prerendering:options": "cd test/prerendering/options && pnpm check",
+    "check": "tsc",
+    "check:all": "tsc && pnpm run -r check --filter ./",
     "format": "npm run check-format -- --write",
     "check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
-    "test": "npm run test:unit && npm run test:typings && npm run test:packaging && npm run test:prerendering && npm run test:integration",
+    "test": "npm run test:unit && npm run test:typings && npm run test:packaging",
+    "test:all": "pnpm run -r test --workspace-concurrency 1 --filter ./",
     "test:unit": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\" -i packaging",
     "test:typings": "tsc --project test/typings",
-    "test:prerendering": "pnpm test:prerendering:basics && pnpm test:prerendering:options",
-    "test:prerendering:basics": "cd test/prerendering/basics && pnpm test",
-    "test:prerendering:options": "cd test/prerendering/options && pnpm test",
     "test:packaging": "uvu src/packaging \"(spec\\.js|test[\\\\/]index\\.js)\"",
-    "test:integration": "pnpm test:integration:amp && pnpm test:integration:basics && pnpm test:integration:options && pnpm test:integration:options-2",
-    "test:integration:amp": "cd test/apps/amp && pnpm test",
-    "test:integration:basics": "cd test/apps/basics && pnpm test",
-    "test:integration:options": "cd test/apps/options && pnpm test",
-    "test:integration:options-2": "cd test/apps/options-2 && pnpm test",
     "types": "node scripts/extract-types.js"
   }
 }

package/types/ambient.d.ts

@@ -228,6 +228,10 @@ declare module '$service-worker' {
 	 * An array of URL strings representing the files in your static directory, or whatever directory is specified by `config.kit.files.assets`. You can customize which files are included from `static` directory using [`config.kit.serviceWorker.files`](/docs/configuration)
 	 */
 	export const files: string[];
+	/**
+	 * An array of pathnames corresponding to prerendered pages and endpoints.
+	 */
+	export const prerendered: string[];
 	/**
 	 * The result of calling `Date.now()` at build time. It's useful for generating unique cache names inside your service worker, so that a later deployment of your app can invalidate old caches.
 	 */

package/types/index.d.ts

@@ -41,6 +41,7 @@ export interface Config {
 			mode?: 'hash' | 'nonce' | 'auto';
 			directives?: CspDirectives;
 		};
+		endpointExtensions?: string[];
 		files?: {
 			assets?: string;
 			hooks?: string;
@@ -69,6 +70,7 @@ export interface Config {
 		prerender?: {
 			concurrency?: number;
 			crawl?: boolean;
+			default?: boolean;
 			enabled?: boolean;
 			entries?: string[];
 			onError?: PrerenderOnErrorValue;
@@ -145,7 +147,7 @@ export interface Page<Params extends Record<string, string> = Record<string, str
  * that method. Note that since 'delete' is a reserved word in
  * JavaScript, delete handles are called `del` instead.
  *
- * Note that you can use [generated types](/docs/types#generated)
+ * Note that you can use [generated types](/docs/types#generated-types)
  * instead of manually specifying the `Params` generic argument.
  */
 export interface RequestHandler<Params = Record<string, string>, Output extends Body = Body> {

package/types/internal.d.ts

@@ -14,6 +14,7 @@ import {
 	HttpMethod,
 	JSONObject,
 	MaybePromise,
+	Prerendered,
 	RequestEvent,
 	RequestOptions,
 	ResolveOptions,
@@ -63,15 +64,13 @@ export interface BuildData {
 		methods: Record<string, HttpMethod[]>;
 		vite_manifest: import('vite').Manifest;
 	};
-	static: string[];
-	entries: string[];
 }
 
 export type CSRComponent = any; // TODO
 
 export type CSRComponentLoader = () => Promise<CSRComponent>;
 
-export type CSRRoute = [RegExp, CSRComponentLoader[], CSRComponentLoader[], GetParams?, HasShadow?];
+export type CSRRoute = [RegExp, CSRComponentLoader[], CSRComponentLoader[], GetParams?, ShadowKey?];
 
 export interface EndpointData {
 	type: 'endpoint';
@@ -84,8 +83,6 @@ export interface EndpointData {
 
 export type GetParams = (match: RegExpExecArray) => Record<string, string>;
 
-type HasShadow = 1;
-
 export interface Hooks {
 	externalFetch: ExternalFetch;
 	getSession: GetSession;
@@ -149,8 +146,8 @@ export interface PrerenderDependency {
 }
 
 export interface PrerenderOptions {
-	fallback?: string;
-	all: boolean;
+	fallback?: boolean;
+	default: boolean;
 	dependencies: Map<string, PrerenderDependency>;
 }
 
@@ -179,6 +176,13 @@ export interface ShadowEndpointOutput<Output extends JSONObject = JSONObject> {
 	body?: Output;
 }
 
+/**
+ * The route key of a page with a matching endpoint — used to ensure the
+ * client loads data from the right endpoint during client-side navigation
+ * rather than a different route that happens to match the path
+ */
+type ShadowKey = string;
+
 export interface ShadowRequestHandler<Output extends JSONObject = JSONObject> {
 	(event: RequestEvent): MaybePromise<Either<ShadowEndpointOutput<Output>, Fallthrough>>;
 }
@@ -272,6 +276,7 @@ export interface SSROptions {
 
 export interface SSRPage {
 	type: 'page';
+	key: string;
 	pattern: RegExp;
 	params: GetParams;
 	shadow:

package/types/private.d.ts

@@ -2,7 +2,7 @@
 // but which cannot be imported from `@sveltejs/kit`. Care should
 // be taken to avoid breaking changes when editing this file
 
-import { SSRNodeLoader, SSRRoute } from './internal';
+import { SSRNodeLoader, SSRRoute, ValidatedConfig } from './internal';
 
 export interface AdapterEntry {
 	/**
@@ -35,8 +35,8 @@ export interface Builder {
 	rimraf(dir: string): void;
 	mkdirp(dir: string): void;
 
-	appDir: string;
-	trailingSlash: TrailingSlash;
+	config: ValidatedConfig;
+	prerendered: Prerendered;
 
 	/**
 	 * Create entry points that map to individual functions
@@ -56,6 +56,16 @@ export interface Builder {
 	 * @returns an array of paths corresponding to the files that have been created by the copy
 	 */
 	writeClient(dest: string): string[];
+	/**
+	 *
+	 * @param dest
+	 */
+	writePrerendered(
+		dest: string,
+		opts?: {
+			fallback?: string;
+		}
+	): string[];
 	/**
 	 * @param dest the destination folder to which files should be copied
 	 * @returns an array of paths corresponding to the files that have been created by the copy
@@ -81,8 +91,6 @@ export interface Builder {
 			replace?: Record<string, string>;
 		}
 	): string[];
-
-	prerender(options: { all?: boolean; dest: string; fallback?: string }): Promise<Prerendered>;
 }
 
 // Based on https://github.com/josh-hemphill/csp-typed-directives/blob/latest/src/csp.types.ts