Merge branch 'main' into next

.github/workflows/cd-assets.yml

@@ -33,7 +33,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Maximize build space
+      - name: (ZIP) Maximize build space
+        if: github.event.inputs.zip_url != ''
         uses: easimon/maximize-build-space@master
         with:
           root-reserve-mb: 512

package.json

@@ -32,17 +32,17 @@
     "@nivo/bar": "^0.87.0",
     "@octokit/plugin-throttling": "^8.2.0",
     "@octokit/rest": "^20.1.1",
-    "@prisma/client": "^5.16.2",
+    "@prisma/client": "^5.19.1",
     "@radix-ui/colors": "^3.0.0",
     "@radix-ui/react-icons": "^1.3.0",
-    "@radix-ui/themes": "^3.1.1",
+    "@radix-ui/themes": "^3.1.3",
-    "@react-three/drei": "^9.108.3",
+    "@react-three/drei": "^9.111.5",
-    "@react-three/fiber": "^8.16.8",
+    "@react-three/fiber": "^8.17.6",
     "@resvg/resvg-js": "^2.6.2",
     "@types/three": "^0.160.0",
-    "@vanilla-extract/css": "^1.15.3",
+    "@vanilla-extract/css": "^1.15.5",
-    "@vanilla-extract/dynamic": "^2.1.1",
+    "@vanilla-extract/dynamic": "^2.1.2",
-    "adm-zip": "^0.5.14",
+    "adm-zip": "^0.5.16",
     "bepaint": "^0.1.0-beta.3",
     "csv-parse": "^5.5.6",
     "decompress": "^4.2.1",
@@ -58,52 +58,52 @@
     "lodash": "^4.17.21",
     "lz4js": "^0.2.0",
     "markdown-escape": "^2.0.0",
-    "markdown-to-jsx": "^7.4.7",
+    "markdown-to-jsx": "^7.5.0",
-    "next": "^14.2.5",
+    "next": "^14.2.7",
     "parse-dds": "^1.2.1",
     "pickleparser": "^0.2.1",
-    "postprocessing": "^6.35.6",
+    "postprocessing": "^6.36.0",
     "progress": "^2.0.3",
-    "protobufjs": "^7.3.2",
+    "protobufjs": "^7.4.0",
     "react": "^18.3.1",
     "react-device-detect": "^2.2.3",
     "react-dom": "^18.3.1",
     "react-fuzzysort": "^1.0.1",
     "react-promise-suspense": "^0.3.4",
     "satori": "^0.10.14",
-    "sharp": "^0.33.4",
+    "sharp": "^0.33.5",
     "three": "0.159.0",
-    "three-stdlib": "^2.30.4",
+    "three-stdlib": "^2.32.2",
     "urlon": "^3.1.0",
-    "vitepress": "^1.3.0",
+    "vitepress": "^1.3.4",
     "vitepress-plugin-auto-sidebar": "^1.2.0",
-    "yaml": "^2.4.5",
+    "yaml": "^2.5.0",
-    "zustand": "^4.5.4"
+    "zustand": "^4.5.5"
   },
   "devDependencies": {
     "@total-typescript/ts-reset": "^0.5.1",
     "@types/adm-zip": "^0.5.5",
-    "@types/bun": "^1.1.6",
+    "@types/bun": "^1.1.8",
     "@types/decompress": "^4.2.7",
     "@types/escape-html": "^1.0.4",
     "@types/express": "^4.17.21",
     "@types/js-yaml": "^4.0.9",
-    "@types/lodash": "^4.17.6",
+    "@types/lodash": "^4.17.7",
     "@types/lz4": "^0.6.4",
     "@types/lz4js": "^0.2.1",
     "@types/markdown-escape": "^1.1.3",
-    "@types/node": "^20.14.10",
+    "@types/node": "^20.16.3",
     "@types/parse-dds": "^1.0.3",
     "@types/pngjs": "^6.0.5",
     "@types/progress": "^2.0.7",
-    "@types/react": "^18.3.3",
+    "@types/react": "^18.3.5",
-    "@vanilla-extract/next-plugin": "^2.4.3",
+    "@vanilla-extract/next-plugin": "^2.4.5",
-    "compare-versions": "^6.1.0",
+    "compare-versions": "^6.1.1",
     "crc": "^4.3.2",
-    "fast-xml-parser": "^4.4.0",
+    "fast-xml-parser": "^4.4.1",
     "knip": "^3.13.2",
-    "prettier": "^3.3.2",
+    "prettier": "^3.3.3",
-    "prisma": "^5.16.2",
+    "prisma": "^5.19.1",
     "typescript": "^5.5.4"
   },
   "packageManager": "[email protected]",

scripts/buildAssets/flags.ts

@@ -1,4 +1,4 @@
-import { readdir, writeFile } from 'fs/promises';
+import { readdir } from 'fs/promises';
 import sharp from 'sharp';
 import { readBase64DVPL } from '../../src/core/blitz/readBase64DVPL';
 import { readDVPLFile } from '../../src/core/blitz/readDVPLFile';
@@ -71,8 +71,6 @@ export async function flags() {
           ).toString('base64');
           const name = flag.match(/flag_filter_(.+)@2x\.packed\.webp/)![1];
 
-          writeFile(`temp/icons/${name}.webp`, content, { encoding: 'base64' });
-
           return {
             content,
             encoding: 'base64',

scripts/buildAssets/index.ts

@@ -27,6 +27,8 @@ import { tankModels } from './tankModels';
 if (!targets && !allTargets) throw new Error('No target(s) specified');
 
 const methods = [
+  tankModels,
+  tankArmors,
   gameModeBanners,
   definitions,
   tankIcons,
@@ -39,8 +41,6 @@ const methods = [
   consumableProvisionIcons,
   camouflageIcons,
   boosterIcons,
-  tankModels,
-  tankArmors,
 ];
 
 for (const method of methods) {