nx 20.2.0 → 20.2.2

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.2",
   "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.2",
+    "@nx/nx-darwin-x64": "20.2.2",
+    "@nx/nx-freebsd-x64": "20.2.2",
+    "@nx/nx-linux-arm-gnueabihf": "20.2.2",
+    "@nx/nx-linux-arm64-gnu": "20.2.2",
+    "@nx/nx-linux-arm64-musl": "20.2.2",
+    "@nx/nx-linux-x64-gnu": "20.2.2",
+    "@nx/nx-linux-x64-musl": "20.2.2",
+    "@nx/nx-win32-arm64-msvc": "20.2.2",
+    "@nx/nx-win32-x64-msvc": "20.2.2"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",
@@ -108,6 +109,7 @@
       "@nx/expo",
       "@nx/express",
       "@nx/gradle",
+      "@nx/module-federation",
       "@nx/nest",
       "@nx/next",
       "@nx/node",

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.`,
+                ],
+        });
     }
 }

package/src/command-line/release/utils/git.js

@@ -84,14 +84,15 @@ async function getGitDiff(from, to = 'HEAD') {
     else {
         range = `${from}..${to}`;
     }
-    // Use a unique enough separator that we can be relatively certain will not occur within the commit message itself
-    const separator = '§§§';
+    // Use unique enough separators that we can be relatively certain will not occur within the commit message itself
+    const commitMetadataSeparator = '§§§';
+    const commitsSeparator = '|@-------@|';
     // https://git-scm.com/docs/pretty-formats
     const args = [
         '--no-pager',
         'log',
         range,
-        `--pretty="----%n%s${separator}%h${separator}%an${separator}%ae%n%b"`,
+        `--pretty="${commitsSeparator}%n%s${commitMetadataSeparator}%h${commitMetadataSeparator}%an${commitMetadataSeparator}%ae%n%b"`,
         '--name-status',
     ];
     // Support cases where the nx workspace root is located at a nested path within the git repo
@@ -101,11 +102,11 @@ async function getGitDiff(from, to = 'HEAD') {
     }
     const r = await (0, exec_command_1.execCommand)('git', args);
     return r
-        .split('----\n')
+        .split(`${commitsSeparator}\n`)
         .splice(1)
         .map((line) => {
         const [firstLine, ..._body] = line.split('\n');
-        const [message, shortHash, authorName, authorEmail] = firstLine.split(separator);
+        const [message, shortHash, authorName, authorEmail] = firstLine.split(commitMetadataSeparator);
         const r = {
             message,
             shortHash,

package/src/plugins/package-json/create-nodes.js

@@ -155,7 +155,7 @@ function getGlobPatternsFromPackageManagerWorkspaces(root, readJson = (path) =>
             : packageJson.workspaces?.packages ?? []));
         if ((0, node_fs_1.existsSync)((0, node_path_1.join)(root, 'pnpm-workspace.yaml'))) {
             try {
-                const { packages } = (0, fileutils_1.readYamlFile)((0, node_path_1.join)(root, 'pnpm-workspace.yaml'));
+                const { packages } = (0, fileutils_1.readYamlFile)((0, node_path_1.join)(root, 'pnpm-workspace.yaml')) ?? {};
                 patterns.push(...normalizePatterns(packages || []));
             }
             catch (e) {
@@ -167,7 +167,7 @@ function getGlobPatternsFromPackageManagerWorkspaces(root, readJson = (path) =>
         }
         if ((0, node_fs_1.existsSync)((0, node_path_1.join)(root, 'lerna.json'))) {
             try {
-                const { packages } = readJson('lerna.json');
+                const { packages } = readJson('lerna.json') ?? {};
                 patterns.push(...normalizePatterns(packages?.length > 0 ? packages : ['packages/*']));
             }
             catch (e) {

package/src/project-graph/file-utils.d.ts

@@ -26,5 +26,5 @@ export declare function readWorkspaceConfig(opts: {
     path?: string;
 }): ProjectsConfigurations;
 export declare function defaultFileRead(filePath: string): string | null;
-export declare function readPackageJson(): any;
+export declare function readPackageJson(root?: string): any;
 export { FileData };

package/src/project-graph/file-utils.js

@@ -131,9 +131,9 @@ function readWorkspaceConfig(opts) {
 function defaultFileRead(filePath) {
     return (0, fs_1.readFileSync)((0, path_1.join)(workspace_root_1.workspaceRoot, filePath), 'utf-8');
 }
-function readPackageJson() {
+function readPackageJson(root = workspace_root_1.workspaceRoot) {
     try {
-        return (0, fileutils_1.readJsonFile)(`${workspace_root_1.workspaceRoot}/package.json`);
+        return (0, fileutils_1.readJsonFile)(`${root}/package.json`);
     }
     catch {
         return {}; // if package.json doesn't exist

package/src/project-graph/plugins/get-plugins.js

@@ -21,6 +21,7 @@ async function getPlugins() {
     }
     // Cleanup current plugins before loading new ones
     if (cleanup) {
+        pendingPluginsPromise = undefined;
         cleanup();
     }
     pendingPluginsPromise ??= (0, internal_api_1.loadNxPlugins)(pluginsConfiguration, workspace_root_1.workspaceRoot);
@@ -40,6 +41,7 @@ async function getOnlyDefaultPlugins() {
     }
     // Cleanup current plugins before loading new ones
     if (cleanupDefaultPlugins) {
+        pendingDefaultPluginPromise = undefined;
         cleanupDefaultPlugins();
     }
     pendingDefaultPluginPromise ??= (0, internal_api_1.loadNxPlugins)([], workspace_root_1.workspaceRoot);

package/src/utils/package-json.js

@@ -81,8 +81,8 @@ function readTargetsFromPackageJson(packageJson, nxJson) {
     const { scripts, nx, private: isPrivate } = packageJson ?? {};
     const res = {};
     const includedScripts = nx?.includedScripts || Object.keys(scripts ?? {});
-    packageManagerCommand ??= (0, package_manager_1.getPackageManagerCommand)();
     for (const script of includedScripts) {
+        packageManagerCommand ??= (0, package_manager_1.getPackageManagerCommand)();
         res[script] = buildTargetFromScript(script, scripts, packageManagerCommand);
     }
     for (const targetName in nx?.targets) {

package/src/utils/package-manager.d.ts

@@ -98,3 +98,17 @@ export declare function packageRegistryView(pkg: string, version: string, args:
 export declare function packageRegistryPack(cwd: string, pkg: string, version: string): Promise<{
     tarballPath: string;
 }>;
+/**
+ * Gets the workspaces defined in the package manager configuration.
+ * @returns workspaces defined in the package manager configuration, empty array if none are defined
+ */
+export declare function getPackageWorkspaces(packageManager?: PackageManager, root?: string): string[];
+/**
+ * Adds a package to the workspaces defined in the package manager configuration.
+ * If the package is already included in the workspaces, it will not be added again.
+ * @param packageManager The package manager to use. If not provided, it will be detected based on the lock file.
+ * @param workspaces The workspaces to add the package to. Defaults to the workspaces defined in the package manager configuration.
+ * @param root The directory the commands will be ran inside of. Defaults to the current workspace's root.
+ * @param packagePath The path of the package to add to the workspaces
+ */
+export declare function addPackagePathToWorkspaces(packagePath: string, packageManager?: PackageManager, workspaces?: string[], root?: string): void;

package/src/utils/package-manager.js

@@ -13,8 +13,11 @@ exports.resolvePackageVersionUsingRegistry = resolvePackageVersionUsingRegistry;
 exports.resolvePackageVersionUsingInstallation = resolvePackageVersionUsingInstallation;
 exports.packageRegistryView = packageRegistryView;
 exports.packageRegistryPack = packageRegistryPack;
+exports.getPackageWorkspaces = getPackageWorkspaces;
+exports.addPackagePathToWorkspaces = addPackagePathToWorkspaces;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
+const yaml_1 = require("yaml");
 const promises_1 = require("node:fs/promises");
 const path_1 = require("path");
 const semver_1 = require("semver");
@@ -50,7 +53,7 @@ function isWorkspacesEnabled(packageManager = detectPackageManager(), root = wor
         return (0, fs_1.existsSync)((0, path_1.join)(root, 'pnpm-workspace.yaml'));
     }
     // yarn and npm both use the same 'workspaces' property in package.json
-    const packageJson = (0, file_utils_1.readPackageJson)();
+    const packageJson = (0, file_utils_1.readPackageJson)(root);
     return !!packageJson?.workspaces;
 }
 /**
@@ -402,3 +405,86 @@ async function packageRegistryPack(cwd, pkg, version) {
     const tarballPath = stdout.trim();
     return { tarballPath };
 }
+/**
+ * Gets the workspaces defined in the package manager configuration.
+ * @returns workspaces defined in the package manager configuration, empty array if none are defined
+ */
+function getPackageWorkspaces(packageManager = detectPackageManager(), root = workspace_root_1.workspaceRoot) {
+    let workspaces;
+    if (packageManager === 'npm' ||
+        packageManager === 'yarn' ||
+        packageManager === 'bun') {
+        const packageJson = (0, file_utils_1.readPackageJson)(root);
+        workspaces = packageJson.workspaces;
+    }
+    else if (packageManager === 'pnpm') {
+        const pnpmWorkspacePath = (0, path_1.join)(root, 'pnpm-workspace.yaml');
+        if ((0, fs_1.existsSync)(pnpmWorkspacePath)) {
+            const { packages } = (0, fileutils_1.readYamlFile)(pnpmWorkspacePath) ?? {};
+            workspaces = packages;
+        }
+    }
+    return workspaces ?? [];
+}
+/**
+ * Adds a package to the workspaces defined in the package manager configuration.
+ * If the package is already included in the workspaces, it will not be added again.
+ * @param packageManager The package manager to use. If not provided, it will be detected based on the lock file.
+ * @param workspaces The workspaces to add the package to. Defaults to the workspaces defined in the package manager configuration.
+ * @param root The directory the commands will be ran inside of. Defaults to the current workspace's root.
+ * @param packagePath The path of the package to add to the workspaces
+ */
+function addPackagePathToWorkspaces(packagePath, packageManager = detectPackageManager(), workspaces = getPackageWorkspaces(packageManager), root = workspace_root_1.workspaceRoot) {
+    if (packageManager === 'npm' ||
+        packageManager === 'yarn' ||
+        packageManager === 'bun') {
+        workspaces.push(packagePath);
+        const packageJson = (0, file_utils_1.readPackageJson)(root);
+        const updatedPackageJson = {
+            ...packageJson,
+            workspaces,
+        };
+        const packageJsonPath = (0, path_1.join)(root, 'package.json');
+        (0, fileutils_1.writeJsonFile)(packageJsonPath, updatedPackageJson);
+    }
+    else if (packageManager === 'pnpm') {
+        const pnpmWorkspacePath = (0, path_1.join)(root, 'pnpm-workspace.yaml');
+        if ((0, fs_1.existsSync)(pnpmWorkspacePath)) {
+            const pnpmWorkspaceDocument = (0, yaml_1.parseDocument)((0, fileutils_1.readFileIfExisting)(pnpmWorkspacePath));
+            const pnpmWorkspaceContents = pnpmWorkspaceDocument.contents;
+            if (!pnpmWorkspaceContents) {
+                (0, fs_1.writeFileSync)(pnpmWorkspacePath, (0, yaml_1.stringify)({
+                    packages: [packagePath],
+                }));
+            }
+            else if (pnpmWorkspaceContents instanceof yaml_1.YAMLMap) {
+                const packages = pnpmWorkspaceContents.items.find((item) => {
+                    return item.key instanceof yaml_1.Scalar
+                        ? item.key?.value === 'packages'
+                        : item.key === 'packages';
+                });
+                if (packages) {
+                    if (packages.value instanceof yaml_1.YAMLSeq === false) {
+                        packages.value = new yaml_1.YAMLSeq();
+                    }
+                    packages.value.items ??= [];
+                    packages.value.items.push(packagePath);
+                }
+                else {
+                    // if the 'packages' key doesn't exist, create it
+                    const packagesSeq = new yaml_1.YAMLSeq();
+                    packagesSeq.items ??= [];
+                    packagesSeq.items.push(packagePath);
+                    pnpmWorkspaceDocument.add(pnpmWorkspaceDocument.createPair('packages', packagesSeq));
+                }
+                (0, fs_1.writeFileSync)(pnpmWorkspacePath, (0, yaml_1.stringify)(pnpmWorkspaceContents));
+            }
+        }
+        else {
+            // If the file doesn't exist, create it
+            (0, fs_1.writeFileSync)(pnpmWorkspacePath, (0, yaml_1.stringify)({
+                packages: [packagePath],
+            }));
+        }
+    }
+}