feat: assorted transition mode removals

src/blocks/blockCSpell.test.ts

@@ -51,10 +51,6 @@ describe("blockCSpell", () => {
 			            ],
 			          },
 			        ],
-			        "removedWorkflows": [
-			          "lint-spelling",
-			          "spelling",
-			        ],
 			      },
 			      "block": [Function],
 			    },
@@ -125,10 +121,6 @@ describe("blockCSpell", () => {
 			            ],
 			          },
 			        ],
-			        "removedWorkflows": [
-			          "lint-spelling",
-			          "spelling",
-			        ],
 			      },
 			      "block": [Function],
 			    },
@@ -198,10 +190,6 @@ describe("blockCSpell", () => {
 			            ],
 			          },
 			        ],
-			        "removedWorkflows": [
-			          "lint-spelling",
-			          "spelling",
-			        ],
 			      },
 			      "block": [Function],
 			    },
@@ -269,10 +257,6 @@ describe("blockCSpell", () => {
 			            ],
 			          },
 			        ],
-			        "removedWorkflows": [
-			          "lint-spelling",
-			          "spelling",
-			        ],
 			      },
 			      "block": [Function],
 			    },
@@ -304,4 +288,80 @@ describe("blockCSpell", () => {
 			}
 		`);
 	});
+
+	test("transition mode", () => {
+		const creation = testBlock(blockCSpell, {
+			mode: "transition",
+			options: optionsBase,
+		});
+
+		expect(creation).toMatchInlineSnapshot(`
+			{
+			  "addons": [
+			    {
+			      "addons": {
+			        "sections": {
+			          "Linting": {
+			            "contents": {
+			              "items": [
+			                "- \`pnpm lint:spelling\` ([cspell](https://cspell.org)): Spell checks across all source files",
+			              ],
+			            },
+			          },
+			        },
+			      },
+			      "block": [Function],
+			    },
+			    {
+			      "addons": {
+			        "extensions": [
+			          "streetsidesoftware.code-spell-checker",
+			        ],
+			      },
+			      "block": [Function],
+			    },
+			    {
+			      "addons": {
+			        "jobs": [
+			          {
+			            "name": "Lint Spelling",
+			            "steps": [
+			              {
+			                "run": "pnpm lint:spelling",
+			              },
+			            ],
+			          },
+			        ],
+			      },
+			      "block": [Function],
+			    },
+			    {
+			      "addons": {
+			        "properties": {
+			          "devDependencies": {
+			            "cspell": "8.17.5",
+			          },
+			          "scripts": {
+			            "lint:spelling": "cspell "**" ".github/**/*"",
+			          },
+			        },
+			      },
+			      "block": [Function],
+			    },
+			    {
+			      "addons": {
+			        "workflows": [
+			          "lint-spelling",
+			          "spelling",
+			        ],
+			      },
+			      "block": [Function],
+			    },
+			  ],
+			  "files": {
+			    "cspell.json": "{"dictionaries":["npm","node","typescript"],"ignorePaths":[".github","CHANGELOG.md","lib","node_modules","pnpm-lock.yaml"]}",
+			  },
+			}
+		`);
+	});
 });

src/blocks/blockCSpell.ts

@@ -7,6 +7,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";
 
@@ -50,7 +51,6 @@ export const blockCSpell = base.createBlock({
 							steps: [{ run: "pnpm lint:spelling" }],
 						},
 					],
-					removedWorkflows: ["lint-spelling", "spelling"],
 				}),
 				blockPackageJson({
 					properties: {
@@ -93,4 +93,13 @@ export const blockCSpell = base.createBlock({
 			],
 		};
 	},
+	transition() {
+		return {
+			addons: [
+				blockRemoveWorkflows({
+					workflows: ["lint-spelling", "spelling"],
+				}),
+			],
+		};
+	},
 });

src/blocks/blockESLint.test.ts

@@ -61,10 +61,6 @@ describe("blockESLint", () => {
 			            ],
 			          },
 			        ],
-			        "removedWorkflows": [
-			          "eslint",
-			          "lint",
-			        ],
 			      },
 			      "block": [Function],
 			    },
@@ -194,10 +190,6 @@ describe("blockESLint", () => {
 			            ],
 			          },
 			        ],
-			        "removedWorkflows": [
-			          "eslint",
-			          "lint",
-			        ],
 			      },
 			      "block": [Function],
 			    },
@@ -271,6 +263,15 @@ describe("blockESLint", () => {
 			      },
 			      "block": [Function],
 			    },
+			    {
+			      "addons": {
+			        "workflows": [
+			          "eslint",
+			          "lint",
+			        ],
+			      },
+			      "block": [Function],
+			    },
 			  ],
 			  "files": {
 			    "eslint.config.js": "import eslint from "@eslint/js";
@@ -388,10 +389,6 @@ describe("blockESLint", () => {
 			            ],
 			          },
 			        ],
-			        "removedWorkflows": [
-			          "eslint",
-			          "lint",
-			        ],
 			      },
 			      "block": [Function],
 			    },
@@ -538,10 +535,6 @@ describe("blockESLint", () => {
 			            ],
 			          },
 			        ],
-			        "removedWorkflows": [
-			          "eslint",
-			          "lint",
-			        ],
 			      },
 			      "block": [Function],
 			    },

src/blocks/blockESLint.ts

@@ -11,6 +11,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";
 
@@ -161,7 +162,6 @@ Each should be shown in VS Code, and can be run manually on the command-line:
 							],
 						},
 					],
-					removedWorkflows: ["eslint", "lint"],
 				}),
 				blockPackageJson({
 					properties: {
@@ -239,6 +239,9 @@ export default tseslint.config(
 				blockRemoveFiles({
 					files: [".eslintrc*", ".eslintignore", "eslint.config.{cjs,mjs}"],
 				}),
+				blockRemoveWorkflows({
+					workflows: ["eslint", "lint"],
+				}),
 			],
 		};
 	},

src/blocks/blockESLintPackageJson.test.ts

@@ -5,7 +5,7 @@ import { blockESLintPackageJson } from "./blockESLintPackageJson.js";
 import { optionsBase } from "./options.fakes.js";
 
 describe("blockESLintPackageJson", () => {
-	test("production", () => {
+	test("without mode", () => {
 		const creation = testBlock(blockESLintPackageJson, {
 			options: optionsBase,
 		});
@@ -29,8 +29,38 @@ describe("blockESLintPackageJson", () => {
 			    },
 			    {
 			      "addons": {
-			        "removedWorkflows": [
-			          "lint-package-json",
+			        "properties": {
+			          "scripts": {
+			            "lint:package-json": undefined,
+			          },
+			        },
+			      },
+			      "block": [Function],
+			    },
+			  ],
+			}
+		`);
+	});
+
+	test("transition mode", () => {
+		const creation = testBlock(blockESLintPackageJson, {
+			mode: "transition",
+			options: optionsBase,
+		});
+
+		expect(creation).toMatchInlineSnapshot(`
+			{
+			  "addons": [
+			    {
+			      "addons": {
+			        "extensions": [
+			          "packageJson.configs.recommended",
+			        ],
+			        "imports": [
+			          {
+			            "source": "eslint-plugin-package-json",
+			            "specifier": "packageJson",
+			          },
 			        ],
 			      },
 			      "block": [Function],
@@ -45,6 +75,14 @@ describe("blockESLintPackageJson", () => {
 			      },
 			      "block": [Function],
 			    },
+			    {
+			      "addons": {
+			        "files": [
+			          ".npmpackagejsonlintrc*",
+			        ],
+			      },
+			      "block": [Function],
+			    },
 			    {
 			      "addons": {
 			        "dependencies": [
@@ -54,6 +92,14 @@ describe("blockESLintPackageJson", () => {
 			      },
 			      "block": [Function],
 			    },
+			    {
+			      "addons": {
+			        "workflows": [
+			          "lint-package-json",
+			        ],
+			      },
+			      "block": [Function],
+			    },
 			  ],
 			}
 		`);

src/blocks/blockESLintPackageJson.ts

@@ -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";
 
 export const blockESLintPackageJson = base.createBlock({
 	about: {
@@ -20,22 +21,31 @@ export const blockESLintPackageJson = base.createBlock({
 						},
 					],
 				}),
-				blockGitHubActionsCI({
-					removedWorkflows: ["lint-package-json"],
-				}),
 				blockPackageJson({
 					properties: {
 						scripts: {
 							"lint:package-json": undefined,
 						},
 					},
 				}),
+			],
+		};
+	},
+	transition() {
+		return {
+			addons: [
+				blockRemoveFiles({
+					files: [".npmpackagejsonlintrc*"],
+				}),
 				blockRemoveDependencies({
 					dependencies: [
 						"npm-package-json-lint",
 						"npm-package-json-lint-config-default",
 					],
 				}),
+				blockRemoveWorkflows({
+					workflows: ["lint-package-json"],
+				}),
 			],
 		};
 	},

src/blocks/blockGitHubActionsCI.ts

@@ -32,7 +32,6 @@ export const blockGitHubActionsCI = base.createBlock({
 				}),
 			)
 			.optional(),
-		removedWorkflows: z.array(z.string()).optional(),
 	},
 	produce({ addons, options }) {
 		const { jobs } = addons;
@@ -145,18 +144,11 @@ export const blockGitHubActionsCI = base.createBlock({
 			},
 		};
 	},
-	transition({ addons }) {
-		const { removedWorkflows = [] } = addons;
+	transition() {
 		return {
 			addons: [
 				blockRemoveFiles({
-					files: [
-						".circleci",
-						"travis.yml",
-						...removedWorkflows.map(
-							(removedWorkflow) => `.github/workflows/${removedWorkflow}.yml`,
-						),
-					],
+					files: [".circleci", "travis.yml"],
 				}),
 			],
 		};