Skip to content

Commit bc08291

Browse files
dukegoddukegod
committed
Merge commit 'bad3c326a3f8b8e0d3bcf07917dc0adf97c32351' into dev
* commit 'bad3c326a3f8b8e0d3bcf07917dc0adf97c32351': (911 commits) chore: update sponsors [ci skip] (vuejs#10158) chore: fix sponsor url [ci skip] chore: update sponsors [ci skip] (vuejs#10136) chore: update sponsors [ci skip] (vuejs#10130) chore: update sponsors [ci skip] (vuejs#10113) chore(typo): fix comment typo (vuejs#10101) chore: update sponsors [ci skip] (vuejs#10064) Create FUNDING.yml chore: update sponsors [ci skip] (vuejs#10031) chore(typo): fix README tag mismatch (vuejs#9934) chore(typo): fix typo in comments (vuejs#9995) chore: update sponsors [ci skip] (vuejs#9970) chore: update sponsors [ci skip] (vuejs#9933) fix: fix function expression regex (vuejs#9922) fix(types): fix global namespace declaration for UMD bundle (vuejs#9912) fix(compiler): Remove the warning for valid v-slot value (vuejs#9917) polish: add warning when .native modifier is used on native HTML elements (vuejs#9884) test: fix running e2e test on windows (vuejs#9909) refactor: remove useless parameter to the function removeVnodes (vuejs#9914) test: separate failing test for TS 3.4 ... # Conflicts: # packages/weex-template-compiler/build.js # packages/weex-vue-framework/factory.js # packages/weex-vue-framework/index.js
2 parents 3cac5c7 + bad3c32 commit bc08291

File tree

429 files changed

+107677
-58578
lines changed

Some content is hidden

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

429 files changed

+107677
-58578
lines changed

‎.babelrc

-8
This file was deleted.

‎.babelrc.js

+23
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

+131
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
version: 2
2+
3+
defaults: &defaults
4+
working_directory: ~/project/vue
5+
docker:
6+
- image: vuejs/ci
7+
8+
jobs:
9+
install:
10+
<<: *defaults
11+
steps:
12+
- checkout
13+
- restore_cache:
14+
keys:
15+
- v1-vue-{{ .Branch }}-{{ checksum "yarn.lock" }}
16+
- v1-vue-{{ .Branch }}-
17+
- v1-vue-
18+
- run: npm install
19+
- save_cache:
20+
key: v1-vue-{{ .Branch }}-{{ checksum "yarn.lock" }}
21+
paths:
22+
- node_modules/
23+
- persist_to_workspace:
24+
root: ~/project
25+
paths:
26+
- vue
27+
28+
lint-flow-types:
29+
<<: *defaults
30+
steps:
31+
- attach_workspace:
32+
at: ~/project
33+
- run: npm run lint
34+
- run: npm run flow
35+
- run: npm run test:types
36+
37+
test-cover:
38+
<<: *defaults
39+
steps:
40+
- attach_workspace:
41+
at: ~/project
42+
- run: npm run test:cover
43+
- run:
44+
name: report coverage stats for non-PRs
45+
command: |
46+
if [[ -z $CI_PULL_REQUEST ]]; then
47+
./node_modules/.bin/codecov
48+
fi
49+
50+
test-e2e:
51+
<<: *defaults
52+
steps:
53+
- attach_workspace:
54+
at: ~/project
55+
- run: npm run test:e2e -- --env phantomjs
56+
57+
test-ssr-weex:
58+
<<: *defaults
59+
steps:
60+
- attach_workspace:
61+
at: ~/project
62+
- run: npm run test:ssr
63+
- run: npm run test:weex
64+
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+
75+
workflows:
76+
version: 2
77+
install-and-parallel-test:
78+
jobs:
79+
- install
80+
- test-cover:
81+
requires:
82+
- install
83+
- lint-flow-types:
84+
requires:
85+
- install
86+
- test-e2e:
87+
requires:
88+
- install
89+
- test-ssr-weex:
90+
requires:
91+
- install
92+
- trigger-regression-test:
93+
filters:
94+
branches:
95+
only:
96+
- "2.6"
97+
- regression-test
98+
requires:
99+
- test-cover
100+
- lint-flow-types
101+
- test-e2e
102+
- test-ssr-weex
103+
weekly_regression_test:
104+
triggers:
105+
- schedule:
106+
# At 13:00 UTC (9:00 EDT) on every Monday
107+
cron: "0 13 * * 1"
108+
filters:
109+
branches:
110+
only:
111+
dev
112+
jobs:
113+
- install
114+
- test-cover:
115+
requires:
116+
- install
117+
- lint-flow-types:
118+
requires:
119+
- install
120+
- test-e2e:
121+
requires:
122+
- install
123+
- test-ssr-weex:
124+
requires:
125+
- install
126+
- trigger-regression-test:
127+
requires:
128+
- test-cover
129+
- lint-flow-types
130+
- test-e2e
131+
- test-ssr-weex

‎.eslintrc

-13
This file was deleted.

‎.eslintrc.js

+29
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+
}

‎.flowconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[ignore]
22
.*/node_modules/.*
33
.*/test/.*
4-
.*/build/.*
4+
.*/scripts/.*
55
.*/examples/.*
66
.*/benchmarks/.*
77

‎.github/CODE_OF_CONDUCT.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
44

5-
We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, age, or religion.
5+
We are committed to making participation in this project a harassment-free experience for everyone, regardless of the level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, age, or religion.
66

77
Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
88

‎.github/COMMIT_CONVENTION.md

+14-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
## Git Commit Message Convention
22

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

513
#### Examples
614

@@ -50,24 +58,24 @@ The **header** is mandatory and the **scope** of the header is optional.
5058

5159
### Revert
5260

53-
If the commit reverts a previous commit, it should begin with `revert: `, followed by the header of the reverted commit. In the body it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit being reverted.
61+
If the commit reverts a previous commit, it should begin with `revert: `, followed by the header of the reverted commit. In the body, it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit being reverted.
5462

5563
### Type
5664

57-
If the prefix is `feat`, `fix` or `perf`, it will appear in the changelog. However if there is any [BREAKING CHANGE](#footer), the commit will always appear in the changelog.
65+
If the prefix is `feat`, `fix` or `perf`, it will appear in the changelog. However, if there is any [BREAKING CHANGE](#footer), the commit will always appear in the changelog.
5866

5967
Other prefixes are up to your discretion. Suggested prefixes are `docs`, `chore`, `style`, `refactor`, and `test` for non-changelog related tasks.
6068

6169
### Scope
6270

63-
The scope could be anything specifying place of the commit change. For example `core`, `compiler`, `ssr`, `v-model`, `transition` etc...
71+
The scope could be anything specifying the place of the commit change. For example `core`, `compiler`, `ssr`, `v-model`, `transition` etc...
6472

6573
### Subject
6674

67-
The subject contains succinct description of the change:
75+
The subject contains a succinct description of the change:
6876

6977
* use the imperative, present tense: "change" not "changed" nor "changes"
70-
* don't capitalize first letter
78+
* don't capitalize the first letter
7179
* no dot (.) at the end
7280

7381
### Body

0 commit comments

Comments
 (0)