Merge pull request #39 from ice-lab/ice-scripts/release-2.1.8

ice-scripts/release 2.1.8
ice-lab · Aug 8, 2019 · c7aa512 · c7aa512
2 parents 308354f + a849c41
commit c7aa512
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.1.8
+
+- [fix] add polyfill when entry path include node_modules
+
 ## 2.1.7
 
 - [fix] add polyfill when entry modified by plugin

diff --git a/packages/ice-scripts/lib/config/processEntry.js b/packages/ice-scripts/lib/config/processEntry.js
@@ -50,14 +50,19 @@ module.exports = (config, options = {}) => {
   if (options.polyfill) {
     const rule = config.module.rule('polyfill').test(/\.jsx?|\.tsx?$/);
     Object.keys(entries).forEach((key) => {
+      let addPolyfill = false;
       // only include entry path
       for (let i = 0; i < entries[key].length; i += 1) {
         // filter node_modules file add by plugin
         if (!/node_modules/.test(entries[key][i])) {
           rule.include.add(entries[key][i]);
+          addPolyfill = true;
           break;
         }
       }
+      if (!addPolyfill) {
+        rule.include.add(entries[key][0]);
+      }
     });
     rule.use('polyfill-loader').loader(require.resolve('../utils/polyfillLoader')).options({});
 

diff --git a/packages/ice-scripts/package.json b/packages/ice-scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ice-scripts",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "description": "ICE SDK",
   "main": "index.js",
   "bin": {