remove electron.remote dependency

now in renderer check if we are in dev mode using `'npm_package_name' in process.env`

The logic is that we always run the dev mode via npm/yarn and thus that env var will be available
This commit is contained in:
Araxeus
2023-04-15 20:04:51 +03:00
parent 20db77f965
commit 263a335c96
3 changed files with 35 additions and 15 deletions

View File

@ -0,0 +1,24 @@
diff --git a/index.js b/index.js
index c8f2fd4467c11b484fe654f7f250e2ba37e8100d..c9ae1ed3d3c7683b14dfe0eee801f5a07585d2aa 100644
--- a/index.js
+++ b/index.js
@@ -5,7 +5,16 @@ if (typeof electron === 'string') {
throw new TypeError('Not running in an Electron environment!');
}
-const isEnvSet = 'ELECTRON_IS_DEV' in process.env;
-const getFromEnv = Number.parseInt(process.env.ELECTRON_IS_DEV, 10) === 1;
+const isDev = () => {
+ if ('ELECTRON_IS_DEV' in process.env) {
+ return Number.parseInt(process.env.ELECTRON_IS_DEV, 10) === 1;
+ }
-module.exports = isEnvSet ? getFromEnv : !electron.app.isPackaged;
+ if (process.type === 'browser') {
+ return !electron.app.isPackaged;
+ }
+
+ return 'npm_package_name' in process.env;
+};
+
+module.exports = isDev();

View File

@ -137,6 +137,9 @@
"youtubei.js": "^4.3.0",
"ytpl": "^2.3.0"
},
"resolutions": {
"electron-is-dev": "patch:electron-is-dev@npm%3A2.0.0#./.yarn/patches/electron-is-dev-npm-2.0.0-9d41637d91.patch"
},
"devDependencies": {
"@playwright/test": "^1.29.2",
"auto-changelog": "^2.4.0",

View File

@ -2957,27 +2957,20 @@ __metadata:
languageName: node
linkType: hard
"electron-is-dev@npm:^0.3.0":
version: 0.3.0
resolution: "electron-is-dev@npm:0.3.0"
checksum: d251e3b4c9cfd515a599dd852319ffca5b6b59c52c40dc3109f74ff9921a71e288d66445fc713a7f6296d3a696f04bb8d2135fa23599af7d7f1bc74a7552646b
languageName: node
linkType: hard
"electron-is-dev@npm:^1.1.0":
version: 1.2.0
resolution: "electron-is-dev@npm:1.2.0"
checksum: 73eee7aa7ce90a387bf224ec26aa808237164572641ca41cdca34a046adb72406d4414c3cc5b0b5e335a6d6010886474e1325c0b0af40c9fac95210b00195fdb
languageName: node
linkType: hard
"electron-is-dev@npm:^2.0.0":
"electron-is-dev@npm:2.0.0":
version: 2.0.0
resolution: "electron-is-dev@npm:2.0.0"
checksum: 7393f46f06153d70a427ea904c60a092e50fbf1015c26c342cebb8324ada8c9e0c0f1f02867af56d9cc76f47be17da8cb311ea6bdc83343e7ebd2323ec4014c8
languageName: node
linkType: hard
"electron-is-dev@patch:electron-is-dev@npm%3A2.0.0#./.yarn/patches/electron-is-dev-npm-2.0.0-9d41637d91.patch::locator=youtube-music%40workspace%3A.":
version: 2.0.0
resolution: "electron-is-dev@patch:electron-is-dev@npm%3A2.0.0#./.yarn/patches/electron-is-dev-npm-2.0.0-9d41637d91.patch::version=2.0.0&hash=64e927&locator=youtube-music%40workspace%3A."
checksum: 9a0c03b4d89c1ef474bff03f331fb72a0edc58c9a5ad0d0fc31a55625a2f2650e6e4934839668cfb4200bc3c83b299f421183f9476e6ebccb6df51f0b8b6d27e
languageName: node
linkType: hard
"electron-is@npm:^3.0.0":
version: 3.0.0
resolution: "electron-is@npm:3.0.0"