@digigov/cli-lint 1.0.5-rc.21 → 2.0.0-6452adf3

package/.eslintrc.cjs

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

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

@@ -1,16 +1,15 @@
 {
-  "../../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!",
+  "../../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.25.2)(babel-plugin-module-resolver@4.0.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(@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-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!",
@@ -18,7 +17,7 @@
   "/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!"
+  "/publint@0.1.8": "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.cjs

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

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,53 @@
-const { Command, flags } = require('@oclif/command');
-const execa = require('execa');
-const { makeConfig, resolveProject } = require('@digigov/cli/lib');
-const { DigigovCommand } = require('@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' }
+import { DigigovCommand, resolveProject } from '@digigov/cli/lib';
+import fs from 'fs';
+import path from 'path';
+
+const command = new DigigovCommand('lint', import.meta.url);
+
+const FILE_EXTENSIONS = ['.js', '.jsx', '.json', '.ts', '.tsx', '.mdx'];
+
+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) {
+  const project = resolveProject();
+
+  if (project.isTs) {
+    let tsconfigPath = path.join(project.root, 'tsconfig.json');
+
+    const tsconfigProduction = path.join(
+      project.root,
+      'tsconfig.production.json'
     );
-    return proc;
+    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' }
+  );
+  return;
+}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@digigov/cli-lint",
-  "version": "1.0.5-rc.21",
+  "version": "2.0.0-6452adf3",
   "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",
@@ -22,21 +22,35 @@
     "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",
     "publint": "0.1.8",
     "eslint-plugin-digigov": "1.0.0"
   },
+  "exports": {
+    ".": "./index.js",
+    "./eslint.common": "./eslint.common.cjs",
+    "./eslint.config": "./eslint.config.cjs",
+    "./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",
+    "@digigov/cli": "2.0.0-6452adf3",
+    "@digigov/cli-build": "2.0.0-6452adf3",
     "prettier": "3.2.5",
+    "typescript": "*",
     "eslint": "8.56.0"
   },
+  "peerDependenciesMeta": {
+    "typescript": {
+      "optional": true
+    }
+  },
   "scripts": {
+    "lint": "eslint --ext .js .",
     "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/eslint.config.js

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