feat: not need set entry for lib

easy-team · Nov 13, 2018 · 177ed1a · 177ed1a
1 parent 06eed40
commit 177ed1a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 18 deletions.
diff --git a/lib/client.js b/lib/client.js
@@ -10,7 +10,7 @@ class WebpackClientBuilder extends WebpackBaseBuilder {
     this.setDevTool(config.devtool);
     this.setPack(config.packs);
     this.setTarget(WebpackClientBuilder.TARGET);
-    this.setCommonsChunkLib();
+    // this.setCommonsChunkLib();
     this.setStartCreateQueue(this.setBabelENV);
     this.setCreateQueue(this.createDllAssetPlugin);
     this.setCreateQueue(this.createDllReferencePlugin);

diff --git a/lib/optimize.js b/lib/optimize.js
@@ -4,6 +4,7 @@ module.exports = class WebpackOptimize {
   constructor(ctx) {
     this.ctx = ctx;
     this.optimization = ctx.utils.cloneDeep(ctx.config.optimization || {});
+    this.lib = this.ctx.config.lib;
   }
 
   getCommonsChunk() {
@@ -25,26 +26,33 @@ module.exports = class WebpackOptimize {
   }
 
   getCacheVendors() {
-    const { lib } = this.ctx.config;
-    const strRegex = Array.isArray(lib) ? lib.join('|') : '.*';
-    const test = new RegExp(`node_modules/_?(${strRegex})(@|/)`);
-    const options = lib ? {
+    const modules = [];
+    const files = [];
+    const lib = this.lib || ['.*'];
+    lib.forEach(m => {
+      if (/\.(jsx?|tsx?)$/.test(m)) {
+        files.push(m);
+      } else {
+        modules.push(m);
+      }
+    });
+    files.unshift(`node_modules/_?(${modules.join('|')})(@|/)`);
+    const strRegex = files.join('|');
+    const test = new RegExp(strRegex);
+    return {
+      name: 'common',
       chunks: 'all',
-      minChunks: 1
-    } : {
-      chunks: 'initial',
-      minChunks: 2
+      minChunks: 1,
+      test: module => {
+        return test.test(module.context);
+      }
     };
-    return this.ctx.merge(options, {
-      name: 'common',
-      test
-    });
   }
 
   getCacheStyles() {
     return {
       name: 'common',
-      chunks: 'initial',
+      chunks: 'all',
       minChunks: 2,
       test: /\.(css|less|scss|stylus)$/,
       enforce: true,
@@ -99,10 +107,10 @@ module.exports = class WebpackOptimize {
         name: 'runtime'
       },
       splitChunks: {
-        chunks: 'initial',
-        minSize: 30000,
-        minChunks: 1,
-        name: false,
+        name: true,
+        chunks: 'all',
+        minSize: this.lib ? 1 : 10000,
+        minChunks: this.lib ? 1 : 2,
         cacheGroups: {
           default: false,
           vendors: this.getCacheVendors(),