create-typescript-app 2.12.0 → 2.13.0

package/lib/blocks/blockCSpell.js

@@ -6,6 +6,7 @@ import { resolveBin } from "../utils/resolveBin.js";
 import { blockDevelopmentDocs } from "./blockDevelopmentDocs.js";
 import { blockGitHubActionsCI } from "./blockGitHubActionsCI.js";
 import { blockPackageJson } from "./blockPackageJson.js";
+import { blockRemoveWorkflows } from "./blockRemoveWorkflows.js";
 import { blockVSCode } from "./blockVSCode.js";
 import { CommandPhase } from "./phases.js";
 const filesGlob = `"**" ".github/**/*"`;
@@ -44,8 +45,7 @@ const blockCSpell = base.createBlock({
               name: "Lint Spelling",
               steps: [{ run: "pnpm lint:spelling" }]
             }
-          ],
-          removedWorkflows: ["lint-spelling", "spelling"]
+          ]
         }),
         blockPackageJson({
           properties: {
@@ -84,6 +84,15 @@ const blockCSpell = base.createBlock({
         }
       ]
     };
+  },
+  transition() {
+    return {
+      addons: [
+        blockRemoveWorkflows({
+          workflows: ["lint-spelling", "spelling"]
+        })
+      ]
+    };
   }
 });
 export {

package/lib/blocks/blockESLint.js

@@ -9,6 +9,7 @@ import { blockGitHubActionsCI } from "./blockGitHubActionsCI.js";
 import { blockPackageJson } from "./blockPackageJson.js";
 import { blockRemoveDependencies } from "./blockRemoveDependencies.js";
 import { blockRemoveFiles } from "./blockRemoveFiles.js";
+import { blockRemoveWorkflows } from "./blockRemoveWorkflows.js";
 import { blockVSCode } from "./blockVSCode.js";
 import { CommandPhase } from "./phases.js";
 const zRuleOptions = z.union([
@@ -141,8 +142,7 @@ Each should be shown in VS Code, and can be run manually on the command-line:
                 { run: "pnpm lint" }
               ]
             }
-          ],
-          removedWorkflows: ["eslint", "lint"]
+          ]
         }),
         blockPackageJson({
           properties: {
@@ -218,6 +218,9 @@ export default tseslint.config(
         }),
         blockRemoveFiles({
           files: [".eslintrc*", ".eslintignore", "eslint.config.{cjs,mjs}"]
+        }),
+        blockRemoveWorkflows({
+          workflows: ["eslint", "lint"]
         })
       ]
     };

package/lib/blocks/blockESLintPackageJson.js

@@ -1,8 +1,9 @@
 import { base } from "../base.js";
 import { blockESLint } from "./blockESLint.js";
-import { blockGitHubActionsCI } from "./blockGitHubActionsCI.js";
 import { blockPackageJson } from "./blockPackageJson.js";
 import { blockRemoveDependencies } from "./blockRemoveDependencies.js";
+import { blockRemoveFiles } from "./blockRemoveFiles.js";
+import { blockRemoveWorkflows } from "./blockRemoveWorkflows.js";
 const blockESLintPackageJson = base.createBlock({
   about: {
     name: "ESLint package.json Plugin"
@@ -19,21 +20,30 @@ const blockESLintPackageJson = base.createBlock({
             }
           ]
         }),
-        blockGitHubActionsCI({
-          removedWorkflows: ["lint-package-json"]
-        }),
         blockPackageJson({
           properties: {
             scripts: {
               "lint:package-json": void 0
             }
           }
+        })
+      ]
+    };
+  },
+  transition() {
+    return {
+      addons: [
+        blockRemoveFiles({
+          files: [".npmpackagejsonlintrc*"]
         }),
         blockRemoveDependencies({
           dependencies: [
             "npm-package-json-lint",
             "npm-package-json-lint-config-default"
           ]
+        }),
+        blockRemoveWorkflows({
+          workflows: ["lint-package-json"]
         })
       ]
     };

package/lib/blocks/blockGitHubActionsCI.d.ts

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

package/lib/blocks/blockGitHubActionsCI.js

@@ -26,8 +26,7 @@ const blockGitHubActionsCI = base.createBlock({
         name: z.string(),
         steps: z.array(zActionStep)
       })
-    ).optional(),
-    removedWorkflows: z.array(z.string()).optional()
+    ).optional()
   },
   produce({ addons, options }) {
     const { jobs } = addons;
@@ -139,18 +138,11 @@ echo "See https://github.com/actions-ecosystem/action-remove-labels/issues/221."
       }
     };
   },
-  transition({ addons }) {
-    const { removedWorkflows = [] } = addons;
+  transition() {
     return {
       addons: [
         blockRemoveFiles({
-          files: [
-            ".circleci",
-            "travis.yml",
-            ...removedWorkflows.map(
-              (removedWorkflow) => `.github/workflows/${removedWorkflow}.yml`
-            )
-          ]
+          files: [".circleci", "travis.yml"]
         })
       ]
     };

package/lib/blocks/blockKnip.js

@@ -8,6 +8,7 @@ import { blockDevelopmentDocs } from "./blockDevelopmentDocs.js";
 import { blockGitHubActionsCI } from "./blockGitHubActionsCI.js";
 import { blockPackageJson } from "./blockPackageJson.js";
 import { blockRemoveFiles } from "./blockRemoveFiles.js";
+import { blockRemoveWorkflows } from "./blockRemoveWorkflows.js";
 const blockKnip = base.createBlock({
   about: {
     name: "Knip"
@@ -36,8 +37,7 @@ const blockKnip = base.createBlock({
               name: "Lint Knip",
               steps: [{ run: "pnpm lint:knip" }]
             }
-          ],
-          removedWorkflows: ["knip", "lint-knip"]
+          ]
         }),
         blockPackageJson({
           properties: {
@@ -67,6 +67,9 @@ const blockKnip = base.createBlock({
       addons: [
         blockRemoveFiles({
           files: [".knip*", "knip.{c,m,t}*", "knip.js", "knip.jsonc"]
+        }),
+        blockRemoveWorkflows({
+          workflows: ["knip", "lint-knip"]
         })
       ]
     };

package/lib/blocks/blockMarkdownlint.js

@@ -5,6 +5,7 @@ import { blockCSpell } from "./blockCSpell.js";
 import { blockDevelopmentDocs } from "./blockDevelopmentDocs.js";
 import { blockGitHubActionsCI } from "./blockGitHubActionsCI.js";
 import { blockPackageJson } from "./blockPackageJson.js";
+import { blockRemoveWorkflows } from "./blockRemoveWorkflows.js";
 import { blockVSCode } from "./blockVSCode.js";
 import { formatIgnoreFile } from "./files/formatIgnoreFile.js";
 import { CommandPhase } from "./phases.js";
@@ -39,12 +40,6 @@ const blockMarkdownlint = base.createBlock({
               name: "Lint Markdown",
               steps: [{ run: "pnpm lint:md" }]
             }
-          ],
-          removedWorkflows: [
-            "lint-md",
-            "lint-markdown",
-            "lint-markdownlint",
-            "markdownlint"
           ]
         }),
         blockPackageJson({
@@ -85,6 +80,20 @@ const blockMarkdownlint = base.createBlock({
         }
       ]
     };
+  },
+  transition() {
+    return {
+      addons: [
+        blockRemoveWorkflows({
+          workflows: [
+            "lint-md",
+            "lint-markdown",
+            "lint-markdownlint",
+            "markdownlint"
+          ]
+        })
+      ]
+    };
   }
 });
 export {

package/lib/blocks/blockPnpmDedupe.js

@@ -2,6 +2,7 @@ import { base } from "../base.js";
 import { blockDevelopmentDocs } from "./blockDevelopmentDocs.js";
 import { blockGitHubActionsCI } from "./blockGitHubActionsCI.js";
 import { blockPackageJson } from "./blockPackageJson.js";
+import { blockRemoveWorkflows } from "./blockRemoveWorkflows.js";
 const blockPnpmDedupe = base.createBlock({
   about: {
     name: "pnpm Dedupe"
@@ -26,8 +27,7 @@ const blockPnpmDedupe = base.createBlock({
               name: "Lint Packages",
               steps: [{ run: "pnpm lint:packages" }]
             }
-          ],
-          removedWorkflows: ["lint-packages"]
+          ]
         }),
         blockPackageJson({
           cleanupCommands: ["pnpm dedupe"],
@@ -39,6 +39,15 @@ const blockPnpmDedupe = base.createBlock({
         })
       ]
     };
+  },
+  transition() {
+    return {
+      addons: [
+        blockRemoveWorkflows({
+          workflows: ["lint-packages"]
+        })
+      ]
+    };
   }
 });
 export {

package/lib/blocks/blockPrettier.js

@@ -5,7 +5,9 @@ import { blockCSpell } from "./blockCSpell.js";
 import { blockDevelopmentDocs } from "./blockDevelopmentDocs.js";
 import { blockGitHubActionsCI } from "./blockGitHubActionsCI.js";
 import { blockPackageJson } from "./blockPackageJson.js";
+import { blockRemoveDependencies } from "./blockRemoveDependencies.js";
 import { blockRemoveFiles } from "./blockRemoveFiles.js";
+import { blockRemoveWorkflows } from "./blockRemoveWorkflows.js";
 import { blockVSCode } from "./blockVSCode.js";
 import { formatIgnoreFile } from "./files/formatIgnoreFile.js";
 import { CommandPhase } from "./phases.js";
@@ -54,8 +56,7 @@ pnpm format --write
               name: "Prettier",
               steps: [{ run: "pnpm format --list-different" }]
             }
-          ],
-          removedWorkflows: ["format", "prettier"]
+          ]
         }),
         blockPackageJson({
           properties: {
@@ -105,8 +106,14 @@ pnpm format --write
   transition() {
     return {
       addons: [
+        blockRemoveDependencies({
+          dependencies: ["eslint-config-prettier", "eslint-plugin-prettier"]
+        }),
         blockRemoveFiles({
           files: [".prettierrc.{c*,js,m*,t*}", "prettier.config*"]
+        }),
+        blockRemoveWorkflows({
+          workflows: ["format", "prettier"]
         })
       ]
     };

package/lib/blocks/blockRemoveWorkflows.d.ts

@@ -0,0 +1,65 @@
+import * as bingo_stratum from 'bingo-stratum';
+
+declare const blockRemoveWorkflows: bingo_stratum.BlockWithAddons<{
+    workflows?: string[] | undefined;
+}, {
+    access: "public" | "restricted";
+    description: string;
+    directory: string;
+    email: {
+        github: string;
+        npm: string;
+    };
+    title: string;
+    owner: string;
+    repository: string;
+    author?: string | undefined;
+    bin?: string | undefined;
+    contributors?: {
+        avatar_url: string;
+        contributions: string[];
+        login: string;
+        name: string;
+        profile: string;
+    }[] | undefined;
+    documentation?: string | undefined;
+    emoji?: string | undefined;
+    existingLabels?: {
+        name: string;
+        description: string;
+        color: string;
+    }[] | undefined;
+    explainer?: string[] | undefined;
+    funding?: string | undefined;
+    guide?: {
+        href: string;
+        title: string;
+    } | undefined;
+    keywords?: string[] | undefined;
+    logo?: {
+        alt: string;
+        src: string;
+        height?: number | undefined;
+        width?: number | undefined;
+    } | undefined;
+    node?: {
+        minimum: string;
+        pinned?: string | undefined;
+    } | undefined;
+    packageData?: {
+        dependencies?: Record<string, string> | undefined;
+        devDependencies?: Record<string, string> | undefined;
+        scripts?: Record<string, string> | undefined;
+    } | undefined;
+    pnpm?: string | undefined;
+    rulesetId?: string | undefined;
+    usage?: string | undefined;
+    version?: string | undefined;
+    words?: string[] | undefined;
+    workflowsVersions?: Record<string, Record<string, {
+        pinned?: boolean | undefined;
+        hash?: string | undefined;
+    }>> | undefined;
+}>;
+
+export { blockRemoveWorkflows };

package/lib/blocks/blockRemoveWorkflows.js

@@ -0,0 +1,31 @@
+import { z } from "zod";
+import { base } from "../base.js";
+import { blockRemoveFiles } from "./blockRemoveFiles.js";
+const blockRemoveWorkflows = base.createBlock({
+  about: {
+    name: "Remove Workflows"
+  },
+  addons: {
+    workflows: z.array(z.string()).optional()
+  },
+  // TODO: Make produce() optional, so this empty-ish produce() can be removed
+  // https://github.com/JoshuaKGoldberg/bingo/issues/295
+  produce() {
+    return {};
+  },
+  transition({ addons }) {
+    const { workflows } = addons;
+    return {
+      addons: [
+        blockRemoveFiles({
+          files: workflows?.map(
+            (workflow) => `.github/workflows/${workflow}.yml`
+          )
+        })
+      ]
+    };
+  }
+});
+export {
+  blockRemoveWorkflows
+};

package/lib/blocks/blockTSup.js

@@ -7,6 +7,7 @@ import { blockGitHubActionsCI } from "./blockGitHubActionsCI.js";
 import { blockPackageJson } from "./blockPackageJson.js";
 import { blockRemoveDependencies } from "./blockRemoveDependencies.js";
 import { blockRemoveFiles } from "./blockRemoveFiles.js";
+import { blockRemoveWorkflows } from "./blockRemoveWorkflows.js";
 import { CommandPhase } from "./phases.js";
 const blockTSup = base.createBlock({
   about: {
@@ -53,8 +54,7 @@ pnpm build --watch
                 }
               ]
             }
-          ],
-          removedWorkflows: ["build", "tsup"]
+          ]
         }),
         blockPackageJson({
           properties: {
@@ -90,10 +90,18 @@ export default defineConfig({
     return {
       addons: [
         blockRemoveDependencies({
-          dependencies: ["@babel/core", "babel"]
+          dependencies: [
+            "@babel/cli",
+            "@babel/core",
+            "@babel/preset-typescript",
+            "babel"
+          ]
         }),
         blockRemoveFiles({
           files: [".babelrc*", "babel.config.*", "dist", "lib"]
+        }),
+        blockRemoveWorkflows({
+          workflows: ["build", "tsup"]
         })
       ]
     };

package/lib/blocks/blockTypeScript.js

@@ -6,6 +6,7 @@ import { blockGitHubActionsCI } from "./blockGitHubActionsCI.js";
 import { blockGitignore } from "./blockGitignore.js";
 import { blockMarkdownlint } from "./blockMarkdownlint.js";
 import { blockPackageJson } from "./blockPackageJson.js";
+import { blockRemoveWorkflows } from "./blockRemoveWorkflows.js";
 import { blockVitest } from "./blockVitest.js";
 import { blockVSCode } from "./blockVSCode.js";
 const blockTypeScript = base.createBlock({
@@ -67,8 +68,7 @@ export * from "./types.js";
           ignores: ["/lib"]
         }),
         blockGitHubActionsCI({
-          jobs: [{ name: "Type Check", steps: [{ run: "pnpm tsc" }] }],
-          removedWorkflows: ["tsc"]
+          jobs: [{ name: "Type Check", steps: [{ run: "pnpm tsc" }] }]
         }),
         blockMarkdownlint({
           ignores: ["lib/"]
@@ -126,6 +126,15 @@ export * from "./types.js";
         })
       }
     };
+  },
+  transition() {
+    return {
+      addons: [
+        blockRemoveWorkflows({
+          workflows: ["tsc"]
+        })
+      ]
+    };
   }
 });
 export {

package/lib/blocks/blockVitest.js

@@ -11,6 +11,7 @@ import { blockPackageJson } from "./blockPackageJson.js";
 import { blockPrettier } from "./blockPrettier.js";
 import { blockRemoveDependencies } from "./blockRemoveDependencies.js";
 import { blockRemoveFiles } from "./blockRemoveFiles.js";
+import { blockRemoveWorkflows } from "./blockRemoveWorkflows.js";
 import { blockTSup } from "./blockTSup.js";
 import { blockVSCode } from "./blockVSCode.js";
 const blockVitest = base.createBlock({
@@ -136,8 +137,7 @@ describe(greet, () => {
               name: "Test",
               steps: [{ run: "pnpm run test --coverage" }, ...actionSteps]
             }
-          ],
-          removedWorkflows: ["test"]
+          ]
         }),
         blockPackageJson({
           properties: {
@@ -200,6 +200,7 @@ export default defineConfig({
       addons: [
         blockRemoveDependencies({
           dependencies: [
+            "@vitest/coverage-istanbul",
             "eslint-plugin-jest",
             "eslint-plugin-mocha",
             "eslint-plugin-vitest",
@@ -208,6 +209,9 @@ export default defineConfig({
         }),
         blockRemoveFiles({
           files: [".mocha*", "jest.config.*", "vitest.config.{c,j,m}*"]
+        }),
+        blockRemoveWorkflows({
+          workflows: ["test"]
         })
       ]
     };

package/lib/blocks/index.d.ts

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

package/lib/data/packageData.d.ts

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

package/lib/options/readLogo.js

@@ -4,12 +4,16 @@ async function readLogo(getReadme) {
   if (!tag) {
     return void 0;
   }
+  const alt = /alt=['"](.+)['"]\s*src=/.exec(tag)?.[1].split(/['"]?\s*\w+=/)[0] ?? "Project logo";
+  if (/All Contributors: \d+/.test(alt)) {
+    return void 0;
+  }
   const src = /src\s*=(.+)['"/]>/.exec(tag)?.[1]?.split(/\s*\w+=/)[0].replaceAll(/^['"]|['"]$/g, "");
-  if (!src) {
+  if (!src || src.includes("//img.shields.io")) {
     return void 0;
   }
   return {
-    alt: /alt=['"](.+)['"]\s*src=/.exec(tag)?.[1].split(/['"]?\s*\w+=/)[0] ?? "Project logo",
+    alt,
     src,
     ...readLogoSizing(src)
   };

package/lib/presets/minimal.js

@@ -15,6 +15,7 @@ import { blockPrettier } from "../blocks/blockPrettier.js";
 import { blockREADME } from "../blocks/blockREADME.js";
 import { blockRemoveDependencies } from "../blocks/blockRemoveDependencies.js";
 import { blockRemoveFiles } from "../blocks/blockRemoveFiles.js";
+import { blockRemoveWorkflows } from "../blocks/blockRemoveWorkflows.js";
 import { blockRepositoryBranchRuleset } from "../blocks/blockRepositoryBranchRuleset.js";
 import { blockRepositoryLabels } from "../blocks/blockRepositoryLabels.js";
 import { blockRepositorySecrets } from "../blocks/blockRepositorySecrets.js";
@@ -45,6 +46,7 @@ const presetMinimal = base.createPreset({
     blockREADME,
     blockRemoveDependencies,
     blockRemoveFiles,
+    blockRemoveWorkflows,
     blockRepositoryBranchRuleset,
     blockRepositoryLabels,
     blockRepositorySecrets,

package/package.json

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