Skip to content

Commit a592964

Browse files
committed
Merge branch 'dev' into tracker-compatibility
2 parents 078d2bb + b5f08f3 commit a592964

File tree

231 files changed

+21672
-17847
lines changed

Some content is hidden

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

231 files changed

+21672
-17847
lines changed

.editorconfig

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# http://editorconfig.org
2+
3+
root = true
4+
5+
[*]
6+
charset = utf-8
7+
indent_style = space
8+
indent_size = 2
9+
end_of_line = lf
10+
insert_final_newline = true
11+
trim_trailing_whitespace = true
12+
13+
[*.md]
14+
insert_final_newline = false
15+
trim_trailing_whitespace = false

.eslintrc

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
{
22
"root": true,
3-
"parser": "babel-eslint",
4-
"extends": "vue",
5-
"plugins": ["flowtype"],
3+
"plugins": [
4+
"flowtype"
5+
],
6+
"extends": [
7+
"plugin:vue-libs/recommended",
8+
"plugin:flowtype/recommended"
9+
],
610
"globals": {
711
"__WEEX__": true
8-
},
9-
"rules": {
10-
"no-useless-escape": 0,
11-
"flowtype/define-flow-type": 1,
12-
"flowtype/use-flow-type": 1
1312
}
1413
}

.github/COMMIT_CONVENTION.md

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
## Git Commit Message Convention
2+
3+
> This is adapted from [Angular's commit convention](https://github.com/conventional-changelog/conventional-changelog/blob/master/packages/conventional-changelog-angular/convention.md).
4+
5+
#### Examples
6+
7+
Appears under "Features" header, pencil subheader:
8+
9+
```
10+
feat(pencil): add 'graphiteWidth' option
11+
```
12+
13+
Appears under "Bug Fixes" header, graphite subheader, with a link to issue #28:
14+
15+
```
16+
fix(graphite): stop graphite breaking when width < 0.1
17+
18+
close #28
19+
```
20+
21+
Appears under "Performance Improvements" header, and under "Breaking Changes" with the breaking change explanation:
22+
23+
```
24+
perf(pencil): remove graphiteWidth option
25+
26+
BREAKING CHANGE: The graphiteWidth option has been removed. The default graphite width of 10mm is always used for performance reason.
27+
```
28+
29+
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.
30+
31+
```
32+
revert: feat(pencil): add 'graphiteWidth' option
33+
34+
This reverts commit 667ecc1654a317a13331b17617d973392f415f02.
35+
```
36+
37+
### Full Message Format
38+
39+
A commit message consists of a **header**, **body** and **footer**. The header has a **type**, **scope** and **subject**:
40+
41+
```
42+
<type>(<scope>): <subject>
43+
<BLANK LINE>
44+
<body>
45+
<BLANK LINE>
46+
<footer>
47+
```
48+
49+
The **header** is mandatory and the **scope** of the header is optional.
50+
51+
### Revert
52+
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.
54+
55+
### Type
56+
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.
58+
59+
Other prefixes are up to your discretion. Suggested prefixes are `docs`, `chore`, `style`, `refactor`, and `test` for non-changelog related tasks.
60+
61+
### Scope
62+
63+
The scope could be anything specifying place of the commit change. For example `core`, `compiler`, `ssr`, `v-model`, `transition` etc...
64+
65+
### Subject
66+
67+
The subject contains succinct description of the change:
68+
69+
* use the imperative, present tense: "change" not "changed" nor "changes"
70+
* don't capitalize first letter
71+
* no dot (.) at the end
72+
73+
### Body
74+
75+
Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes".
76+
The body should include the motivation for the change and contrast this with previous behavior.
77+
78+
### Footer
79+
80+
The footer should contain any information about **Breaking Changes** and is also the place to
81+
reference GitHub issues that this commit **Closes**.
82+
83+
**Breaking Changes** should start with the word `BREAKING CHANGE:` with a space or two newlines. The rest of the commit message is then used for this.

.github/CONTRIBUTING.md

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,14 @@ After cloning the repo, run:
4343
$ npm install
4444
```
4545

46-
If you are on a Unix-like system, optionally install the Git pre-commit hook with:
46+
This will also run the `postinstall` script which links two git hooks:
4747

48-
``` bash
49-
$ npm run install:hooks
50-
```
48+
- `pre-commit`: runs ESLint on staged files.
49+
- `commit-msg`: validates commit message format (see below).
50+
51+
### Commiting Changes
5152

52-
This will run ESLint on changed files before each commit.
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.
5354

5455
### Commonly used NPM scripts
5556

@@ -73,10 +74,16 @@ The default test script will do the following: lint with ESLint -> type check wi
7374

7475
## Project Structure
7576

76-
- **`build`**: contains build-related configuration files. In most cases you don't need to touch them.
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:
78+
79+
- `build/alias.js`: module import aliases used across all source code and tests.
80+
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.
7782

7883
- **`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.
7984

85+
See [dist/README.md](https://github.com/vuejs/vue/blob/dev/dist/README.md) for more details on dist files.
86+
8087
- **`flow`**: contains type declarations for [Flow](https://flowtype.org/). These declarations are loaded **globally** and you will see them used in type annotations in normal source code.
8188

8289
- **`packages`**: contains `vue-server-renderer` and `vue-template-compiler`, which are distributed as separate NPM packages. They are automatically generated from the source code and always have the same version with the main `vue` package.
@@ -85,16 +92,6 @@ The default test script will do the following: lint with ESLint -> type check wi
8592

8693
- **`src`**: contains the source code, obviously. The codebase is written in ES2015 with [Flow](https://flowtype.org/) type annotations.
8794

88-
- **`entries`**: contains entries for different builds and packages.
89-
90-
- **`web-runtime`**: the entry for `dist/vue.common.js`, a.k.a the runtime-only build. It does not include the template to render function compiler, so it does not support the `template` option. **This is set as the `main` field in `package.json` so it is the default export when you import Vue as an NPM package.**
91-
92-
- **`web-runtime-with-compiler`**: the entry for `dist/vue.js`, a.k.a the standalone build. It includes the template to render function compiler. To use this build from the NPM packages, do `import Vue from 'vue/dist/vue'`, or alias `vue` to `vue/dist/vue` in your build tool configuration.
93-
94-
- **`web-compiler.js`**: the entry for the `vue-template-compiler` NPM package.
95-
96-
- **`web-server-renderer.js`**: the entry for the `vue-server-renderer` NPM package.
97-
9895
- **`compiler`**: contains code for the template-to-render-function compiler.
9996

10097
The compiler consists of a parser (converts template strings to element ASTs), an optimizer (detects static trees for vdom render optimization), and a code generator (generate render function code from element ASTs). Note the codegen directly generates code strings from the element AST - it's done this way for smaller code size because the compiler is shipped to the browser in the standalone build.
@@ -117,6 +114,8 @@ The default test script will do the following: lint with ESLint -> type check wi
117114

118115
- **`platforms`**: contains platform-specific code.
119116

117+
Entry files for dist builds are located in their respective platform directory.
118+
120119
Each platform module contains three parts: `compiler`, `runtime` and `server`, corresponding to the three directories above. Each part contains platform-specific modules/utilities which are then imported and injected to the core counterparts in platform-specific entry files. For example, the code implementing the logic behind `v-bind:class` is in `platforms/web/runtime/modules/class.js` - which is imported in `entries/web-runtime.js` and used to create the browser-specific vdom patching function.
121120

122121
- **`sfc`**: contains single-file component (`*.vue` files) parsing logic. This is used in the `vue-template-compiler` package.

.github/ISSUE_TEMPLATE.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@ IMPORTANT: Please use the following link to create a new issue:
44
https://new-issue.vuejs.org/
55
66
If your issue was not created using the app above, it will be closed immediately.
7+
8+
中文用户请注意:
9+
请使用上面的链接来创建新的 issue。如果不是用上述工具创建的 issue 会被自动关闭。
710
-->

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ dist/vue.common.min.js
99
test/e2e/reports
1010
test/e2e/screenshots
1111
coverage
12+
RELEASE_NOTE*.md

BACKERS.md

Lines changed: 66 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,63 +4,73 @@ You can join them in supporting Vue.js development by [pledging on Patreon](htt
44

55
### $2000
66

7-
<a href="http://www.thedifferenceengine.io/">
8-
<img width="600px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/tde.png">
7+
<a href="https://stdlib.com/">
8+
<img width="600px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/stdlib.png">
9+
</a>
10+
11+
---
12+
13+
### $1000
14+
15+
<a href="https://www.upyun.com/?utm_source=vue&utm_medium=ad&utm_content=github">
16+
<img width="400px" src="https://raw.githubusercontent.com/vuejs/cn.vuejs.org/master/themes/vue/source/images/upyun-large.png">
917
</a>
1018

1119
---
1220

1321
### $500
1422

23+
<a href="https://deepstreamhub.com">
24+
<img width="260px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/deepstream.png">
25+
</a>
26+
<br><br>
1527
<a href="https://jsfiddle.net/">
1628
<img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/jsfiddle.png">
1729
</a>
18-
30+
<br><br>
1931
<a href="https://laravel.com">
2032
<img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/laravel.png">
2133
</a>
22-
34+
<br><br>
2335
<a href="https://chaitin.cn">
2436
<img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/chaitin.png">
2537
</a>
26-
38+
<br><br>
2739
<a href="https://htmlburger.com/">
2840
<img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/htmlburger.png">
2941
</a>
30-
42+
<br><br>
3143
<a href="https://starter.someline.com/">
3244
<img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/someline.png">
3345
</a>
34-
46+
<br><br>
3547
<a href="http://monterail.com/" target="_blank">
3648
<img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/monterail.png">
3749
</a>
38-
50+
<br><br>
3951
<a href="https://www.trisoft.ro/" target="_blank">
4052
<img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/trisoft.png">
4153
</a>
42-
54+
<br><br>
4355
<a href="https://www.2mhost.com/" target="_blank">
4456
<img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/2mhost.png">
4557
</a>
46-
58+
<br><br>
4759
<a href="https://vuejsjob.com/?ref=vuejs" target="_blank">
4860
<img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/vuejobs.png">
4961
</a>
50-
62+
<br><br>
5163
<a href="https://leanpub.com/vuejs2" target="_blank">
5264
<img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/tmvuejs2.png">
5365
</a>
54-
55-
<a href="https://stdlib.com/" target="_blank">
56-
<img width="240px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/stdlib.png">
66+
<br><br>
67+
<a href="https://famebroker.com" target="_blank">
68+
<img width="260px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/famebroker.png">
69+
</a>
70+
<br><br>
71+
<a href="https://component.io/" target="_blank">
72+
<img width="260px" src="https://raw.githubusercontent.com/vuejs/vuejs.org/master/themes/vue/source/images/component_io.png">
5773
</a>
58-
59-
---
60-
61-
### $250
62-
63-
It could be you!
6474

6575
---
6676

@@ -69,18 +79,26 @@ It could be you!
6979
<a href="http://tighten.co/">
7080
<img width="240px" src="http://i.imgur.com/T7fQYLT.png">
7181
</a>
72-
82+
<br><br>
7383
<a href="http://invoicemachine.com/">
7484
<img width="220px" src="http://assets.invoicemachine.com/images/flat_logo.png">
7585
</a>
76-
86+
<br><br>
7787
<a href="https://alligator.io">
7888
<img width="240px" src="https://alligator.io/images/alligator-logo.svg">
7989
</a>
80-
90+
<br><br>
8191
<a href="https://monei.net/">
8292
<img width="200px" src="http://i.imgur.com/JUSjHAi.png">
8393
</a>
94+
<br><br>
95+
<a href="https://www.accelebrate.com/">
96+
<img width="220px" src="https://www.accelebrate.com/assets/images/accelebrate_logo@2x.png">
97+
</a>
98+
<br><br>
99+
<a href="https://www.waterfall.com">
100+
<img width="200px" src="https://waterfall.com/waterfall_logo_large.png">
101+
</a>
84102

85103
---
86104

@@ -96,7 +114,6 @@ It could be you!
96114
- Wasim Khamlichi
97115
- errorrik
98116
- Alex Balashov
99-
- Cheng-Wei Chien
100117

101118
---
102119

@@ -141,7 +158,6 @@ It could be you!
141158
- Anders
142159
- Dexter Miguel
143160
- Stephen Michael Hartley
144-
- TJ Fogarty
145161
- Wen-Tien Chang
146162
- Ole Støvern
147163
- Valerian Cure
@@ -222,3 +238,28 @@ It could be you!
222238
- Michael Richards
223239
- Eduardo Reveles
224240
- Jan Kremlacek
241+
- Guy Gavergun
242+
- Keith Bailey
243+
- Joel Birch
244+
- Bernhard E. Reiter
245+
- Radu Cretu
246+
- Luiz Tanure
247+
- Poamrong Rith
248+
- Chengzhi Yin
249+
- Dan Barrett
250+
- Zoran Knezevic
251+
- Charles Beaumont
252+
- Jonathan Kent
253+
- James Simpson
254+
- Pascal Germain
255+
- Pierre Vanhulst
256+
- Vincent Gabriel
257+
- Kyovo Digaw
258+
- devneko
259+
- Cheng-Wei Chien
260+
- Michael Mazurczak
261+
- Daniel
262+
- Chris Anderson
263+
- Jon Hobbs-Smith
264+
- Chez Tschetter
265+
- Akiho Nagao

0 commit comments

Comments
 (0)