@sveltejs/kit 1.0.0-next.403 → 1.0.0-next.405

package/assets/server/index.js

@@ -1360,6 +1360,9 @@ async function render_response({
 	const stylesheets = new Set(entry.stylesheets);
 	const modulepreloads = new Set(entry.imports);
 
+	/** @type {Set<string>} */
+	const link_header_preloads = new Set();
+
 	/** @type {Map<string, string>} */
 	// TODO if we add a client entry point one day, we will need to include inline_styles with the entry, otherwise stylesheets will be linked even if they are below inlineStyleThreshold
 	const inline_styles = new Map();
@@ -1519,32 +1522,35 @@ async function render_response({
 		head += `\n\t<style${attributes.join('')}>${content}</style>`;
 	}
 
-	// prettier-ignore
-	head += Array.from(stylesheets)
-		.map((dep) => {
-			const attributes = [
-				'rel="stylesheet"',
-				`href="${options.prefix + dep}"`
-			];
+	for (const dep of stylesheets) {
+		const path = options.prefix + dep;
+		const attributes = [];
 
-			if (csp.style_needs_nonce) {
-				attributes.push(`nonce="${csp.nonce}"`);
-			}
+		if (csp.style_needs_nonce) {
+			attributes.push(`nonce="${csp.nonce}"`);
+		}
 
-			if (inline_styles.has(dep)) {
-				// don't load stylesheets that are already inlined
-				// include them in disabled state so that Vite can detect them and doesn't try to add them
-				attributes.push('disabled', 'media="(max-width: 0)"');
-			}
+		if (inline_styles.has(dep)) {
+			// don't load stylesheets that are already inlined
+			// include them in disabled state so that Vite can detect them and doesn't try to add them
+			attributes.push('disabled', 'media="(max-width: 0)"');
+		} else {
+			const preload_atts = ['rel="preload"', 'as="style"'].concat(attributes);
+			link_header_preloads.add(`<${encodeURI(path)}>; ${preload_atts.join(';')}; nopush`);
+		}
 
-			return `\n\t<link ${attributes.join(' ')}>`;
-		})
-		.join('');
+		attributes.unshift('rel="stylesheet"');
+		head += `\n\t<link href="${path}" ${attributes.join(' ')}>`;
+	}
 
 	if (page_config.router || page_config.hydrate) {
-		head += Array.from(modulepreloads)
-			.map((dep) => `\n\t<link rel="modulepreload" href="${options.prefix + dep}">`)
-			.join('');
+		for (const dep of modulepreloads) {
+			const path = options.prefix + dep;
+			link_header_preloads.add(`<${encodeURI(path)}>; rel="modulepreload"; nopush`);
+			if (state.prerendering) {
+				head += `\n\t<link rel="modulepreload" href="${path}">`;
+			}
+		}
 
 		const attributes = ['type="module"', `data-sveltekit-hydrate="${target}"`];
 
@@ -1611,6 +1617,10 @@ async function render_response({
 		etag: `"${hash(html)}"`
 	});
 
+	if (link_header_preloads.size) {
+		headers.set('link', Array.from(link_header_preloads).join(', '));
+	}
+
 	if (cache) {
 		headers.set('cache-control', `${is_private ? 'private' : 'public'}, max-age=${cache.maxage}`);
 	}

package/dist/chunks/index3.js

@@ -1,7 +1,11 @@
 import { $ } from './index.js';
+import glob from 'tiny-glob';
+import zlib from 'zlib';
+import { existsSync, statSync, createReadStream, createWriteStream } from 'fs';
+import { pipeline } from 'stream';
+import { promisify } from 'util';
 import { r as rimraf, m as mkdirp, c as copy } from './filesystem.js';
 import { g as generate_manifest } from '../vite.js';
-import 'fs';
 import 'path';
 import 'url';
 import 'node:child_process';
@@ -18,9 +22,7 @@ import '../node/polyfills.js';
 import 'assert';
 import 'net';
 import 'http';
-import 'stream';
 import 'buffer';
-import 'util';
 import 'stream/web';
 import 'perf_hooks';
 import 'util/types';
@@ -28,7 +30,6 @@ import 'events';
 import 'tls';
 import 'async_hooks';
 import 'console';
-import 'zlib';
 import 'node:http';
 import 'node:https';
 import 'node:zlib';
@@ -64,6 +65,30 @@ function create_builder({ config, build_data, prerendered, log }) {
 		return true;
 	}
 
+	const pipe = promisify(pipeline);
+
+	/**
+	 * @param {string} file
+	 * @param {'gz' | 'br'} format
+	 */
+	async function compress_file(file, format = 'gz') {
+		const compress =
+			format == 'br'
+				? zlib.createBrotliCompress({
+						params: {
+							[zlib.constants.BROTLI_PARAM_MODE]: zlib.constants.BROTLI_MODE_TEXT,
+							[zlib.constants.BROTLI_PARAM_QUALITY]: zlib.constants.BROTLI_MAX_QUALITY,
+							[zlib.constants.BROTLI_PARAM_SIZE_HINT]: statSync(file).size
+						}
+				  })
+				: zlib.createGzip({ level: zlib.constants.Z_BEST_COMPRESSION });
+
+		const source = createReadStream(file);
+		const destination = createWriteStream(`${file}.${format}`);
+
+		await pipe(source, compress, destination);
+	}
+
 	return {
 		log,
 		rimraf,
@@ -190,6 +215,23 @@ function create_builder({ config, build_data, prerendered, log }) {
 			);
 		},
 
+		async compress(directory) {
+			if (!existsSync(directory)) {
+				return;
+			}
+
+			const files = await glob('**/*.{html,js,json,css,svg,xml,wasm}', {
+				cwd: directory,
+				dot: true,
+				absolute: true,
+				filesOnly: true
+			});
+
+			await Promise.all(
+				files.map((file) => Promise.all([compress_file(file, 'gz'), compress_file(file, 'br')]))
+			);
+		},
+
 		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/cli.js

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

package/dist/node/polyfills.js

@@ -11,7 +11,7 @@ import require$$0$3 from 'events';
 import require$$4$1 from 'tls';
 import require$$3 from 'async_hooks';
 import 'console';
-import require$$3$1 from 'zlib';
+import zlib from 'zlib';
 import http from 'node:http';
 import 'node:https';
 import 'node:zlib';
@@ -10333,7 +10333,7 @@ function requireFetch () {
 	} = requireResponse();
 	const { Headers } = requireHeaders();
 	const { Request, makeRequest } = requireRequest();
-	const zlib = require$$3$1;
+	const zlib$1 = zlib;
 	const {
 	  matchRequestIntegrity,
 	  makePolicyContainer,
@@ -12215,11 +12215,11 @@ function requireFetch () {
 	          if (request.method !== 'HEAD' && request.method !== 'CONNECT' && !nullBodyStatus.includes(status) && !(request.redirect === 'follow' && location)) {
 	            for (const coding of codings) {
 	              if (/(x-)?gzip/.test(coding)) {
-	                decoders.push(zlib.createGunzip());
+	                decoders.push(zlib$1.createGunzip());
 	              } else if (/(x-)?deflate/.test(coding)) {
-	                decoders.push(zlib.createInflate());
+	                decoders.push(zlib$1.createInflate());
 	              } else if (coding === 'br') {
-	                decoders.push(zlib.createBrotliDecompress());
+	                decoders.push(zlib$1.createBrotliDecompress());
 	              } else {
 	                decoders.length = 0;
 	                break

package/dist/vite.js

@@ -182,20 +182,6 @@ function assets_base(config) {
 	return `${assets || base}/`;
 }
 
-/**
- * vite.config.js will contain vite-plugin-svelte-kit, which kicks off the server and service
- * worker builds in a hook. When running the server and service worker builds we must remove
- * the SvelteKit plugin so that we do not kick off additional instances of these builds.
- * @param {import('vite').UserConfig} config
- */
-function remove_svelte_kit(config) {
-	// TODO i feel like there's a more elegant way to do this
-	// @ts-expect-error - it can't handle infinite type expansion
-	config.plugins = (config.plugins || [])
-		.flat(Infinity)
-		.filter((plugin) => plugin.name !== 'vite-plugin-svelte-kit');
-}
-
 const method_names = new Set(['GET', 'HEAD', 'PUT', 'POST', 'DELETE', 'PATCH']);
 
 // If we'd written this in TypeScript, it could be easy...
@@ -288,11 +274,11 @@ export class Server {
 	init({ env }) {
 		const entries = Object.entries(env);
 
-		const prv = Object.fromEntries(Object.entries(env).filter(([k]) => !k.startsWith('${
+		const prv = Object.fromEntries(entries.filter(([k]) => !k.startsWith('${
 			config.kit.env.publicPrefix
 		}')));
 
-		const pub = Object.fromEntries(Object.entries(env).filter(([k]) => k.startsWith('${
+		const pub = Object.fromEntries(entries.filter(([k]) => k.startsWith('${
 			config.kit.env.publicPrefix
 		}')));
 
@@ -409,8 +395,6 @@ async function build_server(options, client) {
 		await get_vite_config(vite_config, vite_config_env)
 	);
 
-	remove_svelte_kit(merged_config);
-
 	const { chunks } = await create_build(merged_config);
 
 	/** @type {import('vite').Manifest} */
@@ -513,7 +497,7 @@ function get_methods(cwd, output, manifest_data) {
  * @param {import('vite').Manifest} client_manifest
  */
 async function build_service_worker(
-	{ config, vite_config, vite_config_env, manifest_data, output_dir, service_worker_entry_file },
+	{ config, manifest_data, output_dir, service_worker_entry_file },
 	prerendered,
 	client_manifest
 ) {
@@ -560,7 +544,7 @@ async function build_service_worker(
 			.trim()
 	);
 
-	const merged_config = merge_vite_configs(await get_vite_config(vite_config, vite_config_env), {
+	await vite.build({
 		base: assets_base(config.kit),
 		build: {
 			lib: {
@@ -576,7 +560,6 @@ async function build_service_worker(
 			outDir: `${output_dir}/client`,
 			emptyOutDir: false
 		},
-		// @ts-expect-error
 		configFile: false,
 		resolve: {
 			alias: {
@@ -585,10 +568,6 @@ async function build_service_worker(
 			}
 		}
 	});
-
-	remove_svelte_kit(merged_config);
-
-	await vite.build(merged_config);
 }
 
 function totalist(dir, callback, pre='') {
@@ -2185,6 +2164,11 @@ function kit() {
 		 * @see https://vitejs.dev/guide/api-plugin.html#config
 		 */
 		async config(config, config_env) {
+			// The config is created in build_server for SSR mode and passed inline
+			if (config.build?.ssr) {
+				return;
+			}
+
 			vite_config_env = config_env;
 			svelte_config = await load_config();
 			is_build = config_env.command === 'build';
@@ -2269,6 +2253,10 @@ function kit() {
 		 * Clears the output directories.
 		 */
 		buildStart() {
+			if (vite_config.build.ssr) {
+				return;
+			}
+
 			// Reset for new build. Goes here because `build --watch` calls buildStart but not config
 			completed_build = false;
 
@@ -2287,6 +2275,10 @@ function kit() {
 		 * then use this hook to kick off builds for the server and service worker.
 		 */
 		async writeBundle(_options, bundle) {
+			if (vite_config.build.ssr) {
+				return;
+			}
+
 			for (const file of manifest_data.components) {
 				const id = vite.normalizePath(path.resolve(file));
 				const node = this.getModuleInfo(id);
@@ -2403,9 +2395,10 @@ function kit() {
 		 * Runs the adapter.
 		 */
 		async closeBundle() {
-			if (!completed_build) {
-				// vite calls closeBundle when dev-server restarts, ignore that,
-				// and only adapt when build successfully completes.
+			// vite calls closeBundle when dev-server restarts, ignore that,
+			// and only adapt when build successfully completes.
+			const is_restart = !completed_build;
+			if (vite_config.build.ssr || is_restart) {
 				return;
 			}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.403",
+  "version": "1.0.0-next.405",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -12,7 +12,8 @@
   "dependencies": {
     "@sveltejs/vite-plugin-svelte": "^1.0.1",
     "chokidar": "^3.5.3",
-    "sade": "^1.8.1"
+    "sade": "^1.8.1",
+    "tiny-glob": "^0.2.9"
   },
   "devDependencies": {
     "@playwright/test": "^1.23.4",

package/types/index.d.ts

@@ -80,6 +80,11 @@ export interface Builder {
 			replace?: Record<string, string>;
 		}
 	): string[];
+
+	/**
+	 * @param {string} directory Path to the directory containing the files to be compressed
+	 */
+	compress(directory: string): void;
 }
 
 export interface Config {