Skip to content

Commit cbb754d

Browse files
authored
Merge pull request ember-cli-code-coverage#274 from Turbo87/prettier
Use Prettier for code formatting
2 parents 7411f5d + 87824c4 commit cbb754d

31 files changed

+500
-438
lines changed

.eslintrc.js

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,23 @@ module.exports = {
77
ecmaVersion: 2018,
88
sourceType: 'module',
99
ecmaFeatures: {
10-
legacyDecorators: true
11-
}
10+
legacyDecorators: true,
11+
},
1212
},
13-
plugins: [
14-
'ember'
15-
],
16-
extends: [
17-
'eslint:recommended',
18-
'plugin:ember/recommended'
19-
],
13+
plugins: ['ember', 'prettier'],
14+
extends: ['eslint:recommended', 'plugin:ember/recommended', 'plugin:prettier/recommended'],
2015
env: {
21-
browser: true
16+
browser: true,
2217
},
2318
rules: {
24-
'ember/no-jquery': 'error'
19+
'ember/no-jquery': 'error',
2520
},
2621
overrides: [
2722
// node files
2823
{
2924
files: [
3025
'.eslintrc.js',
26+
'.prettierrc.js',
3127
'.template-lintrc.js',
3228
'ember-cli-build.js',
3329
'index.js',
@@ -36,28 +32,39 @@ module.exports = {
3632
'config/**/*.js',
3733
'lib/**',
3834
'test/**',
39-
'tests/dummy/config/**/*.js'
35+
'tests/dummy/config/**/*.js',
4036
],
4137
excludedFiles: [
4238
'addon/**',
4339
'addon-test-support/**',
4440
'app/**',
4541
'test/fixtures/**',
46-
'tests/dummy/app/**'
42+
'tests/dummy/app/**',
4743
],
4844
parserOptions: {
49-
sourceType: 'script'
45+
sourceType: 'script',
5046
},
5147
env: {
5248
browser: false,
53-
node: true
49+
node: true,
5450
},
5551
plugins: ['node'],
5652
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
5753
'no-console': 'off',
5854
'no-useless-escape': 'off',
59-
'node/no-unpublished-require': 'off'
60-
})
61-
}
62-
]
55+
'node/no-unpublished-require': 'off',
56+
}),
57+
},
58+
59+
// node test files
60+
{
61+
files: ['test/**'],
62+
env: {
63+
mocha: true,
64+
},
65+
rules: {
66+
'no-unused-expressions': 0,
67+
},
68+
},
69+
],
6370
};

.prettierrc.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
'use strict';
2+
3+
module.exports = {
4+
printWidth: 100,
5+
semi: true,
6+
arrowParens: 'avoid',
7+
singleQuote: true,
8+
trailingComma: 'es5',
9+
};

.template-lintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
extends: 'octane'
4+
extends: 'octane',
55
};

config/ember-try.js

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -2,87 +2,87 @@
22

33
const getChannelURL = require('ember-source-channel-url');
44

5-
module.exports = async function() {
5+
module.exports = async function () {
66
return {
77
scenarios: [
88
{
99
name: 'ember-lts-3.12',
1010
npm: {
1111
devDependencies: {
12-
'ember-source': '~3.12.0'
13-
}
14-
}
12+
'ember-source': '~3.12.0',
13+
},
14+
},
1515
},
1616
{
1717
name: 'ember-lts-3.16',
1818
npm: {
1919
devDependencies: {
20-
'ember-source': '~3.16.0'
21-
}
20+
'ember-source': '~3.16.0',
21+
},
2222
},
2323
},
24-
{
25-
name: 'ember-release',
26-
npm: {
27-
devDependencies: {
28-
'ember-source': await getChannelURL('release')
29-
}
30-
}
24+
{
25+
name: 'ember-release',
26+
npm: {
27+
devDependencies: {
28+
'ember-source': await getChannelURL('release'),
29+
},
3130
},
32-
{
33-
name: 'ember-beta',
34-
npm: {
35-
devDependencies: {
36-
'ember-source': await getChannelURL('beta')
37-
}
38-
}
31+
},
32+
{
33+
name: 'ember-beta',
34+
npm: {
35+
devDependencies: {
36+
'ember-source': await getChannelURL('beta'),
37+
},
3938
},
40-
{
41-
name: 'ember-canary',
42-
npm: {
43-
devDependencies: {
44-
'ember-source': await getChannelURL('canary')
45-
}
46-
}
39+
},
40+
{
41+
name: 'ember-canary',
42+
npm: {
43+
devDependencies: {
44+
'ember-source': await getChannelURL('canary'),
45+
},
4746
},
48-
// The default `.travis.yml` runs this scenario via `npm test`,
49-
// not via `ember try`. It's still included here so that running
50-
// `ember try:each` manually or from a customized CI config will run it
51-
// along with all the other scenarios.
52-
{
53-
name: 'ember-default',
54-
npm: {
55-
devDependencies: {}
56-
}
47+
},
48+
// The default `.travis.yml` runs this scenario via `npm test`,
49+
// not via `ember try`. It's still included here so that running
50+
// `ember try:each` manually or from a customized CI config will run it
51+
// along with all the other scenarios.
52+
{
53+
name: 'ember-default',
54+
npm: {
55+
devDependencies: {},
5756
},
58-
{
59-
name: 'ember-default-with-jquery',
60-
env: {
61-
EMBER_OPTIONAL_FEATURES: JSON.stringify({
62-
'jquery-integration': true
63-
})
57+
},
58+
{
59+
name: 'ember-default-with-jquery',
60+
env: {
61+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
62+
'jquery-integration': true,
63+
}),
64+
},
65+
npm: {
66+
devDependencies: {
67+
'@ember/jquery': '^0.5.1',
6468
},
65-
npm: {
66-
devDependencies: {
67-
'@ember/jquery': '^0.5.1'
68-
}
69-
}
7069
},
70+
},
7171
{
7272
name: 'ember-classic',
7373
env: {
7474
EMBER_OPTIONAL_FEATURES: JSON.stringify({
7575
'application-template-wrapper': true,
7676
'default-async-observers': false,
77-
'template-only-glimmer-components': false
78-
})
77+
'template-only-glimmer-components': false,
78+
}),
7979
},
8080
npm: {
8181
ember: {
82-
edition: 'classic'
83-
}
84-
}
85-
}
86-
]
82+
edition: 'classic',
83+
},
84+
},
85+
},
86+
],
8787
};
8888
};

config/environment.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

3-
module.exports = function(/* environment, appConfig */) {
4-
return { };
3+
module.exports = function (/* environment, appConfig */) {
4+
return {};
55
};

ember-cli-build.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
44

5-
module.exports = function(defaults) {
5+
module.exports = function (defaults) {
66
let app = new EmberAddon(defaults, {
77
// Add options here
88
'ember-cli-babel': {
99
// Used by the dummy app, doesn't affect the host app
10-
includePolyfill: true
11-
}
10+
includePolyfill: true,
11+
},
1212
});
1313

1414
/*

0 commit comments

Comments
 (0)