Merge branch 'master' of github.com:vuejs/cn.vuejs.org into attr-prop

Author: Jinjiang

.circleci/config.yml

@@ -4,41 +4,34 @@
 #
 version: 2
 jobs:
-  build:
-    branches:
-      only: master
-
+  lint:
+    working_directory: ~/repo
     docker:
-      # specify the version you desire here
       - image: circleci/node:12
-
-      # Specify service dependencies here if necessary
-      # CircleCI maintains a library of pre-built images
-      # documented at https://circleci.com/docs/2.0/circleci-images/
-      # - image: circleci/mongo:3.4.4
-
+    steps:
+      - checkout
+      - restore_cache:
+          key: dependencies-cache-{{ checksum "package.json" }}
+      - run: yarn install
+      - save_cache:
+          key: dependencies-cache-{{ checksum "package.json" }}
+          paths:
+            - node_modules
+      - run: yarn lint
+  build:
     working_directory: ~/repo
-
+    docker:
+      - image: circleci/node:12
     steps:
       - checkout
-
-      # Download and cache dependencies
       - restore_cache:
-          keys:
-            - v1-dependencies-{{ checksum "package.json" }}
-            # fallback to using the latest cache if no exact match is found
-            - v1-dependencies-
-
+          key: dependencies-cache-{{ checksum "package.json" }}
       - run: yarn install
-
       - save_cache:
+          key: dependencies-cache-{{ checksum "package.json" }}
           paths:
             - node_modules
-          key: v1-dependencies-{{ checksum "package.json" }}
-
-      # run tests!
       - run: yarn build
-      # - run: yarn deploy
       - run:
           name: deploy
           command: |
@@ -51,39 +44,18 @@ jobs:
             git add .
             git commit -m "generated docs"
             git push origin HEAD:gh-pages --force
-  lint:
-    branches:
-      ignore:
-        - master
-        - gh-pages
-
-    docker:
-      # specify the version you desire here
-      - image: circleci/node:12
-
-      # Specify service dependencies here if necessary
-      # CircleCI maintains a library of pre-built images
-      # documented at https://circleci.com/docs/2.0/circleci-images/
-      # - image: circleci/mongo:3.4.4
-
-    working_directory: ~/repo
-
-    steps:
-      - checkout
-
-      # Download and cache dependencies
-      - restore_cache:
-          keys:
-            - v1-dependencies-{{ checksum "package.json" }}
-            # fallback to using the latest cache if no exact match is found
-            - v1-dependencies-
-
-      - run: yarn install
 
-      - save_cache:
-          paths:
-            - node_modules
-          key: v1-dependencies-{{ checksum "package.json" }}
-
-      # run tests!
-      - run: yarn lint
+workflows:
+  version: 2
+  lint_and_build:
+    jobs:
+      - lint:
+          filters:
+            branches:
+              ignore:
+                - master
+                - gh-pages
+      - build:
+          filters:
+            branches:
+              only: master

package.json

@@ -29,6 +29,6 @@
     "hexo-server": "^0.3.1",
     "hoek": "^6.1.2",
     "request": "^2.85.0",
-    "zhlint": "git+https://github.com/Jinjiang/zhlint.git"
+    "zhlint": "^0.2.2"
   }
 }