nx 20.1.0-beta.2 → 20.1.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "20.1.0-beta.2",
+  "version": "20.1.0-beta.4",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -80,16 +80,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "20.1.0-beta.2",
-    "@nx/nx-darwin-arm64": "20.1.0-beta.2",
-    "@nx/nx-linux-x64-gnu": "20.1.0-beta.2",
-    "@nx/nx-linux-x64-musl": "20.1.0-beta.2",
-    "@nx/nx-win32-x64-msvc": "20.1.0-beta.2",
-    "@nx/nx-linux-arm64-gnu": "20.1.0-beta.2",
-    "@nx/nx-linux-arm64-musl": "20.1.0-beta.2",
-    "@nx/nx-linux-arm-gnueabihf": "20.1.0-beta.2",
-    "@nx/nx-win32-arm64-msvc": "20.1.0-beta.2",
-    "@nx/nx-freebsd-x64": "20.1.0-beta.2"
+    "@nx/nx-darwin-x64": "20.1.0-beta.4",
+    "@nx/nx-darwin-arm64": "20.1.0-beta.4",
+    "@nx/nx-linux-x64-gnu": "20.1.0-beta.4",
+    "@nx/nx-linux-x64-musl": "20.1.0-beta.4",
+    "@nx/nx-win32-x64-msvc": "20.1.0-beta.4",
+    "@nx/nx-linux-arm64-gnu": "20.1.0-beta.4",
+    "@nx/nx-linux-arm64-musl": "20.1.0-beta.4",
+    "@nx/nx-linux-arm-gnueabihf": "20.1.0-beta.4",
+    "@nx/nx-win32-arm64-msvc": "20.1.0-beta.4",
+    "@nx/nx-freebsd-x64": "20.1.0-beta.4"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",
@@ -160,9 +160,9 @@
       "x86_64-unknown-freebsd"
     ]
   },
+  "types": "./bin/nx.d.ts",
   "main": "./bin/nx.js",
   "type": "commonjs",
-  "types": "./bin/nx.d.ts",
   "scripts": {
     "postinstall": "node ./bin/post-install"
   }

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

@@ -15,6 +15,7 @@ exports.getFirstGitCommit = getFirstGitCommit;
  * Special thanks to changelogen for the original inspiration for many of these utilities:
  * https://github.com/unjs/changelogen
  */
+const node_path_1 = require("node:path");
 const utils_1 = require("../../../tasks-runner/utils");
 const workspace_root_1 = require("../../../utils/workspace-root");
 const exec_command_1 = require("./exec-command");
@@ -86,13 +87,19 @@ async function getGitDiff(from, to = 'HEAD') {
     // Use a unique enough separator that we can be relatively certain will not occur within the commit message itself
     const separator = '§§§';
     // https://git-scm.com/docs/pretty-formats
-    const r = await (0, exec_command_1.execCommand)('git', [
+    const args = [
         '--no-pager',
         'log',
         range,
         `--pretty="----%n%s${separator}%h${separator}%an${separator}%ae%n%b"`,
         '--name-status',
-    ]);
+    ];
+    // Support cases where the nx workspace root is located at a nested path within the git repo
+    const relativePath = await getGitRootRelativePath();
+    if (relativePath) {
+        args.push(`--relative=${relativePath}`);
+    }
+    const r = await (0, exec_command_1.execCommand)('git', args);
     return r
         .split('----\n')
         .splice(1)
@@ -405,3 +412,19 @@ async function getFirstGitCommit() {
         throw new Error(`Unable to find first commit in git history`);
     }
 }
+async function getGitRoot() {
+    try {
+        return (await (0, exec_command_1.execCommand)('git', ['rev-parse', '--show-toplevel'])).trim();
+    }
+    catch (e) {
+        throw new Error('Unable to find git root');
+    }
+}
+let gitRootRelativePath;
+async function getGitRootRelativePath() {
+    if (!gitRootRelativePath) {
+        const gitRoot = await getGitRoot();
+        gitRootRelativePath = (0, node_path_1.relative)(gitRoot, workspace_root_1.workspaceRoot);
+    }
+    return gitRootRelativePath;
+}