@sveltejs/kit 1.0.0-next.364 → 1.0.0-next.368

package/assets/client/start.js

@@ -725,10 +725,13 @@ function create_client({ target, session, base, trailing_slash }) {
 				const root = document.body;
 				const tabindex = root.getAttribute('tabindex');
 
-				getSelection()?.removeAllRanges();
 				root.tabIndex = -1;
 				root.focus({ preventScroll: true });
 
+				setTimeout(() => {
+					getSelection()?.removeAllRanges();
+				});
+
 				// restore `tabindex` as to prevent `root` from stealing input from elements
 				if (tabindex !== null) {
 					root.setAttribute('tabindex', tabindex);

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

package/dist/vite.js

@@ -263,9 +263,9 @@ const get_default_config = function ({ config, input, ssr, outDir }) {
 				input,
 				output: {
 					format: 'esm',
-					entryFileNames: ssr ? '[name].js' : '[name]-[hash].js',
-					chunkFileNames: 'chunks/[name]-[hash].js',
-					assetFileNames: 'assets/[name]-[hash][extname]'
+					entryFileNames: ssr ? '[name].js' : 'immutable/[name]-[hash].js',
+					chunkFileNames: 'immutable/chunks/[name]-[hash].js',
+					assetFileNames: 'immutable/assets/[name]-[hash][extname]'
 				},
 				preserveEntrySignatures: 'strict'
 			},
@@ -298,7 +298,7 @@ function assets_base(config) {
 	// during `svelte-kit preview`, because we use a local asset path. This
 	// may be fixed in Vite 3: https://github.com/vitejs/vite/issues/2009
 	const { base, assets } = config.paths;
-	return `${assets || base}/${config.appDir}/immutable/`;
+	return `${assets || base}/${config.appDir}/`;
 }
 
 /**
@@ -372,7 +372,7 @@ export class Server {
 			manifest,
 			method_override: ${s(config.kit.methodOverride)},
 			paths: { base, assets },
-			prefix: assets + '/${config.kit.appDir}/immutable/',
+			prefix: assets + '/${config.kit.appDir}/',
 			prerender: {
 				default: ${config.kit.prerender.default},
 				enabled: ${config.kit.prerender.enabled}
@@ -447,7 +447,7 @@ async function build_server(options, client) {
 
 		if (file) {
 			const resolved = path__default.resolve(cwd, file);
-			const relative = path__default.relative(config.kit.files.routes, resolved);
+			const relative = decodeURIComponent(path__default.relative(config.kit.files.routes, resolved));
 			const name = posixify(path__default.join('entries/endpoints', relative.replace(/\.js$/, '')));
 			input[name] = resolved;
 		}
@@ -456,7 +456,7 @@ async function build_server(options, client) {
 	// ...and every component used by pages...
 	manifest_data.components.forEach((file) => {
 		const resolved = path__default.resolve(cwd, file);
-		const relative = path__default.relative(config.kit.files.routes, resolved);
+		const relative = decodeURIComponent(path__default.relative(config.kit.files.routes, resolved));
 
 		const name = relative.startsWith('..')
 			? posixify(path__default.join('entries/fallbacks', path__default.basename(file)))
@@ -692,7 +692,7 @@ async function build_service_worker(
 
 			export const build = [
 				${Array.from(build)
-					.map((file) => `${s(`${config.kit.paths.base}/${config.kit.appDir}/immutable/${file}`)}`)
+					.map((file) => `${s(`${config.kit.paths.base}/${config.kit.appDir}/${file}`)}`)
 					.join(',\n\t\t\t\t')}
 			];
 
@@ -2038,10 +2038,11 @@ const cwd$1 = process.cwd();
 
 /**
  * @param {import('vite').ViteDevServer} vite
+ * @param {import('vite').ResolvedConfig} vite_config
  * @param {import('types').ValidatedConfig} svelte_config
  * @return {Promise<Promise<() => void>>}
  */
-async function dev(vite, svelte_config) {
+async function dev(vite, vite_config, svelte_config) {
 	installPolyfills();
 
 	init(svelte_config);
@@ -2228,6 +2229,18 @@ async function dev(vite, svelte_config) {
 					}
 				}
 
+				const file = posixify(path__default.resolve(decoded.slice(1)));
+				const is_file = fs__default.existsSync(file) && !fs__default.statSync(file).isDirectory();
+				const allowed =
+					!vite_config.server.fs.strict ||
+					vite_config.server.fs.allow.some((dir) => file.startsWith(dir));
+
+				if (is_file && allowed) {
+					// @ts-expect-error
+					serve_static_middleware.handle(req, res);
+					return;
+				}
+
 				if (!decoded.startsWith(svelte_config.kit.paths.base)) {
 					return not_found(
 						res,
@@ -2825,7 +2838,7 @@ function kit() {
 	/** @type {import('types').ValidatedConfig} */
 	let svelte_config;
 
-	/** @type {import('vite').UserConfig} */
+	/** @type {import('vite').ResolvedConfig} */
 	let vite_config;
 
 	/** @type {import('vite').ConfigEnv} */
@@ -2837,6 +2850,15 @@ function kit() {
 	/** @type {boolean} */
 	let is_build;
 
+	/** @type {import('types').Logger} */
+	let log;
+
+	/** @type {import('types').Prerendered} */
+	let prerendered;
+
+	/** @type {import('types').BuildData} */
+	let build_data;
+
 	/**
 	 * @type {{
 	 *   build_dir: string;
@@ -2849,6 +2871,8 @@ function kit() {
 	function create_client_config() {
 		/** @type {Record<string, string>} */
 		const input = {
+			// Put unchanging assets in immutable directory. We don't set that in the
+			// outDir so that other plugins can add mutable assets to the bundle
 			start: `${get_runtime_path(svelte_config.kit)}/client/start.js`
 		};
 
@@ -2857,7 +2881,7 @@ function kit() {
 		// their location in the source code, which is helpful for debugging
 		manifest_data.components.forEach((file) => {
 			const resolved = path__default.resolve(cwd, file);
-			const relative = path__default.relative(svelte_config.kit.files.routes, resolved);
+			const relative = decodeURIComponent(path__default.relative(svelte_config.kit.files.routes, resolved));
 
 			const name = relative.startsWith('..')
 				? path__default.basename(file)
@@ -2869,7 +2893,7 @@ function kit() {
 			config: svelte_config,
 			input,
 			ssr: false,
-			outDir: `${paths.client_out_dir}/immutable`
+			outDir: `${paths.client_out_dir}`
 		});
 	}
 
@@ -2877,7 +2901,6 @@ function kit() {
 		name: 'vite-plugin-svelte-kit',
 
 		async config(config, config_env) {
-			vite_config = config;
 			vite_config_env = config_env;
 			svelte_config = await load_config();
 			is_build = config_env.command === 'build';
@@ -2941,6 +2964,10 @@ function kit() {
 			return result;
 		},
 
+		configResolved(config) {
+			vite_config = config;
+		},
+
 		buildStart() {
 			if (is_build) {
 				rimraf(paths.build_dir);
@@ -2952,8 +2979,9 @@ function kit() {
 		},
 
 		async writeBundle(_options, bundle) {
-			const verbose = vite_config.logLevel === 'info';
-			const log = logger({ verbose });
+			log = logger({
+				verbose: vite_config.logLevel === 'info'
+			});
 
 			fs__default.writeFileSync(
 				`${paths.client_out_dir}/version.json`,
@@ -2975,7 +3003,7 @@ function kit() {
 
 			/** @type {import('vite').Manifest} */
 			const vite_manifest = JSON.parse(
-				fs__default.readFileSync(`${paths.client_out_dir}/immutable/manifest.json`, 'utf-8')
+				fs__default.readFileSync(`${paths.client_out_dir}/manifest.json`, 'utf-8')
 			);
 
 			const entry_id = posixify(
@@ -3007,7 +3035,7 @@ function kit() {
 			process.env.SVELTEKIT_SERVER_BUILD_COMPLETED = 'true';
 
 			/** @type {import('types').BuildData} */
-			const build_data = {
+			build_data = {
 				app_dir: svelte_config.kit.appDir,
 				manifest_data,
 				service_worker: options.service_worker_entry_file ? 'service-worker.js' : null, // TODO make file configurable?
@@ -3028,8 +3056,8 @@ function kit() {
 
 			const files = new Set([
 				...static_files,
-				...chunks.map((chunk) => `${svelte_config.kit.appDir}/immutable/${chunk.fileName}`),
-				...assets.map((chunk) => `${svelte_config.kit.appDir}/immutable/${chunk.fileName}`)
+				...chunks.map((chunk) => `${svelte_config.kit.appDir}/${chunk.fileName}`),
+				...assets.map((chunk) => `${svelte_config.kit.appDir}/${chunk.fileName}`)
 			]);
 
 			// TODO is this right?
@@ -3041,7 +3069,7 @@ function kit() {
 
 			log.info('Prerendering');
 
-			const prerendered = await prerender({
+			prerendered = await prerender({
 				config: svelte_config.kit,
 				entries: manifest_data.routes
 					.map((route) => (route.type === 'page' ? route.path : ''))
@@ -3063,7 +3091,9 @@ function kit() {
 			console.log(
 				`\nRun ${$.bold().cyan('npm run preview')} to preview your production build locally.`
 			);
+		},
 
+		async closeBundle() {
 			if (svelte_config.kit.adapter) {
 				const { adapt } = await import('./chunks/index2.js');
 				await adapt(svelte_config, build_data, prerendered, { log });
@@ -3074,9 +3104,7 @@ function kit() {
 					`See ${$.bold().cyan('https://kit.svelte.dev/docs/adapters')} to learn how to configure your app to run on the platform of your choosing`
 				);
 			}
-		},
 
-		closeBundle() {
 			if (is_build && svelte_config.kit.prerender.enabled) {
 				// this is necessary to close any open db connections, etc.
 				// TODO: prerender in a subprocess so we can exit in isolation
@@ -3086,12 +3114,11 @@ function kit() {
 		},
 
 		async configureServer(vite) {
-			return await dev(vite, svelte_config);
+			return await dev(vite, vite_config, svelte_config);
 		},
 
 		configurePreviewServer(vite) {
-			const protocol = vite_config.preview?.https ? 'https' : 'http';
-			return preview(vite, svelte_config, protocol);
+			return preview(vite, svelte_config, vite_config.preview.https ? 'https' : 'http');
 		}
 	};
 }

package/package.json

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