fix(webpack-runner): 解决esnextModules匹配不准确的问题

NervJS · Mar 15, 2019 · 555e82d · 555e82d
1 parent 3c1af2f
commit 555e82d
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/packages/taro-webpack-runner/src/util/chain.ts b/packages/taro-webpack-runner/src/util/chain.ts
@@ -150,7 +150,7 @@ const getModule = ({
   fontUrlLoaderOption,
   imageUrlLoaderOption,
   mediaUrlLoaderOption,
-  esnextModules = [] as string[],
+  esnextModules = [] as (string | RegExp)[],
 
   module,
   plugins
@@ -346,7 +346,15 @@ const getModule = ({
   ]
   if (Array.isArray(esnextModules) && esnextModules.length) {
     /* cnpm 安装的模块名前带下划线 `_` */
-    esnextModuleRegs = esnextModuleRegs.concat([...esnextModules.map(v => new RegExp(`node_modules[\\\\/]_?${v}`))])
+    esnextModuleRegs = esnextModuleRegs.concat([
+      ...esnextModules.map(v => {
+        if (typeof v === 'string') {
+          return new RegExp(`\b${v}\b`)
+        } else {
+          return v
+        }
+      })
+    ])
   }
   /**
    * isEsnextModule