Avoid tagging v6 releases with latest/pre

Author: brophdawg11

scripts/publish.js

@@ -40,13 +40,22 @@ async function ensureBuildVersion(packageName, version) {
  * @param {string} packageName
  * @param {string} tag
  */
-function publishBuild(packageName, tag) {
+function publishBuild(packageName, tag, releaseBranch) {
   let buildDir = path.join(rootDir, "packages", packageName);
-  let args = ["--access public", `--tag ${tag}`];
+
+  let args = ["--access public"];
+  if (tag) {
+    args.push(`--tag ${tag}`);
+  }
+
   if (tag === "experimental" || tag === "nightly") {
-    args.push(`--no-git-checks`);
+    args.push("--no-git-checks");
+  } else if (releaseBranch) {
+    args.push(`--publish-branch ${releaseBranch}`);
   } else {
-    args.push("--publish-branch release-next");
+    throw new Error(
+      "Expected a release branch name to be provided for non-experimental/nightly releases"
+    );
   }
   console.log();
   console.log(`  pnpm publish ${buildDir} --tag ${tag} --access public`);
@@ -75,13 +84,19 @@ async function run() {
     );
 
     // 2. Determine the appropriate npm tag to use
-    let tag = version.includes("experimental")
-      ? "experimental"
-      : version.includes("nightly")
-      ? "nightly"
-      : semver.prerelease(version) == null
-      ? "latest"
-      : "pre";
+    let publishBranch;
+    let tag;
+    if (version.includes("experimental")) {
+      tag = "experimental";
+    } else if (version.includes("nightly")) {
+      tag = "nightly";
+    } else if (version.startsWith("6.")) {
+      publishBranch = "release-v6";
+      tag = null;
+    } else if (version.startsWith("7.")) {
+      publishBranch = "release-next";
+      tag = semver.prerelease(version) == null ? "latest" : "pre";
+    }
 
     console.log();
     console.log(`  Publishing version ${version} to npm with tag "${tag}"`);
@@ -103,17 +118,21 @@ async function run() {
     await ensureBuildVersion("create-react-router", version);
 
     // 4. Publish to npm
-    publishBuild("react-router", tag);
-    publishBuild("react-router-dom", tag);
-    publishBuild("react-router-dev", tag);
-    publishBuild("react-router-express", tag);
-    publishBuild("react-router-node", tag);
-    publishBuild("react-router-serve", tag);
-    publishBuild("react-router-architect", tag);
-    publishBuild("react-router-cloudflare", tag);
-    publishBuild("react-router-fs-routes", tag);
-    publishBuild("react-router-remix-routes-option-adapter", tag);
-    publishBuild("create-react-router", tag);
+    publishBuild("react-router", tag, releaseBranch);
+    publishBuild("react-router-dom", tag, releaseBranch);
+    publishBuild("react-router-dev", tag, releaseBranch);
+    publishBuild("react-router-express", tag, releaseBranch);
+    publishBuild("react-router-node", tag, releaseBranch);
+    publishBuild("react-router-serve", tag, releaseBranch);
+    publishBuild("react-router-architect", tag, releaseBranch);
+    publishBuild("react-router-cloudflare", tag, releaseBranch);
+    publishBuild("react-router-fs-routes", tag, releaseBranch);
+    publishBuild(
+      "react-router-remix-routes-option-adapter",
+      tag,
+      releaseBranch
+    );
+    publishBuild("create-react-router", tag, releaseBranch);
   } catch (error) {
     console.log();
     console.error(`  ${error.message}`);