Skip to content

Commit 4a84d5f

Browse files
committed
Prettier up the code
Small changes in the prettier config in the default bluerpint. Applied here.
1 parent f1895ed commit 4a84d5f

8 files changed

Lines changed: 60 additions & 24 deletions

File tree

.eslintrc.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ module.exports = {
1414
},
1515
},
1616
plugins: ['ember'],
17-
extends: ['eslint:recommended', 'plugin:ember/recommended', 'plugin:prettier/recommended'],
17+
extends: [
18+
'eslint:recommended',
19+
'plugin:ember/recommended',
20+
'plugin:prettier/recommended',
21+
],
1822
env: {
1923
browser: true,
2024
},

addon/modifiers/did-insert.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,10 @@ import { macroCondition, dependencySatisfies } from '@embroider/macros';
4848
export default setModifierManager(
4949
() => ({
5050
capabilities: capabilities(
51-
macroCondition(dependencySatisfies('ember-source', '>= 3.22.0-beta.1')) ? '3.22' : '3.13',
52-
{ disableAutoTracking: true }
51+
macroCondition(dependencySatisfies('ember-source', '>= 3.22.0-beta.1'))
52+
? '3.22'
53+
: '3.13',
54+
{ disableAutoTracking: true },
5355
),
5456

5557
createModifier() {},
@@ -61,5 +63,5 @@ export default setModifierManager(
6163
updateModifier() {},
6264
destroyModifier() {},
6365
}),
64-
class DidInsertModifier {}
66+
class DidInsertModifier {},
6567
);

addon/modifiers/did-update.js

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
import { setModifierManager, capabilities } from '@ember/modifier';
2-
import { macroCondition, dependencySatisfies, importSync } from '@embroider/macros';
2+
import {
3+
macroCondition,
4+
dependencySatisfies,
5+
importSync,
6+
} from '@embroider/macros';
37

48
const untrack = (function () {
59
if (macroCondition(dependencySatisfies('ember-source', '> 3.27.0-beta.1'))) {
610
// ember-source@3.27 shipped "real modules" by default, so we can just use
711
// importSync to get @glimmer/validator directly
812
return importSync('@glimmer/validator').untrack;
9-
} else if (macroCondition(dependencySatisfies('ember-source', '>= 3.22.0-alpha.1'))) {
13+
} else if (
14+
macroCondition(dependencySatisfies('ember-source', '>= 3.22.0-alpha.1'))
15+
) {
1016
// we can access `window.Ember` here because it wasn't deprecated until at least 3.27
1117
// eslint-disable-next-line no-undef
1218
return Ember.__loader.require('@glimmer/validator').untrack;
@@ -73,7 +79,9 @@ const untrack = (function () {
7379
*/
7480
export default setModifierManager(
7581
() => ({
76-
capabilities: macroCondition(dependencySatisfies('ember-source', '>= 3.22.0-alpha.1'))
82+
capabilities: macroCondition(
83+
dependencySatisfies('ember-source', '>= 3.22.0-alpha.1'),
84+
)
7785
? capabilities('3.22', { disableAutoTracking: false })
7886
: capabilities('3.13', { disableAutoTracking: true }),
7987

@@ -84,7 +92,9 @@ export default setModifierManager(
8492
// save element into state bucket
8593
state.element = element;
8694

87-
if (macroCondition(dependencySatisfies('ember-source', '>= 3.22.0-alpha.1'))) {
95+
if (
96+
macroCondition(dependencySatisfies('ember-source', '>= 3.22.0-alpha.1'))
97+
) {
8898
// Consume individual properties to entangle tracking.
8999
// https://github.com/emberjs/ember.js/issues/19277
90100
// https://github.com/ember-modifier/ember-modifier/pull/63#issuecomment-815908201
@@ -96,7 +106,9 @@ export default setModifierManager(
96106
updateModifier({ element }, args) {
97107
let [fn, ...positional] = args.positional;
98108

99-
if (macroCondition(dependencySatisfies('ember-source', '>= 3.22.0-alpha.1'))) {
109+
if (
110+
macroCondition(dependencySatisfies('ember-source', '>= 3.22.0-alpha.1'))
111+
) {
100112
// Consume individual properties to entangle tracking.
101113
// https://github.com/emberjs/ember.js/issues/19277
102114
// https://github.com/ember-modifier/ember-modifier/pull/63#issuecomment-815908201
@@ -112,5 +124,5 @@ export default setModifierManager(
112124

113125
destroyModifier() {},
114126
}),
115-
class DidUpdateModifier {}
127+
class DidUpdateModifier {},
116128
);

addon/modifiers/will-destroy.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@ import { macroCondition, dependencySatisfies } from '@embroider/macros';
4242
export default setModifierManager(
4343
() => ({
4444
capabilities: capabilities(
45-
macroCondition(dependencySatisfies('ember-source', '>= 3.22.0-beta.1')) ? '3.22' : '3.13',
46-
{ disableAutoTracking: true }
45+
macroCondition(dependencySatisfies('ember-source', '>= 3.22.0-beta.1'))
46+
? '3.22'
47+
: '3.13',
48+
{ disableAutoTracking: true },
4749
),
4850

4951
createModifier() {
@@ -62,5 +64,5 @@ export default setModifierManager(
6264
fn(element, positional, args.named);
6365
},
6466
}),
65-
class WillDestroyModifier {}
67+
class WillDestroyModifier {},
6668
);

tests/dummy/config/targets.js

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

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

59
module.exports = {
610
browsers,

tests/integration/modifiers/did-insert-test.js

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ module('Integration | Modifier | did-insert', function (hooks) {
1919
assert.strictEqual(element.tagName, 'DIV', 'correct element tagName');
2020
assert.dom(element).hasAttribute('data-foo', 'some-thing');
2121
};
22-
await render(hbs`<div data-foo="some-thing" {{did-insert this.someMethod}}></div>`);
22+
await render(
23+
hbs`<div data-foo="some-thing" {{did-insert this.someMethod}}></div>`,
24+
);
2325
});
2426

2527
test('it can accept arguments', async function (assert) {
@@ -30,11 +32,15 @@ module('Integration | Modifier | did-insert', function (hooks) {
3032
assert.dom(element).hasAttribute('data-foo', 'some-thing');
3133

3234
assert.namedArgsEqual(named, { some: 'hash-value' }, 'named args match');
33-
assert.deepEqual(positional, ['some-positional-value'], 'positional args match');
35+
assert.deepEqual(
36+
positional,
37+
['some-positional-value'],
38+
'positional args match',
39+
);
3440
};
3541

3642
await render(
37-
hbs`<div data-foo="some-thing" {{did-insert this.someMethod "some-positional-value" some="hash-value"}}></div>`
43+
hbs`<div data-foo="some-thing" {{did-insert this.someMethod "some-positional-value" some="hash-value"}}></div>`,
3844
);
3945
});
4046

@@ -51,7 +57,7 @@ module('Integration | Modifier | did-insert', function (hooks) {
5157

5258
this.set('firstArg', 'initial');
5359
await render(
54-
hbs`<div data-foo="some-thing" {{did-insert this.someMethod this.firstArg}}></div>`
60+
hbs`<div data-foo="some-thing" {{did-insert this.someMethod this.firstArg}}></div>`,
5561
);
5662
this.set('firstArg', 'updated');
5763
});
@@ -60,7 +66,7 @@ module('Integration | Modifier | did-insert', function (hooks) {
6066
this.owner.register(
6167
'component:sometimes-fades-in',
6268
// eslint-disable-next-line ember/no-classic-classes
63-
Component.extend({})
69+
Component.extend({}),
6470
);
6571

6672
// eslint-disable-next-line ember/no-classic-classes

tests/integration/modifiers/did-update-test.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ module('Integration | Modifier | did-update', function (hooks) {
2222

2323
this.set('boundValue', 'initial');
2424
await render(
25-
hbs`<div data-foo="some-thing" {{did-update this.someMethod this.boundValue}}></div>`
25+
hbs`<div data-foo="some-thing" {{did-update this.someMethod this.boundValue}}></div>`,
2626
);
2727

2828
this.set('boundValue', 'update');
@@ -46,7 +46,9 @@ module('Integration | Modifier | did-update', function (hooks) {
4646
assert.strictEqual(this.context.secondaryValue, 'initial');
4747
};
4848

49-
await render(hbs`<div {{did-update this.someMethod this.context.boundValue}}></div>`);
49+
await render(
50+
hbs`<div {{did-update this.someMethod this.context.boundValue}}></div>`,
51+
);
5052

5153
this.context.boundValue = 'update';
5254
await settled();

tests/integration/modifiers/will-destroy-test.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module('Integration | Modifier | will-destroy', function (hooks) {
1616
this.set('show', true);
1717

1818
await render(
19-
hbs`{{#if this.show}}<div data-foo="some-thing" {{will-destroy this.someMethod}}></div>{{/if}}`
19+
hbs`{{#if this.show}}<div data-foo="some-thing" {{will-destroy this.someMethod}}></div>{{/if}}`,
2020
);
2121

2222
// trigger destroy
@@ -31,13 +31,17 @@ module('Integration | Modifier | will-destroy', function (hooks) {
3131
assert.dom(element).hasAttribute('data-foo', 'some-thing');
3232

3333
assert.namedArgsEqual(named, { some: 'hash-value' }, 'named args match');
34-
assert.deepEqual(positional, ['some-positional-value'], 'positional args match');
34+
assert.deepEqual(
35+
positional,
36+
['some-positional-value'],
37+
'positional args match',
38+
);
3539
};
3640

3741
this.set('show', true);
3842

3943
await render(
40-
hbs`{{#if this.show}}<div data-foo="some-thing" {{will-destroy this.someMethod "some-positional-value" some="hash-value"}}></div>{{/if}}`
44+
hbs`{{#if this.show}}<div data-foo="some-thing" {{will-destroy this.someMethod "some-positional-value" some="hash-value"}}></div>{{/if}}`,
4145
);
4246

4347
// trigger destroy

0 commit comments

Comments
 (0)