@digigov/cli-lint 1.1.0-2a507fd6 → 2.0.0-0138f8bd

package/CHANGELOG.json

@@ -1,6 +1,52 @@
 {
   "name": "@digigov/cli-lint",
   "entries": [
+    {
+      "version": "1.0.4",
+      "tag": "@digigov/cli-lint_v1.0.4",
+      "date": "Fri, 16 Feb 2024 09:57:32 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Remove cypress plugin & upgrade all other plugins"
+          }
+        ]
+      }
+    },
+    {
+      "version": "1.0.3",
+      "tag": "@digigov/cli-lint_v1.0.3",
+      "date": "Mon, 29 Jan 2024 17:45:11 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Upgrade @typescript-eslint for TypeScript v5"
+          }
+        ],
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@digigov/cli-build\" from `1.1.0` to `1.1.1`"
+          }
+        ]
+      }
+    },
+    {
+      "version": "1.0.2",
+      "tag": "@digigov/cli-lint_v1.0.2",
+      "date": "Mon, 29 Jan 2024 10:46:50 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Disallow irregular whitespace"
+          }
+        ],
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@digigov/cli-build\" from `1.0.1` to `1.1.0`"
+          }
+        ]
+      }
+    },
     {
       "version": "1.0.0",
       "tag": "@digigov/cli-lint_v1.0.0",

package/CHANGELOG.md

@@ -1,6 +1,27 @@
 # Change Log - @digigov/cli-lint
 
-This log was last generated on Fri, 15 Dec 2023 15:23:56 GMT and should not be manually modified.
+This log was last generated on Fri, 16 Feb 2024 09:57:32 GMT and should not be manually modified.
+
+## 1.0.4
+Fri, 16 Feb 2024 09:57:32 GMT
+
+### Patches
+
+- Remove cypress plugin & upgrade all other plugins
+
+## 1.0.3
+Mon, 29 Jan 2024 17:45:11 GMT
+
+### Patches
+
+- Upgrade @typescript-eslint for TypeScript v5
+
+## 1.0.2
+Mon, 29 Jan 2024 10:46:50 GMT
+
+### Patches
+
+- Disallow irregular whitespace
 
 ## 1.0.0
 Fri, 15 Dec 2023 15:23:56 GMT

package/eslint.config.js

@@ -1 +1,207 @@
-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
+/** @type {any[]} */
+let config = [];
+
+if (project.ignore) {
+  const gitIgnoreConfig = includeIgnoreFile(project.ignore);
+  config.push(gitIgnoreConfig);
+}
+
+config.push([
+  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,
+      '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,
+      },
+    },
+  });
+
+  // storybook
+  config.push({
+    files: ['**/*.stories.{js,jsx,ts,tsx}', '**/__stories__/*.{js,jsx,ts,tsx}'],
+    rules: {
+      '@typescript-eslint/no-unused-vars': 'off',
+      '@typescript-eslint/no-explicit-any': 'off',
+    },
+  });
+}
+
+// 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,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,44 +1,53 @@
 {
   "name": "@digigov/cli-lint",
-  "version": "1.1.0-2a507fd6",
+  "version": "2.0.0-0138f8bd",
   "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.13.8",
-    "@oclif/command": "1.8.0",
-    "@typescript-eslint/eslint-plugin": "4.19.0",
-    "@typescript-eslint/parser": "4.19.0",
-    "eslint-config-prettier": "6.10.0",
-    "eslint-import-resolver-babel-module": "5.1.2",
-    "eslint-plugin-css-modules": "2.11.0",
-    "eslint-plugin-cypress": "2.8.1",
-    "eslint-plugin-digigov": "1.0.0",
-    "eslint-plugin-enzyme": "0.2.0",
-    "eslint-plugin-import": "2.20.1",
-    "eslint-plugin-jest": "24.1.3",
-    "eslint-plugin-json": "2.0.1",
-    "eslint-plugin-mdx": "1.6.8",
-    "eslint-plugin-prettier": "3.1.2",
-    "eslint-plugin-promise": "4.2.1",
-    "eslint-plugin-react": "7.18.0",
-    "eslint-plugin-react-hooks": "4.0.2",
-    "eslint-plugin-standard": "4.0.1",
-    "execa": "5.0.0",
-    "@rushstack/eslint-patch": "1.0.6",
-    "publint": "0.1.8"
+    "eslint-config-prettier": "9.1.0",
+    "eslint-plugin-css-modules": "2.12.0",
+    "eslint-plugin-digigov": "2.0.0-0138f8bd",
+    "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",
+    "@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",
+    "./prettier.config": "./prettier.config.cjs",
+    "./prettierrc": "./prettierrc.cjs"
   },
   "devDependencies": {
     "publint": "0.1.8"
   },
   "peerDependencies": {
-    "@digigov/cli": "1.1.0-2a507fd6",
-    "@digigov/cli-build": "1.1.0-2a507fd6",
-    "prettier": "2.0.2",
-    "eslint": "7.24.0"
+    "@digigov/cli": "2.0.0-0138f8bd",
+    "prettier": "^3",
+    "typescript": "*",
+    "eslint": "^9"
+  },
+  "peerDependenciesMeta": {
+    "typescript": {
+      "optional": true
+    }
   },
   "scripts": {
-    "publint": "publint"
+    "lint": "eslint",
+    "publint": "publint",
+    "typecheck": "tsc"
   }
 }

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/tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "extends": "@digigov/cli/tsconfig.cli",
+  "include": ["./*.js"]
+}

package/.eslintrc.js

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

package/eslint.common.js

@@ -1,127 +0,0 @@
-const lib = require('@digigov/cli/lib');
-const prettierrc = require('./prettier.config');
-require('@rushstack/eslint-patch/modern-module-resolution');
-function makeEslintConfig(dir) {
-  const project = lib.resolveProject(dir);
-  let restConfig = {};
-  let rules = {};
-  const plugins = [];
-  const settings = {};
-  const extendsRest = [
-    'eslint:recommended',
-    'plugin:prettier/recommended',
-    'plugin:json/recommended',
-  ];
-  if (project.dependencies.react) {
-    plugins.push('digigov');
-    rules = {
-      'digigov/no-relative-imports': 'error',
-    }
-    extendsRest.push(
-      ...[
-        'plugin:react/recommended',
-        'plugin:react-hooks/recommended',
-      ]
-    );
-    settings['react'] = {
-      version: 'detect',
-    };
-    settings[require.resolve('eslint-plugin-import')] = {
-      [require.resolve('eslint-import-resolver-babel-module')]: {},
-    };
-  }
-  if (project.dependencies.jest) {
-    extendsRest.push(
-      ...['plugin:jest/recommended', 'plugin:cypress/recommended']
-    );
-    plugins.push('enzyme');
-  }
-  if (project.src) {
-    restConfig = {
-      ...restConfig,
-      parser: '@babel/eslint-parser',
-      parserOptions: {
-        babelOptions: {
-          configFile: require.resolve('@digigov/cli-build/babel.config.js'),
-        },
-      },
-    };
-  }
-  const config = {
-    env: {
-      node: true,
-      browser: true,
-    },
-    extends: extendsRest,
-    plugins,
-    rules: {
-      'jest/no-deprecated-functions': 0,
-      'no-use-before-define': 0,
-      'space-before-function-paren': 0,
-      'prettier/prettier': ['error', prettierrc, { usePrettierrc: false }],
-      ...rules,
-    },
-    settings,
-    overrides: [
-      {
-        files: ['*.md', '*.mdx'],
-        extends: ['plugin:mdx/recommended'],
-      },
-      {
-        files: ['*.css'],
-        extends: ['plugin:css-modules/recommended'],
-      },
-    ],
-    ...restConfig,
-  };
-  if (project.isTs) {
-    config.overrides.push({
-      files: ['*.ts', '*.tsx'],
-      parser: '@typescript-eslint/parser',
-      env: {
-        browser: true,
-      },
-      plugins: ['@typescript-eslint', 'import'],
-      extends: 'plugin:@typescript-eslint/recommended',
-      rules: {
-        'react/prop-types': 'off',
-        '@typescript-eslint/no-empty-interface': 'off',
-        '@typescript-eslint/no-var-requires': 0,
-        '@typescript-eslint/ban-ts-comment': 'warn',
-        'react-hooks/exhaustive-deps': 'off',
-        'import/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,
-            },
-          },
-        ],
-      },
-    });
-  }
-  return config;
-}
-
-module.exports = {
-  makeEslintConfig,
-  config: makeEslintConfig(),
-};

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 
-