Merge remote-tracking branch 'upsteam/main' into feat/parse-js-yaml

marcalexiei · marcalexiei · commit 746563454373 · 2025-11-17T06:58:00.000+01:00
diff --git a/.changeset/pink-animals-heal.md b/.changeset/pink-animals-heal.md
@@ -0,0 +1,5 @@
+---
+"@changesets/assemble-release-plan": patch
+---
+
+fix: Throw a descriptive error if there is an issue with a package name in a changeset
diff --git a/.changeset/purple-chefs-film.md b/.changeset/purple-chefs-film.md
diff --git a/.changeset/wise-turkeys-behave.md b/.changeset/wise-turkeys-behave.md
@@ -0,0 +1,5 @@
+---
+"@changesets/config": patch
+---
+
+Fixed log error link mismatch to remove dot at the end
diff --git a/.codesandbox/ci.json b/.codesandbox/ci.json
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -61,14 +61,7 @@ jobs:
     runs-on: ubuntu-latest
     if: always()
     needs: [test, typecheck, lint]
-    env:
-      FAILURE: ${{ contains(join(needs.*.result, ','), 'failure') }}
     steps:
-      - name: Check for failure
-        run: |
-          echo $FAILURE
-          if [ "$FAILURE" = "false" ]; then
-            exit 0
-          else
-            exit 1
-          fi
+      - name: Exit with error if some jobs are not successful
+        run: exit 1
+        if: ${{ always() && (contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') || contains(needs.*.result, 'cancelled')) }}
diff --git a/docs/adding-a-changeset.md b/docs/adding-a-changeset.md
@@ -12,7 +12,7 @@ A changeset is a piece of information about changes made in a branch or commit.
 
 ## I am in a multi-package repository (a mono-repo)
 
-1. Run the command line script `yarn changeset` or `npx @changesets/cli`.
+1. Run the command line script `yarn changeset` or `pnpm changeset` or `npx @changesets/cli`.
 2. Select the packages you want to include in the changeset using <kbd>↑</kbd> and <kbd>↓</kbd> to navigate to packages, and <kbd>space</kbd> to select a package. Hit enter when all desired packages are selected.
 3. You will be prompted to select a bump type for each selected package. Select an appropriate bump type for the changes made. See [here](https://semver.org/) for information on semver versioning
 4. Your final prompt will be to provide a message to go alongside the changeset. This will be written into the changelog when the next release occurs.
@@ -36,7 +36,7 @@ While not every changeset is going to need a huge amount of detail, a good idea
 
 ## I am in a single-package repository
 
-1. Run the command line script `yarn changeset` or `npx @changesets/cli`.
+1. Run the command line script `yarn changeset` or `pnpm changeset` or `npx @changesets/cli`.
 2. Select an appropriate bump type for the changes made. See [here](https://semver.org/) for information on semver versioning.
 3. Your final prompt will be to provide a message to go alongside the changeset. This will be written into the changelog when the next release occurs.
 
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
   "dependencies": {
     "@babel/cli": "^7.27.0",
     "@babel/core": "^7.26.10",
-    "@babel/preset-env": "^7.26.9",
+    "@babel/preset-env": "^7.28.5",
     "@babel/preset-typescript": "^7.27.0",
     "@manypkg/cli": "^0.22.0",
     "@preconstruct/cli": "^2.8.12",
diff --git a/packages/assemble-release-plan/src/flatten-releases.ts b/packages/assemble-release-plan/src/flatten-releases.ts
@@ -5,6 +5,7 @@ import { shouldSkipPackage } from "@changesets/should-skip-package";
 import { Config, NewChangeset } from "@changesets/types";
 import { Package } from "@manypkg/get-packages";
 import { InternalRelease } from "./types";
+import { getPackageIfExists } from "./utils";
 
 export default function flattenReleases(
   changesets: NewChangeset[],
@@ -19,19 +20,17 @@ export default function flattenReleases(
       // If their dependencies need updates, they will be added to releases by `determineDependents()` with release type `none`
       .filter(
         ({ name }) =>
-          !shouldSkipPackage(packagesByName.get(name)!, {
-            ignore: config.ignore,
-            allowPrivatePackages: config.privatePackages.version,
-          })
+          !shouldSkipPackage(
+            getPackageIfExists(packagesByName, name, changeset),
+            {
+              ignore: config.ignore,
+              allowPrivatePackages: config.privatePackages.version,
+            }
+          )
       )
       .forEach(({ name, type }) => {
         let release = releases.get(name);
-        let pkg = packagesByName.get(name);
-        if (!pkg) {
-          throw new Error(
-            `"${changeset.id}" changeset mentions a release for a package "${name}" but such a package could not be found.`
-          );
-        }
+        const pkg = getPackageIfExists(packagesByName, name, changeset);
         if (!release) {
           release = {
             name,
diff --git a/packages/assemble-release-plan/src/index.test.ts b/packages/assemble-release-plan/src/index.test.ts
@@ -535,11 +535,29 @@ describe("assemble-release-plan", () => {
         undefined
       )
     ).toThrowErrorMatchingInlineSnapshot(`
-"Found mixed changeset big-cats-delight
-Found ignored packages: pkg-b
-Found not ignored packages: pkg-a
-Mixed changesets that contain both ignored and not ignored packages are not allowed"
-`);
+      "Found mixed changeset big-cats-delight
+      Found ignored packages: pkg-b
+      Found not ignored packages: pkg-a
+      Mixed changesets that contain both ignored and not ignored packages are not allowed"
+    `);
+  });
+
+  it("should throw for packages not present in the project", () => {
+    setup.addChangeset({
+      id: "big-cats-delight",
+      releases: [{ name: "impossible-package", type: "major" }],
+    });
+
+    expect(() =>
+      assembleReleasePlan(
+        setup.changesets,
+        setup.packages,
+        defaultConfig,
+        undefined
+      )
+    ).toThrowErrorMatchingInlineSnapshot(
+      `""big-cats-delight" changeset mentions a release for a package "impossible-package" but such a package could not be found."`
+    );
   });
 
   it("should not bump a dev dependent nor its dependent when a package gets bumped", () => {
@@ -560,28 +578,6 @@ Mixed changesets that contain both ignored and not ignored packages are not allo
     expect(releases[1].newVersion).toEqual("1.0.0");
   });
 
-  it("should throw an error when a changeset contains a package that is not in the workspace", () => {
-    setup.addChangeset({
-      id: "big-cats-delight",
-      releases: [{ name: "pkg-a", type: "major" }],
-    });
-    setup.addChangeset({
-      id: "small-dogs-sad",
-      releases: [{ name: "pkg-z", type: "minor" }],
-    });
-
-    expect(() =>
-      assembleReleasePlan(
-        setup.changesets,
-        setup.packages,
-        defaultConfig,
-        undefined
-      )
-    ).toThrow(
-      "Found changeset small-dogs-sad for package pkg-z which is not in the workspace"
-    );
-  });
-
   describe("fixed packages", () => {
     it("should assemble release plan for fixed packages", () => {
       setup.addChangeset({
@@ -634,7 +630,7 @@ Mixed changesets that contain both ignored and not ignored packages are not allo
       // Expected events:
       // - dependencies are checked, nothing leaves semver, nothing changes
       // - fixed are checked, pkg-a is aligned with pkg-b
-      // - depencencies are checked, in pkg-c the dependency range for pkg-a is not satisfied, so a patch bump is given to it
+      // - dependencies are checked, in pkg-c the dependency range for pkg-a is not satisfied, so a patch bump is given to it
       // - fixed are checked, pkg-c is aligned with pkg-d
       setup.addChangeset({
         id: "just-some-umbrellas",
diff --git a/packages/assemble-release-plan/src/index.ts b/packages/assemble-release-plan/src/index.ts
@@ -16,6 +16,7 @@ import flattenReleases from "./flatten-releases";
 import { incrementVersion } from "./increment";
 import matchFixedConstraint from "./match-fixed-constraint";
 import { InternalRelease, PreInfo } from "./types";
+import { getPackageIfExists } from "./utils";
 
 type SnapshotReleaseParameters = {
   tag?: string | undefined;
@@ -126,7 +127,7 @@ function assembleReleasePlan(
   config: OptionalProp<Config, "snapshot">,
   // intentionally not using an optional parameter here so the result of `readPreState` has to be passed in here
   preState: PreState | undefined,
-  // snapshot: undefined            ->  not using snaphot
+  // snapshot: undefined            ->  not using snapshot
   // snapshot: { tag: undefined }   ->  --snapshot (empty tag)
   // snapshot: { tag: "canary" }    ->  --snapshot canary
   snapshot?: SnapshotReleaseParameters | string | boolean
@@ -276,19 +277,14 @@ function getRelevantChangesets(
     const skippedPackages = [];
     const notSkippedPackages = [];
     for (const release of changeset.releases) {
-      const packageByName = packagesByName.get(release.name);
-
-      if (!packageByName) {
-        throw new Error(
-          `Found changeset ${changeset.id} for package ${release.name} which is not in the workspace`
-        );
-      }
-
       if (
-        shouldSkipPackage(packageByName, {
-          ignore: config.ignore,
-          allowPrivatePackages: config.privatePackages.version,
-        })
+        shouldSkipPackage(
+          getPackageIfExists(packagesByName, release.name, changeset),
+          {
+            ignore: config.ignore,
+            allowPrivatePackages: config.privatePackages.version,
+          }
+        )
       ) {
         skippedPackages.push(release.name);
       } else {
diff --git a/packages/assemble-release-plan/src/utils.ts b/packages/assemble-release-plan/src/utils.ts
@@ -1,4 +1,4 @@
-import { PackageGroup, VersionType } from "@changesets/types";
+import { NewChangeset, PackageGroup, VersionType } from "@changesets/types";
 import { Package } from "@manypkg/get-packages";
 import semverGt from "semver/functions/gt";
 import { InternalRelease } from "./types";
@@ -58,3 +58,17 @@ export function getCurrentHighestVersion(
 
   return highestVersion!;
 }
+
+export function getPackageIfExists(
+  packagesByName: Map<string, Package>,
+  packageName: string,
+  changeset: Pick<NewChangeset, "id">
+): Package {
+  const pkg = packagesByName.get(packageName);
+  if (pkg) {
+    return pkg;
+  }
+  throw new Error(
+    `"${changeset.id}" changeset mentions a release for a package "${packageName}" but such a package could not be found.`
+  );
+}
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -80,7 +80,7 @@
     "@changesets/should-skip-package": "^0.1.2",
     "@changesets/types": "^6.1.0",
     "@changesets/write": "^0.4.0",
-    "@inquirer/external-editor": "^1.0.0",
+    "@inquirer/external-editor": "^1.0.2",
     "@manypkg/get-packages": "^1.1.3",
     "ansi-colors": "^4.1.3",
     "ci-info": "^3.7.0",
diff --git a/packages/cli/src/run.test.ts b/packages/cli/src/run.test.ts
@@ -224,4 +224,31 @@ describe("cli", () => {
       `);
     });
   });
+
+  describe("pre", () => {
+    it("should throw an error if tag not passed in", async () => {
+      const cwd = await testdir({
+        "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({}),
+      });
+      try {
+        await run(["pre", "enter"], {}, cwd);
+      } catch (e) {
+        // ignore the error. We just want to validate the error message
+      }
+
+      const loggerErrorCalls = (error as any).mock.calls;
+      expect(loggerErrorCalls.length).toEqual(1);
+      expect(loggerErrorCalls[0][0]).toEqual(
+        `A tag must be passed when using prerelease enter`
+      );
+    });
+  });
 });
diff --git a/packages/cli/src/run.ts b/packages/cli/src/run.ts
@@ -212,7 +212,7 @@ export async function run(
         }
         let tag = input[2];
         if (command === "enter" && typeof tag !== "string") {
-          error(`A tag must be passed when using prerelese enter`);
+          error(`A tag must be passed when using prerelease enter`);
           throw new ExitError(1);
         }
         // @ts-ignore
diff --git a/packages/config/src/index.test.ts b/packages/config/src/index.test.ts
diff --git a/packages/config/src/index.ts b/packages/config/src/index.ts
diff --git a/yarn.lock b/yarn.lock

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@changesets/assemble-release-plan": patch
 +---
++
 +fix: Throw a descriptive error if there is an issue with a package name in a changeset