Skip to content

[fix] prerendering path and layout fixes #7639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 14, 2022
Merged

[fix] prerendering path and layout fixes #7639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/curly-suits-lay.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

[fix] prerendering path and layout fixes
6 changes: 4 additions & 2 deletions packages/kit/src/core/generate_manifest/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@ export function generate_manifest({ build_data, relative_path, routes, format =
*/
const reindexed = new Map();
/**
* @type {Set<any>} All nodes actually used in the routes definition (prerendered routes are omitted)
* All nodes actually used in the routes definition (prerendered routes are omitted).
* Root layout/error is always included as they are needed for 404 and root errors.
* @type {Set<any>}
*/
const used_nodes = new Set();
const used_nodes = new Set([0, 1]);

for (const route of routes) {
if (route.page) {
Expand Down
6 changes: 4 additions & 2 deletions packages/kit/src/exports/vite/preview/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { pathToFileURL } from 'url';
import { getRequest, setResponse } from '../../../exports/node/index.js';
import { installPolyfills } from '../../../exports/node/polyfills.js';
import { SVELTE_KIT_ASSETS } from '../../../constants.js';
import { loadEnv } from 'vite';
import { loadEnv, normalizePath } from 'vite';

/** @typedef {import('http').IncomingMessage} Req */
/** @typedef {import('http').ServerResponse} Res */
Expand Down Expand Up @@ -100,7 +100,9 @@ export async function preview(vite, vite_config, svelte_config) {

const { pathname } = new URL(/** @type {string} */ (req.url), 'http://dummy');

let filename = join(svelte_config.kit.outDir, 'output/prerendered/pages' + pathname);
let filename = normalizePath(
join(svelte_config.kit.outDir, 'output/prerendered/pages' + pathname)
);
let prerendered = is_file(filename);

if (!prerendered) {
Expand Down