nx 19.3.0-canary.20240607-7495f06 → 19.3.0-canary.20240611-1600875

package/migrations.json

@@ -77,6 +77,12 @@
       "version": "19.2.0-beta.2",
       "description": "Updates the default workspace data directory to .nx/workspace-data",
       "implementation": "./src/migrations/update-19-2-0/move-workspace-data-directory"
+    },
+    "19-2-2-update-nx-wrapper": {
+      "cli": "nx",
+      "version": "19.2.2-beta.0",
+      "description": "Updates the nx wrapper.",
+      "implementation": "./src/migrations/update-17-3-0/update-nxw"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.3.0-canary.20240607-7495f06",
+  "version": "19.3.0-canary.20240611-1600875",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -70,7 +70,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.3.0-canary.20240607-7495f06"
+    "@nrwl/tao": "19.3.0-canary.20240611-1600875"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -85,16 +85,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.3.0-canary.20240607-7495f06",
-    "@nx/nx-darwin-arm64": "19.3.0-canary.20240607-7495f06",
-    "@nx/nx-linux-x64-gnu": "19.3.0-canary.20240607-7495f06",
-    "@nx/nx-linux-x64-musl": "19.3.0-canary.20240607-7495f06",
-    "@nx/nx-win32-x64-msvc": "19.3.0-canary.20240607-7495f06",
-    "@nx/nx-linux-arm64-gnu": "19.3.0-canary.20240607-7495f06",
-    "@nx/nx-linux-arm64-musl": "19.3.0-canary.20240607-7495f06",
-    "@nx/nx-linux-arm-gnueabihf": "19.3.0-canary.20240607-7495f06",
-    "@nx/nx-win32-arm64-msvc": "19.3.0-canary.20240607-7495f06",
-    "@nx/nx-freebsd-x64": "19.3.0-canary.20240607-7495f06"
+    "@nx/nx-darwin-x64": "19.3.0-canary.20240611-1600875",
+    "@nx/nx-darwin-arm64": "19.3.0-canary.20240611-1600875",
+    "@nx/nx-linux-x64-gnu": "19.3.0-canary.20240611-1600875",
+    "@nx/nx-linux-x64-musl": "19.3.0-canary.20240611-1600875",
+    "@nx/nx-win32-x64-msvc": "19.3.0-canary.20240611-1600875",
+    "@nx/nx-linux-arm64-gnu": "19.3.0-canary.20240611-1600875",
+    "@nx/nx-linux-arm64-musl": "19.3.0-canary.20240611-1600875",
+    "@nx/nx-linux-arm-gnueabihf": "19.3.0-canary.20240611-1600875",
+    "@nx/nx-win32-arm64-msvc": "19.3.0-canary.20240611-1600875",
+    "@nx/nx-freebsd-x64": "19.3.0-canary.20240611-1600875"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/init/implementation/dot-nx/add-nx-scripts.js

@@ -11,17 +11,36 @@ const nxWrapperPath = (p = path) => p.join('.nx', 'nxw.js');
 exports.nxWrapperPath = nxWrapperPath;
 const NODE_MISSING_ERR = 'Nx requires NodeJS to be available. To install NodeJS and NPM, see: https://nodejs.org/en/download/ .';
 const NPM_MISSING_ERR = 'Nx requires npm to be available. To install NodeJS and NPM, see: https://nodejs.org/en/download/ .';
-const BATCH_SCRIPT_CONTENTS = `set path_to_root=%~dp0
-WHERE node >nul 2>nul
-IF %ERRORLEVEL% NEQ 0 (ECHO ${NODE_MISSING_ERR}; EXIT 1)
-WHERE npm >nul 2>nul
-IF %ERRORLEVEL% NEQ 0 (ECHO ${NPM_MISSING_ERR}; EXIT 1)
-node ${path.win32.join('%path_to_root%', (0, exports.nxWrapperPath)(path.win32))} %*`;
-const SHELL_SCRIPT_CONTENTS = `#!/bin/bash
-command -v node >/dev/null 2>&1 || { echo >&2 "${NODE_MISSING_ERR}"; exit 1; }
-command -v npm >/dev/null 2>&1 || { echo >&2 "${NPM_MISSING_ERR}"; exit 1; }
-path_to_root=$(dirname $BASH_SOURCE)
-node ${path.posix.join('$path_to_root', (0, exports.nxWrapperPath)(path.posix))} $@`;
+const BATCH_SCRIPT_CONTENTS = [
+    // don't log command to console
+    `@ECHO OFF`,
+    // Prevents path_to_root from being inherited by child processes
+    `SETLOCAL`,
+    `SET path_to_root=%~dp0`,
+    // Checks if node is available
+    `WHERE node >nul 2>nul`,
+    `IF %ERRORLEVEL% NEQ 0 (ECHO ${NODE_MISSING_ERR} & GOTO exit)`,
+    // Checks if npm is available
+    `WHERE npm >nul 2>nul`,
+    `IF %ERRORLEVEL% NEQ 0 (ECHO ${NPM_MISSING_ERR} & GOTO exit)`,
+    // Executes the nx wrapper script
+    `node ${path.win32.join('%path_to_root%', (0, exports.nxWrapperPath)(path.win32))} %*`,
+    // Exits with the same error code as the previous command
+    `:exit`,
+    `  cmd /c exit /b %ERRORLEVEL%`,
+].join('\r\n');
+const SHELL_SCRIPT_CONTENTS = [
+    // Execute in bash
+    `#!/bin/bash`,
+    // Checks if node is available
+    `command -v node >/dev/null 2>&1 || { echo >&2 "${NODE_MISSING_ERR}"; exit 1; }`,
+    // Checks if npm is available
+    `command -v npm >/dev/null 2>&1 || { echo >&2 "${NPM_MISSING_ERR}"; exit 1; }`,
+    // Gets the path to the root of the project
+    `path_to_root=$(dirname $BASH_SOURCE)`,
+    // Executes the nx wrapper script
+    `node ${path.posix.join('$path_to_root', (0, exports.nxWrapperPath)(path.posix))} $@`,
+].join('\n');
 function generateDotNxSetup(version) {
     const host = new tree_1.FsTree(process.cwd(), false, '.nx setup');
     writeMinimalNxJson(host, version);
@@ -54,8 +73,14 @@ function writeMinimalNxJson(host, version) {
 }
 exports.writeMinimalNxJson = writeMinimalNxJson;
 function updateGitIgnore(host) {
-    const contents = host.read('.gitignore', 'utf-8') ?? '';
-    host.write('.gitignore', [contents, '.nx/installation', '.nx/cache'].join('\n'));
+    let contents = host.read('.gitignore', 'utf-8') ?? '';
+    if (!contents.includes('.nx/installation')) {
+        contents = [contents, '.nx/installation'].join('\n');
+    }
+    if (!contents.includes('.nx/cache')) {
+        contents = [contents, '.nx/cache'].join('\n');
+    }
+    host.write('.gitignore', contents);
 }
 exports.updateGitIgnore = updateGitIgnore;
 // Gets the sanitized contents for nxw.js

package/src/command-line/release/utils/git.d.ts

@@ -27,12 +27,12 @@ export declare function getLatestGitTagForPattern(releaseTagPattern: string, add
     extractedVersion: string;
 } | null>;
 export declare function getGitDiff(from: string | undefined, to?: string): Promise<RawGitCommit[]>;
-export declare function getChangedTrackedFiles(): Promise<Set<string>>;
-export declare function gitAdd({ changedFiles, deletedFiles, dryRun, verbose, logFn, }: {
+export declare function gitAdd({ changedFiles, deletedFiles, dryRun, verbose, logFn, cwd, }: {
     changedFiles?: string[];
     deletedFiles?: string[];
     dryRun?: boolean;
     verbose?: boolean;
+    cwd?: string;
     logFn?: (...messages: string[]) => void;
 }): Promise<string>;
 export declare function gitCommit({ messages, additionalArgs, dryRun, verbose, logFn, }: {

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

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFirstGitCommit = exports.getCommitHash = exports.parseGitCommit = exports.parseConventionalCommitsMessage = exports.parseCommits = exports.gitPush = exports.gitTag = exports.gitCommit = exports.gitAdd = exports.getChangedTrackedFiles = exports.getGitDiff = exports.getLatestGitTagForPattern = void 0;
+exports.getFirstGitCommit = exports.getCommitHash = exports.parseGitCommit = exports.parseConventionalCommitsMessage = exports.parseCommits = exports.gitPush = exports.gitTag = exports.gitCommit = exports.gitAdd = exports.getGitDiff = exports.getLatestGitTagForPattern = void 0;
 /**
  * Special thanks to changelogen for the original inspiration for many of these utilities:
  * https://github.com/unjs/changelogen
  */
 const utils_1 = require("../../../tasks-runner/utils");
+const app_root_1 = require("../../../utils/app-root");
 const exec_command_1 = require("./exec-command");
 function escapeRegExp(string) {
     return string.replace(/[/\-\\^$*+?.()|[\]{}]/g, '\\$&');
@@ -97,18 +98,21 @@ async function getGitDiff(from, to = 'HEAD') {
     });
 }
 exports.getGitDiff = getGitDiff;
-async function getChangedTrackedFiles() {
-    const result = await (0, exec_command_1.execCommand)('git', ['status', '--porcelain']);
+async function getChangedTrackedFiles(cwd) {
+    const result = await (0, exec_command_1.execCommand)('git', ['status', '--porcelain'], {
+        cwd,
+    });
     const lines = result.split('\n').filter((l) => l.trim().length > 0);
     return new Set(lines.map((l) => l.substring(3)));
 }
-exports.getChangedTrackedFiles = getChangedTrackedFiles;
-async function gitAdd({ changedFiles, deletedFiles, dryRun, verbose, logFn, }) {
+async function gitAdd({ changedFiles, deletedFiles, dryRun, verbose, logFn, cwd, }) {
     logFn = logFn || console.log;
+    // Default to running git add related commands from the workspace root
+    cwd = cwd || app_root_1.workspaceRoot;
     let ignoredFiles = [];
     let filesToAdd = [];
     for (const f of changedFiles ?? []) {
-        const isFileIgnored = await isIgnored(f);
+        const isFileIgnored = await isIgnored(f, cwd);
         if (isFileIgnored) {
             ignoredFiles.push(f);
         }
@@ -117,9 +121,9 @@ async function gitAdd({ changedFiles, deletedFiles, dryRun, verbose, logFn, }) {
         }
     }
     if (deletedFiles?.length > 0) {
-        const changedTrackedFiles = await getChangedTrackedFiles();
+        const changedTrackedFiles = await getChangedTrackedFiles(cwd);
         for (const f of deletedFiles ?? []) {
-            const isFileIgnored = await isIgnored(f);
+            const isFileIgnored = await isIgnored(f, cwd);
             if (isFileIgnored) {
                 ignoredFiles.push(f);
                 // git add will fail if trying to add an untracked file that doesn't exist
@@ -151,13 +155,17 @@ async function gitAdd({ changedFiles, deletedFiles, dryRun, verbose, logFn, }) {
     if (dryRun) {
         return;
     }
-    return (0, exec_command_1.execCommand)('git', commandArgs);
+    return (0, exec_command_1.execCommand)('git', commandArgs, {
+        cwd,
+    });
 }
 exports.gitAdd = gitAdd;
-async function isIgnored(filePath) {
+async function isIgnored(filePath, cwd) {
     try {
         // This command will error if the file is not ignored
-        await (0, exec_command_1.execCommand)('git', ['check-ignore', filePath]);
+        await (0, exec_command_1.execCommand)('git', ['check-ignore', filePath], {
+            cwd,
+        });
         return true;
     }
     catch {

package/src/command-line/release/version.d.ts

@@ -18,7 +18,7 @@ export interface ReleaseVersionGeneratorSchema {
     currentVersionResolverMetadata?: Record<string, unknown>;
     fallbackCurrentVersionResolver?: 'disk';
     firstRelease?: boolean;
-    versionPrefix?: typeof validReleaseVersionPrefixes[number];
+    versionPrefix?: (typeof validReleaseVersionPrefixes)[number];
     skipLockFileUpdate?: boolean;
     installArgs?: string;
     installIgnoreScripts?: boolean;

package/src/command-line/release/version.js

@@ -378,7 +378,7 @@ function resolveGeneratorData({ collectionName, generatorName, configGeneratorOp
                  * the @nx/js generator config in their nx.json so we need to be clear about what the problem is)
                  */
                 if (collectionName === '@nx/js') {
-                    throw new Error('The @nx/js plugin is required in order to version your JavaScript packages. Please install it and try again.');
+                    throw new Error('The @nx/js plugin is required in order to version your JavaScript packages. Run "nx add @nx/js" to add it to your workspace.');
                 }
                 throw new Error(`Unable to resolve the package ${collectionName} in order to load the generator called ${generatorName}. Is the package installed?`);
             }

package/src/command-line/yargs-utils/shared-options.d.ts

@@ -57,7 +57,7 @@ export declare function withOverrides<T extends {
     __overrides_unparsed__: string[];
 };
 declare const allOutputStyles: readonly ["dynamic", "static", "stream", "stream-without-prefixes", "compact"];
-export type OutputStyle = typeof allOutputStyles[number];
+export type OutputStyle = (typeof allOutputStyles)[number];
 export declare function withOutputStyleOption(yargs: Argv, choices?: ReadonlyArray<OutputStyle>): Argv<{
     "output-style": string;
 }>;