Merge pull request #146 from PSDTools/bump

lishaduck · web-flow · commit 4ff1a85a0d82 · 2025-01-15T23:22:25.000-06:00
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -21,7 +21,7 @@
 
 .prettierrc       @lishaduck
 .prettierignore   @lishaduck
-eslint.config.js  @lishaduck
+eslint.config.ts  @lishaduck
 package.json      @lishaduck
 pnpm-lock.yaml    @lishaduck
 tsconfig.*json    @lishaduck
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -45,12 +45,10 @@ jobs:
           set-safe-directory: true
       - name: ⠨⠿ Install pnpm
         uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
-        with:
-          package_json_file: package.json
       - name: ⬢ Install Node
         uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
-          node-version-file: package.json
+          node-version-file: .nvmrc
           cache: "pnpm"
       - name: ⚙️ Cache Turbo
         uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
@@ -71,8 +69,8 @@ jobs:
         run: pnpm run build
       - name: 🕵️ Merge Checks
         run: pnpm run merge-checks --continue
-      - name: 🧹 Check for deduped dependencies
-        run: pnpm exec turbo check-deduped-deps
+      # - name: 🧹 Check for deduped dependencies
+      #   run: pnpm exec turbo check-deduped-deps
       - name: ⚙️ Upload GPA Calculator
         uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
         with:
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1,3 @@
+auto-install-peers=true
+strict-peer-dependencies=true
+disallow-workspace-cycles=true
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v23.6.0
diff --git a/apps/gpa-calculator/eslint.config.js b/apps/gpa-calculator/eslint.config.js
diff --git a/apps/gpa-calculator/eslint.config.ts b/apps/gpa-calculator/eslint.config.ts
@@ -0,0 +1,3 @@
+import { config } from "deputy";
+
+export default config();
diff --git a/apps/gpa-calculator/package.json b/apps/gpa-calculator/package.json
@@ -31,26 +31,27 @@
     "defaults and fully supports es6-module"
   ],
   "dependencies": {
-    "html-template-tag": "^4.1.0",
+    "html-template-tag": "^4.1.1",
     "idb-keyval": "^6.2.1",
     "typed-query-selector": "^2.12.0",
-    "unstorage": "^1.13.1",
+    "unstorage": "^1.14.4",
     "zod": "^3.24.1"
   },
   "devDependencies": {
     "@psdtools/tsconfig": "workspace:^",
     "@total-typescript/ts-reset": "^0.6.1",
     "@vite-pwa/assets-generator": "^0.2.6",
-    "browserslist": "^4.24.2",
+    "browserslist": "^4.24.4",
     "browserslist-to-esbuild": "^2.1.1",
     "deputy": "workspace:^",
-    "eslint": "^9.14.0",
+    "eslint": "^9.18.0",
     "fontaine": "^0.5.0",
-    "lightningcss": "^1.28.1",
-    "typescript": "^5.7.2",
-    "vite": "^5.4.11",
-    "vite-plugin-html-minifier": "^1.0.4",
-    "vite-plugin-pwa": "^0.20.5",
+    "jiti": "^2.4.2",
+    "lightningcss": "^1.29.1",
+    "typescript": "~5.7.3",
+    "vite": "^6.0.7",
+    "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",
diff --git a/apps/gpa-calculator/src/data/data-types.ts b/apps/gpa-calculator/src/data/data-types.ts
@@ -34,4 +34,4 @@ const newCourse = z
     }),
   );
 
-export { type Course, newCourse };
+export { type Course, courseSchema, newCourse };
diff --git a/apps/gpa-calculator/src/script.ts b/apps/gpa-calculator/src/script.ts
@@ -23,14 +23,14 @@ import {
 } from "./scripts/storage.ts";
 
 declare global {
-  function hsmsSwap(): Promise<void>;
   function classAmount(): Promise<void>;
-  function loadGpa(): Promise<void>;
-  function clearData(): Promise<void>;
   function clearAll(): Promise<void>;
-  function toggleNav(open: boolean): void;
-  function startApp(): Promise<void>;
+  function clearData(): Promise<void>;
   function darkMode(): Promise<void>;
+  function hsmsSwap(): Promise<void>;
+  function loadGpa(): Promise<void>;
+  function startApp(): Promise<void>;
+  function toggleNav(open: boolean): void;
 }
 
 let courses: Course[] = [];
diff --git a/apps/gpa-calculator/src/scripts/storage.ts b/apps/gpa-calculator/src/scripts/storage.ts
@@ -3,7 +3,12 @@ import indexedDbDriver from "unstorage/drivers/indexedb";
 
 import type { Course } from "../data/data-types";
 
-const storage: Storage = createStorage({
+interface StorageData {
+  arraystorage: Course[];
+  gradestorage: string;
+}
+
+const storage: Storage<StorageData> = createStorage<StorageData>({
   driver: indexedDbDriver({ base: "gpa:" }),
 });
 
diff --git a/apps/gpa-calculator/tsconfig.eslint.json b/apps/gpa-calculator/tsconfig.eslint.json
@@ -1,4 +1,4 @@
 {
   "extends": "@psdtools/tsconfig/extra.json",
-  "files": ["eslint.config.js", "tailwind.config.ts", "vite.config.ts"]
+  "files": ["eslint.config.ts", "tailwind.config.ts", "vite.config.ts"]
 }
diff --git a/apps/gpa-calculator/vite.config.ts b/apps/gpa-calculator/vite.config.ts
@@ -14,7 +14,7 @@ export default defineConfig({
     cssMinify: "lightningcss",
     rollupOptions: {
       input: {
-        main: new URL(import.meta.resolve("./index.html")).pathname,
+        main: "./index.html",
       },
     },
     sourcemap: true,
diff --git a/apps/phs-map/eslint.config.js b/apps/phs-map/eslint.config.js
diff --git a/apps/phs-map/eslint.config.ts b/apps/phs-map/eslint.config.ts
@@ -0,0 +1,3 @@
+import { config } from "deputy";
+
+export default config();
diff --git a/apps/phs-map/package.json b/apps/phs-map/package.json
@@ -33,11 +33,11 @@
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^6.7.2",
     "@fortawesome/free-solid-svg-icons": "^6.7.2",
-    "html-template-tag": "^4.1.0",
+    "html-template-tag": "^4.1.1",
     "idb-keyval": "^6.2.1",
     "pathfinding": "^0.4.18",
     "typed-query-selector": "^2.12.0",
-    "unstorage": "^1.13.1",
+    "unstorage": "^1.14.4",
     "zod": "^3.24.1",
     "zod-validation-error": "^3.4.0"
   },
@@ -46,17 +46,18 @@
     "@total-typescript/ts-reset": "^0.6.1",
     "@types/pathfinding": "~0.0.9",
     "@vite-pwa/assets-generator": "^0.2.6",
-    "browserslist": "^4.24.2",
+    "browserslist": "^4.24.4",
     "browserslist-to-esbuild": "^2.1.1",
     "deputy": "workspace:^",
-    "eslint": "^9.14.0",
+    "eslint": "^9.18.0",
     "fontaine": "^0.5.0",
-    "lightningcss": "^1.28.1",
-    "typescript": "^5.7.2",
-    "vite": "^5.4.11",
-    "vite-plugin-html-minifier": "^1.0.4",
-    "vite-plugin-pwa": "^0.20.5",
-    "vite-plugin-webfont-dl": "^3.9.5",
+    "jiti": "^2.4.2",
+    "lightningcss": "^1.29.1",
+    "typescript": "~5.7.3",
+    "vite": "^6.0.7",
+    "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",
diff --git a/apps/phs-map/src/data/colors.ts b/apps/phs-map/src/data/colors.ts
@@ -1,6 +1,6 @@
 export const colorMap = {
-  "-2": "#00FFFF",
-  "-3": "#FF00FF",
-  "-4": "#F00FFF",
   "-5": "#F00F0F",
+  "-4": "#F00FFF",
+  "-3": "#FF00FF",
+  "-2": "#00FFFF",
 };
diff --git a/apps/phs-map/src/data/data-types.ts b/apps/phs-map/src/data/data-types.ts
@@ -106,4 +106,4 @@ type GWing = "G";
  */
 type HWing = "H";
 
-export type { Coords2D, Level, Lvl, Rooms, StairList };
+export type { Coords, Coords2D, Level, Lvl, Rooms, StairList, Wing };
diff --git a/apps/phs-map/src/script.ts b/apps/phs-map/src/script.ts
@@ -6,7 +6,6 @@
  * Therefore, it is important to keep the script as fast as possible.
  */
 
-/* eslint-disable no-param-reassign */
 /* eslint-disable @typescript-eslint/no-shadow */
 
 // cspell:ignore stinv, txtbox, containerinpt, xmark, rmnum, btninpt, showpth
@@ -568,19 +567,7 @@ function passingTime(num: number, profNum: number): void {
     } else {
       btmPath(x1, y1, x2, y2, flr1, flr2);
     }
-    switch (flr1) {
-      case 1: {
-        lvl(1);
-        break;
-      }
-      case 2: {
-        lvl(2);
-        break;
-      }
-      default: {
-        lvl(0);
-      }
-    }
+    lvl(flr1);
   }
 }
 globalThis.passingTime = passingTime;
diff --git a/apps/phs-map/src/styles/bounce.css b/apps/phs-map/src/styles/bounce.css
@@ -1397,7 +1397,7 @@ table tr:hover {
   outline: 2px solid black;
 }
 
-table tr:first-chid:hover {
+table tr:first-child:hover {
   border-top-left-radius: 2px;
   border-top-right-radius: 2px;
 }
diff --git a/apps/phs-map/tsconfig.eslint.json b/apps/phs-map/tsconfig.eslint.json
@@ -1,4 +1,4 @@
 {
   "extends": "@psdtools/tsconfig/extra.json",
-  "files": ["eslint.config.js", "vite.config.ts"]
+  "files": ["eslint.config.ts", "vite.config.ts"]
 }
diff --git a/apps/phs-map/vite.config.ts b/apps/phs-map/vite.config.ts
@@ -5,21 +5,21 @@ import { browserslistToTargets } from "lightningcss";
 import { defineConfig } from "vite";
 import htmlMinifier from "vite-plugin-html-minifier";
 import { VitePWA } from "vite-plugin-pwa";
-import webfontDownload from "vite-plugin-webfont-dl";
+import { webfontDownload } from "vite-plugin-webfont-dl";
 
 const browsersList = browserslist();
 
 // https://vitejs.dev/config/
 export default defineConfig({
   build: {
+    cssMinify: "lightningcss",
     rollupOptions: {
       input: {
-        main: new URL(import.meta.resolve("./index.html")).pathname,
+        main: "./index.html",
       },
     },
     sourcemap: true,
     target: browserslistToEsbuild(browsersList),
-    // cssMinify: "lightningcss", // Currently doesn't support first-child.
   },
   css: {
     lightningcss: {
@@ -31,7 +31,8 @@ export default defineConfig({
     webfontDownload(["https://fonts.googleapis.com/css?family=Lato"]),
     FontaineTransform.vite({
       fallbacks: ["sans-serif"],
-      resolvePath: (path) => new URL(`.${path}`, import.meta.url),
+      // The config gets moved to `node_modules/.vite-temp/`.
+      resolvePath: (path) => new URL(`../../.${path}`, import.meta.url),
     }),
     htmlMinifier({
       minify: true,
diff --git a/knip.json b/knip.json
@@ -1,20 +1,24 @@
 {
-  "$schema": "https://unpkg.com/knip@5/schema.json",
+  "$schema": "./node_modules/knip/schema.json",
   "workspaces": {
     "apps/*": {
-      "entry": ["src/script.ts", "src/sw.ts"],
-      "project": ["**/*.{js,cjs,mjs,ts,cts,mts}"]
+      "entry": ["src/{script,sw}.ts"],
+      "project": ["**/*.{js,cjs,mjs,ts,cts,mts}"],
+      "ignore": ["eslint.config.ts"],
+      "ignoreDependencies": ["deputy"]
     },
     "apps/gpa-calculator": {
-      "entry": ["src/script.ts", "src/sw.ts"],
+      "entry": ["src/{script,sw}.ts"],
       "project": ["**/*.{js,cjs,mjs,ts,cts,mts}"],
-      "ignore": ["tailwind.config.ts"]
+      "ignore": ["eslint.config.ts", "tailwind.config.ts"],
+      "ignoreDependencies": ["deputy"]
     },
     "packages/deputy": {
-      "ignore": ["tsdown.config.ts"],
-      "ignoreDependencies": ["@eslint-types/*", "rolldown"]
+      "ignore": ["eslint.config.ts"],
+      "ignoreDependencies": ["@eslint-types/*"]
     }
   },
   "ignore": [".pnpmfile.cjs"],
-  "ignoreDependencies": ["@commitlint/cli"]
+  "ignoreExportsUsedInFile": true,
+  "includeEntryExports": true
 }
diff --git a/package.json b/package.json
@@ -17,33 +17,30 @@
     "merge-checks": "turbo run typecheck knip lint format:check manypkg typesync:check"
   },
   "devDependencies": {
-    "@commitlint/cli": "^19.6.0",
+    "@commitlint/cli": "^19.6.1",
     "@commitlint/config-conventional": "^19.6.0",
-    "@manypkg/cli": "^0.22.0",
+    "@manypkg/cli": "^0.23.0",
     "husky": "^9.1.7",
-    "knip": "^5.41.0",
+    "knip": "^5.42.1",
     "prettier": "3.4.2",
-    "turbo": "^2.2.3",
+    "turbo": "^2.3.3",
     "typesync": "^0.14.0"
   },
   "devEngines": {
     "runtime": [
       {
         "name": "node",
-        "version": ">= 22.0.0"
+        "version": ">= 23.0.0"
       }
     ],
     "packageManager": [
       {
         "name": "pnpm",
-        "version": "^9.0.0"
+        "version": "^10.0.0"
       }
     ]
   },
-  "engines": {
-    "node": "22.10.0"
-  },
-  "packageManager": "pnpm@9.12.2+sha512.22721b3a11f81661ae1ec68ce1a7b879425a1ca5b991c975b074ac220b187ce56c708fe5db69f4c962c989452eee76c82877f4ee80f474cebd61ee13461b6228",
+  "packageManager": "pnpm@10.0.0+sha512.b8fef5494bd3fe4cbd4edabd0745df2ee5be3e4b0b8b08fa643aa3e4c6702ccc0f00d68fa8a8c9858a735a0032485a44990ed2810526c875e416f001b17df12b",
   "pnpm": {
     "peerDependencyRules": {
       "allowedVersions": {
@@ -54,14 +51,14 @@
       "esbuild",
       "sharp"
     ],
-    "neverBuildDependencies": [
+    "ignoredBuiltDependencies": [
       "eslint-config-sheriff"
-    ]
+    ],
+    "overrides": {
+      "eslint-plugin-unicorn": "^56.0.1"
+    }
   },
   "manypkg": {
-    "workspaceProtocol": "require",
-    "ignoredRules": [
-      "ROOT_HAS_DEV_DEPENDENCIES"
-    ]
+    "workspaceProtocol": "require"
   }
 }
diff --git a/packages/deputy/eslint.config.js b/packages/deputy/eslint.config.js
diff --git a/packages/deputy/eslint.config.ts b/packages/deputy/eslint.config.ts
@@ -0,0 +1,3 @@
+import { config } from "./src/index.ts";
+
+export default config();
diff --git a/packages/deputy/package.json b/packages/deputy/package.json
diff --git a/packages/deputy/src/index.ts b/packages/deputy/src/index.ts
diff --git a/packages/deputy/tsconfig.eslint.json b/packages/deputy/tsconfig.eslint.json
diff --git a/packages/deputy/tsdown.config.ts b/packages/deputy/tsdown.config.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/turbo.json b/turbo.json

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+auto-install-peers=true`
	`2`	`+strict-peer-dependencies=true`
	`3`	`+disallow-workspace-cycles=true`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import { config } from "deputy";`
	`2`	`+`
	`3`	`+export default config();`