create-typescript-app 2.25.0 → 2.26.1

package/lib/base.js

@@ -116,7 +116,7 @@ const base = createBase({
     const getBin = lazyValue(async () => await readBin(getPackageData));
     const getEmoji = lazyValue(async () => await readEmoji(getDescription));
     const getDescription = lazyValue(
-      async () => await readDescription(getPackageData, getReadme)
+      async () => await readDescription(getPackageData, getReadme, getRepository)
     );
     const getDevelopmentDocumentation = lazyValue(
       async () => await readDevelopmentDocumentation(take)

package/lib/blocks/blockESLint.d.ts

@@ -9,6 +9,7 @@ declare const blockESLint: bingo_stratum.BlockWithAddons<{
         specifier: string;
         types?: boolean | undefined;
     }[];
+    ignores: string[];
     extensions: (string | {
         files?: string[] | undefined;
         rules?: Record<string, "off" | "error" | "warn" | ["error" | "warn", unknown] | ["error" | "warn", unknown, unknown]> | {
@@ -21,7 +22,6 @@ declare const blockESLint: bingo_stratum.BlockWithAddons<{
         linterOptions?: unknown;
         plugins?: Record<string, string> | undefined;
     })[];
-    ignores: string[];
     explanations: string[];
     rules?: Record<string, "off" | "error" | "warn" | ["error" | "warn", unknown] | ["error" | "warn", unknown, unknown]> | {
         entries: Record<string, "off" | "error" | "warn" | ["error" | "warn", unknown] | ["error" | "warn", unknown, unknown]>;

package/lib/blocks/blockGitHubActionsCI.d.ts

@@ -38,8 +38,8 @@ declare const blockGitHubActionsCI: bingo_stratum.BlockWithAddons<{
         } | {
             uses: string;
         }))[];
-        if?: string | undefined;
         checkoutWith?: Record<string, string> | undefined;
+        if?: string | undefined;
     }[] | undefined;
 }, {
     access: "public" | "restricted";

package/lib/blocks/blockPackageJson.d.ts

@@ -50,7 +50,6 @@ declare const blockPackageJson: bingo_stratum.BlockWithAddons<{
             url?: string | undefined;
             email?: string | undefined;
         })[] | undefined;
-        publishConfig?: Record<string, unknown> | undefined;
         main?: string | undefined;
         types?: string | undefined;
         bugs?: string | {
@@ -66,6 +65,7 @@ declare const blockPackageJson: bingo_stratum.BlockWithAddons<{
         overrides?: Record<string, unknown> | undefined;
         os?: string[] | undefined;
         cpu?: string[] | undefined;
+        publishConfig?: Record<string, unknown> | undefined;
         workspaces?: string[] | undefined;
         deprecated?: string | undefined;
         typings?: string | undefined;

package/lib/blocks/blockPackageJson.js

@@ -4,8 +4,8 @@ import sortPackageJson from "sort-package-json";
 import { z } from "zod";
 import { PackageJson } from "zod-package-json";
 import { base } from "../base.js";
+import { htmlToTextSafe } from "../utils/htmlToTextSafe.js";
 import { blockRemoveFiles } from "./blockRemoveFiles.js";
-import { htmlToTextSafe } from "./html/htmlToTextSafe.js";
 import { CommandPhase } from "./phases.js";
 const PackageJsonWithNullableScripts = PackageJson.partial().extend({
   scripts: z.record(z.string(), z.union([z.string(), z.undefined()])).optional()

package/lib/blocks/blockReleaseIt.d.ts

@@ -2,8 +2,8 @@ import * as bingo_stratum from 'bingo-stratum';
 
 declare const blockReleaseIt: bingo_stratum.BlockWithAddons<{
     builders: {
-        order: number;
         run: string;
+        order: number;
     }[];
 }, {
     access: "public" | "restricted";

package/lib/blocks/blockRepositorySettings.js

@@ -1,5 +1,5 @@
 import { base } from "../base.js";
-import { htmlToTextSafe } from "./html/htmlToTextSafe.js";
+import { htmlToTextSafe } from "../utils/htmlToTextSafe.js";
 const blockRepositorySettings = base.createBlock({
   about: {
     name: "Repository Settings"

package/lib/blocks/blockVitest.d.ts

@@ -2,10 +2,6 @@ import * as bingo_stratum from 'bingo-stratum';
 
 declare const blockVitest: bingo_stratum.BlockWithAddons<{
     exclude: string[];
-    coverage: {
-        exclude?: string[] | undefined;
-        include?: string[] | undefined;
-    };
     actionSteps: ({
         with?: Record<string, string> | undefined;
         env?: Record<string, string> | undefined;
@@ -15,6 +11,10 @@ declare const blockVitest: bingo_stratum.BlockWithAddons<{
     } | {
         uses: string;
     }))[];
+    coverage: {
+        exclude?: string[] | undefined;
+        include?: string[] | undefined;
+    };
     flags: string[];
 }, {
     access: "public" | "restricted";

package/lib/blocks/index.d.ts

@@ -553,6 +553,7 @@ declare const blocks: {
             specifier: string;
             types?: boolean | undefined;
         }[];
+        ignores: string[];
         extensions: (string | {
             files?: string[] | undefined;
             rules?: Record<string, "off" | "error" | "warn" | ["error" | "warn", unknown] | ["error" | "warn", unknown, unknown]> | {
@@ -565,7 +566,6 @@ declare const blocks: {
             linterOptions?: unknown;
             plugins?: Record<string, string> | undefined;
         })[];
-        ignores: string[];
         explanations: string[];
         rules?: Record<string, "off" | "error" | "warn" | ["error" | "warn", unknown] | ["error" | "warn", unknown, unknown]> | {
             entries: Record<string, "off" | "error" | "warn" | ["error" | "warn", unknown] | ["error" | "warn", unknown, unknown]>;
@@ -1469,8 +1469,8 @@ declare const blocks: {
             } | {
                 uses: string;
             }))[];
-            if?: string | undefined;
             checkoutWith?: Record<string, string> | undefined;
+            if?: string | undefined;
         }[] | undefined;
     }, {
         access: "public" | "restricted";
@@ -2211,7 +2211,6 @@ declare const blocks: {
                 url?: string | undefined;
                 email?: string | undefined;
             })[] | undefined;
-            publishConfig?: Record<string, unknown> | undefined;
             main?: string | undefined;
             types?: string | undefined;
             bugs?: string | {
@@ -2227,6 +2226,7 @@ declare const blocks: {
             overrides?: Record<string, unknown> | undefined;
             os?: string[] | undefined;
             cpu?: string[] | undefined;
+            publishConfig?: Record<string, unknown> | undefined;
             workspaces?: string[] | undefined;
             deprecated?: string | undefined;
             typings?: string | undefined;
@@ -2806,8 +2806,8 @@ declare const blocks: {
     }>;
     blockReleaseIt: bingo_stratum.BlockWithAddons<{
         builders: {
-            order: number;
             run: string;
+            order: number;
         }[];
     }, {
         access: "public" | "restricted";
@@ -3335,10 +3335,6 @@ declare const blocks: {
     }>;
     blockVitest: bingo_stratum.BlockWithAddons<{
         exclude: string[];
-        coverage: {
-            exclude?: string[] | undefined;
-            include?: string[] | undefined;
-        };
         actionSteps: ({
             with?: Record<string, string> | undefined;
             env?: Record<string, string> | undefined;
@@ -3348,6 +3344,10 @@ declare const blocks: {
         } | {
             uses: string;
         }))[];
+        coverage: {
+            exclude?: string[] | undefined;
+            include?: string[] | undefined;
+        };
         flags: string[];
     }, {
         access: "public" | "restricted";

package/lib/data/packageData.d.ts

@@ -1,5 +1,5 @@
 var name = "create-typescript-app";
-var version = "2.24.5";
+var version = "2.26.0";
 var description = "Quickstart-friendly TypeScript template with comprehensive, configurable, opinionated tooling. 🎁";
 var repository = {
 	type: "git",
@@ -50,11 +50,12 @@ var dependencies = {
 	json5: "^2.2.3",
 	"lazy-value": "^3.0.0",
 	lodash: "^4.17.21",
+	marked: "^15.0.7",
 	"npm-user": "^6.1.1",
 	"object-strings-deep": "^0.1.1",
 	"parse-author": "^2.0.0",
 	"parse-package-name": "^1.0.0",
-	"remove-dependencies": "^0.1.0",
+	"remove-dependencies": "^0.1.1",
 	"remove-undefined-objects": "^6.0.0",
 	semver: "^7.7.1",
 	"set-github-repository-labels": "^0.2.0",

package/lib/options/readDescription.d.ts

@@ -1,5 +1,5 @@
 import { PartialPackageData } from '../types.js';
 
-declare function readDescription(getPackageData: () => Promise<PartialPackageData>, getReadme: () => Promise<string>): Promise<string | undefined>;
+declare function readDescription(getPackageData: () => Promise<PartialPackageData>, getReadme: () => Promise<string>, getRepository: () => Promise<string | undefined>): Promise<string | undefined>;
 
 export { readDescription };

package/lib/options/readDescription.js

@@ -1,16 +1,27 @@
+import { marked } from "marked";
 import { packageData } from "../data/packageData.js";
+import { htmlToTextSafe } from "../utils/htmlToTextSafe.js";
 import { readDescriptionFromReadme } from "./readDescriptionFromReadme.js";
-async function readDescription(getPackageData, getReadme) {
-  const { description: inferred } = await getPackageData();
-  if (!inferred) {
+async function readDescription(getPackageData, getReadme, getRepository) {
+  const { description: fromPackageJson } = await getPackageData();
+  if (!fromPackageJson) {
     return void 0;
   }
-  const { description: existing } = packageData;
   const fromReadme = await readDescriptionFromReadme(getReadme);
-  if (fromReadme?.replaceAll(/<\s*(?:\/\s*)?\w+\s*>/gu, "") === inferred) {
-    return fromReadme;
+  if (!fromReadme) {
+    return marked.parseInline(fromPackageJson);
   }
-  return existing === inferred ? void 0 : inferred;
+  if (await getRepository() !== "create-typescript-app" && fromPackageJson === packageData.description) {
+    return void 0;
+  }
+  const fromPackageJsonNormalized = htmlToTextSafe(
+    await marked.parseInline(fromPackageJson)
+  );
+  const fromReadmeNormalized = htmlToTextSafe(fromReadme);
+  if (fromReadmeNormalized !== fromPackageJsonNormalized) {
+    return await marked.parseInline(fromPackageJson);
+  }
+  return fromReadme;
 }
 export {
   readDescription

package/lib/utils/htmlToTextSafe.js

@@ -0,0 +1,15 @@
+import { convert } from "html-to-text";
+function htmlToTextSafe(raw) {
+  return convert(raw, {
+    selectors: [
+      {
+        options: { ignoreHref: true },
+        selector: "a"
+      }
+    ],
+    wordwrap: false
+  });
+}
+export {
+  htmlToTextSafe
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-typescript-app",
-	"version": "2.25.0",
+	"version": "2.26.1",
 	"description": "Quickstart-friendly TypeScript template with comprehensive, configurable, opinionated tooling. 🎁",
 	"repository": {
 		"type": "git",
@@ -54,11 +54,12 @@
 		"json5": "^2.2.3",
 		"lazy-value": "^3.0.0",
 		"lodash": "^4.17.21",
+		"marked": "^15.0.7",
 		"npm-user": "^6.1.1",
 		"object-strings-deep": "^0.1.1",
 		"parse-author": "^2.0.0",
 		"parse-package-name": "^1.0.0",
-		"remove-dependencies": "^0.1.0",
+		"remove-dependencies": "^0.1.1",
 		"remove-undefined-objects": "^6.0.0",
 		"semver": "^7.7.1",
 		"set-github-repository-labels": "^0.2.0",

package/lib/blocks/html/htmlToTextSafe.js

@@ -1,7 +0,0 @@
-import { convert } from "html-to-text";
-function htmlToTextSafe(raw) {
-  return convert(raw, { wordwrap: false });
-}
-export {
-  htmlToTextSafe
-};