@so1ve/eslint-config 1.2.0 → 1.4.0

package/dist/index.cjs

@@ -7,8 +7,7 @@ var pluginHtml = require('@html-eslint/eslint-plugin');
 var parserHtml = require('@html-eslint/parser');
 var pluginSo1ve = require('@so1ve/eslint-plugin');
 var pluginSortImports = require('@so1ve/eslint-plugin-sort-imports');
-var pluginTs = require('@typescript-eslint/eslint-plugin');
-var parserTs = require('@typescript-eslint/parser');
+var pluginStylistic = require('@stylistic/eslint-plugin');
 var eslintMdx = require('eslint-mdx');
 var pluginArrayFunc = require('eslint-plugin-array-func');
 var pluginEtc = require('eslint-plugin-etc');
@@ -36,6 +35,7 @@ var parserToml = require('toml-eslint-parser');
 var parserVue = require('vue-eslint-parser');
 var parserYaml = require('yaml-eslint-parser');
 var globals = require('globals');
+var tseslint = require('typescript-eslint');
 var fs = require('node:fs');
 var gitignore = require('eslint-config-flat-gitignore');
 var localPkg = require('local-pkg');
@@ -65,8 +65,7 @@ var pluginHtml__default = /*#__PURE__*/_interopDefaultLegacy(pluginHtml);
 var parserHtml__default = /*#__PURE__*/_interopDefaultLegacy(parserHtml);
 var pluginSo1ve__default = /*#__PURE__*/_interopDefaultLegacy(pluginSo1ve);
 var pluginSortImports__default = /*#__PURE__*/_interopDefaultLegacy(pluginSortImports);
-var pluginTs__default = /*#__PURE__*/_interopDefaultLegacy(pluginTs);
-var parserTs__default = /*#__PURE__*/_interopDefaultLegacy(parserTs);
+var pluginStylistic__default = /*#__PURE__*/_interopDefaultLegacy(pluginStylistic);
 var eslintMdx__default = /*#__PURE__*/_interopDefaultLegacy(eslintMdx);
 var pluginArrayFunc__default = /*#__PURE__*/_interopDefaultLegacy(pluginArrayFunc);
 var pluginEtc__default = /*#__PURE__*/_interopDefaultLegacy(pluginEtc);
@@ -94,6 +93,7 @@ var parserToml__default = /*#__PURE__*/_interopDefaultLegacy(parserToml);
 var parserVue__default = /*#__PURE__*/_interopDefaultLegacy(parserVue);
 var parserYaml__default = /*#__PURE__*/_interopDefaultLegacy(parserYaml);
 var globals__default = /*#__PURE__*/_interopDefaultLegacy(globals);
+var tseslint__default = /*#__PURE__*/_interopDefaultLegacy(tseslint);
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var gitignore__default = /*#__PURE__*/_interopDefaultLegacy(gitignore);
 
@@ -193,6 +193,11 @@ const GLOB_EXCLUDE = [
 const formatting = (options) => {
   var _a, _b;
   return [
+    {
+      plugins: {
+        style: pluginStylistic__default["default"]
+      }
+    },
     {
       rules: {
         "so1ve/no-useless-template-string": "error",
@@ -200,8 +205,8 @@ const formatting = (options) => {
         "so1ve/no-import-promises-as": "error",
         "so1ve/pad-after-last-import": "error",
         "so1ve/function-style": "error",
-        "quote-props": ["error", "consistent-as-needed"],
-        "padding-line-between-statements": [
+        "style/quote-props": ["error", "consistent-as-needed"],
+        "style/padding-line-between-statements": [
           "error",
           { blankLine: "always", prev: "*", next: "return" }
         ]
@@ -1058,14 +1063,14 @@ function typescript({
       // Install the plugins without globs, so they can be configured separately.
       plugins: {
         import: pluginImport__default["default"],
-        ts: pluginTs__default["default"],
+        ts: tseslint__default["default"].plugin,
         etc: pluginEtc__default["default"]
       }
     },
     {
       files: [GLOB_TS, GLOB_TSX, ...componentExts.map((ext) => `**/*.${ext}`)],
       languageOptions: {
-        parser: parserTs__default["default"],
+        parser: tseslint__default["default"].parser,
         parserOptions: {
           sourceType: "module",
           extraFileExtensions: componentExts.map((ext) => `.${ext}`),
@@ -1082,12 +1087,12 @@ function typescript({
       },
       rules: {
         ...renameRules(
-          pluginTs__default["default"].configs["eslint-recommended"].overrides[0].rules,
+          tseslint__default["default"].configs.eslintRecommended.rules,
           "@typescript-eslint/",
           "ts/"
         ),
         ...renameRules(
-          pluginTs__default["default"].configs.recommended.rules,
+          tseslint__default["default"].configs.recommended.map((config) => config.rules).filter(Boolean).reduce((a, b) => ({ ...a, ...b }), {}),
           "@typescript-eslint/",
           "ts/"
         ),
@@ -1159,6 +1164,9 @@ function typescript({
         "ts/consistent-type-definitions": ["error", "interface"],
         "ts/consistent-indexed-object-style": ["error", "record"],
         "ts/prefer-ts-expect-error": "error",
+        "ts/prefer-for-of": "error",
+        "ts/no-duplicate-enum-values": "error",
+        "ts/no-non-null-asserted-nullish-coalescing": "error",
         "ts/no-require-imports": "error",
         "ts/method-signature-style": ["error", "property"],
         "ts/explicit-member-accessibility": [
@@ -1208,9 +1216,6 @@ function typescript({
         "ts/no-non-null-assertion": "off",
         "ts/explicit-module-boundary-types": "off",
         "ts/triple-slash-reference": "off",
-        "ts/prefer-for-of": "error",
-        "ts/no-duplicate-enum-values": "error",
-        "ts/no-non-null-asserted-nullish-coalescing": "error",
         // handled by unused-imports/no-unused-imports
         "ts/no-unused-vars": "off",
         ...overrides
@@ -1220,7 +1225,7 @@ function typescript({
       files: [GLOB_TS, GLOB_TSX, ...componentExts.map((ext) => `**/*.${ext}`)],
       ignores: [GLOB_MARKDOWN_CODE],
       languageOptions: {
-        parser: parserTs__default["default"],
+        parser: tseslint__default["default"].parser,
         parserOptions: {
           sourceType: "module",
           // EXPERIMENTAL_useProjectService: true,
@@ -1329,7 +1334,7 @@ const vue = ({
           jsx: true
         },
         extraFileExtensions: [".vue"],
-        parser: typescript ? parserTs__default["default"] : null,
+        parser: typescript ? tseslint__default["default"].parser : null,
         sourceType: "module"
       }
     },
@@ -1341,7 +1346,7 @@ const vue = ({
       ...pluginVue__default["default"].configs["vue3-recommended"].rules,
       "no-unused-vars": "off",
       "no-undef": "off",
-      "@typescript-eslint/no-unused-vars": "off",
+      "ts/no-unused-vars": "off",
       "vue/no-v-html": "off",
       "vue/require-prop-types": "off",
       "vue/require-default-prop": "off",
@@ -1674,13 +1679,9 @@ Object.defineProperty(exports, 'pluginSortImports', {
 	enumerable: true,
 	get: function () { return pluginSortImports__default["default"]; }
 });
-Object.defineProperty(exports, 'pluginTs', {
-	enumerable: true,
-	get: function () { return pluginTs__default["default"]; }
-});
-Object.defineProperty(exports, 'parserTs', {
+Object.defineProperty(exports, 'pluginStylistic', {
 	enumerable: true,
-	get: function () { return parserTs__default["default"]; }
+	get: function () { return pluginStylistic__default["default"]; }
 });
 Object.defineProperty(exports, 'parserMdx', {
 	enumerable: true,

package/dist/index.d.ts

@@ -1,14 +1,13 @@
 import so1vePlugin from '@so1ve/eslint-plugin';
 export { default as pluginSo1ve } from '@so1ve/eslint-plugin';
 import { ParserOptions } from '@typescript-eslint/parser';
-export { default as parserTs } from '@typescript-eslint/parser';
 import { FlatGitignoreOptions } from 'eslint-config-flat-gitignore';
 import { Rules, FlatESLintConfigItem } from 'eslint-define-config';
 export { default as pluginComments } from '@eslint-community/eslint-plugin-eslint-comments';
 export { default as pluginHtml } from '@html-eslint/eslint-plugin';
 export { default as parserHtml } from '@html-eslint/parser';
 export { default as pluginSortImports } from '@so1ve/eslint-plugin-sort-imports';
-export { default as pluginTs } from '@typescript-eslint/eslint-plugin';
+export { default as pluginStylistic } from '@stylistic/eslint-plugin';
 export { default as parserMdx } from 'eslint-mdx';
 export { default as pluginArrayFunc } from 'eslint-plugin-array-func';
 export { default as pluginEtc } from 'eslint-plugin-etc';

package/dist/index.mjs

@@ -8,10 +8,8 @@ import pluginSo1ve from '@so1ve/eslint-plugin';
 export { default as pluginSo1ve } from '@so1ve/eslint-plugin';
 import pluginSortImports from '@so1ve/eslint-plugin-sort-imports';
 export { default as pluginSortImports } from '@so1ve/eslint-plugin-sort-imports';
-import pluginTs from '@typescript-eslint/eslint-plugin';
-export { default as pluginTs } from '@typescript-eslint/eslint-plugin';
-import parserTs from '@typescript-eslint/parser';
-export { default as parserTs } from '@typescript-eslint/parser';
+import pluginStylistic from '@stylistic/eslint-plugin';
+export { default as pluginStylistic } from '@stylistic/eslint-plugin';
 export { default as parserMdx } from 'eslint-mdx';
 import pluginArrayFunc from 'eslint-plugin-array-func';
 export { default as pluginArrayFunc } from 'eslint-plugin-array-func';
@@ -64,6 +62,7 @@ export { default as parserVue } from 'vue-eslint-parser';
 import parserYaml from 'yaml-eslint-parser';
 export { default as parserYaml } from 'yaml-eslint-parser';
 import globals from 'globals';
+import tseslint from 'typescript-eslint';
 import fs from 'node:fs';
 import gitignore from 'eslint-config-flat-gitignore';
 import { isPackageExists } from 'local-pkg';
@@ -164,6 +163,11 @@ const GLOB_EXCLUDE = [
 const formatting = (options) => {
   var _a, _b;
   return [
+    {
+      plugins: {
+        style: pluginStylistic
+      }
+    },
     {
       rules: {
         "so1ve/no-useless-template-string": "error",
@@ -171,8 +175,8 @@ const formatting = (options) => {
         "so1ve/no-import-promises-as": "error",
         "so1ve/pad-after-last-import": "error",
         "so1ve/function-style": "error",
-        "quote-props": ["error", "consistent-as-needed"],
-        "padding-line-between-statements": [
+        "style/quote-props": ["error", "consistent-as-needed"],
+        "style/padding-line-between-statements": [
           "error",
           { blankLine: "always", prev: "*", next: "return" }
         ]
@@ -1029,14 +1033,14 @@ function typescript({
       // Install the plugins without globs, so they can be configured separately.
       plugins: {
         import: pluginImport,
-        ts: pluginTs,
+        ts: tseslint.plugin,
         etc: pluginEtc
       }
     },
     {
       files: [GLOB_TS, GLOB_TSX, ...componentExts.map((ext) => `**/*.${ext}`)],
       languageOptions: {
-        parser: parserTs,
+        parser: tseslint.parser,
         parserOptions: {
           sourceType: "module",
           extraFileExtensions: componentExts.map((ext) => `.${ext}`),
@@ -1053,12 +1057,12 @@ function typescript({
       },
       rules: {
         ...renameRules(
-          pluginTs.configs["eslint-recommended"].overrides[0].rules,
+          tseslint.configs.eslintRecommended.rules,
           "@typescript-eslint/",
           "ts/"
         ),
         ...renameRules(
-          pluginTs.configs.recommended.rules,
+          tseslint.configs.recommended.map((config) => config.rules).filter(Boolean).reduce((a, b) => ({ ...a, ...b }), {}),
           "@typescript-eslint/",
           "ts/"
         ),
@@ -1130,6 +1134,9 @@ function typescript({
         "ts/consistent-type-definitions": ["error", "interface"],
         "ts/consistent-indexed-object-style": ["error", "record"],
         "ts/prefer-ts-expect-error": "error",
+        "ts/prefer-for-of": "error",
+        "ts/no-duplicate-enum-values": "error",
+        "ts/no-non-null-asserted-nullish-coalescing": "error",
         "ts/no-require-imports": "error",
         "ts/method-signature-style": ["error", "property"],
         "ts/explicit-member-accessibility": [
@@ -1179,9 +1186,6 @@ function typescript({
         "ts/no-non-null-assertion": "off",
         "ts/explicit-module-boundary-types": "off",
         "ts/triple-slash-reference": "off",
-        "ts/prefer-for-of": "error",
-        "ts/no-duplicate-enum-values": "error",
-        "ts/no-non-null-asserted-nullish-coalescing": "error",
         // handled by unused-imports/no-unused-imports
         "ts/no-unused-vars": "off",
         ...overrides
@@ -1191,7 +1195,7 @@ function typescript({
       files: [GLOB_TS, GLOB_TSX, ...componentExts.map((ext) => `**/*.${ext}`)],
       ignores: [GLOB_MARKDOWN_CODE],
       languageOptions: {
-        parser: parserTs,
+        parser: tseslint.parser,
         parserOptions: {
           sourceType: "module",
           // EXPERIMENTAL_useProjectService: true,
@@ -1300,7 +1304,7 @@ const vue = ({
           jsx: true
         },
         extraFileExtensions: [".vue"],
-        parser: typescript ? parserTs : null,
+        parser: typescript ? tseslint.parser : null,
         sourceType: "module"
       }
     },
@@ -1312,7 +1316,7 @@ const vue = ({
       ...pluginVue.configs["vue3-recommended"].rules,
       "no-unused-vars": "off",
       "no-undef": "off",
-      "@typescript-eslint/no-unused-vars": "off",
+      "ts/no-unused-vars": "off",
       "vue/no-v-html": "off",
       "vue/require-prop-types": "off",
       "vue/require-default-prop": "off",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@so1ve/eslint-config",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "author": "Ray <i@mk1.io> (https://github.com/so1ve/)",
   "description": "Ray's eslint config.",
   "keywords": [
@@ -35,8 +35,7 @@
     "@eslint-community/eslint-plugin-eslint-comments": "^4.0.0",
     "@html-eslint/eslint-plugin": "^0.19.1",
     "@html-eslint/parser": "^0.19.1",
-    "@typescript-eslint/eslint-plugin": "^6.2.0",
-    "@typescript-eslint/parser": "^6.2.0",
+    "@stylistic/eslint-plugin": "^1.6.0",
     "@unocss/eslint-config": "^0.55.0",
     "eslint-config-flat-gitignore": "^0.1.0",
     "eslint-define-config": "^1.21.0",
@@ -69,12 +68,14 @@
     "jsonc-eslint-parser": "^2.3.0",
     "local-pkg": "^0.5.0",
     "toml-eslint-parser": "^0.6.0",
+    "typescript-eslint": "^7.0.1",
     "vue-eslint-parser": "^9.3.1",
     "yaml-eslint-parser": "^1.2.2",
-    "@so1ve/eslint-plugin": "1.2.0",
-    "@so1ve/eslint-plugin-sort-imports": "1.2.0"
+    "@so1ve/eslint-plugin": "1.4.0",
+    "@so1ve/eslint-plugin-sort-imports": "1.4.0"
   },
   "devDependencies": {
+    "@typescript-eslint/utils": "^6.2.0",
     "eslint": "^8.46.0"
   },
   "peerDependencies": {