Skip to content

Commit

Permalink
Merge pull request #1 from vuejs/dev
Browse files Browse the repository at this point in the history
同步更新
  • Loading branch information
loong-moon committed Dec 10, 2018
2 parents 3b43c81 + 628c1b7 commit 8d9a656
Show file tree
Hide file tree
Showing 156 changed files with 55,461 additions and 35,008 deletions.
8 changes: 0 additions & 8 deletions .babelrc

This file was deleted.

23 changes: 23 additions & 0 deletions .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'
]
}
51 changes: 50 additions & 1 deletion .circleci/config.yml
Expand Up @@ -3,7 +3,7 @@ version: 2
defaults: &defaults
working_directory: ~/project/vue
docker:
- image: circleci/node:6-browsers
- image: vuejs/ci

jobs:
install:
Expand Down Expand Up @@ -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:
Expand All @@ -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
14 changes: 0 additions & 14 deletions .eslintrc

This file was deleted.

29 changes: 29 additions & 0 deletions .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
}
}

0 comments on commit 8d9a656

Please sign in to comment.