create-typescript-app 2.37.0 → 2.39.0

package/lib/blocks/blockContributorCovenant.js

@@ -1,4 +1,5 @@
 import { base } from "../base.js";
+import { blockMarkdownlint } from "./blockMarkdownlint.js";
 import { blockREADME } from "./blockREADME.js";
 import { blockRemoveFiles } from "./blockRemoveFiles.js";
 const blockContributorCovenant = base.createBlock({
@@ -8,6 +9,9 @@ const blockContributorCovenant = base.createBlock({
   produce({ options }) {
     return {
       addons: [
+        blockMarkdownlint({
+          ignores: [".github/CODE_OF_CONDUCT.md"]
+        }),
         blockREADME({
           badges: [
             {

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/blockMarkdownlint.js

@@ -7,6 +7,7 @@ import { blockPackageJson } from "./blockPackageJson.js";
 import { blockRemoveWorkflows } from "./blockRemoveWorkflows.js";
 import { blockVSCode } from "./blockVSCode.js";
 import { formatIgnoreFile } from "./files/formatIgnoreFile.js";
+import { intakeFile } from "./intake/intakeFile.js";
 import { CommandPhase } from "./phases.js";
 const blockMarkdownlint = base.createBlock({
   about: {
@@ -15,6 +16,15 @@ const blockMarkdownlint = base.createBlock({
   addons: {
     ignores: z.array(z.string()).default([])
   },
+  intake({ files }) {
+    const markdownlintignoreRaw = intakeFile(files, [".markdownlintignore"]);
+    if (!markdownlintignoreRaw) {
+      return void 0;
+    }
+    return {
+      ignores: markdownlintignoreRaw[0].split("\n").filter(Boolean)
+    };
+  },
   produce({ addons }) {
     const { ignores } = addons;
     return {
@@ -61,12 +71,7 @@ const blockMarkdownlint = base.createBlock({
           "no-inline-html": false
         }),
         ".markdownlintignore": formatIgnoreFile(
-          [
-            ".github/CODE_OF_CONDUCT.md",
-            "CHANGELOG.md",
-            "node_modules/",
-            ...ignores
-          ].sort()
+          Array.from(/* @__PURE__ */ new Set(["node_modules/", ...ignores])).sort()
         )
       },
       scripts: [

package/lib/blocks/blockReleaseIt.js

@@ -2,6 +2,7 @@ import { z } from "zod";
 import { base } from "../base.js";
 import { getPackageDependencies } from "../data/packageData.js";
 import { resolveUses } from "./actions/resolveUses.js";
+import { blockMarkdownlint } from "./blockMarkdownlint.js";
 import { blockPackageJson } from "./blockPackageJson.js";
 import { blockREADME } from "./blockREADME.js";
 import { blockRepositorySecrets } from "./blockRepositorySecrets.js";
@@ -22,6 +23,9 @@ const blockReleaseIt = base.createBlock({
     const { builders } = addons;
     return {
       addons: [
+        blockMarkdownlint({
+          ignores: ["CHANGELOG.md"]
+        }),
         blockPackageJson({
           properties: {
             devDependencies: getPackageDependencies(

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.38.0";
 var description = "Quickstart-friendly TypeScript template with comprehensive, configurable, opinionated tooling. 🎁";
 var repository = {
 	type: "git",
@@ -95,7 +95,7 @@ var devDependencies = {
 	"eslint-plugin-markdown": "5.1.0",
 	"eslint-plugin-n": "17.16.2",
 	"eslint-plugin-package-json": "0.29.0",
-	"eslint-plugin-perfectionist": "4.10.1",
+	"eslint-plugin-perfectionist": "4.11.0",
 	"eslint-plugin-regexp": "2.7.0",
 	"eslint-plugin-yml": "1.17.0",
 	husky: "9.1.7",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-typescript-app",
-	"version": "2.37.0",
+	"version": "2.39.0",
 	"description": "Quickstart-friendly TypeScript template with comprehensive, configurable, opinionated tooling. 🎁",
 	"repository": {
 		"type": "git",
@@ -99,7 +99,7 @@
 		"eslint-plugin-markdown": "5.1.0",
 		"eslint-plugin-n": "17.16.2",
 		"eslint-plugin-package-json": "0.29.0",
-		"eslint-plugin-perfectionist": "4.10.1",
+		"eslint-plugin-perfectionist": "4.11.0",
 		"eslint-plugin-regexp": "2.7.0",
 		"eslint-plugin-yml": "1.17.0",
 		"husky": "9.1.7",