@sveltejs/kit 1.0.0-next.391 → 1.0.0-next.392

package/dist/chunks/index2.js

@@ -157,7 +157,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 } = {}) {

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

package/dist/vite.js

@@ -1,5 +1,5 @@
 import * as fs from 'fs';
-import fs__default, { readFileSync, writeFileSync, readdirSync, statSync } from 'fs';
+import fs__default, { readFileSync, existsSync, writeFileSync, readdirSync, statSync } from 'fs';
 import path__default, { join, dirname, resolve as resolve$1, normalize } from 'path';
 import { a as load_template, $, c as coalesce_to_error, l as load_config } from './chunks/error.js';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
@@ -284,7 +284,9 @@ const get_default_config = function ({ config, input, ssr, outDir }) {
 			__SVELTEKIT_APP_VERSION_POLL_INTERVAL__: JSON.stringify(config.kit.version.pollInterval),
 			__SVELTEKIT_DEV__: 'false'
 		},
-		publicDir: ssr ? false : config.kit.files.assets,
+		// prevent Vite copying the contents of `config.kit.files.assets`,
+		// if it happens to be 'public' instead of 'static'
+		publicDir: false,
 		resolve: {
 			alias: get_aliases(config.kit)
 		},
@@ -1240,7 +1242,10 @@ async function prerender({ config, client_out_dir, manifest_path, log }) {
 		return file;
 	}
 
-	const files = new Set(walk(client_out_dir).map(posixify));
+	const files = new Set([
+		...walk(client_out_dir).map(posixify),
+		...(existsSync(config.files.assets) ? walk(config.files.assets).map(posixify) : []) // TODO remove this if we use Vite publicDir option
+	]);
 	const seen = new Set();
 	const written = new Set();
 
@@ -2263,7 +2268,7 @@ async function dev(vite, vite_config, svelte_config) {
 				/** @type {function} */ (middleware.handle).name === 'viteServeStaticMiddleware'
 		);
 
-		remove_static_middlewares(vite.middlewares);
+		remove_html_middlewares(vite.middlewares);
 
 		vite.middlewares.use(async (req, res) => {
 			try {
@@ -2466,15 +2471,11 @@ function not_found(res, message = 'Not found') {
 /**
  * @param {import('connect').Server} server
  */
-function remove_static_middlewares(server) {
-	// We don't use viteServePublicMiddleware because of the following issues:
-	// https://github.com/vitejs/vite/issues/9260
-	// https://github.com/vitejs/vite/issues/9236
-	// https://github.com/vitejs/vite/issues/9234
-	const static_middlewares = ['viteServePublicMiddleware', 'viteServeStaticMiddleware'];
+function remove_html_middlewares(server) {
+	const html_middlewares = ['viteServeStaticMiddleware'];
 	for (let i = server.stack.length - 1; i > 0; i--) {
-		// @ts-expect-error using internals
-		if (static_middlewares.includes(server.stack[i].handle.name)) {
+		// @ts-expect-error using internals until https://github.com/vitejs/vite/pull/4640 is merged
+		if (html_middlewares.includes(server.stack[i].handle.name)) {
 			server.stack.splice(i, 1);
 		}
 	}
@@ -2698,13 +2699,16 @@ async function preview(vite, config, protocol) {
 	const server = new Server(manifest);
 
 	return () => {
-		// generated client assets and the contents of `static`
+		// files in `static`
+		vite.middlewares.use(scoped(assets, mutable(config.kit.files.assets)));
+
+		// immutable generated client assets
 		vite.middlewares.use(
 			scoped(
 				assets,
 				sirv(join(config.kit.outDir, 'output/client'), {
 					setHeaders: (res, pathname) => {
-						// only apply to immutable directory, not e.g. version.json
+						// only apply to build directory, not e.g. version.json
 						if (pathname.startsWith(`/${config.kit.appDir}/immutable`)) {
 							res.setHeader('cache-control', 'public,max-age=31536000,immutable');
 						}
@@ -3030,7 +3034,6 @@ function kit() {
 					__SVELTEKIT_DEV__: 'true',
 					__SVELTEKIT_APP_VERSION_POLL_INTERVAL__: '0'
 				},
-				publicDir: svelte_config.kit.files.assets,
 				resolve: {
 					alias: get_aliases(svelte_config.kit)
 				},

package/package.json

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