Skip to content

Commit 8c2efc2

Browse files
Merge pull request #267 from emberjs/dependabot/npm_and_yarn/prettier-2.2.1
2 parents a5fcd4f + 04c9bff commit 8c2efc2

File tree

3 files changed

+40
-38
lines changed

3 files changed

+40
-38
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"eslint-plugin-node": "^11.1.0",
4141
"eslint-plugin-prettier": "^3.3.0",
4242
"execa": "^4.0.3",
43-
"prettier": "^2.1.2",
43+
"prettier": "^2.2.1",
4444
"qunit": "^2.13.0",
4545
"release-it": "^14.2.2",
4646
"release-it-lerna-changelog": "^2.4.0"

tests/commands-test.js

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -362,13 +362,13 @@ QUnit.module('commands', (hooks) => {
362362
}
363363
);
364364

365-
QUnit.test('it rewrites application.hbs when asked to', async function (
366-
assert
367-
) {
368-
project.write({
369-
app: {
370-
templates: {
371-
'application.hbs': strip`
365+
QUnit.test(
366+
'it rewrites application.hbs when asked to',
367+
async function (assert) {
368+
project.write({
369+
app: {
370+
templates: {
371+
'application.hbs': strip`
372372
<ul>
373373
<li>One</li>
374374
<li>Two</li>
@@ -379,18 +379,18 @@ QUnit.module('commands', (hooks) => {
379379
380380
<!-- wow -->
381381
`,
382+
},
382383
},
383-
},
384-
});
384+
});
385385

386-
await run('feature:disable', 'application-template-wrapper', {
387-
input: 'yes\n',
388-
});
386+
await run('feature:disable', 'application-template-wrapper', {
387+
input: 'yes\n',
388+
});
389389

390-
assert.deepEqual(
391-
project.read('app/templates'),
392-
{
393-
'application.hbs': strip`
390+
assert.deepEqual(
391+
project.read('app/templates'),
392+
{
393+
'application.hbs': strip`
394394
<div class="ember-view">
395395
<ul>
396396
<li>One</li>
@@ -403,10 +403,11 @@ QUnit.module('commands', (hooks) => {
403403
<!-- wow -->
404404
</div>
405405
`,
406-
},
407-
'it should have rewritten the template with the wrapper'
408-
);
409-
});
406+
},
407+
'it should have rewritten the template with the wrapper'
408+
);
409+
}
410+
);
410411

411412
QUnit.test(
412413
'it does not rewrite application.hbs when asked not to',
@@ -625,21 +626,22 @@ QUnit.module('commands', (hooks) => {
625626
},
626627
};
627628

628-
QUnit.test('it generates component files when asked to', async function (
629-
assert
630-
) {
631-
project.write({ app: CLASSIC_BEFORE });
629+
QUnit.test(
630+
'it generates component files when asked to',
631+
async function (assert) {
632+
project.write({ app: CLASSIC_BEFORE });
632633

633-
await run('feature:enable', 'template-only-glimmer-components', {
634-
input: 'yes\n',
635-
});
634+
await run('feature:enable', 'template-only-glimmer-components', {
635+
input: 'yes\n',
636+
});
636637

637-
assert.deepEqual(
638-
project.read('app'),
639-
CLASSIC_AFTER,
640-
'it should have generated the component JS files'
641-
);
642-
});
638+
assert.deepEqual(
639+
project.read('app'),
640+
CLASSIC_AFTER,
641+
'it should have generated the component JS files'
642+
);
643+
}
644+
);
643645

644646
QUnit.test(
645647
'it generates component files without prompt when asked to',

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5737,10 +5737,10 @@ prettier-linter-helpers@^1.0.0:
57375737
dependencies:
57385738
fast-diff "^1.1.2"
57395739

5740-
prettier@^2.1.2:
5741-
version "2.1.2"
5742-
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.2.tgz#3050700dae2e4c8b67c4c3f666cdb8af405e1ce5"
5743-
integrity sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==
5740+
prettier@^2.2.1:
5741+
version "2.2.1"
5742+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
5743+
integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
57445744

57455745
printf@^0.5.1:
57465746
version "0.5.3"

0 commit comments

Comments
 (0)