fix baseRef broken after updating nx

firsttris · Nov 28, 2023 · 098ebd7 · 098ebd7
1 parent aa0b28d
commit 098ebd7
Show file tree

Hide file tree

Showing 8 changed files with 248 additions and 218 deletions.
diff --git a/apps/ccu-addon-mui/.env.development b/apps/ccu-addon-mui/.env.development
@@ -1 +1 @@
-REACT_APP_BASENAME=/
+REACT_ROUTER_BASENAME=/
diff --git a/apps/ccu-addon-mui/.env.production b/apps/ccu-addon-mui/.env.production
@@ -1 +1 @@
-REACT_APP_BASENAME=/addons/mui/
+REACT_ROUTER_BASENAME=/addons/mui/
diff --git a/apps/ccu-addon-mui/project.json b/apps/ccu-addon-mui/project.json
@@ -12,7 +12,7 @@
         "compiler": "babel",
         "outputPath": "dist/apps/ccu-addon-mui",
         "index": "apps/ccu-addon-mui/src/index.html",
-        "baseHref": "/",
+        "baseHref": "/addons/mui/",
         "main": "apps/ccu-addon-mui/src/main.tsx",
         "polyfills": "apps/ccu-addon-mui/src/polyfills.ts",
         "tsConfig": "apps/ccu-addon-mui/tsconfig.app.json",
@@ -32,12 +32,6 @@
           "vendorChunk": true
         },
         "production": {
-          "fileReplacements": [
-            {
-              "replace": "apps/ccu-addon-mui/src/environments/environment.ts",
-              "with": "apps/ccu-addon-mui/src/environments/environment.prod.ts"
-            }
-          ],
           "optimization": true,
           "outputHashing": "all",
           "sourceMap": false,

diff --git a/apps/ccu-addon-mui/src/environments/environment.prod.ts b/apps/ccu-addon-mui/src/environments/environment.prod.ts
diff --git a/apps/ccu-addon-mui/src/environments/environment.ts b/apps/ccu-addon-mui/src/environments/environment.ts
diff --git a/apps/ccu-addon-mui/src/main.tsx b/apps/ccu-addon-mui/src/main.tsx
@@ -1,11 +1,8 @@
 import { StrictMode } from 'react';
 import * as ReactDOM from 'react-dom/client';
 import { BrowserRouter } from 'react-router-dom';
-
 import { Router } from './router';
-
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { environment } from './environments/environment';
 
 const queryClient = new QueryClient({
   defaultOptions: {
@@ -20,7 +17,7 @@ const root = ReactDOM.createRoot(
 );
 root.render(
   <StrictMode>
-    <BrowserRouter basename={environment.basename}>
+    <BrowserRouter basename={process.env['REACT_APP_BASENAME']}>
       <QueryClientProvider client={queryClient}>
         <Router />
       </QueryClientProvider>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		REACT_APP_BASENAME=/addons/mui/
		REACT_ROUTER_BASENAME=/addons/mui/