nx 22.4.2 → 22.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "22.4.2",
+  "version": "22.4.3",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -83,16 +83,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "22.4.2",
-    "@nx/nx-darwin-x64": "22.4.2",
-    "@nx/nx-freebsd-x64": "22.4.2",
-    "@nx/nx-linux-arm-gnueabihf": "22.4.2",
-    "@nx/nx-linux-arm64-gnu": "22.4.2",
-    "@nx/nx-linux-arm64-musl": "22.4.2",
-    "@nx/nx-linux-x64-gnu": "22.4.2",
-    "@nx/nx-linux-x64-musl": "22.4.2",
-    "@nx/nx-win32-arm64-msvc": "22.4.2",
-    "@nx/nx-win32-x64-msvc": "22.4.2"
+    "@nx/nx-darwin-arm64": "22.4.3",
+    "@nx/nx-darwin-x64": "22.4.3",
+    "@nx/nx-freebsd-x64": "22.4.3",
+    "@nx/nx-linux-arm-gnueabihf": "22.4.3",
+    "@nx/nx-linux-arm64-gnu": "22.4.3",
+    "@nx/nx-linux-arm64-musl": "22.4.3",
+    "@nx/nx-linux-x64-gnu": "22.4.3",
+    "@nx/nx-linux-x64-musl": "22.4.3",
+    "@nx/nx-win32-arm64-msvc": "22.4.3",
+    "@nx/nx-win32-x64-msvc": "22.4.3"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/import/import.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"import.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/import/import.ts"],"names":[],"mappings":"AAsCA,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,gBAAgB,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,aAAa,iBA4TzD"}
+{"version":3,"file":"import.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/import/import.ts"],"names":[],"mappings":"AAwCA,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,gBAAgB,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,aAAa,iBAmUzD"}

package/src/command-line/import/import.js

@@ -12,6 +12,7 @@ const output_1 = require("../../utils/output");
 const createSpinner = require('ora');
 const init_v2_1 = require("../init/init-v2");
 const nx_json_1 = require("../../config/nx-json");
+const fileutils_1 = require("../../utils/fileutils");
 const workspace_root_1 = require("../../utils/workspace-root");
 const package_manager_1 = require("../../utils/package-manager");
 const workspace_context_1 = require("../../utils/workspace-context");
@@ -154,7 +155,14 @@ async function importHandler(options) {
     const pmc = (0, package_manager_1.getPackageManagerCommand)();
     const nxJson = (0, nx_json_1.readNxJson)(workspace_root_1.workspaceRoot);
     (0, workspace_context_1.resetWorkspaceContext)();
-    const { plugins, updatePackageScripts } = await (0, init_v2_1.detectPlugins)(nxJson, options.interactive, true);
+    let packageJson;
+    try {
+        packageJson = (0, fileutils_1.readJsonFile)('package.json');
+    }
+    catch {
+        packageJson = null;
+    }
+    const { plugins, updatePackageScripts } = await (0, init_v2_1.detectPlugins)(nxJson, packageJson, options.interactive, true);
     if (packageManager !== sourcePackageManager) {
         output_1.output.warn({
             title: `Mismatched package managers`,

package/src/command-line/init/init-v2.d.ts

@@ -1,4 +1,5 @@
 import { NxJsonConfiguration } from '../../config/nx-json';
+import { PackageJson } from '../../utils/package-json';
 import { Agent } from '../../ai/utils';
 export interface InitArgs {
     interactive: boolean;
@@ -10,7 +11,7 @@ export interface InitArgs {
     aiAgents?: Agent[];
 }
 export declare function initHandler(options: InitArgs, inner?: boolean): Promise<void>;
-export declare function detectPlugins(nxJson: NxJsonConfiguration, interactive: boolean, includeAngularCli?: boolean): Promise<{
+export declare function detectPlugins(nxJson: NxJsonConfiguration, packageJson: PackageJson | null, interactive: boolean, includeAngularCli?: boolean): Promise<{
     plugins: string[];
     updatePackageScripts: boolean;
 }>;

package/src/command-line/init/init-v2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init-v2.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/init/init-v2.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAc,MAAM,sBAAsB,CAAC;AAavE,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAkBvC,MAAM,WAAW,QAAQ;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC;CACpB;AAED,wBAAsB,WAAW,CAC/B,OAAO,EAAE,QAAQ,EACjB,KAAK,UAAQ,GACZ,OAAO,CAAC,IAAI,CAAC,CA2Bf;AAsMD,wBAAsB,aAAa,CACjC,MAAM,EAAE,mBAAmB,EAC3B,WAAW,EAAE,OAAO,EACpB,iBAAiB,CAAC,EAAE,OAAO,GAC1B,OAAO,CAAC;IACT,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,oBAAoB,EAAE,OAAO,CAAC;CAC/B,CAAC,CA2JD"}
+{"version":3,"file":"init-v2.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/init/init-v2.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAc,MAAM,sBAAsB,CAAC;AAIvE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AASvD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAkBvC,MAAM,WAAW,QAAQ;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC;CACpB;AAED,wBAAsB,WAAW,CAC/B,OAAO,EAAE,QAAQ,EACjB,KAAK,UAAQ,GACZ,OAAO,CAAC,IAAI,CAAC,CA2Bf;AAsMD,wBAAsB,aAAa,CACjC,MAAM,EAAE,mBAAmB,EAC3B,WAAW,EAAE,WAAW,GAAG,IAAI,EAC/B,WAAW,EAAE,OAAO,EACpB,iBAAiB,CAAC,EAAE,OAAO,GAC1B,OAAO,CAAC;IACT,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,oBAAoB,EAAE,OAAO,CAAC;CAC/B,CAAC,CAsKD"}

package/src/command-line/init/init-v2.js

@@ -143,7 +143,7 @@ async function initHandlerImpl(options) {
             updatePackageScripts = true;
         }
         else {
-            const { plugins: _plugins, updatePackageScripts: _updatePackageScripts } = await detectPlugins(nxJson, options.interactive);
+            const { plugins: _plugins, updatePackageScripts: _updatePackageScripts } = await detectPlugins(nxJson, packageJson, options.interactive);
             plugins = _plugins;
             updatePackageScripts = _updatePackageScripts;
         }
@@ -212,12 +212,22 @@ const npmPackageToPluginMap = {
     '@rsbuild/core': '@nx/rsbuild',
     '@react-router/dev': '@nx/react',
 };
-async function detectPlugins(nxJson, interactive, includeAngularCli) {
+async function detectPlugins(nxJson, packageJson, interactive, includeAngularCli) {
     let files = ['package.json'].concat((0, workspace_context_1.globWithWorkspaceContextSync)(process.cwd(), ['**/*/package.json']));
     const currentPlugins = new Set((nxJson.plugins ?? []).map((p) => {
         const plugin = typeof p === 'string' ? p : p.plugin;
         return (0, get_package_name_from_import_path_1.getPackageNameFromImportPath)(plugin);
     }));
+    // Also treat already-installed @nx/* and @nrwl/* packages as current plugins
+    const rootDeps = {
+        ...packageJson?.dependencies,
+        ...packageJson?.devDependencies,
+    };
+    for (const dep of Object.keys(rootDeps)) {
+        if (dep.startsWith('@nx/') || dep.startsWith('@nrwl/')) {
+            currentPlugins.add((0, get_package_name_from_import_path_1.getPackageNameFromImportPath)(dep));
+        }
+    }
     const detectedPlugins = new Set();
     for (const file of files) {
         if (!(0, fs_1.existsSync)(file))