fix: ci

webpack · Sep 24, 2022 · 11cc040 · 11cc040
1 parent 2eb2f22
commit 11cc040
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/packages/webpack-cli/src/webpack-cli.ts b/packages/webpack-cli/src/webpack-cli.ts
@@ -144,14 +144,19 @@ class WebpackCLI implements IWebpackCLI {
       return true;
     }
 
+    // Respect NODE_PATH environment variable
+    if (
+      process.env.NODE_PATH &&
+      fs.statSync(path.join(process.env.NODE_PATH, packageName)).isDirectory()
+    ) {
+      return true;
+    }
+
     let dir = __dirname;
 
     do {
       try {
-        const packagePath = process.env.NODE_PATH
-          ? path.join(process.env.NODE_PATH, packageName)
-          : path.join(dir, "node_modules", packageName);
-        if (fs.statSync(packagePath).isDirectory()) {
+        if (fs.statSync(path.join(dir, "node_modules", packageName)).isDirectory()) {
           return true;
         }
       } catch (_error) {

diff --git a/scripts/globalSetup.js b/scripts/globalSetup.js
@@ -1,4 +1,3 @@
 const { version } = require("webpack");
 
-module.exports = () =>
-  console.log(`\n Running tests for webpack @${version} \n NODE_PATH-> ${process.env.NODE_PATH}`);
+module.exports = () => console.log(`\n Running tests for webpack @${version} \n`);
diff --git a/test/utils/test-utils.js b/test/utils/test-utils.js
@@ -53,10 +53,7 @@ const createProcess = (cwd, args, options) => {
     reject: false,
     stdio: ENABLE_LOG_COMPILATION ? "inherit" : "pipe",
     maxBuffer: Infinity,
-    env: {
-      WEBPACK_CLI_HELP_WIDTH: 1024,
-      NODE_PATH: path.resolve(__dirname, "../../node_modules"),
-    },
+    env: { WEBPACK_CLI_HELP_WIDTH: 1024 },
     ...options,
   });
 };