Skip to content

Commit 89534ce

Browse files
committed
Merge branch 'release/4.0.0'
2 parents b3e2cef + e44f3e7 commit 89534ce

36 files changed

Lines changed: 1507 additions & 510 deletions

.eslintrc

Lines changed: 177 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,177 @@
1+
/**
2+
* 0 - turn the rule off
3+
* 1 - turn the rule on as a warning (doesn't affect exit code)
4+
* 2 - turn the rule on as an error (exit code will be 1)
5+
*
6+
* Meteor Style Guide: https://github.com/meteor/meteor/wiki/Meteor-Style-Guide
7+
*
8+
*/
9+
10+
{
11+
"parser": "babel-eslint",
12+
"env": {
13+
"browser": true,
14+
"node": true
15+
},
16+
"ecmaFeatures": {
17+
"arrowFunctions": true,
18+
"blockBindings": true,
19+
"classes": true,
20+
"defaultParams": true,
21+
"destructuring": true,
22+
"forOf": true,
23+
"generators": false,
24+
"modules": true,
25+
"objectLiteralComputedProperties": true,
26+
"objectLiteralDuplicateProperties": false,
27+
"objectLiteralShorthandMethods": true,
28+
"objectLiteralShorthandProperties": true,
29+
"spread": true,
30+
"superInFunctions": true,
31+
"templateStrings": true,
32+
"jsx": true
33+
},
34+
"rules": {
35+
/**
36+
* Strict mode
37+
*/
38+
// babel inserts "use strict"; for us
39+
// http://eslint.org/docs/rules/strict
40+
"strict": 0,
41+
42+
/**
43+
* ES6
44+
*/
45+
"no-var": 1, // http://eslint.org/docs/rules/no-var
46+
47+
/**
48+
* Variables
49+
*/
50+
"no-shadow": 2, // http://eslint.org/docs/rules/no-shadow
51+
"no-shadow-restricted-names": 2, // http://eslint.org/docs/rules/no-shadow-restricted-names
52+
"no-unused-vars": [2, { // http://eslint.org/docs/rules/no-unused-vars
53+
"vars": "local",
54+
"args": "after-used"
55+
}],
56+
"no-use-before-define": [2, "nofunc"], // http://eslint.org/docs/rules/no-use-before-define
57+
58+
/**
59+
* Possible errors
60+
*/
61+
"comma-dangle": [1, "never"], // http://eslint.org/docs/rules/comma-dangle
62+
"no-cond-assign": [2, "always"], // http://eslint.org/docs/rules/no-cond-assign
63+
"no-console": 1, // http://eslint.org/docs/rules/no-console
64+
"no-debugger": 1, // http://eslint.org/docs/rules/no-debugger
65+
"no-alert": 1, // http://eslint.org/docs/rules/no-alert
66+
"no-constant-condition": 1, // http://eslint.org/docs/rules/no-constant-condition
67+
"no-dupe-keys": 2, // http://eslint.org/docs/rules/no-dupe-keys
68+
"no-duplicate-case": 2, // http://eslint.org/docs/rules/no-duplicate-case
69+
"no-empty": 2, // http://eslint.org/docs/rules/no-empty
70+
"no-ex-assign": 2, // http://eslint.org/docs/rules/no-ex-assign
71+
"no-extra-boolean-cast": 0, // http://eslint.org/docs/rules/no-extra-boolean-cast
72+
"no-extra-semi": 2, // http://eslint.org/docs/rules/no-extra-semi
73+
"no-func-assign": 2, // http://eslint.org/docs/rules/no-func-assign
74+
"no-inner-declarations": 2, // http://eslint.org/docs/rules/no-inner-declarations
75+
"no-invalid-regexp": 2, // http://eslint.org/docs/rules/no-invalid-regexp
76+
"no-irregular-whitespace": 2, // http://eslint.org/docs/rules/no-irregular-whitespace
77+
"no-obj-calls": 2, // http://eslint.org/docs/rules/no-obj-calls
78+
"quote-props": [2, "as-needed", { "keywords": true, "unnecessary": false }], // http://eslint.org/docs/rules/quote-props (previously known as no-reserved-keys)
79+
"no-sparse-arrays": 2, // http://eslint.org/docs/rules/no-sparse-arrays
80+
"no-unreachable": 2, // http://eslint.org/docs/rules/no-unreachable
81+
"use-isnan": 2, // http://eslint.org/docs/rules/use-isnan
82+
"block-scoped-var": 0, // http://eslint.org/docs/rules/block-scoped-var
83+
84+
/**
85+
* Best practices
86+
*/
87+
"consistent-return": 2, // http://eslint.org/docs/rules/consistent-return
88+
"curly": [2, "multi-line"], // http://eslint.org/docs/rules/curly
89+
"default-case": 2, // http://eslint.org/docs/rules/default-case
90+
"dot-notation": [2, { // http://eslint.org/docs/rules/dot-notation
91+
"allowKeywords": true
92+
}],
93+
"eqeqeq": 2, // http://eslint.org/docs/rules/eqeqeq
94+
"guard-for-in": 2, // http://eslint.org/docs/rules/guard-for-in
95+
"no-caller": 2, // http://eslint.org/docs/rules/no-caller
96+
//"no-else-return": 2, // http://eslint.org/docs/rules/no-else-return
97+
"no-eq-null": 2, // http://eslint.org/docs/rules/no-eq-null
98+
"no-eval": 2, // http://eslint.org/docs/rules/no-eval
99+
"no-extend-native": 2, // http://eslint.org/docs/rules/no-extend-native
100+
"no-extra-bind": 2, // http://eslint.org/docs/rules/no-extra-bind
101+
"no-fallthrough": 2, // http://eslint.org/docs/rules/no-fallthrough
102+
"no-floating-decimal": 2, // http://eslint.org/docs/rules/no-floating-decimal
103+
"no-implied-eval": 2, // http://eslint.org/docs/rules/no-implied-eval
104+
"no-lone-blocks": 2, // http://eslint.org/docs/rules/no-lone-blocks
105+
"no-loop-func": 2, // http://eslint.org/docs/rules/no-loop-func
106+
"no-multi-str": 2, // http://eslint.org/docs/rules/no-multi-str
107+
"no-native-reassign": 2, // http://eslint.org/docs/rules/no-native-reassign
108+
"no-new": 2, // http://eslint.org/docs/rules/no-new
109+
"no-new-func": 2, // http://eslint.org/docs/rules/no-new-func
110+
"no-new-wrappers": 2, // http://eslint.org/docs/rules/no-new-wrappers
111+
"no-octal": 2, // http://eslint.org/docs/rules/no-octal
112+
"no-octal-escape": 2, // http://eslint.org/docs/rules/no-octal-escape
113+
"no-param-reassign": 2, // http://eslint.org/docs/rules/no-param-reassign
114+
"no-proto": 2, // http://eslint.org/docs/rules/no-proto
115+
"no-redeclare": 2, // http://eslint.org/docs/rules/no-redeclare
116+
"no-return-assign": 2, // http://eslint.org/docs/rules/no-return-assign
117+
"no-script-url": 2, // http://eslint.org/docs/rules/no-script-url
118+
"no-self-compare": 2, // http://eslint.org/docs/rules/no-self-compare
119+
"no-sequences": 2, // http://eslint.org/docs/rules/no-sequences
120+
"no-throw-literal": 2, // http://eslint.org/docs/rules/no-throw-literal
121+
"no-with": 2, // http://eslint.org/docs/rules/no-with
122+
"radix": 2, // http://eslint.org/docs/rules/radix
123+
"vars-on-top": 1, // http://eslint.org/docs/rules/vars-on-top
124+
"wrap-iife": [2, "any"], // http://eslint.org/docs/rules/wrap-iife
125+
"yoda": 2, // http://eslint.org/docs/rules/yoda
126+
"max-len": [1, 200, 2], // http://eslint.org/docs/rules/max-len
127+
128+
/**
129+
* Style
130+
*/
131+
"indent": [2, 2, {"VariableDeclarator": 2}], // http://eslint.org/docs/rules/indent
132+
"brace-style": [2, // http://eslint.org/docs/rules/brace-style
133+
"1tbs", {
134+
"allowSingleLine": true
135+
}],
136+
"camelcase": [2, { // http://eslint.org/docs/rules/camelcase
137+
"properties": "never"
138+
}],
139+
"comma-spacing": [2, { // http://eslint.org/docs/rules/comma-spacing
140+
"before": false,
141+
"after": true
142+
}],
143+
"comma-style": [2, "last"], // http://eslint.org/docs/rules/comma-style
144+
"eol-last": 2, // http://eslint.org/docs/rules/eol-last
145+
"func-names": 0, // http://eslint.org/docs/rules/func-names
146+
"func-style": [2, "expression"], // http://eslint.org/docs/rules/func-style
147+
"key-spacing": [2, { // http://eslint.org/docs/rules/key-spacing
148+
"beforeColon": false,
149+
"afterColon": true
150+
}],
151+
"new-cap": [2, { // http://eslint.org/docs/rules/new-cap
152+
"newIsCap": true,
153+
"capIsNew": false
154+
}],
155+
"no-multiple-empty-lines": [2, { // http://eslint.org/docs/rules/no-multiple-empty-lines
156+
"max": 2
157+
}],
158+
"no-nested-ternary": 2, // http://eslint.org/docs/rules/no-nested-ternary
159+
"no-new-object": 2, // http://eslint.org/docs/rules/no-new-object
160+
"no-array-constructor": 2, // http://eslint.org/docs/rules/no-array-constructor
161+
"no-spaced-func": 2, // http://eslint.org/docs/rules/no-spaced-func
162+
"no-trailing-spaces": 2, // http://eslint.org/docs/rules/no-trailing-spaces
163+
"no-underscore-dangle": 0, // http://eslint.org/docs/rules/no-underscore-dangle
164+
"one-var": [1, "never"], // http://eslint.org/docs/rules/one-var
165+
"semi": [2, "always"], // http://eslint.org/docs/rules/semi
166+
"semi-spacing": [2, { // http://eslint.org/docs/rules/semi-spacing
167+
"before": false,
168+
"after": true
169+
}],
170+
"space-after-keywords": 2, // http://eslint.org/docs/rules/space-after-keywords
171+
"space-before-blocks": 2, // http://eslint.org/docs/rules/space-before-blocks
172+
"space-before-function-paren": [2, "never"], // http://eslint.org/docs/rules/space-before-function-paren
173+
"space-infix-ops": 2, // http://eslint.org/docs/rules/space-infix-ops
174+
"space-return-throw-case": 2, // http://eslint.org/docs/rules/space-return-throw-case
175+
"spaced-comment": 2, // http://eslint.org/docs/rules/spaced-comment (previously known as spaced-line-comment)
176+
}
177+
}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
.build*
22
.DS_Store
3+
.idea

.npm/package/npm-shrinkwrap.json

Lines changed: 26 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.versions

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
accounts-base@1.2.1
1+
accounts-base@1.2.2
22
babel-compiler@5.8.24_1
33
babel-runtime@0.1.4
44
base64@1.0.4
@@ -9,32 +9,32 @@ boilerplate-generator@1.0.4
99
caching-compiler@1.0.0
1010
caching-html-compiler@1.0.2
1111
callback-hook@1.0.4
12-
check@1.0.6
13-
coffeescript@1.0.10
12+
check@1.1.0
13+
coffeescript@1.0.11
1414
ddp@1.2.2
1515
ddp-client@1.2.1
16-
ddp-common@1.2.1
16+
ddp-common@1.2.2
1717
ddp-rate-limiter@1.0.0
18-
ddp-server@1.2.1
18+
ddp-server@1.2.2
1919
deps@1.0.9
2020
diff-sequence@1.0.1
21-
ecmascript@0.1.5
22-
ecmascript-collections@0.1.6
21+
ecmascript@0.1.6
22+
ecmascript-runtime@0.2.6
2323
ejson@1.0.7
24-
email@1.0.7
24+
email@1.0.8
2525
geojson-utils@1.0.4
2626
grigio:babel@0.1.3
2727
html-tools@1.0.5
2828
htmljs@1.0.5
2929
id-map@1.0.4
3030
jquery@1.11.4
31-
local-test:space:base@3.1.0
31+
local-test:space:base@4.0.0
3232
localstorage@1.0.5
3333
logging@1.0.8
34-
meteor@1.1.9
34+
meteor@1.1.10
3535
minifiers@1.1.7
3636
minimongo@1.0.10
37-
mongo@1.1.2
37+
mongo@1.1.3
3838
mongo-id@1.0.1
3939
npm-mongo@1.4.39_1
4040
observe-sequence@1.0.7
@@ -43,25 +43,25 @@ practicalmeteor:chai@2.1.0_1
4343
practicalmeteor:loglevel@1.2.0_2
4444
practicalmeteor:munit@2.1.5
4545
practicalmeteor:sinon@1.14.1_2
46-
promise@0.5.0
47-
random@1.0.4
46+
promise@0.5.1
47+
random@1.0.5
4848
rate-limit@1.0.0
49-
reactive-dict@1.1.2
49+
reactive-dict@1.1.3
5050
reactive-var@1.0.6
5151
retry@1.0.4
5252
routepolicy@1.0.6
5353
service-configuration@1.0.5
5454
session@1.1.1
55-
space:base@3.1.0
56-
space:testing@1.5.0
55+
space:base@4.0.0
56+
space:testing@3.0.1
5757
spacebars@1.0.7
5858
spacebars-compiler@1.0.7
59-
templating@1.1.4
59+
templating@1.1.5
6060
templating-tools@1.0.0
6161
test-helpers@1.0.5
6262
tinytest@1.0.6
6363
tracker@1.0.9
6464
ui@1.0.8
6565
underscore@1.0.4
66-
webapp@1.2.2
66+
webapp@1.2.3
6767
webapp-hashing@1.0.5

0 commit comments

Comments
 (0)