fix(scripts): Prevent publishing without a tag (#3223)

remix-run · May 18, 2022 · b4fb6c5 · b4fb6c5
1 parent d141d68
commit b4fb6c5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/scripts/publish-private.js b/scripts/publish-private.js
@@ -10,6 +10,10 @@ function getTaggedVersion() {
   return output.replace(/^v/g, "");
 }
 
+/**
+ * @param {string} dir
+ * @param {string} tag
+ */
 function publish(dir, tag) {
   execSync(`npm publish --tag ${tag} ${dir}`, { stdio: "inherit" });
 }
@@ -23,7 +27,14 @@ async function run() {
   }
 
   let prerelease = semver.prerelease(taggedVersion);
-  let tag = prerelease ? prerelease[0] : "latest";
+  let prereleaseTag = prerelease ? String(prerelease[0]) : undefined;
+  let tag = prereleaseTag
+    ? prereleaseTag.includes("nightly")
+      ? "nightly"
+      : prereleaseTag.includes("experimental")
+      ? "experimental"
+      : prereleaseTag
+    : "latest";
 
   // Publish all @remix-run/* packages
   for (let name of [

diff --git a/scripts/publish.js b/scripts/publish.js
@@ -10,11 +10,14 @@ function getTaggedVersion() {
   return output.replace(/^v/g, "");
 }
 
+/**
+ * @param {string} dir
+ * @param {string} tag
+ */
 function publish(dir, tag) {
-  execSync(
-    `npm publish --access public${tag != null ? ` --tag ${tag}` : ""} ${dir}`,
-    { stdio: "inherit" }
-  );
+  execSync(`npm publish --access public --tag ${tag} ${dir}`, {
+    stdio: "inherit",
+  });
 }
 
 async function run() {
@@ -31,7 +34,7 @@ async function run() {
     ? prereleaseTag.includes("nightly")
       ? "nightly"
       : prereleaseTag.includes("experimental")
-      ? null
+      ? "experimental"
       : prereleaseTag
     : "latest";