Skip to content

Make "npm run lint:js" happy #1701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ matrix:
- cargo fmt -- --check
- cargo clippy --all-targets --all-features --all
- cargo test
- npm run lint:js
- npm test
- rust: beta
script:
Expand Down
6 changes: 3 additions & 3 deletions config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ module.exports = function(environment) {
},
EXTEND_PROTOTYPES: {
// Prevent Ember Data from overriding Date.parse.
Date: false
}
Date: false,
},
},

APP: {
Expand All @@ -33,7 +33,7 @@ module.exports = function(environment) {
ENV['ember-a11y-testing'] = {
componentOptions: {
turnAuditOff: true,
}
},
};
}

Expand Down
8 changes: 4 additions & 4 deletions config/manifest.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ module.exports = function(/* environment, appConfig */) {
{
src: 'cargo.png',
sizes: '227x227',
type: 'image/png'
}
type: 'image/png',
},
],
ms: {
tileColor: '#3b6837'
}
tileColor: '#3b6837',
},
};
};
4 changes: 2 additions & 2 deletions config/targets.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ module.exports = {
'last 1 Safari version',
'last 1 iOS version',
'last 1 Edge version',
'last 1 UCAndroid version'
]
'last 1 UCAndroid version',
],
};
10 changes: 3 additions & 7 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module.exports = function(defaults) {
'rust',
'scss',
'sql',
'yaml'
'yaml',
];

let app = new EmberApp(defaults, {
Expand All @@ -29,9 +29,7 @@ module.exports = function(defaults) {
components: highlightedLanguages,
},
sassOptions: {
includePaths: [
'node_modules/normalize.css',
],
includePaths: ['node_modules/normalize.css'],
},
});

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

return app.toTree();
Expand Down
19 changes: 5 additions & 14 deletions testem.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,12 @@ module.exports = {
test_page: 'tests/index.html?hidepassed',
disable_watching: true,
parallel: -1,
launch_in_ci: [
'Chrome'
],
launch_in_dev: [
'Chrome'
],
launch_in_ci: ['Chrome'],
launch_in_dev: ['Chrome'],
browser_args: {
Chrome: {
mode: 'ci',
args: [
'--disable-gpu',
'--headless',
'--remote-debugging-port=9222',
'--window-size=1440,900'
]
}
}
args: ['--disable-gpu', '--headless', '--remote-debugging-port=9222', '--window-size=1440,900'],
},
},
};