add lessOrder function

genModuleLess.js

@@ -6,24 +6,10 @@
 const glob = require('glob');
 const uniqBy = require('lodash.uniqby');
 const { winPath } = require('umi-utils');
+
 const AddLocalIdentName = require('./AddLocalIdentName');
 const replaceDefaultLess = require('./replaceDefaultLess');
-
-// order:
-// 0. other/**/index.less
-// 1. other/**.less
-// 2. site/theme/**/index.less
-// 3. site/theme/**.less
-const getLessOrder = filename => {
-  let order = 0;
-  if (filename.includes('index.less')) {
-    order += 1;
-  }
-  if (!filename.includes('site/theme')) {
-    order += 2;
-  }
-  return order;
-};
+const lessOrder = require('./lessOrder');
 
 // read less file list
 const genModuleLess = (parents, { isModule, filterFileLess }) => {
@@ -32,9 +18,9 @@ const genModuleLess = (parents, { isModule, filterFileLess }) => {
   lessArray = [];
   glob
     .sync(winPath(`${parents}/**/**.less`), {
-      ignore: ['**/node_modules/**', '**/es/**', '**/lib/**', '**/dist/**', '**/_site/**'],
+      ignore: ['**/node_modules/**', '**/dist/**', '**/_site/**'],
     })
-    .sort((a, b) => getLessOrder(a) - getLessOrder(b))
+    .sort((a, b) => lessOrder(a) - lessOrder(b))
     .filter(filePath => {
       if (
         filePath.includes('ant.design.pro.less') ||

getVariable.js

@@ -4,60 +4,16 @@ const uniqBy = require('lodash.uniqby');
 
 const fileNameList = [];
 
-function discardAndReport(less, result) {
-  function discardEmpty(node) {
-    const { type, nodes: sub } = node;
-
-    if (sub) {
-      node.each(discardEmpty);
-    }
-
-    if (
-      (type === 'decl' && !node.value) ||
-      (type === 'rule' && !node.selector) ||
-      (sub && !sub.length) ||
-      (type === 'atrule' && ((!sub && !node.params) || (!node.params && !sub.length)))
-    ) {
-      if (
-        (node.selector && node.toString().includes('(') && node.selector.indexOf('.') === 0) ||
-        (node.toString().includes('@') && !node.toString().includes('{'))
-      ) {
-        // should have same code
-        node.fileNameList = '';
-      } else {
-        node.remove();
-      }
-
-      result.messages.push({
-        type: 'removal',
-        plugin: 'postcss-discard-empty',
-        node,
-      });
-    }
-  }
-
-  less.each(discardEmpty);
-}
-const removeNoVarLessPlugin = postcss.plugin('LocalIdentNamePlugin', () => (less, result) => {
+const removeNoVarLessPlugin = postcss.plugin('LocalIdentNamePlugin', () => less => {
   less.walkAtRules(atRule => {
     if (atRule.import) {
       atRule.remove();
     }
   });
-  less.walkDecls(decls => {
-    const content = decls.toString();
-    if (
-      (!content.includes('@') && !content.includes('border')) ||
-      content.includes('padding') ||
-      content.includes('margin')
-    ) {
-      decls.remove();
-    }
-  });
+
   less.walkComments(decls => {
     decls.remove();
   });
-  discardAndReport(less, result);
 });
 
 const getVariable = (lessPath, lessText) =>

lessOrder.js

@@ -0,0 +1,17 @@
+// order:
+// 0. other/**/index.less
+// 1. other/**.less
+// 2. site/theme/**/index.less
+// 3. site/theme/**.less
+const lessOrder = filename => {
+  let order = 0;
+  if (filename.includes('index.less')) {
+    order += 1;
+  }
+  if (!filename.includes('site/theme')) {
+    order += 2;
+  }
+  return order;
+};
+
+module.exports = lessOrder;

loopAllLess.js

@@ -6,6 +6,7 @@ const prettier = require('prettier');
 const getVariable = require('./getVariable');
 const replaceDefaultLess = require('./replaceDefaultLess');
 const deleteRelativePath = require('./removeRelativePath');
+const lessOrder = require('./lessOrder');
 
 // read less file list
 const loopAllLess = async (parents, ignore = ['**/node_modules/**', '**/lib/**', '**/es/**']) => {
@@ -27,17 +28,7 @@ const loopAllLess = async (parents, ignore = ['**/node_modules/**', '**/lib/**',
       }
       return 1;
     })
-    .sort((a, b) => {
-      let aSortNumber = 0;
-      let bSortNumber = 0;
-      if (a.includes('index.less')) {
-        aSortNumber = 1;
-      }
-      if (b.includes('index.less')) {
-        bSortNumber = 1;
-      }
-      return bSortNumber - aSortNumber;
-    })
+    .sort((a, b) => lessOrder(a) - lessOrder(b))
     .filter(filePath => {
       if (
         filePath.includes('ant.design.pro.less') ||

test.js

@@ -1,7 +1,7 @@
 const genCss = require('./index');
 
 genCss(
-  '/Users/qixian.cs/Documents/GitHub/ant-design-pro',
+  'C:/github/ant-design-pro',
   [
     {
       theme: 'dark',