From e1c0123714b2e0a1342056bf67f19c536b0b3fe9 Mon Sep 17 00:00:00 2001 From: Oleksandr Fedoniuk Date: Thu, 19 Dec 2024 16:34:20 +0200 Subject: [PATCH 1/3] feat: OPS-4841 Update ESLint configuration --- .eslintignore | 3 --- .eslintrc | 9 --------- eslint.config.mjs | 20 ++++++++++++++++++++ package.json | 10 +++++----- 4 files changed, 25 insertions(+), 17 deletions(-) delete mode 100644 .eslintignore delete mode 100644 .eslintrc create mode 100644 eslint.config.mjs diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index 9a9e7d1..0000000 --- a/.eslintignore +++ /dev/null @@ -1,3 +0,0 @@ -lib/ -renovate.json -tsconfig.json diff --git a/.eslintrc b/.eslintrc deleted file mode 100644 index 731c6be..0000000 --- a/.eslintrc +++ /dev/null @@ -1,9 +0,0 @@ -{ - "root": true, - "extends": [ - "@shelf/eslint-config/typescript" - ], - "rules": { - "@typescript-eslint/no-var-requires": "off" - } -} diff --git a/eslint.config.mjs b/eslint.config.mjs new file mode 100644 index 0000000..338fa0a --- /dev/null +++ b/eslint.config.mjs @@ -0,0 +1,20 @@ +import rules from '@shelf/eslint-config/typescript.js'; + +export default [ + ...rules, + {files: ['**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx', '**/*.json']}, + { + ignores: [ + '.idea/', + 'coverage/', + 'draft.js', + 'lib/', + 'dist/', + 'node_modules/', + 'packages/**/tsconfig.types.json', + 'packages/**/node_modules/**', + 'packages/**/lib/**', + 'renovate.json', + ], + }, +]; diff --git a/package.json b/package.json index 1051cdb..8b37ed9 100644 --- a/package.json +++ b/package.json @@ -24,8 +24,8 @@ "build": "rm -rf lib/ && yarn build:types && babel src --out-dir lib --ignore '**/*.test.ts' --extensions '.ts'", "build:types": "tsc --emitDeclarationOnly --declaration --isolatedModules false --declarationDir lib", "coverage": "jest --coverage", - "lint": "eslint . --ext .js,.ts,.json --fix", - "lint:ci": "eslint . --ext .js,.ts,.json", + "lint": "yarn lint:ci --fix", + "lint:ci": "eslint . --quiet", "prepack": "yarn build", "test": "export ENVIRONMENT=local && jest tests", "type-check": "tsc --noEmit", @@ -58,18 +58,18 @@ "@babel/cli": "7.26.4", "@babel/core": "7.26.0", "@shelf/babel-config": "1.2.0", - "@shelf/eslint-config": "2.30.0", + "@shelf/eslint-config": "4.2.1", "@shelf/prettier-config": "1.0.0", "@shelf/tsconfig": "0.1.0", "@types/aws-sdk": "2.7.4", "@types/cwd": "^0.10.2", "@types/jest": "29.5.14", "@types/node": "16", - "eslint": "8.57.1", + "eslint": "9.17.0", "husky": "8.0.3", "jest": "29.7.0", "lint-staged": "13.3.0", - "prettier": "2.8.8", + "prettier": "3.4.2", "typescript": "5.7.2" }, "engines": { From a257db9dbb4d6d3ce8adbc3987a2b1eecadec676 Mon Sep 17 00:00:00 2001 From: Oleksandr Fedoniuk Date: Thu, 19 Dec 2024 18:02:50 +0200 Subject: [PATCH 2/3] feat: OPS-4841 Node --- .circleci/config.yml | 4 ++-- package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dc9e962..2cdf525 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ jobs: test_without_db: working_directory: ~/repo docker: - - image: cimg/node:16.15-browsers + - image: cimg/node:18.20.5-browsers steps: - checkout @@ -15,7 +15,7 @@ jobs: test_with_db: working_directory: ~/repo docker: - - image: cimg/node:16.15-browsers + - image: cimg/node:18.20.5-browsers - image: circleci/dynamodb steps: diff --git a/package.json b/package.json index 8b37ed9..5fa0dfb 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "@types/aws-sdk": "2.7.4", "@types/cwd": "^0.10.2", "@types/jest": "29.5.14", - "@types/node": "16", + "@types/node": "18", "eslint": "9.17.0", "husky": "8.0.3", "jest": "29.7.0", @@ -73,7 +73,7 @@ "typescript": "5.7.2" }, "engines": { - "node": ">=16" + "node": ">=18" }, "publishConfig": { "access": "public" From 6246af58154bfa53c976d733ddc39c88253bd1eb Mon Sep 17 00:00:00 2001 From: Sasha Fedoniuk <35227010+whodeen@users.noreply.github.com> Date: Fri, 20 Dec 2024 10:24:51 +0200 Subject: [PATCH 3/3] feat: OPS-4841 Node --- .circleci/config.yml | 4 ++-- package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2cdf525..5a497fa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ jobs: test_without_db: working_directory: ~/repo docker: - - image: cimg/node:18.20.5-browsers + - image: cimg/node:20.18.1-browsers steps: - checkout @@ -15,7 +15,7 @@ jobs: test_with_db: working_directory: ~/repo docker: - - image: cimg/node:18.20.5-browsers + - image: cimg/node:20.18.1-browsers - image: circleci/dynamodb steps: diff --git a/package.json b/package.json index 5fa0dfb..48a5803 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "@types/aws-sdk": "2.7.4", "@types/cwd": "^0.10.2", "@types/jest": "29.5.14", - "@types/node": "18", + "@types/node": "20", "eslint": "9.17.0", "husky": "8.0.3", "jest": "29.7.0", @@ -73,7 +73,7 @@ "typescript": "5.7.2" }, "engines": { - "node": ">=18" + "node": ">=20" }, "publishConfig": { "access": "public"