;
export interface SSROptions {
+ app_dir: string;
app_template_contains_nonce: boolean;
csp: ValidatedConfig['kit']['csp'];
csrf_check_origin: boolean;
diff --git a/packages/kit/src/types/synthetic/$env+dynamic+private.md b/packages/kit/src/types/synthetic/$env+dynamic+private.md
index 99fabd42485d..eed73d827bd3 100644
--- a/packages/kit/src/types/synthetic/$env+dynamic+private.md
+++ b/packages/kit/src/types/synthetic/$env+dynamic+private.md
@@ -2,6 +2,8 @@ This module provides access to runtime environment variables, as defined by the
This module cannot be imported into client-side code.
+Dynamic environment variables cannot be used during prerendering.
+
```ts
import { env } from '$env/dynamic/private';
console.log(env.DEPLOYMENT_SPECIFIC_VARIABLE);
diff --git a/packages/kit/src/types/synthetic/$env+dynamic+public.md b/packages/kit/src/types/synthetic/$env+dynamic+public.md
index b70626ba6417..ad1cf54d2fb6 100644
--- a/packages/kit/src/types/synthetic/$env+dynamic+public.md
+++ b/packages/kit/src/types/synthetic/$env+dynamic+public.md
@@ -2,6 +2,8 @@ Similar to [`$env/dynamic/private`](https://kit.svelte.dev/docs/modules#$env-dyn
Note that public dynamic environment variables must all be sent from the server to the client, causing larger network requests — when possible, use `$env/static/public` instead.
+Dynamic environment variables cannot be used during prerendering.
+
```ts
import { env } from '$env/dynamic/public';
console.log(env.PUBLIC_DEPLOYMENT_SPECIFIC_VARIABLE);
diff --git a/packages/kit/test/apps/basics/package.json b/packages/kit/test/apps/basics/package.json
index 1c705def699a..4866372a0361 100644
--- a/packages/kit/test/apps/basics/package.json
+++ b/packages/kit/test/apps/basics/package.json
@@ -9,7 +9,7 @@
"check": "svelte-kit sync && tsc && svelte-check",
"test": "node test/setup.js && pnpm test:dev && pnpm test:build",
"test:dev": "node -e \"fs.rmSync('test/errors.json', { force: true })\" && cross-env DEV=true playwright test",
- "test:build": "node -e \"fs.rmSync('test/errors.json', { force: true })\" && playwright test",
+ "test:build": "node -e \"fs.rmSync('test/errors.json', { force: true })\" && cross-env PUBLIC_PRERENDERING=false playwright test",
"test:cross-platform:dev": "node test/setup.js && node -e \"fs.rmSync('test/errors.json', { force: true })\" && cross-env DEV=true playwright test test/cross-platform/",
"test:cross-platform:build": "node test/setup.js && node -e \"fs.rmSync('test/errors.json', { force: true })\" && playwright test test/cross-platform/"
},
diff --git a/packages/kit/test/apps/basics/playwright.config.js b/packages/kit/test/apps/basics/playwright.config.js
index 33d36b651014..0f7c1458a513 100644
--- a/packages/kit/test/apps/basics/playwright.config.js
+++ b/packages/kit/test/apps/basics/playwright.config.js
@@ -1 +1,11 @@
-export { config as default } from '../../utils.js';
+import { config } from '../../utils.js';
+
+export default {
+ ...config,
+ webServer: {
+ command: process.env.DEV
+ ? 'cross-env PUBLIC_PRERENDERING=false pnpm dev'
+ : 'cross-env PUBLIC_PRERENDERING=true pnpm build && pnpm preview',
+ port: process.env.DEV ? 5173 : 4173
+ }
+};
diff --git a/packages/kit/test/apps/basics/src/routes/+layout.server.js b/packages/kit/test/apps/basics/src/routes/+layout.server.js
index 6df957a1aa99..50f99accae43 100644
--- a/packages/kit/test/apps/basics/src/routes/+layout.server.js
+++ b/packages/kit/test/apps/basics/src/routes/+layout.server.js
@@ -1,5 +1,4 @@
import { error, redirect } from '@sveltejs/kit';
-import { env } from '$env/dynamic/private';
import { SOME_JSON } from '$env/static/private';
// https://github.com/sveltejs/kit/issues/8646
@@ -7,10 +6,6 @@ if (JSON.parse(SOME_JSON).answer !== 42) {
throw new Error('failed to parse env var');
}
-if (JSON.parse(env.SOME_JSON).answer !== 42) {
- throw new Error('failed to parse env var');
-}
-
/** @type {import('./$types').LayoutServerLoad} */
export async function load({ cookies, locals, fetch }) {
if (locals.url?.pathname === '/non-existent-route') {
diff --git a/packages/kit/test/apps/basics/src/routes/prerendering/env/+layout.svelte b/packages/kit/test/apps/basics/src/routes/prerendering/env/+layout.svelte
new file mode 100644
index 000000000000..9fd745e3ba79
--- /dev/null
+++ b/packages/kit/test/apps/basics/src/routes/prerendering/env/+layout.svelte
@@ -0,0 +1,4 @@
+prerendered
+dynamic
+
+
diff --git a/packages/kit/test/apps/basics/src/routes/prerendering/env/dynamic/+page.svelte b/packages/kit/test/apps/basics/src/routes/prerendering/env/dynamic/+page.svelte
new file mode 100644
index 000000000000..c0db5dfb5fcb
--- /dev/null
+++ b/packages/kit/test/apps/basics/src/routes/prerendering/env/dynamic/+page.svelte
@@ -0,0 +1,5 @@
+
+
+prerendering: {env.PUBLIC_PRERENDERING}
diff --git a/packages/kit/test/apps/basics/src/routes/prerendering/env/prerendered/+page.js b/packages/kit/test/apps/basics/src/routes/prerendering/env/prerendered/+page.js
new file mode 100644
index 000000000000..189f71e2e1b3
--- /dev/null
+++ b/packages/kit/test/apps/basics/src/routes/prerendering/env/prerendered/+page.js
@@ -0,0 +1 @@
+export const prerender = true;
diff --git a/packages/kit/test/apps/basics/src/routes/prerendering/env/prerendered/+page.svelte b/packages/kit/test/apps/basics/src/routes/prerendering/env/prerendered/+page.svelte
new file mode 100644
index 000000000000..34c62bbc7ead
--- /dev/null
+++ b/packages/kit/test/apps/basics/src/routes/prerendering/env/prerendered/+page.svelte
@@ -0,0 +1 @@
+prerendered
diff --git a/packages/kit/test/apps/basics/test/client.test.js b/packages/kit/test/apps/basics/test/client.test.js
index b140ca45ddc6..06a6561fd0b1 100644
--- a/packages/kit/test/apps/basics/test/client.test.js
+++ b/packages/kit/test/apps/basics/test/client.test.js
@@ -736,6 +736,15 @@ test.describe('env', () => {
'accessible anywhere/evaluated at run time'
);
});
+
+ test('uses correct dynamic env when navigating from prerendered page', async ({
+ page,
+ clicknav
+ }) => {
+ await page.goto('/prerendering/env/prerendered');
+ await clicknav('[href="/prerendering/env/dynamic"]');
+ expect(await page.locator('h2')).toHaveText('prerendering: false');
+ });
});
test.describe('Snapshots', () => {
diff --git a/packages/kit/test/prerendering/basics/src/routes/env/+page.server.js b/packages/kit/test/prerendering/basics/src/routes/env/+page.server.js
index 617a8542fd21..d0f085387247 100644
--- a/packages/kit/test/prerendering/basics/src/routes/env/+page.server.js
+++ b/packages/kit/test/prerendering/basics/src/routes/env/+page.server.js
@@ -1,9 +1,7 @@
import { PRIVATE_STATIC } from '$env/static/private';
-import { env } from '$env/dynamic/private';
export function load() {
return {
- PRIVATE_STATIC,
- PRIVATE_DYNAMIC: env.PRIVATE_DYNAMIC
+ PRIVATE_STATIC
};
}
diff --git a/packages/kit/test/prerendering/basics/src/routes/env/+page.svelte b/packages/kit/test/prerendering/basics/src/routes/env/+page.svelte
index 4ee2f424da67..bb13de1f8f55 100644
--- a/packages/kit/test/prerendering/basics/src/routes/env/+page.svelte
+++ b/packages/kit/test/prerendering/basics/src/routes/env/+page.svelte
@@ -1,13 +1,9 @@
PRIVATE_STATIC: {data.PRIVATE_STATIC}
-PRIVATE_DYNAMIC: {data.PRIVATE_DYNAMIC}
-
PUBLIC_STATIC: {PUBLIC_STATIC}
-PUBLIC_DYNAMIC: {env.PUBLIC_DYNAMIC}
diff --git a/packages/kit/test/prerendering/basics/test/tests.spec.js b/packages/kit/test/prerendering/basics/test/tests.spec.js
index 5b5763d19e1d..ecf337c35a76 100644
--- a/packages/kit/test/prerendering/basics/test/tests.spec.js
+++ b/packages/kit/test/prerendering/basics/test/tests.spec.js
@@ -205,12 +205,8 @@ test('$env - includes environment variables', () => {
content,
/.*PRIVATE_STATIC: accessible to server-side code\/replaced at build time.*/gs
);
- assert.match(
- content,
- /.*PRIVATE_DYNAMIC: accessible to server-side code\/evaluated at run time.*/gs
- );
+
assert.match(content, /.*PUBLIC_STATIC: accessible anywhere\/replaced at build time.*/gs);
- assert.match(content, /.*PUBLIC_DYNAMIC: accessible anywhere\/evaluated at run time.*/gs);
});
test('prerenders a page in a (group)', () => {
diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts
index 3210343dd793..79e925d0f4cc 100644
--- a/packages/kit/types/index.d.ts
+++ b/packages/kit/types/index.d.ts
@@ -83,6 +83,11 @@ declare module '@sveltejs/kit' {
*/
generateFallback(dest: string): Promise;
+ /**
+ * Generate a module exposing build-time environment variables as `$env/dynamic/public`.
+ */
+ generateEnvModule(): void;
+
/**
* Generate a server-side manifest to initialise the SvelteKit [server](https://kit.svelte.dev/docs/types#public-types-server) with.
* @param opts a relative path to the base directory of the app and optionally in which format (esm or cjs) the manifest should be generated
@@ -266,7 +271,9 @@ declare module '@sveltejs/kit' {
*/
alias?: Record;
/**
- * The directory relative to `paths.assets` where the built JS and CSS (and imported assets) are served from. (The filenames therein contain content-based hashes, meaning they can be cached indefinitely). Must not start or end with `/`.
+ * The directory where SvelteKit keeps its stuff, including static assets (such as JS and CSS) and internally-used routes.
+ *
+ * If `paths.assets` is specified, there will be two app directories — `${paths.assets}/${appDir}` and `${paths.base}/${appDir}`.
* @default "_app"
*/
appDir?: string;
@@ -1501,6 +1508,7 @@ declare module '@sveltejs/kit' {
imports: string[];
stylesheets: string[];
fonts: string[];
+ uses_env_dynamic_public: boolean;
} | null;
server_manifest: import('vite').Manifest;
}
diff --git a/packages/migrate/migrations/sveltekit-2/migrate.js b/packages/migrate/migrations/sveltekit-2/migrate.js
index e956baa40601..0b5098da396b 100644
--- a/packages/migrate/migrations/sveltekit-2/migrate.js
+++ b/packages/migrate/migrations/sveltekit-2/migrate.js
@@ -17,6 +17,7 @@ export function update_pkg_json_content(content) {
return update_pkg(content, [
// All other bumps are done as part of the Svelte 4 migration
['@sveltejs/kit', '^2.0.0'],
+ ['@sveltejs/adapter-static', '^3.0.0'],
['vite', '^5.0.0'],
['vitest', '^1.0.0'],
['typescript', '^5.0.0'], // should already be done by Svelte 4 migration, but who knows