From b98f7298a2a60f793feeccdb75cf1302addd1fb0 Mon Sep 17 00:00:00 2001
From: kangfenmao <kangfenmao@qq.com>
Date: Sun, 25 Aug 2024 22:12:31 +0800
Subject: [PATCH] build: add yarn workspace config

---
 electron.vite.config.ts |  7 ++++++-
 package.json            | 10 ++++++++--
 tsconfig.node.json      |  1 +
 yarn.lock               | 11 +++++++++--
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/electron.vite.config.ts b/electron.vite.config.ts
index 4caf9ce3..337b9b2c 100644
--- a/electron.vite.config.ts
+++ b/electron.vite.config.ts
@@ -4,7 +4,12 @@ import { resolve } from 'path'
 
 export default defineConfig({
   main: {
-    plugins: [externalizeDepsPlugin()]
+    plugins: [externalizeDepsPlugin()],
+    resolve: {
+      alias: {
+        ollama: resolve('ollama/src')
+      }
+    }
   },
   preload: {
     plugins: [externalizeDepsPlugin()]
diff --git a/package.json b/package.json
index 7af4e1d4..99481802 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,14 @@
   "main": "./out/main/index.js",
   "author": "kangfenmao@qq.com",
   "homepage": "https://github.com/kangfenmao/cherry-studio",
+  "workspaces": {
+    "packages": [
+      "ollama"
+    ],
+    "nohoist": [
+      "ollama"
+    ]
+  },
   "scripts": {
     "format": "prettier --write .",
     "lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix",
@@ -27,7 +35,6 @@
     "@electron-toolkit/preload": "^3.0.0",
     "@electron-toolkit/utils": "^3.0.0",
     "@sentry/electron": "^5.2.0",
-    "adm-zip": "^0.5.15",
     "electron-devtools-installer": "^3.2.0",
     "electron-log": "^5.1.5",
     "electron-store": "^8.2.0",
@@ -44,7 +51,6 @@
     "@hello-pangea/dnd": "^16.6.0",
     "@kangfenmao/keyv-storage": "^0.1.0",
     "@reduxjs/toolkit": "^2.2.5",
-    "@types/adm-zip": "^0",
     "@types/lodash": "^4.17.5",
     "@types/node": "^18.19.9",
     "@types/react": "^18.2.48",
diff --git a/tsconfig.node.json b/tsconfig.node.json
index 52b576ca..04c642a5 100644
--- a/tsconfig.node.json
+++ b/tsconfig.node.json
@@ -4,6 +4,7 @@
     "electron.vite.config.*",
     "src/main/**/*",
     "src/preload/**/*",
+    "src/ollma/**/*",
     "src/main/env.d.ts"
   ],
   "compilerOptions": {
diff --git a/yarn.lock b/yarn.lock
index 7ae53862..7a3d9859 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2631,13 +2631,11 @@ __metadata:
     "@kangfenmao/keyv-storage": "npm:^0.1.0"
     "@reduxjs/toolkit": "npm:^2.2.5"
     "@sentry/electron": "npm:^5.2.0"
-    "@types/adm-zip": "npm:^0"
     "@types/lodash": "npm:^4.17.5"
     "@types/node": "npm:^18.19.9"
     "@types/react": "npm:^18.2.48"
     "@types/react-dom": "npm:^18.2.18"
     "@vitejs/plugin-react": "npm:^4.2.1"
-    adm-zip: "npm:^0.5.15"
     antd: "npm:^5.18.3"
     axios: "npm:^1.7.3"
     browser-image-compression: "npm:^2.0.2"
@@ -7737,6 +7735,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ollama@workspace:ollama":
+  version: 0.0.0-use.local
+  resolution: "ollama@workspace:ollama"
+  dependencies:
+    "@types/adm-zip": "npm:^0"
+    adm-zip: "npm:^0.5.15"
+  languageName: unknown
+  linkType: soft
+
 "once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.4.0":
   version: 1.4.0
   resolution: "once@npm:1.4.0"