8000 Merge remote-tracking branch 'original_author/master' · macroxing/vue@4d3ddde · GitHub
[go: up one dir, main page]
Skip to content

Commit 4d3ddde

Browse files
macroxingmacroxing
committed
Merge remote-tracking branch 'original_author/master'
2 parents 2f6a6b9 + bf8e371 commit 4d3ddde

File tree

200 files changed

+17850
-12319
lines changed

Some content is hidden

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

200 files changed

+17850
-12319
lines changed

‎.bithoundrc

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"ignore": [
3+
"**/node_modules/**",
4+
"**/build/**",
5+
"**/dist/**",
6+
"**/examples/**",
7+
"**/perf/**",
8+
"gruntfile.js",
9+
"**/test/unit/lib/**"
10+
],
11+
"test": [
12+
"**/test/**"
13+
]
14+
}

‎.eslintrc

Lines changed: 166 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
1+
{
2+
"env": {
3+
"browser": true,
4+
"node": true
5+
},
6+
7+
"globals": {
8+
"jQuery": true
9+
},
10+
11+
"rules": {
12+
"accessor-pairs": 2,
13+
"array-bracket-spacing": 0,
14+
"block-scoped-var": 0,
15+
"brace-style": [2, "1tbs", { "allowSingleLine": true }],
16+
"camelcase": 0,
17+
"comma-dangle": [2, "never"],
18+
"comma-spacing": [2, { "before": false, "after": true }],
19+
"comma-style": [2, "last"],
20+
"complexity": 0,
21+
"computed-property-spacing": 0,
22+
"consistent-return": 0,
23+
"consistent-this": 0,
24+
"constructor-super": 2,
25+
"curly": [2, "multi-line"],
26+
"default-case": 0,
27+
"dot-location": [2, "property"],
28+
"dot-notation": 0,
29+
"eol-last": 2,
30+
"eqeqeq": [2, "allow-null"],
31+
"func-names": 0,
32+
"func-style": 0,
33+
"generator-star-spacing": [2, { "before": true, "after": true }],
34+
"guard-for-in": 0,
35+
"handle-callback-err": [2, "^(err|error)$" ],
36+
"indent": [2, 2, { "SwitchCase": 1 }],
37+
"key-spacing": [2, { "beforeColon": false, "afterColon": true }],
38+
"linebreak-style": 0,
39+
"lines-around-comment": 0,
40+
"max-nested-callbacks": 0,
41+
"new-cap": [2, { "newIsCap": true, "capIsNew": false }],
42+
"new-parens": 2,
43+
"newline-after-var": 0,
44+
"no-alert": 0,
45+
"no-array-constructor": 2,
46+
"no-caller": 2,
47+
"no-catch-shadow": 0,
48+
"no-cond-assign": 2,
49+
"no-console": 0,
50+
"no-constant-condition": 0,
51+
"no-continue": 0,
52+
"no-control-regex": 2,
53+
"no-debugger": 2,
54+
"no-delete-var": 2,
55+
"no-div-regex": 0,
56+
"no-dupe-args": 2,
57+
"no-dupe-keys": 2,
58+
"no-duplicate-case": 2,
59+
"no-else-return": 0,
60+
"no-empty": 0,
61+
"no-empty-character-class": 2,
62+
"no-empty-label": 2,
63+
"no-eq-null": 0,
64+
"no-eval": 2,
65+
"no-ex-assign": 2,
66+
"no-extend-native": 2,
67+
"no-extra-bind": 2,
68+
"no-extra-boolean-cast": 2,
69+
"no-extra-parens": 0,
70+
"no-extra-semi": 0,
71+
"no-fallthrough": 2,
72+
"no-floating-decimal": 2,
73+
"no-func-assign": 2,
74+
"no-implied-eval": 2,
75+
"no-inline-comments": 0,
76+
"no-inner-declarations": [2, "functions"],
77+
"no-invalid-regexp": 2,
78+
"no-irregular-whitespace": 2,
79+
"no-iterator": 2,
80+
"no-label-var": 2,
81+
"no-labels": 2,
82+
"no-lone-blocks": 2,
83+
"no-lonely-if": 0,
84+
"no-loop-func": 0,
85+
"no-mixed-requires": 0,
86+
"no-mixed-spaces-and-tabs": 2,
87+
"no-multi-spaces": 2,
88+
"no-multi-str": 2,
89+
"no-multiple-empty-lines": [2, { "max": 1 }],
90+
"no-native-reassign": 2,
91+
"no-negated-in-lhs": 2,
92+
"no-nested-ternary": 0,
93+
"no-new": 2,
94+
"no-new-func": 0,
95+
"no-new-object": 2,
96+
"no-new-require": 2,
97+
"no-new-wrappers": 2,
98+
"no-obj-calls": 2,
99+
"no-octal": 2,
100+
"no-octal-escape": 2,
101+
"no-param-reassign": 0,
102+
"no-path-concat": 0,
103+
"no-process-env": 0,
104+
"no-process-exit": 0,
105+
"no-proto": 0,
1 F438 06+
"no-redeclare": 2,
107+
"no-regex-spaces": 2,
108+
"no-restricted-modules": 0,
109+
"no-return-assign": 2,
110+
"no-script-url": 0,
111+
"no-self-compare": 2,
112+
"no-sequences": 2,
113+
"no-shadow": 0,
114+
"no-shadow-restricted-names": 2,
115+
"no-spaced-func": 2,
116+
"no-sparse-arrays": 2,
117+
"no-sync": 0,
118+
"no-ternary": 0,
119+
"no-this-before-super": 2,
120+
"no-throw-literal": 2,
121+
"no-trailing-spaces": 2,
122+
"no-undef": 2,
123+
"no-undef-init": 2,
124+
"no-undefined": 0,
125+
"no-underscore-dangle": 0,
126+
"no-unexpected-multiline": 2,
127+
"no-unneeded-ternary": 2,
128+
"no-unreachable": 2,
129+
"no-unused-expressions": 0,
130+
"no-unused-vars": [2, { "vars": "all", "args": "none" }],
131+
"no-use-before-define": 0,
132+
"no-var": 0,
133+
"no-void": 0,
134+
"no-warning-comments": 0,
135+
"no-with": 2,
136+
"object-curly-spacing": 0,
137+
"object-shorthand": 0,
138+
"one-var": [2, { "initialized": "never" }],
139+
"operator-assignment": 0,
140+
"operator-linebreak": [2, "after"],
141+
"padded-blocks": 0,
142+
"prefer-const": 0,
143+
"quote-props": 0,
144+
"quotes": [2, "single", "avoid-escape"],
145+
"radix": 2,
146+
"semi": [2, "never"],
147+
"semi-spacing": 0,
148+
"sort-vars": 0,
149+
"space-after-keywords": [2, "always"],
150+
"space-before-blocks": [2, "always"],
151+
"space-before-function-paren": [2, "always"],
152+
"space-in-parens": [2, "never"],
153+
"space-infix-ops": 2,
154+
"space-return-throw-case": 2,
155+
"space-unary-ops": [2, { "words": true, "nonwords": false }],
156+
"spaced-comment": [2, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!"] }],
157+
"strict": 0,
158+
"use-isnan": 2,
159+
"valid-jsdoc": 0,
160+
"valid-typeof": 2,
161+
"vars-on-top": 0,
162+
"wrap-iife": [2, "any"],
163+
"wrap-regex": 0,
164+
"yoda": [2, "never"]
165+
}
166+
}

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
dist/vue.js.map
12
dist/vue.min.js.gz
23
test/unit/specs.js
4+
test/unit/specs.js.map
35
explorations
46
node_modules
57
.DS_Store

‎.jshintrc

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

‎.npmignore

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
.*
22
*.md
3+
*.yml
4+
build
35
coverage
4-
grunt
6+
dist/vue.js.map
57
dist/vue.min.js.gz
8+
examples
69
explorations
10+
perf
711
test
8-
examples
912
bower.json
1013
component.json
1114
gruntfile.js
12-
sauce_connect.log
15+
sauce_connect.log

‎.travis.yml

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

‎CONTRIBUTING.md

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22

33
Hi! I’m really excited that you are interested in contributing to Vue.js. Before submitting your contribution though, please make sure to take a moment and read through the following guidelines.
44

5-
## Issue Reporting Checklist
5+
## Issue Reporting Guidelines
66

7-
- Make sure that you are using the latest version of Vue.
7+
- The issue list of this repo is **exclusively** for bug reports and feature requests. For simple questions, please use either [Gitter](https://gitter.im/yyx990803/vue) or [vuejs/Discussion](https://github.com/vuejs/Discussion/issues).
88
- Try to search for your issue, it may have already been answered or even fixed in the development branch.
9-
- It is recommended that you make a JSFiddle to reproduce your issue. You could start with [this template](http://jsfiddle.net/5sH6A/) that already includes the latest version of Vue.
9+
- Check if the issue is reproducible with the latest stable version of Vue. If you are using a pre-release, please indicate the specific version you are using.
10+
- It is **required** that you clearly describe the steps necessary to reproduce the issue you are running into. Issues with no clear repro steps will not be triaged. If an issue labeled "need repro" receives no further input from the issue author for more than 5 days, it will be closed.
11+
- It is recommended that you make a JSFiddle to demonstrate your issue. You could start with [this template](http://jsfiddle.net/5sH6A/) that already includes the latest version of Vue.
1012
- If your issue is resolved but still open, don’t hesitate to close it. In case you found a solution by yourself, it could be helpful to explain how you fixed it.
1113

12-
## Pull Request Checklist
14+
## Pull Request Guidelines
1315

1416
- Checkout a topic branch from `dev` and merge back against `dev`.
1517
- Work in the `src` folder and **DO NOT** checkin `dist` in the commits.
@@ -32,7 +34,7 @@ Hi! I’m really excited that you are interested in contributing to Vue.js. Befo
3234
- align equal signs where appropriate.
3335
- Return early.
3436
- 1 space after `function`
35-
- 1 space between arguments, but not between parens.
37+
- 1 space between arguments, but not between parentheses.
3638
- When in doubt, read the source code.
3739
- Break long ternary conditionals like this:
3840

@@ -44,24 +46,23 @@ Hi! I’m really excited that you are interested in contributing to Vue.js. Befo
4446

4547
## Development Setup
4648

47-
You will need [Node](http://nodejs.org), [Grunt](http://gruntjs.com), [PhantomJS](http://phantomjs.org) and [CasperJS](http://casperjs.org).
49+
You will need [Node.js](http://nodejs.org) & [Grunt](http://gruntjs.com).
4850

4951
``` bash
50-
# in case you don’t already these:
51-
# npm install -g grunt-cli phantomjs casperjs
52+
# npm install -g grunt-cli
5253
$ npm install
5354
```
5455

5556
To watch and auto-build `dist/vue.js` during development:
5657

5758
``` bash
58-
$ grunt watch
59+
$ npm run dev
5960
```
6061

6162
To lint:
6263

6364
``` bash
64-
grunt jshint
65+
$ grunt eslint
6566
```
6667

6768
To build:
@@ -73,13 +74,11 @@ $ grunt build
7374
To test:
7475

7576
``` bash
76-
# if you don’t have these yet:
77-
# npm install -g phantomjs casperjs
7877
$ grunt test
7978
```
8079

81-
The unit tests are written with Jasmine and run with Karma. The functional tests are written for and run with CasperJS.
80+
The default task (by simply running `grunt`) will do the following: lint -> build -> unit tests -> e2e tests. It is required to have this pass successfully for a PR to be considered.
8281

83-
**If you are not using a Mac**
82+
The unit tests are written with Jasmine and run with Karma. The e2e tests are written for and run with CasperJS.
8483

85-
You can modify the Gruntfile to only run Karma tests in browsers that are available on your system. Just make sure don’t check in the Gruntfile for the commit.
84+
Note that the unit tests will automatically be run in Chrome, Firefox and Safari. If you are not on a Mac, or don't have one of the browsers installed on your system, you can modify the [karma config in gruntfile.js](https://github.com/yyx990803/vue/blob/dev/gruntfile.js#L38) to only run Karma tests in browsers that are available on your system. Just make sure don’t check in the gruntfile changes for the commit.

0 commit comments

Comments
 (0)
0