test: use clientBuilder test

Author: hubcarl

.eslintrc

@@ -14,6 +14,7 @@
       2,
       { "SwitchCase": 1 }
     ],
+    "require-jsdoc": "off",
     "no-loop-func": "off",
     "no-underscore-dangle": "off",
     "consistent-return": "off",

lib/base.js

@@ -103,11 +103,11 @@ class WebpackBaseBuilder extends Config {
               sourcePlugins[plugin.name.name] = plugin;
             }
           } else if (this.isWebpackApplyPlugin(plugin)) { // only apply method plugin
-            const label = this.utils.getPluginLabel(plugin);
-            sourcePlugins[label] = { name: plugin };
+            const md5Label = this.utils.getPluginLabel(plugin);
+            sourcePlugins[md5Label] = { name: plugin };
           } else if (Object.keys(plugin).length === 1) {
-            const label = Object.keys(plugin)[0];
-            sourcePlugins[label] = plugin[label];
+            const keyLabel = Object.keys(plugin)[0];
+            sourcePlugins[keyLabel] = plugin[keyLabel];
           }
         }
       });
@@ -144,7 +144,6 @@ class WebpackBaseBuilder extends Config {
         target[name] = configPlugin;
       }
     });
-
     return target;
   }
 
@@ -418,7 +417,7 @@ class WebpackBaseBuilder extends Config {
         } else if (this.utils.isObject(configInfo.name)) { // plugin object
           plugin = configInfo.name;
           pluginName = plugin.constructor && plugin.constructor.name || label;
-        } else if (this.utils.isObject(configInfo) && this.utils.isFunction(configInfo.apply)) {
+        } else if (this.isWebpackApplyPlugin(configInfo)) {
           plugin = configInfo;
           pluginName = label;
         } else if (this.utils.isString(configInfo.name) || this.utils.isFunction(configInfo.name)) {

test/client.test.js

@@ -580,30 +580,30 @@ describe('client.test.js', () => {
         devtool: 'source-map',
         loaders: {
           css: {
-            options:{
-              sourceMap: false,
+            options: {
+              sourceMap: false
             }
           },
-          scss:  {
-            options:{
-              sourceMap: false,
+          scss: {
+            options: {
+              sourceMap: false
             }
           },
-          sass:  {
-            options:{
-              sourceMap: false,
+          sass: {
+            options: {
+              sourceMap: false
             }
           },
-          less:  {
-            options:{
-              sourceMap: false,
+          less: {
+            options: {
+              sourceMap: false
             }
           },
-          stylus:  {
-            options:{
-              sourceMap: false,
+          stylus: {
+            options: {
+              sourceMap: false
             }
-          },
+          }
         }
       });
       const webpackConfig = builder.create();
@@ -615,7 +615,7 @@ describe('client.test.js', () => {
       expect(cssLoader.use[1].options.sourceMap).to.be.false;
       expect(sassLoader.use[1].options.sourceMap).to.be.false;
       expect(sassLoader.use[3].options.sourceMap).to.be.false;
-      
+
       expect(scssLoader.use[1].options.sourceMap).to.be.false;
       expect(scssLoader.use[3].options.sourceMap).to.be.false;
 
@@ -625,5 +625,18 @@ describe('client.test.js', () => {
       expect(stylusLoader.use[1].options.sourceMap).to.be.false;
       expect(stylusLoader.use[3].options.sourceMap).to.be.false;
     });
+
+    it('should merge plugin array params test', () => {
+      const builder = createBuilder({
+        plugins: {
+          copy: [{ from: 'asset', to: 'public' }]
+        }
+      });
+      const webpackConfig = builder.create();
+      const plugins = webpackConfig.plugins;
+      const copy = getPluginByLabel('copy', plugins);
+      expect(!!copy).to.be.true;
+    });
+
   });
 });

test/plugin.test.js

@@ -8,7 +8,7 @@ const path = require('path').posix;
 const utils = require('../utils/utils');
 
 // http://chaijs.com/api/bdd/
-function createBuilder(config) {
+const createBuilder = config => {
   const builder = new WebpackBaseBuilder(config);
   if (config && config.type) {
     builder.type = config.type;
@@ -19,13 +19,13 @@ function createBuilder(config) {
     include: path.join(__dirname, '../test')
   });
   return builder;
-}
+};
 
-function getPluginByLabel(label, plugins) {
+const getPluginByLabel = (label, plugins) => {
   return plugins.find(plugin => {
     return plugin.__lable__ === label || plugin.__plugin__ === label;
   });
-}
+};
 
 describe('plugin.test.js', () => {
   before(() => {});
@@ -186,19 +186,19 @@ describe('plugin.test.js', () => {
       expect(!!copy).to.be.true;
     });
 
-    // it('should merge array plugin test', () => {
-    //   const plugin = new CopyWebpackPlugin([{ from: 'asset', to: 'public' }]); 
-    //   const builder = createBuilder({
-    //     plugins: [
-    //       plugin
-    //     ]
-    //   });
-    //   const webpackConfig = builder.create();
-    //   const plugins = webpackConfig.plugins;
-    //   const lable = utils.getPluginLabel(plugin);
-    //   const copy = getPluginByLabel(lable, plugins);
-    //   expect(!!copy).to.be.true;
-    // });
+    it('should merge array plugin test', () => {
+      const plugin = new CopyWebpackPlugin([{ from: 'asset', to: 'public' }]);
+      const builder = createBuilder({
+        plugins: [
+          plugin
+        ]
+      });
+      const webpackConfig = builder.create();
+      const plugins = webpackConfig.plugins;
+      const lable = utils.getPluginLabel(plugin);
+      const copy = getPluginByLabel(lable, plugins);
+      expect(!!copy).to.be.true;
+    });
 
     it('should add webpack plugin test', () => {
       const builder = createBuilder({});

utils/utils.js

@@ -113,7 +113,6 @@ utils.getCustomEntry = (config, type) => {
       }
     } else if (entry instanceof RegExp) {
       const dirEntry = utils.walkFile(entry, configEntry.exclude, extMatch, config.baseDir);
-      console.log('...entry', dirEntry);
       Object.assign(entries, utils.createEntry(config, entryLoader, dirEntry, false));
     } else if (utils.isObject(entry)) {
       Object.assign(entries, utils.createEntry(config, entryLoader, entry, true));