Skip to content

fix: prerender optional parameters as empty when entries contains '*' #11178

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
benmccann merged 13 commits into from
Dec 12, 2023
Merged

fix: prerender optional parameters as empty when entries contains '*' #11178

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5a67927
Prerender optional params without value
LorisSigrist Dec 2, 2023
234cb59
Merge branch 'master' into 11133-crawl-optional-param-at-root
LorisSigrist Dec 2, 2023
d8c4bdf
Format, Lint & fix lockfile
LorisSigrist Dec 2, 2023
4a8d717
Add changeset
LorisSigrist Dec 2, 2023
bcfe4dd
Update packages/kit/src/core/postbuild/prerender.js
LorisSigrist Dec 3, 2023
a32a5b3
Update .changeset/good-jars-relax.md
LorisSigrist Dec 3, 2023
e382995
Move test from own project into `prerendering/basics`
LorisSigrist Dec 3, 2023
1b862f0
Merge remote-tracking branch 'origin/11133-crawl-optional-param-at-ro…
LorisSigrist Dec 3, 2023
d4697c9
Update KitConfig.entries description
LorisSigrist Dec 3, 2023
24c4589
Hopefully fix test on ubuntu
LorisSigrist Dec 3, 2023
02269ae
Update packages/kit/src/exports/public.d.ts
benmccann Dec 12, 2023
ff3ee54
Merge branch 'version-2' into 11133-crawl-optional-param-at-root
benmccann Dec 12, 2023
37cfe14
update types
benmccann Dec 12, 2023
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/good-jars-relax.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

fix: Prerender optional parameters without value
8 changes: 6 additions & 2 deletions packages/kit/src/core/postbuild/prerender.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,8 +429,12 @@ async function prerender({ out, manifest_path, metadata, verbose, env }) {
if (entry === '*') {
for (const [id, prerender] of prerender_map) {
if (prerender) {
if (id.includes('[')) continue;
const path = `/${get_route_segments(id).join('/')}`;
//Remove optional parameters from the route
const segments = get_route_segments(id).filter((segment) => !segment.startsWith('[['));
const processed_id = '/' + segments.join('/');

if (processed_id.includes('[')) continue;
const path = `/${get_route_segments(processed_id).join('/')}`;
enqueue(null, config.paths.base + path);
}
}
Expand Down
21 changes: 21 additions & 0 deletions packages/kit/test/prerendering/optional-params/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"name": "prerendering-test-optional-params",
"private": true,
"version": "0.0.1",
"scripts": {
"dev": "vite dev",
"build": "vite build",
"preview": "vite preview",
"check": "svelte-kit sync && tsc && svelte-check",
"test": "svelte-kit sync && pnpm build && vitest run"
},
"devDependencies": {
"@sveltejs/kit": "workspace:^",
"svelte": "^4.2.2",
"svelte-check": "^3.4.4",
"typescript": "^4.9.4",
"vite": "^4.4.9",
"vitest": "^0.34.5"
},
"type": "module"
}
12 changes: 12 additions & 0 deletions packages/kit/test/prerendering/optional-params/src/app.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="icon" href="%sveltekit.assets%/favicon.png" />
%sveltekit.head%
</head>
<body>
%sveltekit.body%
</body>
</html>
1 change: 1 addition & 0 deletions packages/kit/test/prerendering/optional-params/src/routes/+layout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const prerender = true;
1 change: 1 addition & 0 deletions packages/kit/test/prerendering/optional-params/src/routes/[[lang]]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<a href="/en">English</a>
10 changes: 10 additions & 0 deletions packages/kit/test/prerendering/optional-params/svelte.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import adapter from '../../../../adapter-static/index.js';

/** @type {import('@sveltejs/kit').Config} */
const config = {
kit: {
adapter: adapter()
}
};

export default config;
19 changes: 19 additions & 0 deletions packages/kit/test/prerendering/optional-params/test/tests.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import * as fs from 'node:fs';
import { fileURLToPath } from 'node:url';
import { expect, test } from 'vitest';
import { replace_hydration_attrs } from '../../test-utils';

const build = fileURLToPath(new URL('../build', import.meta.url));

/** @param {string} file */
const read = (file) => fs.readFileSync(`${build}/${file}`, 'utf-8');

test('prerenders /', () => {
const content = replace_hydration_attrs(read('index.html'));
expect(content).toContain('<a href="/en">English</a>');
});

test('prerenders nested /en', () => {
const content = replace_hydration_attrs(read('en.html'));
expect(content).toContain('<a href="/en">English</a>');
});
16 changes: 16 additions & 0 deletions packages/kit/test/prerendering/optional-params/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"compilerOptions": {
"allowJs": true,
"checkJs": true,
"noEmit": true,
"module": "esnext",
"moduleResolution": "node",
"paths": {
"@sveltejs/kit": ["../../../types"],
"$lib": ["./src/lib"],
"$lib/*": ["./src/lib/*"],
"types": ["../../../types/internal"]
}
},
"extends": "./.svelte-kit/tsconfig.json"
}
23 changes: 23 additions & 0 deletions packages/kit/test/prerendering/optional-params/vite.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import * as path from 'node:path';
import { sveltekit } from '@sveltejs/kit/vite';

/** @type {import('vite').UserConfig} */
const config = {
build: {
minify: false
},

clearScreen: false,

logLevel: 'silent',

plugins: [sveltekit()],

server: {
fs: {
allow: [path.resolve('../../../src')]
}
}
};

export default config;
109 changes: 98 additions & 11 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.