chore: ice-scripts/release-2.1.7 (#33)

ice-scripts/release-2.1.7

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 2.1.7
+
+- [fix] add polyfill when entry modified by plugin
+- [fix] require modules in shim file
+- [feat] support css localize in dev mode
+
 ## 2.1.6
 
 - [fix] remove check latest version of ice-scripts alibaba/ice#2517

packages/ice-plugin-css-assets-local/CHANGELOG.md

@@ -1,9 +1,13 @@
 # Changelog
 
- ## 0.1.1
+## 0.1.2
 
- - [fix] 兼容 options 为空的情况
+- [feat] 支持 dev 命令下下载 css 资源
 
- ## 0.1.0
+## 0.1.1
 
- - [feat] 完成初始版本基础功能
+- [fix] 兼容 options 为空的情况
+
+## 0.1.0
+
+- [feat] 完成初始版本基础功能

packages/ice-plugin-css-assets-local/index.js

@@ -2,17 +2,18 @@ const ExtractCssAssetsWebpackPlugin = require('extract-css-assets-webpack-plugin
 
 module.exports = ({ context, log, chainWebpack }, options = {}) => {
   const { command } = context;
-
-  // it is increase dev build time
-  if (command === 'build') {
+  const { outputPath, relativeCssPath, activeInDev } = options;
+  // it is increase dev build time by set default activeCommands ['build']
+  const activeCommands = activeInDev ? ['dev', 'build'] : ['build'];
+  if (activeCommands.indexOf(command) > -1) {
     log.info('离线化构建项目，自动下载网络资源，请耐心等待');
 
     chainWebpack((config) => {
       // TODO: set publicPath
       config.plugin('ExtractCssAssetsWebpackPlugin')
         .use(ExtractCssAssetsWebpackPlugin, [{
-          outputPath: options.outputPath || 'assets',
-          relativeCssPath: options.relativeCssPath || '../',
+          outputPath: outputPath || 'assets',
+          relativeCssPath: relativeCssPath || '../',
         }]);
     });
   }

packages/ice-plugin-css-assets-local/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ice-plugin-css-assets-local",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "ice-scripts plugin for localize CSS assets",
   "main": "index.js",
   "scripts": {

packages/ice-scripts/lib/config/jest/shim.js

@@ -1,2 +1,2 @@
-import 'core-js/stable';
-import 'regenerator-runtime/runtime';
+require('core-js/stable');
+require('regenerator-runtime/runtime');

packages/ice-scripts/lib/config/processEntry.js

@@ -34,7 +34,8 @@ function enhanceEntries(entries, chunk) {
   return hotEntries;
 }
 
-module.exports = (entry, options = {}) => {
+module.exports = (config, options = {}) => {
+  const entry = config.toConfig().entry;
   // 需要区分项目类型，新版的项目直接返回 src/index.js
   let entries = {};
   if (Array.isArray(entry) || typeof entry === 'string') {
@@ -46,10 +47,31 @@ module.exports = (entry, options = {}) => {
       entries[key] = entryWithApp(entry[key]);
     });
   }
+  if (options.polyfill) {
+    const rule = config.module.rule('polyfill').test(/\.jsx?|\.tsx?$/);
+    Object.keys(entries).forEach((key) => {
+      // 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]);
+          break;
+        }
+      }
+    });
+    rule.use('polyfill-loader').loader(require.resolve('../utils/polyfillLoader')).options({});
+
+    // add resolve modules for get core-js and regenerator-runtime
+    const modulePath = require.resolve('core-js');
+    const pathArr = modulePath.split('node_modules');
+    pathArr.pop(); // pop file path
+    config.resolve.modules.add(path.join(pathArr.join('node_modules'), 'node_modules'));
+  }
 
   if (options.hotDev) {
     entries = enhanceEntries(entries, hotDevClientPath);
   }
 
-  return entries;
+  config.entryPoints.clear();
+  config.merge({ entry: entries });
 };

packages/ice-scripts/lib/core/Context.js

@@ -89,19 +89,6 @@ module.exports = class Context {
     }
   }
 
-  // process entry
-  processWepackEntry(config) {
-    const entry = config.toConfig().entry;
-    if (entry) {
-      // delete origin entry
-      config.entryPoints.clear();
-      // merge new entry
-      config.merge({ entry: processEntry(entry, {
-        hotDev: this.command === 'dev' && !this.commandArgs.disabledReload,
-      }) });
-    }
-  }
-
   async applyHook(key, opts = {}) {
     const hooks = this.eventHooks[key] || [];
     const results = [];
@@ -140,7 +127,10 @@ module.exports = class Context {
       }
     }
     // add polyfill/hotdev before origin entry
-    this.processWepackEntry(config);
+    processEntry(config, {
+      hotDev: this.command === 'dev' && !this.commandArgs.disabledReload,
+      polyfill: this.userConfig.injectBabel === 'polyfill',
+    });
     return config.toConfig();
   }
 

packages/ice-scripts/lib/plugins/userConfig/configs/injectBabel.js

@@ -1,6 +1,4 @@
-const path = require('path');
-
-module.exports = ({ chainWebpack, context }, injectBabel) => {
+module.exports = ({ chainWebpack }, injectBabel) => {
   chainWebpack((config) => {
     if (injectBabel === 'runtime') {
       ['jsx', 'tsx'].forEach((rule) => {
@@ -26,21 +24,6 @@ module.exports = ({ chainWebpack, context }, injectBabel) => {
             return Object.assign(options, { plugins });
           });
       });
-    } else if (injectBabel === 'polyfill') {
-      const { rootDir } = context;
-      const entries = config.toConfig().entry;
-      const rule = config.module.rule('polyfill').test(/\.jsx?|\.tsx?$/);
-      Object.keys(entries).forEach((key) => {
-        // only include entry path
-        rule.include.add(path.resolve(rootDir, entries[key][0]));
-      });
-      rule.use('polyfill-loader').loader(require.resolve('../utils/polyfillLoader')).options({});
-
-      // add resolve modules for get core-js and regenerator-runtime
-      const modulePath = require.resolve('core-js');
-      const pathArr = modulePath.split('node_modules');
-      pathArr.pop(); // pop file path
-      config.resolve.modules.add(path.join(pathArr.join('node_modules'), 'node_modules'));
     }
   });
 };

packages/ice-scripts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ice-scripts",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "description": "ICE SDK",
   "main": "index.js",
   "bin": {