From dd0bb0266e904f0dbd59dd04f0deda867a91ebfc Mon Sep 17 00:00:00 2001 From: Austin Fahsl Date: Wed, 28 Feb 2024 14:54:23 -0700 Subject: [PATCH] feat(release): interpolate workspaceRoot in changelog path --- e2e/release/src/independent-projects.test.ts | 4 ++-- packages/nx/src/command-line/release/changelog.ts | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/e2e/release/src/independent-projects.test.ts b/e2e/release/src/independent-projects.test.ts index 3f980b23fc38b..47d33fc1e9a6d 100644 --- a/e2e/release/src/independent-projects.test.ts +++ b/e2e/release/src/independent-projects.test.ts @@ -762,7 +762,7 @@ describe('nx release - independent projects', () => { integrity: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX total files: 4 - Would publish to http://localhost:4873 with tag "latest", but [dry-run] was set + Would publish to ${e2eRegistryUrl} with tag "latest", but [dry-run] was set @@ -871,7 +871,7 @@ describe('nx release - independent projects', () => { integrity: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX total files: 4 - Would publish to http://localhost:4873 with tag "latest", but [dry-run] was set + Would publish to ${e2eRegistryUrl} with tag "latest", but [dry-run] was set diff --git a/packages/nx/src/command-line/release/changelog.ts b/packages/nx/src/command-line/release/changelog.ts index ea0939aa9d4ec..f6956da297265 100644 --- a/packages/nx/src/command-line/release/changelog.ts +++ b/packages/nx/src/command-line/release/changelog.ts @@ -629,6 +629,10 @@ async function applyChangesAndExit( function resolveChangelogRenderer( changelogRendererPath: string ): ChangelogRenderer { + const interpolatedChangelogRendererPath = interpolate(changelogRendererPath, { + workspaceRoot, + }); + // Try and load the provided (or default) changelog renderer let changelogRenderer: ChangelogRenderer; let cleanupTranspiler = () => {}; @@ -637,7 +641,7 @@ function resolveChangelogRenderer( if (rootTsconfigPath) { cleanupTranspiler = registerTsProject(rootTsconfigPath); } - const r = require(changelogRendererPath); + const r = require(interpolatedChangelogRendererPath); changelogRenderer = r.default || r; } catch { } finally {