@bensandee/tooling 0.30.0 → 0.31.0

package/README.md

@@ -77,7 +77,7 @@ The generated `ci:check` script defaults to `pnpm check --skip 'docker:*'` since
 
 Docker packages are discovered automatically. Any package with a `Dockerfile` or `docker/Dockerfile` is a Docker package. Image names are derived as `{root-package-name}-{package-name}`, build context defaults to `.` (project root). For single-package repos, `Dockerfile` or `docker/Dockerfile` at the project root is checked.
 
-When Docker packages are present, `repo:sync` generates a deploy workflow (`.forgejo/workflows/publish.yml` or `.github/workflows/publish.yml`) triggered on version tags (`v*.*.*`) that runs `pnpm exec tooling docker:publish`.
+When Docker packages are present, `repo:sync` generates a publish workflow (`.forgejo/workflows/publish.yml` or `.github/workflows/publish.yml`) triggered via `workflow_dispatch` for manual runs. For the `simple` release strategy, docker publishing is also added as a step in the release workflow so it runs automatically after each release.
 
 #### Overrides
 

package/dist/bin.mjs

@@ -1172,9 +1172,7 @@ function computeNodeVersionYaml(ctx) {
 function deployWorkflow(ci, nodeVersionYaml) {
 	return `${workflowSchemaComment(ci)}name: Publish
 on:
-  push:
-    tags:
-      - "v[0-9]+.[0-9]+.[0-9]+"
+  workflow_dispatch:
 
 jobs:
   publish:
@@ -1579,7 +1577,7 @@ function getAddedDevDepNames(config) {
 	const deps = { ...ROOT_DEV_DEPS };
 	if (config.structure !== "monorepo") Object.assign(deps, PER_PACKAGE_DEV_DEPS);
 	deps["@bensandee/config"] = "0.9.1";
-	deps["@bensandee/tooling"] = "0.30.0";
+	deps["@bensandee/tooling"] = "0.31.0";
 	if (config.formatter === "oxfmt") deps["oxfmt"] = {
 		"@changesets/cli": "2.30.0",
 		"@release-it/bumper": "7.0.5",
@@ -1634,7 +1632,7 @@ async function generatePackageJson(ctx) {
 	const devDeps = { ...ROOT_DEV_DEPS };
 	if (!isMonorepo) Object.assign(devDeps, PER_PACKAGE_DEV_DEPS);
 	devDeps["@bensandee/config"] = isWorkspacePackage(ctx, "@bensandee/config") ? "workspace:*" : "0.9.1";
-	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.30.0";
+	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.31.0";
 	if (ctx.config.useEslintPlugin) devDeps["@bensandee/eslint-plugin"] = isWorkspacePackage(ctx, "@bensandee/eslint-plugin") ? "workspace:*" : "0.9.2";
 	if (ctx.config.formatter === "oxfmt") devDeps["oxfmt"] = {
 		"@changesets/cli": "2.30.0",
@@ -2795,7 +2793,18 @@ ${commonSteps(nodeVersionYaml, publishesNpm)}
           ${tokenEnv}${npmEnv}
 `;
 }
-function commitAndTagVersionWorkflow(ci, nodeVersionYaml, publishesNpm) {
+function dockerPublishStep() {
+	return `
+      - name: Publish Docker images
+        if: success()
+        env:
+          DOCKER_REGISTRY_HOST: ${actionsExpr("vars.DOCKER_REGISTRY_HOST")}
+          DOCKER_REGISTRY_NAMESPACE: ${actionsExpr("vars.DOCKER_REGISTRY_NAMESPACE")}
+          DOCKER_USERNAME: ${actionsExpr("secrets.DOCKER_USERNAME")}
+          DOCKER_PASSWORD: ${actionsExpr("secrets.DOCKER_PASSWORD")}
+        run: pnpm exec bst docker:publish`;
+}
+function commitAndTagVersionWorkflow(ci, nodeVersionYaml, publishesNpm, hasDocker) {
 	const isGitHub = ci === "github";
 	const permissions = isGitHub ? `
 permissions:
@@ -2817,6 +2826,7 @@ permissions:
           FORGEJO_REPOSITORY: \${{ github.repository }}
           RELEASE_TOKEN: \${{ secrets.RELEASE_TOKEN }}
         run: pnpm exec bst release:simple`;
+	const dockerStep = hasDocker ? dockerPublishStep() : "";
 	return `${workflowSchemaComment(ci)}name: Release
 on:
   workflow_dispatch:
@@ -2825,7 +2835,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-${commonSteps(nodeVersionYaml, publishesNpm)}${gitConfigStep}${releaseStep}
+${commonSteps(nodeVersionYaml, publishesNpm)}${gitConfigStep}${releaseStep}${dockerStep}
 `;
 }
 /** Build the required release step for the check job (changesets). */
@@ -2860,7 +2870,7 @@ function changesetsReleaseStep(ci, publishesNpm) {
 		}
 	};
 }
-function requiredReleaseSteps(strategy, nodeVersionYaml, publishesNpm) {
+function requiredReleaseSteps(strategy, nodeVersionYaml, publishesNpm, hasDocker) {
 	const isNodeVersionFile = nodeVersionYaml.startsWith("node-version-file");
 	const steps = [
 		{
@@ -2902,6 +2912,13 @@ function requiredReleaseSteps(strategy, nodeVersionYaml, publishesNpm) {
 				match: { run: "release:simple" },
 				step: { run: "pnpm exec bst release:simple" }
 			});
+			if (hasDocker) steps.push({
+				match: { run: "docker:publish" },
+				step: {
+					name: "Publish Docker images",
+					run: "pnpm exec bst docker:publish"
+				}
+			});
 			break;
 		case "changesets":
 			steps.push({
@@ -2912,10 +2929,10 @@ function requiredReleaseSteps(strategy, nodeVersionYaml, publishesNpm) {
 	}
 	return steps;
 }
-function buildWorkflow(strategy, ci, nodeVersionYaml, publishesNpm) {
+function buildWorkflow(strategy, ci, nodeVersionYaml, publishesNpm, hasDocker) {
 	switch (strategy) {
 		case "release-it": return releaseItWorkflow(ci, nodeVersionYaml, publishesNpm);
-		case "simple": return commitAndTagVersionWorkflow(ci, nodeVersionYaml, publishesNpm);
+		case "simple": return commitAndTagVersionWorkflow(ci, nodeVersionYaml, publishesNpm, hasDocker);
 		default: return null;
 	}
 }
@@ -2965,7 +2982,8 @@ async function generateReleaseCi(ctx) {
 	const isGitHub = ctx.config.ci === "github";
 	const workflowPath = isGitHub ? ".github/workflows/release.yml" : ".forgejo/workflows/release.yml";
 	const nodeVersionYaml = computeNodeVersionYaml(ctx);
-	const content = buildWorkflow(ctx.config.releaseStrategy, ctx.config.ci, nodeVersionYaml, publishesNpm);
+	const hasDocker = hasDockerPackages(ctx);
+	const content = buildWorkflow(ctx.config.releaseStrategy, ctx.config.ci, nodeVersionYaml, publishesNpm, hasDocker);
 	if (!content) return {
 		filePath,
 		action: "skipped",
@@ -2990,7 +3008,7 @@ async function generateReleaseCi(ctx) {
 					description: "Release workflow already up to date"
 				};
 			}
-			const merged = mergeWorkflowSteps(existing, "release", requiredReleaseSteps(ctx.config.releaseStrategy, nodeVersionYaml, publishesNpm));
+			const merged = mergeWorkflowSteps(existing, "release", requiredReleaseSteps(ctx.config.releaseStrategy, nodeVersionYaml, publishesNpm, hasDocker));
 			const withComment = ensureSchemaComment(merged.content, ctx.config.ci);
 			if (!merged.changed) {
 				if (withComment !== raw) {
@@ -3319,7 +3337,7 @@ function generateMigratePrompt(results, config, detected) {
 	const timestamp = (/* @__PURE__ */ new Date()).toISOString();
 	sections.push("# Migration Prompt");
 	sections.push("");
-	sections.push(`_Generated by \`@bensandee/tooling@0.30.0 repo:sync\` on ${timestamp}_`);
+	sections.push(`_Generated by \`@bensandee/tooling@0.31.0 repo:sync\` on ${timestamp}_`);
 	sections.push("");
 	sections.push("The following prompt was generated by `@bensandee/tooling repo:sync`. Paste it into Claude Code or another AI assistant to finish migrating this repository.");
 	sections.push("");
@@ -5127,7 +5145,7 @@ const dockerCheckCommand = defineCommand({
 const main = defineCommand({
 	meta: {
 		name: "bst",
-		version: "0.30.0",
+		version: "0.31.0",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
@@ -5143,7 +5161,7 @@ const main = defineCommand({
 		"docker:check": dockerCheckCommand
 	}
 });
-console.log(`@bensandee/tooling v0.30.0`);
+console.log(`@bensandee/tooling v0.31.0`);
 async function run() {
 	await runMain(main);
 	process.exit(process.exitCode ?? 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bensandee/tooling",
-  "version": "0.30.0",
+  "version": "0.31.0",
   "description": "CLI tool to bootstrap and maintain standardized TypeScript project tooling",
   "bin": {
     "bst": "./dist/bin.mjs"