diff --git a/.yarnrc.yml b/.yarnrc.yml index 789b4263..aa0c646f 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -1,3 +1,2 @@ nodeLinker: node-modules httpTimeout: 300000 -nmHoistingLimits: workspaces diff --git a/electron-builder.yml b/electron-builder.yml index 47d75023..01e7808b 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -11,15 +11,6 @@ files: - '!{tsconfig.json,tsconfig.node.json,tsconfig.web.json}' asarUnpack: - resources/** -extraResources: - - from: './ollama/bin' - to: 'ollama/bin' - filter: - - 'ollama-${os}.zip' - - from: './ollama/models' - to: 'ollama/models' - filter: - - '**/*' win: executableName: Cherry Studio nsis: diff --git a/package.json b/package.json index 99481802..544dcdd0 100644 --- a/package.json +++ b/package.json @@ -9,9 +9,6 @@ "workspaces": { "packages": [ "ollama" - ], - "nohoist": [ - "ollama" ] }, "scripts": { @@ -61,7 +58,7 @@ "browser-image-compression": "^2.0.2", "dayjs": "^1.11.11", "dotenv-cli": "^7.4.2", - "electron": "^28.2.0", + "electron": "^28.3.3", "electron-builder": "^24.9.1", "electron-vite": "^2.0.0", "emittery": "^1.0.3", diff --git a/src/main/utils/upgrade.ts b/src/main/utils/upgrade.ts index f876ede8..8febb8de 100644 --- a/src/main/utils/upgrade.ts +++ b/src/main/utils/upgrade.ts @@ -8,7 +8,7 @@ export async function updateUserDataPath() { const currentPath = app.getPath('userData') const oldPath = currentPath.replace('CherryStudio', 'cherry-studio') - if (fs.existsSync(oldPath)) { + if (currentPath !== oldPath && fs.existsSync(oldPath)) { Logger.log('Update userData path') try { diff --git a/yarn.lock b/yarn.lock index 7a3d9859..f3b0368d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2641,7 +2641,7 @@ __metadata: browser-image-compression: "npm:^2.0.2" dayjs: "npm:^1.11.11" dotenv-cli: "npm:^7.4.2" - electron: "npm:^28.2.0" + electron: "npm:^28.3.3" electron-builder: "npm:^24.9.1" electron-devtools-installer: "npm:^3.2.0" electron-log: "npm:^5.1.5" @@ -2687,6 +2687,28 @@ __metadata: languageName: unknown linkType: soft +"SevenAI@workspace:ollama": + version: 0.0.0-use.local + resolution: "SevenAI@workspace:ollama" + dependencies: + "@electron-toolkit/preload": "npm:^3.0.0" + "@electron-toolkit/utils": "npm:^3.0.0" + "@sentry/electron": "npm:^5.2.0" + "@types/adm-zip": "npm:^0" + adm-zip: "npm:^0.5.15" + dotenv-cli: "npm:^7.4.2" + electron: "npm:^28.3.3" + electron-builder: "npm:^24.9.1" + electron-devtools-installer: "npm:^3.2.0" + electron-log: "npm:^5.1.5" + electron-store: "npm:^8.2.0" + electron-updater: "npm:^6.1.7" + electron-vite: "npm:^2.0.0" + electron-window-state: "npm:^5.0.3" + eslint-plugin-simple-import-sort: "npm:^12.1.1" + languageName: unknown + linkType: soft + "abbrev@npm:^2.0.0": version: 2.0.0 resolution: "abbrev@npm:2.0.0" @@ -4249,16 +4271,16 @@ __metadata: languageName: node linkType: hard -"electron@npm:^28.2.0": - version: 28.3.1 - resolution: "electron@npm:28.3.1" +"electron@npm:^28.3.3": + version: 28.3.3 + resolution: "electron@npm:28.3.3" dependencies: "@electron/get": "npm:^2.0.0" "@types/node": "npm:^18.11.18" extract-zip: "npm:^2.0.1" bin: electron: cli.js - checksum: 10c0/afd9fffbb4010784ac295965fa12e22700dca76e2c0ce64247f90442a9bb88ba7ccc3ee582c87edb2cab27048e5241c14309cd032f83782ec0bcd57e98f76169 + checksum: 10c0/e9ff47ed18379f9bdefc49e34f676eb83dde118de83d27e9e98760d02d41dd118b90d854d983831ccf7b8b4fe311966d8c95e43f52b4fb7089a84863e4373e10 languageName: node linkType: hard @@ -7735,15 +7757,6 @@ __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"