Skip to content

Commit 263a335

Browse files
committed
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
1 parent 20db77f commit 263a335

File tree

3 files changed

+34
-14
lines changed

3 files changed

+34
-14
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff --git a/index.js b/index.js
2+
index c8f2fd4467c11b484fe654f7f250e2ba37e8100d..c9ae1ed3d3c7683b14dfe0eee801f5a07585d2aa 100644
3+
--- a/index.js
4+
+++ b/index.js
5+
@@ -5,7 +5,16 @@ if (typeof electron === 'string') {
6+
throw new TypeError('Not running in an Electron environment!');
7+
}
8+
9+
-const isEnvSet = 'ELECTRON_IS_DEV' in process.env;
10+
-const getFromEnv = Number.parseInt(process.env.ELECTRON_IS_DEV, 10) === 1;
11+
+const isDev = () => {
12+
+ if ('ELECTRON_IS_DEV' in process.env) {
13+
+ return Number.parseInt(process.env.ELECTRON_IS_DEV, 10) === 1;
14+
+ }
15+
16+
-module.exports = isEnvSet ? getFromEnv : !electron.app.isPackaged;
17+
+ if (process.type === 'browser') {
18+
+ return !electron.app.isPackaged;
19+
+ }
20+
+
21+
+ return 'npm_package_name' in process.env;
22+
+};
23+
+
24+
+module.exports = isDev();

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,9 @@
137137
"youtubei.js": "^4.3.0",
138138
"ytpl": "^2.3.0"
139139
},
140+
"resolutions": {
141+
"electron-is-dev": "patch:electron-is-dev@npm%3A2.0.0#./.yarn/patches/electron-is-dev-npm-2.0.0-9d41637d91.patch"
142+
},
140143
"devDependencies": {
141144
"@playwright/test": "^1.29.2",
142145
"auto-changelog": "^2.4.0",

yarn.lock

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2957,24 +2957,17 @@ __metadata:
29572957
languageName: node
29582958
linkType: hard
29592959

2960-
"electron-is-dev@npm:^0.3.0":
2961-
version: 0.3.0
2962-
resolution: "electron-is-dev@npm:0.3.0"
2963-
checksum: d251e3b4c9cfd515a599dd852319ffca5b6b59c52c40dc3109f74ff9921a71e288d66445fc713a7f6296d3a696f04bb8d2135fa23599af7d7f1bc74a7552646b
2964-
languageName: node
2965-
linkType: hard
2966-
2967-
"electron-is-dev@npm:^1.1.0":
2968-
version: 1.2.0
2969-
resolution: "electron-is-dev@npm:1.2.0"
2970-
checksum: 73eee7aa7ce90a387bf224ec26aa808237164572641ca41cdca34a046adb72406d4414c3cc5b0b5e335a6d6010886474e1325c0b0af40c9fac95210b00195fdb
2960+
"electron-is-dev@npm:2.0.0":
2961+
version: 2.0.0
2962+
resolution: "electron-is-dev@npm:2.0.0"
2963+
checksum: 7393f46f06153d70a427ea904c60a092e50fbf1015c26c342cebb8324ada8c9e0c0f1f02867af56d9cc76f47be17da8cb311ea6bdc83343e7ebd2323ec4014c8
29712964
languageName: node
29722965
linkType: hard
29732966

2974-
"electron-is-dev@npm:^2.0.0":
2967+
"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.":
29752968
version: 2.0.0
2976-
resolution: "electron-is-dev@npm:2.0.0"
2977-
checksum: 7393f46f06153d70a427ea904c60a092e50fbf1015c26c342cebb8324ada8c9e0c0f1f02867af56d9cc76f47be17da8cb311ea6bdc83343e7ebd2323ec4014c8
2969+
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."
2970+
checksum: 9a0c03b4d89c1ef474bff03f331fb72a0edc58c9a5ad0d0fc31a55625a2f2650e6e4934839668cfb4200bc3c83b299f421183f9476e6ebccb6df51f0b8b6d27e
29782971
languageName: node
29792972
linkType: hard
29802973

0 commit comments

Comments
 (0)