@angular-eslint/builder 18.3.2-alpha.9 → 18.4.1-alpha.0

package/dist/lint.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lint.impl.d.ts","sourceRoot":"","sources":["../src/lint.impl.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;;AAGvC,wBAgME"}
+{"version":3,"file":"lint.impl.d.ts","sourceRoot":"","sources":["../src/lint.impl.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;;AAMvC,wBA8LE"}

package/dist/lint.impl.js

@@ -15,10 +15,6 @@ exports.default = (0, architect_1.createBuilder)(async (options, context) => {
     if (printInfo) {
         console.info(`\nLinting ${JSON.stringify(projectName)}...`);
     }
-    /**
-     * We want users to have the option of not specifying the config path, and let
-     * eslint automatically resolve the `.eslintrc.json` files in each folder.
-     */
     const eslintConfigPath = options.eslintConfig
         ? (0, path_1.resolve)(systemRoot, options.eslintConfig)
         : undefined;
@@ -28,9 +24,9 @@ exports.default = (0, architect_1.createBuilder)(async (options, context) => {
     /**
      * Until ESLint v9 is released and the new so called flat config is the default
      * we only want to support it if the user has explicitly opted into it by converting
-     * their root ESLint config to use eslint.config.js
+     * their root ESLint config to use a supported flat config file name.
      */
-    const useFlatConfig = (0, fs_1.existsSync)((0, path_1.join)(systemRoot, 'eslint.config.js'));
+    const useFlatConfig = eslint_utils_1.supportedFlatConfigNames.some((name) => (0, fs_1.existsSync)((0, path_1.join)(systemRoot, name)));
     const { eslint, ESLint } = await (0, eslint_utils_1.resolveAndInstantiateESLint)(eslintConfigPath, options, useFlatConfig);
     const version = ESLint?.version?.split('.');
     if (!version ||
@@ -50,7 +46,8 @@ exports.default = (0, architect_1.createBuilder)(async (options, context) => {
             const projectMetadata = await context.getProjectMetadata(projectName);
             if (projectMetadata?.root) {
                 const { root } = projectMetadata;
-                eslintConfigPathForError = `\`${root}/.eslintrc.json\``;
+                eslintConfigPathForError =
+                    resolveESLintConfigPath(root) ?? '';
             }
             console.error(`
 Error: You have attempted to use a lint rule which requires the full TypeScript type-checker to be available, but you do not have \`parserOptions.project\` configured to point at your project tsconfig.json files in the relevant TypeScript file "overrides" block of your project ESLint config ${eslintConfigPath || eslintConfigPathForError}
@@ -110,7 +107,6 @@ For full guidance on how to resolve this issue, please see https://github.com/an
      * log (even when no results) because different formatters handled the
      * "no results" case differently.
      */
-    // @ts-expect-error - TODO: investigate this new rules meta argument to this function in ESLint v9
     const formattedResults = await formatter.format(finalLintResults);
     if (options.outputFile) {
         const pathToOutputFile = (0, path_1.join)(systemRoot, options.outputFile);
@@ -139,3 +135,22 @@ For full guidance on how to resolve this issue, please see https://github.com/an
         success: options.force || (totalErrors === 0 && !tooManyWarnings),
     };
 });
+function resolveESLintConfigPath(projectRoot) {
+    const rcPath = (0, path_1.join)(projectRoot, '.eslintrc.json');
+    if ((0, fs_1.existsSync)(rcPath)) {
+        return rcPath;
+    }
+    const jsPath = (0, path_1.join)(projectRoot, 'eslint.config.js');
+    if ((0, fs_1.existsSync)(jsPath)) {
+        return jsPath;
+    }
+    const mjsPath = (0, path_1.join)(projectRoot, 'eslint.config.mjs');
+    if ((0, fs_1.existsSync)(mjsPath)) {
+        return mjsPath;
+    }
+    const cjsPath = (0, path_1.join)(projectRoot, 'eslint.config.cjs');
+    if ((0, fs_1.existsSync)(cjsPath)) {
+        return cjsPath;
+    }
+    return null;
+}

package/dist/schema.json

@@ -91,7 +91,12 @@
     },
     "noEslintrc": {
       "type": "boolean",
-      "description": "The equivalent of the `--no-eslintrc` flag on the ESLint CLI, it is false by default",
+      "description": "NOTE: eslintrc config only. The equivalent of the `--no-eslintrc` flag on the ESLint CLI, it is false by default",
+      "default": false
+    },
+    "noConfigLookup": {
+      "type": "boolean",
+      "description": "NOTE: flat config only. The equivalent of the `--no-config-lookup` flag on the ESLint CLI, it is false by default",
       "default": false
     },
     "rulesdir": {

package/dist/utils/eslint-utils.d.ts

@@ -1,5 +1,6 @@
 import type { ESLint } from 'eslint';
 import type { Schema } from '../schema';
+export declare const supportedFlatConfigNames: string[];
 export declare function resolveAndInstantiateESLint(eslintConfigPath: string | undefined, options: Schema, useFlatConfig?: boolean): Promise<{
     ESLint: typeof import("eslint").ESLint;
     eslint: ESLint;

package/dist/utils/eslint-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"eslint-utils.d.ts","sourceRoot":"","sources":["../../src/utils/eslint-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAuBxC,wBAAsB,2BAA2B,CAC/C,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,OAAO,EAAE,MAAM,EACf,aAAa,UAAQ;;;GA0EtB"}
+{"version":3,"file":"eslint-utils.d.ts","sourceRoot":"","sources":["../../src/utils/eslint-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAExC,eAAO,MAAM,wBAAwB,UAIpC,CAAC;AAuBF,wBAAsB,2BAA2B,CAC/C,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,OAAO,EAAE,MAAM,EACf,aAAa,UAAQ;;;GAyFtB"}

package/dist/utils/eslint-utils.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.supportedFlatConfigNames = void 0;
 exports.resolveAndInstantiateESLint = resolveAndInstantiateESLint;
+exports.supportedFlatConfigNames = [
+    'eslint.config.js',
+    'eslint.config.mjs',
+    'eslint.config.cjs',
+];
 async function resolveESLintClass(useFlatConfig = false) {
     try {
         // In eslint 8.57.0 (the final v8 version), a dedicated API was added for resolving the correct ESLint class.
@@ -23,12 +29,11 @@ async function resolveESLintClass(useFlatConfig = false) {
 async function resolveAndInstantiateESLint(eslintConfigPath, options, useFlatConfig = false) {
     if (useFlatConfig &&
         eslintConfigPath &&
-        !eslintConfigPath?.endsWith('eslint.config.js')) {
-        throw new Error('When using the new Flat Config with ESLint, all configs must be named eslint.config.js and .eslintrc files may not be used. See https://eslint.org/docs/latest/use/configure/configuration-files-new');
+        !exports.supportedFlatConfigNames.some((name) => eslintConfigPath.endsWith(name))) {
+        throw new Error(`When using the new Flat Config with ESLint, all configs must be named ${exports.supportedFlatConfigNames.join(' or ')}, and .eslintrc files may not be used. See https://eslint.org/docs/latest/use/configure/configuration-files`);
     }
     const ESLint = await resolveESLintClass(useFlatConfig);
     const eslintOptions = {
-        overrideConfigFile: eslintConfigPath,
         fix: !!options.fix,
         cache: !!options.cache,
         cacheLocation: options.cacheLocation || undefined,
@@ -58,8 +63,23 @@ async function resolveAndInstantiateESLint(eslintConfigPath, options, useFlatCon
         if (options.reportUnusedDisableDirectives) {
             throw new Error('For Flat Config, ESLint removed `reportedUnusedDisableDirectives` and so it is not supported as an option. See https://eslint.org/docs/latest/use/configure/configuration-files-new');
         }
+        /**
+         * Adapted from https://github.com/eslint/eslint/blob/50f03a119e6827c03b1d6c86d3aa1f4820b609e8/lib/cli.js#L144
+         */
+        if (typeof options.noConfigLookup !== 'undefined') {
+            const configLookup = !options.noConfigLookup;
+            let overrideConfigFile = typeof eslintConfigPath === 'string' ? eslintConfigPath : !configLookup;
+            if (overrideConfigFile === false) {
+                overrideConfigFile = undefined;
+            }
+            eslintOptions.overrideConfigFile = overrideConfigFile;
+        }
+        else {
+            eslintOptions.overrideConfigFile = eslintConfigPath;
+        }
     }
     else {
+        eslintOptions.overrideConfigFile = eslintConfigPath;
         eslintOptions.rulePaths = options.rulesdir || [];
         eslintOptions.resolvePluginsRelativeTo =
             options.resolvePluginsRelativeTo || undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/builder",
-  "version": "18.3.2-alpha.9",
+  "version": "18.4.1-alpha.0",
   "description": "Angular CLI builder for ESLint",
   "license": "MIT",
   "main": "dist/index.js",