Skip to content

Omit route components from non-SSR builds when ssr: false #1481

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
ryansolid merged 4 commits into from
May 20, 2024
Merged

Omit route components from non-SSR builds when ssr: false #1481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ffabe26
dataOnly server fs routing
Brendonovich May 18, 2024
a4fe60a
Merge branch 'main' into dataOnly-routes-when-CSR
Brendonovich May 18, 2024
31c1c01
Create twenty-monkeys-marry.md
Brendonovich May 18, 2024
c904644
Merge branch 'main' into dataOnly-routes-when-CSR
ryansolid May 20, 2024
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/twenty-monkeys-marry.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@solidjs/start": patch
---

Omit route components from non-SSR builds
13 changes: 7 additions & 6 deletions packages/start/config/fs-router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,13 @@ export class SolidStartServerFileRouter extends BaseFileSystemRouter {
const hasAPIRoutes = exports.find(exp => HTTP_METHODS.includes(exp.n));
if (hasDefault || hasAPIRoutes) {
return {
$component: hasDefault
? {
src: src,
pick: ["default", "$css"]
}
: undefined,
$component:
!this.config.dataOnly && hasDefault
? {
src: src,
pick: ["default", "$css"]
}
: undefined,
$$route: hasRouteConfig
? {
src: src,
Expand Down
20 changes: 13 additions & 7 deletions packages/start/config/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ function solidStartServerFsRouter(config) {
new SolidStartServerFileRouter(
{
dir: resolve.absolute(config.dir, router.root),
extensions: config.extensions ?? DEFAULT_EXTENSIONS
extensions: config.extensions ?? DEFAULT_EXTENSIONS,
dataOnly: config.dataOnly
},
router,
app
Expand Down Expand Up @@ -90,7 +91,7 @@ export function defineConfig(baseConfig = {}) {
},
handler: `${start.appRoot}/entry-server${entryExtension}`,
middleware: start.middleware,
routes: solidStartServerFsRouter({ dir: routeDir, extensions }),
routes: solidStartServerFsRouter({ dir: routeDir, extensions, dataOnly: !start.ssr }),
extensions,
target: "server",
plugins: async () => {
Expand Down Expand Up @@ -133,7 +134,9 @@ export function defineConfig(baseConfig = {}) {
},
cacheDir: "node_modules/.vinxi/server",
define: {
"import.meta.env.START_APP": JSON.stringify(`${start.appRoot}/app${entryExtension}`),
"import.meta.env.START_APP": JSON.stringify(
`${start.appRoot}/app${entryExtension}`
),
"import.meta.env.START_ISLANDS": JSON.stringify(start.experimental.islands),
"import.meta.env.SSR": JSON.stringify(true),
"import.meta.env.START_SSR": JSON.stringify(start.ssr),
Expand Down Expand Up @@ -201,7 +204,9 @@ export function defineConfig(baseConfig = {}) {
},
cacheDir: "node_modules/.vinxi/client",
define: {
"import.meta.env.START_APP": JSON.stringify(`${start.appRoot}/app${entryExtension}`),
"import.meta.env.START_APP": JSON.stringify(
`${start.appRoot}/app${entryExtension}`
),
"import.meta.env.START_ISLANDS": JSON.stringify(start.experimental.islands),
"import.meta.env.SSR": JSON.stringify(false),
"import.meta.env.START_SSR": JSON.stringify(start.ssr),
Expand All @@ -213,7 +218,6 @@ export function defineConfig(baseConfig = {}) {
];
}
},

{
name: "server-fns",
type: "http",
Expand All @@ -223,7 +227,7 @@ export function defineConfig(baseConfig = {}) {
),
middleware: start.middleware,
target: "server",
routes: solidStartServerFsRouter({ dir: routeDir, extensions }),
routes: solidStartServerFsRouter({ dir: routeDir, extensions, dataOnly: !start.ssr }),
plugins: async () => {
const userConfig =
typeof vite === "function" ? await vite({ router: "server-function" }) : { ...vite };
Expand Down Expand Up @@ -263,7 +267,9 @@ export function defineConfig(baseConfig = {}) {
}
},
define: {
"import.meta.env.START_APP": JSON.stringify(`${start.appRoot}/app${entryExtension}`),
"import.meta.env.START_APP": JSON.stringify(
`${start.appRoot}/app${entryExtension}`
),
"import.meta.env.START_ISLANDS": JSON.stringify(start.experimental.islands),
"import.meta.env.SSR": JSON.stringify(true),
"import.meta.env.START_SSR": JSON.stringify(start.ssr),
Expand Down