create-typescript-app 2.66.0 → 2.67.0

package/dist/blocks/blockCSpell.mjs

@@ -4,6 +4,7 @@ import { base } from "../base.mjs";
 import { resolveBin } from "../utils/resolveBin.mjs";
 import { CommandPhase } from "./phases.mjs";
 import { blockGitHubActionsCI } from "./blockGitHubActionsCI.mjs";
+import { formatFile } from "../utils/formatFile.mjs";
 import { blockPackageJson } from "./blockPackageJson.mjs";
 import { blockDevelopmentDocs } from "./blockDevelopmentDocs.mjs";
 import { blockRemoveWorkflows } from "./blockRemoveWorkflows.mjs";
@@ -44,7 +45,7 @@ const blockCSpell = base.createBlock({
 					scripts: { "lint:spelling": `cspell ${filesGlob}` }
 				} })
 			],
-			files: { "cspell.json": JSON.stringify({
+			files: { "cspell.json": formatFile("cspell.json", JSON.stringify({
 				dictionaries: [
 					"npm",
 					"node",
@@ -59,7 +60,7 @@ const blockCSpell = base.createBlock({
 					...ignorePaths
 				])).sort(),
 				...allWords.length && { words: allWords }
-			}) }
+			})) }
 		};
 	},
 	setup({ options }) {

package/dist/blocks/blockESLint.mjs

@@ -5,6 +5,7 @@ import { CommandPhase } from "./phases.mjs";
 import { blockRemoveFiles } from "./blockRemoveFiles.mjs";
 import { withPreviously } from "./files/withPreviously.mjs";
 import { blockGitHubActionsCI } from "./blockGitHubActionsCI.mjs";
+import { formatFile } from "../utils/formatFile.mjs";
 import { blockPackageJson } from "./blockPackageJson.mjs";
 import { blockDevelopmentDocs } from "./blockDevelopmentDocs.mjs";
 import { blockRemoveWorkflows } from "./blockRemoveWorkflows.mjs";
@@ -116,13 +117,13 @@ Each should be shown in VS Code, and can be run manually on the command-line:
 					}
 				})
 			],
-			files: { [configFileName]: withPreviously(`${explanation}${importLines.join("\n")}
+			files: { [configFileName]: withPreviously(formatFile(configFileName, `${explanation}${importLines.join("\n")}
 
 export default defineConfig(
 	globalIgnores( [${ignoreLines.join(", ")}], "Global Ignores" ),
 	{ linterOptions: { reportUnusedDisableDirectives: "error" } },
 	${extensionLines.join(",")}
-);`, ["eslint.config.js", "eslint.config.mjs"]) },
+);`), ["eslint.config.js", "eslint.config.mjs"]) },
 			scripts: [{
 				commands: ["pnpm lint --fix"],
 				phase: CommandPhase.Process
@@ -173,7 +174,7 @@ function printExtension(extension) {
 		extension.extends && `extends: [${extension.extends.join(", ")}],`,
 		`files: [${extension.files.map((glob) => JSON.stringify(glob)).join(", ")}],`,
 		extension.languageOptions && `languageOptions: ${JSON.stringify(extension.languageOptions).replace("\"import.meta.dirname\"", "import.meta.dirname")},`,
-		extension.linterOptions && `linterOptions: ${JSON.stringify(extension.linterOptions)}`,
+		extension.linterOptions && `linterOptions: ${JSON.stringify(extension.linterOptions)},`,
 		extension.rules && `rules: ${printExtensionRules(extension.rules)},`,
 		extension.settings && `settings: ${JSON.stringify(sortKeys(extension.settings))},`,
 		"}"

package/dist/blocks/blockESLintPlugin.mjs

@@ -2,6 +2,7 @@ import { intakeFile } from "./intake/intakeFile.mjs";
 import { base } from "../base.mjs";
 import { CommandPhase } from "./phases.mjs";
 import { blockGitHubActionsCI } from "./blockGitHubActionsCI.mjs";
+import { formatFile } from "../utils/formatFile.mjs";
 import { blockPackageJson } from "./blockPackageJson.mjs";
 import { blockDevelopmentDocs } from "./blockDevelopmentDocs.mjs";
 import { blockCSpell } from "./blockCSpell.mjs";
@@ -91,7 +92,7 @@ These are all set to \`"error"\` in the recommended config:
 				} }),
 				blockVitest({ coverage: { exclude: ["src/index.ts", "src/rules/index.ts"] } })
 			],
-			files: { [configFileName]: `import prettier from "prettier";
+			files: { [configFileName]: formatFile(configFileName, `import prettier from "prettier";
 
 /** @type {import('eslint-doc-generator').GenerateOptions} */
 const config = {
@@ -104,7 +105,7 @@ const config = {
 };
 
 export default config;
-` },
+`) },
 			scripts: [{
 				commands: ["pnpm build"],
 				phase: CommandPhase.Build

package/dist/blocks/blockKnip.mjs

@@ -3,6 +3,7 @@ import { base } from "../base.mjs";
 import { blockRemoveFiles } from "./blockRemoveFiles.mjs";
 import { withPreviously } from "./files/withPreviously.mjs";
 import { blockGitHubActionsCI } from "./blockGitHubActionsCI.mjs";
+import { formatFile } from "../utils/formatFile.mjs";
 import { blockPackageJson } from "./blockPackageJson.mjs";
 import { blockDevelopmentDocs } from "./blockDevelopmentDocs.mjs";
 import { blockRemoveWorkflows } from "./blockRemoveWorkflows.mjs";
@@ -45,7 +46,7 @@ const blockKnip = base.createBlock({
 				blockRemoveFiles({ files: [".ts-prunerc*"] }),
 				blockVSCode({ extensions: ["webpro.vscode-knip"] })
 			],
-			files: { "knip.config.ts": withPreviously(`import type { KnipConfig } from "knip";
+			files: { "knip.config.ts": withPreviously(formatFile("knip.config.ts", `import type { KnipConfig } from "knip";
 
 export default ${JSON.stringify({
 				entry: entry?.sort(),
@@ -56,7 +57,7 @@ export default ${JSON.stringify({
 				},
 				project: project?.sort(),
 				treatConfigHintsAsErrors: true
-			})} satisfies KnipConfig;`, ["knip.json"]) }
+			})} satisfies KnipConfig;`), ["knip.json"]) }
 		};
 	},
 	transition() {

package/dist/blocks/blockPackageJson.mjs

@@ -2,6 +2,7 @@ import { htmlToTextSafe } from "../utils/htmlToTextSafe.mjs";
 import { base } from "../base.mjs";
 import { CommandPhase } from "./phases.mjs";
 import { blockRemoveFiles } from "./blockRemoveFiles.mjs";
+import { formatFile } from "../utils/formatFile.mjs";
 import { resolveEmails } from "../utils/resolveEmails.mjs";
 import { z } from "zod";
 import semver from "semver";
@@ -21,13 +22,13 @@ const blockPackageJson = base.createBlock({
 			...options.packageData?.dependencies,
 			...addons.properties.dependencies
 		});
-		const devDependencies = useLargerVersions(options.packageData?.devDependencies, {
+		const devDependencies = Object.fromEntries(Object.entries(useLargerVersions(options.packageData?.devDependencies, {
 			...options.packageData?.devDependencies,
 			...addons.properties.devDependencies
-		});
+		})).filter(([name]) => !(name in dependencies)));
 		const description = htmlToTextSafe(options.description);
 		return {
-			files: { "package.json": sortPackageJson(JSON.stringify(removeUndefinedObjects({
+			files: { "package.json": formatFile("package.json", sortPackageJson(JSON.stringify(removeUndefinedObjects({
 				...options.packageData,
 				...addons.properties,
 				author: {
@@ -53,7 +54,7 @@ const blockPackageJson = base.createBlock({
 				},
 				type: options.type ?? "module",
 				version: options.version ?? "0.0.0"
-			}))) },
+			})))) },
 			scripts: [{
 				commands: [`pnpm install ${offline ? "--offline " : ""}--no-frozen-lockfile`, ...addons.cleanupCommands],
 				phase: CommandPhase.Install

package/dist/blocks/blockPrettier.mjs

@@ -4,6 +4,7 @@ import { CommandPhase } from "./phases.mjs";
 import { blockRemoveFiles } from "./blockRemoveFiles.mjs";
 import { withPreviously } from "./files/withPreviously.mjs";
 import { blockGitHubActionsCI } from "./blockGitHubActionsCI.mjs";
+import { formatFile } from "../utils/formatFile.mjs";
 import { blockPackageJson } from "./blockPackageJson.mjs";
 import { blockDevelopmentDocs } from "./blockDevelopmentDocs.mjs";
 import { blockRemoveWorkflows } from "./blockRemoveWorkflows.mjs";
@@ -67,14 +68,14 @@ pnpm format --write
 					"/pnpm-lock.yaml",
 					...ignores
 				].sort()),
-				"prettier.config.ts": withPreviously(`import type { Config } from "prettier";
+				"prettier.config.ts": withPreviously(formatFile("prettier.config.ts", `import type { Config } from "prettier";
 
 export default ${JSON.stringify({
 					...overrides.length && { overrides: overrides.sort() },
 					...plugins.length && { plugins: plugins.sort() },
 					useTabs: true
 				})} satisfies Config;
-`, [".prettierrc.json"])
+`), [".prettierrc.json"])
 			},
 			scripts: [{
 				commands: [...runBefore, "pnpm format --write"],

package/dist/blocks/blockReleaseIt.mjs

@@ -3,6 +3,7 @@ import { base } from "../base.mjs";
 import { resolveUses } from "./actions/resolveUses.mjs";
 import { createSoloWorkflowFile } from "./files/createSoloWorkflowFile.mjs";
 import { withPreviously } from "./files/withPreviously.mjs";
+import { formatFile } from "../utils/formatFile.mjs";
 import { blockPackageJson } from "./blockPackageJson.mjs";
 import { blockREADME } from "./blockREADME.mjs";
 import { blockRepositorySecrets } from "./blockRepositorySecrets.mjs";
@@ -91,7 +92,7 @@ const blockReleaseIt = base.createBlock({
 						]
 					}), ["release.yml"])
 				} },
-				".release-it.json": JSON.stringify({
+				".release-it.json": formatFile(".release-it.json", JSON.stringify({
 					git: {
 						commitMessage: "chore: release v${version}",
 						pushArgs: ["--follow-tags", "--atomic"],
@@ -152,7 +153,7 @@ const blockReleaseIt = base.createBlock({
 							}
 						]
 					} }
-				})
+				}))
 			},
 			suggestions: [[`- add ${options.owner}/${options.repository} and \`release.yaml\` as a Trusted Publisher on:`, `   https://www.npmjs.com/package/${options.repository}/access`].join("\n")]
 		};

package/dist/blocks/blockRenovate.mjs

@@ -1,4 +1,5 @@
 import { base } from "../base.mjs";
+import { formatFile } from "../utils/formatFile.mjs";
 import { intakeFileAsJson } from "./intake/intakeFileAsJson.mjs";
 import { blockGitHubApps } from "./blockGitHubApps.mjs";
 import { z } from "zod";
@@ -18,7 +19,7 @@ const blockRenovate = base.createBlock({
 				name: "Renovate",
 				url: "https://github.com/apps/renovate"
 			}] })],
-			files: { ".github": { "renovate.json": JSON.stringify({
+			files: { ".github": { "renovate.json": formatFile(".github/renovate.json", JSON.stringify({
 				$schema: "https://docs.renovatebot.com/renovate-schema.json",
 				automerge: true,
 				extends: [
@@ -31,7 +32,7 @@ const blockRenovate = base.createBlock({
 				minimumReleaseAge: "7 days",
 				patch: { enabled: false },
 				postUpdateOptions: ["pnpmDedupe"]
-			}) } }
+			})) } }
 		};
 	}
 });

package/dist/blocks/blockTSDown.mjs

@@ -4,6 +4,7 @@ import { CommandPhase } from "./phases.mjs";
 import { blockRemoveFiles } from "./blockRemoveFiles.mjs";
 import { withPreviously } from "./files/withPreviously.mjs";
 import { blockGitHubActionsCI } from "./blockGitHubActionsCI.mjs";
+import { formatFile } from "../utils/formatFile.mjs";
 import { blockPackageJson } from "./blockPackageJson.mjs";
 import { blockDevelopmentDocs } from "./blockDevelopmentDocs.mjs";
 import { blockRemoveWorkflows } from "./blockRemoveWorkflows.mjs";
@@ -85,14 +86,14 @@ pnpm build --watch
 					run: "pnpm build"
 				}] })
 			],
-			files: { "tsdown.config.ts": withPreviously(`import { defineConfig } from "tsdown";
+			files: { "tsdown.config.ts": withPreviously(formatFile("tsdown.config.ts", `import { defineConfig } from "tsdown";
 
 export default defineConfig(${JSON.stringify({
 				entry: Array.from(/* @__PURE__ */ new Set([options.bundle ? "src/index.ts" : "src/**/*.ts", ...entry])),
 				...options.bundle ? {} : { unbundle: true },
 				...properties
 			})});
-`, ["tsup.config.ts"]) },
+`), ["tsup.config.ts"]) },
 			scripts: options.bin ? [{
 				commands: ["pnpm build"],
 				phase: CommandPhase.Build

package/dist/blocks/blockTypeScript.mjs

@@ -1,6 +1,7 @@
 import { getPackageDependencies } from "../data/packageData.mjs";
 import { base } from "../base.mjs";
 import { blockGitHubActionsCI } from "./blockGitHubActionsCI.mjs";
+import { formatFile } from "../utils/formatFile.mjs";
 import { blockPackageJson } from "./blockPackageJson.mjs";
 import { blockDevelopmentDocs } from "./blockDevelopmentDocs.mjs";
 import { blockRemoveWorkflows } from "./blockRemoveWorkflows.mjs";
@@ -110,7 +111,7 @@ greet("Hello, world! ${options.emoji}");
 					}]
 				})
 			],
-			files: { "tsconfig.json": JSON.stringify({
+			files: { "tsconfig.json": formatFile("tsconfig.json", JSON.stringify({
 				compilerOptions: sortKeys({
 					declaration: true,
 					esModuleInterop: true,
@@ -125,7 +126,7 @@ greet("Hello, world! ${options.emoji}");
 					...compilerOptions
 				}),
 				include: ["src"]
-			}) }
+			})) }
 		};
 	},
 	transition() {

package/dist/blocks/blockVSCode.mjs

@@ -1,4 +1,5 @@
 import { base } from "../base.mjs";
+import { formatFile } from "../utils/formatFile.mjs";
 import { blockDevelopmentDocs } from "./blockDevelopmentDocs.mjs";
 import { getPrimaryBin } from "./bin/getPrimaryBin.mjs";
 import { z } from "zod";
@@ -37,20 +38,20 @@ To launch it, open a test file, then run _Debug Current Test File_ from the VS C
 				}
 			})],
 			files: { ".vscode": {
-				"extensions.json": extensions?.length ? JSON.stringify({ recommendations: [...extensions].sort() }) : void 0,
-				"launch.json": debuggers?.length ? JSON.stringify({
+				"extensions.json": extensions?.length ? formatFile(".vscode/extensions.json", JSON.stringify({ recommendations: [...extensions].sort() })) : void 0,
+				"launch.json": debuggers?.length ? formatFile(".vscode/launch.json", JSON.stringify({
 					configurations: [...debuggers].sort((a, b) => a.name.localeCompare(b.name)),
 					version: "0.2.0"
-				}) : void 0,
-				"settings.json": JSON.stringify(sortKeys({
+				})) : void 0,
+				"settings.json": formatFile(".vscode/settings.json", JSON.stringify(sortKeys({
 					"editor.formatOnSave": true,
 					"editor.rulers": [80],
 					...settings
-				})),
-				"tasks.json": tasks?.length ? JSON.stringify({
+				}))),
+				"tasks.json": tasks?.length ? formatFile(".vscode/tasks.json", JSON.stringify({
 					tasks: tasks.sort((a, b) => a.detail.localeCompare(b.detail)),
 					version: "2.0.0"
-				}) : void 0
+				})) : void 0
 			} }
 		};
 	}

package/dist/blocks/blockVitest.mjs

@@ -3,6 +3,7 @@ import { getPackageDependencies } from "../data/packageData.mjs";
 import { base } from "../base.mjs";
 import { blockRemoveFiles } from "./blockRemoveFiles.mjs";
 import { blockGitHubActionsCI } from "./blockGitHubActionsCI.mjs";
+import { formatFile } from "../utils/formatFile.mjs";
 import { blockPackageJson } from "./blockPackageJson.mjs";
 import { blockDevelopmentDocs } from "./blockDevelopmentDocs.mjs";
 import { blockRemoveWorkflows } from "./blockRemoveWorkflows.mjs";
@@ -168,7 +169,7 @@ describe(greet, () => {
 					extensions: ["vitest.explorer"]
 				})
 			],
-			files: { "vitest.config.ts": `import { defineConfig } from "vitest/config";
+			files: { "vitest.config.ts": formatFile("vitest.config.ts", `import { defineConfig } from "vitest/config";
 
 export default defineConfig({
 	test: {
@@ -183,7 +184,7 @@ export default defineConfig({
 		setupFiles: ["console-fail-test/setup"],
 	},
 });
-	` }
+	`) }
 		};
 	},
 	transition() {

package/dist/package.json.d.mts

@@ -34,6 +34,7 @@ declare const _exports: {
     "*": string;
   };
   dependencies: {
+    "@prettier/sync": string;
     "@typescript-eslint/typescript-estree": string;
     bingo: string;
     "bingo-fs": string;
@@ -57,6 +58,7 @@ declare const _exports: {
     "object-strings-deep": string;
     "parse-author": string;
     "parse-package-name": string;
+    prettier: string;
     "remove-dependencies": string;
     "remove-undefined-objects": string;
     semver: string;
@@ -73,7 +75,6 @@ declare const _exports: {
     "@eslint-community/eslint-plugin-eslint-comments": string;
     "@eslint/js": string;
     "@eslint/markdown": string;
-    "@prettier/sync": string;
     "@release-it/conventional-changelog": string;
     "@types/html-to-text": string;
     "@types/lodash": string;
@@ -100,7 +101,6 @@ declare const _exports: {
     husky: string;
     knip: string;
     "lint-staged": string;
-    prettier: string;
     "prettier-plugin-curly": string;
     "prettier-plugin-packagejson": string;
     "prettier-plugin-padding-lines": string;

package/dist/utils/formatFile.d.mts

@@ -0,0 +1,3 @@
+//#region src/utils/formatFile.d.ts
+export declare function formatFile(filePath: string, text: string): string;
+//#endregion

package/dist/utils/formatFile.mjs

@@ -0,0 +1,10 @@
+import prettier from "@prettier/sync";
+//#region src/utils/formatFile.ts
+function formatFile(filePath, text) {
+	return prettier.format(text, {
+		filepath: filePath,
+		useTabs: true
+	});
+}
+//#endregion
+export { formatFile };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-typescript-app",
-	"version": "2.66.0",
+	"version": "2.67.0",
 	"description": "Quickstart-friendly TypeScript template with comprehensive, configurable, opinionated tooling. 🎁",
 	"repository": {
 		"type": "git",
@@ -33,12 +33,13 @@
 		"*": "prettier --ignore-unknown --write"
 	},
 	"dependencies": {
+		"@prettier/sync": "^0.6.1",
 		"@typescript-eslint/typescript-estree": "^8.67.0",
 		"bingo": "^0.13.0",
 		"bingo-fs": "^0.6.0",
 		"bingo-stratum": "^0.7.0",
 		"cached-factory": "^0.3.0",
-		"cspell-populate-words": "^0.3.1",
+		"cspell-populate-words": "0.3.1",
 		"execa": "^10.0.1",
 		"git-url-parse": "^16.1.0",
 		"github-default-labels": "^0.1.1",
@@ -56,6 +57,7 @@
 		"object-strings-deep": "^0.1.2",
 		"parse-author": "^2.0.0",
 		"parse-package-name": "^1.0.0",
+		"prettier": "^3.9.6",
 		"remove-dependencies": "^0.1.1",
 		"remove-undefined-objects": "^9.0.0",
 		"semver": "^7.8.5",
@@ -72,7 +74,6 @@
 		"@eslint-community/eslint-plugin-eslint-comments": "4.8.1",
 		"@eslint/js": "10.0.1",
 		"@eslint/markdown": "8.0.3",
-		"@prettier/sync": "0.6.1",
 		"@release-it/conventional-changelog": "12.0.0",
 		"@types/html-to-text": "9.0.4",
 		"@types/lodash": "4.17.25",
@@ -91,15 +92,14 @@
 		"eslint-plugin-jsdoc": "64.5.4",
 		"eslint-plugin-jsonc": "3.4.1",
 		"eslint-plugin-markdown-links": "0.9.1",
-		"eslint-plugin-n": "18.3.0",
+		"eslint-plugin-n": "18.4.0",
 		"eslint-plugin-package-json": "1.10.0",
 		"eslint-plugin-perfectionist": "5.12.0",
 		"eslint-plugin-regexp": "3.3.1",
 		"eslint-plugin-yml": "3.8.1",
 		"husky": "9.1.7",
 		"knip": "6.38.0",
-		"lint-staged": "17.5.1",
-		"prettier": "3.9.6",
+		"lint-staged": "17.6.0",
 		"prettier-plugin-curly": "0.4.1",
 		"prettier-plugin-packagejson": "3.0.2",
 		"prettier-plugin-padding-lines": "0.1.0",