@sveltejs/kit 2.0.5 → 2.0.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/core/postbuild/analyse.js +1 -1
- package/src/core/postbuild/fallback.js +1 -1
- package/src/core/postbuild/prerender.js +19 -10
- package/src/core/sync/write_server.js +2 -2
- package/src/exports/public.d.ts +0 -8
- package/src/exports/vite/index.js +5 -0
- package/src/runtime/server/index.js +7 -3
- package/src/types/ambient.d.ts +5 -0
- package/src/types/internal.d.ts +2 -1
- package/src/version.js +1 -1
- package/types/index.d.ts +5 -8
- package/types/index.d.ts.map +1 -1
- package/src/runtime/app/env.js +0 -1
package/package.json
CHANGED
|
@@ -39,7 +39,7 @@ async function analyse({ manifest_path, env }) {
|
|
|
39
39
|
|
|
40
40
|
// configure `import { building } from '$app/environment'` —
|
|
41
41
|
// essential we do this before analysing the code
|
|
42
|
-
internal.set_building(
|
|
42
|
+
internal.set_building();
|
|
43
43
|
|
|
44
44
|
// set env, in case it's used in initialisation
|
|
45
45
|
const { publicPrefix: public_prefix, privatePrefix: private_prefix } = config.env;
|
|
@@ -30,7 +30,7 @@ async function generate_fallback({ manifest_path, env }) {
|
|
|
30
30
|
/** @type {import('@sveltejs/kit').SSRManifest} */
|
|
31
31
|
const manifest = (await import(pathToFileURL(manifest_path).href)).manifest;
|
|
32
32
|
|
|
33
|
-
set_building(
|
|
33
|
+
set_building();
|
|
34
34
|
|
|
35
35
|
const server = new Server(manifest);
|
|
36
36
|
await server.init({ env });
|
|
@@ -36,7 +36,8 @@ async function prerender({ out, manifest_path, metadata, verbose, env }) {
|
|
|
36
36
|
|
|
37
37
|
// configure `import { building } from '$app/environment'` —
|
|
38
38
|
// essential we do this before analysing the code
|
|
39
|
-
internal.set_building(
|
|
39
|
+
internal.set_building();
|
|
40
|
+
internal.set_prerendering();
|
|
40
41
|
|
|
41
42
|
/**
|
|
42
43
|
* @template {{message: string}} T
|
|
@@ -98,9 +99,6 @@ async function prerender({ out, manifest_path, metadata, verbose, env }) {
|
|
|
98
99
|
/** @type {Map<string, string>} */
|
|
99
100
|
const saved = new Map();
|
|
100
101
|
|
|
101
|
-
const server = new Server(manifest);
|
|
102
|
-
await server.init({ env });
|
|
103
|
-
|
|
104
102
|
const handle_http_error = normalise_error_handler(
|
|
105
103
|
log,
|
|
106
104
|
config.prerender.handleHttpError,
|
|
@@ -413,16 +411,27 @@ async function prerender({ out, manifest_path, metadata, verbose, env }) {
|
|
|
413
411
|
}
|
|
414
412
|
}
|
|
415
413
|
|
|
414
|
+
let has_prerenderable_routes = false;
|
|
415
|
+
|
|
416
|
+
for (const value of prerender_map.values()) {
|
|
417
|
+
if (value) {
|
|
418
|
+
has_prerenderable_routes = true;
|
|
419
|
+
break;
|
|
420
|
+
}
|
|
421
|
+
}
|
|
422
|
+
|
|
416
423
|
if (
|
|
417
|
-
config.prerender.entries.length
|
|
418
|
-
|
|
419
|
-
route_level_entries.length > 0 ||
|
|
420
|
-
prerender_map.size > 0
|
|
424
|
+
(config.prerender.entries.length === 0 && route_level_entries.length === 0) ||
|
|
425
|
+
!has_prerenderable_routes
|
|
421
426
|
) {
|
|
422
|
-
|
|
423
|
-
log.info('Prerendering');
|
|
427
|
+
return { prerendered, prerender_map };
|
|
424
428
|
}
|
|
425
429
|
|
|
430
|
+
log.info('Prerendering');
|
|
431
|
+
|
|
432
|
+
const server = new Server(manifest);
|
|
433
|
+
await server.init({ env });
|
|
434
|
+
|
|
426
435
|
for (const entry of config.prerender.entries) {
|
|
427
436
|
if (entry === '*') {
|
|
428
437
|
for (const [id, prerender] of prerender_map) {
|
|
@@ -26,7 +26,7 @@ const server_template = ({
|
|
|
26
26
|
error_page
|
|
27
27
|
}) => `
|
|
28
28
|
import root from '../root.${isSvelte5Plus() ? 'js' : 'svelte'}';
|
|
29
|
-
import { set_building } from '__sveltekit/environment';
|
|
29
|
+
import { set_building, set_prerendering } from '__sveltekit/environment';
|
|
30
30
|
import { set_assets } from '__sveltekit/paths';
|
|
31
31
|
import { set_private_env, set_public_env, set_safe_public_env } from '${runtime_directory}/shared-server.js';
|
|
32
32
|
|
|
@@ -63,7 +63,7 @@ export function get_hooks() {
|
|
|
63
63
|
return ${hooks ? `import(${s(hooks)})` : '{}'};
|
|
64
64
|
}
|
|
65
65
|
|
|
66
|
-
export { set_assets, set_building, set_private_env, set_public_env, set_safe_public_env };
|
|
66
|
+
export { set_assets, set_building, set_prerendering, set_private_env, set_public_env, set_safe_public_env };
|
|
67
67
|
`;
|
|
68
68
|
|
|
69
69
|
// TODO need to re-run this whenever src/app.html or src/error.html are
|
package/src/exports/public.d.ts
CHANGED
|
@@ -179,14 +179,6 @@ export interface Config {
|
|
|
179
179
|
extensions?: string[];
|
|
180
180
|
/** SvelteKit options */
|
|
181
181
|
kit?: KitConfig;
|
|
182
|
-
/** [`@sveltejs/package`](/docs/packaging) options. */
|
|
183
|
-
package?: {
|
|
184
|
-
source?: string;
|
|
185
|
-
dir?: string;
|
|
186
|
-
emitTypes?: boolean;
|
|
187
|
-
exports?(filepath: string): boolean;
|
|
188
|
-
files?(filepath: string): boolean;
|
|
189
|
-
};
|
|
190
182
|
/** Preprocessor options, if any. Preprocessing can alternatively also be done through Vite's preprocessor capabilities. */
|
|
191
183
|
preprocess?: any;
|
|
192
184
|
/** `vite-plugin-svelte` plugin options. */
|
|
@@ -442,10 +442,15 @@ function kit({ svelte_config }) {
|
|
|
442
442
|
return dedent`
|
|
443
443
|
export const version = ${s(version.name)};
|
|
444
444
|
export let building = false;
|
|
445
|
+
export let prerendering = false;
|
|
445
446
|
|
|
446
447
|
export function set_building() {
|
|
447
448
|
building = true;
|
|
448
449
|
}
|
|
450
|
+
|
|
451
|
+
export function set_prerendering() {
|
|
452
|
+
prerendering = true;
|
|
453
|
+
}
|
|
449
454
|
`;
|
|
450
455
|
}
|
|
451
456
|
}
|
|
@@ -3,7 +3,7 @@ import { set_private_env, set_public_env, set_safe_public_env } from '../shared-
|
|
|
3
3
|
import { options, get_hooks } from '__SERVER__/internal.js';
|
|
4
4
|
import { DEV } from 'esm-env';
|
|
5
5
|
import { filter_private_env, filter_public_env } from '../../utils/env.js';
|
|
6
|
-
import {
|
|
6
|
+
import { prerendering } from '__sveltekit/environment';
|
|
7
7
|
|
|
8
8
|
/** @type {ProxyHandler<{ type: 'public' | 'private' }>} */
|
|
9
9
|
const prerender_env_handler = {
|
|
@@ -47,8 +47,12 @@ export class Server {
|
|
|
47
47
|
const private_env = filter_private_env(env, prefixes);
|
|
48
48
|
const public_env = filter_public_env(env, prefixes);
|
|
49
49
|
|
|
50
|
-
set_private_env(
|
|
51
|
-
|
|
50
|
+
set_private_env(
|
|
51
|
+
prerendering ? new Proxy({ type: 'private' }, prerender_env_handler) : private_env
|
|
52
|
+
);
|
|
53
|
+
set_public_env(
|
|
54
|
+
prerendering ? new Proxy({ type: 'public' }, prerender_env_handler) : public_env
|
|
55
|
+
);
|
|
52
56
|
set_safe_public_env(public_env);
|
|
53
57
|
|
|
54
58
|
if (!this.#options.hooks) {
|
package/src/types/ambient.d.ts
CHANGED
|
@@ -86,11 +86,16 @@ declare module '__sveltekit/environment' {
|
|
|
86
86
|
* SvelteKit analyses your app during the `build` step by running it. During this process, `building` is `true`. This also applies during prerendering.
|
|
87
87
|
*/
|
|
88
88
|
export const building: boolean;
|
|
89
|
+
/**
|
|
90
|
+
* True during prerendering, false otherwise.
|
|
91
|
+
*/
|
|
92
|
+
export const prerendering: boolean;
|
|
89
93
|
/**
|
|
90
94
|
* The value of `config.kit.version.name`.
|
|
91
95
|
*/
|
|
92
96
|
export const version: string;
|
|
93
97
|
export function set_building(): void;
|
|
98
|
+
export function set_prerendering(): void;
|
|
94
99
|
}
|
|
95
100
|
|
|
96
101
|
/** Internal version of $app/paths */
|
package/src/types/internal.d.ts
CHANGED
|
@@ -27,8 +27,9 @@ export interface ServerModule {
|
|
|
27
27
|
}
|
|
28
28
|
|
|
29
29
|
export interface ServerInternalModule {
|
|
30
|
-
set_building(building: boolean): void;
|
|
31
30
|
set_assets(path: string): void;
|
|
31
|
+
set_building(): void;
|
|
32
|
+
set_prerendering(): void;
|
|
32
33
|
set_private_env(environment: Record<string, string>): void;
|
|
33
34
|
set_public_env(environment: Record<string, string>): void;
|
|
34
35
|
set_safe_public_env(environment: Record<string, string>): void;
|
package/src/version.js
CHANGED
package/types/index.d.ts
CHANGED
|
@@ -161,14 +161,6 @@ declare module '@sveltejs/kit' {
|
|
|
161
161
|
extensions?: string[];
|
|
162
162
|
/** SvelteKit options */
|
|
163
163
|
kit?: KitConfig;
|
|
164
|
-
/** [`@sveltejs/package`](/docs/packaging) options. */
|
|
165
|
-
package?: {
|
|
166
|
-
source?: string;
|
|
167
|
-
dir?: string;
|
|
168
|
-
emitTypes?: boolean;
|
|
169
|
-
exports?(filepath: string): boolean;
|
|
170
|
-
files?(filepath: string): boolean;
|
|
171
|
-
};
|
|
172
164
|
/** Preprocessor options, if any. Preprocessing can alternatively also be done through Vite's preprocessor capabilities. */
|
|
173
165
|
preprocess?: any;
|
|
174
166
|
/** `vite-plugin-svelte` plugin options. */
|
|
@@ -2185,11 +2177,16 @@ declare module '__sveltekit/environment' {
|
|
|
2185
2177
|
* SvelteKit analyses your app during the `build` step by running it. During this process, `building` is `true`. This also applies during prerendering.
|
|
2186
2178
|
*/
|
|
2187
2179
|
export const building: boolean;
|
|
2180
|
+
/**
|
|
2181
|
+
* True during prerendering, false otherwise.
|
|
2182
|
+
*/
|
|
2183
|
+
export const prerendering: boolean;
|
|
2188
2184
|
/**
|
|
2189
2185
|
* The value of `config.kit.version.name`.
|
|
2190
2186
|
*/
|
|
2191
2187
|
export const version: string;
|
|
2192
2188
|
export function set_building(): void;
|
|
2189
|
+
export function set_prerendering(): void;
|
|
2193
2190
|
}
|
|
2194
2191
|
|
|
2195
2192
|
/** Internal version of $app/paths */
|
package/types/index.d.ts.map
CHANGED
|
@@ -143,5 +143,5 @@
|
|
|
143
143
|
null,
|
|
144
144
|
null
|
|
145
145
|
],
|
|
146
|
-
"mappings": ";;;;;;;;;kBA2BiBA,OAAOA;;;;;;;;;;;;aAYZC,cAAcA;;;;;;aAMdC,cAAcA;;;;;;;;;;;;;;;kBAeTC,aAAaA;;;;;;;;;;;;;;;;kBAgBbC,OAAOA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBA4FPC,MAAMA
|
|
146
|
+
"mappings": ";;;;;;;;;kBA2BiBA,OAAOA;;;;;;;;;;;;aAYZC,cAAcA;;;;;;aAMdC,cAAcA;;;;;;;;;;;;;;;kBAeTC,aAAaA;;;;;;;;;;;;;;;;kBAgBbC,OAAOA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBA4FPC,MAAMA;;;;;;;;;;;;;;;;;;;;;kBAqBNC,OAAOA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAyDPC,SAASA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAuYdC,MAAMA;;;;;;;;;;;aAWNC,iBAAiBA;;;;;;;;;;;;;aAajBC,iBAAiBA;;;;;;;;;;aAUjBC,WAAWA;;;;;;;;;;aAUXC,IAAIA;;;;;;;;;;;;kBAYCC,SAASA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBA4GTC,eAAeA;;;;;;;;;;;;;;;;;;;;;;;;;;kBA0BfC,gBAAgBA;;;;;;;;;;;;;;;;;;;;;;;;aAwBrBC,cAAcA;;kBAETC,UAAUA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAoCVC,cAAcA;;;;;;;;;;kBAUdC,UAAUA;;;;;;;;;;;;;;;;;;kBAkBVC,aAAaA;;;;;;;;;;;;;;;;;;;kBAmBbC,IAAIA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aA8CTC,YAAYA;;kBAEPC,YAAYA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aA4FjBC,cAAcA;;;;;kBAKTC,cAAcA;;;;;;;;;;;;;;;;;;;;;;;kBAuBdC,eAAeA;;;;;;;;;;;;;;;cAenBC,MAAMA;;;;;;kBAMFC,iBAAiBA;;;;kBAIjBC,WAAWA;;;;;;;;;;;;;;;;;;;aAmBhBC,UAAUA;;;;;;;kBAOLC,eAAeA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAqEpBC,MAAMA;;;;;;;;;;aAUNC,OAAOA;;;;;;;;;;;;;;;;aAgBPC,YAAYA;;;;;;;;;;;;kBCluCXC,SAASA;;;;;;;;;;kBAqBTC,QAAQA;;;;;;;aD0uCTC,cAAcA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBA6BTC,QAAQA;;;;WEtxCRC,YAAYA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WAkDZC,GAAGA;;;;;;;;;;;;;;;;;;;;;;WAsBHC,aAAaA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAmElBC,UAAUA;;WAELC,MAAMA;;;;;;;;;MASXC,YAAYA;;WAEPC,WAAWA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WAmCXC,yBAAyBA;;;;;;;;;;WAUzBC,yBAAyBA;;;;WAIzBC,sCAAsCA;;;;MAI3CC,8BAA8BA;MAC9BC,8BAA8BA;MAC9BC,2CAA2CA;;;;;;aAM3CC,eAAeA;;WAIVC,cAAcA;;;;;WAKdC,YAAYA;;;;;;MAMjBC,aAAaA;WCnMRC,KAAKA;;;;;;WAaLC,SAASA;;;;;;;;;;;;;;;;WAuETC,YAAYA;;;;;;;WAOZC,QAAQA;;;;;;;;;;;;;MAwBbC,iBAAiBA;;;;;;;;WAUZC,UAAUA;;;;;;;;;;;;;WAaVC,SAASA;;;;;;;;;;;;;;;;;;;;;;;WAsGTC,YAAYA;;;;;;;;;;;;;MAajBC,kBAAkBA;;WAEbC,OAAOA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAsCZC,aAAaA;;WA2BRC,eAAeA;;;;;;MAMpBC,uBAAuBA;;MAEvBC,WAAWA;;;;;;;;WAQNC,QAAQA;;;;;;;;;MAyCbC,eAAeA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBCtVXC,WAAWA;;;;;;;;;;;iBAcXC,QAAQA;;;;;iBAaRC,UAAUA;;;;;;iBASVC,IAAIA;;;;;;iBA8BJC,IAAIA;;;;;;;;;;;;aApI6CC,QAAQA;aAMVC,YAAYA;cCX9DC,OAAOA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBCiEJC,QAAQA;;;;iBC+BFC,UAAUA;;;;;;iBAeVC,WAAWA;;;;;;;;;iBChGjBC,gBAAgBA;;;;;;;iBC8GVC,SAASA;;;;;;;;cC1HlBC,OAAOA;;;;cAKPC,GAAGA;;;;;;;;iBCEAC,WAAWA;;;;;;;;;;;;;;;;;;;iBA8BXC,WAAWA;;;;;;;;;;;;;;;;;;;;;iBAyCXC,OAAOA;;;;;;;;;;cC7EVC,qBAAqBA;;;;;;;;cAgBrBC,IAAIA;;;;;;;;;;;;;;;;;;;;;;;;cAqBJC,UAAUA;;;;cAOVC,aAAaA;;;;;;;;;;;;cAebC,WAAWA;;;;;;;;;;;cAeXC,WAAWA;;;;;;;;;;;;cAgBXC,cAAcA;;;;;;;;;;cAcdC,UAAUA;;;;;;cAUVC,aAAaA;;;;;cAUbC,SAASA;;;;;cAUTC,YAAYA;MVebxD,YAAYA;;;;;;;;;;;;;;;;;;iBWxIRyD,YAAYA;;;;iBCZfC,SAASA;;;;;;;;;;;;;;cAwBTC,IAAIA;;;;;;;;cAeJC,UAAUA;;;;;;cAaVC,OAAOA"
|
|
147
147
|
}
|
package/src/runtime/app/env.js
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
throw new Error('$app/env has been renamed to $app/environment');
|