Skip to content

A local-first personal finance app

[AI] Refactor IS_GENERIC_BROWSER env var to --mode=browser (#7466)

Matiss Janis Aboltinse109d652b47c
diff --git a/packages/desktop-client/bin/build-browser b/packages/desktop-client/bin/build-browser
index 3e6e18aa6c..0b5a283cfb 100755
--- a/packages/desktop-client/bin/build-browser
+++ b/packages/desktop-client/bin/build-browser
@@ -7,10 +7,9 @@ echo "Building the browser..."
rm -fr build
-export IS_GENERIC_BROWSER=1
export REACT_APP_BACKEND_WORKER_HASH=`ls "$ROOT"/../public/kcab/kcab.worker.*.js | sed 's/.*kcab\.worker\.\(.*\)\.js/\1/'`
-yarn build
+yarn build --mode=browser
rm -fr build-stats
mkdir build-stats
diff --git a/packages/desktop-client/bin/watch-browser b/packages/desktop-client/bin/watch-browser
index 2f2861696f..5d3b9a0362 100755
--- a/packages/desktop-client/bin/watch-browser
+++ b/packages/desktop-client/bin/watch-browser
@@ -3,8 +3,7 @@
ROOT=`dirname $0`
cd "$ROOT/.."
-export IS_GENERIC_BROWSER=1
export PORT=3001
export REACT_APP_BACKEND_WORKER_HASH="dev"
-yarn start
+yarn start --mode=browser
diff --git a/packages/desktop-client/src/build-shims.js b/packages/desktop-client/src/build-shims.js
index a9b4bf6ee3..f7056affee 100644
--- a/packages/desktop-client/src/build-shims.js
+++ b/packages/desktop-client/src/build-shims.js
@@ -3,7 +3,7 @@ const global = globalThis || this || self;
const process = {
env: {
...import.meta.env,
- NODE_ENV: import.meta.env.MODE,
+ NODE_ENV: import.meta.env.DEV ? 'development' : 'production',
PUBLIC_URL: import.meta.env.BASE_URL.slice(0, -1),
},
};
diff --git a/packages/desktop-client/vite.config.ts b/packages/desktop-client/vite.config.ts
index 87b2afd40c..fe3dc44778 100644
--- a/packages/desktop-client/vite.config.ts
+++ b/packages/desktop-client/vite.config.ts
@@ -152,7 +152,7 @@ export default defineConfig(async ({ mode }) => {
},
server: {
host: true,
- headers: mode === 'development' ? devHeaders : undefined,
+ headers: devHeaders,
port: +env.PORT || 5173,
open: env.BROWSER
? ['chrome', 'firefox', 'edge', 'browser', 'browserPrivate'].includes(
@@ -164,7 +164,7 @@ export default defineConfig(async ({ mode }) => {
},
},
resolve: {
- ...(!env.IS_GENERIC_BROWSER && {
+ ...(mode !== 'browser' && {
conditions: ['electron-renderer', 'module', 'browser', 'default'],
}),
tsconfigPaths: true,
diff --git a/upcoming-release-notes/7466.md b/upcoming-release-notes/7466.md
new file mode 100644
index 0000000000..30ff3c2643
--- /dev/null
+++ b/upcoming-release-notes/7466.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [MatissJanis]
+---
+
+Refactor browser mode configuration to use `--mode=browser` instead of an environment variable.