@st1ggy/linter-config 1.0.67 → 1.0.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@st1ggy/linter-config",
-  "version": "1.0.67",
+  "version": "1.0.68",
   "description": "ESLint, Stylelint and Prettier configs for React, Vue [WIP] and Svelte [WIP]",
   "private": false,
   "main": "index.js",

package/src/eslint/eslint.config.common.js

@@ -1,7 +1,7 @@
-import commonRules from './rules/rules.common.js'
-import importRules from './rules/rules.import.js'
-import prettierRules from './rules/rules.prettier.js'
-import sonarjsRules from './rules/rules.sonarjs.js'
-import unicornRules from './rules/rules.unicorn.js'
+import commonConfig from './rules/rules.common.js'
+import importConfig from './rules/rules.import.js'
+import prettierConfig from './rules/rules.prettier.js'
+import sonarjsConfig from './rules/rules.sonarjs.js'
+import unicornConfig from './rules/rules.unicorn.js'
 
-export default [...prettierRules, ...commonRules, ...importRules, ...unicornRules, ...sonarjsRules]
+export default [...prettierConfig, ...commonConfig, ...importConfig, ...unicornConfig, ...sonarjsConfig]

package/src/eslint/eslint.config.next.js

@@ -1,17 +1,4 @@
-import nextPlugin from '@next/eslint-plugin-next'
+import nextConfig from './eslint.config.next.js'
+import reactConfig from './eslint.config.react.js'
 
-import react from './eslint.config.react.js'
-
-export default [
-  ...react,
-  {
-    files: ['**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx'],
-    plugins: {
-      '@next/next': nextPlugin,
-    },
-    rules: {
-      ...nextPlugin.configs.recommended.rules,
-      ...nextPlugin.configs['core-web-vitals'].rules,
-    },
-  },
-]
+export default [...reactConfig, ...nextConfig]

package/src/eslint/eslint.config.react.js

@@ -1,4 +1,4 @@
-import typescript from './eslint.config.typescript.js'
-import reactRules from './rules/rules.react.js'
+import typescriptConfig from './eslint.config.typescript.js'
+import reactConfig from './rules/rules.react.js'
 
-export default [...typescript, ...reactRules]
+export default [...typescriptConfig, ...reactConfig]

package/src/eslint/eslint.config.typescript.js

@@ -1,11 +1,11 @@
 import tseslint from 'typescript-eslint'
 
-import common from './eslint.config.common.js'
-import typescriptRules from './rules/rules.typescript.js'
+import commonConfig from './eslint.config.common.js'
+import typescriptConfig from './rules/rules.typescript.js'
 
 export default tseslint.config(
-  ...common,
+  ...commonConfig,
   ...tseslint.configs.recommended,
   ...tseslint.configs.stylistic,
-  ...typescriptRules,
+  ...typescriptConfig,
 )

package/src/eslint/rules/rules.common.js

@@ -1,7 +1,11 @@
 import eslint from '@eslint/js'
+import tseslint from 'typescript-eslint'
 
-export default [
-  eslint.configs.recommended,
+export default tseslint.config(
+  {
+    files: ['**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx'],
+    extends: eslint.configs.recommended,
+  },
   {
     files: ['**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx'],
     rules: {
@@ -85,4 +89,4 @@ export default [
       ],
     },
   },
-]
+)

package/src/eslint/rules/rules.next.js

@@ -0,0 +1,14 @@
+import nextPlugin from '@next/eslint-plugin-next'
+
+export default [
+  {
+    files: ['**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx'],
+    plugins: {
+      '@next/next': nextPlugin,
+    },
+    rules: {
+      ...nextPlugin.configs.recommended.rules,
+      ...nextPlugin.configs['core-web-vitals'].rules,
+    },
+  },
+]

package/src/eslint/rules/rules.prettier.js

@@ -1,11 +1,15 @@
 import prettierConfig from 'eslint-config-prettier'
 import prettierPlugin from 'eslint-plugin-prettier'
+import tseslint from 'typescript-eslint'
 
-export default [
-  prettierConfig,
+export default tseslint.config(
+  {
+    files: ['**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx'],
+    extends: prettierConfig,
+  },
   {
     files: ['**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx'],
     plugins: { prettier: prettierPlugin },
     rules: { 'prettier/prettier': 'error' },
   },
-]
+)

package/src/eslint/rules/rules.react.js

@@ -1,10 +1,17 @@
 import reactJsxRuntime from 'eslint-plugin-react/configs/jsx-runtime.js'
 import reactRecommended from 'eslint-plugin-react/configs/recommended.js'
 import reactHooksPlugin from 'eslint-plugin-react-hooks'
+import tseslint from 'typescript-eslint'
 
-export default [
-  reactRecommended,
-  reactJsxRuntime,
+export default tseslint.config(
+  {
+    files: ['**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx'],
+    extends: reactRecommended,
+  },
+  {
+    files: ['**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx'],
+    extends: reactJsxRuntime,
+  },
   {
     files: ['**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx'],
     plugins: { 'react-hooks': reactHooksPlugin },
@@ -50,4 +57,4 @@ export default [
       ...reactHooksPlugin.configs.recommended.rules,
     },
   },
-]
+)

package/src/eslint/rules/rules.sonarjs.js

@@ -1,3 +1,7 @@
 import sonarjs from 'eslint-plugin-sonarjs'
+import tseslint from 'typescript-eslint'
 
-export default [sonarjs.configs.recommended]
+export default tseslint.config({
+  files: ['**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx'],
+  extends: sonarjs.configs.recommended,
+})

package/src/eslint/rules/rules.unicorn.js

@@ -1,7 +1,11 @@
 import unicornPlugin from 'eslint-plugin-unicorn'
+import tseslint from 'typescript-eslint'
 
-export default [
-  unicornPlugin.configs['flat/recommended'],
+export default tseslint.config(
+  {
+    files: ['**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx'],
+    extends: unicornPlugin.configs['flat/recommended'],
+  },
   {
     files: ['**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx'],
     rules: {
@@ -23,4 +27,4 @@ export default [
       ],
     },
   },
-]
+)