Skip to content

Commit 6bdd95c

Browse files
committed
Auto merge of #1701 - kzys:lint-all, r=carols10cents
Make "npm run lint:js" happy This pull request fixes all warnings from lint:js and enforces that by running the task on Travis CI.
2 parents 7119b08 + 98ad8a3 commit 6bdd95c

File tree

6 files changed

+18
-30
lines changed

6 files changed

+18
-30
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ matrix:
5858
- cargo fmt -- --check
5959
- cargo clippy --all-targets --all-features --all
6060
- cargo test
61+
- npm run lint:js
6162
- npm test
6263
- rust: beta
6364
script:

config/environment.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ module.exports = function(environment) {
1414
},
1515
EXTEND_PROTOTYPES: {
1616
// Prevent Ember Data from overriding Date.parse.
17-
Date: false
18-
}
17+
Date: false,
18+
},
1919
},
2020

2121
APP: {
@@ -33,7 +33,7 @@ module.exports = function(environment) {
3333
ENV['ember-a11y-testing'] = {
3434
componentOptions: {
3535
turnAuditOff: true,
36-
}
36+
},
3737
};
3838
}
3939

config/manifest.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ module.exports = function(/* environment, appConfig */) {
1313
{
1414
src: 'cargo.png',
1515
sizes: '227x227',
16-
type: 'image/png'
17-
}
16+
type: 'image/png',
17+
},
1818
],
1919
ms: {
20-
tileColor: '#3b6837'
21-
}
20+
tileColor: '#3b6837',
21+
},
2222
};
2323
};

config/targets.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ module.exports = {
77
'last 1 Safari version',
88
'last 1 iOS version',
99
'last 1 Edge version',
10-
'last 1 UCAndroid version'
11-
]
10+
'last 1 UCAndroid version',
11+
],
1212
};

ember-cli-build.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module.exports = function(defaults) {
1717
'rust',
1818
'scss',
1919
'sql',
20-
'yaml'
20+
'yaml',
2121
];
2222

2323
let app = new EmberApp(defaults, {
@@ -29,9 +29,7 @@ module.exports = function(defaults) {
2929
components: highlightedLanguages,
3030
},
3131
sassOptions: {
32-
includePaths: [
33-
'node_modules/normalize.css',
34-
],
32+
includePaths: ['node_modules/normalize.css'],
3533
},
3634
});
3735

@@ -48,9 +46,7 @@ module.exports = function(defaults) {
4846
// please specify an object with the list of modules as keys
4947
// along with the exports of each module as its value.
5048
app.import('node_modules/timekeeper/lib/timekeeper.js', {
51-
using: [
52-
{ transformation: 'cjs', as: 'timekeeper' },
53-
],
49+
using: [{ transformation: 'cjs', as: 'timekeeper' }],
5450
});
5551

5652
return app.toTree();

testem.js

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,12 @@ module.exports = {
44
test_page: 'tests/index.html?hidepassed',
55
disable_watching: true,
66
parallel: -1,
7-
launch_in_ci: [
8-
'Chrome'
9-
],
10-
launch_in_dev: [
11-
'Chrome'
12-
],
7+
launch_in_ci: ['Chrome'],
8+
launch_in_dev: ['Chrome'],
139
browser_args: {
1410
Chrome: {
1511
mode: 'ci',
16-
args: [
17-
'--disable-gpu',
18-
'--headless',
19-
'--remote-debugging-port=9222',
20-
'--window-size=1440,900'
21-
]
22-
}
23-
}
12+
args: ['--disable-gpu', '--headless', '--remote-debugging-port=9222', '--window-size=1440,900'],
13+
},
14+
},
2415
};

0 commit comments

Comments
 (0)