create-typescript-app 2.26.2 → 2.26.4

package/lib/blocks/blockESLint.d.ts

@@ -9,7 +9,6 @@ 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]> | {
@@ -22,6 +21,7 @@ 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/blockESLint.js

@@ -24,14 +24,13 @@ const zRuleOptions = z.union([
     ])
   ])
 ]);
+const zExtensionRuleGroup = z.object({
+  comment: z.string().optional(),
+  entries: z.record(z.string(), zRuleOptions)
+});
 const zExtensionRules = z.union([
   z.record(z.string(), zRuleOptions),
-  z.array(
-    z.object({
-      comment: z.string().optional(),
-      entries: z.record(z.string(), zRuleOptions)
-    })
-  )
+  z.array(zExtensionRuleGroup)
 ]);
 const zExtension = z.object({
   extends: z.array(z.string()).optional(),
@@ -250,6 +249,24 @@ export default tseslint.config(
     };
   }
 });
+function groupByComment(rulesGroups) {
+  const byComment = /* @__PURE__ */ new Map();
+  const grouped = [];
+  for (const group of rulesGroups) {
+    const existing = byComment.get(group.comment);
+    if (existing) {
+      existing.entries = {
+        ...existing.entries,
+        ...group.entries
+      };
+      continue;
+    } else {
+      byComment.set(group.comment, group);
+      grouped.push(group);
+    }
+  }
+  return grouped;
+}
 function printExtension(extension) {
   return [
     "{",
@@ -268,7 +285,7 @@ function printExtensionRules(rules) {
   }
   return [
     "{",
-    ...rules.flatMap((group) => [
+    ...groupByComment(rules).flatMap((group) => [
       printGroupComment(group.comment),
       ...Object.entries(group.entries).map(
         ([ruleName, options]) => `"${ruleName}": ${JSON.stringify(options)},`

package/lib/blocks/blockESLintPlugin.js

@@ -9,11 +9,12 @@ const blockESLintPlugin = base.createBlock({
   about: {
     name: "ESLint Plugin"
   },
-  produce() {
+  produce({ options }) {
+    const configFileName = `.eslint-doc-generatorrc.${options.type === "commonjs" ? "mjs" : "js"}`;
     return {
       addons: [
         blockCSpell({
-          words: ["eslint-doc-generatorrc.js"]
+          words: ["eslint-doc-generatorrc"]
         }),
         blockDevelopmentDocs({
           sections: {
@@ -42,7 +43,7 @@ pnpm build:docs
         }),
         blockESLint({
           extensions: ['eslintPlugin.configs["flat/recommended"]'],
-          ignores: [".eslint-doc-generatorrc.js", "docs/rules/*/*.ts"],
+          ignores: [configFileName, "docs/rules/*/*.ts"],
           imports: [
             {
               source: {
@@ -70,11 +71,6 @@ pnpm build:docs
               "eslint-doc-generator": "2.1.0",
               "eslint-plugin-eslint-plugin": "6.4.0"
             },
-            peerDependencies: {
-              "@typescript-eslint/parser": ">=8",
-              eslint: ">=9",
-              typescript: ">=5"
-            },
             scripts: {
               "build:docs": "eslint-doc-generator",
               "lint:docs": "eslint-doc-generator --check"
@@ -88,7 +84,7 @@ pnpm build:docs
         })
       ],
       files: {
-        ".eslint-doc-generatorrc.js": `import prettier from "prettier";
+        [configFileName]: `import prettier from "prettier";
 
 /** @type {import('eslint-doc-generator').GenerateOptions} */
 const config = {

package/lib/blocks/blockGitHubActionsCI.d.ts

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

package/lib/blocks/blockPackageJson.d.ts

@@ -50,6 +50,7 @@ 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 | {
@@ -65,7 +66,6 @@ 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/blockReleaseIt.d.ts

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

package/lib/blocks/blockVitest.d.ts

@@ -2,6 +2,10 @@ 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;
@@ -11,10 +15,6 @@ 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,7 +553,6 @@ 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]> | {
@@ -566,6 +565,7 @@ 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;
             }))[];
-            checkoutWith?: Record<string, string> | undefined;
             if?: string | undefined;
+            checkoutWith?: Record<string, string> | undefined;
         }[] | undefined;
     }, {
         access: "public" | "restricted";
@@ -2211,6 +2211,7 @@ declare const blocks: {
                 url?: string | undefined;
                 email?: string | undefined;
             })[] | undefined;
+            publishConfig?: Record<string, unknown> | undefined;
             main?: string | undefined;
             types?: string | undefined;
             bugs?: string | {
@@ -2226,7 +2227,6 @@ 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: {
-            run: string;
             order: number;
+            run: string;
         }[];
     }, {
         access: "public" | "restricted";
@@ -3335,6 +3335,10 @@ 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;
@@ -3344,10 +3348,6 @@ 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.26.1";
+var version = "2.26.3";
 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.26.2",
+	"version": "2.26.4",
 	"description": "Quickstart-friendly TypeScript template with comprehensive, configurable, opinionated tooling. 🎁",
 	"repository": {
 		"type": "git",