Skip to content

Commit f7fad6a

Browse files
committed
determine prerenderability based on config, not state
1 parent e6567cf commit f7fad6a

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
lines changed

packages/kit/src/core/build/build_server.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,10 @@ export class Server {
7171
method_override: ${s(config.kit.methodOverride)},
7272
paths: { base, assets },
7373
prefix: assets + '/${config.kit.appDir}/',
74-
prerender: ${config.kit.prerender.enabled},
74+
prerender: {
75+
default: ${config.kit.prerender.default},
76+
enabled: ${config.kit.prerender.enabled}
77+
},
7578
read,
7679
root,
7780
service_worker: ${has_service_worker ? "base + '/service-worker.js'" : 'null'},

packages/kit/src/core/dev/plugin.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,10 @@ export async function create_plugin(config, cwd) {
320320
assets
321321
},
322322
prefix: '',
323-
prerender: config.kit.prerender.enabled,
323+
prerender: {
324+
default: config.kit.prerender.default,
325+
enabled: config.kit.prerender.enabled
326+
},
324327
read: (file) => fs.readFileSync(path.join(config.kit.files.assets, file)),
325328
root,
326329
router: config.kit.browser.router,

packages/kit/src/runtime/server/page/load_node.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export async function load_node({
5252
/** @type {import('types').LoadOutput} */
5353
let loaded;
5454

55-
const should_prerender = node.module.prerender ?? state?.prerender?.default ?? false;
55+
const should_prerender = node.module.prerender ?? options.prerender.default;
5656

5757
/** @type {import('types').ShadowData} */
5858
const shadow = is_leaf

packages/kit/types/internal.d.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,10 @@ export interface SSROptions {
255255
assets: string;
256256
};
257257
prefix: string;
258-
prerender: boolean;
258+
prerender: {
259+
default: boolean;
260+
enabled: boolean;
261+
};
259262
read(file: string): Buffer;
260263
root: SSRComponent['default'];
261264
router: boolean;

0 commit comments

Comments
 (0)