fix env to work in electron correctly

goooseman · goooseman · commit c04ecdc4629e · 2020-04-19T22:58:20.000+03:00
The problem is: electron env includes and browser and nodejs together.
Therefore, both isBrowser and isNodejs function will return true.
The comment in the code mentions, that isBrowser is explictly called first
to prevent electron renderer process to be initialized with
wrong environment due to isNodejs() returning true.
But current code (before the change) executes both isBrowser and isNodejs blocks.
This commit resolves the issue.
diff --git a/src/env/index.ts b/src/env/index.ts
@@ -22,10 +22,10 @@ function initialize() {
   // check for isBrowser() first to prevent electron renderer process
   // to be initialized with wrong environment due to isNodejs() returning true
   if (isBrowser()) {
-    setEnv(createBrowserEnv())
+    return setEnv(createBrowserEnv())
   }
   if (isNodejs()) {
-    setEnv(createNodejsEnv())
+    return setEnv(createNodejsEnv())
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,10 @@ function initialize() {`
`22`	`22`	`// check for isBrowser() first to prevent electron renderer process`
`23`	`23`	`// to be initialized with wrong environment due to isNodejs() returning true`
`24`	`24`	`if (isBrowser()) {`
`25`		`- setEnv(createBrowserEnv())`
	`25`	`+ return setEnv(createBrowserEnv())`
`26`	`26`	`}`
`27`	`27`	`if (isNodejs()) {`
`28`		`- setEnv(createNodejsEnv())`
	`28`	`+ return setEnv(createNodejsEnv())`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`