Merge branch 'main' into changeset-release/main

Author: fforootd

.changeset/fix-alpha-publish-gate.md

@@ -0,0 +1,2 @@
+---
+---

apps/cli/tests/unit/scripts/release-alpha-train.test.ts

@@ -192,6 +192,64 @@ describe("release-alpha-train script", () => {
     });
   });
 
+  it("blocks GoReleaser when Changesets did not publish npm packages", async () => {
+    const cwd = await fixtureRepo();
+
+    await expect(
+      releaseAlphaTrain.inspectAlphaReleaseTrain({
+        cwd,
+        execFile: commandMock(),
+        published: false,
+        remote: false,
+      }),
+    ).resolves.toMatchObject({
+      shouldComplete: false,
+      skipReason: "npm publish did not run",
+    });
+  });
+
+  it("rejects prepare when Changesets did not publish npm packages", async () => {
+    const cwd = await fixtureRepo();
+
+    await expect(
+      releaseAlphaTrain.prepareAlphaReleaseTrain({
+        cwd,
+        execFile: commandMock(),
+        published: false,
+      }),
+    ).rejects.toThrow("alpha release train is not ready to complete: npm publish did not run");
+  });
+
+  it("allows GoReleaser recovery when npm did not publish but the release tag exists", async () => {
+    const cwd = await fixtureRepo();
+
+    const result = await releaseAlphaTrain.prepareAlphaReleaseTrain({
+      cwd,
+      execFile: commandMock({ tagCommit: "head-commit" }),
+      published: false,
+    });
+
+    expect(result.shouldCreateTag).toBe(false);
+    expect(result.shouldRunGoreleaser).toBe(true);
+    expect(result.shouldUpdateRelease).toBe(true);
+  });
+
+  it("allows completion after Changesets publishes npm packages", async () => {
+    const cwd = await fixtureRepo();
+
+    await expect(
+      releaseAlphaTrain.inspectAlphaReleaseTrain({
+        cwd,
+        execFile: commandMock(),
+        published: true,
+        remote: false,
+      }),
+    ).resolves.toMatchObject({
+      shouldComplete: true,
+      skipReason: "",
+    });
+  });
+
   it("prunes empty changesets before Changesets decides whether to publish", async () => {
     const cwd = await fixtureRepo({
       changesets: {

scripts/release-alpha-train.mjs

@@ -87,6 +87,7 @@ export async function inspectAlphaReleaseTrain(options = {}) {
   const readFileFn = options.readFile ?? readFile;
   const readdirFn = options.readdir ?? readdir;
   const execFileFn = options.execFile ?? execFile;
+  const publishedWasSpecified = options.published !== undefined;
   const published = normalizeBoolean(options.published);
   const remote = options.remote === undefined ? true : normalizeBoolean(options.remote);
 
@@ -117,6 +118,28 @@ export async function inspectAlphaReleaseTrain(options = {}) {
   const tagExists = Boolean(tagCommit);
   const tagMatchesHead = tagCommit === headCommit;
 
+  if (publishedWasSpecified && !published && !tagExists) {
+    return {
+      version,
+      tagName,
+      title,
+      image,
+      packages,
+      activeChangesets,
+      headCommit,
+      tagCommit,
+      tagExists,
+      tagMatchesHead,
+      releaseExists: false,
+      imageExists: false,
+      shouldComplete: false,
+      shouldCreateTag: false,
+      shouldRunGoreleaser: false,
+      shouldUpdateRelease: false,
+      skipReason: "npm publish did not run",
+    };
+  }
+
   if (!published && activeChangesets.length > 0) {
     return {
       version,