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

package/dist/cli.js

@@ -3,6 +3,7 @@ import fs__default from 'fs';
 import path__default, { join, relative } from 'path';
 import { exec as exec$1 } from 'child_process';
 import { createConnection, createServer } from 'net';
+import chokidar from 'chokidar';
 import * as url from 'url';
 import { networkInterfaces, release } from 'os';
 
@@ -337,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);
@@ -782,7 +787,7 @@ async function load_config({ cwd = process.cwd() } = {}) {
 		);
 	}
 
-	const config = await import(url.pathToFileURL(config_file).href);
+	const config = await import(`${url.pathToFileURL(config_file).href}?ts=${Date.now()}`);
 
 	const validated = validate_config(config.default);
 
@@ -870,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.335');
+const prog = sade('svelte-kit').version('1.0.0-next.338');
 
 prog
 	.command('dev')
@@ -881,17 +886,20 @@ prog
 	.option('--https', 'Use self-signed HTTPS certificate')
 	.option('-H', 'no longer supported, use --https instead') // TODO remove for 1.0
 	.action(async ({ port, host, https, open, H }) => {
-		try {
-			if (H) throw new Error('-H is no longer supported — use --https instead');
+		let first = true;
+		let relaunching = false;
+		let uid = 1;
 
-			process.env.NODE_ENV = process.env.NODE_ENV || 'development';
-			const config = await load_config();
+		/** @type {() => Promise<void>} */
+		let close;
 
+		/** @param {import('types').ValidatedConfig} config */
+		async function start(config) {
 			const { dev } = await import('./chunks/index.js');
 
 			const cwd = process.cwd();
 
-			const { address_info, server_config } = await dev({
+			const { address_info, server_config, close } = await dev({
 				cwd,
 				port,
 				host,
@@ -903,12 +911,52 @@ prog
 				port: address_info.port,
 				host: address_info.address,
 				https: !!(https || server_config.https),
-				open: open || !!server_config.open,
+				open: first && (open || !!server_config.open),
 				base: config.kit.paths.base,
 				loose: server_config.fs.strict === false,
 				allow: server_config.fs.allow,
 				cwd
 			});
+
+			first = false;
+
+			return close;
+		}
+
+		async function relaunch() {
+			const id = uid;
+			relaunching = true;
+
+			try {
+				const updated_config = await load_config();
+				await close();
+				close = await start(updated_config);
+
+				if (id !== uid) relaunch();
+			} catch (e) {
+				const error = /** @type {Error} */ (e);
+
+				console.error($.bold().red(`> ${error.message}`));
+				if (error.stack) {
+					console.error($.gray(error.stack.split('\n').slice(1).join('\n')));
+				}
+			}
+
+			relaunching = false;
+		}
+
+		try {
+			if (H) throw new Error('-H is no longer supported — use --https instead');
+
+			process.env.NODE_ENV = process.env.NODE_ENV || 'development';
+
+			const config = await load_config();
+			close = await start(config);
+
+			chokidar.watch('svelte.config.js', { ignoreInitial: true }).on('change', () => {
+				if (relaunching) uid += 1;
+				else relaunch();
+			});
 		} catch (error) {
 			handle_error(error);
 		}
@@ -1049,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.335'}\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.335",
+  "version": "1.0.0-next.338",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -10,15 +10,14 @@
   "homepage": "https://kit.svelte.dev",
   "type": "module",
   "dependencies": {
-    "@sveltejs/vite-plugin-svelte": "^1.0.0-next.32",
+    "@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",
@@ -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",
@@ -46,6 +44,7 @@
     "svelte-preprocess": "^4.9.8",
     "svelte2tsx": "~0.5.0",
     "tiny-glob": "^0.2.9",
+    "typescript": "^4.6.4",
     "uvu": "^0.5.2"
   },
   "peerDependencies": {

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

@@ -13,9 +13,7 @@ import {
 	MaybePromise,
 	Prerendered,
 	PrerenderOnErrorValue,
-	RequestEvent,
 	RequestOptions,
-	ResolveOptions,
 	ResponseHeaders,
 	RouteDefinition,
 	TrailingSlash
@@ -95,7 +93,6 @@ export interface Config {
 	extensions?: string[];
 	kit?: {
 		adapter?: Adapter;
-		amp?: boolean;
 		appDir?: string;
 		browser?: {
 			hydrate?: boolean;
@@ -235,6 +232,16 @@ export interface ParamMatcher {
 	(param: string): boolean;
 }
 
+export interface RequestEvent<Params extends Record<string, string> = Record<string, string>> {
+	clientAddress: string;
+	locals: App.Locals;
+	params: Params;
+	platform: Readonly<App.Platform>;
+	request: Request;
+	routeId: string | null;
+	url: URL;
+}
+
 /**
  * A `(event: RequestEvent) => RequestHandlerOutput` function exported from an endpoint that corresponds to an HTTP verb (`get`, `put`, `patch`, etc) and handles requests with that method. Note that since 'delete' is a reserved word in JavaScript, delete handles are called `del` instead.
  *
@@ -253,6 +260,11 @@ export interface RequestHandlerOutput<Output = ResponseBody> {
 	body?: Output extends ResponseBody ? Output : BodyValidator<Output>;
 }
 
+export interface ResolveOptions {
+	ssr?: boolean;
+	transformPage?: ({ html }: { html: string }) => MaybePromise<string>;
+}
+
 export type ResponseBody = JSONValue | Uint8Array | ReadableStream | import('stream').Readable;
 
 export class Server {

package/types/internal.d.ts

@@ -6,7 +6,9 @@ import {
 	Handle,
 	HandleError,
 	Load,
+	RequestEvent,
 	RequestHandler,
+	ResolveOptions,
 	Server,
 	SSRManifest
 } from './index';
@@ -14,9 +16,7 @@ import {
 	HttpMethod,
 	JSONObject,
 	MaybePromise,
-	RequestEvent,
 	RequestOptions,
-	ResolveOptions,
 	ResponseHeaders,
 	TrailingSlash
 } from './private';
@@ -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/types/private.d.ts

@@ -206,26 +206,11 @@ export interface PrerenderErrorHandler {
 
 export type PrerenderOnErrorValue = 'fail' | 'continue' | PrerenderErrorHandler;
 
-export interface RequestEvent<Params extends Record<string, string> = Record<string, string>> {
-	clientAddress: string;
-	locals: App.Locals;
-	params: Params;
-	platform: Readonly<App.Platform>;
-	request: Request;
-	routeId: string | null;
-	url: URL;
-}
-
 export interface RequestOptions {
 	getClientAddress: () => string;
 	platform?: App.Platform;
 }
 
-export interface ResolveOptions {
-	ssr?: boolean;
-	transformPage?: ({ html }: { html: string }) => MaybePromise<string>;
-}
-
 /** `string[]` is only for set-cookie, everything else must be type of `string` */
 export type ResponseHeaders = Record<string, string | number | string[]>;
 

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