chore: improve webpack 5 initial test (#6493)

umijs · Apr 27, 2021 · 05de48d · 05de48d
1 parent 74a1ec5
commit 05de48d
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/packages/umi/src/initWebpack.ts b/packages/umi/src/initWebpack.ts
@@ -26,9 +26,12 @@ export default () => {
   const configContent = configFile ? readFileSync(configFile, 'utf-8') : '';
 
   // TODO: detect with ast
-  const haveWebpack5 = configContent.includes('webpack5:');
+  const haveWebpack5 =
+    configContent.includes('webpack5:') &&
+    !configContent.includes('// webpack5:') &&
+    !configContent.includes('//webpack5:');
 
-  if (haveWebpack5) {
+  if (haveWebpack5 || process.env.USE_WEBPACK_5) {
     process.env.USE_WEBPACK_5 = '1';
     init(true);
   } else {