@digigov/cli-lint 2.0.0-rc.24 → 2.0.0-rc.25

package/.rush/temp/chunked-rush-logs/cli-lint.lint.chunks.jsonl

@@ -1 +1 @@
-{"kind":"O","text":"Invoking: eslint --ext .js . \n"}
+{"kind":"O","text":"Invoking: eslint \n"}

package/.rush/temp/package-deps_lint.json

@@ -1,16 +1,15 @@
 {
   "files": {
-    "tooling/cli-lint/.eslintrc.cjs": "5e8d1b67d3736e5c696abf5e05f0b28550860532",
     "tooling/cli-lint/CHANGELOG.json": "c09f3851df6b0406e9c5369e282407884ea0e78d",
     "tooling/cli-lint/CHANGELOG.md": "90e33c71e8b157a9cd4e04465f053e7f600f3a17",
     "tooling/cli-lint/eslint.common.cjs": "812018682f5a3a58179847a07741c05171d523af",
-    "tooling/cli-lint/eslint.config.cjs": "634a76a1b79f8c7b53cb2c1898c64630eec5d6c5",
+    "tooling/cli-lint/eslint.config.js": "1f29bd6e21d281148b1f9e466795f6d5b7bbb51b",
     "tooling/cli-lint/eslintrc.cjs": "98055ea47afbb00a32b185dbd22d6400f039ce85",
-    "tooling/cli-lint/index.js": "3cc076339446133932867243f35266ba1a5332ad",
-    "tooling/cli-lint/package.json": "4fbc714de1e66d8ccadb084191e0fe6f0ddf8e19",
+    "tooling/cli-lint/index.js": "e864b84969bc7c90b0e87e1aba6225266875c667",
+    "tooling/cli-lint/package.json": "906bc217ccb024366f45e55e0206c5c6c2045675",
     "tooling/cli-lint/prettier.config.cjs": "7796b248642ee21b308769f8fcce91f7244d7d82",
     "tooling/cli-lint/prettierrc.cjs": "35450ff283e2bc5288fe93a4d233d6c6ccfab939",
-    "tooling/cli-lint/.rush/temp/shrinkwrap-deps.json": "1be0b032044fcbb062cb7a9ea7a13877d28e7bba"
+    "tooling/cli-lint/.rush/temp/shrinkwrap-deps.json": "e7e94f88709e266f472f360562294e1ad0d72a19"
   },
-  "arguments": "eslint --ext .js . "
+  "arguments": "eslint "
 }

package/.rush/temp/shrinkwrap-deps.json

@@ -1,23 +1,22 @@
 {
-  "../../tooling/cli-lint": "../../tooling/cli-lint:cy3nEVIy8qFekXJOPYJsix+a/IMyeyVmow3qjmPxCOM=:",
-  "/@babel/eslint-parser@7.19.1(@babel/core@7.26.0)(eslint@8.56.0)": "Missing shrinkwrap entry!",
-  "/@rushstack/eslint-patch@1.7.2": "Missing shrinkwrap entry!",
-  "/@typescript-eslint/eslint-plugin@6.19.1(@typescript-eslint/parser@6.19.1(eslint@8.56.0)(typescript@5.6.2))(eslint@8.56.0)(typescript@5.6.2)": "Missing shrinkwrap entry!",
-  "/@typescript-eslint/parser@6.19.1(eslint@8.56.0)(typescript@5.6.2)": "Missing shrinkwrap entry!",
-  "/eslint-config-prettier@9.1.0(eslint@8.56.0)": "Missing shrinkwrap entry!",
-  "/eslint-import-resolver-babel-module@5.3.2(@babel/core@7.26.0)(babel-plugin-module-resolver@4.0.0)": "Missing shrinkwrap entry!",
-  "/eslint-plugin-css-modules@2.12.0(eslint@8.56.0)": "Missing shrinkwrap entry!",
-  "/eslint-plugin-enzyme@0.2.0(eslint@8.56.0)": "Missing shrinkwrap entry!",
-  "/eslint-plugin-import@2.29.1(eslint@8.56.0)": "Missing shrinkwrap entry!",
-  "/eslint-plugin-jest@27.6.3(@typescript-eslint/eslint-plugin@6.19.1(@typescript-eslint/parser@6.19.1(eslint@8.56.0)(typescript@5.6.2))(eslint@8.56.0)(typescript@5.6.2))(eslint@8.56.0)(jest@29.0.2(babel-plugin-macros@3.1.0)(node-notifier@8.0.2))(typescript@5.6.2)": "Missing shrinkwrap entry!",
-  "/eslint-plugin-json@3.1.0": "Missing shrinkwrap entry!",
-  "/eslint-plugin-mdx@2.3.4(eslint@8.56.0)": "Missing shrinkwrap entry!",
-  "/eslint-plugin-prettier@5.1.3(@types/eslint@9.6.1)(eslint-config-prettier@9.1.0(eslint@8.56.0))(eslint@8.56.0)(prettier@3.2.5)": "Missing shrinkwrap entry!",
-  "/eslint-plugin-promise@6.1.1(eslint@8.56.0)": "Missing shrinkwrap entry!",
-  "/eslint-plugin-react-hooks@4.6.0(eslint@8.56.0)": "Missing shrinkwrap entry!",
-  "/eslint-plugin-react@7.33.2(eslint@8.56.0)": "Missing shrinkwrap entry!",
-  "/eslint@8.56.0": "Missing shrinkwrap entry!",
-  "/prettier@3.2.5": "Missing shrinkwrap entry!",
+  "../../tooling/cli-lint": "../../tooling/cli-lint:RAjxV3oKBQjVS/PmzgnDbAfLHyGhIAmYDzEIJz6vneI=:",
+  "/@eslint/compat@1.2.4(eslint@9.16.0(jiti@1.21.6))": "Missing shrinkwrap entry!",
+  "/@eslint/js@9.16.0": "Missing shrinkwrap entry!",
+  "/@rushstack/eslint-patch@1.10.4": "Missing shrinkwrap entry!",
+  "/@vitest/eslint-plugin@1.1.19(@typescript-eslint/utils@8.18.1(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.2)(vitest@2.1.3(@types/node@22.7.5)(happy-dom@15.11.0)(jsdom@20.0.3)(lightningcss@1.22.0)(sass-embedded@1.81.0)(terser@5.33.0))": "Missing shrinkwrap entry!",
+  "/eslint-config-prettier@9.1.0(eslint@9.16.0(jiti@1.21.6))": "Missing shrinkwrap entry!",
+  "/eslint-import-resolver-typescript@3.7.0(eslint-plugin-import-x@4.5.1(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.2))(eslint-plugin-import@2.29.1(eslint@9.16.0(jiti@1.21.6)))(eslint@9.16.0(jiti@1.21.6))": "Missing shrinkwrap entry!",
+  "/eslint-plugin-css-modules@2.12.0(eslint@9.16.0(jiti@1.21.6))": "Missing shrinkwrap entry!",
+  "/eslint-plugin-import-x@4.5.1(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.2)": "Missing shrinkwrap entry!",
+  "/eslint-plugin-json@4.0.1": "Missing shrinkwrap entry!",
+  "/eslint-plugin-prettier@5.2.1(@types/eslint@9.6.1)(eslint-config-prettier@9.1.0(eslint@9.16.0(jiti@1.21.6)))(eslint@9.16.0(jiti@1.21.6))(prettier@3.4.2)": "Missing shrinkwrap entry!",
+  "/eslint-plugin-promise@7.2.1(eslint@9.16.0(jiti@1.21.6))": "Missing shrinkwrap entry!",
+  "/eslint-plugin-react-hooks@5.0.0(eslint@9.16.0(jiti@1.21.6))": "Missing shrinkwrap entry!",
+  "/eslint-plugin-react@7.37.2(eslint@9.16.0(jiti@1.21.6))": "Missing shrinkwrap entry!",
+  "/eslint@9.16.0(jiti@1.21.6)": "Missing shrinkwrap entry!",
+  "/globals@15.13.0": "Missing shrinkwrap entry!",
+  "/prettier@3.4.2": "Missing shrinkwrap entry!",
   "/publint@0.1.8": "Missing shrinkwrap entry!",
+  "/typescript-eslint@8.17.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.2)": "Missing shrinkwrap entry!",
   "/typescript@5.6.2": "Missing shrinkwrap entry!"
 }

package/eslint.config.js

@@ -0,0 +1,192 @@
+import { resolveProject } from '@digigov/cli/lib';
+
+import { includeIgnoreFile } from '@eslint/compat';
+import js from '@eslint/js';
+import pluginPromise from 'eslint-plugin-promise';
+
+import json from 'eslint-plugin-json';
+
+import ts from 'typescript-eslint';
+
+import globals from 'globals';
+import react from 'eslint-plugin-react';
+import reactHooks from 'eslint-plugin-react-hooks';
+
+import vitest from '@vitest/eslint-plugin';
+
+import importPlugin from 'eslint-plugin-import-x';
+import * as tsResolver from 'eslint-import-resolver-typescript';
+import digigovEslintPlugin from 'eslint-plugin-digigov';
+
+import prettier from 'eslint-plugin-prettier/recommended';
+
+const project = resolveProject();
+
+// base
+let config = [
+  includeIgnoreFile(project.ignore),
+  js.configs.recommended,
+  pluginPromise.configs['flat/recommended'],
+  {
+    ...json.configs.recommended,
+    name: '@digigov/json',
+    files: ['**/*.json'],
+  },
+  {
+    files: ['**/*.{js,mjs,cjs,ts,mts,cts}'],
+    languageOptions: {
+      globals: {
+        ...globals.node,
+        ...globals.jest,
+      },
+    },
+    rules: {
+      'promise/catch-or-return': [
+        'error',
+        {
+          allowFinally: true,
+        },
+      ],
+    },
+  },
+];
+
+// typescript
+if (project.isTs) {
+  config.push(ts.configs.recommended, ts.configs.stylistic, {
+    rules: {
+      '@typescript-eslint/no-explicit-any': 'warn',
+      '@typescript-eslint/no-empty-interface': 'off',
+      '@typescript-eslint/no-empty-object-type': 'off',
+      '@typescript-eslint/no-var-requires': 'off',
+      '@typescript-eslint/no-require-imports': 'off',
+      '@typescript-eslint/ban-ts-comment': 'warn',
+      '@typescript-eslint/no-empty-function': 'off',
+    },
+  });
+
+  // import
+  config.push({
+    name: '@digigov/import-plugin',
+    files: ['**/*.{mts,ts,tsx}'],
+    plugins: {
+      'import-x': importPlugin,
+      digigov: digigovEslintPlugin,
+    },
+    languageOptions: {
+      parser: ts.parser,
+      ecmaVersion: 'latest',
+      sourceType: 'module',
+      parserOptions: {
+        warnOnUnsupportedTypeScriptVersion: false,
+      },
+    },
+    rules: {
+      ...importPlugin.flatConfigs.recommended.rules,
+      ...importPlugin.flatConfigs.typescript.rules,
+      ...importPlugin.flatConfigs.react.rules,
+      'digigov/no-relative-imports': 'error',
+      // the following import-x rules already checked by typescript eslint
+      'import-x/default': 'off',
+      'import-x/named': 'off',
+      'import-x/namespace': 'off',
+      'import-x/no-named-as-default-member': 'off',
+      'import-x/no-unresolved': 'off',
+      // sort imports
+      'import-x/order': [
+        'error',
+        {
+          groups: [
+            ['builtin', 'external'],
+            'internal',
+            ['parent', 'sibling', 'index'],
+          ],
+          pathGroups: [
+            {
+              pattern: 'react',
+              group: 'builtin',
+              position: 'before',
+            },
+            {
+              pattern: '@digigov/**',
+              group: 'internal',
+            },
+          ],
+          pathGroupsExcludedImportTypes: ['react'],
+          alphabetize: {
+            order: 'asc',
+            caseInsensitive: true,
+          },
+        },
+      ],
+    },
+    settings: {
+      'import-x/resolver': {
+        name: 'tsResolver',
+        resolver: tsResolver,
+      },
+    },
+  });
+}
+
+// react
+if (project.dependencies.react) {
+  config.push({
+    name: '@digigov/react',
+    files: ['**/*.{js,jsx,ts,tsx}'],
+    plugins: {
+      react,
+      'react-hooks': reactHooks,
+    },
+    settings: {
+      react: {
+        version: 'detect',
+        defaultVersion: '18.3.1',
+      },
+    },
+    languageOptions: {
+      ...react.configs.flat.recommended.languageOptions,
+      globals: {
+        ...globals.serviceworker,
+        ...globals.browser,
+      },
+      parserOptions: {
+        ecmaFeatures: {
+          jsx: true,
+        },
+      },
+    },
+    rules: {
+      ...react.configs.flat.recommended.rules,
+      ...react.configs.flat['jsx-runtime'].rules,
+      ...reactHooks.configs.recommended.rules,
+      'react-hooks/exhaustive-deps': 'warn',
+      'react/prop-types': 'off',
+    },
+  });
+}
+
+// testing
+if (project.dependencies.vitest) {
+  config.push({
+    name: '@digigov/vitest',
+    files: [
+      '**/__tests__/**/*.{js,jsx,ts,tsx}',
+      '**/*.test.{js,jsx,ts,tsx}',
+      '**/*.spec.{js,jsx,ts,tsx}',
+    ],
+    plugins: {
+      vitest,
+    },
+    rules: {
+      ...vitest.configs.recommended.rules,
+      'no-use-before-define': 'off',
+      'space-before-function-paren': 'off',
+    },
+  });
+}
+
+// prettier - must be last
+config.push(prettier);
+
+export default ts.config(config);

package/index.js

@@ -1,11 +1,7 @@
-import { DigigovCommand, resolveProject } from '@digigov/cli/lib';
-import fs from 'fs';
-import path from 'path';
+import { DigigovCommand } from '@digigov/cli/lib';
 
 const command = new DigigovCommand('lint', import.meta.url);
 
-const FILE_EXTENSIONS = ['.js', '.jsx', '.json', '.ts', '.tsx', '.mdx'];
-
 command
   .argument('[filter...]', 'Filter files')
   .helpOption(false)
@@ -19,35 +15,9 @@ export default command;
  * @param {DigigovCommand} ctx - The command context
  */
 async function lint(args, _, ctx) {
-  const project = resolveProject();
-
-  if (project.isTs) {
-    let tsconfigPath = path.join(project.root, 'tsconfig.json');
-
-    const tsconfigProduction = path.join(
-      project.root,
-      'tsconfig.production.json'
-    );
-    if (fs.existsSync(tsconfigProduction)) {
-      tsconfigPath = tsconfigProduction;
-    }
-    await ctx.exec('tsc', ['--noEmit', '--project', tsconfigPath]);
-  }
-
-  const cmdArgs = [];
-  if (project.ignore) {
-    cmdArgs.push('--ignore-path', project.ignore);
-  }
-  await ctx.exec(
-    'eslint',
-    [
-      '--ext',
-      FILE_EXTENSIONS.join(','),
-      '--no-error-on-unmatched-pattern',
-      ...cmdArgs,
-      ...args,
-    ],
-    { env: {}, stdio: 'inherit' }
-  );
+  await ctx.exec('eslint', ['--no-error-on-unmatched-pattern', ...args], {
+    env: {},
+    stdio: 'inherit',
+  });
   return;
 }

package/package.json

@@ -1,35 +1,33 @@
 {
   "name": "@digigov/cli-lint",
-  "version": "2.0.0-rc.24",
+  "version": "2.0.0-rc.25",
   "description": "Lint plugin for Digigov CLI",
   "main": "index.js",
   "type": "module",
   "author": "GRNET Devs <devs@lists.grnet.gr>",
   "license": "BSD-2-Clause",
   "dependencies": {
-    "@babel/eslint-parser": "7.19.1",
-    "@typescript-eslint/eslint-plugin": "6.19.1",
-    "@typescript-eslint/parser": "6.19.1",
     "eslint-config-prettier": "9.1.0",
-    "eslint-import-resolver-babel-module": "5.3.2",
     "eslint-plugin-css-modules": "2.12.0",
-    "eslint-plugin-enzyme": "0.2.0",
-    "eslint-plugin-import": "2.29.1",
-    "eslint-plugin-jest": "27.6.3",
-    "eslint-plugin-json": "3.1.0",
-    "eslint-plugin-mdx": "2.3.4",
-    "eslint-plugin-prettier": "5.1.3",
-    "eslint-plugin-promise": "6.1.1",
-    "eslint-plugin-react": "7.33.2",
-    "eslint-plugin-react-hooks": "4.6.0",
-    "@rushstack/eslint-patch": "1.7.2",
+    "eslint-plugin-digigov": "2.0.0-rc.25",
+    "eslint-plugin-json": "4.0.1",
+    "eslint-plugin-prettier": "5.2.1",
+    "eslint-plugin-promise": "7.2.1",
+    "eslint-plugin-react": "7.37.2",
+    "eslint-plugin-react-hooks": "5.0.0",
+    "@rushstack/eslint-patch": "1.10.4",
     "publint": "0.1.8",
-    "eslint-plugin-digigov": "1.0.0"
+    "@vitest/eslint-plugin": "~1.1.14",
+    "@eslint/js": "~9.16.0",
+    "typescript-eslint": "~8.17.0",
+    "eslint-plugin-import-x": "~4.5.0",
+    "eslint-import-resolver-typescript": "~3.7.0",
+    "globals": "~15.13.0",
+    "@eslint/compat": "~1.2.3"
   },
   "exports": {
     ".": "./index.js",
-    "./eslint.common": "./eslint.common.cjs",
-    "./eslint.config": "./eslint.config.cjs",
+    "./eslint.config": "./eslint.config.js",
     "./eslintrc": "./eslintrc.cjs",
     "./prettier.config": "./prettier.config.cjs",
     "./prettierrc": "./prettierrc.cjs"
@@ -38,11 +36,11 @@
     "publint": "0.1.8"
   },
   "peerDependencies": {
-    "@digigov/cli": "2.0.0-rc.24",
-    "@digigov/cli-build": "2.0.0-rc.24",
-    "prettier": "3.2.5",
+    "@digigov/cli": "2.0.0-rc.25",
+    "@digigov/cli-build": "2.0.0-rc.25",
+    "prettier": "^3",
     "typescript": "*",
-    "eslint": "8.56.0"
+    "eslint": "^9"
   },
   "peerDependenciesMeta": {
     "typescript": {
@@ -50,7 +48,7 @@
     }
   },
   "scripts": {
-    "lint": "eslint --ext .js .",
+    "lint": "eslint",
     "publint": "publint"
   }
 }

package/rush-logs/cli-lint.lint.log

@@ -1 +1 @@
-Invoking: eslint --ext .js . 
+Invoking: eslint 

package/.eslintrc.cjs

@@ -1,3 +0,0 @@
-const eslintrc = require('./eslint.common.cjs').config;
-
-module.exports = eslintrc;

package/eslint.config.cjs

@@ -1 +0,0 @@
-module.exports = require('./eslintrc.cjs')();