Merge remote-tracking branch 'origin/next' into v3

CHANGELOG.en-US.md

@@ -10,6 +10,12 @@
 
 ---
 
+## 2.1.5
+
+`2021-05-12`
+
+- 🐞 Fix SSR time reporting error [#3983](https://github.com/vueComponent/ant-design-vue/issues/3983)
+
 ## 2.1.4
 
 `2021-05-09`

CHANGELOG.zh-CN.md

@@ -10,6 +10,12 @@
 
 ---
 
+## 2.1.5
+
+`2021-05-12`
+
+- 🐞 修复 SSR 时报错问题 [#3983](https://github.com/vueComponent/ant-design-vue/issues/3983)
+
 ## 2.1.4
 
 `2021-05-09`

antd-tools/getWebpackConfig.js

@@ -4,8 +4,9 @@ const path = require('path');
 const webpack = require('webpack');
 const WebpackBar = require('webpackbar');
 const { merge } = require('webpack-merge');
+const TerserPlugin = require('terser-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
+const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin');
 const CleanUpStatsPlugin = require('./utils/CleanUpStatsPlugin');
 // const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
@@ -207,6 +208,9 @@ All rights reserved.
       }),
       new CleanUpStatsPlugin(),
     ],
+    performance: {
+      hints: false,
+    },
   };
 
   if (process.env.RUN_ENV === 'PRODUCTION') {
@@ -223,17 +227,12 @@ All rights reserved.
     config.output.libraryTarget = 'umd';
     config.optimization = {
       minimizer: [
-        // eslint-disable-next-line no-unused-vars
-        compiler => {
-          return () => {
-            return {
-              parallel: true,
-              terserOptions: {
-                warnings: false,
-              },
-            };
-          };
-        },
+        new TerserPlugin({
+          parallel: true,
+          terserOptions: {
+            warnings: false,
+          },
+        }),
       ],
     };
 
@@ -266,7 +265,8 @@ All rights reserved.
         }),
       ],
       optimization: {
-        minimizer: [new OptimizeCSSAssetsPlugin({})],
+        minimize: true,
+        minimizer: [new CssMinimizerPlugin({})],
       },
     });
 

antd-tools/gulpfile.js

@@ -118,10 +118,16 @@ function babelify(js, modules) {
         );
         file.path = file.path.replace(/index\.(js|jsx|ts|tsx)$/, 'css.js');
         this.push(file);
-        next();
-      } else {
-        next();
+      } else if (modules !== false) {
+        const content = file.contents.toString(encoding);
+        file.contents = Buffer.from(
+          content
+            .replace(/lodash-es/g, 'lodash')
+            .replace(/@ant-design\/icons-vue/g, '@ant-design/icons-vue/lib/icons'),
+        );
+        this.push(file);
       }
+      next();
     }),
   );
   if (modules === false) {
@@ -302,61 +308,54 @@ function publish(tagString, done) {
 }
 
 function pub(done) {
-  dist(code => {
-    if (code) {
-      done(code);
-      return;
-    }
-    const notOk = !packageJson.version.match(/^\d+\.\d+\.\d+$/);
-    let tagString;
-    if (argv['npm-tag']) {
-      tagString = argv['npm-tag'];
-    }
-    if (!tagString && notOk) {
-      tagString = 'next';
-    }
-    if (packageJson.scripts['pre-publish']) {
-      runCmd('npm', ['run', 'pre-publish'], code2 => {
-        if (code2) {
-          done(code2);
-          return;
-        }
-        publish(tagString, done);
-      });
-    } else {
+  const notOk = !packageJson.version.match(/^\d+\.\d+\.\d+$/);
+  let tagString;
+  if (argv['npm-tag']) {
+    tagString = argv['npm-tag'];
+  }
+  if (!tagString && notOk) {
+    tagString = 'next';
+  }
+  if (packageJson.scripts['pre-publish']) {
+    runCmd('npm', ['run', 'pre-publish'], code2 => {
+      if (code2) {
+        done(code2);
+        return;
+      }
       publish(tagString, done);
-    }
-  });
+    });
+  } else {
+    publish(tagString, done);
+  }
 }
 
-gulp.task(
-  'compile-with-es',
-  gulp.series(done => {
-    compile(false).on('finish', function() {
-      done();
-    });
-  }),
-);
+gulp.task('compile-with-es', done => {
+  console.log('[Parallel] Compile to es...');
+  compile(false).on('finish', done);
+});
+
+gulp.task('compile-with-lib', done => {
+  console.log('[Parallel] Compile to js...');
+  compile().on('finish', done);
+});
 
 gulp.task(
   'compile',
-  gulp.series('compile-with-es', done => {
-    compile().on('finish', function() {
-      done();
-    });
+  gulp.series(gulp.parallel('compile-with-es', 'compile-with-lib'), done => {
+    done();
   }),
 );
 
 gulp.task(
   'dist',
-  gulp.series('compile', done => {
+  gulp.series(done => {
     dist(done);
   }),
 );
 
 gulp.task(
   'pub',
-  gulp.series('check-git', 'compile', done => {
+  gulp.series('check-git', 'compile', 'dist', done => {
     // if (!process.env.GITHUB_TOKEN) {
     //   console.log('no GitHub token found, skip');
     // } else {

components/_util/component-classes.ts

@@ -3,7 +3,7 @@
  * https://github.com/component/classes.git
  */
 
-import { indexOf } from 'lodash-es';
+import indexOf from 'lodash-es/indexOf';
 
 /**
  * Whitespace regexp.

components/carousel/index.tsx

@@ -51,6 +51,7 @@ export const CarouselProps = {
   slickGoTo: PropTypes.number,
   responsive: PropTypes.array,
   dotPosition: PropTypes.oneOf(tuple('top', 'bottom', 'left', 'right')),
+  verticalSwiping: PropTypes.looseBool.def(false),
 };
 
 const Carousel = defineComponent({

components/vc-image/src/Image.tsx

@@ -7,7 +7,7 @@ import {
   computed,
   onMounted,
 } from 'vue';
-import { isNumber } from 'lodash-es';
+import isNumber from 'lodash-es/isNumber';
 
 import BaseMixin from '../../_util/BaseMixin';
 import cn from '../../_util/classNames';

components/vc-menu/Menu.jsx

@@ -13,7 +13,7 @@ import {
   toRaw,
   watch,
 } from 'vue';
-import { isEqual } from 'lodash-es';
+import isEqual from 'lodash-es/isEqual';
 
 const Menu = {
   name: 'Menu',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ant-design-vue",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "title": "Ant Design Vue",
   "description": "An enterprise-class UI design language and Vue-based implementation",
   "keywords": [
@@ -33,7 +33,7 @@
     "test:dev": "cross-env NODE_ENV=test jest --config .jest.js",
     "compile": "node antd-tools/cli/run.js compile",
     "generator-webtypes": "tsc -p antd-tools/generator-types/tsconfig.json && node antd-tools/generator-types/index.js",
-    "pub": "node antd-tools/cli/run.js pub",
+    "pub": "node --max_old_space_size=8192 antd-tools/cli/run.js pub",
     "pub-with-ci": "node antd-tools/cli/run.js pub-with-ci",
     "prepublish": "node antd-tools/cli/run.js guard",
     "pre-publish": "node ./scripts/prepub && npm run generator-webtypes",
@@ -112,6 +112,7 @@
     "compare-versions": "^3.3.0",
     "cross-env": "^7.0.0",
     "css-loader": "^5.0.0",
+    "css-minimizer-webpack-plugin": "^2.0.0",
     "deep-assign": "^3.0.0",
     "docsearch.js": "^2.6.3",
     "enquire-js": "^0.2.1",
@@ -151,7 +152,6 @@
     "mkdirp": "^0.5.1",
     "mockdate": "^2.0.2",
     "nprogress": "^0.2.0",
-    "optimize-css-assets-webpack-plugin": "^5.0.1",
     "postcss": "^8.2.12",
     "postcss-loader": "^5.0.0",
     "prettier": "^1.18.2",
@@ -171,6 +171,7 @@
     "stylelint-config-standard": "^22.0.0",
     "stylelint-declaration-block-no-ignored-properties": "^2.1.0",
     "stylelint-order": "^4.0.0",
+    "terser-webpack-plugin": "^5.1.1",
     "through2": "^3.0.0",
     "ts-jest": "^26.4.1",
     "ts-loader": "^9.1.0",
@@ -209,6 +210,7 @@
     "async-validator": "^3.3.0",
     "dom-align": "^1.12.1",
     "dom-scroll-into-view": "^2.0.0",
+    "lodash": "^4.17.21",
     "lodash-es": "^4.17.15",
     "moment": "^2.27.0",
     "omit.js": "^2.0.0",