Skip to content

Commit 3645fe8

Browse files
authored
Merge pull request #820 from elwayman02/prettier-3
prettier v3
2 parents ddf3351 + dfd40cd commit 3645fe8

File tree

3 files changed

+48
-22
lines changed

3 files changed

+48
-22
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@
6666
"eslint-config-prettier": "^9.0.0",
6767
"eslint-plugin-ember": "^11.11.1",
6868
"eslint-plugin-node": "^11.1.0",
69-
"eslint-plugin-prettier": "^4.2.1",
69+
"eslint-plugin-prettier": "^5.0.1",
7070
"eslint-plugin-qunit": "^8.0.1",
7171
"field-guide": "^2.4.0",
7272
"field-guide-default-template": "^3.0.0",
7373
"loader.js": "^4.7.0",
7474
"prember": "^2.0.0",
75-
"prettier": "^2.8.8",
75+
"prettier": "^3.0.3",
7676
"qunit": "^2.19.4",
7777
"qunit-dom": "^2.0.0",
7878
"release-it": "^15.11.0",

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ module('Integration | Modifier | did-resize', function (hooks) {
5555
assert.strictEqual(
5656
Object.keys(options).length,
5757
0,
58-
'empty object passed as default options'
58+
'empty object passed as default options',
5959
);
6060
});
6161

6262
test('modifier triggers handler when ResizeObserver fires callback', async function (assert) {
6363
await render(
64-
hbs`<div id="test-element" {{did-resize this.resizeStub}}></div>`
64+
hbs`<div id="test-element" {{did-resize this.resizeStub}}></div>`,
6565
);
6666
let entry = { target: find('#test-element') };
6767
let fakeObserver = { observe: {} };
@@ -70,7 +70,7 @@ module('Integration | Modifier | did-resize', function (hooks) {
7070

7171
assert.ok(
7272
this.resizeStub.calledOnceWith(entry, fakeObserver),
73-
'handler fired with correct parameters'
73+
'handler fired with correct parameters',
7474
);
7575
});
7676

@@ -114,13 +114,13 @@ module('Integration | Modifier | did-resize', function (hooks) {
114114
await render(
115115
hbs`<div id="test-element1" {{did-resize this.resizeStub}}></div>
116116
<div id="test-element2" {{did-resize this.resizeStub2}}></div>
117-
<div id="test-element3" {{did-resize this.resizeStub3}}></div>`
117+
<div id="test-element3" {{did-resize this.resizeStub3}}></div>`,
118118
);
119119

120120
let entries = ['#test-element1', '#test-element2', '#test-element3'].map(
121121
(elementId) => {
122122
return { target: find(elementId) };
123-
}
123+
},
124124
);
125125
let fakeObserver = { observe: {} };
126126

@@ -130,47 +130,47 @@ module('Integration | Modifier | did-resize', function (hooks) {
130130
assert.ok(this.resizeStub.calledOnce, 'First handler was called only once');
131131
assert.ok(
132132
this.resizeStub2.calledOnce,
133-
'Second handler was called only once'
133+
'Second handler was called only once',
134134
);
135135
assert.ok(
136136
this.resizeStub3.calledOnce,
137-
'Third handler was called only once'
137+
'Third handler was called only once',
138138
);
139139

140140
// trigger resize only on the first element
141141
resizeCallback([entries[0]], fakeObserver);
142142
assert.ok(
143143
this.resizeStub.calledTwice,
144-
'First handler was called a second time'
144+
'First handler was called a second time',
145145
);
146146
assert.notOk(
147147
this.resizeStub2.calledTwice,
148-
'Second handler was not called a second time'
148+
'Second handler was not called a second time',
149149
);
150150
assert.notOk(
151151
this.resizeStub3.calledTwice,
152-
'Third handler was not called a second time'
152+
'Third handler was not called a second time',
153153
);
154154
});
155155

156156
test('element gets unobserved before removing from the DOM', async function (assert) {
157157
await render(
158-
hbs`<div id='test-element' {{did-resize this.resizeStub}}></div>`
158+
hbs`<div id='test-element' {{did-resize this.resizeStub}}></div>`,
159159
);
160160
let element = find('#test-element');
161161
await clearRender();
162162

163163
assert.ok(
164164
unobserveStub.calledOnceWith(element),
165-
'unobserve is called with the HTMLElement of the modifier'
165+
'unobserve is called with the HTMLElement of the modifier',
166166
);
167167

168168
let entry = { target: element };
169169
let fakeObserver = { observe: {} };
170170
resizeCallback([entry], fakeObserver);
171171
assert.notOk(
172172
this.resizeStub.called,
173-
'handler function is not called after element is removed from the DOM'
173+
'handler function is not called after element is removed from the DOM',
174174
);
175175
});
176176
});

yarn.lock

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1935,6 +1935,18 @@
19351935
dependencies:
19361936
"@octokit/openapi-types" "^18.0.0"
19371937

1938+
"@pkgr/utils@^2.3.1":
1939+
version "2.4.2"
1940+
resolved "https://registry.yarnpkg.com/@pkgr/utils/-/utils-2.4.2.tgz#9e638bbe9a6a6f165580dc943f138fd3309a2cbc"
1941+
integrity sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==
1942+
dependencies:
1943+
cross-spawn "^7.0.3"
1944+
fast-glob "^3.3.0"
1945+
is-glob "^4.0.3"
1946+
open "^9.1.0"
1947+
picocolors "^1.0.0"
1948+
tslib "^2.6.0"
1949+
19381950
"@pnpm/network.ca-file@^1.0.1":
19391951
version "1.0.2"
19401952
resolved "https://registry.yarnpkg.com/@pnpm/network.ca-file/-/network.ca-file-1.0.2.tgz#2ab05e09c1af0cdf2fcf5035bea1484e222f7983"
@@ -6811,12 +6823,13 @@ eslint-plugin-node@^11.1.0:
68116823
resolve "^1.10.1"
68126824
semver "^6.1.0"
68136825

6814-
eslint-plugin-prettier@^4.2.1:
6815-
version "4.2.1"
6816-
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz#651cbb88b1dab98bfd42f017a12fa6b2d993f94b"
6817-
integrity sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==
6826+
eslint-plugin-prettier@^5.0.1:
6827+
version "5.0.1"
6828+
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.1.tgz#a3b399f04378f79f066379f544e42d6b73f11515"
6829+
integrity sha512-m3u5RnR56asrwV/lDC4GHorlW75DsFfmUcjfCYylTUs85dBRnB7VM6xG8eCMJdeDRnppzmxZVf1GEPJvl1JmNg==
68186830
dependencies:
68196831
prettier-linter-helpers "^1.0.0"
6832+
synckit "^0.8.5"
68206833

68216834
eslint-plugin-qunit@^8.0.1:
68226835
version "8.0.1"
@@ -11161,7 +11174,7 @@ onetime@^6.0.0:
1116111174
dependencies:
1116211175
mimic-fn "^4.0.0"
1116311176

11164-
11177+
[email protected], open@^9.1.0:
1116511178
version "9.1.0"
1116611179
resolved "https://registry.yarnpkg.com/open/-/open-9.1.0.tgz#684934359c90ad25742f5a26151970ff8c6c80b6"
1116711180
integrity sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==
@@ -11794,11 +11807,16 @@ prettier-linter-helpers@^1.0.0:
1179411807
dependencies:
1179511808
fast-diff "^1.1.2"
1179611809

11797-
prettier@^2.5.1, prettier@^2.8.8:
11810+
prettier@^2.5.1:
1179811811
version "2.8.8"
1179911812
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
1180011813
integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
1180111814

11815+
prettier@^3.0.3:
11816+
version "3.0.3"
11817+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643"
11818+
integrity sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==
11819+
1180211820
pretty-ms@^3.1.0:
1180311821
version "3.2.0"
1180411822
resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-3.2.0.tgz#87a8feaf27fc18414d75441467d411d6e6098a25"
@@ -13629,6 +13647,14 @@ sync-disk-cache@^2.0.0:
1362913647
rimraf "^3.0.0"
1363013648
username-sync "^1.0.2"
1363113649

13650+
synckit@^0.8.5:
13651+
version "0.8.5"
13652+
resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.8.5.tgz#b7f4358f9bb559437f9f167eb6bc46b3c9818fa3"
13653+
integrity sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==
13654+
dependencies:
13655+
"@pkgr/utils" "^2.3.1"
13656+
tslib "^2.5.0"
13657+
1363213658
tap-parser@^7.0.0:
1363313659
version "7.0.0"
1363413660
resolved "https://registry.yarnpkg.com/tap-parser/-/tap-parser-7.0.0.tgz#54db35302fda2c2ccc21954ad3be22b2cba42721"
@@ -14008,7 +14034,7 @@ tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0:
1400814034
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
1400914035
integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
1401014036

14011-
tslib@^2.4.1:
14037+
tslib@^2.4.1, tslib@^2.5.0, tslib@^2.6.0:
1401214038
version "2.6.2"
1401314039
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
1401414040
integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==

0 commit comments

Comments
 (0)