Merge branch '2.6' into dev

Author: yyx990803

Diff for: .babelrc

@@ -0,0 +1,23 @@
+const babelPresetFlowVue = {
+  plugins: [
+    require('@babel/plugin-proposal-class-properties'),
+    // require('@babel/plugin-syntax-flow'), // not needed, included in transform-flow-strip-types
+    require('@babel/plugin-transform-flow-strip-types')
+  ]
+}
+
+module.exports = {
+  presets: [
+    require('@babel/preset-env'),
+    // require('babel-preset-flow-vue')
+    babelPresetFlowVue
+  ],
+  plugins: [
+    require('babel-plugin-transform-vue-jsx'),
+    require('@babel/plugin-syntax-dynamic-import')
+  ],
+  ignore: [
+    'dist/*.js',
+    'packages/**/*.js'
+  ]
+}

Diff for: .babelrc.js

@@ -3,7 +3,7 @@ version: 2
 defaults: &defaults
   working_directory: ~/project/vue
   docker:
-    - image: circleci/node:6-browsers
+    - image: vuejs/ci
 
 jobs:
   install:
@@ -12,12 +12,12 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - v1-vue-{{ .Branch }}-{{ checksum "package-lock.json" }}
+            - v1-vue-{{ .Branch }}-{{ checksum "yarn.lock" }}
             - v1-vue-{{ .Branch }}-
             - v1-vue-
       - run: npm install
       - save_cache:
-          key: v1-vue-{{ .Branch }}-{{ checksum "package-lock.json" }}
+          key: v1-vue-{{ .Branch }}-{{ checksum "yarn.lock" }}
           paths:
             - node_modules/
       - persist_to_workspace:
@@ -44,7 +44,7 @@ jobs:
          name: report coverage stats for non-PRs
          command: |
            if [[ -z $CI_PULL_REQUEST ]]; then
-             cat ./coverage/lcov.info | ./node_modules/.bin/codecov
+             ./node_modules/.bin/codecov
            fi
 
   test-e2e:
@@ -62,6 +62,16 @@ jobs:
       - run: npm run test:ssr
       - run: npm run test:weex
 
+  trigger-regression-test:
+    <<: *defaults
+    steps:
+      - run:
+          command: |
+            curl --user ${CIRCLE_TOKEN}: \
+            --data build_parameters[CIRCLE_JOB]=update \
+            --data build_parameters[VUE_REVISION]=${CIRCLE_SHA1} \
+            https://circleci.com/api/v1.1/project/github/vuejs/regression-testing/tree/master
+
 workflows:
   version: 2
   install-and-parallel-test:
@@ -79,3 +89,42 @@ workflows:
       - test-ssr-weex:
           requires:
             - install
+      - trigger-regression-test:
+          filters:
+            branches:
+              only:
+                - regression-test
+          requires:
+            - test-cover
+            - lint-flow-types
+            - test-e2e
+            - test-ssr-weex
+  weekly_regression_test:
+    triggers:
+      - schedule:
+          # At 13:00 UTC (9:00 EDT) on every Monday
+          cron: "0 13 * * 1"
+          filters:
+            branches:
+              only:
+                dev
+    jobs:
+      - install
+      - test-cover:
+          requires:
+            - install
+      - lint-flow-types:
+          requires:
+            - install
+      - test-e2e:
+          requires:
+            - install
+      - test-ssr-weex:
+          requires:
+            - install
+      - trigger-regression-test:
+          requires:
+            - test-cover
+            - lint-flow-types
+            - test-e2e
+            - test-ssr-weex

Diff for: .circleci/config.yml

@@ -0,0 +1,29 @@
+module.exports = {
+  root: true,
+  parserOptions: {
+    parser: require.resolve('babel-eslint'),
+    ecmaVersion: 2018,
+    sourceType: 'module'
+  },
+  env: {
+    es6: true,
+    node: true,
+    browser: true
+  },
+  plugins: [
+    "flowtype"
+  ],
+  extends: [
+    "eslint:recommended",
+    "plugin:flowtype/recommended"
+  ],
+  globals: {
+    "__WEEX__": true,
+    "WXEnvironment": true
+  },
+  rules: {
+    'no-console': process.env.NODE_ENV !== 'production' ? 0 : 2,
+    'no-useless-escape': 0,
+    'no-empty': 0
+  }
+}

Diff for: .eslintrc

@@ -1,7 +1,7 @@
 [ignore]
 .*/node_modules/.*
 .*/test/.*
-.*/build/.*
+.*/scripts/.*
 .*/examples/.*
 .*/benchmarks/.*
 

Diff for: .eslintrc.js

@@ -1,6 +1,14 @@
 ## Git Commit Message Convention
 
-> This is adapted from [Angular's commit convention](https://github.com/conventional-changelog/conventional-changelog/blob/master/packages/conventional-changelog-angular/convention.md).
+> This is adapted from [Angular's commit convention](https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-angular).
+
+#### TL;DR:
+
+Messages must be matched by the following regex:
+
+``` js
+/^(revert: )?(feat|fix|polish|docs|style|refactor|perf|test|workflow|ci|chore|types)(\(.+\))?: .{1,50}/
+```
 
 #### Examples
 

Diff for: .flowconfig

@@ -40,18 +40,12 @@ You will need [Node.js](http://nodejs.org) **version 6+** and [Java Runtime Envi
 After cloning the repo, run:
 
 ``` bash
-$ npm install
-& npm run setup
+$ npm install # or yarn
 ```
 
-The `setup` script links two git hooks:
-
-- `pre-commit`: runs ESLint on staged files.
-- `commit-msg`: validates commit message format (see below).
-
 ### Committing Changes
 
-Commit messages should follow the [commit message convention](./COMMIT_CONVENTION.md) so that changelogs can be automatically generated. If git hooks have been properly linked, commit messages will be automatically validated upon commit. It is recommended to use `npm run commit` instead of `git commit`, which provides an interactive CLI for generating proper commit messages.
+Commit messages should follow the [commit message convention](./COMMIT_CONVENTION.md) so that changelogs can be automatically generated. Commit messages will be automatically validated upon commit. If you are not familiar with the commit message convention, you can use `npm run commit` instead of `git commit`, which provides an interactive CLI for generating proper commit messages.
 
 ### Commonly used NPM scripts
 
@@ -75,11 +69,11 @@ The default test script will do the following: lint with ESLint -> type check wi
 
 ## Project Structure
 
-- **`build`**: contains build-related configuration files. In most cases you don't need to touch them. However, it would be helpful to familiarize yourself with the following files:
+- **`scripts`**: contains build-related scripts and configuration files. In most cases you don't need to touch them. However, it would be helpful to familiarize yourself with the following files:
 
-  - `build/alias.js`: module import aliases used across all source code and tests.
+  - `scripts/alias.js`: module import aliases used across all source code and tests.
 
-  - `build/config.js`: contains the build configurations for all files found in `dist/`. Check this file if you want to find out the entry source file for a dist file.
+  - `scripts/config.js`: contains the build configurations for all files found in `dist/`. Check this file if you want to find out the entry source file for a dist file.
 
 - **`dist`**: contains built files for distribution. Note this directory is only updated when a release happens; they do not reflect the latest changes in development branches.
 
@@ -137,10 +131,10 @@ As a pure community-driven project without major corporate backing, we also welc
 
 ### What's the difference between Patreon and OpenCollective?
 
-Funds donated via Patreon goes directly to support Evan You's full-time work on Vue.js. Funds donated via OpenCollective are managed with transparent expenses and will be used for compensating work and expenses by core team members or sponsoring community events. Your name/logo will receive proper recognition and exposure by donating on either platform.
+Funds donated via Patreon go directly to support Evan You's full-time work on Vue.js. Funds donated via OpenCollective are managed with transparent expenses and will be used for compensating work and expenses for core team members or sponsoring community events. Your name/logo will receive proper recognition and exposure by donating on either platform.
 
 ## Credits
 
-Thank you to all the people who have already contributed to vuejs!
+Thank you to all the people who have already contributed to Vue.js!
 
 <a href="https://github.com/vuejs/vue/graphs/contributors"><img src="https://opencollective.com/vuejs/contributors.svg?width=890" /></a>