Skip to content

Commit 8b4cfd9

Browse files
authored
Merge pull request #936 from elwayman02/prettier-8
Prettier v8
2 parents b8042ec + 6cb8a44 commit 8b4cfd9

7 files changed

+162
-131
lines changed

package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -68,24 +68,24 @@
6868
"ember-template-lint": "^5.11.2",
6969
"ember-try": "^3.0.0-beta.1",
7070
"eslint": "^8.47.0",
71-
"eslint-config-prettier": "^8.8.0",
71+
"eslint-config-prettier": "^9.0.0",
7272
"eslint-plugin-ember": "^11.10.0",
7373
"eslint-plugin-n": "^16.0.2",
74-
"eslint-plugin-prettier": "^4.2.1",
74+
"eslint-plugin-prettier": "^5.0.0",
7575
"eslint-plugin-qunit": "^8.0.0",
7676
"field-guide": "^2.4.0",
7777
"field-guide-default-template": "^3.0.0",
7878
"loader.js": "^4.7.0",
7979
"prember": "^2.0.0",
80-
"prettier": "^2.8.8",
80+
"prettier": "^3.0.0",
8181
"qunit": "^2.19.4",
8282
"qunit-dom": "^2.0.0",
8383
"release-it": "^15.11.0",
8484
"release-it-lerna-changelog": "^5.0.0",
8585
"sass": "^1.66.1",
8686
"stylelint": "^15.10.3",
87-
"stylelint-config-standard": "^33.0.0",
88-
"stylelint-prettier": "^3.0.0",
87+
"stylelint-config-standard": "^34.0.0",
88+
"stylelint-prettier": "^4.0.2",
8989
"webpack": "^5.83.1"
9090
},
9191
"fastbootDependencies": [

tests/integration/modifiers/did-intersect-mock-test.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module(
2020

2121
test('Did intersect mock triggers onEnter correctly', async function (assert) {
2222
await render(
23-
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub}}></div>`
23+
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub}}></div>`,
2424
);
2525
await this.didIntersectMock.enter('[data-test-did-intersect]');
2626

@@ -30,7 +30,7 @@ module(
3030

3131
test('Did intersect mock triggers onEnter with additional state correctly', async function (assert) {
3232
await render(
33-
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub}}></div>`
33+
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub}}></div>`,
3434
);
3535
await this.didIntersectMock.enter('[data-test-did-intersect]', {
3636
time: 100,
@@ -39,13 +39,13 @@ module(
3939
assert.ok(
4040
this.enterStub.calledWithMatch({
4141
time: 100,
42-
})
42+
}),
4343
);
4444
});
4545

4646
test('Did intersect mock triggers onExit correctly', async function (assert) {
4747
await render(
48-
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub}}></div>`
48+
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub}}></div>`,
4949
);
5050
await this.didIntersectMock.exit('[data-test-did-intersect]');
5151

@@ -55,7 +55,7 @@ module(
5555

5656
test('Did intersect mock triggers onExit with additional state correctly', async function (assert) {
5757
await render(
58-
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub}}></div>`
58+
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub}}></div>`,
5959
);
6060
await this.didIntersectMock.exit('[data-test-did-intersect]', {
6161
time: 100,
@@ -64,13 +64,13 @@ module(
6464
assert.ok(
6565
this.exitStub.calledWithMatch({
6666
time: 100,
67-
})
67+
}),
6868
);
6969
});
7070

7171
test('Did intersect mock triggers onExit never exceeds maxEnter if maxEnter is provided', async function (assert) {
7272
await render(
73-
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub maxEnter=this.maxEnter}}></div>`
73+
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub maxEnter=this.maxEnter}}></div>`,
7474
);
7575

7676
for (let i = 0; i < this.maxEnter + 1; i++) {
@@ -82,7 +82,7 @@ module(
8282

8383
test('Did intersect mock triggers onExit never exceeds maxExit if maxExit is provided', async function (assert) {
8484
await render(
85-
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub maxExit=this.maxExit}}></div>`
85+
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub maxExit=this.maxExit}}></div>`,
8686
);
8787

8888
for (let i = 0; i < this.maxExit + 1; i++) {
@@ -94,7 +94,7 @@ module(
9494

9595
test('Did intersect mock fire without limit if maxEnter and maxExit is not provided', async function (assert) {
9696
await render(
97-
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub}}></div>`
97+
hbs`<div data-test-did-intersect {{did-intersect onEnter=this.enterStub onExit=this.exitStub}}></div>`,
9898
);
9999

100100
const numOfFiredCallback = this.maxEnter + this.maxExit;
@@ -107,13 +107,13 @@ module(
107107
assert.strictEqual(
108108
this.enterStub.callCount,
109109
numOfFiredCallback,
110-
'Enter callback has fired more than maxEnter times'
110+
'Enter callback has fired more than maxEnter times',
111111
);
112112
assert.strictEqual(
113113
this.exitStub.callCount,
114114
numOfFiredCallback,
115-
'Exit callback has fired more than maxExit times'
115+
'Exit callback has fired more than maxExit times',
116116
);
117117
});
118-
}
118+
},
119119
);

0 commit comments

Comments
 (0)