#178 Another adjustment to basename/public URL route

pacificclimate · Feb 8, 2024 · 367da68 · 367da68
1 parent 66f7c7d
commit 367da68
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/index.js b/src/index.js
@@ -16,7 +16,18 @@ import "./index.css";
 
 import registerServiceWorker from "./registerServiceWorker";
 
-console.log("### process.env.PUBLIC_URL", process.env.PUBLIC_URL);
+let baseName = "/";
+if (process.env.PUBLIC_URL) {
+  if (process.env.PUBLIC_URL.indexOf(".") >= 0) {
+    baseName = new URL(process.env.PUBLIC_URL).pathname;
+  } else {
+    // for development
+    baseName = process.env.PUBLIC_URL;
+  }
+}
+
+console.log("### PUBLIC_URL", process.env.PUBLIC_URL);
+console.log("### baseName", baseName);
 
 // Code split our bundle along our primary routes using the "lazy" function.
 // https://reactrouter.com/en/main/route/lazy
@@ -32,7 +43,7 @@ const router = createBrowserRouter(
     </Route>,
   ),
   {
-    basename: process.env.PUBLIC_URL ? process.env.PUBLIC_URL : "/",
+    basename: baseName,
   },
 );