refactor: postcss and framework set

easy-team · Nov 19, 2018 · b489abe · b489abe
1 parent df3564c
commit b489abe
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 1 deletion.
diff --git a/config/config.js b/config/config.js
@@ -14,6 +14,7 @@ exports.base = {
     install:{
       check: false
     },
+    postcss: true,
     compile:{
       cache: true,
       thread: true

diff --git a/lib/core/config.js b/lib/core/config.js
@@ -79,6 +79,10 @@ class Config {
     return false;
   }
 
+  get postcss() {
+    return this.config.postcss;
+  }
+
   get framework() {
     return this.config.framework;
   }

diff --git a/lib/core/loader.js b/lib/core/loader.js
@@ -176,7 +176,7 @@ module.exports = {
             itemLoader.use[index] = this.merge(itemLoader.use[index], options);
           }
         });
-        if (itemLoader.postcss) {
+        if (this.postcss && itemLoader.postcss) {
           const postcssIndex = ['css', 'css_module'].includes(name) ? itemLoader.use.length : itemLoader.use.length - 1;
           const postcssLoader = this.createPostCssLoader(loaderOptions && loaderOptions.postcss);
           itemLoader.use.splice(postcssIndex, 0, postcssLoader);

diff --git a/test/client.test.js b/test/client.test.js
@@ -564,6 +564,7 @@ describe('client.test.js', () => {
       const scssLoader = helper.getLoaderByName('sass', webpackConfig.module.rules, /\.scss/);
       const lessLoader = helper.getLoaderByName('less', webpackConfig.module.rules, /\.less/);
       const stylusLoader = helper.getLoaderByName('stylus', webpackConfig.module.rules, /\.stylus/);
+
       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;

diff --git a/test/rule.test.js b/test/rule.test.js
@@ -41,5 +41,24 @@ describe('rules.test.js', () => {
       expect(helper.getLoaderByName('babel', rules)).to.be.undefined;
       expect(helper.getLoaderByName(/\.(woff2?|eot|ttf|otf)(\?.*)?$/, rules)).to.be.undefined;
     });
+
+    it('should webpack rules options test', () => {
+      const config = {
+        module: {
+          rules: [
+            {
+              eslint: {
+                fix: true
+              }
+            }
+          ]
+        }
+      };
+      const builder = helper.createBuilder(config);
+      const webpackConfig = builder.create();
+      const rules = webpackConfig.module.rules;
+      const eslint = helper.getLoaderByName('eslint', rules);
+      expect(eslint.use[0].options.fix).to.be.true;
+    });
   });
 });
diff --git a/utils/utils.js b/utils/utils.js
@@ -285,6 +285,8 @@ utils.getLoaderLabel = loader => {
         }
         return name;
       }, '');
+    } else if (Object.keys(loader).length === 1) {
+      loaderName = Object.keys(loader)[0];
     }
   }
   return loaderName.replace(/-loader$/, '');