create-typescript-app 2.37.0 → 2.38.0

package/lib/blocks/blockGitHubActionsCI.d.ts

@@ -41,6 +41,7 @@ declare const blockGitHubActionsCI: bingo_stratum.BlockWithAddons<{
         if?: string | undefined;
         checkoutWith?: Record<string, string> | undefined;
     }[] | undefined;
+    nodeVersion?: string | number | undefined;
 }, {
     access: "public" | "restricted";
     description: string;

package/lib/blocks/blockGitHubActionsCI.js

@@ -1,3 +1,4 @@
+import _ from "lodash";
 import { z } from "zod";
 import { base } from "../base.js";
 import { resolveUses } from "./actions/resolveUses.js";
@@ -6,6 +7,7 @@ import { blockRepositoryBranchRuleset } from "./blockRepositoryBranchRuleset.js"
 import { createMultiWorkflowFile } from "./files/createMultiWorkflowFile.js";
 import { createSoloWorkflowFile } from "./files/createSoloWorkflowFile.js";
 import { formatYaml } from "./files/formatYaml.js";
+import { intakeFileAsYaml } from "./intake/intakeFileAsYaml.js";
 const zActionStep = z.intersection(
   z.object({
     env: z.record(z.string(), z.string()).optional(),
@@ -26,10 +28,37 @@ const blockGitHubActionsCI = base.createBlock({
         name: z.string(),
         steps: z.array(zActionStep)
       })
-    ).optional()
+    ).optional(),
+    nodeVersion: z.union([z.number(), z.string()]).optional()
+  },
+  intake({ files }) {
+    const actionYml = intakeFileAsYaml(files, [
+      ".github",
+      "actions",
+      "prepare",
+      "action.yml"
+    ]);
+    if (!actionYml) {
+      return;
+    }
+    const steps = _.get(actionYml, ["runs", "steps"]);
+    if (!steps || !Array.isArray(steps)) {
+      return void 0;
+    }
+    const setupNodeStep = steps.find(
+      (step) => typeof step.uses === "string" && step.uses.startsWith("actions/setup-node")
+    );
+    if (!setupNodeStep) {
+      return void 0;
+    }
+    const nodeVersion = setupNodeStep.with?.["node-version"];
+    if (!nodeVersion) {
+      return void 0;
+    }
+    return { nodeVersion };
   },
   produce({ addons, options }) {
-    const { jobs } = addons;
+    const { jobs, nodeVersion = options.node.pinned ?? options.node.minimum } = addons;
     return {
       addons: [
         blockRepositoryBranchRuleset({
@@ -60,7 +89,7 @@ const blockGitHubActionsCI = base.createBlock({
                       ),
                       with: {
                         cache: "pnpm",
-                        "node-version": options.node.pinned ?? options.node.minimum
+                        "node-version": nodeVersion
                       }
                     },
                     {

package/lib/blocks/index.d.ts

@@ -1473,6 +1473,7 @@ declare const blocks: {
             if?: string | undefined;
             checkoutWith?: Record<string, string> | undefined;
         }[] | undefined;
+        nodeVersion?: string | number | undefined;
     }, {
         access: "public" | "restricted";
         description: string;

package/lib/data/packageData.d.ts

@@ -1,5 +1,5 @@
 var name = "create-typescript-app";
-var version = "2.36.2";
+var version = "2.37.0";
 var description = "Quickstart-friendly TypeScript template with comprehensive, configurable, opinionated tooling. 🎁";
 var repository = {
 	type: "git",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-typescript-app",
-	"version": "2.37.0",
+	"version": "2.38.0",
 	"description": "Quickstart-friendly TypeScript template with comprehensive, configurable, opinionated tooling. 🎁",
 	"repository": {
 		"type": "git",