From 64f5573358766219f823acf201fc88141b225ef0 Mon Sep 17 00:00:00 2001
From: Matiss Janis Aboltins <matiss@mja.lv>
Date: Sat, 14 Jan 2023 21:35:51 +0000
Subject: [PATCH] :rewind: reverting some changes to fix electron-app (#466)
---
packages/desktop-client/config/paths.js | 4 +++-
packages/desktop-client/src/browser-preload.js | 1 +
packages/desktop-electron/package.json | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
create mode 100644 packages/desktop-client/src/browser-preload.js
diff --git a/packages/desktop-client/config/paths.js b/packages/desktop-client/config/paths.js
index e08021fab..f435dc470 100644
--- a/packages/desktop-client/config/paths.js
+++ b/packages/desktop-client/config/paths.js
@@ -38,10 +38,12 @@ function getServedPath(appPackageJson) {
return ensureSlash(servedUrl, true);
}
+const isGenericBrowser = process.env.IS_GENERIC_BROWSER;
+
// JWL: Resolve to mobile suffixes before resolving to .js. This
// makes it load real React Native components, but when needed
// .web.js can be used to force a web version.
-const moduleFileExtensions = ['browser.js']
+const moduleFileExtensions = (isGenericBrowser ? ['browser.js'] : [])
.concat(['web.mjs', 'web.js'])
.concat(['mjs', 'js', 'json', 'web.jsx', 'jsx']);
diff --git a/packages/desktop-client/src/browser-preload.js b/packages/desktop-client/src/browser-preload.js
new file mode 100644
index 000000000..aa1336a94
--- /dev/null
+++ b/packages/desktop-client/src/browser-preload.js
@@ -0,0 +1 @@
+// Intentionally left blank to make electron app work
diff --git a/packages/desktop-electron/package.json b/packages/desktop-electron/package.json
index ec1e2b8c9..fd3022cac 100644
--- a/packages/desktop-electron/package.json
+++ b/packages/desktop-electron/package.json
@@ -3,7 +3,7 @@
"productName": "Actual",
"author": "Shift Reset LLC",
"description": "A simple and powerful personal finance system",
- "version": "22.12.03",
+ "version": "22.12.3",
"scripts": {
"clean": "rm -rf dist",
"update-client": "bin/update-client",
--
GitLab