diff --git a/.chronus/changes/dummy.md b/.chronus/changes/dummy.md new file mode 100644 index 00000000000..31d45609777 --- /dev/null +++ b/.chronus/changes/dummy.md @@ -0,0 +1,12 @@ +--- +changeKind: internal +packages: + - "@typespec/http" + - "@typespec/streams" + - "@typespec/compiler" + - "@typespec/openapi3" + - "@typespec/openapi" + - "@typespec/http-server-js" +--- + +Testing new dev range diff --git a/.chronus/changes/try-no-dev-2025-4-8-17-24-10.md b/.chronus/changes/try-no-dev-2025-4-8-17-24-10.md new file mode 100644 index 00000000000..033ce773462 --- /dev/null +++ b/.chronus/changes/try-no-dev-2025-4-8-17-24-10.md @@ -0,0 +1,8 @@ +--- +# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking +changeKind: fix +packages: + - "@typespec/internal-build-utils" +--- + +Prerelease only allows other prerelease diff --git a/packages/internal-build-utils/src/prerelease.ts b/packages/internal-build-utils/src/prerelease.ts index c3f6a679cfc..2f001ac1f9a 100644 --- a/packages/internal-build-utils/src/prerelease.ts +++ b/packages/internal-build-utils/src/prerelease.ts @@ -116,10 +116,7 @@ export function getPrereleaseVersionRange(manifest: BumpManifest, prereleaseTag: throw new Error(`Invalid semver version ${manifest.nextVersion}`); } - if (parsedOldVersion.major > 0 && parsedOldVersion.major === parsedNextVersion.major) { - return `^${manifest.oldVersion}`; - } - return `^${manifest.oldVersion} || >=${manifest.nextVersion}-${prereleaseTag} <${manifest.nextVersion}`; + return `>=${manifest.nextVersion}-${prereleaseTag} <${manifest.nextVersion}`; } function getDevVersion(version: string, changeCount: number) { diff --git a/packages/internal-build-utils/test/prerelease.test.ts b/packages/internal-build-utils/test/prerelease.test.ts index 12c520a0fd3..a31037c1dad 100644 --- a/packages/internal-build-utils/test/prerelease.test.ts +++ b/packages/internal-build-utils/test/prerelease.test.ts @@ -6,22 +6,22 @@ describe("getPrereleaseVersionRange", () => { { currentVersion: "0.1.0", preReleaseTag: "dev", - expectedRange: "^0.1.0 || >=0.2.0-dev <0.2.0", + expectedRange: ">=0.2.0-dev <0.2.0", }, { currentVersion: "0.1.0-alpha.0", preReleaseTag: "dev", - expectedRange: "^0.1.0-alpha.0 || >=0.1.0-alpha.1-dev <0.1.0-alpha.1", + expectedRange: ">=0.1.0-alpha.1-dev <0.1.0-alpha.1", }, { currentVersion: "1.0.0-rc.0", preReleaseTag: "dev", - expectedRange: "^1.0.0-rc.0", + expectedRange: ">=1.0.0-rc.1-dev <1.0.0-rc.1", }, { currentVersion: "1.1.0", preReleaseTag: "dev", - expectedRange: "^1.1.0", + expectedRange: ">=1.2.0-dev <1.2.0", }, ])( "limits range to major version ($currentVersion)",