Skip to content

fix: strip baseURL prefix before matching API routes #2117

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
themavik wants to merge 2 commits into
base: main
Choose a base branch
from
+11 −4
Open

fix: strip baseURL prefix before matching API routes #2117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee320a1
fix: strip baseURL prefix before matching API routes (#2106)
themavik Mar 19, 2026
638dfff
Merge branch 'main' into fix/2106-api-routes-base-url
brenelz Mar 19, 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
5 changes: 4 additions & 1 deletion packages/start/src/config/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export function solidStart(options?: SolidStartOptions): Array<PluginOption> {
},
};
},
async config(_, env) {
async config(config, env) {
const clientInput = [handlers.client];
if (env.command === "build") {
const clientRouter: BaseFileSystemRouter = (globalThis as any).ROUTERS.client;
Expand Down Expand Up @@ -143,6 +143,9 @@ export function solidStart(options?: SolidStartOptions): Array<PluginOption> {
"import.meta.env.START_CLIENT_ENTRY": JSON.stringify(handlers.client),
"import.meta.env.START_DEV_OVERLAY": JSON.stringify(start.devOverlay),
"import.meta.env.SEROVAL_MODE": JSON.stringify(start.serialization?.mode || "json"),
"import.meta.env.SERVER_BASE_URL": JSON.stringify(
(config as { server?: { baseURL?: string } })?.server?.baseURL ?? "",
),
},
builder: {
sharedPlugins: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/start/src/env.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ interface SolidStartMetaEnv {
START_CLIENT_ENTRY: string;
START_ISLANDS: boolean;
// START_DEV_OVERLAY: boolean;
// SERVER_BASE_URL: string;
SERVER_BASE_URL: string;
}
8 changes: 6 additions & 2 deletions packages/start/src/server/handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,10 @@ function produceResponseWithEventHeaders(res: Response) {
}

function stripBaseUrl(path: string) {
if (import.meta.env.BASE_URL === "/" || import.meta.env.BASE_URL === "") return path;
return path.slice(import.meta.env.BASE_URL.length);
const base =
import.meta.env.SERVER_BASE_URL || import.meta.env.BASE_URL || "/";
if (base === "/" || base === "") return path;
const normalizedBase = base.endsWith("/") ? base.slice(0, -1) : base;
if (normalizedBase === "") return path;
return path.startsWith(normalizedBase) ? path.slice(normalizedBase.length) || "/" : path;
}
Loading