diff --git a/package.json b/package.json index 7be0e091b0..8444e6d16d 100644 --- a/package.json +++ b/package.json @@ -70,13 +70,8 @@ "@electron-toolkit/utils": "^3.0.0", "@electron/notarize": "^2.5.0", "@langchain/community": "^0.3.36", - "@mozilla/readability": "^0.6.0", - "@notionhq/client": "^2.2.15", - "@shikijs/markdown-it": "^3.2.2", "@strongtz/win32-arm64-msvc": "^0.4.7", - "@tryfabric/martian": "^1.2.4", "@types/react-infinite-scroll-component": "^5.0.0", - "@xyflow/react": "^12.4.4", "adm-zip": "^0.5.16", "archiver": "^7.0.1", "async-mutex": "^0.5.0", @@ -125,8 +120,10 @@ "@hello-pangea/dnd": "^16.6.0", "@kangfenmao/keyv-storage": "^0.1.0", "@modelcontextprotocol/sdk": "^1.10.2", + "@mozilla/readability": "^0.6.0", "@notionhq/client": "^2.2.15", "@reduxjs/toolkit": "^2.2.5", + "@shikijs/markdown-it": "^3.2.2", "@swc/plugin-styled-components": "^7.1.3", "@tavily/core": "patch:@tavily/core@npm%3A0.3.1#~/.yarn/patches/@tavily-core-npm-0.3.1-fe69bf2bea.patch", "@tryfabric/martian": "^1.2.4", @@ -146,6 +143,7 @@ "@vitejs/plugin-react-swc": "^3.9.0", "@vitest/coverage-v8": "^3.1.1", "@vitest/ui": "^3.1.1", + "@xyflow/react": "^12.4.4", "antd": "^5.22.5", "applescript": "^1.0.0", "axios": "^1.7.3", @@ -199,7 +197,7 @@ "remark-math": "^6.0.0", "rollup-plugin-visualizer": "^5.12.0", "sass": "^1.77.2", - "shiki": "^3.2.1", + "shiki": "^3.2.2", "string-width": "^7.2.0", "styled-components": "^6.1.11", "tiny-pinyin": "^1.3.2", @@ -218,7 +216,8 @@ "libsql@npm:^0.4.4": "patch:libsql@npm%3A0.4.7#~/.yarn/patches/libsql-npm-0.4.7-444e260fb1.patch", "openai@npm:^4.77.0": "patch:openai@npm%3A4.87.3#~/.yarn/patches/openai-npm-4.87.3-2b30a7685f.patch", "pkce-challenge@npm:^4.1.0": "patch:pkce-challenge@npm%3A4.1.0#~/.yarn/patches/pkce-challenge-npm-4.1.0-fbc51695a3.patch", - "app-builder-lib@npm:26.0.13": "patch:app-builder-lib@npm%3A26.0.13#~/.yarn/patches/app-builder-lib-npm-26.0.13-a064c9e1d0.patch" + "app-builder-lib@npm:26.0.13": "patch:app-builder-lib@npm%3A26.0.13#~/.yarn/patches/app-builder-lib-npm-26.0.13-a064c9e1d0.patch", + "shiki": "3.2.2" }, "packageManager": "yarn@4.6.0", "lint-staged": { diff --git a/packages/shared/IpcChannel.ts b/packages/shared/IpcChannel.ts index 413b5b7cf4..8a7c12a6fb 100644 --- a/packages/shared/IpcChannel.ts +++ b/packages/shared/IpcChannel.ts @@ -159,5 +159,5 @@ export enum IpcChannel { // Search Window SearchWindow_Open = 'search-window:open', SearchWindow_Close = 'search-window:close', - SearchWindow_OpenUrl = 'search-window:open-url', + SearchWindow_OpenUrl = 'search-window:open-url' } diff --git a/src/main/index.ts b/src/main/index.ts index 8c0b47a096..7285b1b5e2 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -110,4 +110,3 @@ if (!app.requestSingleInstanceLock()) { // In this file you can include the rest of your app"s specific main process // code. You can also put them in separate files and require them here. } - diff --git a/src/renderer/src/assets/styles/ant.scss b/src/renderer/src/assets/styles/ant.scss index 4853d9031e..3bbaa516b9 100644 --- a/src/renderer/src/assets/styles/ant.scss +++ b/src/renderer/src/assets/styles/ant.scss @@ -16,6 +16,10 @@ outline: none; } +.ant-tabs-tab-btn { + outline: none; +} + .ant-segmented-group { gap: 4px; } diff --git a/src/renderer/src/utils/shiki.ts b/src/renderer/src/utils/shiki.ts index f25a1d48b6..ec2b662ae7 100644 --- a/src/renderer/src/utils/shiki.ts +++ b/src/renderer/src/utils/shiki.ts @@ -10,6 +10,7 @@ const defaultOptions = { }, defaultColor: 'light' } + const initHighlighter = async (options: MarkdownItShikiOptions) => { const themeNames = ('themes' in options ? Object.values(options.themes) : [options.theme]).filter( Boolean diff --git a/yarn.lock b/yarn.lock index 37c28b9aee..defe4e1697 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4428,7 +4428,7 @@ __metadata: remark-math: "npm:^6.0.0" rollup-plugin-visualizer: "npm:^5.12.0" sass: "npm:^1.77.2" - shiki: "npm:^3.2.1" + shiki: "npm:^3.2.2" string-width: "npm:^7.2.0" styled-components: "npm:^6.1.11" tar: "npm:^7.4.3" @@ -15569,7 +15569,7 @@ __metadata: languageName: node linkType: hard -"shiki@npm:3.2.2, shiki@npm:^3.2.1": +"shiki@npm:3.2.2": version: 3.2.2 resolution: "shiki@npm:3.2.2" dependencies: