Cleanup and wrap

Author: jamesdaniels

scripts/github.js

@@ -11,18 +11,20 @@ const since = process.env.GITHUB_ACTION
   : "";
 
 const lernaList = JSON.parse(
+  execSync("lerna list --json", { stdio: ["ignore", "pipe", "ignore"] }).toString(),
+);
+
+const ref = process.env.GITHUB_SHA ?? "HEAD";
+const shortSHA = execSync(`git rev-parse --short ${ref}`).toString().trim();
+
+const filteredLernaList = JSON.parse(
   execSync(
     `lerna list --json --include-dependencies --include-dependents ${
       packageFromRef ? `--scope='{,*/}${packageFromRef}'` : since
     }`,
     { stdio: ["ignore", "pipe", "ignore"] },
   ).toString(),
-);
-
-const ref = process.env.GITHUB_SHA ?? "HEAD";
-const shortSHA = execSync(`git rev-parse --short ${ref}`).toString().trim();
-
-const filteredLernaList = lernaList.filter((lerna) => {
+).filter((lerna) => {
   if (lerna.private) return false;
   return true;
 });
@@ -37,6 +39,7 @@ module.exports = {
   packageFromRef,
   versionFromRef,
   prerelease: !packageFromRef || !!prerelease,
+  lernaList,
   filteredLernaList,
   shortSHA,
   lernaScopeArgs,

scripts/publish.js

@@ -2,7 +2,7 @@
 const { execSync } = require("child_process");
 const { writeFileSync, readFileSync } = require("fs");
 const { join } = require("path");
-const { filteredLernaList, versionFromRef, shortSHA, prerelease } = require("./github.js");
+const { filteredLernaList, lernaList, versionFromRef, shortSHA, prerelease } = require("./github.js");
 
 const wombatDressingRoomTokens = new Map([
   // ['firebase-frameworks', process.env.FIREBASE_FRAMEWORKS_NPM_TOKEN],
@@ -17,7 +17,7 @@ wombatDressingRoomTokens.forEach((token, pkg) => {
   });
 });
 
-for (const lerna of filteredLernaList) {
+const packagesToPublish = filteredLernaList.map((lerna) => {
   if (versionFromRef && versionFromRef.split("-")[0] !== lerna.version) {
     throw new Error(
       `Cowardly refusing to publish ${lerna.name}@${versionFromRef} from ${lerna.version}, version needs to be bumped in source.`,
@@ -29,16 +29,25 @@ for (const lerna of filteredLernaList) {
   const packageJsonPath = join(lerna.location, "package.json");
   const packageJson = JSON.parse(readFileSync(packageJsonPath).toString());
   packageJson.version = version;
-  for (const dependency of packageJson.dependencies) {
-    const lernaPackage = filteredLernaList.find(it => it.name === dependency[0]);
+  return packageJson;
+});
+
+for (packageJson of packagesToPublish) {
+  for (const dependency in packageJson.dependencies) {
+    const lernaPackage = lernaList.find(it => it.name === dependency);
     if (lernaPackage) {
-      dependency[1] = lernaPackage.version;
+      const changedPackage = packagesToPublish.find(it => it.name === dependency);
+      packageJson.dependencies[dependency] = changedPackage?.version || lernaPackage.version;
     }
   }
+  const lerna = lernaList.find(it => it.name === packageJson.name);
+  if (!lerna) { throw packageJson.name }
+  const packageJsonPath = join(lerna.location, "package.json");
   writeFileSync(packageJsonPath, JSON.stringify(packageJson, undefined, 2));
   const registry = wombatDressingRoomTokens.get(lerna.name)
     ? `https://wombat-dressing-room.appspot.com/${lerna.name}/_ns`
     : "https://registry.npmjs.org";
-  console.log(`npm publish --registry ${registry} --access public --tag ${tag} --provenance`, { cwd });
-    // execSync(`npm publish --registry ${registry} --access public --tag ${tag} --provenance`, { cwd });
+  const cwd = lerna.location;
+  const tag = versionFromRef ? (prerelease ? "next" : "latest") : "canary";
+  execSync(`npm publish --registry ${registry} --access public --tag ${tag} --provenance`, { cwd });
 }