@sveltejs/kit 1.0.0-next.336 → 1.0.0-next.339

package/dist/chunks/sync.js

@@ -193,118 +193,120 @@ function create_manifest_data({
 	const routes_base = posixify(path__default.relative(cwd, config.kit.files.routes));
 	const valid_extensions = [...config.extensions, ...config.kit.endpointExtensions];
 
-	list_files(config.kit.files.routes).forEach((file) => {
-		const extension = valid_extensions.find((ext) => file.endsWith(ext));
-		if (!extension) return;
+	if (fs__default.existsSync(config.kit.files.routes)) {
+		list_files(config.kit.files.routes).forEach((file) => {
+			const extension = valid_extensions.find((ext) => file.endsWith(ext));
+			if (!extension) return;
 
-		const id = file
-			.slice(0, -extension.length)
-			.replace(/(?:^|\/)index((?:@[a-zA-Z0-9_-]+)?(?:\.[a-z]+)?)?$/, '$1');
-		const project_relative = `${routes_base}/${file}`;
+			const id = file
+				.slice(0, -extension.length)
+				.replace(/(?:^|\/)index((?:@[a-zA-Z0-9_-]+)?(?:\.[a-z]+)?)?$/, '$1');
+			const project_relative = `${routes_base}/${file}`;
 
-		const segments = id.split('/');
-		const name = /** @type {string} */ (segments.pop());
+			const segments = id.split('/');
+			const name = /** @type {string} */ (segments.pop());
 
-		if (name === '__layout.reset') {
-			throw new Error(
-				'__layout.reset has been removed in favour of named layouts: https://kit.svelte.dev/docs/layouts#named-layouts'
-			);
-		}
+			if (name === '__layout.reset') {
+				throw new Error(
+					'__layout.reset has been removed in favour of named layouts: https://kit.svelte.dev/docs/layouts#named-layouts'
+				);
+			}
 
-		if (name === '__error' || layout_pattern.test(name)) {
-			const dir = segments.join('/');
+			if (name === '__error' || layout_pattern.test(name)) {
+				const dir = segments.join('/');
 
-			if (!tree.has(dir)) {
-				tree.set(dir, {
-					error: undefined,
-					layouts: {}
-				});
-			}
+				if (!tree.has(dir)) {
+					tree.set(dir, {
+						error: undefined,
+						layouts: {}
+					});
+				}
 
-			const group = /** @type {Node} */ (tree.get(dir));
+				const group = /** @type {Node} */ (tree.get(dir));
 
-			if (name === '__error') {
-				group.error = project_relative;
-			} else {
-				const match = /** @type {RegExpMatchArray} */ (layout_pattern.exec(name));
+				if (name === '__error') {
+					group.error = project_relative;
+				} else {
+					const match = /** @type {RegExpMatchArray} */ (layout_pattern.exec(name));
 
-				if (match[1] === DEFAULT) {
-					throw new Error(`${project_relative} cannot use reserved "${DEFAULT}" name`);
-				}
+					if (match[1] === DEFAULT) {
+						throw new Error(`${project_relative} cannot use reserved "${DEFAULT}" name`);
+					}
+
+					const layout_id = match[1] || DEFAULT;
 
-				const layout_id = match[1] || DEFAULT;
+					const defined = group.layouts[layout_id];
+					if (defined && defined !== default_layout) {
+						throw new Error(
+							`Duplicate layout ${project_relative} already defined at ${defined.file}`
+						);
+					}
 
-				const defined = group.layouts[layout_id];
-				if (defined && defined !== default_layout) {
-					throw new Error(
-						`Duplicate layout ${project_relative} already defined at ${defined.file}`
-					);
+					group.layouts[layout_id] = {
+						file: project_relative,
+						name
+					};
 				}
 
-				group.layouts[layout_id] = {
-					file: project_relative,
-					name
-				};
+				return;
+			} else if (dunder_pattern.test(file)) {
+				throw new Error(
+					`Files and directories prefixed with __ are reserved (saw ${project_relative})`
+				);
 			}
 
-			return;
-		} else if (dunder_pattern.test(file)) {
-			throw new Error(
-				`Files and directories prefixed with __ are reserved (saw ${project_relative})`
-			);
-		}
+			if (!config.kit.routes(file)) return;
 
-		if (!config.kit.routes(file)) return;
-
-		if (/\]\[/.test(id)) {
-			throw new Error(`Invalid route ${project_relative} — parameters must be separated`);
-		}
+			if (/\]\[/.test(id)) {
+				throw new Error(`Invalid route ${project_relative} — parameters must be separated`);
+			}
 
-		if (count_occurrences('[', id) !== count_occurrences(']', id)) {
-			throw new Error(`Invalid route ${project_relative} — brackets are unbalanced`);
-		}
+			if (count_occurrences('[', id) !== count_occurrences(']', id)) {
+				throw new Error(`Invalid route ${project_relative} — brackets are unbalanced`);
+			}
 
-		if (!units.has(id)) {
-			units.set(id, {
-				id,
-				pattern: parse_route_id(id).pattern,
-				segments: id
-					.split('/')
-					.filter(Boolean)
-					.map((segment) => {
-						/** @type {Part[]} */
-						const parts = [];
-						segment.split(/\[(.+?)\]/).map((content, i) => {
-							const dynamic = !!(i % 2);
-
-							if (!content) return;
-
-							parts.push({
-								content,
-								dynamic,
-								rest: dynamic && content.startsWith('...'),
-								type: (dynamic && content.split('=')[1]) || null
+			if (!units.has(id)) {
+				units.set(id, {
+					id,
+					pattern: parse_route_id(id).pattern,
+					segments: id
+						.split('/')
+						.filter(Boolean)
+						.map((segment) => {
+							/** @type {Part[]} */
+							const parts = [];
+							segment.split(/\[(.+?)\]/).map((content, i) => {
+								const dynamic = !!(i % 2);
+
+								if (!content) return;
+
+								parts.push({
+									content,
+									dynamic,
+									rest: dynamic && content.startsWith('...'),
+									type: (dynamic && content.split('=')[1]) || null
+								});
 							});
-						});
-						return parts;
-					}),
-				page: undefined,
-				endpoint: undefined
-			});
-		}
+							return parts;
+						}),
+					page: undefined,
+					endpoint: undefined
+				});
+			}
 
-		const unit = /** @type {Unit} */ (units.get(id));
+			const unit = /** @type {Unit} */ (units.get(id));
 
-		if (config.extensions.find((ext) => file.endsWith(ext))) {
-			const { layouts, errors } = trace(project_relative, file, tree, config.extensions);
-			unit.page = {
-				a: layouts.concat(project_relative),
-				b: errors
-			};
-		} else {
-			unit.endpoint = project_relative;
-		}
-	});
+			if (config.extensions.find((ext) => file.endsWith(ext))) {
+				const { layouts, errors } = trace(project_relative, file, tree, config.extensions);
+				unit.page = {
+					a: layouts.concat(project_relative),
+					b: errors
+				};
+			} else {
+				unit.endpoint = project_relative;
+			}
+		});
+	}
 
 	/** @type {string[]} */
 	const components = [];

package/dist/chunks/write_tsconfig.js

@@ -29,11 +29,12 @@ function trim(str) {
 const exists = (file) => fs__default.existsSync(file) && file;
 
 /** @param {import('types').ValidatedConfig} config */
-function write_tsconfig(config) {
+function write_tsconfig(config, cwd = process.cwd()) {
 	const out = path__default.join(config.kit.outDir, 'tsconfig.json');
-	const user_file = exists('tsconfig.json') || exists('jsconfig.json');
+	const user_file =
+		exists(path__default.resolve(cwd, 'tsconfig.json')) || exists(path__default.resolve(cwd, 'jsconfig.json'));
 
-	if (user_file) validate(config, out, user_file);
+	if (user_file) validate(config, cwd, out, user_file);
 
 	/** @param {string} file */
 	const project_relative = (file) => posixify(path__default.relative('.', file));
@@ -97,17 +98,20 @@ function write_tsconfig(config) {
 
 /**
  * @param {import('types').ValidatedConfig} config
+ * @param {string} cwd
  * @param {string} out
  * @param {string} user_file
  */
-function validate(config, out, user_file) {
+function validate(config, cwd, out, user_file) {
 	// we have to eval the file, since it's not parseable as JSON (contains comments)
 	const user_tsconfig_json = fs__default.readFileSync(user_file, 'utf-8');
 	const user_tsconfig = (0, eval)(`(${user_tsconfig_json})`);
 
 	// we need to check that the user's tsconfig extends the framework config
 	const extend = user_tsconfig.extends;
-	const extends_framework_config = extend && path__default.resolve('.', extend) === out;
+	const extends_framework_config = extend && path__default.resolve(cwd, extend) === out;
+
+	const kind = path__default.basename(user_file);
 
 	if (extends_framework_config) {
 		const { paths: user_paths } = user_tsconfig.compilerOptions || {};
@@ -119,16 +123,16 @@ function validate(config, out, user_file) {
 			const lib_ = user_paths['$lib/*'] || [];
 
 			const missing_lib_paths =
-				!lib.some((relative) => path__default.resolve('.', relative) === config.kit.files.lib) ||
+				!lib.some((relative) => path__default.resolve(cwd, relative) === config.kit.files.lib) ||
 				!lib_.some(
-					(relative) => path__default.resolve('.', relative) === path__default.join(config.kit.files.lib, '/*')
+					(relative) => path__default.resolve(cwd, relative) === path__default.join(config.kit.files.lib, '/*')
 				);
 
 			if (missing_lib_paths) {
 				console.warn(
 					$
 						.bold()
-						.yellow(`Your compilerOptions.paths in ${user_file} should include the following:`)
+						.yellow(`Your compilerOptions.paths in ${kind} should include the following:`)
 				);
 				const relative = posixify(path__default.relative('.', config.kit.files.lib));
 				console.warn(`{\n  "$lib":["${relative}"],\n  "$lib/*":["${relative}/*"]\n}`);
@@ -139,9 +143,7 @@ function validate(config, out, user_file) {
 		if (!relative.startsWith('./')) relative = './' + relative;
 
 		console.warn(
-			$
-				.bold()
-				.yellow(`Your ${user_file} should extend the configuration generated by SvelteKit:`)
+			$.bold().yellow(`Your ${kind} should extend the configuration generated by SvelteKit:`)
 		);
 		console.warn(`{\n  "extends": "${relative}"\n}`);
 	}

package/dist/cli.js

@@ -338,7 +338,11 @@ const options = object(
 				return input;
 			}),
 
-			amp: boolean(false),
+			// TODO: remove this for the 1.0 release
+			amp: error(
+				(keypath) =>
+					`${keypath} has been removed. See https://kit.svelte.dev/docs/seo#amp for details on how to support AMP`
+			),
 
 			appDir: validate('_app', (input, keypath) => {
 				assert_string(input, keypath);
@@ -761,7 +765,16 @@ function load_template(cwd, config) {
 
 	if (fs__default.existsSync(template)) {
 		const contents = fs__default.readFileSync(template, 'utf8');
-		const expected_tags = ['%svelte.head%', '%svelte.body%'];
+
+		// 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}`);
@@ -871,7 +884,7 @@ async function launch(port, https, base) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}${base}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.336');
+const prog = sade('svelte-kit').version('1.0.0-next.339');
 
 prog
 	.command('dev')
@@ -1093,7 +1106,7 @@ async function check_port(port) {
 function welcome({ port, host, https, open, base, loose, allow, cwd }) {
 	if (open) launch(port, https, base);
 
-	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.336'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.339'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.336",
+  "version": "1.0.0-next.339",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -13,41 +13,24 @@
     "@sveltejs/vite-plugin-svelte": "^1.0.0-next.44",
     "chokidar": "^3.5.3",
     "sade": "^1.7.4",
-    "vite": "^2.9.0"
+    "vite": "^2.9.9"
   },
   "devDependencies": {
-    "@playwright/test": "^1.21.0",
-    "@rollup/plugin-replace": "^4.0.0",
-    "@types/amphtml-validator": "^1.0.1",
     "@types/connect": "^3.4.35",
     "@types/cookie": "^0.5.0",
     "@types/marked": "^4.0.1",
     "@types/mime": "^2.0.3",
-    "@types/node": "^16.11.11",
     "@types/sade": "^1.7.3",
     "@types/set-cookie-parser": "^2.4.2",
-    "amphtml-validator": "^1.0.35",
     "cookie": "^0.5.0",
-    "cross-env": "^7.0.3",
     "devalue": "^2.0.1",
-    "eslint": "^8.3.0",
     "kleur": "^4.1.4",
     "locate-character": "^2.0.5",
-    "marked": "^4.0.5",
     "mime": "^3.0.0",
     "node-fetch": "^3.1.0",
-    "port-authority": "^1.1.2",
-    "rollup": "^2.60.2",
     "selfsigned": "^2.0.0",
     "set-cookie-parser": "^2.4.8",
-    "sirv": "^2.0.0",
-    "svelte": "^3.44.2",
-    "svelte-check": "^2.5.0",
-    "svelte-preprocess": "^4.9.8",
-    "svelte2tsx": "~0.5.0",
-    "tiny-glob": "^0.2.9",
-    "typescript": "^4.6.4",
-    "uvu": "^0.5.2"
+    "svelte": "^3.48.0"
   },
   "peerDependencies": {
     "svelte": "^3.44.0"

package/types/ambient.d.ts

@@ -49,14 +49,10 @@ declare namespace App {
 
 /**
  * ```ts
- * import { amp, browser, dev, mode, prerendering } from '$app/env';
+ * import { browser, dev, mode, prerendering } from '$app/env';
  * ```
  */
 declare module '$app/env' {
-	/**
-	 * Whether or not the app is running in [AMP mode](/docs/seo#manual-setup-amp).
-	 */
-	export const amp: boolean;
 	/**
 	 * Whether the app is running in the browser or on the server.
 	 */

package/types/index.d.ts

@@ -93,7 +93,6 @@ export interface Config {
 	extensions?: string[];
 	kit?: {
 		adapter?: Adapter;
-		amp?: boolean;
 		appDir?: string;
 		browser?: {
 			hydrate?: boolean;

package/types/internal.d.ts

@@ -240,7 +240,6 @@ export interface SSRNode {
 export type SSRNodeLoader = () => Promise<SSRNode>;
 
 export interface SSROptions {
-	amp: boolean;
 	csp: ValidatedConfig['kit']['csp'];
 	dev: boolean;
 	floc: boolean;

package/dist/chunks/amp_hook.js

@@ -1,56 +0,0 @@
-/** @type {import('amphtml-validator').Validator} */
-const amp = await (await import('./index7.js').then(function (n) { return n.i; })).getInstance();
-
-/** @type {import('types').Handle} */
-async function handle({ event, resolve }) {
-	const response = await resolve(event);
-	if (response.headers.get('content-type') !== 'text/html') {
-		return response;
-	}
-
-	let rendered = await response.text();
-	const result = amp.validateString(rendered);
-
-	if (result.status !== 'PASS') {
-		const lines = rendered.split('\n');
-
-		/** @param {string} str */
-		const escape = (str) => str.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-
-		rendered = `<!doctype html>
-		<head>
-			<meta charset="utf-8" />
-			<meta name="viewport" content="width=device-width, initial-scale=1" />
-			<style>
-				body {
-					font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
-					color: #333;
-				}
-
-				pre {
-					background: #f4f4f4;
-					padding: 1em;
-					overflow-x: auto;
-				}
-			</style>
-		</head>
-		<h1>AMP validation failed</h1>
-
-		${result.errors
-			.map(
-				(error) => `
-			<h2>${error.severity}</h2>
-			<p>Line ${error.line}, column ${error.col}: ${error.message} (<a href="${error.specUrl}">${
-					error.code
-				}</a>)</p>
-			<pre>${escape(lines[error.line - 1])}</pre>
-		`
-			)
-			.join('\n\n')}
-	`;
-	}
-
-	return new Response(rendered, { status: response.status, headers: response.headers });
-}
-
-export { handle };