@sveltejs/kit 1.0.0-next.337 → 1.0.0-next.338

package/assets/app/env.js

@@ -12,9 +12,5 @@ const dev = !!import.meta.env.DEV;
  * @type {import('$app/env').mode}
  */
 const mode = import.meta.env.MODE;
-/**
- * @type {import('$app/env').amp}
- */
-const amp = !!import.meta.env.VITE_SVELTEKIT_AMP;
 
-export { amp, browser, dev, mode };
+export { browser, dev, mode };

package/assets/client/start.js

@@ -941,7 +941,18 @@ function create_client({ target, session, base, trailing_slash }) {
 				props: props || {},
 				get url() {
 					node.uses.url = true;
-					return url;
+
+					return new Proxy(url, {
+						get: (target, property) => {
+							if (property === 'hash') {
+								throw new Error(
+									'url.hash is inaccessible from load. Consider accessing hash from the page store within the script tag of your component.'
+								);
+							}
+
+							return Reflect.get(target, property, target);
+						}
+					});
 				},
 				get session() {
 					node.uses.session = true;

package/assets/server/index.js

@@ -1272,95 +1272,76 @@ async function render_response({
 		}
 	`;
 
-	if (options.amp) {
-		// inline_style contains CSS files (i.e. `import './styles.css'`)
-		// rendered.css contains the CSS from `<style>` tags in Svelte components
-		const styles = `${inlined_style}\n${rendered.css.code}`;
-		head += `
-		<style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style>
-		<noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
-		<script async src="https://cdn.ampproject.org/v0.js"></script>
-
-		<style amp-custom>${styles}</style>`;
-
-		if (options.service_worker) {
-			head +=
-				'<script async custom-element="amp-install-serviceworker" src="https://cdn.ampproject.org/v0/amp-install-serviceworker-0.1.js"></script>';
+	if (inlined_style) {
+		const attributes = [];
+		if (options.dev) attributes.push(' data-sveltekit');
+		if (csp.style_needs_nonce) attributes.push(` nonce="${csp.nonce}"`);
 
-			body += `<amp-install-serviceworker src="${options.service_worker}" layout="nodisplay"></amp-install-serviceworker>`;
-		}
-	} else {
-		if (inlined_style) {
-			const attributes = [];
-			if (options.dev) attributes.push(' data-sveltekit');
-			if (csp.style_needs_nonce) attributes.push(` nonce="${csp.nonce}"`);
+		csp.add_style(inlined_style);
 
-			csp.add_style(inlined_style);
+		head += `\n\t<style${attributes.join('')}>${inlined_style}</style>`;
+	}
 
-			head += `\n\t<style${attributes.join('')}>${inlined_style}</style>`;
-		}
+	// prettier-ignore
+	head += Array.from(stylesheets)
+		.map((dep) => {
+			const attributes = [
+				'rel="stylesheet"',
+				`href="${options.prefix + dep}"`
+			];
 
-		// prettier-ignore
-		head += Array.from(stylesheets)
-			.map((dep) => {
-				const attributes = [
-					'rel="stylesheet"',
-					`href="${options.prefix + dep}"`
-				];
+			if (csp.style_needs_nonce) {
+				attributes.push(`nonce="${csp.nonce}"`);
+			}
 
-				if (csp.style_needs_nonce) {
-					attributes.push(`nonce="${csp.nonce}"`);
-				}
+			if (styles.has(dep)) {
+				// don't load stylesheets that are already inlined
+				// include them in disabled state so that Vite can detect them and doesn't try to add them
+				attributes.push('disabled', 'media="(max-width: 0)"');
+			}
 
-				if (styles.has(dep)) {
-					// don't load stylesheets that are already inlined
-					// include them in disabled state so that Vite can detect them and doesn't try to add them
-					attributes.push('disabled', 'media="(max-width: 0)"');
-				}
+			return `\n\t<link ${attributes.join(' ')}>`;
+		})
+		.join('');
 
-				return `\n\t<link ${attributes.join(' ')}>`;
-			})
+	if (page_config.router || page_config.hydrate) {
+		head += Array.from(modulepreloads)
+			.map((dep) => `\n\t<link rel="modulepreload" href="${options.prefix + dep}">`)
 			.join('');
 
-		if (page_config.router || page_config.hydrate) {
-			head += Array.from(modulepreloads)
-				.map((dep) => `\n\t<link rel="modulepreload" href="${options.prefix + dep}">`)
-				.join('');
+		const attributes = ['type="module"', `data-sveltekit-hydrate="${target}"`];
 
-			const attributes = ['type="module"', `data-sveltekit-hydrate="${target}"`];
+		csp.add_script(init_app);
 
-			csp.add_script(init_app);
-
-			if (csp.script_needs_nonce) {
-				attributes.push(`nonce="${csp.nonce}"`);
-			}
+		if (csp.script_needs_nonce) {
+			attributes.push(`nonce="${csp.nonce}"`);
+		}
 
-			body += `\n\t\t<script ${attributes.join(' ')}>${init_app}</script>`;
+		body += `\n\t\t<script ${attributes.join(' ')}>${init_app}</script>`;
 
-			body += serialized_data
-				.map(({ url, body, response }) =>
-					render_json_payload_script(
-						{ type: 'data', url, body: typeof body === 'string' ? hash(body) : undefined },
-						response
-					)
+		body += serialized_data
+			.map(({ url, body, response }) =>
+				render_json_payload_script(
+					{ type: 'data', url, body: typeof body === 'string' ? hash(body) : undefined },
+					response
 				)
-				.join('\n\t');
+			)
+			.join('\n\t');
 
-			if (shadow_props) {
-				body += render_json_payload_script({ type: 'props' }, shadow_props);
-			}
+		if (shadow_props) {
+			body += render_json_payload_script({ type: 'props' }, shadow_props);
 		}
+	}
 
-		if (options.service_worker) {
-			// always include service worker unless it's turned off explicitly
-			csp.add_script(init_service_worker);
+	if (options.service_worker) {
+		// always include service worker unless it's turned off explicitly
+		csp.add_script(init_service_worker);
 
-			head += `
-				<script${csp.script_needs_nonce ? ` nonce="${csp.nonce}"` : ''}>${init_service_worker}</script>`;
-		}
+		head += `
+			<script${csp.script_needs_nonce ? ` nonce="${csp.nonce}"` : ''}>${init_service_worker}</script>`;
 	}
 
-	if (state.prerender && !options.amp) {
+	if (state.prerender) {
 		const http_equiv = [];
 
 		const csp_headers = csp.get_meta();

package/dist/chunks/filesystem.js

@@ -13,7 +13,7 @@ function mkdirp(dir) {
 
 /** @param {string} path */
 function rimraf(path) {
-	(fs__default.rmSync || fs__default.rmdirSync)(path, { recursive: true, force: true });
+	fs__default.rmSync(path, { force: true, recursive: true });
 }
 
 /**

package/dist/chunks/index.js

@@ -9,7 +9,6 @@ import { S as SVELTE_KIT_ASSETS, s as sirv } from './constants.js';
 import { installFetch } from '../install-fetch.js';
 import { update, init } from './sync.js';
 import { getRequest, setResponse } from '../node.js';
-import { sequence } from '../hooks.js';
 import { p as posixify } from './filesystem.js';
 import { p as parse_route_id } from './misc.js';
 import 'sade';
@@ -39,14 +38,6 @@ const style_pattern = /\.(css|less|sass|scss|styl|stylus|pcss|postcss)$/;
 async function create_plugin(config, cwd) {
 	const runtime = get_runtime_path(config);
 
-	/** @type {import('types').Handle} */
-	let amp;
-
-	if (config.kit.amp) {
-		process.env.VITE_SVELTEKIT_AMP = 'true';
-		amp = (await import('./amp_hook.js')).handle;
-	}
-
 	process.env.VITE_SVELTEKIT_APP_VERSION_POLL_INTERVAL = '0';
 
 	/** @type {import('types').Respond} */
@@ -238,7 +229,7 @@ async function create_plugin(config, cwd) {
 						/** @type {import('types').Hooks} */
 						const hooks = {
 							getSession: user_hooks.getSession || (() => ({})),
-							handle: amp ? sequence(amp, handle) : handle,
+							handle,
 							handleError:
 								user_hooks.handleError ||
 								(({ /** @type {Error & { frame?: string }} */ error }) => {
@@ -300,7 +291,6 @@ async function create_plugin(config, cwd) {
 						const rendered = await respond(
 							request,
 							{
-								amp: config.kit.amp,
 								csp: config.kit.csp,
 								dev: true,
 								floc: config.kit.floc,
@@ -504,12 +494,7 @@ async function dev({ cwd, port, host, https, config }) {
 		plugins: [
 			svelte({
 				...config,
-				// In AMP mode, we know that there are no conditional component imports. In that case, we
-				// don't need to include CSS for components that are imported but unused, so we can just
-				// include rendered CSS.
-				// This would also apply if hydrate and router are both false, but we don't know if one
-				// has been enabled at the page level, so we don't do anything there.
-				emitCss: !config.kit.amp,
+				emitCss: true,
 				compilerOptions: {
 					...config.compilerOptions,
 					hydratable: !!config.kit.browser.hydrate

package/dist/chunks/index2.js

@@ -238,8 +238,6 @@ async function build_client({
 	process.env.VITE_SVELTEKIT_APP_VERSION_FILE = `${config.kit.appDir}/version.json`;
 	process.env.VITE_SVELTEKIT_APP_VERSION_POLL_INTERVAL = `${config.kit.version.pollInterval}`;
 
-	process.env.VITE_SVELTEKIT_AMP = config.kit.amp ? 'true' : '';
-
 	const client_out_dir = `${output_dir}/client/${config.kit.appDir}`;
 
 	/** @type {Record<string, string>} */
@@ -286,12 +284,7 @@ async function build_client({
 		plugins: [
 			svelte({
 				...config,
-				// In AMP mode, we know that there are no conditional component imports. In that case, we
-				// don't need to include CSS for components that are imported but unused, so we can just
-				// include rendered CSS.
-				// This would also apply if hydrate and router are both false, but we don't know if one
-				// has been enabled at the page level, so we don't do anything there.
-				emitCss: !config.kit.amp,
+				emitCss: true,
 				compilerOptions: {
 					...config.compilerOptions,
 					hydratable: !!config.kit.browser.hydrate
@@ -372,7 +365,6 @@ export function override(settings) {
 export class Server {
 	constructor(manifest) {
 		this.options = {
-			amp: ${config.kit.amp},
 			csp: ${s(config.kit.csp)},
 			dev: false,
 			floc: ${config.kit.floc},
@@ -581,7 +573,7 @@ async function build_server(
 
 	client.assets.forEach((asset) => {
 		if (asset.fileName.endsWith('.css')) {
-			if (config.kit.amp || asset.source.length < config.kit.inlineStyleThreshold) {
+			if (asset.source.length < config.kit.inlineStyleThreshold) {
 				const index = stylesheet_lookup.size;
 				const file = `${output_dir}/server/stylesheets/${index}.js`;
 

package/dist/chunks/index6.js

@@ -15549,7 +15549,7 @@ async function build(config, cwd = process.cwd()) {
 	mkdirp(dir);
 
 	// Make sure generated tsconfig is up-to-date
-	write_tsconfig(config);
+	write_tsconfig(config, cwd);
 
 	const files = scan(config);
 

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);
@@ -871,7 +875,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.337');
+const prog = sade('svelte-kit').version('1.0.0-next.338');
 
 prog
 	.command('dev')
@@ -1093,7 +1097,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.337'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.338'}\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.337",
+  "version": "1.0.0-next.338",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -18,7 +18,6 @@
   "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",
@@ -26,7 +25,6 @@
     "@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",

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 };