chore(deps): migrate to catalogs

PSDTools · Feb 17, 2025 · abda095 · abda095
1 parent deda1f7
commit abda095
Show file tree

Hide file tree

Showing 9 changed files with 1,766 additions and 1,409 deletions.
diff --git a/apps/gpa-calculator/package.json b/apps/gpa-calculator/package.json
@@ -30,32 +30,32 @@
     "defaults"
   ],
   "dependencies": {
-    "html-template-tag": "^4.1.1",
-    "idb-keyval": "^6.2.1",
-    "typed-query-selector": "^2.12.0",
-    "unstorage": "^1.14.4",
-    "zod": "^3.24.1"
+    "html-template-tag": "catalog:",
+    "idb-keyval": "catalog:",
+    "typed-query-selector": "catalog:",
+    "unstorage": "catalog:",
+    "zod": "catalog:"
   },
   "devDependencies": {
     "@psdtools/tsconfig": "workspace:^",
-    "@tailwindcss/vite": "4.0.2",
-    "@total-typescript/ts-reset": "^0.6.1",
-    "@vite-pwa/assets-generator": "^0.2.6",
-    "browserslist": "^4.24.4",
-    "browserslist-to-esbuild": "^2.1.1",
+    "@tailwindcss/vite": "catalog:",
+    "@total-typescript/ts-reset": "catalog:",
+    "@vite-pwa/assets-generator": "catalog:",
+    "browserslist": "catalog:",
+    "browserslist-to-esbuild": "catalog:",
     "deputy": "workspace:^",
-    "eslint": "^9.19.0",
-    "fontaine": "^0.5.0",
-    "jiti": "^2.4.2",
-    "lightningcss": "^1.29.1",
-    "tailwindcss": "4.0.2",
-    "typescript": "~5.7.3",
-    "vite": "^6.0.11",
-    "vite-plugin-html-minifier": "^1.0.5",
-    "vite-plugin-pwa": "^0.21.1",
-    "workbox-build": "^7.3.0",
-    "workbox-core": "^7.3.0",
-    "workbox-precaching": "^7.3.0",
-    "workbox-window": "^7.3.0"
+    "eslint": "catalog:",
+    "fontaine": "catalog:",
+    "jiti": "catalog:",
+    "lightningcss": "catalog:",
+    "tailwindcss": "catalog:",
+    "typescript": "catalog:",
+    "vite": "catalog:",
+    "vite-plugin-html-minifier": "catalog:",
+    "vite-plugin-pwa": "catalog:",
+    "workbox-build": "catalog:",
+    "workbox-core": "catalog:",
+    "workbox-precaching": "catalog:",
+    "workbox-window": "catalog:"
   }
 }
diff --git a/apps/petal-notes/package.json b/apps/petal-notes/package.json
@@ -21,57 +21,57 @@
     "defaults"
   ],
   "dependencies": {
-    "@codemirror/autocomplete": "^6.18.6",
-    "@codemirror/commands": "^6.8.0",
-    "@codemirror/lang-markdown": "^6.3.2",
-    "@codemirror/language": "^6.10.8",
-    "@codemirror/language-data": "^6.5.1",
-    "@codemirror/search": "^6.5.9",
-    "@codemirror/state": "^6.5.1",
-    "@codemirror/view": "^6.36.2",
-    "@lezer-unofficial/printer": "^1.0.1",
-    "@lezer/highlight": "^1.2.1",
-    "@lezer/markdown": "^1.4.1",
-    "codemirror": "^6.0.1",
-    "hypermd": "https://pkg.pr.new/jsimonrichard/HyperMD/hypermd@9c02ff2"
+    "@codemirror/autocomplete": "catalog:",
+    "@codemirror/commands": "catalog:",
+    "@codemirror/lang-markdown": "catalog:",
+    "@codemirror/language": "catalog:",
+    "@codemirror/language-data": "catalog:",
+    "@codemirror/search": "catalog:",
+    "@codemirror/state": "catalog:",
+    "@codemirror/view": "catalog:",
+    "@lezer-unofficial/printer": "catalog:",
+    "@lezer/highlight": "catalog:",
+    "@lezer/markdown": "catalog:",
+    "codemirror": "catalog:",
+    "hypermd": "catalog:"
   },
   "devDependencies": {
-    "@chromatic-com/storybook": "^3.2.4",
+    "@chromatic-com/storybook": "catalog:",
     "@psdtools/tsconfig": "workspace:^",
-    "@storybook/addon-a11y": "^8.5.2",
-    "@storybook/addon-designs": "^8.1.0",
-    "@storybook/addon-essentials": "^8.5.2",
-    "@storybook/addon-svelte-csf": "=5.0.0-next.23",
-    "@storybook/blocks": "^8.5.2",
-    "@storybook/experimental-addon-test": "^8.5.2",
-    "@storybook/svelte": "^8.5.2",
-    "@storybook/sveltekit": "^8.5.2",
-    "@storybook/test": "^8.5.2",
-    "@sveltejs/adapter-static": "^3.0.8",
-    "@sveltejs/kit": "^2.16.1",
-    "@sveltejs/vite-plugin-svelte": "^5.0.3",
-    "@tailwindcss/forms": "^0.5.10",
-    "@tailwindcss/typography": "^0.5.16",
-    "@tailwindcss/vite": "4.0.2",
-    "@total-typescript/ts-reset": "^0.6.1",
-    "@types/react": "^19.0.8",
-    "@vitest/browser": "^3.0.4",
-    "@vitest/coverage-v8": "^3.0.4",
-    "browserslist": "^4.24.4",
-    "browserslist-to-esbuild": "^2.1.1",
-    "chromatic": "^11.25.2",
+    "@storybook/addon-a11y": "catalog:",
+    "@storybook/addon-designs": "catalog:",
+    "@storybook/addon-essentials": "catalog:",
+    "@storybook/addon-svelte-csf": "catalog:",
+    "@storybook/blocks": "catalog:",
+    "@storybook/experimental-addon-test": "catalog:",
+    "@storybook/svelte": "catalog:",
+    "@storybook/sveltekit": "catalog:",
+    "@storybook/test": "catalog:",
+    "@sveltejs/adapter-static": "catalog:",
+    "@sveltejs/kit": "catalog:",
+    "@sveltejs/vite-plugin-svelte": "catalog:",
+    "@tailwindcss/forms": "catalog:",
+    "@tailwindcss/typography": "catalog:",
+    "@tailwindcss/vite": "catalog:",
+    "@total-typescript/ts-reset": "catalog:",
+    "@types/react": "catalog:",
+    "@vitest/browser": "catalog:",
+    "@vitest/coverage-v8": "catalog:",
+    "browserslist": "catalog:",
+    "browserslist-to-esbuild": "catalog:",
+    "chromatic": "catalog:",
     "deputy": "workspace:^",
-    "eslint": "^9.19.0",
-    "jiti": "^2.4.2",
-    "lightningcss": "^1.29.1",
-    "playwright": "^1.50.1",
-    "storybook": "^8.5.2",
-    "svelte": "^5.19.6",
-    "svelte-check": "^4.1.4",
-    "tailwindcss": "4.0.2",
-    "typescript": "~5.7.3",
-    "vite": "^6.0.11",
-    "vitest": "^3.0.4",
-    "vitest-browser-svelte": "^0.1.0"
+    "eslint": "catalog:",
+    "jiti": "catalog:",
+    "lightningcss": "catalog:",
+    "playwright": "catalog:",
+    "storybook": "catalog:",
+    "svelte": "catalog:",
+    "svelte-check": "catalog:",
+    "tailwindcss": "catalog:",
+    "typescript": "catalog:",
+    "vite": "catalog:",
+    "vitest": "catalog:",
+    "vitest-browser-svelte": "catalog:"
   }
 }
diff --git a/apps/phs-map/package.json b/apps/phs-map/package.json
@@ -30,36 +30,36 @@
     "defaults"
   ],
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^6.7.2",
-    "@fortawesome/free-solid-svg-icons": "^6.7.2",
-    "html-template-tag": "^4.1.1",
-    "idb-keyval": "^6.2.1",
-    "pathfinding": "^0.4.18",
-    "typed-query-selector": "^2.12.0",
-    "unstorage": "^1.14.4",
-    "zod": "^3.24.1",
-    "zod-validation-error": "^3.4.0"
+    "@fortawesome/fontawesome-svg-core": "catalog:",
+    "@fortawesome/free-solid-svg-icons": "catalog:",
+    "html-template-tag": "catalog:",
+    "idb-keyval": "catalog:",
+    "pathfinding": "catalog:",
+    "typed-query-selector": "catalog:",
+    "unstorage": "catalog:",
+    "zod": "catalog:",
+    "zod-validation-error": "catalog:"
   },
   "devDependencies": {
     "@psdtools/tsconfig": "workspace:^",
-    "@total-typescript/ts-reset": "^0.6.1",
+    "@total-typescript/ts-reset": "catalog:",
     "@types/pathfinding": "~0.0.9",
-    "@vite-pwa/assets-generator": "^0.2.6",
-    "browserslist": "^4.24.4",
-    "browserslist-to-esbuild": "^2.1.1",
+    "@vite-pwa/assets-generator": "catalog:",
+    "browserslist": "catalog:",
+    "browserslist-to-esbuild": "catalog:",
     "deputy": "workspace:^",
-    "eslint": "^9.19.0",
-    "fontaine": "^0.5.0",
-    "jiti": "^2.4.2",
-    "lightningcss": "^1.29.1",
-    "typescript": "~5.7.3",
-    "vite": "^6.0.11",
-    "vite-plugin-html-minifier": "^1.0.5",
-    "vite-plugin-pwa": "^0.21.1",
-    "vite-plugin-webfont-dl": "^3.10.4",
-    "workbox-build": "^7.3.0",
-    "workbox-core": "^7.3.0",
-    "workbox-precaching": "^7.3.0",
-    "workbox-window": "^7.3.0"
+    "eslint": "catalog:",
+    "fontaine": "catalog:",
+    "jiti": "catalog:",
+    "lightningcss": "catalog:",
+    "typescript": "catalog:",
+    "vite": "catalog:",
+    "vite-plugin-html-minifier": "catalog:",
+    "vite-plugin-pwa": "catalog:",
+    "vite-plugin-webfont-dl": "catalog:",
+    "workbox-build": "catalog:",
+    "workbox-core": "catalog:",
+    "workbox-precaching": "catalog:",
+    "workbox-window": "catalog:"
   }
 }
diff --git a/package.json b/package.json
@@ -22,12 +22,12 @@
     "@commitlint/config-conventional": "^19.7.1",
     "@manypkg/cli": "^0.23.0",
     "husky": "^9.1.7",
-    "knip": "^5.43.6",
-    "prettier": "3.4.2",
+    "knip": "^5.44.1",
+    "prettier": "3.5.1",
     "prettier-plugin-svelte": "^3.3.3",
     "prettier-plugin-tailwindcss": "^0.6.11",
     "turbo": "^2.4.2",
-    "typesync": "^0.14.0"
+    "typesync": "^0.14.1"
   },
   "devEngines": {
     "runtime": [
@@ -43,7 +43,7 @@
       }
     ]
   },
-  "packageManager": "[email protected].0+sha512.6b849d0787d97f8f4e1f03a9b8ff8f038e79e153d6f11ae539ae7c435ff9e796df6a862c991502695c7f9e8fac8aeafc1ac5a8dab47e36148d183832d886dd52",
+  "packageManager": "[email protected].1+sha512.c753b6c3ad7afa13af388fa6d808035a008e30ea9993f58c6663e2bc5ff21679aa834db094987129aa4d488b86df57f7b634981b2f827cdcacc698cc0cfb88af",
   "pnpm": {
     "peerDependencyRules": {
       "allowedVersions": {

diff --git a/packages/deputy/package.json b/packages/deputy/package.json
@@ -22,18 +22,17 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@cspell/eslint-plugin": "^8.17.3",
-    "eslint-config-sheriff": "^25.7.0",
-    "eslint-plugin-perfectionist": "^4.7.0",
-    "eslint-plugin-svelte": "3.0.0-next.16",
-    "globals": "^15.14.0",
-    "svelte2tsx": "^0.7.34",
-    "typescript-eslint": "^8.22.0",
-    "typescript-eslint-parser-for-extra-files": "^0.7.0"
+    "@cspell/eslint-plugin": "catalog:",
+    "eslint-config-sheriff": "catalog:",
+    "eslint-plugin-perfectionist": "catalog:",
+    "eslint-plugin-svelte": "catalog:",
+    "globals": "catalog:",
+    "svelte2tsx": "catalog:",
+    "typescript-eslint-parser-for-extra-files": "catalog:"
   },
   "peerDependencies": {
-    "eslint": "^9.18.0",
-    "svelte": "^5.19.2"
+    "eslint": "catalog:",
+    "svelte": "catalog:"
   },
   "peerDependenciesMeta": {
     "svelte": {
@@ -42,10 +41,10 @@
   },
   "devDependencies": {
     "@psdtools/tsconfig": "workspace:*",
-    "@sveltejs/kit": "^2.16.1",
-    "eslint": "^9.19.0",
-    "jiti": "^2.4.2",
-    "svelte": "^5.19.6",
-    "typescript": "~5.7.3"
+    "@sveltejs/kit": "catalog:",
+    "eslint": "catalog:",
+    "jiti": "catalog:",
+    "svelte": "catalog:",
+    "typescript": "catalog:"
   }
 }
diff --git a/packages/deputy/src/index.ts b/packages/deputy/src/index.ts
@@ -4,12 +4,12 @@ import {
   sheriff,
   type SheriffSettings,
   supportedFileTypes,
+  tseslint,
   type TSESLint,
 } from "eslint-config-sheriff";
 import perfectionist from "eslint-plugin-perfectionist";
 import sveltePlugin from "eslint-plugin-svelte";
 import globals from "globals";
-import ts from "typescript-eslint";
 import { meta, parseForESLint } from "typescript-eslint-parser-for-extra-files";
 
 const tsParser: TSESLint.Parser.LooseParserModule = {
@@ -46,9 +46,11 @@ const sheriffOptions = {
   vitest: false,
 } satisfies SheriffSettings;
 
-const baseConfig = ts.config([
-  ...ts.configs.strictTypeChecked,
-  ...ts.configs.stylisticTypeChecked,
+const baseConfig = tseslint.config([
+  {
+    ...tseslint.configs.stylisticTypeChecked[2],
+    files: [supportedFileTypes],
+  },
   {
     files: [supportedFileTypes],
     rules: {
@@ -69,7 +71,9 @@ const baseConfig = ts.config([
         error,
         {
           "ts-check": false,
-          "ts-expect-error": { descriptionFormat: "^\\(TS\\d+\\): .+$" },
+          "ts-expect-error": {
+            descriptionFormat: "^\\(ts\\d+\\): .+$",
+          },
         },
       ],
       "@typescript-eslint/explicit-function-return-type": [
@@ -187,7 +191,7 @@ function svelteConfig({
 }): TSESLint.FlatConfig.ConfigArray {
   const { svelteKitConfig } = settings;
 
-  return ts.config([
+  return tseslint.config([
     ...sveltePlugin.configs.recommended,
     {
       languageOptions: {
@@ -223,7 +227,7 @@ function svelteConfig({
 
         // Best Practices
         "prefer-const": off,
-        "svelte/block-lang": [warn, { script: "ts" }],
+        "svelte/block-lang": [warn, { script: "tseslint" }],
         "svelte/button-has-type": warn,
         "svelte/no-ignored-unsubscribe": warn,
         "svelte/no-inline-styles": warn,