@lbenie/linting 1.4.0 → 1.5.0

package/README.md

@@ -16,20 +16,24 @@ or
 yarn add -D @lbenie/linting
 ```
 
-Then create a `.eslintrc.js` file at the root of your project and add the following
+Then create a `eslint.config.js` file at the root of your project and add the following
 
 ```js
-module.exports = {
-  extends: [require.resolve('@lbenie/linting/eslint')],
-};
+import rules from '@lbenie/linting/eslint';
+
+export default [
+  ...rules,
+]
 ```
 
-Then create a `.stylelintrc.js` file at the root of your project and add the following
+Then create a `stylelint.config.cjs` file at the root of your project and add the following
 
 ```js
-module.exports = {
-  extends: [require.resolve('@lbenie/linting/stylelint')],
-};
+import rules from '@lbenie/linting/stylelint';
+
+export default [
+  ...rules,
+]
 ```
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->

package/eslint/eslint.config.js

@@ -0,0 +1,159 @@
+import js from '@eslint/js'
+import jsxA11y from 'eslint-plugin-jsx-a11y'
+import globals from 'globals'
+import jsdoc from 'eslint-plugin-jsdoc'
+import tsElint from '@typescript-eslint/eslint-plugin'
+import typescriptParser from '@typescript-eslint/parser'
+import functional from 'eslint-plugin-functional'
+import prettier from 'eslint-plugin-prettier'
+import astroParser from 'astro-eslint-parser'
+import astro from 'eslint-plugin-astro'
+import litA11y from 'eslint-plugin-lit-a11y'
+
+/**
+ * @type {Pick<import('eslint').Linter.FlatConfig, 'parserOptions' | 'ignores' | 'languageOptions'>}
+ */
+const defaultOptions = {
+  ignores: ['node_modules/*'],
+  languageOptions: {
+    sourceType: 'module',
+    globals: {
+      ...globals.browser,
+      ...globals.node,
+    },
+    parserOptions: {
+      ecmaVersion: 'latest',
+      sourceType: 'module',
+      experimentalObjectRestSpread: true,
+      ecmaFeatures: {
+        jsx: true,
+      },
+    },
+  },
+}
+
+/**
+ * @type {import('eslint').Linter.FlatConfig['plugins']}
+ */
+const defaultPlugins = {
+  functional,
+  jsdoc,
+  'jsx-a11y': jsxA11y,
+  '@typescript-eslint': tsElint,
+  prettier,
+  'lit-a11y': litA11y,
+}
+
+/**
+ * @type {import('eslint').Linter.FlatConfig['rules']}
+ */
+const functionalrules = {
+  'functional/prefer-tacit': ['error'],
+  'functional/prefer-readonly-type': ['error'],
+  'functional/readonly-type': ['error', 'keyword'],
+  'functional/prefer-property-signatures': ['error'],
+}
+
+/**
+ * @type {import('eslint').Linter.FlatConfig['rules']}
+ */
+const prettierRules = {
+  'prettier/prettier': [
+    'error',
+    { singleQuote: true, semi: false, trailingComma: 'all' },
+  ],
+}
+
+/**
+ * @type {import('eslint').Linter.FlatConfig['rules']}
+ */
+const tsRules = {
+  '@typescript-eslint/no-unused-vars': 'off',
+  '@typescript-eslint/consistent-type-imports': [
+    'error',
+    { fixStyle: 'inline-type-imports' },
+  ],
+  '@typescript-eslint/prefer-readonly': ['error'],
+  '@typescript-eslint/prefer-readonly-parameter-types': ['error'],
+}
+
+/**
+ * @type {import('eslint').Linter.FlatConfig['rules']}
+ */
+const defaultRules = {
+  ...functionalrules,
+  ...prettierRules,
+  ...jsxA11y.configs.recommended.rules,
+  ...litA11y.configs.recommended.rules,
+}
+
+/**
+ * @type {import('eslint').Linter.FlatConfig[]}
+ */
+const config = [
+  jsdoc.configs['flat/recommended'],
+  {
+    ...defaultOptions,
+    files: ['**/*.js', '**/*.jsx', '**/*.mjs', '**/*.cjs'],
+    rules: {
+      ...js.configs.recommended.rules,
+      ...defaultRules,
+    },
+    plugins: {
+      ...defaultPlugins,
+    },
+  },
+  {
+    ...defaultOptions,
+    files: ['**/*.ts', '**/*.tsx'],
+    rules: {
+      ...defaultRules,
+      ...tsElint.configs.recommended.rules,
+      ...tsElint.configs['recommended-requiring-type-checking'].rules,
+      ...tsRules,
+    },
+    languageOptions: {
+      ...defaultOptions.languageOptions,
+      parser: typescriptParser,
+      parserOptions: {
+        ...defaultOptions.languageOptions.parserOptions,
+        parser: typescriptParser,
+        project: ['./tsconfig.json'],
+      },
+    },
+    plugins: {
+      ...defaultPlugins,
+    },
+  },
+  {
+    ...defaultOptions,
+    files: ['**/*.astro', '**/*.astro/*.js', '*.astro/*.js'],
+    languageOptions: {
+      ...defaultOptions.languageOptions,
+      globals: {
+        ...defaultOptions.languageOptions.globals,
+        'astro/astro': true,
+      },
+      parser: astroParser,
+      parserOptions: {
+        ...defaultOptions.languageOptions.parserOptions,
+        parser: typescriptParser,
+        project: ['./tsconfig.json'],
+      },
+    },
+    rules: {
+      ...defaultRules,
+      ...tsElint.configs.recommended.rules,
+      ...tsElint.configs['recommended-requiring-type-checking'].rules,
+      ...tsRules,
+      ...astro.configs.recommended.rules,
+      'prettier/prettier': 'off',
+    },
+    plugins: {
+      ...defaultPlugins,
+      astro,
+    },
+  },
+]
+
+export default config

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lbenie/linting",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "my opiniated rules",
   "repository": {
     "url": "https://github.com/lbenie/linting"
@@ -10,7 +10,7 @@
     "stylelint",
     "linting"
   ],
-  "type": "commonjs",
+  "type": "module",
   "license": "MIT",
   "private": false,
   "files": [
@@ -32,6 +32,7 @@
     "access": "public"
   },
   "devDependencies": {
+    "@eslint/js": "8.54.0",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/commit-analyzer": "11.1.0",
     "@semantic-release/git": "10.0.1",
@@ -41,6 +42,7 @@
     "@types/react": "18.2.38",
     "@types/semantic-release": "20.0.6",
     "all-contributors-cli": "6.26.1",
+    "astro": "3.6.0",
     "concurrently": "8.2.2",
     "conventional-changelog-conventionalcommits": "7.0.2",
     "lit": "3.1.0",
@@ -53,11 +55,13 @@
     "@typescript-eslint/eslint-plugin": "6.12.0",
     "@typescript-eslint/parser": "6.12.0",
     "eslint": "8.54.0",
-    "eslint-plugin-astro": "^0.29.0",
+    "eslint-plugin-astro": "0.29.0",
     "eslint-plugin-functional": "6.0.0",
+    "eslint-plugin-jsdoc": "46.9.0",
     "eslint-plugin-jsx-a11y": "6.8.0",
     "eslint-plugin-lit-a11y": "4.1.1",
     "eslint-plugin-prettier": "5.0.1",
+    "globals": "13.23.0",
     "postcss": "8.4.31",
     "postcss-scss": "4.0.9",
     "postcss-styl": "0.12.3",

package/stylelint/{.stylelintrc.js → stylelint.config.cjs}

@@ -2,9 +2,7 @@
  * @type {import('stylelint').Config}
  */
 module.exports = {
-  extends: [
-    'stylelint-order',
-  ],
+  extends: ['stylelint-order'],
   plugins: ['stylelint-stylus', 'stylelint-order'],
   overrides: [
     {

package/eslint/.eslintrc.js

@@ -1,102 +0,0 @@
-/**
- * @type {import('eslint').Linter.Config['rules']}
- */
-const tsRules = {
-  '@typescript-eslint/no-unused-vars': 'off',
-  '@typescript-eslint/consistent-type-imports': ['error', { fixStyle: 'inline-type-imports'}],
-  '@typescript-eslint/prefer-readonly': ['error'],
-  '@typescript-eslint/prefer-readonly-parameter-types': ['error'],
-}
-
-/**
- * @type {import('eslint').Linter.Config['rules']}
- */
-const functionalrules = {
-  'functional/prefer-tacit': ['error'],
-  'functional/prefer-readonly-type': ['error'],
-  'functional/readonly-type': ['error', 'keyword'],
-  'functional/prefer-property-signatures': ['error'],
-}
-
-/**
- * @type {import('eslint').Linter.Config['rules']}
- */
-const prettierRules = {
-  'prettier/prettier': [
-    'error',
-    { singleQuote: true, semi: false, trailingComma: 'all' },
-  ]
-}
-
-/**
- * @type {import('eslint').Linter.Config['extends']}
- */
-const a11yExtends = [
-  'plugin:jsx-a11y/recommended',
-  'plugin:lit-a11y/recommended',
-]
-
-/**
- * @type {import('eslint').Linter.Config}
- */
-module.exports = {
-  root: true,
-  extends: [
-    'eslint:recommended',
-  ],
-  plugins: ['prettier', '@typescript-eslint', 'functional', 'jsx-a11y', 'lit-a11y'],
-  env: {
-    node: true,
-    es6: true,
-  },
-  parserOptions: {
-    ecmaVersion: 'latest',
-    sourceType: 'module',
-    experimentalObjectRestSpread: true,
-  },
-  overrides: [
-    {
-      files: ['*.ts', '*.tsx', '*.mjs', '*.cjs'],
-      extends: [
-        'plugin:@typescript-eslint/recommended',
-        'plugin:@typescript-eslint/recommended-requiring-type-checking',
-        ...a11yExtends,
-      ],
-      parserOptions: {
-        parser: '@typescript-eslint/parser',
-        project: ['./tsconfig.json'],
-        ecmaFeatures: {
-          jsx: true,
-        }
-      },
-      parser: '@typescript-eslint/parser',
-      rules: {
-        ...prettierRules,
-        ...tsRules,
-        ...functionalrules
-      },
-      env: {
-        browser: true,
-      },
-    },
-    {
-      files: ['*.astro'],
-      parser: 'astro-eslint-parser',
-      extends: [
-        ...a11yExtends,
-        'plugin:astro/recommended'
-      ],
-      parserOptions: {
-        project: ['./tsconfig.json'],
-        extraFileExtensions: ['.astro'],
-      },
-      rules: {
-        ...tsRules,
-        ...functionalrules
-      },
-      env: {
-        browser: true,
-      },
-    },
-  ],
-}