Skip to content

Commit 0499779

Browse files
committed
fix single flight in ssr false
1 parent e60e0b6 commit 0499779

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed

.changeset/dry-shrimps-repeat.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@solidjs/start": patch
3+
---
4+
5+
fix single flight in ssr false

packages/start/config/fs-router.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ export class SolidStartClientFileRouter extends BaseFileSystemRouter {
2424

2525
if (src.endsWith(".md") || src.endsWith(".mdx")) {
2626
return {
27+
page: true,
2728
$component: {
2829
src: src,
2930
pick: ["$css"]
@@ -35,10 +36,11 @@ export class SolidStartClientFileRouter extends BaseFileSystemRouter {
3536
}
3637

3738
const [_, exports] = analyzeModule(src);
38-
const hasDefault = exports.find(e => e.n === "default");
39-
const hasRouteConfig = exports.find(e => e.n === "route");
39+
const hasDefault = !!exports.find(e => e.n === "default");
40+
const hasRouteConfig = !!exports.find(e => e.n === "route");
4041
if (hasDefault) {
4142
return {
43+
page: true,
4244
$component: {
4345
src: src,
4446
pick: ["default", "$css"]
@@ -93,6 +95,7 @@ export class SolidStartServerFileRouter extends BaseFileSystemRouter {
9395
let path = this.toPath(src);
9496
if (src.endsWith(".md") || src.endsWith(".mdx")) {
9597
return {
98+
page: true,
9699
$component: {
97100
src: src,
98101
pick: ["$css"]
@@ -105,10 +108,11 @@ export class SolidStartServerFileRouter extends BaseFileSystemRouter {
105108

106109
const [_, exports] = analyzeModule(src);
107110
const hasRouteConfig = exports.find(e => e.n === "route");
108-
const hasDefault = exports.find(e => e.n === "default");
109-
const hasAPIRoutes = exports.find(exp => HTTP_METHODS.includes(exp.n));
111+
const hasDefault = !!exports.find(e => e.n === "default");
112+
const hasAPIRoutes = !!exports.find(exp => HTTP_METHODS.includes(exp.n));
110113
if (hasDefault || hasAPIRoutes) {
111114
return {
115+
page: hasDefault,
112116
$component:
113117
!this.config.dataOnly && hasDefault
114118
? {

packages/start/src/router/FileRoutes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export function createRoutes() {
1414
...(route.$$route ? route.$$route.require().route.info : {}),
1515
filesystem: true
1616
},
17-
component: lazyRoute(
17+
component: route.$component && lazyRoute(
1818
route.$component,
1919
import.meta.env.START_ISLANDS
2020
? import.meta.env.MANIFEST["ssr"]

packages/start/src/router/routes.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ interface Route {
55
path: string;
66
id: string;
77
children?: Route[];
8+
page?: boolean;
89
$component?: any;
910
$GET?: any;
1011
$POST?: any;
@@ -23,7 +24,7 @@ declare module "vinxi/routes" {
2324
}
2425

2526
export const pageRoutes = defineRoutes(
26-
(fileRoutes as unknown as Route[]).filter(o => o.$component)
27+
(fileRoutes as unknown as Route[]).filter(o => o.page)
2728
);
2829

2930
function defineRoutes(fileRoutes: Route[]) {

0 commit comments

Comments
 (0)