Skip to content

Commit 32ec12e

Browse files
committed
chore: update prettier
1 parent e605143 commit 32ec12e

File tree

24 files changed

+82
-97
lines changed

24 files changed

+82
-97
lines changed

.eslintrc.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-env node */
12
module.exports = {
23
root: true,
34
parser: '@typescript-eslint/parser',
@@ -11,7 +12,7 @@ module.exports = {
1112
browser: true,
1213
},
1314
rules: {
14-
"prettier/prettier": "error"
15+
'prettier/prettier': 'error',
1516
},
1617
settings: {
1718
node: {
@@ -43,14 +44,10 @@ module.exports = {
4344
node: true,
4445
},
4546
plugins: ['node'],
46-
rules: Object.assign(
47-
{},
48-
require('eslint-plugin-node').configs.recommended.rules,
49-
{
50-
// add your custom rules and overrides for node files here
51-
'ember/avoid-leaking-state-in-ember-objects': 'off',
52-
}
53-
),
47+
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
48+
// add your custom rules and overrides for node files here
49+
'ember/avoid-leaking-state-in-ember-objects': 'off',
50+
}),
5451
},
5552

5653
// test files

config/deploy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env node */
22
'use strict';
33

4-
module.exports = function(deployTarget) {
4+
module.exports = function (deployTarget) {
55
let ENV = {
66
build: {},
77
// include other plugin configuration that applies to all deploy targets here

config/environment.js

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

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

ember-cli-build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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
'ember-cli-babel': {
88
throwUnlessParallelizable: true,

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
"in-repo-b": "link:tests/dummy/lib/in-repo-b",
126126
"loader.js": "4.7.0",
127127
"mocha": "8.0.1",
128-
"prettier": "1.19.1",
128+
"prettier": "2.0.5",
129129
"prettier-eslint": "11.0.0",
130130
"qunit-dom": "1.2.0",
131131
"testdouble": "3.16.0",

tests/dummy/app/router.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ const Router = AddonDocsRouter.extend({
66
rootURL: config.rootURL,
77
});
88

9-
Router.map(function() {
10-
docsRoute(this, function() {
9+
Router.map(function () {
10+
docsRoute(this, function () {
1111
this.route('upgrade-notes');
1212
this.route('configuration');
13-
this.route('ts-guide', function() {
13+
this.route('ts-guide', function () {
1414
this.route('with-addons');
1515
this.route('using-ts-effectively');
1616
this.route('current-limitations');
1717
});
18-
this.route('troubleshooting', function() {
18+
this.route('troubleshooting', function () {
1919
this.route('conflicting-types');
2020
});
21-
this.route('type-defs', function() {
21+
this.route('type-defs', function () {
2222
this.route('package-names');
2323
});
2424
});

tests/dummy/config/environment.js

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

3-
module.exports = function(environment) {
3+
module.exports = function (environment) {
44
let ENV = {
55
modulePrefix: 'dummy',
66
environment,

tests/integration/components/js-importing-ts-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import { setupRenderingTest } from 'ember-qunit';
33
import { render } from '@ember/test-helpers';
44
import hbs from 'htmlbars-inline-precompile';
55

6-
module('Integration | Component | js importing ts', function(hooks) {
6+
module('Integration | Component | js importing ts', function (hooks) {
77
setupRenderingTest(hooks);
88

9-
test('it renders', async function(assert) {
9+
test('it renders', async function (assert) {
1010
// Set any properties with this.set('myProperty', 'value');
1111
// Handle any actions with this.on('myAction', function(val) { ... });
1212

tests/integration/components/ts-component-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import { setupRenderingTest } from 'ember-qunit';
33
import { render } from '@ember/test-helpers';
44
import hbs from 'htmlbars-inline-precompile';
55

6-
module('Integration | Component | ts component', function(hooks) {
6+
module('Integration | Component | ts component', function (hooks) {
77
setupRenderingTest(hooks);
88

9-
test('it renders', async function(assert) {
9+
test('it renders', async function (assert) {
1010
// Set any properties with this.set('myProperty', 'value');
1111
// Handle any actions with this.on('myAction', function(val) { ... });
1212

tests/unit/build-test.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,28 @@ import fileB from 'dummy/b';
77
import { description as fromAts } from 'in-repo-a/test-support/from-ats';
88
import { description as fromTs } from 'dummy/tests/from-ts';
99

10-
module('Unit | Build', function() {
11-
test("in-repo addons' addon trees wind up in the right place", function(assert) {
10+
module('Unit | Build', function () {
11+
test("in-repo addons' addon trees wind up in the right place", function (assert) {
1212
assert.equal(addonFileA, 'in-repo-a/test-file');
1313
assert.equal(addonFileB, 'in-repo-b/test-file');
1414
});
1515

16-
test("in-repo addons' app trees wind up in the right place", function(assert) {
16+
test("in-repo addons' app trees wind up in the right place", function (assert) {
1717
assert.equal(fileA, 'dummy/a');
1818
assert.equal(fileB, 'dummy/b');
1919
});
2020

21-
test("addon's addon-test-support files end up in <addon-name>/test-support/*", function(assert) {
21+
test("addon's addon-test-support files end up in <addon-name>/test-support/*", function (assert) {
2222
assert.ok(fromAts);
2323
assert.equal(fromAts, 'From addon-test-support');
2424
});
2525

26-
test("addon's test-support files end up in dummy/tests/*", function(assert) {
26+
test("addon's test-support files end up in dummy/tests/*", function (assert) {
2727
assert.ok(fromTs);
2828
assert.equal(fromTs, 'From test-support');
2929
});
3030

31-
test('property initialization occurs in the right order', function(assert) {
31+
test('property initialization occurs in the right order', function (assert) {
3232
class TestClass {
3333
// we shouldn't encourage folks to write code like this, but tsc ensures
3434
// that constructor param fields are set before field initializers run

0 commit comments

Comments
 (0)