create-typescript-app 2.7.1 → 2.7.3

package/lib/base.d.ts

@@ -9,16 +9,16 @@ declare const zContributor: z.ZodObject<{
     name: z.ZodString;
     profile: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    name: string;
     avatar_url: string;
     contributions: string[];
     login: string;
+    name: string;
     profile: string;
 }, {
-    name: string;
     avatar_url: string;
     contributions: string[];
     login: string;
+    name: string;
     profile: string;
 }>;
 type Contributor = z.infer<typeof zContributor>;
@@ -33,16 +33,16 @@ declare const base: bingo_stratum.Base<{
         name: z.ZodString;
         profile: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        name: string;
         avatar_url: string;
         contributions: string[];
         login: string;
+        name: string;
         profile: string;
     }, {
-        name: string;
         avatar_url: string;
         contributions: string[];
         login: string;
+        name: string;
         profile: string;
     }>, "many">>;
     description: z.ZodDefault<z.ZodString>;
@@ -84,11 +84,11 @@ declare const base: bingo_stratum.Base<{
         href: z.ZodString;
         title: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        title: string;
         href: string;
-    }, {
         title: string;
+    }, {
         href: string;
+        title: string;
     }>>;
     keywords: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
     logo: z.ZodOptional<z.ZodObject<{

package/lib/base.js

@@ -25,7 +25,6 @@ import { readNpmDefaults } from "./options/readNpmDefaults.js";
 import { readOwner } from "./options/readOwner.js";
 import { readPackageAuthor } from "./options/readPackageAuthor.js";
 import { readPackageData } from "./options/readPackageData.js";
-import { readPackageDataFull } from "./options/readPackageDataFull.js";
 import { readPnpm } from "./options/readPnpm.js";
 import { readRepository } from "./options/readRepository.js";
 import { readRulesetId } from "./options/readRulesetId.js";
@@ -101,19 +100,17 @@ const base = createBase({
     version: z.string().optional().describe("package version to publish as and store in `package.json`")
   },
   prepare({ options, take }) {
-    const getAccess = lazyValue(
-      async () => await readAccess(getPackageDataFull)
-    );
+    const getAccess = lazyValue(async () => await readAccess(getPackageData));
     const getAllContributors = lazyValue(
       async () => await readAllContributors(take)
     );
     const getAuthor = lazyValue(
       async () => await readAuthor(getPackageAuthor, getNpmDefaults, options.owner)
     );
-    const getBin = lazyValue(async () => (await getPackageDataFull()).bin);
+    const getBin = lazyValue(async () => (await getPackageData()).bin);
     const getEmoji = lazyValue(async () => await readEmoji(getDescription));
     const getDescription = lazyValue(
-      async () => await readDescription(getPackageDataFull, getReadme)
+      async () => await readDescription(getPackageData, getReadme)
     );
     const getDocumentation = lazyValue(
       async () => await readDocumentation(take)
@@ -140,14 +137,9 @@ const base = createBase({
     const getGitDefaults = lazyValue(async () => await readGitDefaults(take));
     const getGuide = lazyValue(async () => await readGuide(take));
     const getLogo = lazyValue(async () => await readLogo(getReadme));
-    const getPackageData = lazyValue(
-      async () => await readPackageData(getPackageDataFull)
-    );
-    const getPackageDataFull = lazyValue(
-      async () => await readPackageDataFull(take)
-    );
+    const getPackageData = lazyValue(async () => await readPackageData(take));
     const getNode = lazyValue(
-      async () => await readNode(getNvmrc, getPackageDataFull)
+      async () => await readNode(getNvmrc, getPackageData)
     );
     const getNpmDefaults = lazyValue(
       async () => await readNpmDefaults(getNpmWhoami)
@@ -164,14 +156,14 @@ const base = createBase({
       async () => await readOwner(take, getGitDefaults, getPackageAuthor)
     );
     const getPackageAuthor = lazyValue(
-      async () => await readPackageAuthor(getPackageDataFull)
+      async () => await readPackageAuthor(getPackageData)
     );
-    const getPnpm = lazyValue(async () => await readPnpm(getPackageDataFull));
+    const getPnpm = lazyValue(async () => await readPnpm(getPackageData));
     const getReadme = lazyValue(
       async () => await readFileSafe("README.md", "")
     );
     const getRepository = lazyValue(
-      async () => await readRepository(getGitDefaults, getPackageDataFull, options)
+      async () => await readRepository(getGitDefaults, getPackageData, options)
     );
     const getRulesetId = lazyValue(
       async () => await readRulesetId(take, getOwner, getRepository)
@@ -182,9 +174,7 @@ const base = createBase({
     const getUsage = lazyValue(
       async () => await readUsage(getEmoji, getReadme, getRepository)
     );
-    const getVersion = lazyValue(
-      async () => (await getPackageDataFull()).version
-    );
+    const getVersion = lazyValue(async () => (await getPackageData()).version);
     return {
       access: getAccess,
       author: getAuthor,

package/lib/blocks/blockESLintPackageJson.js

@@ -8,10 +8,10 @@ const blockESLintPackageJson = base.createBlock({
     return {
       addons: [
         blockESLint({
-          extensions: ["packageJson"],
+          extensions: ["packageJson.configs.recommended"],
           imports: [
             {
-              source: "eslint-plugin-package-json/configs/recommended",
+              source: "eslint-plugin-package-json",
               specifier: "packageJson"
             }
           ]

package/lib/blocks/blockPackageJson.js

@@ -1,5 +1,6 @@
 import * as htmlToText from "html-to-text";
 import removeUndefinedObjects from "remove-undefined-objects";
+import semver from "semver";
 import sortPackageJson from "sort-package-json";
 import { z } from "zod";
 import { PackageJson } from "zod-package-json";
@@ -14,14 +15,17 @@ const blockPackageJson = base.createBlock({
     properties: PackageJson.partial().default({})
   },
   produce({ addons, offline, options }) {
-    const dependencies = {
+    const dependencies = useLargerVersions(options.packageData?.dependencies, {
       ...options.packageData?.dependencies,
       ...addons.properties.dependencies
-    };
-    const devDependencies = {
-      ...options.packageData?.devDependencies,
-      ...addons.properties.devDependencies
-    };
+    });
+    const devDependencies = useLargerVersions(
+      options.packageData?.devDependencies,
+      {
+        ...options.packageData?.devDependencies,
+        ...addons.properties.devDependencies
+      }
+    );
     const description = htmlToText.convert(options.description, {
       wordwrap: false
     });
@@ -93,6 +97,26 @@ const blockPackageJson = base.createBlock({
     };
   }
 });
+function removeRangePrefix(version) {
+  return version.replaceAll(/[\^~><=]/gu, "").split(" ")[0];
+}
+function useLargerVersion(existing, replacement) {
+  if (!existing) {
+    return replacement;
+  }
+  return semver.gt(removeRangePrefix(existing), removeRangePrefix(replacement)) ? existing : replacement;
+}
+function useLargerVersions(existing, replacements) {
+  if (!existing) {
+    return replacements;
+  }
+  return Object.fromEntries(
+    Object.entries(replacements).map(([key, replacement]) => [
+      key,
+      useLargerVersion(existing[key], replacement)
+    ])
+  );
+}
 export {
   blockPackageJson
 };

package/lib/data/packageData.d.ts

@@ -1,5 +1,5 @@
 var name = "create-typescript-app";
-var version = "2.7.0";
+var version = "2.7.2";
 var description = "Quickstart-friendly TypeScript template with comprehensive, configurable, opinionated tooling. 🎁";
 var repository = {
 	type: "git",
@@ -54,6 +54,7 @@ var dependencies = {
 	"parse-package-name": "^1.0.0",
 	"remove-dependencies": "^0.1.0",
 	"remove-undefined-objects": "^6.0.0",
+	semver: "^7.7.1",
 	"set-github-repository-labels": "^0.2.0",
 	"sort-keys": "^5.1.0",
 	"sort-package-json": "^3.0.0",
@@ -63,7 +64,7 @@ var dependencies = {
 };
 var devDependencies = {
 	"@eslint-community/eslint-plugin-eslint-comments": "4.4.1",
-	"@eslint/js": "9.21.0",
+	"@eslint/js": "9.22.0",
 	"@prettier/sync": "^0.5.2",
 	"@release-it/conventional-changelog": "10.0.0",
 	"@types/eslint-plugin-markdown": "2.0.2",
@@ -71,9 +72,10 @@ var devDependencies = {
 	"@types/html-to-text": "9.0.4",
 	"@types/js-yaml": "4.0.9",
 	"@types/lodash": "4.17.16",
-	"@types/node": "22.13.9",
+	"@types/node": "22.13.10",
 	"@types/parse-author": "2.0.3",
-	"@vitest/coverage-v8": "3.0.7",
+	"@types/semver": "^7.5.8",
+	"@vitest/coverage-v8": "3.0.9",
 	"@vitest/eslint-plugin": "1.1.38",
 	"all-contributors-cli": "6.26.1",
 	"bingo-requests": "^0.5.4",
@@ -81,18 +83,18 @@ var devDependencies = {
 	"bingo-testers": "^0.5.6",
 	"console-fail-test": "0.5.0",
 	cspell: "8.17.5",
-	eslint: "9.21.0",
-	"eslint-plugin-jsdoc": "50.6.3",
+	eslint: "9.22.0",
+	"eslint-plugin-jsdoc": "50.6.8",
 	"eslint-plugin-jsonc": "2.19.1",
 	"eslint-plugin-markdown": "5.1.0",
 	"eslint-plugin-n": "17.16.2",
-	"eslint-plugin-package-json": "0.26.2",
-	"eslint-plugin-perfectionist": "4.10.0",
+	"eslint-plugin-package-json": "0.29.0",
+	"eslint-plugin-perfectionist": "4.10.1",
 	"eslint-plugin-regexp": "2.7.0",
 	"eslint-plugin-yml": "1.17.0",
 	husky: "9.1.7",
-	knip: "5.45.0",
-	"lint-staged": "15.4.3",
+	knip: "5.46.0",
+	"lint-staged": "15.5.0",
 	lodash: "^4.17.21",
 	markdownlint: "0.37.4",
 	"markdownlint-cli": "0.44.0",
@@ -104,10 +106,10 @@ var devDependencies = {
 	"sentences-per-line": "0.3.0",
 	tsup: "8.4.0",
 	typescript: "5.8.2",
-	"typescript-eslint": "8.26.0",
-	vitest: "3.0.7"
+	"typescript-eslint": "8.26.1",
+	vitest: "3.0.9"
 };
-var packageManager = "pnpm@10.6.0";
+var packageManager = "pnpm@10.6.4";
 var engines = {
 	node: ">=18.3.0"
 };

package/lib/options/readPackageData.d.ts

@@ -1,9 +1,6 @@
+import { TakeInput } from 'bingo';
 import { PartialPackageData } from '../types.js';
 
-declare function readPackageData(getPackageDataFull: () => Promise<PartialPackageData>): Promise<{
-    dependencies: Record<string, string> | undefined;
-    devDependencies: Record<string, string> | undefined;
-    scripts: Record<string, string> | undefined;
-}>;
+declare function readPackageData(take: TakeInput): Promise<PartialPackageData>;
 
 export { readPackageData };

package/lib/options/readPackageData.js

@@ -1,10 +1,11 @@
-async function readPackageData(getPackageDataFull) {
-  const original = await getPackageDataFull();
-  return {
-    dependencies: original.dependencies,
-    devDependencies: original.devDependencies,
-    scripts: original.scripts
-  };
+import { inputFromFileJSON } from "input-from-file-json";
+import { swallowError } from "../utils/swallowError.js";
+async function readPackageData(take) {
+  return swallowError(
+    await take(inputFromFileJSON, {
+      filePath: "./package.json"
+    })
+  ) || {};
 }
 export {
   readPackageData

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-typescript-app",
-	"version": "2.7.1",
+	"version": "2.7.3",
 	"description": "Quickstart-friendly TypeScript template with comprehensive, configurable, opinionated tooling. 🎁",
 	"repository": {
 		"type": "git",
@@ -58,6 +58,7 @@
 		"parse-package-name": "^1.0.0",
 		"remove-dependencies": "^0.1.0",
 		"remove-undefined-objects": "^6.0.0",
+		"semver": "^7.7.1",
 		"set-github-repository-labels": "^0.2.0",
 		"sort-keys": "^5.1.0",
 		"sort-package-json": "^3.0.0",
@@ -67,7 +68,7 @@
 	},
 	"devDependencies": {
 		"@eslint-community/eslint-plugin-eslint-comments": "4.4.1",
-		"@eslint/js": "9.21.0",
+		"@eslint/js": "9.22.0",
 		"@prettier/sync": "^0.5.2",
 		"@release-it/conventional-changelog": "10.0.0",
 		"@types/eslint-plugin-markdown": "2.0.2",
@@ -75,9 +76,10 @@
 		"@types/html-to-text": "9.0.4",
 		"@types/js-yaml": "4.0.9",
 		"@types/lodash": "4.17.16",
-		"@types/node": "22.13.9",
+		"@types/node": "22.13.10",
 		"@types/parse-author": "2.0.3",
-		"@vitest/coverage-v8": "3.0.7",
+		"@types/semver": "^7.5.8",
+		"@vitest/coverage-v8": "3.0.9",
 		"@vitest/eslint-plugin": "1.1.38",
 		"all-contributors-cli": "6.26.1",
 		"bingo-requests": "^0.5.4",
@@ -85,18 +87,18 @@
 		"bingo-testers": "^0.5.6",
 		"console-fail-test": "0.5.0",
 		"cspell": "8.17.5",
-		"eslint": "9.21.0",
-		"eslint-plugin-jsdoc": "50.6.3",
+		"eslint": "9.22.0",
+		"eslint-plugin-jsdoc": "50.6.8",
 		"eslint-plugin-jsonc": "2.19.1",
 		"eslint-plugin-markdown": "5.1.0",
 		"eslint-plugin-n": "17.16.2",
-		"eslint-plugin-package-json": "0.26.2",
-		"eslint-plugin-perfectionist": "4.10.0",
+		"eslint-plugin-package-json": "0.29.0",
+		"eslint-plugin-perfectionist": "4.10.1",
 		"eslint-plugin-regexp": "2.7.0",
 		"eslint-plugin-yml": "1.17.0",
 		"husky": "9.1.7",
-		"knip": "5.45.0",
-		"lint-staged": "15.4.3",
+		"knip": "5.46.0",
+		"lint-staged": "15.5.0",
 		"lodash": "^4.17.21",
 		"markdownlint": "0.37.4",
 		"markdownlint-cli": "0.44.0",
@@ -108,10 +110,10 @@
 		"sentences-per-line": "0.3.0",
 		"tsup": "8.4.0",
 		"typescript": "5.8.2",
-		"typescript-eslint": "8.26.0",
-		"vitest": "3.0.7"
+		"typescript-eslint": "8.26.1",
+		"vitest": "3.0.9"
 	},
-	"packageManager": "pnpm@10.6.0",
+	"packageManager": "pnpm@10.6.4",
 	"engines": {
 		"node": ">=18.3.0"
 	},

package/lib/options/readPackageDataFull.d.ts

@@ -1,6 +0,0 @@
-import { TakeInput } from 'bingo';
-import { PartialPackageData } from '../types.js';
-
-declare function readPackageDataFull(take: TakeInput): Promise<PartialPackageData>;
-
-export { readPackageDataFull };

package/lib/options/readPackageDataFull.js

@@ -1,9 +0,0 @@
-import { inputFromFileJSON } from "input-from-file-json";
-async function readPackageDataFull(take) {
-  return await take(inputFromFileJSON, {
-    filePath: "./package.json"
-  }) ?? {};
-}
-export {
-  readPackageDataFull
-};