Skip to content

Commit efc2a4a

Browse files
chore: separate generated from non-generated server code (#8429)
* rename node.server to node.has_server_load - more descriptive * rename core/prerender to core/postbuild * fix * move logic around * rename server/index.js to server/respond.js * move some logic around * move some stuff around * remove options.paths * move read to internal request options * remove version from SSROptions * tidy up * add note * tidy up * remove public_env from SSROptions * move logic to sync * notes to self * WIP * hack around the problem * oops * partial solution to stack traces * fix a few more tests * insane * use __SVELTEKIT_DEV__ instead of state.dev * fix * set globalThis.__SVELTEKIT_DEV__ * tidy some stuff up * add ambient declaration * set paths correctly * remove import * DRY * reduce indirection * use private fields * separate manifest from server configuration * tidy up * exclude SvelteKit deps from Vite processing * regenerate server-internal.js as necessary * tidy up * see if this fixes windows * of course it's a path separator issue * remove unused exports * tidy up, see if this still works in windows * remove some unused code * Create gorgeous-actors-run.md Co-authored-by: Simon Holthausen <simon.holthausen@vercel.com>
1 parent b6c238a commit efc2a4a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1061
-1002
lines changed

.changeset/gorgeous-actors-run.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@sveltejs/kit": patch
3+
---
4+
5+
chore: separate generated from non-generated server code

.prettierrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"packages/package/test/fixtures/**/expected/**/*",
2626
"packages/package/test/watch/expected/**/*",
2727
"packages/package/test/watch/package/**/*",
28-
"packages/kit/src/core/prerender/fixtures/**/*",
28+
"packages/kit/src/core/postbuild/fixtures/**/*",
2929
"packages/migrate/migrations/routes/*/samples.md"
3030
],
3131
"options": {

packages/kit/src/core/adapt/builder.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ export function create_builder({ config, build_data, routes, prerendered, log })
126126

127127
generateFallback(dest) {
128128
// do prerendering in a subprocess so any dangling stuff gets killed upon completion
129-
const script = fileURLToPath(new URL('../prerender/fallback.js', import.meta.url));
129+
const script = fileURLToPath(new URL('../postbuild/fallback.js', import.meta.url));
130130

131131
const manifest_path = `${config.kit.outDir}/output/server/manifest-full.js`;
132132

packages/kit/src/core/prerender/fallback.js renamed to packages/kit/src/core/postbuild/fallback.js

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,19 @@ installPolyfills();
1414

1515
const server_root = join(config.outDir, 'output');
1616

17+
/** @type {import('types').ServerInternalModule} */
18+
const { set_building, set_paths } = await import(
19+
pathToFileURL(`${server_root}/server/internal.js`).href
20+
);
21+
1722
/** @type {import('types').ServerModule} */
18-
const { Server, override } = await import(pathToFileURL(`${server_root}/server/index.js`).href);
23+
const { Server } = await import(pathToFileURL(`${server_root}/server/index.js`).href);
1924

2025
/** @type {import('types').SSRManifest} */
2126
const manifest = (await import(pathToFileURL(manifest_path).href)).manifest;
2227

23-
override({
24-
building: true,
25-
paths: config.paths,
26-
read: (file) => readFileSync(join(config.files.assets, file))
27-
});
28+
set_building(true);
29+
set_paths(config.paths);
2830

2931
const server = new Server(manifest);
3032
await server.init({ env: JSON.parse(env) });
@@ -36,7 +38,8 @@ const rendered = await server.respond(new Request(config.prerender.origin + '/[f
3638
prerendering: {
3739
fallback: true,
3840
dependencies: new Map()
39-
}
41+
},
42+
read: (file) => readFileSync(join(config.files.assets, file))
4043
});
4144

4245
mkdirp(dirname(dest));

0 commit comments

Comments
 (0)