Stop choking if BASE_URL includes origin (fix #979)

solidjs · Aug 11, 2023 · faf3f92 · faf3f92
1 parent 0dd5953
commit faf3f92
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/packages/start/entry-client/StartClient.tsx b/packages/start/entry-client/StartClient.tsx
@@ -80,10 +80,22 @@ export default () => {
     );
   }
 
+  const BASE_URL = import.meta.env.BASE_URL;
+  let basePath = BASE_URL;
+  if (BASE_URL.startsWith("http")) {
+    try {
+      // SolidRouter expects a pathname for the `base` prop, not a full URL.
+      const url = new URL(BASE_URL);
+      basePath = url.pathname;
+    } catch (e) {
+      console.warn('BASE_URL starts with http, but `new URL` failed to parse it. Please check your BASE_URL:', BASE_URL);
+    }
+  }
+
   return (
     <ServerContext.Provider value={mockFetchEvent}>
       <MetaProvider>
-        <StartRouter base={import.meta.env.BASE_URL} data={dataFn}>
+        <StartRouter base={basePath} data={dataFn}>
           <Root />
         </StartRouter>
       </MetaProvider>