chore: upgrade root deps (#1940)

SnailyCAD · Jun 9, 2024 · ced8c37 · ced8c37
1 parent b66b034
commit ced8c37
Show file tree

Hide file tree

Showing 19 changed files with 17,478 additions and 13,299 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -22,7 +22,6 @@ jobs:
 
       - uses: pnpm/action-setup@v4
         with:
-          version: 8
           run_install: false
 
       - name: Get pnpm store directory

diff --git a/.github/workflows/test-builds-typecheck.yml b/.github/workflows/test-builds-typecheck.yml
@@ -25,7 +25,6 @@ jobs:
 
       - uses: pnpm/action-setup@v4
         with:
-          version: 8
           run_install: false
 
       - name: Get pnpm store directory
@@ -45,15 +44,15 @@ jobs:
         run: pnpm install
 
       - name: Build packages
-        run: pnpm turbo run build --filter="{packages/**/**}"
+        run: pnpm turbo run build --filter="{packages/*}"
         env:
           NODE_OPTIONS: --max-old-space-size=6144
 
       - name: Run turbo typecheck
         run: pnpm turbo run typecheck
 
       - name: Build apps
-        run: pnpm turbo run build --filter="{apps/**/**}"
+        run: pnpm turbo run build --filter="{apps/*}"
         env:
           NODE_OPTIONS: --max-old-space-size=6144
 

diff --git a/.npmrc b/.npmrc
@@ -1,2 +1,3 @@
 legacy-peer-deps=true
-auto-install-peers=true
+auto-install-peers=true
+package-manager-strict=false
diff --git a/apps/api/package.json b/apps/api/package.json
@@ -25,46 +25,46 @@
     "@types/ejs": "^3.1.5",
     "@types/express": "^4.17.21",
     "@types/glob": "^8.1.0",
-    "@types/jsonwebtoken": "9.0.5",
+    "@types/jsonwebtoken": "9.0.6",
     "@types/lodash.set": "^4.3.9",
     "@types/multer": "^1.4.11",
-    "@types/node": "^20.9.3",
+    "@types/node": "^20.14.2",
     "@types/qrcode": "^1.5.5",
     "@types/sharp": "^0.31.1",
-    "dotenv": "^16.3.1",
-    "regenerator-runtime": "^0.14.0",
+    "dotenv": "^16.4.5",
+    "regenerator-runtime": "^0.14.1",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5.3.2",
     "vite": "^5.0.0",
     "vitest": "^0.34.6"
   },
   "dependencies": {
-    "@discordjs/rest": "^2.2.0",
+    "@discordjs/rest": "^2.3.0",
     "@paralleldrive/cuid2": "^2.2.2",
-    "@prisma/client": "^5.6.0",
+    "@prisma/client": "^5.15.0",
     "@sentry/node": "^7.81.0",
     "@snailycad/audit-logger": "workspace:*",
-    "@snailycad/config": "^1.79.1",
+    "@snailycad/config": "workspace:*",
     "@snailycad/image-data-uri": "^3.2.0",
     "@snailycad/permissions": "workspace:*",
     "@snailycad/prisma-generator-redundant-types": "^2.0.2",
     "@snailycad/schemas": "workspace:*",
     "@snailycad/types": "workspace:*",
-    "@snailycad/utils": "^1.79.1",
-    "@tsed/common": "^7.48.0",
-    "@tsed/components-scan": "^7.48.0",
-    "@tsed/core": "^7.48.0",
-    "@tsed/di": "^7.48.0",
-    "@tsed/exceptions": "^7.48.0",
-    "@tsed/json-mapper": "^7.48.0",
-    "@tsed/logger": "^6.6.3",
-    "@tsed/platform-exceptions": "^7.48.0",
-    "@tsed/platform-express": "^7.48.0",
-    "@tsed/platform-middlewares": "^7.48.0",
-    "@tsed/platform-params": "^7.48.0",
-    "@tsed/schema": "^7.48.0",
-    "@tsed/socketio": "^7.48.0",
-    "@tsed/swagger": "^7.48.0",
+    "@snailycad/utils": "workspace:*",
+    "@tsed/common": "^7.71.1",
+    "@tsed/components-scan": "^7.71.1",
+    "@tsed/core": "^7.71.1",
+    "@tsed/di": "^7.71.1",
+    "@tsed/exceptions": "^7.71.1",
+    "@tsed/json-mapper": "^7.71.1",
+    "@tsed/logger": "^6.7.5",
+    "@tsed/platform-exceptions": "^7.71.1",
+    "@tsed/platform-express": "^7.71.1",
+    "@tsed/platform-middlewares": "^7.71.1",
+    "@tsed/platform-params": "^7.71.1",
+    "@tsed/schema": "^7.71.1",
+    "@tsed/socketio": "^7.71.1",
+    "@tsed/swagger": "^7.71.1",
     "bcrypt": "^5.1.1",
     "command-exists": "^1.2.9",
     "compression": "1.7.4",
@@ -73,26 +73,26 @@
     "cors": "^2.8.5",
     "date-fns": "^2.30.0",
     "discord-api-types": "0.37.64",
-    "ejs": "^3.1.9",
-    "express": "4.18.2",
-    "glob": "^10.3.10",
+    "ejs": "^3.1.10",
+    "express": "4.19.2",
+    "glob": "^10.4.1",
     "is-ip": "3.1.0",
     "jsonwebtoken": "9.0.2",
     "lodash.set": "^4.3.2",
     "multer": "^1.4.5-lts.1",
     "nanoid": "^3.3.4",
-    "nodemon": "^3.0.1",
+    "nodemon": "^3.1.3",
     "otplib": "^12.0.1",
-    "prisma": "^5.6.0",
+    "prisma": "^5.15.0",
     "puppeteer": "^21.5.2",
     "qrcode": "^1.5.3",
     "reflect-metadata": "^0.1.13",
     "sharp": "^0.32.6",
-    "socket.io": "^4.7.2",
-    "ts-node": "^10.9.1",
-    "tslib": "^2.6.2",
-    "undici": "^5.27.2",
+    "socket.io": "^4.7.5",
+    "ts-node": "^10.9.2",
+    "tslib": "^2.6.3",
+    "undici": "^6.18.2",
     "use-intl": "2.22.1",
-    "zod": "^3.22.4"
+    "zod": "^3.23.8"
   }
 }
diff --git a/apps/client/package.json b/apps/client/package.json
@@ -25,38 +25,38 @@
     "@radix-ui/react-tabs": "^1.0.4",
     "@radix-ui/react-toolbar": "^1.0.4",
     "@radix-ui/react-tooltip": "^1.0.7",
-    "@react-aria/label": "^3.7.3",
-    "@react-aria/ssr": "^3.9.0",
+    "@react-aria/label": "^3.7.8",
+    "@react-aria/ssr": "^3.9.4",
     "@react-types/shared": "^3.22.0",
     "@sentry/browser": "^7.81.1",
     "@sentry/nextjs": "^7.81.1",
     "@sentry/tracing": "^7.81.1",
     "@snailycad/audit-logger": "workspace:*",
-    "@snailycad/config": "^1.79.1",
+    "@snailycad/config": "workspace:*",
     "@snailycad/permissions": "workspace:*",
     "@snailycad/schemas": "workspace:*",
     "@snailycad/types": "workspace:*",
     "@snailycad/ui": "workspace:*",
-    "@snailycad/utils": "^1.79.1",
-    "@tailwindcss/typography": "^0.5.10",
-    "@tanstack/react-query": "^5.8.4",
-    "@tanstack/react-table": "8.10.7",
+    "@snailycad/utils": "workspace:*",
+    "@tailwindcss/typography": "^0.5.13",
+    "@tanstack/react-query": "^5.40.1",
+    "@tanstack/react-table": "8.17.3",
     "@types/color": "^3.0.6",
     "@types/connect": "^3.4.38",
     "@types/is-hotkey": "^0.1.10",
-    "@types/leaflet": "^1.9.8",
+    "@types/leaflet": "^1.9.12",
     "@types/nprogress": "^0.2.3",
     "@types/react": "18.2.34",
     "@types/react-dom": "18.2.14",
-    "@types/sortablejs": "^1.15.6",
-    "@types/uuid": "^9.0.7",
-    "autoprefixer": "^10.4.16",
-    "axios": "^1.6.2",
+    "@types/sortablejs": "^1.15.8",
+    "@types/uuid": "^9.0.8",
+    "autoprefixer": "^10.4.19",
+    "axios": "^1.7.2",
     "bignumber.js": "^9.1.2",
     "color": "^4.2.3",
     "date-fns": "^2.30.0",
     "eslint-config-next": "^14.0.3",
-    "formik": "^2.4.5",
+    "formik": "^2.4.6",
     "hex-color-regex": "^1.1.0",
     "is-hotkey": "^0.2.0",
     "leaflet": "^1.9.4",
@@ -68,11 +68,11 @@
     "nprogress": "^0.2.0",
     "pretty-bytes": "^6.1.1",
     "react": "18.2.0",
-    "react-bootstrap-icons": "^1.10.3",
+    "react-bootstrap-icons": "^1.11.4",
     "react-colorful": "^5.6.1",
     "react-cool-onclickoutside": "^1.7.0",
     "react-cropper": "^2.3.3",
-    "react-diff-viewer-continued": "^3.3.1",
+    "react-diff-viewer-continued": "^3.4.0",
     "react-digit-input": "^2.1.0",
     "react-dom": "18.2.0",
     "react-google-recaptcha-v3": "^1.10.1",
@@ -89,21 +89,21 @@
     "slate": "^0.100.0",
     "slate-history": "^0.100.0",
     "slate-react": "^0.101.0",
-    "socket.io-client": "^4.7.2",
-    "sortablejs": "^1.15.0",
+    "socket.io-client": "^4.7.5",
+    "sortablejs": "^1.15.2",
     "storage-factory": "^0.2.1",
     "use-intl": "2.22.1",
-    "uuid": "^9.0.1",
-    "zod": "3.22.4",
-    "zustand": "^4.4.6"
+    "uuid": "^10.0.0",
+    "zod": "3.23.8",
+    "zustand": "^4.5.2"
   },
   "devDependencies": {
-    "dotenv": "^16.3.1",
-    "postcss": "^8.4.31",
-    "sass": "^1.69.5",
-    "tailwindcss": "^3.3.5",
+    "dotenv": "^16.4.5",
+    "postcss": "^8.4.38",
+    "sass": "^1.77.4",
+    "tailwindcss": "^3.4.4",
     "typescript": "^5.3.2",
-    "vite": "^5.0.2",
+    "vite": "^5.2.13",
     "vitest": "^0.34.6"
   }
 }
diff --git a/apps/client/src/components/bleeter/manage-bleet-modal.tsx b/apps/client/src/components/bleeter/manage-bleet-modal.tsx
@@ -109,7 +109,7 @@ export function ManageBleetModal({ post, onCreate, onUpdate }: Props) {
     title: post?.title ?? "",
     body: post?.body ?? "",
     bodyData: dataToSlate(post),
-    image: null as unknown as File,
+    image: null as unknown as File | null,
   };
 
   return (

diff --git a/apps/client/src/components/dispatch/active-units/modals/merge-unit-modal.tsx b/apps/client/src/components/dispatch/active-units/modals/merge-unit-modal.tsx
@@ -153,10 +153,18 @@ export function MergeUnitModal({
                 }
               }}
               fetchOptions={{
-                apiPath: (query) =>
-                  `/admin/values/emergency_vehicle/search?query=${query}&department=${(
-                    activeUnit ?? unit
-                  )?.departmentId}`,
+                apiPath: (query) => {
+                  const basePath = "/admin/values/emergency_vehicle/search?query";
+                  const queryParams = new URLSearchParams();
+                  const departmentId = activeUnit?.departmentId || unit.departmentId;
+
+                  if (query) queryParams.set("query", query);
+                  if (departmentId) {
+                    queryParams.set("department", departmentId);
+                  }
+
+                  return `${basePath}${queryParams.toString()}`;
+                },
                 filterTextRequired: true,
               }}
             >

diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "scripts": {
     "start": "pnpm concurrently \"pnpm --filter \"@snailycad/client\" start\" \"pnpm --filter \"@snailycad/api\" generate && pnpm --filter \"@snailycad/api\" start\"",
     "full-start": "git stash && git pull && pnpm install && node scripts/copy-env.mjs --client --api && pnpm run build && pnpm run start",
-    "build": "pnpm turbo run build --filter=\"{packages/**/**}\" && pnpm turbo run build --filter=\"{apps/**/**}\"",
+    "build": "pnpm turbo run build --filter=\"{packages/*}\" && pnpm turbo run build --filter=\"{apps/*}\"",
     "dev": "docker compose up -d && pnpm turbo run watch --parallel --concurrency 11",
     "format": "prettier --write \"./(packages|apps)/**/**/*.{js,jsx,ts,mjs,tsx,md,css,json}\" --ignore-path .gitignore",
     "lint": "pnpm eslint . --ext .ts,.js,.tsx,.jsx,.mjs",
@@ -23,8 +23,8 @@
     "@casperiv/eslint-config-react": "8.0.0",
     "eslint": "8.56.0",
     "eslint-plugin-deprecation": "^2.0.0",
-    "lerna": "^8.0.1",
-    "lint-staged": "^15.2.0"
+    "lerna": "^8.1.3",
+    "lint-staged": "^15.2.5"
   },
   "lint-staged": {
     "*.{js,jsx,json,ts,tsx,md,mdx,css,html,yml,yaml,scss,sass}\"": "prettier --write --ignore-path .prettierignore"
@@ -33,14 +33,14 @@
     "node": ">=18.16.0"
   },
   "dependencies": {
-    "@faker-js/faker": "^8.3.1",
+    "@faker-js/faker": "^8.4.1",
     "colorette": "2.0.20",
     "concurrently": "^8.2.2",
     "copy": "^0.3.2",
-    "dotenv": "^16.3.1",
+    "dotenv": "^16.4.5",
     "husky": "^8.0.3",
-    "prettier": "3.1.1",
-    "turbo": "1.10.16"
+    "prettier": "3.3.1",
+    "turbo": "2.0.3"
   },
   "pnpm": {
     "overrides": {
@@ -50,5 +50,6 @@
       "undici@<5.26.2": ">=5.26.2",
       "@babel/traverse@<7.23.2": ">=7.23.2"
     }
-  }
+  },
+  "packageManager": "pnpm@9.0.4"
 }