upgrade forge

ZuodaoTech · Nov 28, 2024 · 436305f · 436305f
1 parent c8d0bf3
commit 436305f
Show file tree

Hide file tree

Showing 4 changed files with 291 additions and 280 deletions.
diff --git a/1000-hours/package.json b/1000-hours/package.json
@@ -8,7 +8,7 @@
     "markdown-it-mathjax3": "^4.3.2",
     "markdown-it-sub": "^2.0.0",
     "markdown-it-sup": "^2.0.0",
-    "mermaid": "^11.4.0",
+    "mermaid": "^11.4.1",
     "sass": "^1.81.0",
     "vitepress": "^1.5.0",
     "vitepress-plugin-mermaid": "^2.0.17",

diff --git a/enjoy/forge.config.js b/enjoy/forge.config.js
@@ -2,6 +2,8 @@ import { VitePlugin } from "@electron-forge/plugin-vite";
 import os from "os";
 import { FusesPlugin } from "@electron-forge/plugin-fuses";
 import { FuseV1Options, FuseVersion } from "@electron/fuses";
+import { DependenciesPlugin } from "electron-forge-plugin-dependencies";
+import pkg from "./package.json" assert { type: "json" };
 
 const config = {
   packagerConfig: {
@@ -70,10 +72,12 @@ const config = {
           // `entry` is just an alias for `build.lib.entry` in the corresponding file of `config`.
           entry: "src/main.ts",
           config: "vite.main.config.ts",
+          target: "main",
         },
         {
           entry: "src/preload.ts",
           config: "vite.preload.config.ts",
+          target: "preload",
         },
       ],
       renderer: [
@@ -98,6 +102,12 @@ const config = {
       [FuseV1Options.EnableEmbeddedAsarIntegrityValidation]: true,
       [FuseV1Options.OnlyLoadAppFromAsar]: false,
     }),
+    {
+      name: "electron-forge-plugin-dependencies",
+      config: {
+        dependencies: Object.keys(pkg.dependencies),
+      },
+    },
   ],
 };
 

diff --git a/enjoy/package.json b/enjoy/package.json
@@ -30,17 +30,17 @@
   "license": "MIT",
   "devDependencies": {
     "@divisey/js-mdict": "^5.0.0",
-    "@electron-forge/cli": "<7.5.0",
-    "@electron-forge/maker-deb": "<7.5.0",
-    "@electron-forge/maker-dmg": "<7.5.0",
-    "@electron-forge/maker-rpm": "<7.5.0",
-    "@electron-forge/maker-squirrel": "<7.5.0",
-    "@electron-forge/maker-zip": "<7.5.0",
-    "@electron-forge/plugin-auto-unpack-natives": "<7.5.0",
-    "@electron-forge/plugin-fuses": "<7.5.0",
-    "@electron-forge/plugin-vite": "<7.5.0",
-    "@electron-forge/publisher-github": "<7.5.0",
-    "@electron-forge/publisher-s3": "^7.5.0",
+    "@electron-forge/cli": "^7.6.0",
+    "@electron-forge/maker-deb": "^7.6.0",
+    "@electron-forge/maker-dmg": "^7.6.0",
+    "@electron-forge/maker-rpm": "^7.6.0",
+    "@electron-forge/maker-squirrel": "^7.6.0",
+    "@electron-forge/maker-zip": "^7.6.0",
+    "@electron-forge/plugin-auto-unpack-natives": "^7.6.0",
+    "@electron-forge/plugin-fuses": "^7.6.0",
+    "@electron-forge/plugin-vite": "7.6.0",
+    "@electron-forge/publisher-github": "^7.6.0",
+    "@electron-forge/publisher-s3": "^7.6.0",
     "@electron/fuses": "^1.8.0",
     "@hookform/resolvers": "^3.9.1",
     "@langchain/community": "^0.3.16",
@@ -99,7 +99,7 @@
     "@typescript-eslint/parser": "^8.16.0",
     "@uidotdev/usehooks": "^2.4.1",
     "@vidstack/react": "^1.12.12",
-    "@vitejs/plugin-react": "^4.3.3",
+    "@vitejs/plugin-react": "^4.3.4",
     "ahoy.js": "^0.4.4",
     "autoprefixer": "^10.4.20",
     "autosize": "^6.0.1",
@@ -118,9 +118,11 @@
     "dayjs": "^1.11.13",
     "decamelize": "^6.0.0",
     "decamelize-keys": "^2.0.1",
-    "electron": "^33.2.0",
+    "dependencies-tree": "^2.0.0",
+    "electron": "^33.2.1",
     "electron-context-menu": "^4.0.4",
     "electron-devtools-installer": "^3.2.0",
+    "electron-forge-plugin-dependencies": "^1.0.0",
     "electron-log": "^5.2.3",
     "electron-playwright-helpers": "^1.7.1",
     "electron-settings": "^4.0.4",
@@ -140,7 +142,7 @@
     "langchain": "^0.3.6",
     "lodash": "^4.17.21",
     "lru-cache": "^11.0.2",
-    "lucide-react": "^0.461.0",
+    "lucide-react": "^0.462.0",
     "mark.js": "^8.11.1",
     "media-captions": "^0.0.18",
     "microsoft-cognitiveservices-speech-sdk": "^1.41.0",
@@ -183,16 +185,16 @@
     "turndown": "^7.2.0",
     "typescript": "^5.7.2",
     "update-electron-app": "^3.0.0",
-    "vite": "^6.0.0",
-    "vite-plugin-static-copy": "^2.1.0",
+    "vite": "^6.0.1",
+    "vite-plugin-static-copy": "^2.2.0",
     "wavesurfer.js": "^7.8.9",
     "zod": "^3.23.8",
     "zod-to-json-schema": "^3.23.5",
     "zx": "^8.2.2"
   },
   "dependencies": {
     "@andrkrn/ffprobe-static": "^5.2.0",
-    "echogarden": "<2.0",
+    "echogarden": "^1.8.7",
     "ffmpeg-static": "^5.2.0",
     "file-type": "^19.6.0",
     "fluent-ffmpeg": "^2.1.3",