@sveltejs/kit 1.0.0-next.378 → 1.0.0-next.380

package/assets/client/start.js

@@ -126,6 +126,8 @@ class LoadURL extends URL {
 	}
 }
 
+/* global __SVELTEKIT_APP_VERSION__, __SVELTEKIT_APP_VERSION_FILE__, __SVELTEKIT_APP_VERSION_POLL_INTERVAL__ */
+
 /** @param {HTMLDocument} doc */
 function get_base_uri(doc) {
 	let baseURI = doc.baseURI;
@@ -193,10 +195,7 @@ function notifiable_store(value) {
 function create_updated_store() {
 	const { set, subscribe } = writable(false);
 
-	const interval = +(
-		/** @type {string} */ (import.meta.env.VITE_SVELTEKIT_APP_VERSION_POLL_INTERVAL)
-	);
-	const initial = import.meta.env.VITE_SVELTEKIT_APP_VERSION;
+	const interval = __SVELTEKIT_APP_VERSION_POLL_INTERVAL__;
 
 	/** @type {NodeJS.Timeout} */
 	let timeout;
@@ -208,9 +207,7 @@ function create_updated_store() {
 
 		if (interval) timeout = setTimeout(check, interval);
 
-		const file = import.meta.env.VITE_SVELTEKIT_APP_VERSION_FILE;
-
-		const res = await fetch(`${assets}/${file}`, {
+		const res = await fetch(`${assets}/${__SVELTEKIT_APP_VERSION_FILE__}`, {
 			headers: {
 				pragma: 'no-cache',
 				'cache-control': 'no-cache'
@@ -219,7 +216,7 @@ function create_updated_store() {
 
 		if (res.ok) {
 			const { version } = await res.json();
-			const updated = version !== initial;
+			const updated = version !== __SVELTEKIT_APP_VERSION__;
 
 			if (updated) {
 				set(true);
@@ -1652,6 +1649,16 @@ function create_client({ target, session, base, trailing_slash }) {
 					);
 				}
 			});
+
+			addEventListener('pageshow', (event) => {
+				// If the user navigates to another site and then uses the back button and
+				// bfcache hits, we need to set navigating to null, the site doesn't know
+				// the navigation away from it was successful.
+				// Info about bfcache here: https://web.dev/bfcache
+				if (event.persisted) {
+					stores.navigating.set(null);
+				}
+			});
 		},
 
 		_hydrate: async ({ status, error, nodes, params, routeId }) => {

package/assets/server/index.js

@@ -165,8 +165,6 @@ function clone_error(error, get_stack) {
 	const {
 		name,
 		message,
-		// this should constitute 'using' a var, since it affects `custom`
-		// eslint-disable-next-line
 		stack,
 		// @ts-expect-error i guess typescript doesn't know about error.cause yet
 		cause,
@@ -3214,6 +3212,8 @@ function exec(match, names, types, matchers) {
 	return params;
 }
 
+/* global __SVELTEKIT_ADAPTER_NAME__ */
+
 const DATA_SUFFIX = '/__data.json';
 
 /** @param {{ html: string }} opts */
@@ -3321,9 +3321,7 @@ async function respond(request, options, state) {
 		get clientAddress() {
 			if (!state.getClientAddress) {
 				throw new Error(
-					`${
-						import.meta.env.VITE_SVELTEKIT_ADAPTER_NAME
-					} does not specify getClientAddress. Please raise an issue`
+					`${__SVELTEKIT_ADAPTER_NAME__} does not specify getClientAddress. Please raise an issue`
 				);
 			}
 

package/dist/chunks/index2.js

@@ -158,7 +158,10 @@ function create_builder({ config, build_data, prerendered, log }) {
 		},
 
 		writeClient(dest) {
-			return copy(`${config.kit.outDir}/output/client`, dest);
+			return [
+				...copy(`${config.kit.outDir}/output/client`, dest),
+				...copy(config.kit.files.assets, dest)
+			];
 		},
 
 		writePrerendered(dest, { fallback } = {}) {
@@ -177,11 +180,16 @@ function create_builder({ config, build_data, prerendered, log }) {
 			return copy(`${config.kit.outDir}/output/server`, dest);
 		},
 
-		writeStatic(dest) {
-			return copy(config.kit.files.assets, dest);
+		// TODO remove these methods for 1.0
+		// @ts-expect-error
+		writeStatic() {
+			throw new Error(
+				`writeStatic has been removed. Please ensure you are using the latest version of ${
+					config.kit.adapter.name || 'your adapter'
+				}`
+			);
 		},
 
-		// @ts-expect-error
 		async prerender() {
 			throw new Error(
 				'builder.prerender() has been removed. Prerendering now takes place in the build phase — see builder.prerender and builder.writePrerendered'

package/dist/chunks/sync.js

@@ -564,7 +564,6 @@ function trace(file, path, tree, extensions) {
 
 	// walk up the tree, find which __layout and __error components
 	// apply to this page
-	// eslint-disable-next-line
 	while (true) {
 		const node = tree.get(parts.join('/'));
 		const layout = node?.layouts[layout_id];
@@ -726,7 +725,7 @@ function copy_assets(dest) {
 		}
 
 		prefix = `../${prefix}`;
-	} while (true); // eslint-disable-line
+	} while (true);
 }
 
 const s = JSON.stringify;

package/dist/cli.js

@@ -18,7 +18,7 @@ function handle_error(e) {
 	process.exit(1);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.378');
+const prog = sade('svelte-kit').version('1.0.0-next.380');
 
 prog
 	.command('package')

package/dist/vite.js

@@ -203,6 +203,9 @@ async function create_build(config) {
  * @param {boolean} add_dynamic_css
  */
 function find_deps$1(manifest, entry, add_dynamic_css) {
+	/** @type {Set<string>} */
+	const seen = new Set();
+
 	/** @type {Set<string>} */
 	const imports = new Set();
 
@@ -214,9 +217,11 @@ function find_deps$1(manifest, entry, add_dynamic_css) {
 	 * @param {boolean} add_js
 	 */
 	function traverse(file, add_js) {
+		if (seen.has(file)) return;
+		seen.add(file);
+
 		const chunk = manifest[file];
 
-		if (imports.has(chunk.file)) return;
 		if (add_js) imports.add(chunk.file);
 
 		if (chunk.css) {
@@ -273,6 +278,12 @@ const get_default_config = function ({ config, input, ssr, outDir }) {
 			ssr,
 			target: ssr ? 'node14.8' : undefined
 		},
+		define: {
+			__SVELTEKIT_ADAPTER_NAME__: JSON.stringify(config.kit.adapter?.name),
+			__SVELTEKIT_APP_VERSION__: JSON.stringify(config.kit.version.name),
+			__SVELTEKIT_APP_VERSION_FILE__: JSON.stringify(`${config.kit.appDir}/version.json`),
+			__SVELTEKIT_APP_VERSION_POLL_INTERVAL__: JSON.stringify(config.kit.version.pollInterval)
+		},
 		// prevent Vite copying the contents of `config.kit.files.assets`,
 		// if it happens to be 'public' instead of 'static'
 		publicDir: false,
@@ -510,8 +521,6 @@ async function build_server(options, client) {
 
 	remove_svelte_kit(merged_config);
 
-	process.env.VITE_SVELTEKIT_ADAPTER_NAME = config.kit.adapter?.name;
-
 	const { chunks } = await create_build(merged_config);
 
 	/** @type {import('vite').Manifest} */
@@ -1229,9 +1238,9 @@ async function prerender({ config, entries, files, log }) {
 			}
 		});
 
-		const text = await response.text();
+		const body = Buffer.from(await response.arrayBuffer());
 
-		save('pages', response, text, decoded, encoded, referrer, 'linked');
+		save('pages', response, body, decoded, encoded, referrer, 'linked');
 
 		for (const [dependency_path, result] of dependencies) {
 			// this seems circuitous, but using new URL allows us to not care
@@ -1252,7 +1261,7 @@ async function prerender({ config, entries, files, log }) {
 		}
 
 		if (config.prerender.crawl && response.headers.get('content-type') === 'text/html') {
-			for (const href of crawl(text)) {
+			for (const href of crawl(body.toString())) {
 				if (href.startsWith('data:') || href.startsWith('#')) continue;
 
 				const resolved = resolve(encoded, href);
@@ -2053,8 +2062,6 @@ async function dev(vite, vite_config, svelte_config) {
 
 	const runtime = get_runtime_prefix(svelte_config.kit);
 
-	process.env.VITE_SVELTEKIT_APP_VERSION_POLL_INTERVAL = '0';
-
 	/** @type {import('types').Respond} */
 	const respond = (await import(`${runtime}/server/index.js`)).respond;
 
@@ -2875,7 +2882,7 @@ function kit() {
 
 	let completed_build = false;
 
-	function vite_client_config() {
+	function vite_client_build_config() {
 		/** @type {Record<string, string>} */
 		const input = {
 			// Put unchanging assets in immutable directory. We don't set that in the
@@ -2948,13 +2955,9 @@ function kit() {
 			};
 
 			if (is_build) {
-				process.env.VITE_SVELTEKIT_APP_VERSION = svelte_config.kit.version.name;
-				process.env.VITE_SVELTEKIT_APP_VERSION_FILE = `${svelte_config.kit.appDir}/version.json`;
-				process.env.VITE_SVELTEKIT_APP_VERSION_POLL_INTERVAL = `${svelte_config.kit.version.pollInterval}`;
-
 				manifest_data = all(svelte_config).manifest_data;
 
-				const new_config = vite_client_config();
+				const new_config = vite_client_build_config();
 
 				warn_overridden_config(config, new_config);
 
@@ -2973,6 +2976,9 @@ function kit() {
 						input: `${get_runtime_directory(svelte_config.kit)}/client/start.js`
 					}
 				},
+				define: {
+					__SVELTEKIT_APP_VERSION_POLL_INTERVAL__: '0'
+				},
 				resolve: {
 					alias: get_aliases(svelte_config.kit)
 				},
@@ -3037,7 +3043,7 @@ function kit() {
 
 			fs__default.writeFileSync(
 				`${paths.client_out_dir}/version.json`,
-				JSON.stringify({ version: process.env.VITE_SVELTEKIT_APP_VERSION })
+				JSON.stringify({ version: svelte_config.kit.version.name })
 			);
 
 			const { assets, chunks } = collect_output(bundle);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.378",
+  "version": "1.0.0-next.380",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -27,7 +27,6 @@
     "cookie": "^0.5.0",
     "cross-env": "^7.0.3",
     "devalue": "^2.0.1",
-    "eslint": "^8.16.0",
     "kleur": "^4.1.4",
     "locate-character": "^2.0.5",
     "marked": "^4.0.16",
@@ -85,11 +84,10 @@
   "scripts": {
     "build": "rollup -c && node scripts/cp.js src/runtime/components assets/components && npm run types",
     "dev": "rollup -cw",
-    "lint": "eslint --ignore-path .gitignore --ignore-pattern \"src/packaging/test/**\" \"{src,test}/**/*.{ts,mjs,js,svelte}\" && npm run check-format",
+    "lint": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
     "check": "tsc",
     "check:all": "tsc && pnpm -r --filter=\"./**\" check",
     "format": "npm run check-format -- --write",
-    "check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
     "test": "npm run test:unit && npm run test:typings && npm run test:packaging && npm run test:integration",
     "test:integration": "pnpm run -r --workspace-concurrency 1 --filter=\"./test/**\" test",
     "test:unit": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\" -i packaging",

package/types/index.d.ts

@@ -65,11 +65,6 @@ export interface Builder {
 	 * @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

package/types/internal.d.ts

@@ -317,3 +317,10 @@ export type ValidatedKitConfig = RecursiveRequired<KitConfig>;
 
 export * from './index';
 export * from './private';
+
+declare global {
+	const __SVELTEKIT_ADAPTER_NAME__: string;
+	const __SVELTEKIT_APP_VERSION__: string;
+	const __SVELTEKIT_APP_VERSION_FILE__: string;
+	const __SVELTEKIT_APP_VERSION_POLL_INTERVAL__: number;
+}