@smoothbricks/cli 0.1.1 → 0.3.0

package/src/release/npm-auth.ts

@@ -1,7 +1,6 @@
 import type { ReleasePackageInfo } from './core.js';
 
 export interface NpmPublishAuthFailureOptions {
-  useBootstrapToken: boolean;
   tokenPresent: boolean;
   repository?: string;
 }
@@ -30,7 +29,7 @@ export async function publishWithAuthDiagnostics(
     shell.error(npmPublishAuthFailureMessage(pkg, options));
     await shell.appendSummary(npmPublishAuthFailureMarkdown(pkg, options));
     throw new Error(
-      `${packageVersion}: npm publish authentication failed. Run smoo release trust-publisher after the package exists on npm; see the warning banner above for details.`,
+      `${packageVersion}: npm publish authentication failed. Run smoo release trust-publisher; see the warning banner above for details.`,
       { cause: error },
     );
   }
@@ -42,26 +41,11 @@ export function npmPublishAuthFailureMessage(
 ): string {
   const packageVersion = `${pkg.name}@${pkg.version}`;
   const lines = [
-    `::error title=npm publish authentication failed::${packageVersion} could not be published. This usually means npm trusted publishing is not configured for this package/workflow/repo, or the bootstrap NPM_TOKEN is missing/invalid.`,
+    `::error title=npm publish authentication failed::${packageVersion} could not be published. This usually means npm trusted publishing is not configured for this package/workflow/repo.`,
     '',
     `🚨 npm publish authentication failed for ${packageVersion}`,
     '',
   ];
-  if (options.useBootstrapToken) {
-    lines.push(
-      'smoo expected a temporary npm automation token because this package does not exist on npm yet.',
-      options.tokenPresent
-        ? 'NODE_AUTH_TOKEN/NPM_TOKEN is set, but npm still rejected the bootstrap publish. Check that the token is valid, has publish rights for this scope, and is available to this workflow.'
-        : 'NODE_AUTH_TOKEN/NPM_TOKEN is not set. Add a temporary NPM_TOKEN repository secret and rerun the Publish workflow.',
-      '',
-      'After the first successful publish, run:',
-      '  smoo release trust-publisher',
-      '',
-      'Then remove the temporary bootstrap token path for future releases.',
-    );
-    return lines.join('\n');
-  }
-
   lines.push(
     'smoo expected npm trusted publishing/OIDC because this package already exists on npm.',
     options.tokenPresent
@@ -75,7 +59,7 @@ export function npmPublishAuthFailureMessage(
     '   workflow: publish.yml',
     '3. Rerun the Publish workflow.',
     '',
-    'For first-ever package publishes, add a temporary NPM_TOKEN repository secret, publish once, then run smoo release trust-publisher.',
+    'For first-ever package publishes, run locally: smoo release trust-publisher --bootstrap.',
   );
   return lines.join('\n');
 }
@@ -86,19 +70,6 @@ export function npmPublishAuthFailureMarkdown(
 ): string {
   const packageVersion = `${pkg.name}@${pkg.version}`;
   const lines = ['## 🚨 npm Publish Authentication Failed', '', `Package: \`${packageVersion}\``, ''];
-  if (options.useBootstrapToken) {
-    lines.push(
-      'smoo expected a temporary npm automation token because this package does not exist on npm yet.',
-      '',
-      options.tokenPresent
-        ? '`NODE_AUTH_TOKEN`/`NPM_TOKEN` is set, but npm still rejected the bootstrap publish. Check that the token is valid, has publish rights for this scope, and is available to this workflow.'
-        : '`NODE_AUTH_TOKEN`/`NPM_TOKEN` is not set. Add a temporary `NPM_TOKEN` repository secret and rerun the Publish workflow.',
-      '',
-      'After the first successful publish, run `smoo release trust-publisher`, then remove the temporary bootstrap token path for future releases.',
-    );
-    return lines.join('\n');
-  }
-
   lines.push(
     'smoo expected npm trusted publishing/OIDC because this package already exists on npm.',
     '',
@@ -112,7 +83,7 @@ export function npmPublishAuthFailureMarkdown(
     `2. Ensure the npm trusted publisher uses repository \`${trustedPublisherRepository(options)}\` and workflow \`publish.yml\``,
     '3. Rerun the Publish workflow.',
     '',
-    'For first-ever package publishes, add a temporary `NPM_TOKEN` repository secret, publish once, then run `smoo release trust-publisher`.',
+    'For first-ever package publishes, run `smoo release trust-publisher --bootstrap` locally.',
   );
   return lines.join('\n');
 }

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>
@@ -35,9 +40,10 @@ export interface ReleaseRepairShell<Package extends ReleasePackageInfo = Release
 
 export interface ReleaseVersionShell<Package extends ReleasePackageInfo = ReleasePackageInfo> {
   releasePackagesAtHead(): Promise<Package[]>;
+  releaseVersionPackages(bump: string): Promise<Package[]>;
   ensureLocalReleaseTags(packages: Package[]): Promise<void>;
   gitHead(): Promise<string>;
-  runNxReleaseVersion(bump: string, dryRun: boolean): Promise<void>;
+  runNxReleaseVersion(packages: Package[], bump: string, dryRun: boolean): Promise<Package[]>;
   assertCleanGitTree(): Promise<void>;
 }
 
@@ -59,10 +65,19 @@ export async function runReleaseVersion<Package extends ReleasePackageInfo>(
     }
   }
 
+  const versionPackages = await shell.releaseVersionPackages(options.bump);
+  if (versionPackages.length === 0) {
+    if (options.bump !== 'auto') {
+      // invariant throw: the CLI resolves forced bumps from the full owned release package set.
+      throw new Error(`No release packages were selected for forced --bump ${options.bump}.`);
+    }
+    return { mode: 'none', packages: [], status: 'no-release-needed' };
+  }
+
   const headBeforeVersioning = await shell.gitHead();
-  await shell.runNxReleaseVersion(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();
@@ -103,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) {
@@ -129,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>,
@@ -168,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 {
@@ -180,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/src/release/publish-plan.ts

@@ -26,7 +26,7 @@ export function planPublishActions<Package extends ReleasePackageInfo>(
   const githubReleasePackages = input.releasePackages.filter((pkg) => githubMissingNames.has(pkg.name));
 
   return {
-    buildProjects: npmPackages.map((pkg) => pkg.name),
+    buildProjects: npmPackages.map((pkg) => pkg.projectName),
     publishPackages: npmPackages.map((pkg) => ({ pkg, distTag: npmDistTagForVersion(pkg.version) })),
     githubReleasePackages,
   };

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/managed/raw/.git-format-staged.yml

@@ -1,47 +0,0 @@
-# git-format-staged configuration for SmoothBricks-style monorepos
-
-formatters:
-  eslint:
-    command: eslint-stdout '{}'
-    patterns:
-      - '*.astro'
-      - '!.*'
-      - '!.*/**'
-
-  biome:
-    command: biome check --files-ignore-unknown=true --use-editorconfig=true '--stdin-file-path={}' --fix
-    patterns:
-      - '*.js'
-      - '*.ts'
-      - '*.jsx'
-      - '*.tsx'
-      - '*.json'
-      - '*.jsonc'
-      - '*.html'
-      - '*.css'
-      - '*.graphql'
-
-  prettier:
-    command: prettier --ignore-unknown --stdin-filepath '{}'
-    patterns:
-      - '*'
-      - '!.*'
-      - '!*.js'
-      - '!*.ts'
-      - '!*.jsx'
-      - '!*.tsx'
-      - '!*.json'
-      - '!*.jsonc'
-      - '!*.html'
-      - '!*.css'
-      - '!*.graphql'
-      - '!*.nix'
-
-  alejandra:
-    command: alejandra
-    patterns:
-      - '*.nix'
-
-settings:
-  update_working_tree: true
-  show_commands: true

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;