Skip to content

Commit

Permalink
feat: update eslint dependencies, fix imports
Browse files Browse the repository at this point in the history
  • Loading branch information
brandongregoryscott committed Jun 22, 2024
1 parent b4ce27b commit 4f14324
Show file tree
Hide file tree
Showing 20 changed files with 970 additions and 512 deletions.
4 changes: 3 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,7 @@
"typescript-sort-keys",
"@typescript-eslint"
],
"rules": {}
"rules": {
"@typescript-eslint/sort-type-union-intersection-members": "off"
}
}
5 changes: 2 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,14 @@ on:
jobs:
build:
runs-on: ubuntu-latest
if: always()

steps:
- uses: actions/checkout@v2

- name: Setup node 14.18
- name: Setup node 18.16.0
uses: actions/setup-node@v2
with:
node-version: 14.18
node-version: 18.16.0

- name: npm install
run: npm install
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18
18.16.0
1,379 changes: 918 additions & 461 deletions package-lock.json

Large diffs are not rendered by default.

21 changes: 11 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,18 @@
"@types/common-tags": "1.8.1",
"@types/jest": "27.5.1",
"@types/lodash": "4.14.182",
"@typescript-eslint/eslint-plugin": "5.27.1",
"@typescript-eslint/parser": "5.27.1",
"@typescript-eslint/utils": "5.27.1",
"@typescript-eslint/eslint-plugin": "7.13.1",
"@typescript-eslint/parser": "7.13.1",
"@typescript-eslint/rule-tester": "7.13.1",
"@typescript-eslint/utils": "7.13.1",
"commitizen": "4.2.4",
"common-tags": "1.8.2",
"cz-conventional-changelog": "3.3.0",
"esbuild": "0.14.43",
"eslint": "8.16.0",
"eslint-plugin-collation": "1.1.2",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-typescript-sort-keys": "2.1.0",
"eslint": "8.57.0",
"eslint-plugin-collation": "1.4.2",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-typescript-sort-keys": "3.2.0",
"eslint-remote-tester": "2.1.4",
"eslint-remote-tester-repositories": "0.0.5",
"husky": "7.0.4",
Expand Down Expand Up @@ -59,9 +60,9 @@
"main": "dist/index.js",
"name": "eslint-plugin-collation",
"peerDependencies": {
"@typescript-eslint/parser": ">=5",
"@typescript-eslint/utils": ">=5",
"eslint": ">=6"
"@typescript-eslint/parser": ">=6 || >=7",
"@typescript-eslint/utils": ">=6 || >=7",
"eslint": ">=7 || >=8"
},
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions src/rules/group-exports.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { ESLintUtils } from "@typescript-eslint/utils";
import { RuleTester } from "@typescript-eslint/rule-tester";
import { groupExports } from "./group-exports";
import { codeBlock } from "common-tags";

const ruleTester = new ESLintUtils.RuleTester({
const ruleTester = new RuleTester({
parser: "@typescript-eslint/parser",
});

Expand Down
4 changes: 2 additions & 2 deletions src/rules/group-exports.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type {
RuleFix,
RuleFixer,
SourceCode,
} from "@typescript-eslint/utils/dist/ts-eslint";
} from "@typescript-eslint/utils/ts-eslint";
import { RuleName } from "../enums/rule-name";
import {
isInlineExport,
Expand Down Expand Up @@ -40,7 +40,7 @@ const groupExports = createRule({
meta: {
docs: {
description: "Consolidates multiple export statements",
recommended: "warn",
recommended: "stylistic",
},
fixable: "code",
messages: {
Expand Down
4 changes: 2 additions & 2 deletions src/rules/no-default-export.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ESLintUtils } from "@typescript-eslint/utils";
import { RuleTester } from "@typescript-eslint/rule-tester";
import { noDefaultExport } from "./no-default-export";

const ruleTester = new ESLintUtils.RuleTester({
const ruleTester = new RuleTester({
parser: "@typescript-eslint/parser",
});

Expand Down
4 changes: 2 additions & 2 deletions src/rules/no-default-export.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type {
RuleFix,
RuleFixer,
SourceCode,
} from "@typescript-eslint/utils/dist/ts-eslint";
} from "@typescript-eslint/utils/ts-eslint";
import { RuleName } from "../enums/rule-name";
import type { Declaration } from "../types/declaration";
import { getName, isDeclaration } from "../utils/node-utils";
Expand Down Expand Up @@ -40,7 +40,7 @@ const noDefaultExport = createRule({
meta: {
docs: {
description: "Enforces exports to be named",
recommended: "warn",
recommended: "stylistic",
},
fixable: "code",
messages: {
Expand Down
4 changes: 2 additions & 2 deletions src/rules/no-inline-export.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { ESLintUtils } from "@typescript-eslint/utils";
import { RuleTester } from "@typescript-eslint/rule-tester";
import { noInlineExport } from "./no-inline-export";
import { codeBlock } from "common-tags";

const ruleTester = new ESLintUtils.RuleTester({
const ruleTester = new RuleTester({
parser: "@typescript-eslint/parser",
});

Expand Down
4 changes: 2 additions & 2 deletions src/rules/no-inline-export.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type {
RuleFix,
RuleFixer,
SourceCode,
} from "@typescript-eslint/utils/dist/ts-eslint";
} from "@typescript-eslint/utils/ts-eslint";
import { RuleName } from "../enums/rule-name";
import { getName } from "../utils/node-utils";
import { createRule } from "../utils/rule-utils";
Expand Down Expand Up @@ -47,7 +47,7 @@ const noInlineExport = createRule({
meta: {
docs: {
description: "Enforces exports to appear at the end of the file",
recommended: "warn",
recommended: "stylistic",
},
fixable: "code",
messages: {
Expand Down
4 changes: 2 additions & 2 deletions src/rules/prefer-import.test.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { ESLintUtils } from "@typescript-eslint/utils";
import { RuleTester } from "@typescript-eslint/rule-tester";
import { preferImport } from "./prefer-import";
import { codeBlock } from "common-tags";
import { TWILIO_PASTE_IMPORTS } from "../constants/twilio-paste-imports";
import { LODASH_IMPORTS } from "../constants/lodash-imports";

const ruleTester = new ESLintUtils.RuleTester({
const ruleTester = new RuleTester({
parser: "@typescript-eslint/parser",
});

Expand Down
15 changes: 8 additions & 7 deletions src/rules/prefer-import.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
import type {
RuleContext,
RuleFix,
RuleListener,
} from "@typescript-eslint/utils/dist/ts-eslint";
import { RuleName } from "../enums/rule-name";
import { createRule, tryRule } from "../utils/rule-utils";
import type { CaseTransformation } from "../utils/string-utils";
Expand All @@ -11,7 +6,6 @@ import {
transformCase,
CASE_TRANSFORMATIONS,
} from "../utils/string-utils";
import type { JSONSchema4 } from "@typescript-eslint/utils/dist/json-schema";
import {
arrify,
difference,
Expand Down Expand Up @@ -41,6 +35,12 @@ import {
removeImportClause,
} from "../utils/fixer-utils";
import { getValues, iterate, updateIn } from "../utils/map-utils";
import type {
RuleContext,
RuleFix,
RuleListener,
} from "@typescript-eslint/utils/ts-eslint";
import type { JSONSchema4 } from "@typescript-eslint/utils/json-schema";

interface PreferImportOptions {
[moduleSpecifier: string]: ImportRule | ImportRule[];
Expand Down Expand Up @@ -433,6 +433,7 @@ const importRuleSchema: JSONSchema4 = {
description:
"String transformation method to be run on the matched `importName`. Only applicable if `replacementModuleSpecifier` has the replacement variable `{importName}`.",
enum: CASE_TRANSFORMATIONS,
type: "string",
},
},
};
Expand All @@ -444,7 +445,7 @@ const preferImport = createRule<PreferImportOptions[], PreferImportMessageIds>({
docs: {
description:
"Enforces imports from a preferred module over another, such as for tree-shaking purposes or wrapping a library.",
recommended: "error",
recommended: "strict",
},
messages: {
bannedGlobalType:
Expand Down
4 changes: 2 additions & 2 deletions src/rules/sort-dependency-list.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ESLintUtils } from "@typescript-eslint/utils";
import { RuleTester } from "@typescript-eslint/rule-tester";
import { sortDependencyList } from "./sort-dependency-list";

const ruleTester = new ESLintUtils.RuleTester({
const ruleTester = new RuleTester({
parser: "@typescript-eslint/parser",
});

Expand Down
4 changes: 2 additions & 2 deletions src/rules/sort-dependency-list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type {
RuleContext,
RuleFix,
RuleFixer,
} from "@typescript-eslint/utils/dist/ts-eslint";
} from "@typescript-eslint/utils/ts-eslint";
import { RuleName } from "../enums/rule-name";
import { createRule } from "../utils/rule-utils";
import { isEqualJson } from "../utils/core-utils";
Expand All @@ -30,7 +30,7 @@ const sortDependencyList = createRule({
meta: {
docs: {
description: "Sorts React dependency lists",
recommended: "warn",
recommended: "stylistic",
},
fixable: "code",
messages: {
Expand Down
4 changes: 2 additions & 2 deletions src/rules/sort-exports.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { ESLintUtils } from "@typescript-eslint/utils";
import { RuleTester } from "@typescript-eslint/rule-tester";
import { codeBlock } from "common-tags";
import { sortExports } from "./sort-exports";

const ruleTester = new ESLintUtils.RuleTester({
const ruleTester = new RuleTester({
parser: "@typescript-eslint/parser",
});

Expand Down
4 changes: 2 additions & 2 deletions src/rules/sort-exports.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { RuleContext } from "@typescript-eslint/utils/dist/ts-eslint";
import type { RuleContext } from "@typescript-eslint/utils/ts-eslint";
import { RuleName } from "../enums/rule-name";
import {
isInlineExport,
Expand Down Expand Up @@ -30,7 +30,7 @@ const sortExports = createRule({
meta: {
docs: {
description: "Sorts specifiers in an export statement",
recommended: "warn",
recommended: "stylistic",
},
fixable: "code",
messages: {
Expand Down
5 changes: 1 addition & 4 deletions src/utils/fixer-utils.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import type { TSESTree } from "@typescript-eslint/utils";
import type {
RuleFix,
SourceCode,
} from "@typescript-eslint/utils/dist/ts-eslint";
import type { RuleFix, SourceCode } from "@typescript-eslint/utils/ts-eslint";
import { isCommaToken, isIdentifierToken } from "./node-utils";

// #region Vendorized Fixer functions
Expand Down
2 changes: 1 addition & 1 deletion src/utils/rule-utils.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ESLintUtils } from "@typescript-eslint/utils";
import { getDocsUrl } from "./string-utils";
import type { RuleContext } from "@typescript-eslint/utils/dist/ts-eslint";
import type { RuleContext } from "@typescript-eslint/utils/ts-eslint";

const createRule = ESLintUtils.RuleCreator(getDocsUrl);

Expand Down
5 changes: 3 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"jsx": "react",
"lib": ["es6"],
"module": "commonjs",
"lib": ["ES2021", "DOM"],
"module": "Node16",
"moduleResolution": "Node16",
"outDir": "dist",
"removeComments": true,
"resolveJsonModule": true,
Expand Down

0 comments on commit 4f14324

Please sign in to comment.