Skip to content

Commit 8d9a656

Browse files
authored
Merge pull request #1 from vuejs/dev
同步更新
2 parents 3b43c81 + 628c1b7 commit 8d9a656

File tree

156 files changed

+55461
-35008
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+55461
-35008
lines changed

.babelrc

Lines changed: 0 additions & 8 deletions
This file was deleted.

.babelrc.js

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
const babelPresetFlowVue = {
2+
plugins: [
3+
require('@babel/plugin-proposal-class-properties'),
4+
// require('@babel/plugin-syntax-flow'), // not needed, included in transform-flow-strip-types
5+
require('@babel/plugin-transform-flow-strip-types')
6+
]
7+
}
8+
9+
module.exports = {
10+
presets: [
11+
require('@babel/preset-env'),
12+
// require('babel-preset-flow-vue')
13+
babelPresetFlowVue
14+
],
15+
plugins: [
16+
require('babel-plugin-transform-vue-jsx'),
17+
require('@babel/plugin-syntax-dynamic-import')
18+
],
19+
ignore: [
20+
'dist/*.js',
21+
'packages/**/*.js'
22+
]
23+
}

.circleci/config.yml

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2
33
defaults: &defaults
44
working_directory: ~/project/vue
55
docker:
6-
- image: circleci/node:6-browsers
6+
- image: vuejs/ci
77

88
jobs:
99
install:
@@ -62,6 +62,16 @@ jobs:
6262
- run: npm run test:ssr
6363
- run: npm run test:weex
6464

65+
trigger-regression-test:
66+
<<: *defaults
67+
steps:
68+
- run:
69+
command: |
70+
curl --user ${CIRCLE_TOKEN}: \
71+
--data build_parameters[CIRCLE_JOB]=update \
72+
--data build_parameters[VUE_REVISION]=${CIRCLE_SHA1} \
73+
https://circleci.com/api/v1.1/project/github/vuejs/regression-testing/tree/master
74+
6575
workflows:
6676
version: 2
6777
install-and-parallel-test:
@@ -79,3 +89,42 @@ workflows:
7989
- test-ssr-weex:
8090
requires:
8191
- install
92+
- trigger-regression-test:
93+
filters:
94+
branches:
95+
only:
96+
- regression-test
97+
requires:
98+
- test-cover
99+
- lint-flow-types
100+
- test-e2e
101+
- test-ssr-weex
102+
weekly_regression_test:
103+
triggers:
104+
- schedule:
105+
# At 13:00 UTC (9:00 EDT) on every Monday
106+
cron: "0 13 * * 1"
107+
filters:
108+
branches:
109+
only:
110+
dev
111+
jobs:
112+
- install
113+
- test-cover:
114+
requires:
115+
- install
116+
- lint-flow-types:
117+
requires:
118+
- install
119+
- test-e2e:
120+
requires:
121+
- install
122+
- test-ssr-weex:
123+
requires:
124+
- install
125+
- trigger-regression-test:
126+
requires:
127+
- test-cover
128+
- lint-flow-types
129+
- test-e2e
130+
- test-ssr-weex

.eslintrc

Lines changed: 0 additions & 14 deletions
This file was deleted.

.eslintrc.js

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
module.exports = {
2+
root: true,
3+
parserOptions: {
4+
parser: require.resolve('babel-eslint'),
5+
ecmaVersion: 2018,
6+
sourceType: 'module'
7+
},
8+
env: {
9+
es6: true,
10+
node: true,
11+
browser: true
12+
},
13+
plugins: [
14+
"flowtype"
15+
],
16+
extends: [
17+
"eslint:recommended",
18+
"plugin:flowtype/recommended"
19+
],
20+
globals: {
21+
"__WEEX__": true,
22+
"WXEnvironment": true
23+
},
24+
rules: {
25+
'no-console': process.env.NODE_ENV !== 'production' ? 0 : 2,
26+
'no-useless-escape': 0,
27+
'no-empty': 0
28+
}
29+
}

0 commit comments

Comments
 (0)