Skip to content

Commit ff72987

Browse files
committed
Merge branch 'vuejs-dev' into dev
* vuejs-dev: (558 commits) chore: sponsors chore: update sponsors chore: update sponsors chore: sponsor cleanup chore: update sponsors chore(package.json): Add sideEffects: false field in package.json (vuejs#8099) chore: new sponsor chore(typo): no dots at the end of the comments (vuejs#8087) chore: new sponsor chore: update sponsors chore: update sponsors chore: use reactive components count in benchmark (vuejs#7996) feat(weex): support object syntax of class (vuejs#7930) feat(server, webpack-plugin): webpack 4 support (vuejs#7839) fix(ssr): render initial and used async css chunks (vuejs#7902) fix(ssr): remove trailing hash in webpack module identifier when generating client manifest chore: new sponsor chore: update sponsor build: release 2.5.17-beta.0 build: build 2.5.17-beta.0 ...
2 parents 83bc7ff + 2df6315 commit ff72987

File tree

356 files changed

+71731
-22837
lines changed

Some content is hidden

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

356 files changed

+71731
-22837
lines changed

.circleci/config.yml

+81
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
version: 2
2+
3+
defaults: &defaults
4+
working_directory: ~/project/vue
5+
docker:
6+
- image: circleci/node:6-browsers
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+
workflows:
66+
version: 2
67+
install-and-parallel-test:
68+
jobs:
69+
- install
70+
- test-cover:
71+
requires:
72+
- install
73+
- lint-flow-types:
74+
requires:
75+
- install
76+
- test-e2e:
77+
requires:
78+
- install
79+
- test-ssr-weex:
80+
requires:
81+
- install

.eslintrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"plugin:flowtype/recommended"
99
],
1010
"globals": {
11-
"__WEEX__": true
11+
"__WEEX__": true,
12+
"WXEnvironment": true
1213
}
1314
}

.flowconfig

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

@@ -20,3 +20,4 @@ module.name_mapper='^weex/\(.*\)$' -> '<PROJECT_ROOT>/src/platforms/weex/\1'
2020
module.name_mapper='^server/\(.*\)$' -> '<PROJECT_ROOT>/src/server/\1'
2121
module.name_mapper='^entries/\(.*\)$' -> '<PROJECT_ROOT>/src/entries/\1'
2222
module.name_mapper='^sfc/\(.*\)$' -> '<PROJECT_ROOT>/src/sfc/\1'
23+
suppress_comment= \\(.\\|\n\\)*\\$flow-disable-line

.github/COMMIT_CONVENTION.md

+16-8
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,43 @@
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

7-
Appears under "Features" header, pencil subheader:
15+
Appears under "Features" header, `compiler` subheader:
816

917
```
10-
feat(pencil): add 'graphiteWidth' option
18+
feat(compiler): add 'comments' option
1119
```
1220

13-
Appears under "Bug Fixes" header, graphite subheader, with a link to issue #28:
21+
Appears under "Bug Fixes" header, `v-model` subheader, with a link to issue #28:
1422

1523
```
16-
fix(graphite): stop graphite breaking when width < 0.1
24+
fix(v-model): handle events on blur
1725
1826
close #28
1927
```
2028

2129
Appears under "Performance Improvements" header, and under "Breaking Changes" with the breaking change explanation:
2230

2331
```
24-
perf(pencil): remove graphiteWidth option
32+
perf(core): improve vdom diffing by removing 'foo' option
2533
26-
BREAKING CHANGE: The graphiteWidth option has been removed. The default graphite width of 10mm is always used for performance reason.
34+
BREAKING CHANGE: The 'foo' option has been removed.
2735
```
2836

2937
The following commit and commit `667ecc1` do not appear in the changelog if they are under the same release. If not, the revert commit appears under the "Reverts" header.
3038

3139
```
32-
revert: feat(pencil): add 'graphiteWidth' option
40+
revert: feat(compiler): add 'comments' option
3341
3442
This reverts commit 667ecc1654a317a13331b17617d973392f415f02.
3543
```

.github/CONTRIBUTING.md

+27-11
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,12 @@ You will need [Node.js](http://nodejs.org) **version 6+** and [Java Runtime Envi
4040
After cloning the repo, run:
4141

4242
``` bash
43-
$ npm install
43+
$ npm install # or yarn
4444
```
4545

46-
This will also run the `postinstall` script which links two git hooks:
46+
### Committing Changes
4747

48-
- `pre-commit`: runs ESLint on staged files.
49-
- `commit-msg`: validates commit message format (see below).
50-
51-
### Commiting Changes
52-
53-
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.
48+
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.
5449

5550
### Commonly used NPM scripts
5651

@@ -74,11 +69,11 @@ The default test script will do the following: lint with ESLint -> type check wi
7469

7570
## Project Structure
7671

77-
- **`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:
72+
- **`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:
7873

79-
- `build/alias.js`: module import aliases used across all source code and tests.
74+
- `scripts/alias.js`: module import aliases used across all source code and tests.
8075

81-
- `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.
76+
- `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.
8277

8378
- **`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.
8479

@@ -122,3 +117,24 @@ The default test script will do the following: lint with ESLint -> type check wi
122117

123118
- **`shared`**: contains utilities shared across the entire codebase.
124119

120+
- **`types`**: contains TypeScript type definitions
121+
122+
- **`test`**: type definitions tests
123+
124+
125+
## Financial Contribution
126+
127+
As a pure community-driven project without major corporate backing, we also welcome financial contributions via Patreon or OpenCollective.
128+
129+
- [Become a backer or sponsor on Patreon](https://www.patreon.com/evanyou)
130+
- [Become a backer or sponsor on OpenCollective](https://opencollective.com/vuejs)
131+
132+
### What's the difference between Patreon and OpenCollective?
133+
134+
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.
135+
136+
## Credits
137+
138+
Thank you to all the people who have already contributed to Vue.js!
139+
140+
<a href="https://github.com/vuejs/vue/graphs/contributors"><img src="https://opencollective.com/vuejs/contributors.svg?width=890" /></a>

.github/ISSUE_TEMPLATE.md

+6
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,9 @@ If your issue was not created using the app above, it will be closed immediately
88
中文用户请注意:
99
请使用上面的链接来创建新的 issue。如果不是用上述工具创建的 issue 会被自动关闭。
1010
-->
11+
12+
<!--
13+
Love vuejs? Please consider supporting us via Patreon or OpenCollective:
14+
👉 https://www.patreon.com/evanyou
15+
👉 https://opencollective.com/vuejs/donate
16+
-->

.gitignore

+8-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ test/e2e/screenshots
1111
coverage
1212
RELEASE_NOTE*.md
1313
.idea/
14-
components/
15-
test/vue.test.js
14+
dist/*.js
15+
packages/vue-server-renderer/basic.js
16+
packages/vue-server-renderer/build.js
17+
packages/vue-server-renderer/server-plugin.js
18+
packages/vue-server-renderer/client-plugin.js
19+
packages/vue-template-compiler/build.js
20+
.vscode
21+
1622

0 commit comments

Comments
 (0)