diff --git a/electron-builder.yml b/electron-builder.yml
index 8effe102..37a7460c 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -15,11 +15,18 @@ files:
- '!packages'
- '!stats.html'
- '!*.md'
+ - '!**/*.{map,ts,tsx,jsx,less,scss,sass,css.d.ts,d.cts,d.mts,md,markdown,yaml,yml}'
+ - '!**/{test,tests,__tests__,coverage}/**'
+ - '!**/*.{spec,test}.{js,jsx,ts,tsx}'
+ - '!**/*.min.*.map'
+ - '!**/*.d.ts'
+ - '!**/{.DS_Store,Thumbs.db}'
+ - '!**/{LICENSE,LICENSE.txt,LICENSE-MIT.txt,*.LICENSE.txt,NOTICE.txt,README.md,CHANGELOG.md}'
- '!node_modules/rollup-plugin-visualizer'
- '!node_modules/js-tiktoken'
- - '!node_modules/node_modules/pdf-parse/lib/pdf.js/v1.9.426'
- - '!node_modules/node_modules/pdf-parse/lib/pdf.js/v1.10.88'
- - '!node_modules/node_modules/pdf-parse/lib/pdf.js/v2.0.550'
+ - '!node_modules/pdf-parse/lib/pdf.js/{v1.9.426,v1.10.88,v2.0.550}'
+ - '!node_modules/mammoth/{mammoth.browser.js,mammoth.browser.min.js}'
+ - '!node_modules/html2canvas/dist/{html2canvas.min.js,html2canvas.esm.js}'
asarUnpack:
- resources/**
@@ -70,7 +77,8 @@ publish:
url: https://cherrystudio.ocool.online
electronDownload:
mirror: https://npmmirror.com/mirrors/electron/
-afterSign: scripts/notarize.js
+afterPack: scripts/removeLocales.js
+# afterSign: scripts/notarize.js
releaseInfo:
releaseNotes: |
增加小程序快捷入口
diff --git a/electron.vite.config.ts b/electron.vite.config.ts
index a3f21270..9dc98420 100644
--- a/electron.vite.config.ts
+++ b/electron.vite.config.ts
@@ -35,7 +35,8 @@ export default defineConfig({
build: {
rollupOptions: {
external: ['@libsql/client']
- }
+ },
+ minify: true
}
},
preload: {
@@ -51,6 +52,9 @@ export default defineConfig({
},
optimizeDeps: {
exclude: ['chunk-7UIZINC5.js', 'chunk-7OJJKI46.js']
+ },
+ build: {
+ minify: true
}
}
})
diff --git a/package.json b/package.json
index f44aba2f..156c56e4 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,6 @@
"@llm-tools/embedjs-openai": "^0.1.25",
"@types/react-infinite-scroll-component": "^5.0.0",
"adm-zip": "^0.5.16",
- "apache-arrow": "^18.0.0",
"docx": "^9.0.2",
"electron-log": "^5.1.5",
"electron-store": "^8.2.0",
diff --git a/scripts/removeLocales.js b/scripts/removeLocales.js
new file mode 100644
index 00000000..1dc0b3cc
--- /dev/null
+++ b/scripts/removeLocales.js
@@ -0,0 +1,58 @@
+const fs = require('fs')
+const path = require('path')
+
+exports.default = async function (context) {
+ const platform = context.packager.platform.name
+
+ // 根据平台确定 locales 目录位置
+ let resourceDirs = []
+ if (platform === 'mac') {
+ // macOS 的语言文件位置
+ resourceDirs = [
+ path.join(context.appOutDir, 'Cherry Studio.app', 'Contents', 'Resources'),
+ path.join(
+ context.appOutDir,
+ 'Cherry Studio.app',
+ 'Contents',
+ 'Frameworks',
+ 'Electron Framework.framework',
+ 'Resources'
+ )
+ ]
+ } else {
+ // Windows 和 Linux 的语言文件位置
+ resourceDirs = [path.join(context.appOutDir, 'locales')]
+ }
+
+ // 处理每个资源目录
+ for (const resourceDir of resourceDirs) {
+ if (!fs.existsSync(resourceDir)) {
+ console.log(`Resource directory not found: ${resourceDir}, skipping...`)
+ continue
+ }
+
+ // 读取所有文件和目录
+ const items = fs.readdirSync(resourceDir)
+
+ // 遍历并删除不需要的语言文件
+ for (const item of items) {
+ if (platform === 'mac') {
+ // 在 macOS 上检查 .lproj 目录
+ if (item.endsWith('.lproj') && !item.match(/^(en|zh|ru)/)) {
+ const dirPath = path.join(resourceDir, item)
+ fs.rmSync(dirPath, { recursive: true, force: true })
+ console.log(`Removed locale directory: ${item} from ${resourceDir}`)
+ }
+ } else {
+ // 其他平台处理 .pak 文件
+ if (!item.match(/^(en|zh|ru)/)) {
+ const filePath = path.join(resourceDir, item)
+ fs.unlinkSync(filePath)
+ console.log(`Removed locale file: ${item} from ${resourceDir}`)
+ }
+ }
+ }
+ }
+
+ console.log('Locale cleanup completed!')
+}
diff --git a/src/renderer/src/assets/images/logo.png b/src/renderer/src/assets/images/logo.png
index 0cae841a..ab6c968a 100644
Binary files a/src/renderer/src/assets/images/logo.png and b/src/renderer/src/assets/images/logo.png differ
diff --git a/src/renderer/src/assets/images/logo/cherry-hr.svg b/src/renderer/src/assets/images/logo/cherry-hr.svg
deleted file mode 100644
index 4dad25f2..00000000
--- a/src/renderer/src/assets/images/logo/cherry-hr.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
\ No newline at end of file
diff --git a/src/renderer/src/assets/images/logo/cherry-text.svg b/src/renderer/src/assets/images/logo/cherry-text.svg
deleted file mode 100644
index 80939f5d..00000000
--- a/src/renderer/src/assets/images/logo/cherry-text.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
\ No newline at end of file
diff --git a/src/renderer/src/assets/images/models/bigcode.webp b/src/renderer/src/assets/images/models/bigcode.webp
new file mode 100644
index 00000000..1f761feb
Binary files /dev/null and b/src/renderer/src/assets/images/models/bigcode.webp differ
diff --git a/src/renderer/src/assets/images/models/bigcode_dark.webp b/src/renderer/src/assets/images/models/bigcode_dark.webp
new file mode 100644
index 00000000..9ca73e59
Binary files /dev/null and b/src/renderer/src/assets/images/models/bigcode_dark.webp differ
diff --git a/src/renderer/src/config/models.ts b/src/renderer/src/config/models.ts
index 652f8163..f00e4683 100644
--- a/src/renderer/src/config/models.ts
+++ b/src/renderer/src/config/models.ts
@@ -10,8 +10,8 @@ import AisingaporeModelLogo from '@renderer/assets/images/models/aisingapore.png
import AisingaporeModelLogoDark from '@renderer/assets/images/models/aisingapore_dark.png'
import BaichuanModelLogo from '@renderer/assets/images/models/baichuan.png'
import BaichuanModelLogoDark from '@renderer/assets/images/models/baichuan_dark.png'
-import BigcodeModelLogo from '@renderer/assets/images/models/bigcode.png'
-import BigcodeModelLogoDark from '@renderer/assets/images/models/bigcode_dark.png'
+import BigcodeModelLogo from '@renderer/assets/images/models/bigcode.webp'
+import BigcodeModelLogoDark from '@renderer/assets/images/models/bigcode_dark.webp'
import ChatGLMModelLogo from '@renderer/assets/images/models/chatglm.png'
import ChatGLMModelLogoDark from '@renderer/assets/images/models/chatglm_dark.png'
import ChatGptModelLogo from '@renderer/assets/images/models/chatgpt.jpeg'
diff --git a/src/renderer/src/providers/BaseProvider.ts b/src/renderer/src/providers/BaseProvider.ts
index d750de97..df68fb7c 100644
--- a/src/renderer/src/providers/BaseProvider.ts
+++ b/src/renderer/src/providers/BaseProvider.ts
@@ -106,7 +106,7 @@ export default abstract class BaseProvider {
return {
id: index,
content: item.pageContent,
- url: sourceUrl,
+ url: encodeURIComponent(sourceUrl),
type: baseItem?.type
}
})
diff --git a/yarn.lock b/yarn.lock
index 6ef7ac04..015b39cb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2102,15 +2102,6 @@ __metadata:
languageName: node
linkType: hard
-"@swc/helpers@npm:^0.5.11":
- version: 0.5.15
- resolution: "@swc/helpers@npm:0.5.15"
- dependencies:
- tslib: "npm:^2.8.0"
- checksum: 10c0/33002f74f6f885f04c132960835fdfc474186983ea567606db62e86acd0680ca82f34647e8e610f4e1e422d1c16fce729dde22cd3b797ab1fd9061a825dabca4
- languageName: node
- linkType: hard
-
"@szmarczak/http-timer@npm:^4.0.5":
version: 4.0.6
resolution: "@szmarczak/http-timer@npm:4.0.6"
@@ -2221,20 +2212,6 @@ __metadata:
languageName: node
linkType: hard
-"@types/command-line-args@npm:^5.2.3":
- version: 5.2.3
- resolution: "@types/command-line-args@npm:5.2.3"
- checksum: 10c0/3a9bc58fd26e546391f6369dd28c03d59349dc4ac39eada1a5c39cc3578e02e4aac222615170e0db79b198ffba2af84fdbdda46e08c6edc4da42bc17ea85200f
- languageName: node
- linkType: hard
-
-"@types/command-line-usage@npm:^5.0.4":
- version: 5.0.4
- resolution: "@types/command-line-usage@npm:5.0.4"
- checksum: 10c0/67840ebf4bcfee200c07d978669ad596fe2adc350fd5c19d44ec2248623575d96ec917f513d1d59453f8f57e879133861a4cc41c20045c07f6c959f1fcaac7ad
- languageName: node
- linkType: hard
-
"@types/debug@npm:^4.0.0, @types/debug@npm:^4.1.6":
version: 4.1.12
resolution: "@types/debug@npm:4.1.12"
@@ -2443,15 +2420,6 @@ __metadata:
languageName: node
linkType: hard
-"@types/node@npm:^20.13.0":
- version: 20.17.8
- resolution: "@types/node@npm:20.17.8"
- dependencies:
- undici-types: "npm:~6.19.2"
- checksum: 10c0/d68bbd9f8946a56d3f405e2dbfcc98d1d7a3cdbaa45d0a8fea2865e63ecdf3a2c9a0e992d9ea1658651909273026d341047e593596e133e842374371e04031c3
- languageName: node
- linkType: hard
-
"@types/node@npm:^20.9.0":
version: 20.17.10
resolution: "@types/node@npm:20.17.10"
@@ -2794,7 +2762,6 @@ __metadata:
"@vitejs/plugin-react": "npm:^4.2.1"
adm-zip: "npm:^0.5.16"
antd: "npm:^5.18.3"
- apache-arrow: "npm:^18.0.0"
axios: "npm:^1.7.3"
browser-image-compression: "npm:^2.0.2"
dayjs: "npm:^1.11.11"
@@ -3122,25 +3089,6 @@ __metadata:
languageName: node
linkType: hard
-"apache-arrow@npm:^18.0.0":
- version: 18.0.0
- resolution: "apache-arrow@npm:18.0.0"
- dependencies:
- "@swc/helpers": "npm:^0.5.11"
- "@types/command-line-args": "npm:^5.2.3"
- "@types/command-line-usage": "npm:^5.0.4"
- "@types/node": "npm:^20.13.0"
- command-line-args: "npm:^5.2.1"
- command-line-usage: "npm:^7.0.1"
- flatbuffers: "npm:^24.3.25"
- json-bignum: "npm:^0.0.3"
- tslib: "npm:^2.6.2"
- bin:
- arrow2csv: bin/arrow2csv.js
- checksum: 10c0/037c3c390b4917e6fe7a594f275b07485068697a46ca8b0ec043b1ceac9be91ac615106f8912d20a574fc28b255253f4eae8c700749881c1afebb4bea39217da
- languageName: node
- linkType: hard
-
"app-builder-bin@npm:4.0.0":
version: 4.0.0
resolution: "app-builder-bin@npm:4.0.0"
@@ -3231,20 +3179,6 @@ __metadata:
languageName: node
linkType: hard
-"array-back@npm:^3.0.1, array-back@npm:^3.1.0":
- version: 3.1.0
- resolution: "array-back@npm:3.1.0"
- checksum: 10c0/bb1fe86aa8b39c21e73c68c7abf8b05ed939b8951a3b17527217f6a2a84e00e4cfa4fdec823081689c5e216709bf1f214a4f5feeee6726eaff83897fa1a7b8ee
- languageName: node
- linkType: hard
-
-"array-back@npm:^6.2.2":
- version: 6.2.2
- resolution: "array-back@npm:6.2.2"
- checksum: 10c0/c98a6e43b669400f58e2fba478336d5d02aac970566ffae3af0cb9b5585ec3811a1e010c76e34fb809a9762e6822a43a9c9a1b99f2a35f43b11a9e198e782818
- languageName: node
- linkType: hard
-
"array-buffer-byte-length@npm:^1.0.1":
version: 1.0.1
resolution: "array-buffer-byte-length@npm:1.0.1"
@@ -3918,15 +3852,6 @@ __metadata:
languageName: node
linkType: hard
-"chalk-template@npm:^0.4.0":
- version: 0.4.0
- resolution: "chalk-template@npm:0.4.0"
- dependencies:
- chalk: "npm:^4.1.2"
- checksum: 10c0/6a4cb4252966475f0bd3ee1cd8780146e1ba69f445e59c565cab891ac18708c8143515d23e2b0fb7e192574fb7608d429ea5b28f3b7b9507770ad6fccd3467e3
- languageName: node
- linkType: hard
-
"chalk@npm:2.4.2, chalk@npm:^2.4.2":
version: 2.4.2
resolution: "chalk@npm:2.4.2"
@@ -4149,30 +4074,6 @@ __metadata:
languageName: node
linkType: hard
-"command-line-args@npm:^5.2.1":
- version: 5.2.1
- resolution: "command-line-args@npm:5.2.1"
- dependencies:
- array-back: "npm:^3.1.0"
- find-replace: "npm:^3.0.0"
- lodash.camelcase: "npm:^4.3.0"
- typical: "npm:^4.0.0"
- checksum: 10c0/a4f6a23a1e420441bd1e44dee24efd12d2e49af7efe6e21eb32fca4e843ca3d5501ddebad86a4e9d99aa626dd6dcb64c04a43695388be54e3a803dbc326cc89f
- languageName: node
- linkType: hard
-
-"command-line-usage@npm:^7.0.1":
- version: 7.0.3
- resolution: "command-line-usage@npm:7.0.3"
- dependencies:
- array-back: "npm:^6.2.2"
- chalk-template: "npm:^0.4.0"
- table-layout: "npm:^4.1.0"
- typical: "npm:^7.1.1"
- checksum: 10c0/444a3e3c6fcbdcb5802de0fd2864ea5aef83eeeb3a825fd24846b996503d4b4140e75aeb2939b3430a06407f3acc02b76b3e08dafb3a3092d22fdcced0ecb0b0
- languageName: node
- linkType: hard
-
"commander@npm:9.2.0":
version: 9.2.0
resolution: "commander@npm:9.2.0"
@@ -5987,15 +5888,6 @@ __metadata:
languageName: node
linkType: hard
-"find-replace@npm:^3.0.0":
- version: 3.0.0
- resolution: "find-replace@npm:3.0.0"
- dependencies:
- array-back: "npm:^3.0.1"
- checksum: 10c0/fcd1bf7960388c8193c2861bcdc760c18ac14edb4bde062a961915d9a25727b2e8aabf0229e90cc09c753fd557e5a3e5ae61e49cadbe727be89a9e8e49ce7668
- languageName: node
- linkType: hard
-
"find-up@npm:^1.0.0":
version: 1.1.2
resolution: "find-up@npm:1.1.2"
@@ -6036,13 +5928,6 @@ __metadata:
languageName: node
linkType: hard
-"flatbuffers@npm:^24.3.25":
- version: 24.3.25
- resolution: "flatbuffers@npm:24.3.25"
- checksum: 10c0/a40a1d46f6d474f1299091970700f36dc5bd86616b71cd99a1b6f521ca33b05f5d7623bd0ffadaa1e10fc63d6663aa3f9595f4916cd379e80c15787257e17a61
- languageName: node
- linkType: hard
-
"flatted@npm:^3.2.9":
version: 3.3.1
resolution: "flatted@npm:3.3.1"
@@ -7832,13 +7717,6 @@ __metadata:
languageName: node
linkType: hard
-"json-bignum@npm:^0.0.3":
- version: 0.0.3
- resolution: "json-bignum@npm:0.0.3"
- checksum: 10c0/f9f9312d57a68f72676802fa087da4ed60241d73b6cc0e3fb9f587ca0de7364efb62612a14414ccfbedc0b77ce3c320adca21834a5673c99eb3375aef9f561db
- languageName: node
- linkType: hard
-
"json-buffer@npm:3.0.1":
version: 3.0.1
resolution: "json-buffer@npm:3.0.1"
@@ -8252,13 +8130,6 @@ __metadata:
languageName: node
linkType: hard
-"lodash.camelcase@npm:^4.3.0":
- version: 4.3.0
- resolution: "lodash.camelcase@npm:4.3.0"
- checksum: 10c0/fcba15d21a458076dd309fce6b1b4bf611d84a0ec252cb92447c948c533ac250b95d2e00955801ebc367e5af5ed288b996d75d37d2035260a937008e14eaf432
- languageName: node
- linkType: hard
-
"lodash.escaperegexp@npm:^4.1.2":
version: 4.1.2
resolution: "lodash.escaperegexp@npm:4.1.2"
@@ -12914,16 +12785,6 @@ __metadata:
languageName: node
linkType: hard
-"table-layout@npm:^4.1.0":
- version: 4.1.1
- resolution: "table-layout@npm:4.1.1"
- dependencies:
- array-back: "npm:^6.2.2"
- wordwrapjs: "npm:^5.1.0"
- checksum: 10c0/26d8e54a55ddb4de447c8f02a8d7fcbb66a9580375e406a3bc7717ab223a413f6dfbded6710f288b3dfd277991813a0bd5a17419a0dc6db54d9a36d883d868dc
- languageName: node
- linkType: hard
-
"tar-fs@npm:^2.0.0":
version: 2.1.1
resolution: "tar-fs@npm:2.1.1"
@@ -13233,13 +13094,6 @@ __metadata:
languageName: node
linkType: hard
-"tslib@npm:^2.8.0":
- version: 2.8.1
- resolution: "tslib@npm:2.8.1"
- checksum: 10c0/9c4759110a19c53f992d9aae23aac5ced636e99887b51b9e61def52611732872ff7668757d4e4c61f19691e36f4da981cd9485e869b4a7408d689f6bf1f14e62
- languageName: node
- linkType: hard
-
"tunnel-agent@npm:^0.6.0":
version: 0.6.0
resolution: "tunnel-agent@npm:0.6.0"
@@ -13365,20 +13219,6 @@ __metadata:
languageName: node
linkType: hard
-"typical@npm:^4.0.0":
- version: 4.0.0
- resolution: "typical@npm:4.0.0"
- checksum: 10c0/f300b198fb9fe743859b75ec761d53c382723dc178bbce4957d9cb754f2878a44ce17dc0b6a5156c52be1065449271f63754ba594dac225b80ce3aa39f9241ed
- languageName: node
- linkType: hard
-
-"typical@npm:^7.1.1":
- version: 7.3.0
- resolution: "typical@npm:7.3.0"
- checksum: 10c0/bee697a88e1dd0447bc1cf7f6e875eaa2b0fb2cccb338b7b261e315f7df84a66402864bfc326d6b3117c50475afd1d49eda03d846a6299ad25f211035bfab3b1
- languageName: node
- linkType: hard
-
"uc.micro@npm:^2.0.0, uc.micro@npm:^2.1.0":
version: 2.1.0
resolution: "uc.micro@npm:2.1.0"
@@ -14056,13 +13896,6 @@ __metadata:
languageName: node
linkType: hard
-"wordwrapjs@npm:^5.1.0":
- version: 5.1.0
- resolution: "wordwrapjs@npm:5.1.0"
- checksum: 10c0/e147162f139eb8c05257729fde586f5422a2d242aa8f027b5fa5adead1b571b455d0690a15c73aeaa31c93ba96864caa06d84ebdb2c32a0890602ab86a7568d1
- languageName: node
- linkType: hard
-
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0, wrap-ansi@npm:^7.0.0":
version: 7.0.0
resolution: "wrap-ansi@npm:7.0.0"