Skip to content

Commit ac2be67

Browse files
dependabot[bot]hugo-vrijswijk
dependabot[bot]
and
hugo-vrijswijk
authored
build(deps-dev): bump prettier from 2.8.8 to 3.0.0 (#2601)
* build(deps-dev): bump prettier from 2.8.8 to 3.0.0 Bumps [prettier](https://github.com/prettier/prettier) from 2.8.8 to 3.0.0. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](prettier/prettier@2.8.8...3.0.0) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Update prettier --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Hugo van Rijswijk <git@hugovr.nl>
1 parent 542abb1 commit ac2be67

34 files changed

+181
-197
lines changed

‎.eslintrc.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = {
22
parser: '@typescript-eslint/parser',
3-
plugins: ['@typescript-eslint', 'prettier'],
3+
plugins: ['@typescript-eslint'],
44
parserOptions: {
55
tsconfigRootDir: __dirname,
66
project: ['tsconfig.lint.json', 'packages/*/test/tsconfig.json', 'packages/*/src/tsconfig.json'],
@@ -15,15 +15,13 @@ module.exports = {
1515

1616
// Not useful for a lot of stuff, but mainly `.shadowRoot`
1717
'@typescript-eslint/no-non-null-assertion': 'off',
18-
'prettier/prettier': 'error',
1918
},
2019
extends: [
2120
'eslint:recommended',
2221
'plugin:@typescript-eslint/eslint-recommended',
2322
'plugin:@typescript-eslint/recommended-type-checked',
2423
'plugin:@typescript-eslint/stylistic-type-checked',
2524
'prettier',
26-
'plugin:tailwindcss/recommended',
2725
],
2826
env: {
2927
node: true,

‎.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ packages/metrics-scala/README.md
1717

1818
# Large files that don't need prettier formatting
1919
report.json
20+
21+
testResources

‎.prettierrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"printWidth": 150,
33
"singleQuote": true,
44
"htmlWhitespaceSensitivity": "strict",
5-
"tailwindConfig": "./packages/elements/tailwind.config.js"
5+
"tailwindConfig": "./packages/elements/tailwind.config.js",
6+
"plugins": ["prettier-plugin-tailwindcss"]
67
}

‎package-lock.json

Lines changed: 32 additions & 73 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"scripts": {
1111
"clean": "rimraf --glob packages/*/{dist,dist-test,src-generated}",
1212
"all": "npm run clean && npm run build && npm run lint && npm run test",
13-
"lint": "npm run lint:json && npm run lint:ts",
13+
"lint": "npm run lint:prettier && npm run lint:ts",
1414
"lint:ts": "eslint --ext .js,.ts .",
15-
"lint:json": "prettier --check .",
15+
"lint:prettier": "prettier --check .",
1616
"prebuild": "npm run generate",
1717
"generate": "lerna run generate",
1818
"build": "tsc -b && lerna run build",
@@ -62,8 +62,6 @@
6262
"eslint": "^8.1.0",
6363
"eslint-config-prettier": "~8.8.0",
6464
"eslint-plugin-import": "~2.27.4",
65-
"eslint-plugin-prettier": "~4.2.1",
66-
"eslint-plugin-tailwindcss": "^3.8.0",
6765
"express": "^4.17.1",
6866
"json-schema-to-typescript": "^13.0.1",
6967
"karma": "~6.4.0",
@@ -76,7 +74,7 @@
7674
"mocha": "^10.0.0",
7775
"postcss": "^8.2.13",
7876
"postcss-loader": "^7.0.0",
79-
"prettier": "~2.8.0",
77+
"prettier": "~3.0.0",
8078
"prettier-plugin-tailwindcss": "^0.4.0",
8179
"resemblejs": "^5.0.0",
8280
"rimraf": "^5.0.0",

‎packages/elements/.prettierrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"printWidth": 150,
33
"singleQuote": true,
44
"htmlWhitespaceSensitivity": "strict",
5-
"tailwindConfig": "./tailwind.config.js"
5+
"tailwindConfig": "./tailwind.config.js",
6+
"plugins": ["prettier-plugin-tailwindcss"]
67
}

‎packages/elements/src/components/app/app.component.ts

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ export class MutationTestReportAppComponent extends RealtimeElement {
134134
createCustomEvent('theme-changed', {
135135
theme: this.theme,
136136
themeBackgroundColor: this.themeBackgroundColor,
137-
})
137+
}),
138138
);
139139
}
140140
}
@@ -185,7 +185,7 @@ export class MutationTestReportAppComponent extends RealtimeElement {
185185
const findResult = <TFile, TResult>(root: MetricsResult<TFile, TResult>, path: string[]): MetricsResult<TFile, TResult> | undefined => {
186186
return path.reduce<MetricsResult<TFile, TResult> | undefined>(
187187
(model, currentPathPart) => model?.childResults.find((child) => child.name === currentPathPart),
188-
root
188+
root,
189189
);
190190
};
191191
const path = this.path.slice(1);
@@ -368,16 +368,17 @@ export class MutationTestReportAppComponent extends RealtimeElement {
368368
{ type: 'mutant', isActive: mutantsActive, text: '👽 Mutants' },
369369
{ type: 'test', isActive: testsActive, text: '🧪 Tests' },
370370
].map(
371-
({ type, isActive, text }) => html`<li class="mr-2" role="presentation">
372-
<a
373-
class="inline-block rounded-t-lg border-b-2 border-transparent p-4 transition-colors hover:border-gray-300 hover:bg-gray-200 hover:text-gray-700 aria-selected:border-b-[3px] aria-selected:border-primary-700 aria-selected:text-primary-on"
374-
role="tab"
375-
href="${toAbsoluteUrl(type)}"
376-
aria-selected="${isActive}"
377-
aria-controls="mte-${type}-view"
378-
>${text}</a
379-
>
380-
</li>`
371+
({ type, isActive, text }) =>
372+
html`<li class="mr-2" role="presentation">
373+
<a
374+
class="inline-block rounded-t-lg border-b-2 border-transparent p-4 transition-colors hover:border-gray-300 hover:bg-gray-200 hover:text-gray-700 aria-selected:border-b-[3px] aria-selected:border-primary-700 aria-selected:text-primary-on"
375+
role="tab"
376+
href="${toAbsoluteUrl(type)}"
377+
aria-selected="${isActive}"
378+
aria-controls="mte-${type}-view"
379+
>${text}</a
380+
>
381+
</li>`,
381382
)}
382383
</ul>
383384
</nav>

‎packages/elements/src/components/breadcrumb.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export class MutationTestReportBreadcrumbComponent extends LitElement {
4545
} else {
4646
return this.renderLink(item, path.slice(0, index + 1));
4747
}
48-
}
48+
},
4949
);
5050
}
5151
return undefined;

‎packages/elements/src/components/drawer-mutant/drawer-mutant.component.ts

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -34,36 +34,38 @@ export class MutationTestReportDrawerMutant extends RealtimeElement {
3434
>
3535
<span slot="summary">${this.renderSummary()}</span>
3636
<span slot="detail" class="block">${this.renderDetail()}</span>
37-
`
38-
)
37+
`,
38+
),
3939
);
4040
}
4141

4242
private renderSummary() {
43-
return renderSummaryContainer(html`${this.mutant?.killedByTests?.[0]
44-
? renderSummaryLine(
45-
html`${renderEmoji('🎯', 'killed')} Killed by:
46-
${this.mutant.killedByTests?.[0].name}${this.mutant.killedByTests.length > 1 ? `(and ${this.mutant.killedByTests.length - 1} more)` : ''}`
47-
)
48-
: nothing}
49-
${renderIf(this.mutant?.static, renderSummaryLine(html`${renderEmoji('🗿', 'static')} Static mutant`))}
50-
${renderIfPresent(this.mutant?.coveredByTests, (coveredTests) =>
51-
renderSummaryLine(
52-
html`${renderEmoji('☂️', 'umbrella')} Covered by ${coveredTests.length}
53-
test${plural(coveredTests)}${this.mutant?.status === MutantStatus.Survived ? ' (yet still survived)' : ''}`
54-
)
55-
)}
56-
${renderIf(
57-
this.mutant?.statusReason?.trim(),
58-
renderSummaryLine(html`${renderEmoji('🕵️', 'spy')} ${this.mutant!.statusReason!}`, `Reason for the ${this.mutant!.status} status`)
59-
)}
60-
${renderIfPresent(this.mutant?.description, (description) => renderSummaryLine(html`${renderEmoji('📖', 'book')} ${description}`))}`);
43+
return renderSummaryContainer(
44+
html`${this.mutant?.killedByTests?.[0]
45+
? renderSummaryLine(
46+
html`${renderEmoji('🎯', 'killed')} Killed by:
47+
${this.mutant.killedByTests?.[0].name}${this.mutant.killedByTests.length > 1 ? `(and ${this.mutant.killedByTests.length - 1} more)` : ''}`,
48+
)
49+
: nothing}
50+
${renderIf(this.mutant?.static, renderSummaryLine(html`${renderEmoji('🗿', 'static')} Static mutant`))}
51+
${renderIfPresent(this.mutant?.coveredByTests, (coveredTests) =>
52+
renderSummaryLine(
53+
html`${renderEmoji('☂️', 'umbrella')} Covered by ${coveredTests.length}
54+
test${plural(coveredTests)}${this.mutant?.status === MutantStatus.Survived ? ' (yet still survived)' : ''}`,
55+
),
56+
)}
57+
${renderIf(
58+
this.mutant?.statusReason?.trim(),
59+
renderSummaryLine(html`${renderEmoji('🕵️', 'spy')} ${this.mutant!.statusReason!}`, `Reason for the ${this.mutant!.status} status`),
60+
)}
61+
${renderIfPresent(this.mutant?.description, (description) => renderSummaryLine(html`${renderEmoji('📖', 'book')} ${description}`))}`,
62+
);
6163
}
6264

6365
private renderDetail() {
6466
return html`<ul class="mb-6 mr-12">
6567
${this.mutant?.killedByTests?.map((test) =>
66-
renderDetailLine('This mutant was killed by this test', html`${renderEmoji('🎯', 'killed')} ${describeTest(test)}`)
68+
renderDetailLine('This mutant was killed by this test', html`${renderEmoji('🎯', 'killed')} ${describeTest(test)}`),
6769
)}
6870
${this.mutant?.coveredByTests
6971
?.filter((test) => !this.mutant?.killedByTests?.includes(test))

0 commit comments

Comments
 (0)