site update & icons update

.github/FUNDING.yml

@@ -1,8 +1,8 @@
 # These are supported funding model platforms
 
 github: # [tangjinzhou]
-patreon: # Replace with a single Patreon username
 open_collective: ant-design-vue
+patreon: tangjinzhou
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 custom: # Replace with a single custom sponsorship URL

antd-tools/cli/run.js

@@ -13,6 +13,28 @@ program.on('--help', () => {
 
 program.parse(process.argv);
 
+function runTask(toRun) {
+  const metadata = { task: toRun };
+  // Gulp >= 4.0.0 (doesn't support events)
+  const taskInstance = gulp.task(toRun);
+  if (taskInstance === undefined) {
+    gulp.emit('task_not_found', metadata);
+    return;
+  }
+  const start = process.hrtime();
+  gulp.emit('task_start', metadata);
+  try {
+    taskInstance.apply(gulp);
+    metadata.hrDuration = process.hrtime(start);
+    gulp.emit('task_stop', metadata);
+    gulp.emit('stop');
+  } catch (err) {
+    err.hrDuration = process.hrtime(start);
+    err.task = metadata.task;
+    gulp.emit('task_err', err);
+  }
+}
+
 const task = program.args[0];
 
 if (!task) {
@@ -22,5 +44,5 @@ if (!task) {
 
   require('../gulpfile');
 
-  gulp.start(task);
+  runTask(task);
 }

antd-tools/gulpfile.js

@@ -145,14 +145,10 @@ function tag() {
   execSync(`git config --global user.name ${process.env.GITHUB_USER_NAME}`);
   execSync(`git tag ${version}`);
   execSync(
-    `git push https://${
+    `git push https://${process.env.GITHUB_TOKEN}@github.com/vueComponent/ant-design-vue.git ${version}:${version}`,
-      process.env.GITHUB_TOKEN
-    }@github.com/vueComponent/ant-design-vue.git ${version}:${version}`,
   );
   execSync(
-    `git push https://${
+    `git push https://${process.env.GITHUB_TOKEN}@github.com/vueComponent/ant-design-vue.git master:master`,
-      process.env.GITHUB_TOKEN
-    }@github.com/vueComponent/ant-design-vue.git master:master`,
   );
   console.log('tagged');
 }
@@ -204,12 +200,17 @@ function githubRelease(done) {
     });
 }
 
-gulp.task('tag', done => {
+gulp.task(
+  'tag',
+  gulp.series(done => {
     tag();
     githubRelease(done);
-});
+  }),
+);
 
-gulp.task('check-git', done => {
+gulp.task(
+  'check-git',
+  gulp.series(done => {
     runCmd('git', ['status', '--porcelain'], (code, result) => {
       if (/^\?\?/m.test(result)) {
         return done(`There are untracked files in the working tree.\n${result}
@@ -221,7 +222,8 @@ gulp.task('check-git', done => {
       }
       return done();
     });
-});
+  }),
+);
 
 function publish(tagString, done) {
   let args = ['publish', '--with-antd-tools'];
@@ -265,29 +267,45 @@ function pub(done) {
   });
 }
 
-gulp.task('dist', ['compile'], done => {
+gulp.task(
-  dist(done);
+  'compile-with-es',
-});
+  gulp.series(done => {
-gulp.task('compile', ['compile-with-es'], done => {
-  compile().on('finish', function() {
-    done();
-  });
-});
-gulp.task('compile-with-es', done => {
     compile(false).on('finish', function() {
       done();
     });
-});
+  }),
+);
 
-gulp.task('pub', ['check-git', 'compile'], done => {
+gulp.task(
+  'compile',
+  gulp.series('compile-with-es', done => {
+    compile().on('finish', function() {
+      done();
+    });
+  }),
+);
+
+gulp.task(
+  'dist',
+  gulp.series('compile', done => {
+    dist(done);
+  }),
+);
+
+gulp.task(
+  'pub',
+  gulp.series('check-git', 'compile', done => {
     if (!process.env.GITHUB_TOKEN) {
       console.log('no GitHub token found, skip');
     } else {
       pub(done);
     }
-});
+  }),
+);
 
-gulp.task('pub-with-ci', done => {
+gulp.task(
+  'pub-with-ci',
+  gulp.series(done => {
     if (!process.env.NPM_TOKEN) {
       console.log('no NPM token found, skip');
     } else {
@@ -326,16 +344,18 @@ gulp.task('pub-with-ci', done => {
         }
       });
     }
-});
+  }),
+);
 
+gulp.task(
+  'guard',
+  gulp.series(done => {
     function reportError() {
       console.log(chalk.bgRed('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'));
       console.log(chalk.bgRed('!! `npm publish` is forbidden for this package. !!'));
       console.log(chalk.bgRed('!! Use `npm run pub` instead.        !!'));
       console.log(chalk.bgRed('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'));
     }
-
-gulp.task('guard', done => {
     const npmArgs = getNpmArgs();
     if (npmArgs) {
       for (let arg = npmArgs.shift(); arg; arg = npmArgs.shift()) {
@@ -347,4 +367,5 @@ gulp.task('guard', done => {
       }
     }
     done();
-});
+  }),
+);

components/dropdown/style/index.less

@@ -161,6 +161,8 @@
       &,
       .@{dropdown-prefix-cls}-menu-submenu-arrow-icon {
         color: @disabled-color;
+        background-color: @component-background;
+        cursor: not-allowed;
       }
     }
   }

package.json

@@ -40,7 +40,8 @@
     "lint:style": "stylelint \"{site,components}/**/*.less\" --syntax less",
     "commitmsg": "commitlint -x @commitlint/config-conventional -e $GIT_PARAMS",
     "codecov": "codecov",
-    "prettier": "node ./scripts/prettier.js"
+    "prettier": "node ./scripts/prettier.js",
+    "postinstall": "node scripts/postinstall || echo \"ignore\""
   },
   "repository": {
     "type": "git",
@@ -109,7 +110,7 @@
     "fetch-jsonp": "^1.1.3",
     "fs-extra": "^7.0.0",
     "glob": "^7.1.2",
-    "gulp": "^3.9.1",
+    "gulp": "^4.0.1",
     "gulp-babel": "^7.0.0",
     "gulp-strip-code": "^0.1.4",
     "highlight.js": "^9.12.0",
@@ -132,6 +133,7 @@
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",
     "mockdate": "^2.0.2",
+    "node-emoji": "^1.10.0",
     "nprogress": "^0.2.0",
     "optimize-css-assets-webpack-plugin": "^5.0.1",
     "postcss": "^7.0.6",
@@ -172,7 +174,7 @@
     "webpackbar": "^3.1.5"
   },
   "dependencies": {
-    "@ant-design/icons": "^1.1.15",
+    "@ant-design/icons": "^2.1.0",
     "@ant-design/icons-vue": "^1.0.1",
     "add-dom-event-listener": "^1.0.2",
     "array-tree-filter": "^2.1.0",

site/components/geektime.vue

@@ -1,29 +1,46 @@
 <template>
-  <div id="geektime">
+  <div id="geektime" v-show="visible">
     <a
       href="https://time.geekbang.org/course/intro/163?code=KHKYcoBU6vZa8nMglg7AWfDxxi3BWrz9INAzAY3umPk%3D"
       target="_blank"
     >
       <img
-        width="150"
+        width="170"
         alt="Vue 实战教程"
-        src="https://cdn.nlark.com/yuque/0/2019/jpeg/87084/1554903088531-assets/web-upload/c496a156-aabc-4a9b-8cb6-a7a6617706ce.jpeg"
+        src="https://cdn.nlark.com/yuque/0/2019/jpeg/87084/1562230861353-assets/web-upload/2fab2df7-5cc9-4791-b344-a97da29eb400.jpeg"
       >
     </a>
+    <div v-if="isMobile" class="close" @click="visible=false">
+      <a-icon type="close"></a-icon>
+    </div>
   </div>
 </template>
 
 <script>
 export default {
-
+  props: ['isMobile'],
+  data() {
+    return {
+      visible: true
+    }
+  }
 };
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
   #geektime {
     position: fixed;
     bottom: 15px;
     right: 15px;
+    .close {
+      position: absolute;
+      text-align: center;
+      top: -8px;
+      right: -8px;
+      font-size: 16px;
+      padding: 15px;
+      color: #6e3041;
+    }
   }
 </style>
 

site/components/layout.vue

@@ -304,7 +304,7 @@ export default {
           </div>
         </a-locale-provider>
         { name.indexOf('back-top') === -1 ? <a-back-top /> : null }
-        { isCN && <Geektime /> }
+        { isCN && <Geektime isMobile={isMobile} /> }
       </div>
     );
   },

site/dev.js

@@ -12,7 +12,7 @@ import Api from './components/api';
 import './components';
 import demoBox from './components/demoBox';
 import demoContainer from './components/demoContainer';
-import Test from '../components/form/demo/index.vue';
+import Test from '../components/date-picker/demo/index.vue';
 import zhCN from './theme/zh-CN';
 import enUS from './theme/en-US';
 Vue.use(Vuex);

site/index.html

@@ -41,6 +41,7 @@
     <!-- Hotjar Tracking Code for http://vue.ant.design -->
     <script>
         (function(h, o, t, j, a, r) {
+          if(location.href.indexOf('iframe') === -1 && (location.host === 'ant-design-vue.gitee.io' || location.host === 'vue.ant.design')) {
             h.hj = h.hj || function() {
               (h.hj.q = h.hj.q || []).push(arguments)
             };
@@ -53,6 +54,7 @@
             r.async = 1;
             r.src = t + h._hjSettings.hjid + j + h._hjSettings.hjsv;
             a.appendChild(r);
+          }
         })(window, document, 'https://static.hotjar.com/c/hotjar-', '.js?sv=');
     </script>
 </body>