@sveltejs/kit 1.0.0-next.396 → 1.0.0-next.399

package/assets/client/start.js

@@ -1595,10 +1595,12 @@ function create_client({ target, session, base, trailing_slash }) {
 				const is_svg_a_element = a instanceof SVGAElement;
 				const url = get_href(a);
 
-				// Ignore if url does not have origin (e.g. `mailto:`, `tel:`.)
+				// Ignore non-HTTP URL protocols (e.g. `mailto:`, `tel:`, `myapp:`, etc.)
 				// MEMO: Without this condition, firefox will open mailer twice.
-				// See: https://github.com/sveltejs/kit/issues/4045
-				if (!is_svg_a_element && url.origin === 'null') return;
+				// See:
+				// - https://github.com/sveltejs/kit/issues/4045
+				// - https://github.com/sveltejs/kit/issues/5725
+				if (!is_svg_a_element && !(url.protocol === 'https:' || url.protocol === 'http:')) return;
 
 				// Ignore if tag has
 				// 1. 'download' attribute

package/dist/chunks/sync.js

@@ -5,7 +5,7 @@ import { p as posixify, c as copy, r as rimraf } from './filesystem.js';
 import { fileURLToPath } from 'url';
 import { w as write_if_changed, t as trim, a as write, v as valid_identifier, r as reserved, b as write_tsconfig } from './write_tsconfig.js';
 import { $ } from './index.js';
-import { loadEnv, loadConfigFromFile } from 'vite';
+import { loadEnv, normalizePath, loadConfigFromFile } from 'vite';
 
 /**
  * @param typeMap [Object] Map of MIME type -> Array[extensions]
@@ -1104,7 +1104,7 @@ function get_env(mode, prefix) {
 /**
  * @param {(id: string) => import('rollup').ModuleInfo | null} node_getter
  * @param {import('rollup').ModuleInfo} node
- * @param {Set<string>} illegal_imports
+ * @param {Set<string>} illegal_imports Illegal module IDs -- be sure to call vite.normalizePath!
  * @param {string} out_dir The directory specified by config.kit.outDir
  */
 function prevent_illegal_rollup_imports(node_getter, node, illegal_imports, out_dir) {
@@ -1116,9 +1116,9 @@ function prevent_illegal_rollup_imports(node_getter, node, illegal_imports, out_
  * @param {(id: string) => import('rollup').ModuleInfo | null} node_getter
  * @param {import('rollup').ModuleInfo} node
  * @param {boolean} dynamic
- * @param {Set<string>} illegal_imports
+ * @param {Set<string>} illegal_imports Illegal module IDs -- be sure to call vite.normalizePath!
  * @param {Set<string>} seen
- * @returns {Array<import('types').ImportNode> | undefined}
+ * @returns {Array<import('types').ImportNode> | null}
  */
 const find_illegal_rollup_imports = (
 	node_getter,
@@ -1127,92 +1127,126 @@ const find_illegal_rollup_imports = (
 	illegal_imports,
 	seen = new Set()
 ) => {
-	if (seen.has(node.id)) return;
-	seen.add(node.id);
+	const name = normalizePath(node.id);
+	if (seen.has(name)) return null;
+	seen.add(name);
 
-	if (illegal_imports.has(node.id)) {
-		return [{ name: node.id, dynamic }];
+	if (illegal_imports.has(name)) {
+		return [{ name, dynamic }];
 	}
 
 	for (const id of node.importedIds) {
 		const child = node_getter(id);
 		const chain =
 			child && find_illegal_rollup_imports(node_getter, child, false, illegal_imports, seen);
-		if (chain) return [{ name: node.id, dynamic }, ...chain];
+		if (chain) return [{ name, dynamic }, ...chain];
 	}
 
 	for (const id of node.dynamicallyImportedIds) {
 		const child = node_getter(id);
 		const chain =
 			child && find_illegal_rollup_imports(node_getter, child, true, illegal_imports, seen);
-		if (chain) return [{ name: node.id, dynamic }, ...chain];
+		if (chain) return [{ name, dynamic }, ...chain];
 	}
+
+	seen.delete(name);
+	return null;
+};
+
+/**
+ * Vite does some weird things with import trees in dev
+ * for example, a Tailwind app.css will appear to import
+ * every file in the project. This isn't a problem for
+ * Rollup during build.
+ * @param {Iterable<string>} config_module_types
+ */
+const get_module_types = (config_module_types) => {
+	return new Set([
+		'.ts',
+		'.js',
+		'.svelte',
+		'.mts',
+		'.mjs',
+		'.cts',
+		'.cjs',
+		'.svelte.md',
+		'.svx',
+		'.md',
+		...config_module_types
+	]);
 };
 
 /**
  * Throw an error if a private module is imported from a client-side node.
  * @param {import('vite').ModuleNode} node
- * @param {Set<string>} illegal_imports
+ * @param {Set<string>} illegal_imports Illegal module IDs -- be sure to call vite.normalizePath!
+ * @param {Iterable<string>} module_types File extensions to analyze in addition to the defaults: `.ts`, `.js`, etc.
  * @param {string} out_dir The directory specified by config.kit.outDir
  */
-function prevent_illegal_vite_imports(node, illegal_imports, out_dir) {
-	const chain = find_illegal_vite_imports(node, illegal_imports);
+function prevent_illegal_vite_imports(node, illegal_imports, module_types, out_dir) {
+	const chain = find_illegal_vite_imports(node, illegal_imports, get_module_types(module_types));
 	if (chain) throw new Error(format_illegal_import_chain(chain, out_dir));
 }
 
 /**
  * @param {import('vite').ModuleNode} node
- * @param {Set<string>} illegal_imports
+ * @param {Set<string>} illegal_imports Illegal module IDs -- be sure to call vite.normalizePath!
+ * @param {Set<string>} module_types File extensions to analyze: `.ts`, `.js`, etc.
  * @param {Set<string>} seen
  * @returns {Array<import('types').ImportNode> | null}
  */
-function find_illegal_vite_imports(node, illegal_imports, seen = new Set()) {
+function find_illegal_vite_imports(node, illegal_imports, module_types, seen = new Set()) {
 	if (!node.id) return null; // TODO when does this happen?
+	const name = normalizePath(node.id);
 
-	if (seen.has(node.id)) return null;
-	seen.add(node.id);
+	if (seen.has(name) || !module_types.has(path__default.extname(name))) return null;
+	seen.add(name);
 
-	if (node.id && illegal_imports.has(node.id)) {
-		return [{ name: node.id, dynamic: false }];
+	if (name && illegal_imports.has(name)) {
+		return [{ name, dynamic: false }];
 	}
 
 	for (const child of node.importedModules) {
-		const chain = child && find_illegal_vite_imports(child, illegal_imports, seen);
-		if (chain) return [{ name: node.id, dynamic: false }, ...chain];
+		const chain = child && find_illegal_vite_imports(child, illegal_imports, module_types, seen);
+		if (chain) return [{ name, dynamic: false }, ...chain];
 	}
 
+	seen.delete(name);
 	return null;
 }
 
 const autogen_comment = '// this file is generated — do not edit it\n';
+const types_reference = '/// <reference types="@sveltejs/kit" />\n\n';
 
 /**
- * Writes the existing environment variables in process.env to
+ * Writes ambient declarations including types reference to @sveltejs/kit,
+ * and the existing environment variables in process.env to
  * $env/static/private and $env/static/public
  * @param {import('types').ValidatedKitConfig} config
  * @param {string} mode The Vite mode
  */
-function write_env(config, mode) {
+function write_ambient(config, mode) {
 	const env = get_env(mode, config.env.publicPrefix);
 
 	// TODO when testing src, `$app` points at `src/runtime/app`... will
 	// probably need to fiddle with aliases
 	write_if_changed(
 		path__default.join(config.outDir, 'runtime/env/static/public.js'),
-		create_module('$env/static/public', env.public)
+		create_env_module('$env/static/public', env.public)
 	);
 
 	write_if_changed(
 		path__default.join(config.outDir, 'runtime/env/static/private.js'),
-		create_module('$env/static/private', env.private)
+		create_env_module('$env/static/private', env.private)
 	);
 
 	write_if_changed(
 		path__default.join(config.outDir, 'ambient.d.ts'),
 		autogen_comment +
-			create_types('$env/static/public', env.public) +
+			types_reference +
+			create_env_types('$env/static/public', env.public) +
 			'\n\n' +
-			create_types('$env/static/private', env.private)
+			create_env_types('$env/static/private', env.private)
 	);
 }
 
@@ -1221,7 +1255,7 @@ function write_env(config, mode) {
  * @param {Record<string, string>} env
  * @returns {string}
  */
-function create_module(id, env) {
+function create_env_module(id, env) {
 	/** @type {string[]} */
 	const declarations = [];
 
@@ -1255,7 +1289,7 @@ function create_module(id, env) {
  * @param {Record<string, string>} env
  * @returns {string}
  */
-function create_types(id, env) {
+function create_env_types(id, env) {
 	const declarations = Object.keys(env)
 		.filter((k) => valid_identifier.test(k))
 		.map((k) => `\texport const ${k}: string;`)
@@ -1273,7 +1307,7 @@ function init(config, mode) {
 	copy_assets(path__default.join(config.kit.outDir, 'runtime'));
 
 	write_tsconfig(config.kit);
-	write_env(config.kit, mode);
+	write_ambient(config.kit, mode);
 }
 
 /**

package/dist/chunks/write_tsconfig.js

@@ -149,7 +149,7 @@ function write_tsconfig(config, cwd = process.cwd()) {
 
 					// This is required for svelte-kit package to work as expected
 					// Can be overwritten
-					lib: ['esnext', 'DOM'],
+					lib: ['esnext', 'DOM', 'DOM.Iterable'],
 					moduleResolution: 'node',
 					module: 'esnext',
 					target: 'esnext'

package/dist/cli.js

@@ -1,8 +1,8 @@
 import fs__default from 'fs';
+import path__default from 'path';
 import { l as load_config, $ } from './chunks/index.js';
 import sade from 'sade';
 import { c as coalesce_to_error } from './chunks/error.js';
-import 'path';
 import 'url';
 
 /** @param {unknown} e */
@@ -19,7 +19,7 @@ function handle_error(e) {
 	process.exit(1);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.396');
+const prog = sade('svelte-kit').version('1.0.0-next.399');
 
 prog
 	.command('package')
@@ -41,13 +41,30 @@ prog
 	.describe('Synchronise generated files')
 	.option('--mode', 'Specify a mode for loading environment variables', 'development')
 	.action(async ({ mode }) => {
-		if (!fs__default.existsSync('svelte.config.js')) {
-			console.warn('Missing svelte.config.js — skipping');
+		const event = process.env.npm_lifecycle_event;
+
+		// TODO remove for 1.0
+		if (event === 'prepare') {
+			const pkg = JSON.parse(fs__default.readFileSync('package.json', 'utf8'));
+			const message =
+				pkg.scripts.prepare === 'svelte-kit sync'
+					? `\`svelte-kit sync\` now runs on "postinstall" — please remove the "prepare" script from your package.json\n`
+					: `\`svelte-kit sync\` now runs on "postinstall" — please remove it from your "prepare" script\n`;
+
+			console.error($.bold().red(message));
+			return;
+		}
+
+		const cwd = event === 'postinstall' ? process.env.INIT_CWD ?? '' : process.cwd();
+
+		const svelte_config_file = path__default.join(cwd, 'svelte.config.js');
+		if (!fs__default.existsSync(svelte_config_file)) {
+			console.warn(`Missing ${svelte_config_file} — skipping`);
 			return;
 		}
 
 		try {
-			const config = await load_config();
+			const config = await load_config({ cwd });
 			const sync = await import('./chunks/sync.js').then(function (n) { return n.f; });
 			sync.all(config, mode);
 		} catch (error) {

package/dist/vite.js

@@ -1297,7 +1297,12 @@ async function dev(vite, vite_config, svelte_config, illegal_imports) {
 						const node = await vite.moduleGraph.getModuleByUrl(url);
 						if (!node) throw new Error(`Could not find node for ${url}`);
 
-						prevent_illegal_vite_imports(node, illegal_imports, svelte_config.kit.outDir);
+						prevent_illegal_vite_imports(
+							node,
+							illegal_imports,
+							[...svelte_config.extensions, ...svelte_config.kit.moduleExtensions],
+							svelte_config.kit.outDir
+						);
 
 						return {
 							module,
@@ -1478,11 +1483,6 @@ async function dev(vite, vite_config, svelte_config, illegal_imports) {
 					);
 				}
 
-				/** @type {Partial<import('types').Hooks>} */
-				const user_hooks = resolve_entry(svelte_config.kit.files.hooks)
-					? await vite.ssrLoadModule(`/${svelte_config.kit.files.hooks}`)
-					: {};
-
 				const runtime_base = true
 					? `/${posixify(path__default.relative(cwd$1, `${svelte_config.kit.outDir}/runtime`))}`
 					: `/@fs${runtime}`;
@@ -1494,6 +1494,11 @@ async function dev(vite, vite_config, svelte_config, illegal_imports) {
 				set_private_env(env.private);
 				set_public_env(env.public);
 
+				/** @type {Partial<import('types').Hooks>} */
+				const user_hooks = resolve_entry(svelte_config.kit.files.hooks)
+					? await vite.ssrLoadModule(`/${svelte_config.kit.files.hooks}`)
+					: {};
+
 				const handle = user_hooks.handle || (({ event, resolve }) => resolve(event));
 
 				/** @type {import('types').Hooks} */
@@ -2191,8 +2196,8 @@ function kit() {
 			};
 
 			illegal_imports = new Set([
-				`${svelte_config.kit.outDir}/runtime/env/dynamic/private.js`,
-				`${svelte_config.kit.outDir}/runtime/env/static/private.js`
+				vite.normalizePath(`${svelte_config.kit.outDir}/runtime/env/dynamic/private.js`),
+				vite.normalizePath(`${svelte_config.kit.outDir}/runtime/env/static/private.js`)
 			]);
 
 			if (is_build) {
@@ -2283,7 +2288,7 @@ function kit() {
 		 */
 		async writeBundle(_options, bundle) {
 			for (const file of manifest_data.components) {
-				const id = path.resolve(file);
+				const id = vite.normalizePath(path.resolve(file));
 				const node = this.getModuleInfo(id);
 
 				if (node) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.396",
+  "version": "1.0.0-next.399",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -20,7 +20,7 @@
     "@types/connect": "^3.4.35",
     "@types/cookie": "^0.5.1",
     "@types/marked": "^4.0.3",
-    "@types/mime": "^2.0.3",
+    "@types/mime": "^3.0.0",
     "@types/node": "^16.11.36",
     "@types/sade": "^1.7.4",
     "@types/set-cookie-parser": "^2.4.2",
@@ -93,6 +93,7 @@
     "test:unit": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\" -i packaging",
     "test:typings": "tsc --project test/typings",
     "test:packaging": "uvu src/packaging \"(spec\\.js|test[\\\\/]index\\.js)\"",
-    "types": "node scripts/extract-types.js"
+    "types": "node scripts/extract-types.js",
+    "postinstall": "node svelte-kit.js sync"
   }
 }

package/svelte-kit.js

@@ -1,2 +1,11 @@
 #!/usr/bin/env node
-import './dist/cli.js';
+import fs from 'fs';
+import { fileURLToPath } from 'url';
+
+// in our own CI, and when deploying directly from this monorepo,
+// the `dist` directory will not exist yet
+if (fs.existsSync(fileURLToPath(new URL('./dist', import.meta.url)))) {
+	import('./dist/cli.js');
+} else {
+	console.error('Run "pnpm build" and try running this command again');
+}