Fixed changelog application when executing through npx (#1562)

Netail · cefn · Andarist · web-flow · commit a0f87f1ce596 · 2025-01-24T11:02:19.000+01:00
* Resolve module from global node_modules Fixes #566 * fix: NPX apply changelog * fix: feedback * fix: feedback v2 * fix: feedback v3 * Create seven-beans-jump.md * Apply suggestions from code review --------- Co-authored-by: Cefn Hoile <github.com@cefn.com> Co-authored-by: Mateusz Burzyński <mateuszburzynski@gmail.com>
diff --git a/.changeset/seven-beans-jump.md b/.changeset/seven-beans-jump.md
@@ -0,0 +1,8 @@
+---
+"@changesets/apply-release-plan": patch
+---
+
+author: @Netail
+author: @cefn
+
+Add an ability to pass in `contextDir` of the running script (like the `@changesets/cli`) so the changelog modules can be alternatively resolved using it
diff --git a/.changeset/warm-results-rescue.md b/.changeset/warm-results-rescue.md
@@ -0,0 +1,8 @@
+---
+"@changesets/cli": patch
+---
+
+author: @Netail
+author: @cefn
+
+Fixed changelog application when executing using `npx` and similar tools
diff --git a/package.json b/package.json
@@ -21,6 +21,7 @@
     "type": "git",
     "url": "https://github.com/changesets/changesets.git"
   },
+  "packageManager": "yarn@1.22.22",
   "workspaces": [
     "packages/*",
     "scripts/*"
diff --git a/packages/apply-release-plan/src/index.ts b/packages/apply-release-plan/src/index.ts
@@ -68,7 +68,8 @@ export default async function applyReleasePlan(
   releasePlan: ReleasePlan,
   packages: Packages,
   config: Config = defaultConfig,
-  snapshot?: string | boolean
+  snapshot?: string | boolean,
+  contextDir = __dirname
 ) {
   let cwd = packages.root.dir;
 
@@ -97,7 +98,8 @@ export default async function applyReleasePlan(
     releasesWithPackage,
     changesets,
     config,
-    cwd
+    cwd,
+    contextDir
   );
 
   if (releasePlan.preState !== undefined && snapshot === undefined) {
@@ -189,7 +191,8 @@ async function getNewChangelogEntry(
   releasesWithPackage: ModCompWithPackage[],
   changesets: NewChangeset[],
   config: Config,
-  cwd: string
+  cwd: string,
+  contextDir: string
 ) {
   if (!config.changelog) {
     return Promise.resolve(
@@ -207,7 +210,13 @@ async function getNewChangelogEntry(
 
   const changelogOpts = config.changelog[1];
   let changesetPath = path.join(cwd, ".changeset");
-  let changelogPath = resolveFrom(changesetPath, config.changelog[0]);
+  let changelogPath;
+
+  try {
+    changelogPath = resolveFrom(changesetPath, config.changelog[0]);
+  } catch {
+    changelogPath = resolveFrom(contextDir, config.changelog[0]);
+  }
 
   let possibleChangelogFunc = require(changelogPath);
   if (possibleChangelogFunc.default) {
diff --git a/packages/cli/src/commands/version/index.ts b/packages/cli/src/commands/version/index.ts
@@ -85,7 +85,8 @@ export default async function version(
     releasePlan,
     packages,
     releaseConfig,
-    options.snapshot
+    options.snapshot,
+    __dirname
   );
 
   const [{ getVersionMessage }, commitOpts] = getCommitFunctions(
