mirror of
https://github.com/CherryHQ/cherry-studio.git
synced 2026-01-08 14:29:15 +08:00
2a31fa2ad5
* refactor: switch workflows from yarn to pnpm
Replace Yarn usage with pnpm in CI workflows to standardize package
management and leverage pnpm's store/cache behavior.
- Use pnpm/action-setup to install pnpm (v) instead of enabling corepack
and preparing Yarn.
- Retrieve pnpm store path and update cache actions to cache the pnpm
store and use pnpm-lock.yaml for cache keys and restores.
- Replace yarn commands with pnpm equivalents across workflows:
install, i18n:sync/translate, format, build:* and tsx invocation.
- Avoid committing lockfile changes by resetting pnpm-lock.yaml instead
of yarn.lock when checking for changes.
- Update install flags: use pnpm install --frozen-lockfile / --install
semantics where appropriate.
These changes unify dependency tooling, improve caching correctness,
and ensure CI uses pnpm-specific lockfile and cache paths.
* build: switch pre-commit hook to pnpm lint-staged
Update .husky/pre-commit to run pnpm lint-staged instead of yarn.
This aligns the pre-commit hook with the project's package manager
and ensures lint-staged runs using pnpm's environment and caching.
* chore(ci): remove pinned pnpm version from GH Action steps
Remove the explicit `with: version: 9` lines from multiple GitHub Actions workflows
(auto-i18n.yml, nightly-build.yml, pr-ci.yml, update-app-upgrade-config.yml,
sync-to-gitcode.yml, release.yml). The workflows still call `pnpm/action-setup@v4`
but no longer hardcode a pnpm version.
This simplifies maintenance and allows the action to resolve an appropriate pnpm
version (or use its default) without needing updates whenever the pinned
version becomes outdated. It reduces churn when bumping pnpm across CI configs
and prevents accidental pin drift between workflow files.
* build: Update pnpm to 10.27.0 and add onlyBuiltDependencies config
* Update @cherrystudio/openai to 6.15.0 and consolidate overrides
* Add @langchain/core to overrides
* Add override for openai-compatible 1.0.27
* build: optimize pnpm config and add missing dependencies
- Comment out shamefully-hoist in .npmrc for better pnpm compatibility
- Add React-related packages to optimizeDeps in electron.vite.config.ts
- Add missing peer dependencies and packages that were previously hoisted
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
* build: refine pnpm configuration and dependency management
- Simplify .npmrc to only essential electron mirror config
- Move platform-specific dependencies to devDependencies
- Pin sharp version to 0.34.3 for consistency
- Update sharp-libvips versions to 1.2.4
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
* reduce app size
* format
* build: remove unnecessary disableOxcRecommendation option from react plugin configuration
* docs: Replace yarn commands with pnpm in documentation and scripts
* Revert "build: optimize pnpm config and add missing dependencies"
This reverts commit acffad31f8.
* build: import dependencies from yarn.lock
* build: Add some phantom dependencies and reorganize dependencies
* build: Keep consistent by removing types of semver
It's not in the previous package.json
* build: Add some phantom dependencies
Keep same version with yarn.lock
* build: Add form-data dependency version 4.0.4
* Add chalk dependency
* build: downgrade some dependencies
Reference: .yarn-state-copy.yml. These phantom dependencies should use top-level package of that version in node_modules
* build: Add phantom dependencies
* build: pin tiptap dependencies to exact versions
Ensure consistent dependency resolution by removing caret ranges and pinning all @tiptap packages to exact version 3.2.0
* chore: pin embedjs dependencies to exact versions
* build: pin @modelcontextprotocol/sdk to exact version 1.23.0
Remove caret from version specifier to prevent automatic upgrades and ensure consistent dependencies
* chore: update @types/node dependency to 22.17.2
Update package.json and pnpm-lock.yaml to use @types/node version 22.17.2 instead of 22.19.3 to maintain consistency across dependencies
* build: move some dependencies to dev deps and pin dependency versions to exact numbers
Remove caret (^) from version ranges to ensure consistent dependency resolution across environments
* chore: move dependencies from prod to dev and update lockfile
Move @ant-design/icons, chalk, form-data, and open from dependencies to devDependencies
Update pnpm-lock.yaml to reflect dependency changes
* build: update package dependencies
- Add new dependencies: md5, @libsql/win32-x64-msvc, @strongtz/win32-arm64-msvc, bonjour-service, emoji-picker-element-data, gray-matter, js-yaml
- Remove redundant dependencies from devDependencies
* build: add cors, katex and pako dependencies
add new dependencies to support cross-origin requests, mathematical notation rendering and data compression
* move some js deps to dev deps
* test: update snapshot tests for Spinner and InputEmbeddingDimension
* chore: exclude .zed directory from biome formatting
* Update @ai-sdk/openai-compatible patch hash
* chore: update @kangfenmao/keyv-storage to version 0.1.3 in package.json and pnpm-lock.yaml
---------
Co-authored-by: icarus <eurfelux@gmail.com>
Co-authored-by: beyondkmp <beyondkmp@gmail.com>
Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>
Co-authored-by: kangfenmao <kangfenmao@qq.com>
69 lines
2.7 KiB
Diff
69 lines
2.7 KiB
Diff
diff --git a/dist/utils/tiktoken.cjs b/dist/utils/tiktoken.cjs
|
|
index c5b41f121d2e3d24c3a4969e31fa1acffdcad3b9..ec724489dcae79ee6c61acf2d4d84bd19daef036 100644
|
|
--- a/dist/utils/tiktoken.cjs
|
|
+++ b/dist/utils/tiktoken.cjs
|
|
@@ -1,6 +1,5 @@
|
|
const require_rolldown_runtime = require('../_virtual/rolldown_runtime.cjs');
|
|
const require_utils_async_caller = require('./async_caller.cjs');
|
|
-const js_tiktoken_lite = require_rolldown_runtime.__toESM(require("js-tiktoken/lite"));
|
|
|
|
//#region src/utils/tiktoken.ts
|
|
var tiktoken_exports = {};
|
|
@@ -11,14 +10,10 @@ require_rolldown_runtime.__export(tiktoken_exports, {
|
|
const cache = {};
|
|
const caller = /* @__PURE__ */ new require_utils_async_caller.AsyncCaller({});
|
|
async function getEncoding(encoding) {
|
|
- if (!(encoding in cache)) cache[encoding] = caller.fetch(`https://tiktoken.pages.dev/js/${encoding}.json`).then((res) => res.json()).then((data) => new js_tiktoken_lite.Tiktoken(data)).catch((e) => {
|
|
- delete cache[encoding];
|
|
- throw e;
|
|
- });
|
|
- return await cache[encoding];
|
|
+ throw new Error("TikToken Not implemented");
|
|
}
|
|
async function encodingForModel(model) {
|
|
- return getEncoding((0, js_tiktoken_lite.getEncodingNameForModel)(model));
|
|
+ throw new Error("TikToken Not implemented");
|
|
}
|
|
|
|
//#endregion
|
|
diff --git a/dist/utils/tiktoken.js b/dist/utils/tiktoken.js
|
|
index 641acca03cb92f04a6fa5c9c31f1880ce635572e..707389970ad957aa0ff20ef37fa8dd2875be737c 100644
|
|
--- a/dist/utils/tiktoken.js
|
|
+++ b/dist/utils/tiktoken.js
|
|
@@ -1,6 +1,5 @@
|
|
import { __export } from "../_virtual/rolldown_runtime.js";
|
|
import { AsyncCaller } from "./async_caller.js";
|
|
-import { Tiktoken, getEncodingNameForModel } from "js-tiktoken/lite";
|
|
|
|
//#region src/utils/tiktoken.ts
|
|
var tiktoken_exports = {};
|
|
@@ -11,14 +10,10 @@ __export(tiktoken_exports, {
|
|
const cache = {};
|
|
const caller = /* @__PURE__ */ new AsyncCaller({});
|
|
async function getEncoding(encoding) {
|
|
- if (!(encoding in cache)) cache[encoding] = caller.fetch(`https://tiktoken.pages.dev/js/${encoding}.json`).then((res) => res.json()).then((data) => new Tiktoken(data)).catch((e) => {
|
|
- delete cache[encoding];
|
|
- throw e;
|
|
- });
|
|
- return await cache[encoding];
|
|
+ throw new Error("TikToken Not implemented");
|
|
}
|
|
async function encodingForModel(model) {
|
|
- return getEncoding(getEncodingNameForModel(model));
|
|
+ throw new Error("TikToken Not implemented");
|
|
}
|
|
|
|
//#endregion
|
|
diff --git a/package.json b/package.json
|
|
index a24f8fc61de58526051999260f2ebee5f136354b..e885359e8966e7730c51772533ce37e01edb3046 100644
|
|
--- a/package.json
|
|
+++ b/package.json
|
|
@@ -20,7 +20,6 @@
|
|
"ansi-styles": "^5.0.0",
|
|
"camelcase": "6",
|
|
"decamelize": "1.2.0",
|
|
- "js-tiktoken": "^1.0.12",
|
|
"langsmith": "^0.3.64",
|
|
"mustache": "^4.2.0",
|
|
"p-queue": "^6.6.2",
|