@digigov/cli-lint 1.0.5-rc.21 → 2.0.0-0c4be34e

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

@@ -1,24 +1,22 @@
 {
-  "../../tooling/cli-lint": "../../tooling/cli-lint:jn6T+DxKXu7qgcTQAhNcvjxRcJ8ceEgamm1Q0x+zqiI=:",
-  "/@babel/eslint-parser@7.19.1(@babel/core@7.25.2)(eslint@8.56.0)": "Missing shrinkwrap entry!",
-  "/@oclif/command@1.8.0(@oclif/config@1.18.17)(supports-color@7.2.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.25.2)(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(@types/node@18.19.0)(node-notifier@8.0.2)(ts-node@10.9.2(@types/node@18.19.0)(typescript@5.6.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!",
-  "/execa@5.0.0": "Missing shrinkwrap entry!",
-  "/prettier@3.2.5": "Missing shrinkwrap entry!",
-  "/publint@0.1.8": "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.common.js → eslint.common.cjs}

@@ -1,8 +1,8 @@
-const lib = require('@digigov/cli/lib');
-const prettierrc = require('./prettier.config');
+const { resolveProject } = require('@digigov/cli/lib');
+const prettierrc = require('./prettier.config.cjs');
 require('@rushstack/eslint-patch/modern-module-resolution');
 function makeEslintConfig(dir) {
-  const project = lib.resolveProject(dir);
+  const project = resolveProject(dir);
   let restConfig = {};
   let rules = {};
   const plugins = [];
@@ -33,7 +33,7 @@ function makeEslintConfig(dir) {
       parser: '@babel/eslint-parser',
       parserOptions: {
         babelOptions: {
-          configFile: require.resolve('@digigov/cli-build/babel.config.js'),
+          configFile: require.resolve('@digigov/cli-build/babel.config.cjs'),
         },
       },
     };

package/eslint.config.js

@@ -1 +1,192 @@
-module.exports = require('./eslintrc')()
+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/eslintrc.cjs

@@ -0,0 +1,5 @@
+const { makeConfig } = require('@digigov/cli/lib');
+const eslintrc = (overrides) => {
+  return makeConfig(overrides, require('./eslint.common.cjs').config);
+};
+module.exports = eslintrc;

package/index.js

@@ -1,45 +1,23 @@
-const { Command, flags } = require('@oclif/command');
-const execa = require('execa');
-const { makeConfig, resolveProject } = require('@digigov/cli/lib');
-const { DigigovCommand } = require('@digigov/cli/lib');
+import { DigigovCommand } from '@digigov/cli/lib';
 
-module.exports = class Lint extends DigigovCommand {
-  static description = 'lint digigov projects';
-  static id = 'lint';
-  static examples = [`$ digigov lint`];
-  static strict = false;
-  dirname = __dirname;
-  static load() {
-    return Lint;
-  }
-  script = 'eslint';
-  static args = [{ name: 'files' }];
-  async run() {
-    const { args, argv } = this.parse(Lint);
-    const project = resolveProject();
-    const ext = ['.js', '.jsx', '.json', '.ts', '.tsx', '.mdx'];
-    const cmdArgs = [];
-    if (project.ignore) {
-      cmdArgs.push('--ignore-path', project.ignore);
-    }
-    if (project.isTs) {
-      await this.exec('tsc', ['--noEmit']);
-    }
-    if (args.files && args.files.startsWith('-')) {
-      args.files = null;
-    }
-    const files = args.files || project.src;
-    const proc = this.exec(
-      this.script,
-      [
-        files,
-        '--ext',
-        ext.join(','),
-        ...cmdArgs,
-        ...argv.filter((a) => a !== files),
-      ],
-      { env: {}, stdio: 'inherit' }
-    );
-    return proc;
-  }
-};
+const command = new DigigovCommand('lint', import.meta.url);
+
+command
+  .argument('[filter...]', 'Filter files')
+  .helpOption(false)
+  .allowUnknownOption()
+  .action(lint);
+
+export default command;
+
+/**
+ * @param {string[]} args - The arguments
+ * @param {DigigovCommand} ctx - The command context
+ */
+async function lint(args, _, ctx) {
+  await ctx.exec('eslint', ['--no-error-on-unmatched-pattern', ...args], {
+    env: {},
+    stdio: 'inherit',
+  });
+  return;
+}

package/package.json

@@ -1,42 +1,54 @@
 {
   "name": "@digigov/cli-lint",
-  "version": "1.0.5-rc.21",
+  "version": "2.0.0-0c4be34e",
   "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",
-    "@oclif/command": "1.8.0",
-    "@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",
-    "execa": "5.0.0",
-    "@rushstack/eslint-patch": "1.7.2",
+    "eslint-plugin-digigov": "2.0.0-0c4be34e",
+    "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.config": "./eslint.config.js",
+    "./eslintrc": "./eslintrc.cjs",
+    "./prettier.config": "./prettier.config.cjs",
+    "./prettierrc": "./prettierrc.cjs"
   },
   "devDependencies": {
     "publint": "0.1.8"
   },
   "peerDependencies": {
-    "@digigov/cli": "1.1.1-rc.21",
-    "@digigov/cli-build": "2.0.0-rc.21",
-    "prettier": "3.2.5",
-    "eslint": "8.56.0"
+    "@digigov/cli": "2.0.0-0c4be34e",
+    "@digigov/cli-build": "2.0.0-0c4be34e",
+    "prettier": "^3",
+    "typescript": "*",
+    "eslint": "^9"
+  },
+  "peerDependenciesMeta": {
+    "typescript": {
+      "optional": true
+    }
   },
   "scripts": {
+    "lint": "eslint",
     "publint": "publint"
   }
 }

package/prettierrc.cjs

@@ -0,0 +1,5 @@
+const { makeConfig } = require('@digigov/cli/lib');
+const prettierrc = (overrides) => {
+  return makeConfig(overrides, require('./prettier.config.cjs'));
+};
+module.exports = prettierrc;

package/.eslintrc.js

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

package/eslintrc.js

@@ -1,6 +0,0 @@
-const {makeConfig} = require('@digigov/cli/lib')
-const eslintrc = (overrides)=>{
-  return makeConfig(overrides, require('./eslint.common').config)
-}
-module.exports = eslintrc 
-

package/prettierrc.js

@@ -1,6 +0,0 @@
-const {makeConfig} = require('@digigov/cli/lib')
-const prettierrc = (overrides)=>{
-  return makeConfig(overrides, require('./prettier.config'))
-}
-module.exports = prettierrc 
-