@smoothbricks/cli 0.2.0 → 0.3.0

package/src/release/orchestration.ts

@@ -11,6 +11,7 @@ export interface ReleaseSummary<Package extends ReleasePackageInfo = ReleasePack
   published: Package[];
   alreadyPublished: Package[];
   githubReleases: Package[];
+  githubReleaseLinks: Array<{ pkg: Package; url: string }>;
   rerunRequired: boolean;
   noRelease: boolean;
 }
@@ -22,7 +23,11 @@ export interface ReleaseCompletionShell<Package extends ReleasePackageInfo = Rel
   buildReleaseCandidate(packages: Package[]): Promise<void>;
   publishPackage(pkg: Package, distTag: string, dryRun: boolean): Promise<void>;
   listGithubMissingPackages(packages: Package[]): Promise<Package[]>;
-  createGithubRelease(pkg: Package, dryRun: boolean): Promise<void>;
+  createGithubRelease(pkg: Package, dryRun: boolean): Promise<string | null>;
+}
+
+export interface ReleaseNextShell<Package extends ReleasePackageInfo = ReleasePackageInfo> {
+  bumpStablePackagesToNext(packages: Package[]): Promise<void>;
 }
 
 export interface ReleaseRepairShell<Package extends ReleasePackageInfo = ReleasePackageInfo>
@@ -38,7 +43,7 @@ export interface ReleaseVersionShell<Package extends ReleasePackageInfo = Releas
   releaseVersionPackages(bump: string): Promise<Package[]>;
   ensureLocalReleaseTags(packages: Package[]): Promise<void>;
   gitHead(): Promise<string>;
-  runNxReleaseVersion(packages: Package[], bump: string, dryRun: boolean): Promise<void>;
+  runNxReleaseVersion(packages: Package[], bump: string, dryRun: boolean): Promise<Package[]>;
   assertCleanGitTree(): Promise<void>;
 }
 
@@ -70,9 +75,9 @@ export async function runReleaseVersion<Package extends ReleasePackageInfo>(
   }
 
   const headBeforeVersioning = await shell.gitHead();
-  await shell.runNxReleaseVersion(versionPackages, options.bump, options.dryRun);
+  const dryRunPackages = await shell.runNxReleaseVersion(versionPackages, options.bump, options.dryRun);
   if (options.dryRun) {
-    return { mode: 'none', packages: [], status: 'dry-run' };
+    return { mode: 'none', packages: dryRunPackages, status: 'dry-run' };
   }
 
   await shell.assertCleanGitTree();
@@ -113,12 +118,30 @@ export async function completeReleaseAtHead<Package extends ReleasePackageInfo>(
   });
 }
 
+export async function bumpStableReleaseToNext<Package extends ReleasePackageInfo>(
+  shell: ReleaseNextShell<Package>,
+  packages: Package[],
+  dryRun: boolean,
+  rerunRequired: boolean,
+): Promise<Package[]> {
+  const stablePackages = packages.filter((pkg) => !pkg.version.includes('-'));
+  if (dryRun || rerunRequired || stablePackages.length === 0) {
+    return [];
+  }
+  await shell.bumpStablePackagesToNext(stablePackages);
+  return stablePackages;
+}
+
 export async function repairPendingTargets<Package extends ReleasePackageInfo>(
   shell: ReleaseRepairShell<Package>,
   targets: Array<ReleaseTarget<Package>>,
   restoreRef: string,
   dryRun: boolean,
 ): Promise<Array<ReleaseSummary<Package>>> {
+  if (dryRun) {
+    return targets.map((target) => repairDryRunSummary(target));
+  }
+
   const summaries: Array<ReleaseSummary<Package>> = [];
   try {
     for (const target of targets) {
@@ -139,6 +162,23 @@ export async function repairPendingTargets<Package extends ReleasePackageInfo>(
   return summaries;
 }
 
+function repairDryRunSummary<Package extends ReleasePackageInfo>(
+  target: ReleaseTarget<Package>,
+): ReleaseSummary<Package> {
+  return {
+    sha: target.sha,
+    dryRun: true,
+    packages: target.packages,
+    pushed: false,
+    published: [],
+    alreadyPublished: target.packages.filter((pkg) => !target.npmPackages.includes(pkg)),
+    githubReleases: [],
+    githubReleaseLinks: [],
+    rerunRequired: false,
+    noRelease: false,
+  };
+}
+
 export async function completeRepairTargetAtHead<Package extends ReleasePackageInfo>(
   shell: ReleaseCompletionShell<Package>,
   target: ReleaseTarget<Package>,
@@ -178,8 +218,12 @@ async function completePlannedRelease<Package extends ReleasePackageInfo>(
   for (const { pkg, distTag } of plan.publishPackages) {
     await shell.publishPackage(pkg, distTag, input.dryRun);
   }
+  const githubReleaseLinks: Array<{ pkg: Package; url: string }> = [];
   for (const pkg of plan.githubReleasePackages) {
-    await shell.createGithubRelease(pkg, input.dryRun);
+    const url = await shell.createGithubRelease(pkg, input.dryRun);
+    if (url) {
+      githubReleaseLinks.push({ pkg, url });
+    }
   }
 
   return {
@@ -190,6 +234,7 @@ async function completePlannedRelease<Package extends ReleasePackageInfo>(
     published: input.dryRun ? [] : plan.publishPackages.map((action) => action.pkg),
     alreadyPublished: input.packages.filter((pkg) => !input.npmMissingPackages.includes(pkg)),
     githubReleases: input.dryRun ? [] : plan.githubReleasePackages,
+    githubReleaseLinks,
     rerunRequired: input.rerunRequired,
     noRelease: false,
   };

package/dist/nx-version-actions.cjs

@@ -1,25 +0,0 @@
-"use strict";
-const nxJsVersionActions = require('@nx/js/src/release/version-actions');
-const baseVersionActions = nxJsVersionActions.default ?? nxJsVersionActions;
-const afterAllProjectsVersioned = async (cwd, options) => {
-    const result = await nxJsVersionActions.afterAllProjectsVersioned(cwd, options);
-    // Temporary Bun workaround. Remove this hook only after all three issues are
-    // fixed in supported Bun versions:
-    // - https://github.com/oven-sh/bun/issues/18906
-    // - https://github.com/oven-sh/bun/issues/20477
-    // - https://github.com/oven-sh/bun/issues/20829
-    // Nx runs `bun install --lockfile-only`, but Bun currently leaves workspace
-    // versions stale in bun.lock. `bun pm pack` then rewrites `workspace:*` using
-    // those stale lockfile versions instead of the current package.json versions.
-    const { syncBunLockfileVersions } = await import('./monorepo/lockfile.js');
-    const updated = syncBunLockfileVersions(cwd);
-    if (updated === 0) {
-        return result;
-    }
-    return {
-        changedFiles: Array.from(new Set([...result.changedFiles, 'bun.lock'])),
-        deletedFiles: result.deletedFiles,
-    };
-};
-baseVersionActions.afterAllProjectsVersioned = afterAllProjectsVersioned;
-module.exports = baseVersionActions;

package/dist/nx-version-actions.d.cts

@@ -1,6 +0,0 @@
-import type { AfterAllProjectsVersioned, VersionActions } from 'nx/release';
-declare const baseVersionActions: typeof VersionActions & {
-    afterAllProjectsVersioned: AfterAllProjectsVersioned;
-};
-export = baseVersionActions;
-//# sourceMappingURL=nx-version-actions.d.cts.map

package/dist/nx-version-actions.d.cts.map

@@ -1 +0,0 @@
-{"version":3,"file":"nx-version-actions.d.cts","sourceRoot":"","sources":["../src/nx-version-actions.cts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAQ5E,QAAA,MAAM,kBAAkB;+BALyC,yBAAyB;CAKf,CAAC;AA2B5E,SAAS,kBAAkB,CAAC"}

package/src/nx-version-actions.cts

@@ -1,36 +0,0 @@
-import type { AfterAllProjectsVersioned, VersionActions } from 'nx/release';
-
-type VersionActionsModule = typeof VersionActions & {
-  default?: typeof VersionActions & { afterAllProjectsVersioned: AfterAllProjectsVersioned };
-  afterAllProjectsVersioned: AfterAllProjectsVersioned;
-};
-
-const nxJsVersionActions = require('@nx/js/src/release/version-actions') as VersionActionsModule;
-const baseVersionActions = nxJsVersionActions.default ?? nxJsVersionActions;
-
-const afterAllProjectsVersioned: AfterAllProjectsVersioned = async (cwd, options) => {
-  const result = await nxJsVersionActions.afterAllProjectsVersioned(cwd, options);
-
-  // Temporary Bun workaround. Remove this hook only after all three issues are
-  // fixed in supported Bun versions:
-  // - https://github.com/oven-sh/bun/issues/18906
-  // - https://github.com/oven-sh/bun/issues/20477
-  // - https://github.com/oven-sh/bun/issues/20829
-  // Nx runs `bun install --lockfile-only`, but Bun currently leaves workspace
-  // versions stale in bun.lock. `bun pm pack` then rewrites `workspace:*` using
-  // those stale lockfile versions instead of the current package.json versions.
-  const { syncBunLockfileVersions } = await import('./monorepo/lockfile.js');
-  const updated = syncBunLockfileVersions(cwd);
-  if (updated === 0) {
-    return result;
-  }
-
-  return {
-    changedFiles: Array.from(new Set([...result.changedFiles, 'bun.lock'])),
-    deletedFiles: result.deletedFiles,
-  };
-};
-
-baseVersionActions.afterAllProjectsVersioned = afterAllProjectsVersioned;
-
-export = baseVersionActions;