diff --git a/.eslintrc b/.eslintrc deleted file mode 100644 index c848887..0000000 --- a/.eslintrc +++ /dev/null @@ -1,14 +0,0 @@ -{ - "env": { - "es6": true, - "node": true - }, - "parserOptions": { - "ecmaFeatures": { - "modules": true - } - }, - "parser": "@typescript-eslint/parser", - "plugins": ["@typescript-eslint"], - "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"] -} diff --git a/.gitattributes b/.gitattributes index b7daa78..3f779fe 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1 @@ -.eslintrc linguist-language=JSON .prettierrc linguist-language=JSON \ No newline at end of file diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 77959fc..3ad5ea1 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -26,7 +26,7 @@ jobs: - name: Check formatting with Prettier run: npx prettier --check --ignore-unknown "**/*" - name: Lint with ESLint - run: npx eslint . --ext .ts + run: npx eslint "**/*.ts" eslint.config.mjs - name: Test with Mocha run: npx mocha -r ts-node/register "**/*.spec.ts" working-directory: nodejs diff --git a/.prettierrc b/.prettierrc index c1d044e..0be0c07 100644 --- a/.prettierrc +++ b/.prettierrc @@ -3,7 +3,7 @@ "bracketSpacing": false, "overrides": [ { - "files": [".eslintrc", ".prettierrc"], + "files": ".prettierrc", "options": {"parser": "json"} } ] diff --git a/eslint.config.mjs b/eslint.config.mjs new file mode 100644 index 0000000..21741bb --- /dev/null +++ b/eslint.config.mjs @@ -0,0 +1,8 @@ +// @ts-check +import eslint from "@eslint/js"; +import tseslint from "typescript-eslint"; + +export default tseslint.config( + eslint.configs.recommended, + ...tseslint.configs.recommended +); diff --git a/package.json b/package.json index 1b4ca50..0a8e30d 100644 --- a/package.json +++ b/package.json @@ -1,15 +1,16 @@ { "private": true, "devDependencies": { + "@eslint/js": "9.6.0", + "@types/eslint__js": "8.42.3", "@types/mocha": "10.0.7", "@types/node": "20.14.9", - "@typescript-eslint/eslint-plugin": "7.14.1", - "@typescript-eslint/parser": "7.14.1", "eslint": "8.57.0", "mocha": "10.5.2", "prettier": "3.3.2", "ts-node": "10.9.2", "typescript": "5.5.2", + "typescript-eslint": "7.14.1", "pulumi-aws-tags": "file:nodejs" } }