Skip to content

Commit fb99d64

Browse files
buschtoensbuschtoens
committed
style(eslint): auto-format
1 parent d5ece2a commit fb99d64

21 files changed

+93
-126
lines changed

‎src/index.js

+20-36
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,19 @@ module.exports = {
1313
// Create `parent.options.autoImport.webpack = {}`
1414
if (!parent.options) parent.options = {};
1515
if (!parent.options.autoImport) parent.options.autoImport = {};
16+
1617
const { autoImport } = parent.options;
18+
1719
if (!autoImport.webpack) autoImport.webpack = {};
20+
1821
const { webpack } = autoImport;
1922

2023
// Unshift `.ts` `.d.ts` extensions to `webpack.resolve.extensions`
21-
if (!webpack.resolve)
22-
webpack.resolve = { extensions: ['.ts', '.js', '.d.ts'] };
23-
else if (!webpack.resolve.extensions)
24-
webpack.resolve.extensions = ['.ts', '.js', '.d.ts'];
25-
else if (!webpack.resolve.extensions.includes('.ts'))
26-
webpack.resolve.extensions.unshift('.ts');
24+
if (!webpack.resolve) webpack.resolve = { extensions: ['.ts', '.js', '.d.ts'] };
25+
else if (!webpack.resolve.extensions) webpack.resolve.extensions = ['.ts', '.js', '.d.ts'];
26+
else if (!webpack.resolve.extensions.includes('.ts')) webpack.resolve.extensions.unshift('.ts');
2727

28-
if (!webpack.resolve.extensions.includes('.d.ts'))
29-
webpack.resolve.extensions.push('.d.ts');
28+
if (!webpack.resolve.extensions.includes('.d.ts')) webpack.resolve.extensions.push('.d.ts');
3029

3130
const tsModuleRule = {
3231
test: /\.ts$/,
@@ -35,55 +34,40 @@ module.exports = {
3534
options: {
3635
plugins: [
3736
// https://github.com/babel/ember-cli-babel/blob/4c3b9091d7c711ecb804a52226409b409a702d82/lib/babel-options-util.js#L398
38-
[
39-
require.resolve('@babel/plugin-transform-typescript'),
40-
{ allowDeclareFields: true }
41-
],
37+
[require.resolve('@babel/plugin-transform-typescript'), { allowDeclareFields: true }],
4238

4339
// https://github.com/babel/ember-cli-babel/blob/4c3b9091d7c711ecb804a52226409b409a702d82/lib/babel-options-util.js#L324
44-
[
45-
require.resolve('@babel/plugin-proposal-decorators'),
46-
{ legacy: true }
47-
],
40+
[require.resolve('@babel/plugin-proposal-decorators'), { legacy: true }],
4841

4942
// https://github.com/babel/ember-cli-babel/blob/4c3b9091d7c711ecb804a52226409b409a702d82/lib/babel-options-util.js#L348-L349
50-
[
51-
require.resolve('@babel/plugin-proposal-class-properties'),
52-
{ loose: false }
53-
],
43+
[require.resolve('@babel/plugin-proposal-class-properties'), { loose: false }],
5444

5545
// https://github.com/webpack/webpack/issues/10227
5646
// Remove when `ember-auto-import` updates to `webpack@5`.
57-
require.resolve(
58-
'@babel/plugin-proposal-nullish-coalescing-operator'
59-
),
60-
require.resolve('@babel/plugin-proposal-optional-chaining')
47+
require.resolve('@babel/plugin-proposal-nullish-coalescing-operator'),
48+
require.resolve('@babel/plugin-proposal-optional-chaining'),
6149
],
6250
presets: [
6351
// Transpile incompatible syntax for project build targets
6452
[
6553
require.resolve('@babel/preset-env'),
6654
{
6755
modules: false,
68-
targets: this.project.targets
69-
}
70-
]
71-
]
72-
}
73-
}
56+
targets: this.project.targets,
57+
},
58+
],
59+
],
60+
},
61+
},
7462
};
7563

7664
// Push `tsModuleRule` into `webpack.module.rules`
7765
if (!webpack.module) {
7866
webpack.module = { rules: [tsModuleRule] };
7967
} else if (!webpack.module.rules) {
8068
webpack.module.rules = [tsModuleRule];
81-
} else if (
82-
!webpack.module.rules.some(
83-
r => String(r.test) === String(tsModuleRule.test)
84-
)
85-
) {
69+
} else if (!webpack.module.rules.some((r) => String(r.test) === String(tsModuleRule.test))) {
8670
webpack.module.rules.push(tsModuleRule);
8771
}
88-
}
72+
},
8973
};

‎tests/addon/.template-lintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

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

‎tests/addon/addon/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { works, SomeEnum, moduleB } from '@test/ts-module-a';
1+
export { moduleB, SomeEnum, works } from '@test/ts-module-a';

‎tests/addon/config/ember-try.js

+24-24
Original file line numberDiff line numberDiff line change
@@ -12,41 +12,41 @@ module.exports = async function () {
1212
name: 'ember-lts-3.4',
1313
npm: {
1414
devDependencies: {
15-
'ember-source': '~3.4.0'
16-
}
17-
}
15+
'ember-source': '~3.4.0',
16+
},
17+
},
1818
},
1919
{
2020
name: 'ember-lts-3.8',
2121
npm: {
2222
devDependencies: {
23-
'ember-source': '~3.8.0'
24-
}
25-
}
23+
'ember-source': '~3.8.0',
24+
},
25+
},
2626
},
2727
{
2828
name: 'ember-release',
2929
npm: {
3030
devDependencies: {
31-
'ember-source': await getChannelURL('release')
32-
}
33-
}
31+
'ember-source': await getChannelURL('release'),
32+
},
33+
},
3434
},
3535
{
3636
name: 'ember-beta',
3737
npm: {
3838
devDependencies: {
39-
'ember-source': await getChannelURL('beta')
40-
}
41-
}
39+
'ember-source': await getChannelURL('beta'),
40+
},
41+
},
4242
},
4343
{
4444
name: 'ember-canary',
4545
npm: {
4646
devDependencies: {
47-
'ember-source': await getChannelURL('canary')
48-
}
49-
}
47+
'ember-source': await getChannelURL('canary'),
48+
},
49+
},
5050
},
5151
// The default `.travis.yml` runs this scenario via `yarn test`,
5252
// not via `ember try`. It's still included here so that running
@@ -55,22 +55,22 @@ module.exports = async function () {
5555
{
5656
name: 'ember-default',
5757
npm: {
58-
devDependencies: {}
59-
}
58+
devDependencies: {},
59+
},
6060
},
6161
{
6262
name: 'ember-default-with-jquery',
6363
env: {
6464
EMBER_OPTIONAL_FEATURES: JSON.stringify({
65-
'jquery-integration': true
66-
})
65+
'jquery-integration': true,
66+
}),
6767
},
6868
npm: {
6969
devDependencies: {
70-
'@ember/jquery': '^0.5.1'
71-
}
72-
}
73-
}
74-
]
70+
'@ember/jquery': '^0.5.1',
71+
},
72+
},
73+
},
74+
],
7575
};
7676
};

‎tests/addon/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
name: require('./package').name
4+
name: require('./package').name,
55
};

‎tests/addon/testem.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ module.exports = {
1313
'--disable-software-rasterizer',
1414
'--mute-audio',
1515
'--remote-debugging-port=0',
16-
'--window-size=1440,900'
17-
].filter(Boolean)
18-
}
19-
}
16+
'--window-size=1440,900',
17+
].filter(Boolean),
18+
},
19+
},
2020
};

‎tests/addon/tests/dummy/app/app.js

+7-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
import Application from '@ember/application';
22

3+
import config from 'dummy/config/environment';
34
import loadInitializers from 'ember-load-initializers';
5+
import Resolver from 'ember-resolver';
46

5-
import config from './config/environment';
6-
import Resolver from './resolver';
7-
8-
const App = Application.extend({
9-
modulePrefix: config.modulePrefix,
10-
podModulePrefix: config.podModulePrefix,
11-
Resolver
12-
});
7+
export default class App extends Application {
8+
modulePrefix = config.modulePrefix;
9+
podModulePrefix = config.podModulePrefix;
10+
Resolver = Resolver;
11+
}
1312

1413
loadInitializers(App, config.modulePrefix);
15-
16-
export default App;

‎tests/addon/tests/dummy/app/router.js

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
import EmberRouter from '@ember/routing/router';
22

3-
import config from './config/environment';
3+
import config from 'dummy/config/environment';
44

5-
const Router = EmberRouter.extend({
6-
location: config.locationType,
7-
rootURL: config.rootURL
8-
});
5+
export default class Router extends EmberRouter {
6+
location = config.locationType;
7+
rootURL = config.rootURL;
8+
}
99

1010
Router.map(function () {});
11-
12-
export default Router;

‎tests/addon/tests/dummy/config/environment.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ module.exports = function (environment) {
1313
},
1414
EXTEND_PROTOTYPES: {
1515
// Prevent Ember Data from overriding Date.parse.
16-
Date: false
17-
}
16+
Date: false,
17+
},
1818
},
1919

2020
APP: {
2121
// Here you can pass flags/options to your application instance
2222
// when it is created
23-
}
23+
},
2424
};
2525

2626
if (environment === 'development') {

‎tests/addon/tests/dummy/config/targets.js

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
'use strict';
22

3-
const browsers = [
4-
'last 1 Chrome versions',
5-
'last 1 Firefox versions',
6-
'last 1 Safari versions'
7-
];
3+
const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
84

95
const isCI = !!process.env.CI;
106
const isProduction = process.env.EMBER_ENV === 'production';
@@ -14,5 +10,5 @@ if (isCI || isProduction) {
1410
}
1511

1612
module.exports = {
17-
browsers
13+
browsers,
1814
};

‎tests/addon/tests/test-helper.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { setApplication } from '@ember/test-helpers';
2-
import { start } from 'ember-qunit';
32
import * as QUnit from 'qunit';
43
import { setup } from 'qunit-dom';
4+
import { start } from 'ember-qunit';
55

66
import Application from '../app';
77
import config from '../config/environment';

‎tests/addon/tests/unit/ts-module-a-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { module, test } from 'qunit';
22

3-
import { works, SomeEnum, moduleB } from '@test/addon';
3+
import { moduleB, SomeEnum, works } from '@test/addon';
44

55
module('ts-module-a', function () {
66
test('it works', function (assert) {

‎tests/app/.template-lintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

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

‎tests/app/app/app.js

+5-7
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ import loadInitializers from 'ember-load-initializers';
55
import config from './config/environment';
66
import Resolver from './resolver';
77

8-
const App = Application.extend({
9-
modulePrefix: config.modulePrefix,
10-
podModulePrefix: config.podModulePrefix,
11-
Resolver
12-
});
8+
export default class App extends Application {
9+
modulePrefix = config.modulePrefix;
10+
podModulePrefix = config.podModulePrefix;
11+
Resolver = Resolver;
12+
}
1313

1414
loadInitializers(App, config.modulePrefix);
15-
16-
export default App;

‎tests/app/app/router.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ import EmberRouter from '@ember/routing/router';
22

33
import config from './config/environment';
44

5-
const Router = EmberRouter.extend({
6-
location: config.locationType,
7-
rootURL: config.rootURL
8-
});
5+
export default class Router extends EmberRouter {
6+
location = config.locationType;
7+
rootURL = config.rootURL;
8+
}
99

1010
Router.map(function () {});
11-
12-
export default Router;

‎tests/app/config/environment.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ module.exports = function (environment) {
1313
},
1414
EXTEND_PROTOTYPES: {
1515
// Prevent Ember Data from overriding Date.parse.
16-
Date: false
17-
}
16+
Date: false,
17+
},
1818
},
1919

2020
APP: {
2121
// Here you can pass flags/options to your application instance
2222
// when it is created
23-
}
23+
},
2424
};
2525

2626
if (environment === 'development') {

‎tests/app/config/targets.js

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
'use strict';
22

3-
const browsers = [
4-
'last 1 Chrome versions',
5-
'last 1 Firefox versions',
6-
'last 1 Safari versions'
7-
];
3+
const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
84

95
const isCI = !!process.env.CI;
106
const isProduction = process.env.EMBER_ENV === 'production';
@@ -14,5 +10,5 @@ if (isCI || isProduction) {
1410
}
1511

1612
module.exports = {
17-
browsers
13+
browsers,
1814
};

0 commit comments

Comments
 (0)