Fix webpack requires.resolve() expression warnings (#295)

andywer · web-flow · commit d476cf18c7c5 · 2020-08-20T09:39:50.000+02:00
Fixes #223. Fixes #294.
diff --git a/src/master/implementation.node.ts b/src/master/implementation.node.ts
@@ -36,7 +36,7 @@ function detectTsNode() {
   }
 
   try {
-    require.resolve("ts-node")
+    eval("require").resolve("ts-node")
     tsNodeAvailable = true
   } catch (error) {
     if (error && error.code === "MODULE_NOT_FOUND") {
@@ -83,7 +83,7 @@ function resolveScriptPath(scriptPath: string, baseURL?: string | undefined) {
 
   const workerFilePath = typeof __non_webpack_require__ === "function"
     ? __non_webpack_require__.resolve(makeRelative(scriptPath))
-    : require.resolve(makeRelative(rebaseScriptPath(scriptPath, /[\/\\]worker_threads[\/\\]/)))
+    : eval("require").resolve(makeRelative(rebaseScriptPath(scriptPath, /[\/\\]worker_threads[\/\\]/)))
 
   return workerFilePath
 }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ function detectTsNode() {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`try {`
`39`		`- require.resolve("ts-node")`
	`39`	`+ eval("require").resolve("ts-node")`
`40`	`40`	`tsNodeAvailable = true`
`41`	`41`	`} catch (error) {`
`42`	`42`	`if (error && error.code === "MODULE_NOT_FOUND") {`
`@@ -83,7 +83,7 @@ function resolveScriptPath(scriptPath: string, baseURL?: string \| undefined) {`
`83`	`83`
`84`	`84`	`const workerFilePath = typeof __non_webpack_require__ === "function"`
`85`	`85`	`? __non_webpack_require__.resolve(makeRelative(scriptPath))`
`86`		`- : require.resolve(makeRelative(rebaseScriptPath(scriptPath, /[\/\\]worker_threads[\/\\]/)))`
	`86`	`+ : eval("require").resolve(makeRelative(rebaseScriptPath(scriptPath, /[\/\\]worker_threads[\/\\]/)))`
`87`	`87`
`88`	`88`	`return workerFilePath`
`89`	`89`	`}`