diff --git a/.changeset/metal-bottles-bow.md b/.changeset/metal-bottles-bow.md index 84f3040..774880f 100644 --- a/.changeset/metal-bottles-bow.md +++ b/.changeset/metal-bottles-bow.md @@ -1,5 +1,5 @@ --- -"@eslegant/config": patch +"@eslegant/js": patch "@eslegant/cli": patch --- diff --git a/.changeset/tricky-avocados-draw.md b/.changeset/tricky-avocados-draw.md index 5bf3aa2..8e3dc06 100644 --- a/.changeset/tricky-avocados-draw.md +++ b/.changeset/tricky-avocados-draw.md @@ -1,7 +1,7 @@ --- "create-eslegant": minor "eslegant": minor -"@eslegant/config": minor +"@eslegant/js": minor "@eslegant/cli": minor --- diff --git a/.changeset/witty-dogs-speak.md b/.changeset/witty-dogs-speak.md new file mode 100644 index 0000000..60d78dc --- /dev/null +++ b/.changeset/witty-dogs-speak.md @@ -0,0 +1,5 @@ +--- +"@eslegant/js": patch +--- + +Renamed @eslegant/config to @eslegant/js diff --git a/packages/config/.lintstagedrc b/configs/js/.lintstagedrc similarity index 100% rename from packages/config/.lintstagedrc rename to configs/js/.lintstagedrc diff --git a/packages/config/CHANGELOG.md b/configs/js/CHANGELOG.md similarity index 100% rename from packages/config/CHANGELOG.md rename to configs/js/CHANGELOG.md diff --git a/packages/config/jsconfig.json b/configs/js/jsconfig.json similarity index 100% rename from packages/config/jsconfig.json rename to configs/js/jsconfig.json diff --git a/packages/config/package.json b/configs/js/package.json similarity index 95% rename from packages/config/package.json rename to configs/js/package.json index 0ffd049..9c54110 100644 --- a/packages/config/package.json +++ b/configs/js/package.json @@ -1,5 +1,5 @@ { - "name": "@eslegant/config", + "name": "@eslegant/js", "version": "0.2.0", "description": "", "main": "index.js", @@ -22,7 +22,7 @@ "lint": "eslint ." }, "repository": { - "directory": "packages/config", + "directory": "configs/js", "type": "git", "url": "https://github.com/LoredDev/ESLegant" }, diff --git a/packages/config/src/@types/eslint-plugin-i.d.ts b/configs/js/src/@types/eslint-plugin-i.d.ts similarity index 92% rename from packages/config/src/@types/eslint-plugin-i.d.ts rename to configs/js/src/@types/eslint-plugin-i.d.ts index a002c13..173ce64 100644 --- a/packages/config/src/@types/eslint-plugin-i.d.ts +++ b/configs/js/src/@types/eslint-plugin-i.d.ts @@ -1,3 +1,4 @@ +// eslint-disable-next-line unicorn/prevent-abbreviations import type { ESLint, Linter } from 'eslint'; /** diff --git a/packages/config/src/@types/eslint-plugin-jsdoc.d.ts b/configs/js/src/@types/eslint-plugin-jsdoc.d.ts similarity index 93% rename from packages/config/src/@types/eslint-plugin-jsdoc.d.ts rename to configs/js/src/@types/eslint-plugin-jsdoc.d.ts index de5663c..4228de7 100644 --- a/packages/config/src/@types/eslint-plugin-jsdoc.d.ts +++ b/configs/js/src/@types/eslint-plugin-jsdoc.d.ts @@ -10,6 +10,7 @@ import type { ESLint } from 'eslint'; * new flat config. */ declare module 'eslint-plugin-jsdoc' { + // eslint-disable-next-line unicorn/prevent-abbreviations interface jsDocESlintPlugin extends ESLint.Plugin { configs: ESLint.Plugin['configs'] & { recommended: ESLint.ConfigData diff --git a/packages/config/src/@types/globals.d.ts b/configs/js/src/@types/globals.d.ts similarity index 100% rename from packages/config/src/@types/globals.d.ts rename to configs/js/src/@types/globals.d.ts index 30c7b93..0bd6b01 100644 --- a/packages/config/src/@types/globals.d.ts +++ b/configs/js/src/@types/globals.d.ts @@ -1,10 +1,10 @@ declare module 'globals' { const globals: { - builtin: Record browser: Record + builtin: Record + commonjs: Record node: Record nodeBuiltin: Record - commonjs: Record }; export default globals; } diff --git a/packages/config/src/@types/typescript-eslint.d.ts b/configs/js/src/@types/typescript-eslint.d.ts similarity index 100% rename from packages/config/src/@types/typescript-eslint.d.ts rename to configs/js/src/@types/typescript-eslint.d.ts diff --git a/packages/config/src/configs/core.js b/configs/js/src/configs/core.js similarity index 93% rename from packages/config/src/configs/core.js rename to configs/js/src/configs/core.js index 02c9b18..71be1af 100644 --- a/packages/config/src/configs/core.js +++ b/configs/js/src/configs/core.js @@ -19,8 +19,8 @@ const config = { parserOptions: { project: process.env.ESLEGANT_TSCONFIG ?? [ './{ts,js}config{.eslint,}.json', - './packages/*/{ts,js}config{.eslint,}.json', - './apps/*/{ts,js}config{.eslint,}.json', + './*/{ts,js}config{.eslint,}.json', + './*/*/{ts,js}config{.eslint,}.json', ], tsconfigRootDir: process.env.ESLEGANT_ROOT ?? process.cwd(), }, diff --git a/packages/config/src/configs/environments/browser.js b/configs/js/src/configs/environments/browser.js similarity index 100% rename from packages/config/src/configs/environments/browser.js rename to configs/js/src/configs/environments/browser.js diff --git a/packages/config/src/configs/environments/index.js b/configs/js/src/configs/environments/index.js similarity index 100% rename from packages/config/src/configs/environments/index.js rename to configs/js/src/configs/environments/index.js diff --git a/packages/config/src/configs/environments/node.js b/configs/js/src/configs/environments/node.js similarity index 100% rename from packages/config/src/configs/environments/node.js rename to configs/js/src/configs/environments/node.js diff --git a/packages/config/src/configs/formatting.js b/configs/js/src/configs/formatting.js similarity index 100% rename from packages/config/src/configs/formatting.js rename to configs/js/src/configs/formatting.js diff --git a/packages/config/src/configs/index.d.ts b/configs/js/src/configs/index.d.ts similarity index 100% rename from packages/config/src/configs/index.d.ts rename to configs/js/src/configs/index.d.ts diff --git a/packages/config/src/configs/index.js b/configs/js/src/configs/index.js similarity index 100% rename from packages/config/src/configs/index.js rename to configs/js/src/configs/index.js diff --git a/packages/config/src/configs/javascript.js b/configs/js/src/configs/javascript.js similarity index 94% rename from packages/config/src/configs/javascript.js rename to configs/js/src/configs/javascript.js index 8cf5080..3a9c00e 100644 --- a/packages/config/src/configs/javascript.js +++ b/configs/js/src/configs/javascript.js @@ -12,7 +12,7 @@ const recommended = { ...tsESLint.configs['recommended-requiring-type-checking'].rules, ...tsESLint.configs['eslint-recommended'].rules, ...tsESLint.configs.strict.rules, - ...importPlugin.configs['recommended'].rules, + ...importPlugin.configs.recommended.rules, // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access ...jsdocPlugin.configs['recommended-typescript-flavor-error'].rules, }, diff --git a/packages/config/src/configs/naming.js b/configs/js/src/configs/naming.js similarity index 100% rename from packages/config/src/configs/naming.js rename to configs/js/src/configs/naming.js diff --git a/packages/config/src/configs/overrides.js b/configs/js/src/configs/overrides.js similarity index 100% rename from packages/config/src/configs/overrides.js rename to configs/js/src/configs/overrides.js diff --git a/packages/config/src/configs/problems.js b/configs/js/src/configs/problems.js similarity index 100% rename from packages/config/src/configs/problems.js rename to configs/js/src/configs/problems.js diff --git a/packages/config/src/configs/suggestions.js b/configs/js/src/configs/suggestions.js similarity index 100% rename from packages/config/src/configs/suggestions.js rename to configs/js/src/configs/suggestions.js diff --git a/packages/config/src/configs/typescript.js b/configs/js/src/configs/typescript.js similarity index 97% rename from packages/config/src/configs/typescript.js rename to configs/js/src/configs/typescript.js index 06c47ad..c203892 100644 --- a/packages/config/src/configs/typescript.js +++ b/configs/js/src/configs/typescript.js @@ -10,7 +10,7 @@ const recommended = { rules: { // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access ...jsdocPlugin.configs['recommended-typescript-error'].rules, - ...importPlugin.configs['typescript'].rules, + ...importPlugin.configs.typescript.rules, '@typescript-eslint/adjacent-overload-signatures': 'error', '@typescript-eslint/array-type': 'error', diff --git a/packages/config/src/constants.js b/configs/js/src/constants.js similarity index 100% rename from packages/config/src/constants.js rename to configs/js/src/constants.js diff --git a/packages/config/src/index.d.ts b/configs/js/src/index.d.ts similarity index 100% rename from packages/config/src/index.d.ts rename to configs/js/src/index.d.ts diff --git a/packages/config/src/index.js b/configs/js/src/index.js similarity index 100% rename from packages/config/src/index.js rename to configs/js/src/index.js index ff4e80d..1231562 100644 --- a/packages/config/src/index.js +++ b/configs/js/src/index.js @@ -1,2 +1,2 @@ -export { default as configs } from './configs/index.js'; export { default as presets } from './presets/index.js'; +export { default as configs } from './configs/index.js'; diff --git a/packages/config/src/presets/index.d.ts b/configs/js/src/presets/index.d.ts similarity index 100% rename from packages/config/src/presets/index.d.ts rename to configs/js/src/presets/index.d.ts diff --git a/packages/config/src/presets/index.js b/configs/js/src/presets/index.js similarity index 100% rename from packages/config/src/presets/index.js rename to configs/js/src/presets/index.js diff --git a/packages/config/src/presets/recommended.js b/configs/js/src/presets/recommended.js similarity index 61% rename from packages/config/src/presets/recommended.js rename to configs/js/src/presets/recommended.js index 0875c46..f5afa10 100644 --- a/packages/config/src/presets/recommended.js +++ b/configs/js/src/presets/recommended.js @@ -3,7 +3,10 @@ import configs from '../configs/index.js'; /** @type {import('eslint').Linter.FlatConfig[]} */ const recommended = [ configs.core, + // TODO [>=1.0.0]: remove .javascript and .typescript configs + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access configs.javascript.recommended, + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access configs.typescript.recommended, configs.suggestions.recommended, configs.formatting.recommended, diff --git a/packages/config/src/presets/strict.js b/configs/js/src/presets/strict.js similarity index 58% rename from packages/config/src/presets/strict.js rename to configs/js/src/presets/strict.js index 1ca76c8..edce7ac 100644 --- a/packages/config/src/presets/strict.js +++ b/configs/js/src/presets/strict.js @@ -3,7 +3,10 @@ import configs from '../configs/index.js'; /** @type {import('eslint').Linter.FlatConfig[]} */ const strict = [ configs.core, + // TODO [>=1.0.0]: remove .javascript and .typescript configs + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access configs.javascript.strict, + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access configs.typescript.strict, configs.suggestions.strict, configs.formatting.strict, diff --git a/eslint.config.js b/eslint.config.js index 27f8bf0..0f87f6a 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -1,4 +1,4 @@ -import { presets } from '@eslegant/config'; +import { presets } from '@eslegant/js'; export default [ ...presets.strict, diff --git a/package.json b/package.json index 8d7059c..99fa210 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "license": "MIT", "type": "module", "dependencies": { - "@eslegant/config": "workspace:*" + "@eslegant/js": "workspace:*" }, "devDependencies": { "@changesets/cli": "^2.26.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1578887..dfaa9ca 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,9 +8,9 @@ importers: .: dependencies: - '@eslegant/config': + '@eslegant/js': specifier: workspace:* - version: link:packages/config + version: link:configs/js devDependencies: '@changesets/cli': specifier: ^2.26.2 @@ -37,6 +37,52 @@ importers: specifier: ^1.10.12 version: 1.10.12 + configs/js: + dependencies: + '@eslint/eslintrc': + specifier: ^2.1.2 + version: 2.1.2 + '@eslint/js': + specifier: ^8.47.0 + version: 8.47.0 + '@typescript-eslint/eslint-plugin': + specifier: ^6.4.1 + version: 6.4.1(@typescript-eslint/parser@6.4.1)(eslint@8.47.0)(typescript@5.1.6) + '@typescript-eslint/parser': + specifier: ^6.4.1 + version: 6.4.1(eslint@8.47.0)(typescript@5.1.6) + eslint-import-resolver-typescript: + specifier: ^3.6.0 + version: 3.6.0(@typescript-eslint/parser@6.4.1)(eslint-plugin-import@2.28.1)(eslint@8.47.0) + eslint-plugin-i: + specifier: 2.28.0-2 + version: 2.28.0-2(@typescript-eslint/parser@6.4.1)(eslint-import-resolver-typescript@3.6.0)(eslint@8.47.0) + eslint-plugin-jsdoc: + specifier: ^46.5.0 + version: 46.5.0(eslint@8.47.0) + eslint-plugin-perfectionist: + specifier: ^1.5.1 + version: 1.5.1(eslint@8.47.0)(typescript@5.1.6) + eslint-plugin-unicorn: + specifier: ^48.0.1 + version: 48.0.1(eslint@8.47.0) + globals: + specifier: ^13.21.0 + version: 13.21.0 + devDependencies: + '@types/eslint__js': + specifier: ^8.42.0 + version: 8.42.0 + '@types/node': + specifier: ^20.5.3 + version: 20.5.3 + eslint: + specifier: ^8.47.0 + version: 8.47.0 + typescript: + specifier: ^5.1.6 + version: 5.1.6 + fixtures/library: dependencies: '@eslegant/cli': @@ -137,52 +183,6 @@ importers: specifier: ^2.4.4 version: 2.4.4 - packages/config: - dependencies: - '@eslint/eslintrc': - specifier: ^2.1.2 - version: 2.1.2 - '@eslint/js': - specifier: ^8.47.0 - version: 8.47.0 - '@typescript-eslint/eslint-plugin': - specifier: ^6.4.1 - version: 6.4.1(@typescript-eslint/parser@6.4.1)(eslint@8.47.0)(typescript@5.1.6) - '@typescript-eslint/parser': - specifier: ^6.4.1 - version: 6.4.1(eslint@8.47.0)(typescript@5.1.6) - eslint-import-resolver-typescript: - specifier: ^3.6.0 - version: 3.6.0(@typescript-eslint/parser@6.4.1)(eslint-plugin-import@2.28.1)(eslint@8.47.0) - eslint-plugin-i: - specifier: 2.28.0-2 - version: 2.28.0-2(@typescript-eslint/parser@6.4.1)(eslint-import-resolver-typescript@3.6.0)(eslint@8.47.0) - eslint-plugin-jsdoc: - specifier: ^46.5.0 - version: 46.5.0(eslint@8.47.0) - eslint-plugin-perfectionist: - specifier: ^1.5.1 - version: 1.5.1(eslint@8.47.0)(typescript@5.1.6) - eslint-plugin-unicorn: - specifier: ^48.0.1 - version: 48.0.1(eslint@8.47.0) - globals: - specifier: ^13.21.0 - version: 13.21.0 - devDependencies: - '@types/eslint__js': - specifier: ^8.42.0 - version: 8.42.0 - '@types/node': - specifier: ^20.5.3 - version: 20.5.3 - eslint: - specifier: ^8.47.0 - version: 8.47.0 - typescript: - specifier: ^5.1.6 - version: 5.1.6 - packages/create-eslegant: dependencies: '@eslegant/cli': @@ -691,7 +691,7 @@ packages: dependencies: ajv: 6.12.6 debug: 4.3.4 - espree: 9.6.0 + espree: 9.6.1 globals: 13.21.0 ignore: 5.2.4 import-fresh: 3.3.0 @@ -2311,6 +2311,7 @@ packages: acorn: 8.10.0 acorn-jsx: 5.3.2(acorn@8.10.0) eslint-visitor-keys: 3.4.3 + dev: true /espree@9.6.1: resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 432e8aa..c5c5aed 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,3 +1,4 @@ packages: - 'packages/*' - 'fixtures/*' + - 'configs/*'