@sveltejs/kit 1.0.0-next.388 → 1.0.0-next.390

package/assets/client/start.js

@@ -690,6 +690,10 @@ function create_client({ target, session, base, trailing_slash }) {
 			return false; // unnecessary, but TypeScript prefers it this way
 		}
 
+		// if this is an internal navigation intent, use the normalized
+		// URL for the rest of the function
+		url = intent?.url || url;
+
 		// abort if user navigated during update
 		if (token !== current_token) return false;
 
@@ -1343,9 +1347,12 @@ function create_client({ target, session, base, trailing_slash }) {
 			const params = route.exec(path);
 
 			if (params) {
-				const id = normalize_path(url.pathname, trailing_slash) + url.search;
+				const normalized = new URL(
+					url.origin + normalize_path(url.pathname, trailing_slash) + url.search + url.hash
+				);
+				const id = normalized.pathname + normalized.search;
 				/** @type {import('./types').NavigationIntent} */
-				const intent = { id, route, params: decode_params(params), url };
+				const intent = { id, route, params: decode_params(params), url: normalized };
 				return intent;
 			}
 		}
@@ -1382,9 +1389,6 @@ function create_client({ target, session, base, trailing_slash }) {
 			return;
 		}
 
-		const pathname = normalize_path(url.pathname, trailing_slash);
-		const normalized = new URL(url.origin + pathname + url.search + url.hash);
-
 		update_scroll_positions(current_history_index);
 
 		accepted();
@@ -1392,12 +1396,12 @@ function create_client({ target, session, base, trailing_slash }) {
 		if (started) {
 			stores.navigating.set({
 				from: current.url,
-				to: normalized
+				to: url
 			});
 		}
 
 		await update(
-			normalized,
+			url,
 			redirect_chain,
 			false,
 			{
@@ -1406,7 +1410,7 @@ function create_client({ target, session, base, trailing_slash }) {
 				details
 			},
 			() => {
-				const navigation = { from, to: normalized };
+				const navigation = { from, to: url };
 				callbacks.after_navigate.forEach((fn) => fn(navigation));
 
 				stores.navigating.set(null);

package/dist/chunks/index.js

@@ -3,7 +3,7 @@ import * as path from 'path';
 import { join, relative, dirname } from 'path';
 import { $ } from './error.js';
 import chokidar from 'chokidar';
-import { d as walk$1, m as mkdirp, p as posixify, r as rimraf, b as write_tsconfig, c as copy } from './write_tsconfig.js';
+import { w as walk$1, m as mkdirp, p as posixify, r as rimraf, d as write_tsconfig, c as copy } from './write_tsconfig.js';
 import { createRequire } from 'module';
 import 'url';
 

package/dist/chunks/sync.js

@@ -2,7 +2,7 @@ import path__default from 'path';
 import fs__default from 'fs';
 import { $ } from './error.js';
 import { fileURLToPath } from 'url';
-import { p as posixify, c as copy, w as write_if_changed, t as trim, r as rimraf, a as write, b as write_tsconfig } from './write_tsconfig.js';
+import { p as posixify, c as copy, a as write_if_changed, t as trim, r as rimraf, b as write, d as write_tsconfig } from './write_tsconfig.js';
 
 /**
  * @param typeMap [Object] Map of MIME type -> Array[extensions]

package/dist/chunks/write_tsconfig.js

@@ -271,4 +271,4 @@ function validate(config, cwd, out, user_file) {
 	}
 }
 
-export { write as a, write_tsconfig as b, copy as c, walk as d, mkdirp as m, posixify as p, rimraf as r, trim as t, write_if_changed as w };
+export { write_if_changed as a, write as b, copy as c, write_tsconfig as d, mkdirp as m, posixify as p, rimraf as r, trim as t, walk as w };

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.388');
+const prog = sade('svelte-kit').version('1.0.0-next.390');
 
 prog
 	.command('package')

package/dist/vite.js

@@ -5,7 +5,7 @@ import { a as load_template, $, c as coalesce_to_error, l as load_config } from
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 import * as vite from 'vite';
 import { loadConfigFromFile } from 'vite';
-import { p as posixify, m as mkdirp, r as rimraf } from './chunks/write_tsconfig.js';
+import { p as posixify, m as mkdirp, w as walk, r as rimraf } from './chunks/write_tsconfig.js';
 import { g as get_runtime_directory, s, i as init, a as get_runtime_prefix, u as update, b as get_mime_lookup, p as parse_route_id, c as all, l as logger } from './chunks/sync.js';
 import { URL as URL$1, pathToFileURL } from 'url';
 import { installPolyfills } from './node/polyfills.js';
@@ -1134,12 +1134,12 @@ const REDIRECT = 3;
 /**
  * @param {{
  *   config: import('types').ValidatedKitConfig;
- *   entries: string[];
- *   files: Set<string>;
+ *   client_out_dir: string;
+ *   manifest_path: string;
  *   log: Logger;
  * }} opts
  */
-async function prerender({ config, entries, files, log }) {
+async function prerender({ config, client_out_dir, manifest_path, log }) {
 	/** @type {import('types').Prerendered} */
 	const prerendered = {
 		pages: new Map(),
@@ -1240,6 +1240,7 @@ async function prerender({ config, entries, files, log }) {
 		return file;
 	}
 
+	const files = new Set(walk(client_out_dir).map(posixify));
 	const seen = new Set();
 	const written = new Set();
 
@@ -1397,6 +1398,12 @@ async function prerender({ config, entries, files, log }) {
 	if (config.prerender.enabled) {
 		for (const entry of config.prerender.entries) {
 			if (entry === '*') {
+				/** @type {import('types').ManifestData} */
+				const { routes } = (await import(pathToFileURL(manifest_path).href)).manifest._;
+				const entries = routes
+					.map((route) => (route.type === 'page' ? route.path : ''))
+					.filter(Boolean);
+
 				for (const entry of entries) {
 					enqueue(null, config.paths.base + entry); // TODO can we pre-normalize these?
 				}
@@ -2910,6 +2917,9 @@ function kit() {
 	/** @type {import('types').BuildData} */
 	let build_data;
 
+	/** @type {string | undefined} */
+	let deferred_warning;
+
 	/**
 	 * @type {{
 	 *   build_dir: string;
@@ -2998,7 +3008,8 @@ function kit() {
 
 				const new_config = vite_client_build_config();
 
-				warn_overridden_config(config, new_config);
+				const warning = warn_overridden_config(config, new_config);
+				if (warning) console.error(warning + '\n');
 
 				return new_config;
 			}
@@ -3045,7 +3056,8 @@ function kit() {
 					}
 				}
 			};
-			warn_overridden_config(config, result);
+
+			deferred_warning = warn_overridden_config(config, result);
 			return result;
 		},
 
@@ -3112,8 +3124,9 @@ function kit() {
 				server
 			};
 
+			const manifest_path = `${paths.output_dir}/server/manifest.js`;
 			fs__default.writeFileSync(
-				`${paths.output_dir}/server/manifest.js`,
+				manifest_path,
 				`export const manifest = ${generate_manifest({
 					build_data,
 					relative_path: '.',
@@ -3124,27 +3137,10 @@ function kit() {
 			process.env.SVELTEKIT_SERVER_BUILD_COMPLETED = 'true';
 			log.info('Prerendering');
 
-			const static_files = manifest_data.assets.map((asset) => posixify(asset.file));
-
-			const files = new Set([
-				...static_files,
-				...chunks.map((chunk) => chunk.fileName),
-				...assets.map((chunk) => chunk.fileName)
-			]);
-
-			// TODO is this right?
-			static_files.forEach((file) => {
-				if (file.endsWith('/index.html')) {
-					files.add(file.slice(0, -11));
-				}
-			});
-
 			prerendered = await prerender({
 				config: svelte_config.kit,
-				entries: manifest_data.routes
-					.map((route) => (route.type === 'page' ? route.path : ''))
-					.filter(Boolean),
-				files,
+				client_out_dir: vite_config.build.outDir,
+				manifest_path,
 				log
 			});
 
@@ -3199,6 +3195,14 @@ function kit() {
 		 * @see https://vitejs.dev/guide/api-plugin.html#configureserver
 		 */
 		async configureServer(vite) {
+			// This method is called by Vite after clearing the screen.
+			// This patch ensures we can log any important messages afterwards for the user to see.
+			const print_urls = vite.printUrls;
+			vite.printUrls = function () {
+				print_urls.apply(this);
+				if (deferred_warning) console.error('\n' + deferred_warning);
+			};
+
 			return await dev(vite, vite_config, svelte_config);
 		},
 
@@ -3248,11 +3252,12 @@ function collect_output(bundle) {
  */
 function warn_overridden_config(config, resolved_config) {
 	const overridden = find_overridden_config(config, resolved_config, enforced_config, '', []);
+
 	if (overridden.length > 0) {
-		console.log(
-			$.bold().red('The following Vite config options will be overridden by SvelteKit:')
+		return (
+			$.bold().red('The following Vite config options will be overridden by SvelteKit:') +
+			overridden.map((key) => `\n  - ${key}`).join('')
 		);
-		console.log(overridden.map((key) => `  - ${key}`).join('\n'));
 	}
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.388",
+  "version": "1.0.0-next.390",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",