diff --git a/.babelrc b/.babelrc deleted file mode 100644 index 605b14091c4..00000000000 --- a/.babelrc +++ /dev/null @@ -1,8 +0,0 @@ -{ - "presets": ["es2015", "flow-vue"], - "plugins": ["transform-vue-jsx", "syntax-dynamic-import"], - "ignore": [ - "dist/*.js", - "packages/**/*.js" - ] -} diff --git a/.babelrc.js b/.babelrc.js new file mode 100644 index 00000000000..400866bfa7e --- /dev/null +++ b/.babelrc.js @@ -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 --git a/.circleci/config.yml b/.circleci/config.yml index 8abef177ef6..ab8973c4acf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 defaults: &defaults working_directory: ~/project/vue docker: - - image: circleci/node:6-browsers + - image: vuejs/ci jobs: install: @@ -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 --git a/.eslintrc b/.eslintrc deleted file mode 100644 index f5845425106..00000000000 --- a/.eslintrc +++ /dev/null @@ -1,14 +0,0 @@ -{ - "root": true, - "plugins": [ - "flowtype" - ], - "extends": [ - "plugin:vue-libs/recommended", - "plugin:flowtype/recommended" - ], - "globals": { - "__WEEX__": true, - "WXEnvironment": true - } -} diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 00000000000..e27aad552a1 --- /dev/null +++ b/.eslintrc.js @@ -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 --git a/BACKERS.md b/BACKERS.md index 559f5f3e8d2..2f493dad4dd 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -17,7 +17,7 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu
- +
@@ -62,6 +62,26 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu + ++ + + + | ++ + + + | +
- +
@@ -72,19 +72,19 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu -- - + + | - - + + | ||
- - - - | @@ -155,13 +150,6 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu | -- - - - | -|
@@ -172,46 +160,48 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu | +|||
- - + + | - - + + | - - + + | -|
- - + + | - - + + | +||
- - + + | - - + + | ||