nx 20.2.0 → 20.2.1

package/bin/nx.js

@@ -17,6 +17,7 @@ const perf_hooks_1 = require("perf_hooks");
 const workspace_context_1 = require("../src/utils/workspace-context");
 const client_1 = require("../src/daemon/client/client");
 const db_connection_1 = require("../src/utils/db-connection");
+const exit_codes_1 = require("../src/utils/exit-codes");
 function main() {
     if (process.argv[2] !== 'report' &&
         process.argv[2] !== '--version' &&
@@ -214,11 +215,25 @@ const getLatestVersionOfNx = ((fn) => {
     let cache = null;
     return () => cache || (cache = fn());
 })(_getLatestVersionOfNx);
-function nxCleanup() {
+function nxCleanup(signal) {
     (0, db_connection_1.removeDbConnections)();
+    if (signal) {
+        process.exit((0, exit_codes_1.signalToCode)(signal));
+    }
+    else {
+        process.exit();
+    }
 }
-process.on('exit', nxCleanup);
-process.on('SIGINT', nxCleanup);
-process.on('SIGTERM', nxCleanup);
-process.on('SIGHUP', nxCleanup);
+process.on('exit', () => {
+    nxCleanup();
+});
+process.on('SIGINT', () => {
+    nxCleanup('SIGINT');
+});
+process.on('SIGTERM', () => {
+    nxCleanup('SIGTERM');
+});
+process.on('SIGHUP', () => {
+    nxCleanup('SIGHUP');
+});
 main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "20.2.0",
+  "version": "20.2.1",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -54,18 +54,19 @@
     "jsonc-parser": "3.2.0",
     "lines-and-columns": "2.0.3",
     "minimatch": "9.0.3",
+    "node-machine-id": "1.1.12",
     "npm-run-path": "^4.0.1",
     "open": "^8.4.0",
+    "ora": "5.3.0",
     "semver": "^7.5.3",
     "string-width": "^4.2.3",
     "tar-stream": "~2.2.0",
     "tmp": "~0.2.1",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
+    "yaml": "^2.6.0",
     "yargs": "^17.6.2",
-    "yargs-parser": "21.1.1",
-    "node-machine-id": "1.1.12",
-    "ora": "5.3.0"
+    "yargs-parser": "21.1.1"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -80,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "20.2.0",
-    "@nx/nx-darwin-arm64": "20.2.0",
-    "@nx/nx-linux-x64-gnu": "20.2.0",
-    "@nx/nx-linux-x64-musl": "20.2.0",
-    "@nx/nx-win32-x64-msvc": "20.2.0",
-    "@nx/nx-linux-arm64-gnu": "20.2.0",
-    "@nx/nx-linux-arm64-musl": "20.2.0",
-    "@nx/nx-linux-arm-gnueabihf": "20.2.0",
-    "@nx/nx-win32-arm64-msvc": "20.2.0",
-    "@nx/nx-freebsd-x64": "20.2.0"
+    "@nx/nx-darwin-arm64": "20.2.1",
+    "@nx/nx-darwin-x64": "20.2.1",
+    "@nx/nx-freebsd-x64": "20.2.1",
+    "@nx/nx-linux-arm-gnueabihf": "20.2.1",
+    "@nx/nx-linux-arm64-gnu": "20.2.1",
+    "@nx/nx-linux-arm64-musl": "20.2.1",
+    "@nx/nx-linux-x64-gnu": "20.2.1",
+    "@nx/nx-linux-x64-musl": "20.2.1",
+    "@nx/nx-win32-arm64-msvc": "20.2.1",
+    "@nx/nx-win32-x64-msvc": "20.2.1"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

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

@@ -2,10 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.importHandler = importHandler;
 const path_1 = require("path");
-const minimatch_1 = require("minimatch");
 const node_fs_1 = require("node:fs");
 const chalk = require("chalk");
-const js_yaml_1 = require("@zkochan/js-yaml");
 const git_utils_1 = require("../../utils/git-utils");
 const promises_1 = require("node:fs/promises");
 const tmp_1 = require("tmp");
@@ -22,7 +20,7 @@ const command_line_utils_1 = require("../../utils/command-line-utils");
 const prepare_source_repo_1 = require("./utils/prepare-source-repo");
 const merge_remote_source_1 = require("./utils/merge-remote-source");
 const needs_install_1 = require("./utils/needs-install");
-const file_utils_1 = require("../../project-graph/file-utils");
+const minimatch_1 = require("minimatch");
 const importRemoteName = '__tmp_nx_import__';
 async function importHandler(options) {
     process.env.NX_RUNNING_NX_IMPORT = 'true';
@@ -166,6 +164,7 @@ async function importHandler(options) {
             ],
         });
     }
+    await handleMissingWorkspacesEntry(packageManager, pmc, relativeDestination, destinationGitClient);
     // If install fails, we should continue since the errors could be resolved later.
     let installFailed = false;
     if (plugins.length > 0) {
@@ -208,7 +207,6 @@ async function importHandler(options) {
             ],
         });
     }
-    await warnOnMissingWorkspacesEntry(packageManager, pmc, relativeDestination);
     if (source != destination) {
         output_1.output.warn({
             title: `Check configuration files`,
@@ -259,9 +257,10 @@ async function createTemporaryRemote(destinationGitClient, sourceRemoteUrl, remo
     await destinationGitClient.addGitRemote(remoteName, sourceRemoteUrl);
     await destinationGitClient.fetch(remoteName);
 }
-// If the user imports a project that isn't in NPM/Yarn/PNPM workspaces, then its dependencies
-// will not be installed. We should warn users and provide instructions on how to fix this.
-async function warnOnMissingWorkspacesEntry(pm, pmc, pkgPath) {
+/**
+ * If the user imports a project that isn't in the workspaces entry, we should add that path to the workspaces entry.
+ */
+async function handleMissingWorkspacesEntry(pm, pmc, pkgPath, destinationGitClient) {
     if (!(0, package_manager_1.isWorkspacesEnabled)(pm, workspace_root_1.workspaceRoot)) {
         output_1.output.warn({
             title: `Missing workspaces in package.json`,
@@ -292,37 +291,24 @@ async function warnOnMissingWorkspacesEntry(pm, pmc, pkgPath) {
         });
     }
     else {
-        // Check if the new package is included in existing workspaces entries. If not, warn the user.
-        let workspaces = null;
-        if (pm === 'npm' || pm === 'yarn' || pm === 'bun') {
-            const packageJson = (0, file_utils_1.readPackageJson)();
-            workspaces = packageJson.workspaces;
-        }
-        else if (pm === 'pnpm') {
-            const yamlPath = (0, path_1.join)(workspace_root_1.workspaceRoot, 'pnpm-workspace.yaml');
-            if ((0, node_fs_1.existsSync)(yamlPath)) {
-                const yamlContent = await node_fs_1.promises.readFile(yamlPath, 'utf-8');
-                const yaml = (0, js_yaml_1.load)(yamlContent);
-                workspaces = yaml.packages;
-            }
-        }
-        if (workspaces) {
-            const isPkgIncluded = workspaces.some((w) => (0, minimatch_1.minimatch)(pkgPath, w));
-            if (!isPkgIncluded) {
-                const pkgsDir = (0, path_1.dirname)(pkgPath);
-                output_1.output.warn({
-                    title: `Project missing in workspaces`,
-                    bodyLines: pm === 'npm' || pm === 'yarn' || pm === 'bun'
-                        ? [
-                            `The imported project (${pkgPath}) is missing the "workspaces" field in package.json.`,
-                            `Add "${pkgsDir}/*" to workspaces run "${pmc.install}".`,
-                        ]
-                        : [
-                            `The imported project (${pkgPath}) is missing the "packages" field in pnpm-workspaces.yaml.`,
-                            `Add "${pkgsDir}/*" to packages run "${pmc.install}".`,
-                        ],
-                });
-            }
+        let workspaces = (0, package_manager_1.getPackageWorkspaces)(pm, workspace_root_1.workspaceRoot);
+        const isPkgIncluded = workspaces.some((w) => (0, minimatch_1.minimatch)(pkgPath, w));
+        if (isPkgIncluded) {
+            return;
         }
+        (0, package_manager_1.addPackagePathToWorkspaces)(pkgPath, pm, workspaces, workspace_root_1.workspaceRoot);
+        await destinationGitClient.amendCommit();
+        output_1.output.success({
+            title: `Project added in workspaces`,
+            bodyLines: pm === 'npm' || pm === 'yarn' || pm === 'bun'
+                ? [
+                    `The imported project (${chalk.bold(pkgPath)}) is missing the "workspaces" field in package.json.`,
+                    `Added "${chalk.bold(pkgPath)}" to workspaces.`,
+                ]
+                : [
+                    `The imported project (${chalk.bold(pkgPath)}) is missing the "packages" field in pnpm-workspaces.yaml.`,
+                    `Added "${chalk.bold(pkgPath)}" to packages.`,
+                ],
+        });
     }
 }