Skip to content

Commit

Permalink
fix failure
Browse files Browse the repository at this point in the history
  • Loading branch information
TylerJang27 committed Aug 12, 2024
1 parent b23e37d commit cbb6fbd
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 10 deletions.
7 changes: 1 addition & 6 deletions eslint.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@ module.exports = [
"no-unused-vars": "off",
"no-use-before-define": "off",
"no-useless-constructor": "off",
"@typescript-eslint/lines-between-class-members": [
"error",
"always",
{ exceptAfterSingleLine: true },
],
"@typescript-eslint/naming-convention": [
"error",
{ selector: "typeLike", format: ["PascalCase"] },
Expand Down Expand Up @@ -79,7 +74,7 @@ module.exports = [
],
"import-x/no-unresolved": "off",
"import-x/prefer-default-export": "off",
"lines-between-class-members": "off",
"lines-between-class-members": ["error", "always", { exceptAfterSingleLine: true }],
"max-len": [
"error",
{
Expand Down
2 changes: 1 addition & 1 deletion repo-tools/definition-checker/check.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import fs from "fs";
import path from "path";
// trunk-ignore(eslint/import/no-extraneous-dependencies)
// trunk-ignore(eslint/import-x/no-extraneous-dependencies)
import YAML from "yaml";

// Avoid strictly typing composite config
Expand Down
4 changes: 2 additions & 2 deletions tests/driver/lint_driver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ lint:
(this.getFullTrunkConfig().lint.definitions.find(
({ name }: { name: string }) => name === this.linter,
)?.known_good_version as string) ?? "";
// trunk-ignore(eslint/@typescript-eslint/no-useless-template-literals): Convert kgv to string
// trunk-ignore(eslint/@typescript-eslint/no-unnecessary-template-expression): Convert kgv to string
if (this.linter === "include-what-you-use" && `${kgv}`.length === 3) {
// TODO(Tyler): `trunk config print` does not correctly wrap quotes around kgv, so we must patch iwyu here
return `${kgv}0`;
Expand All @@ -149,7 +149,7 @@ lint:

let newTrunkContents = "<undefined contents>";
try {
// trunk-ignore(eslint/@typescript-eslint/no-useless-template-literals): Cast to string to handle decimal case
// trunk-ignore(eslint/@typescript-eslint/no-unnecessary-template-expression): Cast to string to handle decimal case
const version = `${this.extractLinterVersion()}`;
const versionString = version.length > 0 ? `@${version}` : "";
const linterVersionString = `${this.linter}${versionString}`;
Expand Down
2 changes: 1 addition & 1 deletion tests/driver/tool_driver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ lint:
return;
}
try {
// trunk-ignore(eslint/@typescript-eslint/no-useless-template-literals): Cast to string to handle decimal case
// trunk-ignore(eslint/@typescript-eslint/no-unnecessary-template-expression): Cast to string to handle decimal case
const version = `${this.extractToolVersion()}`;
const versionString = version.length > 0 ? `@${version}` : "";
const toolVersionString = `${this.tool}${versionString}`;
Expand Down

0 comments on commit cbb6fbd

Please sign in to comment.