@nx/eslint 0.0.0-pr-30715-a5f5e3b → 0.0.0-pr-31222-862e973

package/src/utils/version-utils.js

@@ -1,35 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInstalledPackageVersion = getInstalledPackageVersion;
 exports.getInstalledEslintVersion = getInstalledEslintVersion;
 const devkit_1 = require("@nx/devkit");
 const semver_1 = require("@nx/devkit/src/utils/semver");
 const devkit_internals_1 = require("nx/src/devkit-internals");
-function getInstalledPackageVersion(pkgName, tree) {
+function getInstalledEslintVersion(tree) {
     try {
-        const packageJson = (0, devkit_internals_1.readModulePackageJson)(pkgName).packageJson;
-        return packageJson.version;
+        const eslintPackageJson = (0, devkit_internals_1.readModulePackageJson)('eslint').packageJson;
+        return eslintPackageJson.version;
     }
     catch { }
-    // the package is not installed on disk, it could be in the package.json
+    // eslint is not installed on disk, it could be in the package.json
     // but waiting to be installed
     const rootPackageJson = tree
         ? (0, devkit_1.readJson)(tree, 'package.json')
         : (0, devkit_1.readJsonFile)('package.json');
-    const pkgVersionInRootPackageJson = rootPackageJson.devDependencies?.[pkgName] ??
-        rootPackageJson.dependencies?.[pkgName];
-    if (!pkgVersionInRootPackageJson) {
-        // the package is not installed
+    const eslintVersionInRootPackageJson = rootPackageJson.devDependencies?.['eslint'] ??
+        rootPackageJson.dependencies?.['eslint'];
+    if (!eslintVersionInRootPackageJson) {
+        // eslint is not installed
         return null;
     }
     try {
         // try to parse and return the version
-        return (0, semver_1.checkAndCleanWithSemver)(pkgName, pkgVersionInRootPackageJson);
+        return (0, semver_1.checkAndCleanWithSemver)('eslint', eslintVersionInRootPackageJson);
     }
     catch { }
     // we could not resolve the version
     return null;
 }
-function getInstalledEslintVersion(tree) {
-    return getInstalledPackageVersion('eslint', tree);
-}

package/src/utils/versions.d.ts

@@ -1,9 +1,8 @@
 export declare const nxVersion: any;
 export declare const eslintVersion = "~8.57.0";
 export declare const eslintrcVersion = "^2.1.1";
-export declare const eslintConfigPrettierVersion = "^10.0.0";
+export declare const eslintConfigPrettierVersion = "^9.0.0";
 export declare const typescriptESLintVersion = "^7.16.0";
-export declare const jsoncEslintParserVersion = "^2.1.0";
-export declare const eslint9__typescriptESLintVersion = "^8.29.0";
+export declare const eslint9__typescriptESLintVersion = "^8.0.0";
 export declare const eslint9__eslintVersion = "^9.8.0";
 export declare const eslintCompat = "^1.1.1";

package/src/utils/versions.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.eslintCompat = exports.eslint9__eslintVersion = exports.eslint9__typescriptESLintVersion = exports.jsoncEslintParserVersion = exports.typescriptESLintVersion = exports.eslintConfigPrettierVersion = exports.eslintrcVersion = exports.eslintVersion = exports.nxVersion = void 0;
+exports.eslintCompat = exports.eslint9__eslintVersion = exports.eslint9__typescriptESLintVersion = exports.typescriptESLintVersion = exports.eslintConfigPrettierVersion = exports.eslintrcVersion = exports.eslintVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 exports.eslintVersion = '~8.57.0';
 exports.eslintrcVersion = '^2.1.1';
-exports.eslintConfigPrettierVersion = '^10.0.0';
+exports.eslintConfigPrettierVersion = '^9.0.0';
 exports.typescriptESLintVersion = '^7.16.0';
-exports.jsoncEslintParserVersion = '^2.1.0';
 // Updated linting stack for ESLint v9, typescript-eslint v8
-exports.eslint9__typescriptESLintVersion = '^8.29.0';
+exports.eslint9__typescriptESLintVersion = '^8.0.0';
 exports.eslint9__eslintVersion = '^9.8.0';
 exports.eslintCompat = '^1.1.1';

package/src/migrations/update-20-2-0/update-typescript-eslint-v8-13-0.d.ts

@@ -1,2 +0,0 @@
-import { type GeneratorCallback, type Tree } from '@nx/devkit';
-export default function (tree: Tree): Promise<GeneratorCallback>;

package/src/migrations/update-20-2-0/update-typescript-eslint-v8-13-0.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
-const devkit_1 = require("@nx/devkit");
-const semver_1 = require("semver");
-const version_utils_1 = require("../../utils/version-utils");
-async function default_1(tree) {
-    const devDependencies = {};
-    const checkPackageAndMigrate = (pkgName) => {
-        const pkgVersion = (0, version_utils_1.getInstalledPackageVersion)(pkgName, tree);
-        if (!!pkgVersion && (0, semver_1.gte)(pkgVersion, '8.0.0') && (0, semver_1.lt)(pkgVersion, '8.13.0')) {
-            devDependencies[pkgName] = '^8.13.0';
-        }
-    };
-    checkPackageAndMigrate('typescript-eslint');
-    checkPackageAndMigrate('@typescript-eslint/eslint-plugin');
-    checkPackageAndMigrate('@typescript-eslint/parser');
-    checkPackageAndMigrate('@typescript-eslint/utils');
-    if (Object.keys(devDependencies).length > 0) {
-        return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies);
-    }
-    return () => { };
-}

package/src/migrations/update-20-3-0/add-file-extensions-to-overrides.d.ts

@@ -1,2 +0,0 @@
-import { type Tree } from '@nx/devkit';
-export default function (tree: Tree): Promise<void>;

package/src/migrations/update-20-3-0/add-file-extensions-to-overrides.js

@@ -1,49 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
-const ts = require("typescript");
-const js_1 = require("@nx/js");
-async function default_1(tree) {
-    let rootConfig;
-    // NOTE: we don't support generating ESM base config currently so they are not handled.
-    for (const candidate of ['eslint.config.js', 'eslint.config.cjs']) {
-        if (tree.exists(candidate)) {
-            rootConfig = candidate;
-            break;
-        }
-    }
-    if (!rootConfig)
-        return;
-    updateOverrideFileExtensions(tree, rootConfig, 'plugin:@nx/typescript', [`'**/*.ts'`, `'**/*.tsx'`], [`'**/*.cts'`, `'**/*.mts'`]);
-    updateOverrideFileExtensions(tree, rootConfig, 'plugin:@nx/javascript', [`'**/*.js'`, `'**/*.jsx'`], [`'**/*.cjs'`, `'**/*.mjs'`]);
-}
-function updateOverrideFileExtensions(tree, configFile, plugin, matchingExts, newExts) {
-    const content = tree.read(configFile, 'utf-8');
-    const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
-    let compatNode;
-    const spreadElementNodes = (0, js_1.findNodes)(source, ts.SyntaxKind.SpreadElement);
-    for (const a of spreadElementNodes) {
-        const assignmentNodes = (0, js_1.findNodes)(a, ts.SyntaxKind.PropertyAssignment);
-        if (assignmentNodes.length === 0)
-            continue;
-        for (const b of assignmentNodes) {
-            if (b.name.getText() === 'extends' &&
-                b.initializer.getText().includes(plugin)) {
-                compatNode = a;
-                break;
-            }
-        }
-    }
-    if (compatNode) {
-        const arrayNodes = (0, js_1.findNodes)(compatNode, ts.SyntaxKind.ArrayLiteralExpression);
-        for (const a of arrayNodes) {
-            if (matchingExts.every((ext) => a.elements.some((e) => e.getText() === ext))) {
-                const exts = new Set(a.elements.map((e) => e.getText()));
-                for (const ext of newExts) {
-                    exts.add(ext);
-                }
-                (0, js_1.replaceChange)(tree, source, configFile, a.getStart(a.getSourceFile()), `[${Array.from(exts).join(', ')}]`, a.getText()).getText();
-            }
-        }
-    }
-}