[pull] master from ant-design:master

.antd-tools.config.js

@@ -1,195 +1,36 @@
 const fs = require('fs');
 const path = require('path');
-const defaultVars = require('./scripts/default-vars');
-const darkVars = require('./scripts/dark-vars');
-const compactVars = require('./scripts/compact-vars');
 
-function generateThemeFileContent(theme) {
-  return `const { ${theme}ThemeSingle } = require('./theme');\nconst defaultTheme = require('./default-theme');\n
-module.exports = {
-  ...defaultTheme,
-  ...${theme}ThemeSingle
-}`;
-}
+const restCssPath = path.join(process.cwd(), 'components', 'style', 'reset.css');
+const tokenStatisticPath = path.join(process.cwd(), 'components', 'version', 'token.json');
+const tokenMetaPath = path.join(process.cwd(), 'components', 'version', 'token-meta.json');
 
-// We need compile additional content for antd user
 function finalizeCompile() {
-  if (fs.existsSync(path.join(__dirname, './lib'))) {
-    // Build a entry less file to dist/antd.less
-    const componentsPath = path.join(process.cwd(), 'components');
-    let componentsLessContent = '';
-    // Build components in one file: lib/style/components.less
-    fs.readdir(componentsPath, (err, files) => {
-      files.forEach(file => {
-        if (fs.existsSync(path.join(componentsPath, file, 'style', 'index.less'))) {
-          componentsLessContent += `@import "../${path.posix.join(
-            file,
-            'style',
-            'index-pure.less',
-          )}";\n`;
-        }
-      });
-      fs.writeFileSync(
-        path.join(process.cwd(), 'lib', 'style', 'components.less'),
-        componentsLessContent,
-      );
-    });
+  if (fs.existsSync(path.join(__dirname, './es'))) {
+    fs.copyFileSync(restCssPath, path.join(process.cwd(), 'es', 'style', 'reset.css'));
+    fs.copyFileSync(tokenStatisticPath, path.join(process.cwd(), 'es', 'version', 'token.json'));
+    fs.copyFileSync(tokenMetaPath, path.join(process.cwd(), 'es', 'version', 'token-meta.json'));
   }
-}
 
-function buildThemeFile(theme, vars) {
-  // Build less entry file: dist/antd.${theme}.less
-  if (theme !== 'default') {
-    fs.writeFileSync(
-      path.join(process.cwd(), 'dist', `antd.${theme}.less`),
-      `@import "../lib/style/${theme}.less";\n@import "../lib/style/components.less";`,
-    );
-    // eslint-disable-next-line no-console
-    console.log(`Built a entry less file to dist/antd.${theme}.less`);
-  } else {
-    fs.writeFileSync(
-      path.join(process.cwd(), 'dist', `default-theme.js`),
-      `module.exports = ${JSON.stringify(vars, null, 2)};\n`,
-    );
-    return;
+  if (fs.existsSync(path.join(__dirname, './lib'))) {
+    fs.copyFileSync(restCssPath, path.join(process.cwd(), 'lib', 'style', 'reset.css'));
+    fs.copyFileSync(tokenStatisticPath, path.join(process.cwd(), 'lib', 'version', 'token.json'));
+    fs.copyFileSync(tokenMetaPath, path.join(process.cwd(), 'lib', 'version', 'token-meta.json'));
   }
-
-  // Build ${theme}.js: dist/${theme}-theme.js, for less-loader
-
-  fs.writeFileSync(
-    path.join(process.cwd(), 'dist', `theme.js`),
-    `const ${theme}ThemeSingle = ${JSON.stringify(vars, null, 2)};\n`,
-    {
-      flag: 'a',
-    },
-  );
-
-  fs.writeFileSync(
-    path.join(process.cwd(), 'dist', `${theme}-theme.js`),
-    generateThemeFileContent(theme),
-  );
-
-  // eslint-disable-next-line no-console
-  console.log(`Built a ${theme} theme js file to dist/${theme}-theme.js`);
 }
 
 function finalizeDist() {
   if (fs.existsSync(path.join(__dirname, './dist'))) {
-    // Build less entry file: dist/antd.less
-    fs.writeFileSync(
-      path.join(process.cwd(), 'dist', 'antd.less'),
-      '@import "../lib/style/default.less";\n@import "../lib/style/components.less";',
-    );
-    // eslint-disable-next-line no-console
-    fs.writeFileSync(
-      path.join(process.cwd(), 'dist', 'theme.js'),
-      `const defaultTheme = require('./default-theme.js');\n`,
-    );
-    // eslint-disable-next-line no-console
-    console.log('Built a entry less file to dist/antd.less');
-    buildThemeFile('default', defaultVars);
-    buildThemeFile('dark', darkVars);
-    buildThemeFile('compact', compactVars);
-    buildThemeFile('variable', {});
-    fs.writeFileSync(
-      path.join(process.cwd(), 'dist', `theme.js`),
-      `
-function getThemeVariables(options = {}) {
-  let themeVar = {
-    'hack': \`true;@import "\${require.resolve('antd/lib/style/color/colorPalette.less')}";\`,
-    ...defaultTheme
-  };
-  if(options.dark) {
-    themeVar = {
-      ...themeVar,
-      ...darkThemeSingle
-    }
-  }
-  if(options.compact){
-    themeVar = {
-      ...themeVar,
-      ...compactThemeSingle
-    }
+    fs.copyFileSync(restCssPath, path.join(process.cwd(), 'dist', 'reset.css'));
   }
-  return themeVar;
-}
-
-module.exports = {
-  darkThemeSingle,
-  compactThemeSingle,
-  getThemeVariables
-}`,
-      {
-        flag: 'a',
-      },
-    );
-  }
-}
-
-function isComponentStyleEntry(file) {
-  return file.path.match(/style(\/|\\)index\.tsx/);
-}
-
-function needTransformStyle(content) {
-  return content.includes('../../style/index.less') || content.includes('./index.less');
 }
 
 module.exports = {
   compile: {
-    includeLessFile: [/(\/|\\)components(\/|\\)style(\/|\\)default.less$/],
-    transformTSFile(file) {
-      if (isComponentStyleEntry(file)) {
-        let content = file.contents.toString();
-
-        if (needTransformStyle(content)) {
-          const cloneFile = file.clone();
-
-          // Origin
-          content = content.replace('../../style/index.less', '../../style/default.less');
-          cloneFile.contents = Buffer.from(content);
-
-          return cloneFile;
-        }
-      }
-    },
-    transformFile(file) {
-      if (isComponentStyleEntry(file)) {
-        const indexLessFilePath = file.path.replace('index.tsx', 'index.less');
-
-        if (fs.existsSync(indexLessFilePath)) {
-          // We put origin `index.less` file to `index-pure.less`
-          const pureFile = file.clone();
-          pureFile.contents = Buffer.from(fs.readFileSync(indexLessFilePath, 'utf8'));
-          pureFile.path = pureFile.path.replace('index.tsx', 'index-pure.less');
-
-          // Rewrite `index.less` file with `root-entry-name`
-          const indexLessFile = file.clone();
-          indexLessFile.contents = Buffer.from(
-            [
-              // Inject variable
-              '@root-entry-name: default;',
-              // Point to origin file
-              "@import './index-pure.less';",
-            ].join('\n\n'),
-          );
-          indexLessFile.path = indexLessFile.path.replace('index.tsx', 'index.less');
-
-          return [indexLessFile, pureFile];
-        }
-      }
-
-      return [];
-    },
-    lessConfig: {
-      modifyVars: {
-        'root-entry-name': 'default',
-      },
-    },
     finalize: finalizeCompile,
   },
   dist: {
     finalize: finalizeDist,
   },
-  generateThemeFileContent,
   bail: true,
 };

.depslintrc.js

@@ -11,15 +11,15 @@ module.exports = {
   ],
   modulePattern: [
     {
-      pattern: /ConfigContext.*renderEmpty/ms,
+      pattern: /ConfigContext.*renderEmpty/s,
       module: '../empty',
     },
     {
-      pattern: /ConfigConsumer.*renderEmpty/ms,
+      pattern: /ConfigConsumer.*renderEmpty/s,
       module: '../empty',
     },
     {
-      pattern: /config-provider\/context.*renderEmpty/ms,
+      pattern: /config-provider\/context.*renderEmpty/s,
       module: '../empty',
     },
   ],