@sveltejs/kit 1.0.0-next.293 → 1.0.0-next.296

package/assets/client/start.js

@@ -864,11 +864,6 @@ function create_client({ target, session, base, trailing_slash }) {
 							}
 						);
 
-						if (res.status === 204) {
-							// fallthrough
-							return;
-						}
-
 						if (res.ok) {
 							const redirect = res.headers.get('x-sveltekit-location');
 
@@ -880,6 +875,10 @@ function create_client({ target, session, base, trailing_slash }) {
 								};
 							}
 
+							if (res.status === 204) {
+								// fallthrough
+								return;
+							}
 							props = await res.json();
 						} else {
 							status = res.status;

package/assets/server/index.js

@@ -1685,7 +1685,7 @@ async function load_node({
 
 					if (options.read) {
 						const type = is_asset
-							? options.manifest._.mime[filename.slice(filename.lastIndexOf('.'))]
+							? options.manifest.mimeTypes[filename.slice(filename.lastIndexOf('.'))]
 							: 'text/html';
 
 						response = new Response(options.read(file), {

package/dist/chunks/index.js

@@ -61,8 +61,8 @@ async function create_plugin(config, cwd) {
 				manifest = {
 					appDir: config.kit.appDir,
 					assets: new Set(manifest_data.assets.map((asset) => asset.file)),
+					mimeTypes: get_mime_lookup(manifest_data),
 					_: {
-						mime: get_mime_lookup(manifest_data),
 						entry: {
 							file: `/@fs${runtime}/client/start.js`,
 							css: [],

package/dist/chunks/index2.js

@@ -56,7 +56,12 @@ async function build_service_worker(
 	fs__default.writeFileSync(
 		service_worker,
 		`
-			export const timestamp = ${Date.now()};
+			// TODO remove for 1.0
+			export const timestamp = {
+				toString: () => {
+					throw new Error('\`timestamp\` has been removed from $service-worker. Use \`version\` instead');
+				}
+			};
 
 			export const build = [
 				${Array.from(app_files)
@@ -75,6 +80,8 @@ async function build_service_worker(
 					.map((path) => s(normalize_path(path, config.kit.trailingSlash)))
 					.join(',\n\t\t\t\t')}
 			];
+
+			export const version = ${s(config.kit.version.name)};
 		`
 			.replace(/^\t{3}/gm, '')
 			.trim()
@@ -299,15 +306,6 @@ let read = null;
 
 set_paths(${s(config.kit.paths)});
 
-// this looks redundant, but the indirection allows us to access
-// named imports without triggering Rollup's missing import detection
-const get_hooks = hooks => ({
-	getSession: hooks.getSession || (() => ({})),
-	handle: hooks.handle || (({ event, resolve }) => resolve(event)),
-	handleError: hooks.handleError || (({ error }) => console.error(error.stack)),
-	externalFetch: hooks.externalFetch || fetch
-});
-
 let default_protocol = 'https';
 
 // allow paths to be globally overridden
@@ -321,8 +319,6 @@ export function override(settings) {
 
 export class Server {
 	constructor(manifest) {
-		const hooks = get_hooks(user_hooks);
-
 		this.options = {
 			amp: ${config.kit.amp},
 			csp: ${s(config.kit.csp)},
@@ -330,7 +326,7 @@ export class Server {
 			floc: ${config.kit.floc},
 			get_stack: error => String(error), // for security
 			handle_error: (error, event) => {
-				hooks.handleError({
+				this.options.hooks.handleError({
 					error,
 					event,
 
@@ -342,7 +338,7 @@ export class Server {
 				});
 				error.stack = this.options.get_stack(error);
 			},
-			hooks,
+			hooks: null,
 			hydrate: ${s(config.kit.browser.hydrate)},
 			manifest,
 			method_override: ${s(config.kit.methodOverride)},
@@ -359,9 +355,19 @@ export class Server {
 		};
 	}
 
-	respond(request, options = {}) {
+	async respond(request, options = {}) {
 		if (!(request instanceof Request)) {
-			throw new Error('The first argument to app.render must be a Request object. See https://github.com/sveltejs/kit/pull/3384 for details');
+			throw new Error('The first argument to server.respond must be a Request object. See https://github.com/sveltejs/kit/pull/3384 for details');
+		}
+
+		if (!this.options.hooks) {
+			const module = await import(${s(hooks)});
+			this.options.hooks = {
+				getSession: module.getSession || (() => ({})),
+				handle: module.handle || (({ event, resolve }) => resolve(event)),
+				handleError: module.handleError || (({ error }) => console.error(error.stack)),
+				externalFetch: module.externalFetch || fetch
+			};
 		}
 
 		return respond(request, this.options, options);
@@ -424,7 +430,7 @@ async function build_server(
 		const relative = path__default.relative(config.kit.files.routes, resolved);
 
 		const name = relative.startsWith('..')
-			? posixify(path__default.join('entries/pages', path__default.basename(file)))
+			? posixify(path__default.join('entries/fallbacks', path__default.basename(file)))
 			: posixify(path__default.join('entries/pages', relative));
 		input[name] = resolved;
 	});

package/dist/chunks/index3.js

@@ -58,8 +58,8 @@ function generate_manifest({ build_data, relative_path, routes, format = 'esm' }
 	return `{
 		appDir: ${s(build_data.app_dir)},
 		assets: new Set(${s(assets)}),
+		mimeTypes: ${s(get_mime_lookup(build_data.manifest_data))},
 		_: {
-			mime: ${s(get_mime_lookup(build_data.manifest_data))},
 			entry: ${s(build_data.client.entry)},
 			nodes: [
 				${Array.from(bundled_nodes.values()).map(node => importer(node.path)).join(',\n\t\t\t\t')}

package/dist/cli.js

@@ -870,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.293');
+const prog = sade('svelte-kit').version('1.0.0-next.296');
 
 prog
 	.command('dev')
@@ -1043,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.293'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.296'}\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.293",
+  "version": "1.0.0-next.296",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",

package/types/ambient.d.ts

@@ -207,14 +207,9 @@ declare module '$app/stores' {
 	export const updated: Readable<boolean> & { check: () => boolean };
 }
 
-/**
- * This is a simple alias to `src/lib`, or whatever directory is specified as [`config.kit.files.lib`](/docs/configuration#files). It allows you to access common components and utility modules without `../../../../` nonsense.
- */
-declare module '$lib' {}
-
 /**
  * ```ts
- * import { build, files, timestamp } from '$service-worker';
+ * import { build, files, prerendered, version } from '$service-worker';
  * ```
  *
  * This module is only available to [service workers](/docs/service-workers).
@@ -233,9 +228,9 @@ declare module '$service-worker' {
 	 */
 	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.
+	 * See [`config.kit.version`](/docs/configuration#version). It's useful for generating unique cache names inside your service worker, so that a later deployment of your app can invalidate old caches.
 	 */
-	export const timestamp: number;
+	export const version: string;
 }
 
 declare module '@sveltejs/kit/hooks' {

package/types/index.d.ts

@@ -28,7 +28,7 @@ import { SSRNodeLoader, SSRRoute, ValidatedConfig } from './internal';
 
 export interface Adapter {
 	name: string;
-	adapt(builder: Builder): Promise<void>;
+	adapt(builder: Builder): MaybePromise<void>;
 }
 
 export interface Builder {
@@ -241,9 +241,10 @@ export class Server {
 export interface SSRManifest {
 	appDir: string;
 	assets: Set<string>;
+	mimeTypes: Record<string, string>;
+
 	/** private fields */
 	_: {
-		mime: Record<string, string>;
 		entry: {
 			file: string;
 			js: string[];