Merge pull request #143 from mcode/connectathon_2025-01_2

Fix environment and vite build
mcode · Jan 6, 2025 · d688aef · d688aef
2 parents 524ccbd + 9ff37ae
commit d688aef
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
   "scripts": {
     "start": "vite",
     "production": "json-server --watch src/db.json -p 3000 --host 0.0.0.0 --static build",
-    "build": "node build",
+    "build": "vite build",
     "test": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject",
     "lint": "eslint \"**/*.{js,jsx}\"",

diff --git a/src/components/App.jsx b/src/components/App.jsx
@@ -11,9 +11,10 @@ import theme from '../containers/styles/theme';
 import { SettingsContext } from '../containers/ContextProvider/SettingsProvider';
 import { actionTypes } from '../containers/ContextProvider/reducer';
 
-const isGhPages = process.env.VITE_GH_PAGES === 'true';
+const isGhPages = process.env.VITE_GH_PAGES.trim() === 'true';
 const Router = isGhPages ? HashRouter : BrowserRouter;
 const redirect = isGhPages ? '/request-generator/#/index' : '/index';
+console.log('redirect: ' + redirect);
 const App = () => {
   const [, dispatch] = React.useContext(SettingsContext);
   useEffect(() => {

diff --git a/vite.config.ts b/vite.config.ts
@@ -21,4 +21,8 @@ export default defineConfig({
         open: false,
         host: true
     },
-})
+    build: {
+        outDir: 'build',
+        emptyOutDir: true, // also necessary
+    },
+})