Visitar URL original
Merge branch 'main' into ts7-release · microsoft/TypeScript@1e4744d · GitHub
Skip to content

Commit 1e4744d

Browse files
committed
Merge branch 'main' into ts7-release
# Conflicts: # Herebyfile.mjs # internal/core/version.go
2 parents ecfe30d + a5a219c commit 1e4744d

1 file changed

Lines changed: 4 additions & 7 deletions

File tree

‎tsc/Herebyfile.mjs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,19 +84,15 @@ const { values: rawOptions } = parseArgs({
8484
*/
8585
const options = /** @type {Options} */ (rawOptions);
8686

87-
// Native release branches can edit these constants to publish a different
88-
// package flavor. Main's defaults publish @typescript/native-preview.
87+
// Native release branches can edit these constants to publish a fixed stable version.
88+
// Main publishes prerelease builds of the TypeScript package.
8989
const nativePreviewReleaseProfile = /** @type {"native-preview" | "typescript"} */ ("typescript");
9090
const nativePreviewReleaseVersion = /** @type {string | undefined} */ ("7.0.2");
9191
const produceNativePreviewVsix = /** @type {boolean} */ (true);
9292
const produceTypeScriptNightlyVsix = /** @type {boolean} */ (false);
9393
const produceAnyVsix = produceNativePreviewVsix || produceTypeScriptNightlyVsix;
9494
const publishAsTypescript = nativePreviewReleaseProfile === "typescript";
9595

96-
if (publishAsTypescript && !nativePreviewReleaseVersion) {
97-
throw new Error("Publishing as 'typescript' requires hardcoding nativePreviewReleaseVersion.");
98-
}
99-
10096
if (options.forRelease && !options.setPrerelease && (!nativePreviewReleaseVersion || produceAnyVsix)) {
10197
throw new Error("forRelease requires setPrerelease unless nativePreviewReleaseVersion is hardcoded and VSIX production is disabled");
10298
}
@@ -1599,7 +1595,8 @@ function nodeToGOARCH(arch, os) {
15991595
}
16001596

16011597
const getPlatforms = memoize(() => {
1602-
let supportedPlatforms = publishAsTypescript
1598+
const publishTag = getPublishTag();
1599+
let supportedPlatforms = publishAsTypescript && publishTag !== "next"
16031600
? platforms
16041601
: platforms.filter(({ vsix }) => vsix);
16051602

0 commit comments

Comments
 (0)