create-typescript-app 2.34.1 → 2.35.0

package/lib/blocks/blockESLint.js

@@ -54,7 +54,13 @@ ${explanation2}
     ].sort(
       (a, b) => a.replace(/.+from/, "").localeCompare(b.replace(/.+from/, ""))
     );
-    const ignoreLines = ["lib", "node_modules", "pnpm-lock.yaml", ...ignores].map((ignore) => JSON.stringify(ignore)).sort();
+    const ignoreLines = Array.from(
+      new Set(
+        ["lib", "node_modules", "pnpm-lock.yaml", ...ignores].map(
+          (ignore) => JSON.stringify(ignore)
+        )
+      )
+    ).sort();
     const extensionLines = [
       printExtension({
         extends: [

package/lib/blocks/blockTSup.js

@@ -10,16 +10,30 @@ import { blockReleaseIt } from "./blockReleaseIt.js";
 import { blockRemoveDependencies } from "./blockRemoveDependencies.js";
 import { blockRemoveFiles } from "./blockRemoveFiles.js";
 import { blockRemoveWorkflows } from "./blockRemoveWorkflows.js";
+import { intakeFileDefineConfig } from "./intake/intakeFileDefineConfig.js";
 import { CommandPhase } from "./phases.js";
+const zEntry = z.array(z.string());
+const zProperties = z.record(z.unknown());
 const blockTSup = base.createBlock({
   about: {
     name: "TSup"
   },
   addons: {
-    entry: z.array(z.string()).default([]),
-    properties: z.record(z.unknown()).default({}),
+    entry: zEntry.default([]),
+    properties: zProperties.default({}),
     runInCI: z.array(z.string()).default([])
   },
+  intake({ files }) {
+    const rawData = intakeFileDefineConfig(files, ["tsup.config.ts"]);
+    if (!rawData) {
+      return void 0;
+    }
+    const { entry: rawEntry, ...rest } = rawData;
+    return {
+      entry: zEntry.safeParse(rawEntry).data,
+      properties: zProperties.safeParse(rest).data
+    };
+  },
   produce({ addons, options }) {
     const { entry, properties, runInCI } = addons;
     return {

package/lib/blocks/blockVitest.js

@@ -1,4 +1,3 @@
-import JSON5 from "json5";
 import { z } from "zod";
 import { base } from "../base.js";
 import { getPackageDependencies } from "../data/packageData.js";
@@ -16,14 +15,7 @@ import { blockRemoveFiles } from "./blockRemoveFiles.js";
 import { blockRemoveWorkflows } from "./blockRemoveWorkflows.js";
 import { blockTSup } from "./blockTSup.js";
 import { blockVSCode } from "./blockVSCode.js";
-import { intakeFile } from "./intake/intakeFile.js";
-function tryParseJSON5(text) {
-  try {
-    return JSON5.parse(text);
-  } catch {
-    return void 0;
-  }
-}
+import { intakeFileDefineConfig } from "./intake/intakeFileDefineConfig.js";
 const zCoverage = z.object({
   exclude: z.array(z.string()).optional(),
   include: z.array(z.string()).optional()
@@ -36,17 +28,8 @@ const zTest = z.object({
   exclude: zExclude
 }).partial();
 function intakeFromConfig(files) {
-  const file = intakeFile(files, ["vitest.config.ts"]);
-  if (!file) {
-    return void 0;
-  }
-  const normalized = file[0].replaceAll(/[\n\r]/g, "");
-  const matched = /defineConfig\(\{(.+)\}\)\s*(?:;\s*)?$/u.exec(normalized);
-  if (!matched) {
-    return void 0;
-  }
-  const rawData = tryParseJSON5(`{${matched[1]}}`);
-  if (typeof rawData !== "object" || typeof rawData.test !== "object") {
+  const rawData = intakeFileDefineConfig(files, ["vitest.config.ts"]);
+  if (typeof rawData?.test !== "object") {
     return void 0;
   }
   const parsedData = zTest.safeParse(rawData.test).data;

package/lib/blocks/intake/intakeFileDefineConfig.d.ts

@@ -0,0 +1,5 @@
+import { IntakeDirectory } from 'bingo-fs';
+
+declare function intakeFileDefineConfig(files: IntakeDirectory, filePath: (string | string[])[]): Record<string, unknown> | undefined;
+
+export { intakeFileDefineConfig };

package/lib/blocks/intake/intakeFileDefineConfig.js

@@ -0,0 +1,28 @@
+import JSON5 from "json5";
+import { intakeFile } from "./intakeFile.js";
+function intakeFileDefineConfig(files, filePath) {
+  const file = intakeFile(files, filePath);
+  if (!file) {
+    return void 0;
+  }
+  const normalized = file[0].replaceAll(/[\n\r]/g, "");
+  const matched = /defineConfig\(\{(.+)\}\)\s*(?:;\s*)?$/u.exec(normalized);
+  if (!matched) {
+    return void 0;
+  }
+  const rawData = tryParseJSON5(`{${matched[1]}}`);
+  if (!rawData || typeof rawData !== "object") {
+    return void 0;
+  }
+  return rawData;
+}
+function tryParseJSON5(text) {
+  try {
+    return JSON5.parse(text);
+  } catch {
+    return void 0;
+  }
+}
+export {
+  intakeFileDefineConfig
+};

package/lib/data/packageData.d.ts

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

package/package.json

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