nx 19.7.1 → 19.7.2

package/package.json

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

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

@@ -83,12 +83,14 @@ 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 = '§§§';
     // https://git-scm.com/docs/pretty-formats
     const r = await (0, exec_command_1.execCommand)('git', [
         '--no-pager',
         'log',
         range,
-        '--pretty="----%n%s|%h|%an|%ae%n%b"',
+        `--pretty="----%n%s${separator}%h${separator}%an${separator}%ae%n%b"`,
         '--name-status',
     ]);
     return r
@@ -96,7 +98,7 @@ async function getGitDiff(from, to = 'HEAD') {
         .splice(1)
         .map((line) => {
         const [firstLine, ..._body] = line.split('\n');
-        const [message, shortHash, authorName, authorEmail] = firstLine.split('|');
+        const [message, shortHash, authorName, authorEmail] = firstLine.split(separator);
         const r = {
             message,
             shortHash,

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

@@ -110,7 +110,7 @@ function buildProjectConfigurationFromPackageJson(packageJson, workspaceRoot, pa
         sourceRoot: projectRoot,
         name,
         ...packageJson.nx,
-        targets: (0, package_json_1.readTargetsFromPackageJson)(packageJson),
+        targets: (0, package_json_1.readTargetsFromPackageJson)(packageJson, nxJson),
         tags: (0, package_json_1.getTagsFromPackageJson)(packageJson),
         metadata: (0, package_json_1.getMetadataFromPackageJson)(packageJson),
     };

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

@@ -1,3 +1,4 @@
+import { NxJsonConfiguration } from '../config/nx-json';
 import { ProjectConfiguration, ProjectMetadata, TargetConfiguration } from '../config/workspace-json-project-json';
 import { PackageManagerCommands } from './package-manager';
 export interface NxProjectPackageJsonConfiguration extends Partial<ProjectConfiguration> {
@@ -69,7 +70,7 @@ export declare function readNxMigrateConfig(json: Partial<PackageJson>): NxMigra
 export declare function buildTargetFromScript(script: string, scripts: Record<string, string>, packageManagerCommand: PackageManagerCommands): TargetConfiguration;
 export declare function getMetadataFromPackageJson(packageJson: PackageJson): ProjectMetadata;
 export declare function getTagsFromPackageJson(packageJson: PackageJson): string[];
-export declare function readTargetsFromPackageJson(packageJson: PackageJson): Record<string, TargetConfiguration<any>>;
+export declare function readTargetsFromPackageJson(packageJson: PackageJson, nxJson: NxJsonConfiguration): Record<string, TargetConfiguration<any>>;
 /**
  * Uses `require.resolve` to read the package.json for a module.
  *

package/src/utils/package-json.js

@@ -77,7 +77,7 @@ function getTagsFromPackageJson(packageJson) {
     }
     return tags;
 }
-function readTargetsFromPackageJson(packageJson) {
+function readTargetsFromPackageJson(packageJson, nxJson) {
     const { scripts, nx, private: isPrivate } = packageJson ?? {};
     const res = {};
     const includedScripts = nx?.includedScripts || Object.keys(scripts ?? {});
@@ -92,12 +92,23 @@ function readTargetsFromPackageJson(packageJson) {
      * Add implicit nx-release-publish target for all package.json files that are
      * not marked as `"private": true` to allow for lightweight configuration for
      * package based repos.
+     *
+     * Any targetDefaults for the nx-release-publish target set by the user should
+     * be merged with the implicit target.
      */
     if (!isPrivate && !res['nx-release-publish']) {
+        const nxReleasePublishTargetDefaults = nxJson?.targetDefaults?.['nx-release-publish'] ?? {};
         res['nx-release-publish'] = {
-            dependsOn: ['^nx-release-publish'],
             executor: '@nx/js:release-publish',
-            options: {},
+            ...nxReleasePublishTargetDefaults,
+            dependsOn: [
+                // For maximum correctness, projects should only ever be published once their dependencies are successfully published
+                '^nx-release-publish',
+                ...(nxReleasePublishTargetDefaults.dependsOn ?? []),
+            ],
+            options: {
+                ...(nxReleasePublishTargetDefaults.options ?? {}),
+            },
         };
     }
     return res;