diff --git a/README.md b/README.md index 30356f7..b3849c8 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,11 @@ Feel free to explore the `tsconfig.json` file for all the configured options. ## ESLint and Prettier setup -The starter kit configures ESLint and Prettier. Both configurations are stored within the `package.json` file and use our [shared config](https://github.com/adonisjs/tooling-config/tree/main/packages). Feel free to change the configuration, use custom plugins, or remove both tools altogether. +The starter kit configures ESLint and Prettier +using our [shared config](https://github.com/adonisjs/tooling-config/tree/main/packages). +ESLint configuration is stored within the `eslint.config.js` file. +Prettier configuration is stored within the `package.json` file. +Feel free to change the configuration, use custom plugins, or remove both tools altogether. ## Using Stale bot diff --git a/eslint.config.js b/eslint.config.js new file mode 100644 index 0000000..3b21353 --- /dev/null +++ b/eslint.config.js @@ -0,0 +1,3 @@ +import { configPkg } from '@adonisjs/eslint-config' + +export default configPkg() diff --git a/package.json b/package.json index 835d259..8f956d0 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "clean": "del-cli build", "copy:templates": "copyfiles \"stubs/**/*.stub\" build", "typecheck": "tsc --noEmit", - "lint": "eslint . --ext=.ts", + "lint": "eslint .", "format": "prettier --write .", "quick:test": "node --import=./tsnode.esm.js --enable-source-maps bin/test.ts", "pretest": "npm run lint", @@ -37,10 +37,10 @@ "author": "", "license": "MIT", "devDependencies": { - "@adonisjs/assembler": "^7.7.0", + "@adonisjs/assembler": "^7.8.2", "@adonisjs/core": "^6.12.0", - "@adonisjs/eslint-config": "^1.3.0", - "@adonisjs/prettier-config": "^1.3.0", + "@adonisjs/eslint-config": "2.0.0-beta.7", + "@adonisjs/prettier-config": "^1.4.0", "@adonisjs/tsconfig": "^1.3.0", "@japa/assert": "^3.0.0", "@japa/runner": "^3.1.4", @@ -49,10 +49,10 @@ "c8": "^10.1.2", "copyfiles": "^2.4.1", "del-cli": "^5.1.0", - "eslint": "^8.57.0", + "eslint": "^9.15.0", "np": "^10.0.6", "prettier": "^3.3.2", - "ts-node": "^10.9.2", + "ts-node-maintained": "^10.9.4", "typescript": "^5.4.5" }, "peerDependencies": { @@ -77,8 +77,5 @@ "tests/**" ] }, - "eslintConfig": { - "extends": "@adonisjs/eslint-config/package" - }, "prettier": "@adonisjs/prettier-config" } diff --git a/tsnode.esm.js b/tsnode.esm.js index 0cce922..57db7f8 100644 --- a/tsnode.esm.js +++ b/tsnode.esm.js @@ -14,5 +14,4 @@ | Because, loaders have been deprecated. */ -import { register } from 'node:module' -register('ts-node/esm', import.meta.url) +import 'ts-node-maintained/register/esm'