nx 23.2.0-beta.1 → 23.2.0-beta.3

package/dist/src/utils/git-utils.d.ts

@@ -36,6 +36,21 @@ export interface VcsRemoteInfo {
 }
 export declare function parseVcsRemoteUrl(url: string): VcsRemoteInfo | null;
 export declare function getVcsRemoteInfo(directory?: string): VcsRemoteInfo | null;
+export declare function getGitRootPath(cwd?: string): string;
+/**
+ * Path of `directory` relative to its git root, posix-separated so it is
+ * identical on every OS, and '' when the directory is the git root itself.
+ * Null outside a git repository.
+ */
+export declare function getGitRootRelativePath(directory: string): string | null;
+/** A shallow clone's truncated history has no stable root commit. */
+export declare function isShallowRepository(directory?: string): boolean;
+/**
+ * SHA of the repository's first commit. Merged unrelated histories leave
+ * several root commits — the sorted-first one is picked so every clone
+ * agrees. Null when there are no commits, or outside a git repository.
+ */
+export declare function getFirstCommitSha(directory?: string): string | null;
 export declare function isGitRepository(directory?: string): boolean;
 export declare function getGitCurrentBranch(directory?: string): string | null;
 export declare function hasUncommittedChanges(directory?: string): boolean;

package/dist/src/utils/git-utils.js

@@ -4,6 +4,10 @@ exports.GitRepository = void 0;
 exports.cloneFromUpstream = cloneFromUpstream;
 exports.parseVcsRemoteUrl = parseVcsRemoteUrl;
 exports.getVcsRemoteInfo = getVcsRemoteInfo;
+exports.getGitRootPath = getGitRootPath;
+exports.getGitRootRelativePath = getGitRootRelativePath;
+exports.isShallowRepository = isShallowRepository;
+exports.getFirstCommitSha = getFirstCommitSha;
 exports.isGitRepository = isGitRepository;
 exports.getGitCurrentBranch = getGitCurrentBranch;
 exports.hasUncommittedChanges = hasUncommittedChanges;
@@ -49,12 +53,7 @@ class GitRepository {
         this.root = this.getGitRootPath(this.directory);
     }
     getGitRootPath(cwd) {
-        return (0, child_process_1.execFileSync)('git', ['rev-parse', '--show-toplevel'], {
-            cwd,
-            windowsHide: true,
-        })
-            .toString()
-            .trim();
+        return getGitRootPath(cwd);
     }
     async hasUncommittedChanges() {
         const data = await this.execGit(['status', '--porcelain']);
@@ -297,6 +296,65 @@ function getVcsRemoteInfo(directory) {
         return null;
     }
 }
+function getGitRootPath(cwd) {
+    return (0, child_process_1.execFileSync)('git', ['rev-parse', '--show-toplevel'], {
+        cwd,
+        windowsHide: true,
+    })
+        .toString()
+        .trim();
+}
+/**
+ * Path of `directory` relative to its git root, posix-separated so it is
+ * identical on every OS, and '' when the directory is the git root itself.
+ * Null outside a git repository.
+ */
+function getGitRootRelativePath(directory) {
+    try {
+        return (0, path_1.relative)(getGitRootPath(directory), directory)
+            .split(path_1.sep)
+            .join(path_1.posix.sep);
+    }
+    catch {
+        return null;
+    }
+}
+/** A shallow clone's truncated history has no stable root commit. */
+function isShallowRepository(directory) {
+    try {
+        return ((0, child_process_1.execFileSync)('git', ['rev-parse', '--is-shallow-repository'], {
+            encoding: 'utf8',
+            stdio: 'pipe',
+            cwd: directory,
+            windowsHide: true,
+        }).trim() === 'true');
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * SHA of the repository's first commit. Merged unrelated histories leave
+ * several root commits — the sorted-first one is picked so every clone
+ * agrees. Null when there are no commits, or outside a git repository.
+ */
+function getFirstCommitSha(directory) {
+    try {
+        const roots = (0, child_process_1.execFileSync)('git', ['rev-list', '--max-parents=0', 'HEAD'], {
+            encoding: 'utf8',
+            stdio: 'pipe',
+            cwd: directory,
+            windowsHide: true,
+        })
+            .trim()
+            .split(/\r?\n/)
+            .filter(Boolean);
+        return roots.sort()[0] ?? null;
+    }
+    catch {
+        return null;
+    }
+}
 function isGitRepository(directory) {
     try {
         (0, child_process_1.execSync)('git rev-parse --is-inside-work-tree', {

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

@@ -121,7 +121,9 @@ export declare function resolvePackageVersionUsingInstallation(packageName: stri
 export declare function packageRegistryView(pkg: string, version: string, args: string, options?: {
     forceNpm?: boolean;
 }): Promise<string>;
-export declare function packageRegistryPack(cwd: string, pkg: string, version: string): Promise<{
+export declare function packageRegistryPack(cwd: string, pkg: string, version: string, options?: {
+    bypassMinReleaseAge?: boolean;
+}): Promise<{
     tarballPath: string;
 }>;
 /**

package/dist/src/utils/package-manager.js

@@ -349,6 +349,20 @@ function modifyPnpmWorkspaceYamlToFitNewDirectory(contents) {
     doc.set('packages', ['.']);
     // Relative patch paths don't resolve in the temp dir.
     doc.delete('patchedDependencies');
+    // link:/file: overrides (e.g. written by `pnpm link`) point at paths that
+    // don't exist in the temp dir, and an override would hijack an exact-version
+    // add (`pnpm add pkg@x.y.z` would install the linked dir instead).
+    const overrides = doc.toJS()?.overrides;
+    if (overrides && typeof overrides === 'object') {
+        for (const [name, spec] of Object.entries(overrides)) {
+            if (typeof spec === 'string' && /^(link|file):/.test(spec)) {
+                doc.deleteIn(['overrides', name]);
+            }
+        }
+        if (Object.keys(doc.toJS()?.overrides ?? {}).length === 0) {
+            doc.delete('overrides');
+        }
+    }
     return doc.toString();
 }
 function copyPackageManagerConfigurationFiles(root, destination) {
@@ -519,7 +533,7 @@ options) {
     });
     return stdout.toString().trim();
 }
-async function packageRegistryPack(cwd, pkg, version) {
+async function packageRegistryPack(cwd, pkg, version, options) {
     /**
      * Only `npm pack` supports downloading a tarball of a specified remote
      * package. `yarn` packs the active workspace, `pnpm pack` only packs
@@ -533,7 +547,13 @@ async function packageRegistryPack(cwd, pkg, version) {
         windowsHide: true,
         // npm enforces `devEngines.packageManager` even on `pack`; force keeps the
         // download working in workspaces that pin a non-npm manager (onFail: error).
-        env: { ...process.env, npm_config_force: 'true' },
+        env: {
+            ...process.env,
+            npm_config_force: 'true',
+            ...(options?.bypassMinReleaseAge
+                ? { npm_config_min_release_age: '0' }
+                : {}),
+        },
     });
     const tarballPath = stdout.trim();
     return { tarballPath };

package/dist/src/utils/workspace-id.d.ts

@@ -0,0 +1,20 @@
+import type { NxJsonConfiguration } from '../config/nx-json';
+/**
+ * The workspace's analytics identity: the Nx Cloud id when the workspace has
+ * one (most stable — it survives repo moves and renames), else the repo key.
+ * Null when neither is available, in which case nothing is reported.
+ */
+export declare function generateWorkspaceId(root: string, nxJson: NxJsonConfiguration | null): string | null;
+/**
+ * Derive the stable, unsalted key identifying this workspace in the
+ * repoTelemetry registry: `sha256(<repo identity> + '#' + <workspace path
+ * relative to the git root>)`.
+ *
+ * The repo identity is the normalized `domain/slug` from the git remote
+ * (protocol-independent: ssh, https, and token-authenticated URLs of the
+ * same repo produce the same key), falling back to the first-commit SHA
+ * when no remote exists. Returns null when no identity is derivable — not
+ * a git repository, or a shallow clone without a remote.
+ */
+export declare function deriveRepoKey(directory: string): string | null;
+export declare function computeRepoKey(identity: string, relativePath: string): string;

package/dist/src/utils/workspace-id.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateWorkspaceId = generateWorkspaceId;
+exports.deriveRepoKey = deriveRepoKey;
+exports.computeRepoKey = computeRepoKey;
+const crypto_1 = require("crypto");
+const git_utils_1 = require("./git-utils");
+/**
+ * The workspace's analytics identity: the Nx Cloud id when the workspace has
+ * one (most stable — it survives repo moves and renames), else the repo key.
+ * Null when neither is available, in which case nothing is reported.
+ */
+function generateWorkspaceId(root, nxJson) {
+    const nxCloudId = nxJson?.nxCloudId ?? nxJson?.nxCloudAccessToken;
+    if (nxCloudId) {
+        return nxCloudId;
+    }
+    return deriveRepoKey(root);
+}
+/**
+ * Derive the stable, unsalted key identifying this workspace in the
+ * repoTelemetry registry: `sha256(<repo identity> + '#' + <workspace path
+ * relative to the git root>)`.
+ *
+ * The repo identity is the normalized `domain/slug` from the git remote
+ * (protocol-independent: ssh, https, and token-authenticated URLs of the
+ * same repo produce the same key), falling back to the first-commit SHA
+ * when no remote exists. Returns null when no identity is derivable — not
+ * a git repository, or a shallow clone without a remote.
+ */
+function deriveRepoKey(directory) {
+    const identity = getRepoIdentity(directory);
+    if (!identity) {
+        return null;
+    }
+    return computeRepoKey(identity, (0, git_utils_1.getGitRootRelativePath)(directory) ?? '');
+}
+function computeRepoKey(identity, relativePath) {
+    return (0, crypto_1.createHash)('sha256')
+        .update(`${identity}#${relativePath}`)
+        .digest('hex');
+}
+function getRepoIdentity(directory) {
+    const remote = (0, git_utils_1.getVcsRemoteInfo)(directory);
+    if (remote) {
+        // Hosts route case-insensitively and hold one canonical casing, so a
+        // hand-typed remote must key the same as the canonical one the claim
+        // flow derives from the host's API.
+        return `${remote.domain}/${remote.slug}`.toLowerCase().replace(/\/+$/, '');
+    }
+    // Without a remote the first commit is the only stable identity, and a
+    // shallow clone doesn't have a real one.
+    return (0, git_utils_1.isShallowRepository)(directory) ? null : (0, git_utils_1.getFirstCommitSha)(directory);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "23.2.0-beta.1",
+  "version": "23.2.0-beta.3",
   "private": false,
   "type": "commonjs",
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
@@ -67,6 +67,7 @@
     "bl": "4.1.0",
     "brace-expansion": "5.0.6",
     "buffer": "5.7.1",
+    "bundle-name": "4.1.0",
     "call-bind-apply-helpers": "1.0.2",
     "chalk": "4.1.2",
     "cli-cursor": "3.1.0",
@@ -77,8 +78,10 @@
     "color-name": "1.1.4",
     "combined-stream": "1.0.8",
     "debug": "4.4.3",
+    "default-browser": "5.2.1",
+    "default-browser-id": "5.0.0",
     "defaults": "1.0.4",
-    "define-lazy-prop": "2.0.0",
+    "define-lazy-prop": "3.0.0",
     "delayed-stream": "1.0.0",
     "dotenv": "16.4.7",
     "dotenv-expand": "12.0.3",
@@ -111,11 +114,12 @@
     "ieee754": "1.2.1",
     "ignore": "7.0.5",
     "inherits": "2.0.4",
-    "is-docker": "2.2.1",
+    "is-docker": "3.0.0",
     "is-fullwidth-code-point": "3.0.0",
+    "is-inside-container": "1.0.0",
     "is-interactive": "1.0.0",
     "is-unicode-supported": "0.1.0",
-    "is-wsl": "2.2.0",
+    "is-wsl": "3.1.0",
     "isexe": "2.0.0",
     "json5": "2.2.3",
     "jsonc-parser": "3.3.1",
@@ -131,7 +135,7 @@
     "npm-run-path": "4.0.1",
     "once": "1.4.0",
     "onetime": "5.1.2",
-    "open": "8.4.2",
+    "open": "10.1.0",
     "ora": "5.4.1",
     "path-key": "3.1.1",
     "picocolors": "1.1.1",
@@ -140,6 +144,7 @@
     "require-directory": "2.1.1",
     "resolve.exports": "2.0.3",
     "restore-cursor": "3.1.0",
+    "run-applescript": "7.0.0",
     "safe-buffer": "5.2.1",
     "semver": "7.8.4",
     "signal-exit": "3.0.7",
@@ -176,16 +181,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "23.2.0-beta.1",
-    "@nx/nx-darwin-x64": "23.2.0-beta.1",
-    "@nx/nx-freebsd-x64": "23.2.0-beta.1",
-    "@nx/nx-linux-arm-gnueabihf": "23.2.0-beta.1",
-    "@nx/nx-linux-arm64-gnu": "23.2.0-beta.1",
-    "@nx/nx-linux-arm64-musl": "23.2.0-beta.1",
-    "@nx/nx-linux-x64-gnu": "23.2.0-beta.1",
-    "@nx/nx-linux-x64-musl": "23.2.0-beta.1",
-    "@nx/nx-win32-arm64-msvc": "23.2.0-beta.1",
-    "@nx/nx-win32-x64-msvc": "23.2.0-beta.1"
+    "@nx/nx-darwin-arm64": "23.2.0-beta.3",
+    "@nx/nx-darwin-x64": "23.2.0-beta.3",
+    "@nx/nx-freebsd-x64": "23.2.0-beta.3",
+    "@nx/nx-linux-arm-gnueabihf": "23.2.0-beta.3",
+    "@nx/nx-linux-arm64-gnu": "23.2.0-beta.3",
+    "@nx/nx-linux-arm64-musl": "23.2.0-beta.3",
+    "@nx/nx-linux-x64-gnu": "23.2.0-beta.3",
+    "@nx/nx-linux-x64-musl": "23.2.0-beta.3",
+    "@nx/nx-win32-arm64-msvc": "23.2.0-beta.3",
+    "@nx/nx-win32-x64-msvc": "23.2.0-beta.3"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",