Merge branch 'sveltejs:main' into cloudflare-workers-exports

Author: thomasfosterau

documentation/docs/20-core-concepts/40-page-options.md

@@ -127,7 +127,7 @@ export const ssr = false;
 
 If you add `export const ssr = false` to your root `+layout.js`, your entire app will only be rendered on the client — which essentially means you turn your app into an SPA.
 
-> [!NOTE] Even with `ssr` set to `false`, code that relies on browser APIs should be imported in your `+page.svelte` or `+layout.svelte` file instead. This is because page options can be overriden and need to be evaluated by importing your `+page.js` or `+layout.js` file on the server (if you have a runtime) or at build time (in case of prerendering).
+> [!NOTE] If all your page options are boolean or string literal values, SvelteKit will evaluate them statically. If not, it will import your `+page.js` or `+layout.js` file on the server (both at build time, and at runtime if your app isn't fully static) so it can evaluate the options. In the second case, browser-only code must not run when the module is loaded. In practice, this means you should import browser-only code in your `+page.svelte` or `+layout.svelte` file instead.
 
 ## csr
 

packages/adapter-auto/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @sveltejs/adapter-auto
 
+## 6.0.1
+### Patch Changes
+
+
+- chore: remove `import-meta-resolve` dependency ([#13629](https://github.com/sveltejs/kit/pull/13629))
+
+- Updated dependencies [[`bd1c04662332cbafa843c35a2e783486116af3d5`](https://github.com/sveltejs/kit/commit/bd1c04662332cbafa843c35a2e783486116af3d5), [`09f61ec2a14573e27769edb403c58aea5433a39f`](https://github.com/sveltejs/kit/commit/09f61ec2a14573e27769edb403c58aea5433a39f), [`09f61ec2a14573e27769edb403c58aea5433a39f`](https://github.com/sveltejs/kit/commit/09f61ec2a14573e27769edb403c58aea5433a39f)]:
+  - @sveltejs/kit@2.21.0
+
 ## 6.0.0
 ### Major Changes
 

packages/adapter-auto/index.js

@@ -1,9 +1,7 @@
 import { execSync } from 'node:child_process';
-import { pathToFileURL } from 'node:url';
-import { resolve } from 'import-meta-resolve';
 import { adapters } from './adapters.js';
-import { dirname, join } from 'node:path';
-import { existsSync } from 'node:fs';
+import path from 'node:path';
+import fs from 'node:fs';
 import process from 'node:process';
 
 /** @type {Record<string, (name: string, version: string) => string>} */
@@ -17,12 +15,15 @@ const commands = {
 function detect_lockfile() {
 	let dir = process.cwd();
 
+	/** @param {string} file */
+	const exists = (file) => fs.existsSync(path.join(dir, file));
+
 	do {
-		if (existsSync(join(dir, 'pnpm-lock.yaml'))) return 'pnpm';
-		if (existsSync(join(dir, 'yarn.lock'))) return 'yarn';
-		if (existsSync(join(dir, 'package-lock.json'))) return 'npm';
-		if (existsSync(join(dir, 'bun.lockb')) || existsSync(join(dir, 'bun.lock'))) return 'bun';
-	} while (dir !== (dir = dirname(dir)));
+		if (exists('pnpm-lock.yaml')) return 'pnpm';
+		if (exists('yarn.lock')) return 'yarn';
+		if (exists('package-lock.json')) return 'npm';
+		if (exists('bun.lockb') || exists('bun.lock')) return 'bun';
+	} while (dir !== (dir = path.dirname(dir)));
 
 	return 'npm';
 }
@@ -38,12 +39,40 @@ function detect_package_manager() {
 	}
 }
 
-/** @param {string} name */
-function import_from_cwd(name) {
-	const cwd = pathToFileURL(process.cwd()).href;
-	const url = resolve(name, cwd + '/x.js');
+/**
+ * Resolves a peer dependency relative to the current CWD. Duplicated with `packages/kit`
+ * @param {string} dependency
+ */
+function resolve_peer(dependency) {
+	let [name, ...parts] = dependency.split('/');
+	if (name[0] === '@') name += `/${parts.shift()}`;
+
+	let dir = process.cwd();
+
+	while (!fs.existsSync(`${dir}/node_modules/${name}/package.json`)) {
+		if (dir === (dir = path.dirname(dir))) {
+			throw new Error(
+				`Could not resolve peer dependency "${name}" relative to your project — please install it and try again.`
+			);
+		}
+	}
+
+	const pkg_dir = `${dir}/node_modules/${name}`;
+	const pkg = JSON.parse(fs.readFileSync(`${pkg_dir}/package.json`, 'utf-8'));
+
+	const subpackage = ['.', ...parts].join('/');
+
+	let exported = pkg.exports[subpackage];
+
+	while (typeof exported !== 'string') {
+		if (!exported) {
+			throw new Error(`Could not find valid "${subpackage}" export in ${name}/package.json`);
+		}
+
+		exported = exported['import'] ?? exported['default'];
+	}
 
-	return import(url);
+	return path.resolve(pkg_dir, exported);
 }
 
 /** @typedef {import('@sveltejs/kit').Adapter} Adapter */
@@ -56,47 +85,43 @@ async function get_adapter() {
 
 	if (!match) return;
 
-	/** @type {{ default: () => Adapter }} */
-	let module;
+	/** @type {string} */
+	let resolved;
 
 	try {
-		module = await import_from_cwd(match.module);
-	} catch (error) {
-		if (
-			error.code === 'ERR_MODULE_NOT_FOUND' &&
-			error.message.startsWith(`Cannot find package '${match.module}'`)
-		) {
-			const package_manager = detect_package_manager();
-			const command = commands[package_manager](match.module, match.version);
-
-			try {
-				console.log(`Installing ${match.module}...`);
-
-				execSync(command, {
-					stdio: 'inherit',
-					env: {
-						...process.env,
-						NODE_ENV: undefined
-					}
-				});
-
-				module = await import_from_cwd(match.module);
-
-				console.log(`Successfully installed ${match.module}.`);
-				console.warn(
-					`\nIf you plan on staying on this deployment platform, consider replacing @sveltejs/adapter-auto with ${match.module}. This will give you faster and more robust installs, and more control over deployment configuration.\n`
-				);
-			} catch (e) {
-				throw new Error(
-					`Could not install ${match.module}. Please install it yourself by adding it to your package.json's devDependencies and try building your project again.`,
-					{ cause: e }
-				);
-			}
-		} else {
-			throw error;
+		resolved = resolve_peer(match.module);
+	} catch {
+		const package_manager = detect_package_manager();
+		const command = commands[package_manager](match.module, match.version);
+
+		try {
+			console.log(`Installing ${match.module}...`);
+
+			execSync(command, {
+				stdio: 'inherit',
+				env: {
+					...process.env,
+					NODE_ENV: undefined
+				}
+			});
+
+			resolved = resolve_peer(match.module);
+
+			console.log(`Successfully installed ${match.module}.`);
+			console.warn(
+				`\nIf you plan on staying on this deployment platform, consider replacing @sveltejs/adapter-auto with ${match.module}. This will give you faster and more robust installs, and more control over deployment configuration.\n`
+			);
+		} catch (e) {
+			throw new Error(
+				`Could not install ${match.module}. Please install it yourself by adding it to your package.json's devDependencies and try building your project again.`,
+				{ cause: e }
+			);
 		}
 	}
 
+	/** @type {{ default: () => Adapter }} */
+	const module = await import(resolved);
+
 	const adapter = module.default();
 
 	return {

packages/adapter-auto/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/adapter-auto",
-	"version": "6.0.0",
+	"version": "6.0.1",
 	"description": "Automatically chooses the SvelteKit adapter for your current environment, if possible.",
 	"keywords": [
 		"adapter",
@@ -46,9 +46,6 @@
 		"typescript": "^5.3.3",
 		"vitest": "^3.1.1"
 	},
-	"dependencies": {
-		"import-meta-resolve": "^4.1.0"
-	},
 	"peerDependencies": {
 		"@sveltejs/kit": "^2.0.0"
 	}

packages/enhanced-img/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @sveltejs/enhanced-img
 
+## 0.6.0
+### Minor Changes
+
+
+- feat: add validation to ensure plugin occurs in correct order ([`1c3f36dc10265fb79c64643c3d7a91469d34e697`](https://github.com/sveltejs/kit/commit/1c3f36dc10265fb79c64643c3d7a91469d34e697))
+
 ## 0.5.1
 ### Patch Changes
 

packages/enhanced-img/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/enhanced-img",
-	"version": "0.5.1",
+	"version": "0.6.0",
 	"description": "Image optimization for your Svelte apps",
 	"repository": {
 		"type": "git",

packages/enhanced-img/src/vite-plugin.js

@@ -30,11 +30,23 @@ export function image_plugin(imagetools_plugin) {
 	/** @type {Partial<import('@sveltejs/vite-plugin-svelte').SvelteConfig | undefined>} */
 	let svelte_config;
 
+	const name = 'vite-plugin-enhanced-img-markup';
+
 	return {
-		name: 'vite-plugin-enhanced-img-markup',
+		name,
 		enforce: 'pre',
 		async configResolved(config) {
 			vite_config = config;
+			for (const plugin of config.plugins || []) {
+				if (plugin.name === name) {
+					break;
+				}
+				if (plugin.name === 'vite-plugin-svelte') {
+					throw new Error(
+						'@sveltejs/enhanced-img must come before the Svelte or SvelteKit plugins'
+					);
+				}
+			}
 			svelte_config = await loadSvelteConfig();
 			if (!svelte_config) throw new Error('Could not load Svelte config file');
 		},

packages/kit/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @sveltejs/kit
 
+## 2.21.0
+### Minor Changes
+
+
+- feat: allow running client-side code at the top-level of universal pages/layouts when SSR is disabled and page options are only boolean or string literals ([#13684](https://github.com/sveltejs/kit/pull/13684))
+
+
+### Patch Changes
+
+
+- chore: remove `import-meta-resolve` dependency ([#13629](https://github.com/sveltejs/kit/pull/13629))
+
+
+- fix: remove component code from server nodes that are never used for SSR ([#13684](https://github.com/sveltejs/kit/pull/13684))
+
 ## 2.20.8
 ### Patch Changes
 

packages/kit/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/kit",
-	"version": "2.20.8",
+	"version": "2.21.0",
 	"description": "SvelteKit is the fastest way to build Svelte apps",
 	"keywords": [
 		"framework",
@@ -18,11 +18,12 @@
 	"homepage": "https://svelte.dev",
 	"type": "module",
 	"dependencies": {
+		"@sveltejs/acorn-typescript": "^1.0.5",
 		"@types/cookie": "^0.6.0",
+		"acorn": "^8.14.1",
 		"cookie": "^0.6.0",
 		"devalue": "^5.1.0",
 		"esm-env": "^1.2.2",
-		"import-meta-resolve": "^4.1.0",
 		"kleur": "^4.1.5",
 		"magic-string": "^0.30.5",
 		"mrmime": "^2.0.0",

packages/kit/src/core/sync/utils.js

@@ -1,10 +1,10 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { mkdirp } from '../../utils/filesystem.js';
-import { resolve_peer_dependency } from '../../utils/import.js';
+import { import_peer } from '../../utils/import.js';
 
 /** @type {{ VERSION: string }} */
-const { VERSION } = await resolve_peer_dependency('svelte/compiler');
+const { VERSION } = await import_peer('svelte/compiler');
 
 /** @type {Map<string, string>} */
 const previous_contents = new Map();

packages/kit/src/exports/vite/build/build_server.js

@@ -3,7 +3,8 @@ import { mkdirp } from '../../../utils/filesystem.js';
 import { filter_fonts, find_deps, resolve_symlinks } from './utils.js';
 import { s } from '../../../utils/misc.js';
 import { normalizePath } from 'vite';
-import { basename } from 'node:path';
+import { basename, join } from 'node:path';
+import { create_static_analyser } from '../static_analysis/index.js';
 
 /**
  * @param {string} out
@@ -14,7 +15,7 @@ import { basename } from 'node:path';
  * @param {import('vite').Rollup.OutputAsset[] | null} css
  * @param {import('types').RecursiveRequired<import('types').ValidatedConfig['kit']['output']>} output_config
  */
-export function build_server_nodes(out, kit, manifest_data, server_manifest, client_manifest, css, output_config) {
+export async function build_server_nodes(out, kit, manifest_data, server_manifest, client_manifest, css, output_config) {
 	mkdirp(`${out}/server/nodes`);
 	mkdirp(`${out}/server/stylesheets`);
 
@@ -73,7 +74,14 @@ export function build_server_nodes(out, kit, manifest_data, server_manifest, cli
 		}
 	}
 
-	manifest_data.nodes.forEach((node, i) => {
+	const { get_page_options } = create_static_analyser(async (server_node) => {
+		// Windows needs the file:// protocol for absolute path dynamic imports
+		return import(`file://${join(out, 'server', resolve_symlinks(server_manifest, server_node).chunk.file)}`);
+	});
+
+	for (let i = 0; i < manifest_data.nodes.length; i++) {
+		const node = manifest_data.nodes[i];
+
 		/** @type {string[]} */
 		const imports = [];
 
@@ -101,12 +109,16 @@ export function build_server_nodes(out, kit, manifest_data, server_manifest, cli
 		}
 
 		if (node.universal) {
-			imports.push(
-				`import * as universal from '../${
-					resolve_symlinks(server_manifest, node.universal).chunk.file
-				}';`
-			);
-			exports.push('export { universal };');
+			const page_options = await get_page_options(node);
+			if (!!page_options && page_options.ssr === false) {
+				exports.push(`export const universal = ${s(page_options, null, 2)};`)
+			} else {
+				imports.push(
+					`import * as universal from '../${resolve_symlinks(server_manifest, node.universal).chunk.file}';`
+				);
+				// TODO: when building for analysis, explain why the file was loaded on the server if we fail to load it
+				exports.push('export { universal };');
+			}
 			exports.push(`export const universal_id = ${s(node.universal)};`);
 		}
 
@@ -186,5 +198,5 @@ export function build_server_nodes(out, kit, manifest_data, server_manifest, cli
 			`${out}/server/nodes/${i}.js`,
 			`${imports.join('\n')}\n\n${exports.join('\n')}\n`
 		);
-	});
+	}
 }