From c250e57ea12d348618a81b75bafcf30305056d66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A6=8A=E5=8E=9F=E6=98=8C=E5=BD=A6?= Date: Thu, 12 Dec 2024 00:36:03 +0900 Subject: [PATCH] fix --- .eslintignore | 4 ---- .eslintrc.js | 23 ----------------------- README.md | 13 ++++++++----- eslint.config.js | 1 + package.json | 3 ++- src/configs/recommended.ts | 11 ++++++++++- src/index.ts | 21 +++++++++++++-------- 7 files changed, 34 insertions(+), 42 deletions(-) delete mode 100644 .eslintignore delete mode 100644 .eslintrc.js diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index 83d4113..0000000 --- a/.eslintignore +++ /dev/null @@ -1,4 +0,0 @@ -!.*.js -/node_modules -/dist -/scripts diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index 42f7712..0000000 --- a/.eslintrc.js +++ /dev/null @@ -1,23 +0,0 @@ -module.exports = { - root: true, - env: { - node: true, - }, - parser: '@typescript-eslint/parser', - plugins: ['@typescript-eslint'], - extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended'], - parserOptions: { - ecmaVersion: 12, - sourceType: 'module', - }, - overrides: [ - { - files: 'scripts/**/*.ts', - rules: { - 'no-console': 'off', - '@typescript-eslint/no-var-requires': 'off', - '@typescript-eslint/no-namespace': 'off', - }, - }, - ], -}; diff --git a/README.md b/README.md index 128b8f0..d71364d 100644 --- a/README.md +++ b/README.md @@ -15,15 +15,15 @@ If your project does not install `@angular-eslint` packages, please do so: https Recommend settings is here: ```diff - { - ... -+ "plugins": ["@rdlabo/rules"], - "overrides": [ +module.exports = tseslint.config( { "files": [ "*.ts" ], - ... + ++ "plugins": { ++ '@rdlabo/rules': rdlabo, ++ }, "rules": { + "@rdlabo/rules/deny-constructor-di": "error", + "@rdlabo/rules/import-inject-object": "error", @@ -37,6 +37,9 @@ Recommend settings is here: "files": [ "*.html" ], ++ "plugins": { ++ '@rdlabo/rules': rdlabo, ++ }, "rules": { + "@rdlabo/rules/deny-element": [ + "error", diff --git a/eslint.config.js b/eslint.config.js index 5f9bde9..787477c 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -4,6 +4,7 @@ const tseslint = require('typescript-eslint'); module.exports = tseslint.config({ files: ['**/*.ts'], + ignores: ['!.*.js', '/node_modules', '/dist', '/scripts'], extends: [ eslint.configs.recommended, ...tseslint.configs.recommended, diff --git a/package.json b/package.json index fab8011..bfe321e 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ }, "main": "dist/index.js", "files": [ - "dist" + "dist", + "package.json" ], "scripts": { "prepare": "husky install", diff --git a/src/configs/recommended.ts b/src/configs/recommended.ts index f507ad9..15344f8 100644 --- a/src/configs/recommended.ts +++ b/src/configs/recommended.ts @@ -1,5 +1,14 @@ /* DON'T EDIT THIS FILE. This is generated by 'scripts/lib/update-lib-configs-recommended.ts' */ export = { - rules: {}, + plugins: ['@rdlabo/rules'], + rules: { + '@rdlabo/rules/deny-constructor-di': 'error', + '@rdlabo/rules/deny-element': 'error', + '@rdlabo/rules/deny-import-from-ionic-module': 'error', + '@rdlabo/rules/deny-soft-private-modifier': 'error', + '@rdlabo/rules/implements-ionic-lifecycle': 'error', + '@rdlabo/rules/import-inject-object': 'error', + '@rdlabo/rules/signal-use-as-signal': 'error', + }, }; diff --git a/src/index.ts b/src/index.ts index 018d6cc..ef7b371 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,5 +1,7 @@ /* DON'T EDIT THIS FILE. This is generated by 'scripts/lib/update-lib-index.ts' */ +import recommended from './configs/recommended'; + import denyConstructorDi from './rules/deny-constructor-di'; import denyElement from './rules/deny-element'; import denyImportFromIonicModule from './rules/deny-import-from-ionic-module'; @@ -9,16 +11,19 @@ import importInjectObject from './rules/import-inject-object'; import signalUseAsSignal from './rules/signal-use-as-signal'; export = { + meta: { + name: '@rdlabo/rules', + }, configs: { - recommended: {}, + recommended, }, rules: { - denyConstructorDi, - denyElement, - denyImportFromIonicModule, - denySoftPrivateModifier, - implementsIonicLifecycle, - importInjectObject, - signalUseAsSignal, + 'deny-constructor-di': denyConstructorDi, + 'deny-element': denyElement, + 'deny-import-from-ionic-module': denyImportFromIonicModule, + 'deny-soft-private-modifier': denySoftPrivateModifier, + 'implements-ionic-lifecycle': implementsIonicLifecycle, + 'import-inject-object': importInjectObject, + 'signal-use-as-signal': signalUseAsSignal, }, };