Skip to content

fix: allow .jsx entry-server #2090

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

Open
huseeiin wants to merge 6 commits into
base: main
Choose a base branch
from
Open

fix: allow .jsx entry-server #2090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
73cd223
fix: allow .jsx entry-server
huseeiin Feb 27, 2026
f63eabb
format
huseeiin Feb 27, 2026
e8ced90
fix
huseeiin Feb 27, 2026
9e3908f
make it better
huseeiin Feb 27, 2026
9ed1f8b
better
huseeiin Feb 27, 2026
5484edc
fix
huseeiin Feb 27, 2026
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
2 changes: 1 addition & 1 deletion packages/start/src/config/dev-server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export function devServer(): Array<PluginOption> {
try {
const serverEntry: {
default: { fetch: (req: Request) => Promise<Response> };
} = await serverEnv.runner.import("./src/entry-server.tsx");
} = await serverEnv.runner.import(START_HANDLERS.server);

const webRes = await serverEntry.default.fetch(webReq);

Expand Down
14 changes: 7 additions & 7 deletions packages/start/src/config/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export function solidStart(options?: SolidStartOptions): Array<PluginOption> {
throw new Error(`Could not find an app jsx/tsx entry in ${start.appRoot}.`);
}
const entryExtension = extname(appEntryPath);
const handlers = {
globalThis.START_HANDLERS = {
client: `${start.appRoot}/entry-client${entryExtension}`,
server: `${start.appRoot}/entry-server${entryExtension}`,
};
Expand All @@ -74,7 +74,7 @@ export function solidStart(options?: SolidStartOptions): Array<PluginOption> {
};
},
async config(_, env) {
const clientInput = [handlers.client];
const clientInput = [START_HANDLERS.client];
if (env.command === "build") {
const clientRouter: BaseFileSystemRouter = (globalThis as any).ROUTERS.client;
for (const route of await clientRouter.getRoutes()) {
Expand Down Expand Up @@ -113,7 +113,7 @@ export function solidStart(options?: SolidStartOptions): Array<PluginOption> {
manifest: true,
copyPublicDir: false,
rollupOptions: {
input: "~/entry-server.tsx",
input: `~/entry-server${entryExtension}`,
},
outDir: "dist/server",
commonjsOptions: {
Expand All @@ -124,7 +124,7 @@ export function solidStart(options?: SolidStartOptions): Array<PluginOption> {
},
resolve: {
alias: {
"@solidjs/start/server/entry": handlers.server,
"@solidjs/start/server/entry": START_HANDLERS.server,
"~": join(process.cwd(), start.appRoot),
...(!start.ssr
? {
Expand All @@ -140,7 +140,7 @@ export function solidStart(options?: SolidStartOptions): Array<PluginOption> {
// Use JSON.stringify so backslashes on Windows are escaped and
// esbuild receives a valid JS string literal for the define value
"import.meta.env.START_APP_ENTRY": JSON.stringify(appEntryPath),
"import.meta.env.START_CLIENT_ENTRY": JSON.stringify(handlers.client),
"import.meta.env.START_CLIENT_ENTRY": JSON.stringify(START_HANDLERS.client),
"import.meta.env.START_DEV_OVERLAY": JSON.stringify(start.devOverlay),
"import.meta.env.SEROVAL_MODE": JSON.stringify(start.serialization?.mode || "json"),
},
Expand Down Expand Up @@ -217,8 +217,8 @@ export function solidStart(options?: SolidStartOptions): Array<PluginOption> {
const { filename, query } = parseIdQuery(id);

let base;
if (filename === VIRTUAL_MODULES.clientEntry) base = handlers.client;
if (filename === VIRTUAL_MODULES.serverEntry) base = handlers.server;
if (filename === VIRTUAL_MODULES.clientEntry) base = START_HANDLERS.client;
if (filename === VIRTUAL_MODULES.serverEntry) base = START_HANDLERS.server;
if (filename === VIRTUAL_MODULES.app) base = appEntryPath;

if (base) {
Expand Down
4 changes: 4 additions & 0 deletions packages/start/src/internal.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,8 @@ import type { Rollup } from "vite";
declare global {
var START_CLIENT_BUNDLE: Rollup.OutputBundle;
var USING_SOLID_START_DEV_SERVER: boolean | undefined;
var START_HANDLERS: {
client: string;
server: string;
};
}
Loading