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

package/assets/client/start.js

@@ -1,6 +1,6 @@
 import { onMount, tick } from 'svelte';
 import { writable } from 'svelte/store';
-import { base, set_paths } from '../paths.js';
+import { assets, set_paths } from '../paths.js';
 import Root from '__GENERATED__/root.svelte';
 import { routes, fallback } from '__GENERATED__/manifest.js';
 import { init } from './singletons.js';
@@ -198,7 +198,7 @@ function create_updated_store() {
 
 		const file = import.meta.env.VITE_SVELTEKIT_APP_VERSION_FILE;
 
-		const res = await fetch(`${base}/${file}`, {
+		const res = await fetch(`${assets}/${file}`, {
 			headers: {
 				pragma: 'no-cache',
 				'cache-control': 'no-cache'
@@ -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/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()
@@ -361,7 +368,7 @@ export class Server {
 
 	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');
 		}
 
 		return respond(request, this.options, options);
@@ -424,7 +431,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/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.292');
+const prog = sade('svelte-kit').version('1.0.0-next.295');
 
 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.292'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.295'}\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.292",
+  "version": "1.0.0-next.295",
   "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

@@ -5,27 +5,95 @@ import './ambient';
 
 import { CompileOptions } from 'svelte/types/compiler/interfaces';
 import {
+	AdapterEntry,
 	Body,
-	Builder,
 	CspDirectives,
 	Either,
 	ErrorLoadInput,
 	Fallthrough,
 	LoadInput,
 	LoadOutput,
+	Logger,
 	MaybePromise,
+	Prerendered,
 	PrerenderOnErrorValue,
 	RequestEvent,
+	RequestOptions,
 	ResolveOptions,
 	ResponseHeaders,
+	RouteDefinition,
 	TrailingSlash
 } from './private';
+import { SSRNodeLoader, SSRRoute, ValidatedConfig } from './internal';
 
 export interface Adapter {
 	name: string;
 	adapt(builder: Builder): Promise<void>;
 }
 
+export interface Builder {
+	log: Logger;
+	rimraf(dir: string): void;
+	mkdirp(dir: string): void;
+
+	config: ValidatedConfig;
+	prerendered: Prerendered;
+
+	/**
+	 * Create entry points that map to individual functions
+	 * @param fn A function that groups a set of routes into an entry point
+	 */
+	createEntries(fn: (route: RouteDefinition) => AdapterEntry): void;
+
+	generateManifest: (opts: { relativePath: string; format?: 'esm' | 'cjs' }) => string;
+
+	getBuildDirectory(name: string): string;
+	getClientDirectory(): string;
+	getServerDirectory(): string;
+	getStaticDirectory(): 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
+	 */
+	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
+	 */
+	writeServer(dest: 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
+	 */
+	writeStatic(dest: string): string[];
+	/**
+	 * @param from the source file or folder
+	 * @param to the destination file or folder
+	 * @param opts.filter a function to determine whether a file or folder should be copied
+	 * @param opts.replace a map of strings to replace
+	 * @returns an array of paths corresponding to the files that have been created by the copy
+	 */
+	copy(
+		from: string,
+		to: string,
+		opts?: {
+			filter?: (basename: string) => boolean;
+			replace?: Record<string, string>;
+		}
+	): string[];
+}
+
 export interface Config {
 	compilerOptions?: CompileOptions;
 	extensions?: string[];
@@ -164,3 +232,24 @@ export type RequestHandlerOutput<Output extends Body = Body> = MaybePromise<
 		Fallthrough
 	>
 >;
+
+export class Server {
+	constructor(manifest: SSRManifest);
+	respond(request: Request, options?: RequestOptions): Promise<Response>;
+}
+
+export interface SSRManifest {
+	appDir: string;
+	assets: Set<string>;
+	/** private fields */
+	_: {
+		mime: Record<string, string>;
+		entry: {
+			file: string;
+			js: string[];
+			css: string[];
+		};
+		nodes: SSRNodeLoader[];
+		routes: SSRRoute[];
+	};
+}

package/types/internal.d.ts

@@ -6,7 +6,9 @@ import {
 	Handle,
 	HandleError,
 	Load,
-	RequestHandler
+	RequestHandler,
+	Server,
+	SSRManifest
 } from './index';
 import {
 	Either,
@@ -14,14 +16,11 @@ import {
 	HttpMethod,
 	JSONObject,
 	MaybePromise,
-	Prerendered,
 	RequestEvent,
 	RequestOptions,
 	ResolveOptions,
 	ResponseHeaders,
 	RouteSegment,
-	Server,
-	SSRManifest,
 	TrailingSlash
 } from './private';
 

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, ValidatedConfig } from './internal';
+import { ValidatedConfig } from './internal';
 
 export interface AdapterEntry {
 	/**
@@ -30,69 +30,6 @@ export interface AdapterEntry {
 
 export type Body = JSONValue | Uint8Array | ReadableStream | import('stream').Readable;
 
-export interface Builder {
-	log: Logger;
-	rimraf(dir: string): void;
-	mkdirp(dir: string): void;
-
-	config: ValidatedConfig;
-	prerendered: Prerendered;
-
-	/**
-	 * Create entry points that map to individual functions
-	 * @param fn A function that groups a set of routes into an entry point
-	 */
-	createEntries(fn: (route: RouteDefinition) => AdapterEntry): void;
-
-	generateManifest: (opts: { relativePath: string; format?: 'esm' | 'cjs' }) => string;
-
-	getBuildDirectory(name: string): string;
-	getClientDirectory(): string;
-	getServerDirectory(): string;
-	getStaticDirectory(): 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
-	 */
-	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
-	 */
-	writeServer(dest: 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
-	 */
-	writeStatic(dest: string): string[];
-	/**
-	 * @param from the source file or folder
-	 * @param to the destination file or folder
-	 * @param opts.filter a function to determine whether a file or folder should be copied
-	 * @param opts.replace a map of strings to replace
-	 * @returns an array of paths corresponding to the files that have been created by the copy
-	 */
-	copy(
-		from: string,
-		to: string,
-		opts?: {
-			filter?: (basename: string) => boolean;
-			replace?: Record<string, string>;
-		}
-	): string[];
-}
-
 // Based on https://github.com/josh-hemphill/csp-typed-directives/blob/latest/src/csp.types.ts
 //
 // MIT License
@@ -329,27 +266,6 @@ export interface RouteSegment {
 	rest: boolean;
 }
 
-export class Server {
-	constructor(manifest: SSRManifest);
-	respond(request: Request, options?: RequestOptions): Promise<Response>;
-}
-
-export interface SSRManifest {
-	appDir: string;
-	assets: Set<string>;
-	/** private fields */
-	_: {
-		mime: Record<string, string>;
-		entry: {
-			file: string;
-			js: string[];
-			css: string[];
-		};
-		nodes: SSRNodeLoader[];
-		routes: SSRRoute[];
-	};
-}
-
 export interface ToJSON {
 	toJSON(...args: any[]): Exclude<JSONValue, ToJSON>;
 }