create-typescript-app 2.61.2 → 2.62.0

package/lib/blocks/blockKnip.js

@@ -1,4 +1,4 @@
-import { getPackageDependencies, getPackageDependency } from "../data/packageData.js";
+import { getPackageDependencies } from "../data/packageData.js";
 import { base } from "../base.js";
 import { blockRemoveFiles } from "./blockRemoveFiles.js";
 import { blockGitHubActionsCI } from "./blockGitHubActionsCI.js";
@@ -6,6 +6,7 @@ import { blockPackageJson } from "./blockPackageJson.js";
 import { blockDevelopmentDocs } from "./blockDevelopmentDocs.js";
 import { blockRemoveWorkflows } from "./blockRemoveWorkflows.js";
 import { intakeFileAsJson } from "./intake/intakeFileAsJson.js";
+import { intakeFileExportObject } from "./intake/intakeFileExportObject.js";
 import { z } from "zod";
 import removeUndefinedObjects from "remove-undefined-objects";
 
@@ -19,7 +20,7 @@ const blockKnip = base.createBlock({
 		project: zStringArray.optional()
 	},
 	intake({ files }) {
-		const knipJson = intakeFileAsJson(files, ["knip.json"]);
+		const knipJson = intakeFileExportObject(files, ["knip.config.ts"]) ?? intakeFileAsJson(files, ["knip.json"]);
 		if (!knipJson) return;
 		return removeUndefinedObjects({
 			entry: zStringArray.safeParse(knipJson.entry).data,
@@ -42,8 +43,9 @@ const blockKnip = base.createBlock({
 				} }),
 				blockRemoveFiles({ files: [".ts-prunerc*"] })
 			],
-			files: { "knip.json": JSON.stringify({
-				$schema: `https://unpkg.com/knip@${getPackageDependency("knip")}/schema.json`,
+			files: { "knip.config.ts": `import type { KnipConfig } from "knip";
+
+export default ${JSON.stringify({
 				entry: entry?.sort(),
 				ignoreDependencies,
 				ignoreExportsUsedInFile: {
@@ -52,15 +54,14 @@ const blockKnip = base.createBlock({
 				},
 				project: project?.sort(),
 				treatConfigHintsAsErrors: true
-			}) }
+			})} satisfies KnipConfig;` }
 		};
 	},
 	transition() {
 		return { addons: [blockRemoveFiles({ files: [
 			".knip*",
-			"knip.{c,m,t}*",
-			"knip.js",
-			"knip.jsonc"
+			"knip.{c,j,m}*",
+			"knip.json*"
 		] }), blockRemoveWorkflows({ workflows: ["knip", "lint-knip"] })] };
 	}
 });

package/lib/blocks/intake/intakeFileExportObject.js

@@ -0,0 +1,24 @@
+import { intakeFile } from "./intakeFile.js";
+import JSON5 from "json5";
+
+//#region src/blocks/intake/intakeFileExportObject.ts
+function intakeFileExportObject(files, filePath) {
+	const file = intakeFile(files, filePath);
+	if (!file) return;
+	const normalized = file[0].replaceAll(/[\n\r]/g, "");
+	const matched = /export\s+default\s*\{(.+)\}/u.exec(normalized);
+	if (!matched) return;
+	const rawData = tryParseJSON5(`{${matched[1]}}`);
+	if (!rawData || typeof rawData !== "object") return;
+	return rawData;
+}
+function tryParseJSON5(text) {
+	try {
+		return JSON5.parse(text);
+	} catch {
+		return;
+	}
+}
+
+//#endregion
+export { intakeFileExportObject };

package/package.json

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