Skip to content

Commit

Permalink
Merge pull request #277 from shelfio/feature/OPS-4841-eslint-9x
Browse files Browse the repository at this point in the history
OPS-4841 Upgrade ESLint to 9x
  • Loading branch information
whodeen authored Dec 20, 2024
2 parents 640b7b2 + 6246af5 commit 9ed3139
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
test_without_db:
working_directory: ~/repo
docker:
- image: cimg/node:16.15-browsers
- image: cimg/node:20.18.1-browsers

steps:
- checkout
Expand All @@ -15,7 +15,7 @@ jobs:
test_with_db:
working_directory: ~/repo
docker:
- image: cimg/node:16.15-browsers
- image: cimg/node:20.18.1-browsers
- image: circleci/dynamodb

steps:
Expand Down
3 changes: 0 additions & 3 deletions .eslintignore

This file was deleted.

9 changes: 0 additions & 9 deletions .eslintrc

This file was deleted.

20 changes: 20 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -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',
],
},
];
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -58,22 +58,22 @@
"@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",
"@types/node": "20",
"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": {
"node": ">=16"
"node": ">=20"
},
"publishConfig": {
"access": "public"
Expand Down

0 comments on commit 9ed3139

Please sign in to comment.