Skip to content

Commit ecf414b

Browse files
authored
Merge pull request #7576 from maiieul/1.14.0-alpha-fix-SPA-nav
fix(qwik): preloader & SPA Link nav
2 parents b834b3e + 26edede commit ecf414b

File tree

3 files changed

+22
-5
lines changed

3 files changed

+22
-5
lines changed

.vscode/launch.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,18 @@
4040
"program": "${workspaceFolder}/packages/docs/node_modules/vite/bin/vite.js",
4141
"args": ["build", "-c", "adapters/cloudflare-pages/vite.config.mts"]
4242
},
43+
{
44+
"type": "node",
45+
"name": "preloader-test build.client",
46+
"request": "launch",
47+
"runtimeExecutable": "pnpm",
48+
"runtimeArgs": [
49+
"run",
50+
"build.client"
51+
],
52+
"skipFiles": ["<node_internals>/**"],
53+
"cwd": "${workspaceFolder}/starters/apps/preloader-test"
54+
},
4355
{
4456
"type": "node",
4557
"name": "e2e.test",

packages/qwik-city/src/buildtime/vite/get-route-imports.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ export function getRouteImports(routes: BuildRoute[], manifest: QwikManifest) {
2626
for (const bundleName of Object.keys(manifest.bundles)) {
2727
const bundle = manifest.bundles[bundleName];
2828
if (bundle.origins?.some((s) => s.endsWith(QWIK_CITY_PLAN_ID))) {
29-
// Don't consider the city plan for preloading
30-
// we keep imports because something might be bundled with it
31-
result[bundleName] = { imports: bundle.imports, dynamicImports: [] };
29+
result[bundleName] = {
30+
...bundle,
31+
dynamicImports: bundle.dynamicImports?.filter((d) => d.includes('menu')),
32+
};
3233
break;
3334
}
3435
}

packages/qwik-city/src/buildtime/vite/get-route-imports.unit.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,12 @@ describe('modifyBundleGraph', () => {
6464
],
6565
},
6666
"q-city-plan.js": {
67-
"dynamicImports": [],
68-
"imports": undefined,
67+
"dynamicImports": undefined,
68+
"origins": [
69+
"@qwik-city-plan",
70+
],
71+
"size": 0,
72+
"total": 0,
6973
},
7074
}
7175
`);

0 commit comments

Comments
 (0)