Skip to content

Commit df55e93

Browse files
authored
Merge pull request #20 from RoundingWellOS/update-build
Update build tooling and dependencies
2 parents a99494a + 2b690e1 commit df55e93

19 files changed

+4328
-261
lines changed

.babelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"presets": [ "es2015" ]
3+
}

.eslintrc

Lines changed: 91 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,98 @@
11
{
22
"parser": "babel-eslint",
3-
"rules": {
4-
"strict": 0,
5-
"quotes": [2, "single"],
6-
"no-underscore-dangle": false
7-
},
3+
"extends": "eslint:recommended",
84
"env": {
95
"browser": true,
106
"node": true
7+
},
8+
"globals": {
9+
"define" : true,
10+
"$" : true,
11+
"jQuery" : true,
12+
"_" : true,
13+
"Backbone" : true,
14+
"Marionette" : true
15+
},
16+
"plugins": [],
17+
"rules": {
18+
"array-bracket-spacing": [2, "never"],
19+
"arrow-body-style": 2,
20+
"block-scoped-var": 2,
21+
"block-spacing": [2, "always"],
22+
"brace-style": 2,
23+
"camelcase": 2,
24+
"comma-spacing": [2, {"before": false, "after": true}],
25+
"comma-style": 2,
26+
"complexity": [2, 5],
27+
"computed-property-spacing": [2, "never"],
28+
"curly": [ 2, "multi-line" ],
29+
"dot-location": [2, "property"],
30+
"dot-notation": 2,
31+
"eqeqeq": [ 2, "allow-null" ],
32+
"guard-for-in": 2,
33+
"indent": [2, 2, {"SwitchCase": 1}], // 2 spaces
34+
"key-spacing": [2, {"beforeColon": false, "afterColon": true}],
35+
"keyword-spacing": [2, {"overrides": {
36+
"if": {"after": false},
37+
"for": {"after": false},
38+
"while": {"after": false},
39+
"switch": {"after": false}
40+
}}],
41+
"no-alert": 2,
42+
"no-bitwise": 2,
43+
"no-caller": 2,
44+
"no-case-declarations": 2,
45+
"no-cond-assign": [ 2, "except-parens" ],
46+
"no-const-assign": 2,
47+
"no-debugger": 2,
48+
"no-div-regex": 2,
49+
"no-duplicate-imports": 2,
50+
"no-else-return": 2,
51+
"no-empty": 2,
52+
"no-eval": 2,
53+
"no-extend-native": 2,
54+
"no-irregular-whitespace": 2,
55+
"no-iterator": 2,
56+
"no-lone-blocks": 2,
57+
"no-loop-func": 2,
58+
"no-multiple-empty-lines": 2,
59+
"no-multi-spaces": 2,
60+
"no-multi-str": 2,
61+
"no-new-wrappers": 2,
62+
"no-proto": 2,
63+
"no-return-assign": 2,
64+
"no-script-url": 2,
65+
"no-self-compare": 2,
66+
"no-sequences": 2,
67+
"no-spaced-func": 2,
68+
"no-shadow": 2,
69+
"no-undef": 2,
70+
"no-undef-init": 2,
71+
"no-unexpected-multiline": 2,
72+
"no-unneeded-ternary": 2,
73+
"no-unused-vars": [1, {"args": "none"}],
74+
"no-useless-concat": 2,
75+
"no-var": 2,
76+
"no-with": 2,
77+
"object-curly-spacing": [2, "always"],
78+
"one-var": [2, "never"],
79+
"operator-linebreak": [2, "before", { "overrides": { "?": "after", ":": "after" } }],
80+
"padded-blocks": [2, "never"],
81+
"prefer-const": 2,
82+
"prefer-template": 2,
83+
"quotes": [ 2, "single" ],
84+
"quote-props": [2, "consistent"],
85+
"radix": [2, "always"],
86+
"semi": [ 2, "always" ],
87+
"semi-spacing": [2, {"before": false, "after": true }],
88+
"space-before-blocks": 2,
89+
"space-before-function-paren": [2, "never"],
90+
"space-in-parens": [2, "never"],
91+
"spaced-comment": [2, "always"],
92+
"space-infix-ops": 2,
93+
"strict": 0,
94+
"template-curly-spacing": [2, "always"],
95+
"valid-typeof": 2,
96+
"wrap-iife": [ 2, "inside" ]
1197
}
1298
}

.jscsrc

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

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
language: node_js
22
node_js:
3-
- "stable"
3+
- "6"
44
sudo: false
5+
cache:
6+
directories:
7+
- node_modules
58
script: "gulp coverage"
69
after_success:
710
- npm install -g codeclimate-test-reporter

bower.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "backbone.eventrouter",
3-
"version": "0.1.1",
3+
"version": "0.3.0",
44
"description": "A highly opinionated, simplistic Backbone.Router coupled with a Backbone.Radio.Channel",
55
"main": "./dist/backbone.eventrouter.js",
66
"repository": {
@@ -30,9 +30,9 @@
3030
"tests"
3131
],
3232
"dependencies": {
33-
"backbone": "^1.1.1",
34-
"backbone.radio": "^1.0.0",
35-
"underscore": "^1.5.0"
33+
"backbone": "^1.3.3",
34+
"backbone.radio": "^2.0.0",
35+
"underscore": "^1.8.3"
3636
},
3737
"authors": [
3838
"paulfalgout <paul@otterball.com>"

0 commit comments

Comments
 (0)