Fixed an issue with changeset status executed without since argum…

…ent (#1357)
changesets · May 20, 2024 · 18c966a · 18c966a
1 parent 4b60580
commit 18c966a
Show file tree

Hide file tree

Showing 3 changed files with 103 additions and 19 deletions.
diff --git a/.changeset/quick-feet-grin.md b/.changeset/quick-feet-grin.md
@@ -0,0 +1,5 @@
+---
+"@changesets/cli": patch
+---
+
+Fixed an issue with `changeset status` executed without `since` argument. It should now correctly use the configured base branch as the default value.
diff --git a/packages/cli/src/commands/status/__tests__/status.ts b/packages/cli/src/commands/status/__tests__/status.ts
@@ -1,4 +1,4 @@
-import { defaultConfig, read } from "@changesets/config";
+import { read } from "@changesets/config";
 import * as git from "@changesets/git";
 import { gitdir, silenceLogsInBlock } from "@changesets/test-utils";
 import { ReleasePlan } from "@changesets/types";
@@ -76,7 +76,77 @@ describe("status", () => {
     await git.add(".", cwd);
     await git.commit("updated a", cwd);
 
-    const releaseObj = await status(cwd, { since: "main" }, defaultConfig);
+    const releaseObj = await status(
+      cwd,
+      { since: "main" },
+      await readConfig(cwd)
+    );
+    expect(replaceHumanIds(releaseObj)).toMatchInlineSnapshot(`
+      {
+        "changesets": [
+          {
+            "id": "~changeset-1~",
+            "releases": [
+              {
+                "name": "pkg-a",
+                "type": "minor",
+              },
+            ],
+            "summary": "This is a summary",
+          },
+        ],
+        "preState": undefined,
+        "releases": [
+          {
+            "changesets": [
+              "~changeset-1~",
+            ],
+            "name": "pkg-a",
+            "newVersion": "1.1.0",
+            "oldVersion": "1.0.0",
+            "type": "minor",
+          },
+        ],
+      }
+    `);
+  });
+
+  it("should get the status comparing to the base branch with undefined since", async () => {
+    const cwd = await gitdir({
+      "package.json": JSON.stringify({
+        private: true,
+        workspaces: ["packages/*"],
+      }),
+      "packages/pkg-a/package.json": JSON.stringify({
+        name: "pkg-a",
+        version: "1.0.0",
+      }),
+      ".changeset/config.json": JSON.stringify({
+        baseBranch: "main",
+      }),
+    });
+
+    await spawn("git", ["checkout", "-b", "new-branch"], { cwd });
+
+    await fs.outputFile(
+      path.join(cwd, "packages/pkg-a/a.js"),
+      'export default "updated a"'
+    );
+    await writeChangeset(
+      {
+        summary: "This is a summary",
+        releases: [{ name: "pkg-a", type: "minor" }],
+      },
+      cwd
+    );
+    await git.add(".", cwd);
+    await git.commit("updated a", cwd);
+
+    const releaseObj = await status(
+      cwd,
+      { since: undefined },
+      await readConfig(cwd)
+    );
     expect(replaceHumanIds(releaseObj)).toMatchInlineSnapshot(`
       {
         "changesets": [
@@ -133,7 +203,7 @@ describe("status", () => {
     await git.add(".", cwd);
     await git.commit("updated a", cwd);
 
-    await status(cwd, { since: "main" }, defaultConfig);
+    await status(cwd, { since: "main" }, await readConfig(cwd));
 
     expect(process.exit).toHaveBeenCalledWith(1);
   });
@@ -156,7 +226,11 @@ describe("status", () => {
 
     await spawn("git", ["checkout", "-b", "new-branch"], { cwd });
 
-    const releaseObj = await status(cwd, { since: "main" }, defaultConfig);
+    const releaseObj = await status(
+      cwd,
+      { since: "main" },
+      await readConfig(cwd)
+    );
 
     expect(process.exit).not.toHaveBeenCalled();
     expect(releaseObj).toEqual({
@@ -199,7 +273,7 @@ describe("status", () => {
     await git.add(".", cwd);
     await git.commit("updated a", cwd);
 
-    await status(cwd, { since: "main" }, defaultConfig);
+    await status(cwd, { since: "main" }, await readConfig(cwd));
 
     expect(process.exit).not.toHaveBeenCalled();
   });
@@ -242,7 +316,7 @@ describe("status", () => {
     const probsUndefined = await status(
       cwd,
       { since: "main", output },
-      defaultConfig
+      await readConfig(cwd)
     );
 
     const releaseObj = await fs.readFile(path.join(cwd, output), "utf-8");
@@ -287,7 +361,9 @@ describe("status", () => {
         name: "pkg-a",
         version: "1.0.0",
       }),
-      ".changeset/config.json": JSON.stringify({}),
+      ".changeset/config.json": JSON.stringify({
+        changedFilePatterns: ["src/**"],
+      }),
     });
 
     // @ts-ignore
@@ -306,7 +382,7 @@ describe("status", () => {
     const releaseObj = await status(
       cwd,
       { since: "main" },
-      { ...defaultConfig, changedFilePatterns: ["src/**"] }
+      await readConfig(cwd)
     );
 
     expect(process.exit).not.toHaveBeenCalled();
@@ -328,7 +404,9 @@ describe("status", () => {
         version: "1.0.0",
       }),
       "packages/pkg-a/src/a.js": 'export default "a"',
-      ".changeset/config.json": JSON.stringify({}),
+      ".changeset/config.json": JSON.stringify({
+        changedFilePatterns: ["src/**"],
+      }),
     });
 
     // @ts-ignore
@@ -344,11 +422,7 @@ describe("status", () => {
     await git.add(".", cwd);
     await git.commit("updated a", cwd);
 
-    await status(
-      cwd,
-      { since: "main" },
-      { ...defaultConfig, changedFilePatterns: ["src/**"] }
-    );
+    await status(cwd, { since: "main" }, await readConfig(cwd));
 
     expect(process.exit).toHaveBeenCalledWith(1);
   });
@@ -364,7 +438,9 @@ describe("status", () => {
         version: "1.0.0",
       }),
       "packages/pkg-a/src/a.js": 'export default "a"',
-      ".changeset/config.json": JSON.stringify({}),
+      ".changeset/config.json": JSON.stringify({
+        changedFilePatterns: ["src/**"],
+      }),
     });
 
     await spawn("git", ["checkout", "-b", "new-branch"], { cwd });
@@ -386,7 +462,7 @@ describe("status", () => {
     const releaseObj = await status(
       cwd,
       { since: "main" },
-      { ...defaultConfig, changedFilePatterns: ["src/**"] }
+      await readConfig(cwd)
     );
     expect(replaceHumanIds(releaseObj)).toMatchInlineSnapshot(`
       {

diff --git a/packages/cli/src/utils/versionablePackages.ts b/packages/cli/src/utils/versionablePackages.ts
@@ -34,15 +34,18 @@ export function filterVersionablePackages(config: Config, packages: Package[]) {
 
 export async function getVersionableChangedPackages(
   config: Config,
-  options: {
+  {
+    cwd,
+    ref,
+  }: {
     cwd: string;
     ref?: string;
   }
 ) {
   const changedPackages = await getChangedPackagesSinceRef({
-    ref: config.baseBranch,
+    ref: ref ?? config.baseBranch,
     changedFilePatterns: config.changedFilePatterns,
-    ...options,
+    cwd,
   });
   return filterVersionablePackages(config, changedPackages);
 }