Skip to content

Fix #1297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Feb 25, 2025
Merged

Fix #1297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
916f999
update yarn
an-lee Jan 22, 2025
11a3bd8
fix dep
an-lee Feb 24, 2025
41eae57
upgrade deps
an-lee Feb 24, 2025
cc64c67
fix document config save
an-lee Feb 24, 2025
f43b48a
fix #1293
an-lee Feb 24, 2025
fce71fd
support long recording assessment
an-lee Feb 25, 2025
24297b8
fix bugsnag
an-lee Feb 25, 2025
7276395
fix style
an-lee Feb 25, 2025
60caccd
fix #1288
an-lee Feb 25, 2025
afabb4d
fix bugsnag config
an-lee Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
574 changes: 287 additions & 287 deletions .yarn/releases/yarn-4.5.3.cjs → .yarn/releases/yarn-4.6.0.cjs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ nmHoistingLimits: workspaces

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.5.3.cjs
yarnPath: .yarn/releases/yarn-4.6.0.cjs
6 changes: 3 additions & 3 deletions 1000-hours/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"markdown-it-sub": "^2.0.0",
"markdown-it-sup": "^2.0.0",
"mermaid": "^11.4.1",
"sass": "^1.83.4",
"vitepress": "^1.5.0",
"sass": "^1.85.0",
"vitepress": "^1.6.3",
"vitepress-plugin-mermaid": "^2.0.17",
"vue": "^3.5.13"
},
Expand All @@ -21,6 +21,6 @@
},
"dependencies": {
"cheerio": "^1.0.0",
"swiper": "^11.2.1"
"swiper": "^11.2.4"
}
}
10 changes: 5 additions & 5 deletions 1000h-portal/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
"postinstall": "nuxt prepare"
},
"dependencies": {
"@nuxtjs/seo": "^2.0.3",
"nuxt": "^3.15.1",
"nuxt-og-image": "^4.0.3",
"@nuxtjs/seo": "^2.2.0",
"nuxt": "^3.15.4",
"nuxt-og-image": "^4.1.4",
"vue": "^3.5.13",
"vue-router": "^4.5.0"
},
"devDependencies": {
"autoprefixer": "^10.4.20",
"postcss": "^8.5.1",
"sass": "^1.83.4",
"postcss": "^8.5.3",
"sass": "^1.85.0",
"tailwindcss": "^3.4.17"
}
}
3 changes: 1 addition & 2 deletions enjoy/forge.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ import { VitePlugin } from "@electron-forge/plugin-vite";
import os from "os";
import { FusesPlugin } from "@electron-forge/plugin-fuses";
import { FuseV1Options, FuseVersion } from "@electron/fuses";
import { DependenciesPlugin } from "electron-forge-plugin-dependencies";
import pkg from "./package.json" assert { type: "json" };
import pkg from "./package.json" with { type: "json" };

const config = {
packagerConfig: {
Expand Down
146 changes: 74 additions & 72 deletions enjoy/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,62 +32,63 @@
"devDependencies": {
"@bugsnag/source-maps": "^2.3.3",
"@divisey/js-mdict": "^5.0.0",
"@electron-forge/cli": "^7.6.0",
"@electron-forge/maker-deb": "^7.6.0",
"@electron-forge/maker-dmg": "^7.6.0",
"@electron-forge/maker-rpm": "^7.6.0",
"@electron-forge/maker-squirrel": "^7.6.0",
"@electron-forge/maker-zip": "^7.6.0",
"@electron-forge/plugin-auto-unpack-natives": "^7.6.0",
"@electron-forge/plugin-fuses": "^7.6.0",
"@electron-forge/plugin-vite": "7.6.0",
"@electron-forge/publisher-github": "^7.6.0",
"@electron-forge/publisher-s3": "^7.6.0",
"@electron-forge/cli": "^7.7.0",
"@electron-forge/maker-deb": "^7.7.0",
"@electron-forge/maker-dmg": "^7.7.0",
"@electron-forge/maker-rpm": "^7.7.0",
"@electron-forge/maker-squirrel": "^7.7.0",
"@electron-forge/maker-zip": "^7.7.0",
"@electron-forge/plugin-auto-unpack-natives": "^7.7.0",
"@electron-forge/plugin-fuses": "^7.7.0",
"@electron-forge/plugin-vite": "7.7.0",
"@electron-forge/publisher-github": "^7.7.0",
"@electron-forge/publisher-s3": "^7.7.0",
"@electron/fuses": "^1.8.0",
"@hookform/resolvers": "^3.10.0",
"@langchain/community": "^0.3.24",
"@langchain/core": "^0.3.30",
"@langchain/ollama": "^0.1.4",
"@langchain/community": "^0.3.32",
"@langchain/core": "^0.3.40",
"@langchain/ollama": "^0.2.0",
"@mozilla/readability": "^0.5.0",
"@playwright/test": "^1.49.1",
"@radix-ui/react-accordion": "^1.2.2",
"@radix-ui/react-alert-dialog": "^1.1.4",
"@radix-ui/react-aspect-ratio": "^1.1.1",
"@radix-ui/react-avatar": "^1.1.2",
"@radix-ui/react-checkbox": "^1.1.3",
"@radix-ui/react-collapsible": "^1.1.2",
"@radix-ui/react-dropdown-menu": "^2.1.4",
"@radix-ui/react-hover-card": "^1.1.4",
"@playwright/test": "^1.50.1",
"@radix-ui/react-accordion": "^1.2.3",
"@radix-ui/react-alert-dialog": "^1.1.6",
"@radix-ui/react-aspect-ratio": "^1.1.2",
"@radix-ui/react-avatar": "^1.1.3",
"@radix-ui/react-checkbox": "^1.1.4",
"@radix-ui/react-collapsible": "^1.1.3",
"@radix-ui/react-dropdown-menu": "^2.1.6",
"@radix-ui/react-hover-card": "^1.1.6",
"@radix-ui/react-icons": "^1.3.2",
"@radix-ui/react-label": "^2.1.1",
"@radix-ui/react-menubar": "^1.1.4",
"@radix-ui/react-popover": "^1.1.4",
"@radix-ui/react-progress": "^1.1.1",
"@radix-ui/react-radio-group": "^1.2.2",
"@radix-ui/react-scroll-area": "^1.2.2",
"@radix-ui/react-select": "^2.1.4",
"@radix-ui/react-separator": "^1.1.1",
"@radix-ui/react-slider": "^1.2.2",
"@radix-ui/react-slot": "^1.1.1",
"@radix-ui/react-switch": "^1.1.2",
"@radix-ui/react-tabs": "^1.1.2",
"@radix-ui/react-toast": "^1.2.4",
"@radix-ui/react-toggle": "^1.1.1",
"@radix-ui/react-tooltip": "^1.1.6",
"@radix-ui/react-label": "^2.1.2",
"@radix-ui/react-menubar": "^1.1.6",
"@radix-ui/react-popover": "^1.1.6",
"@radix-ui/react-progress": "^1.1.2",
"@radix-ui/react-radio-group": "^1.2.3",
"@radix-ui/react-scroll-area": "^1.2.3",
"@radix-ui/react-select": "^2.1.6",
"@radix-ui/react-separator": "^1.1.2",
"@radix-ui/react-slider": "^1.2.3",
"@radix-ui/react-slot": "^1.1.2",
"@radix-ui/react-switch": "^1.1.3",
"@radix-ui/react-tabs": "^1.1.3",
"@radix-ui/react-toast": "^1.2.6",
"@radix-ui/react-toggle": "^1.1.2",
"@radix-ui/react-tooltip": "^1.1.8",
"@rails/actioncable": "8.0.100",
"@tailwindcss/typography": "^0.5.16",
"@types/ahoy.js": "^0.4.2",
"@types/autosize": "^4.0.3",
"@types/command-exists": "^1.2.3",
"@types/diff": "^7",
"@types/electron-squirrel-startup": "^1.0.2",
"@types/fluent-ffmpeg": "^2.1.27",
"@types/html-to-text": "^9.0.4",
"@types/intl-tel-input": "^18.1.4",
"@types/lodash": "^4.17.14",
"@types/lodash": "^4.17.15",
"@types/mark.js": "^8.11.12",
"@types/mime-types": "^2.1.4",
"@types/mustache": "^4.2.5",
"@types/node": "^22.10.6",
"@types/node": "^22.13.5",
"@types/prop-types": "^15.7.14",
"@types/rails__actioncable": "^6.1.11",
"@types/react": "^18.3.18",
Expand All @@ -97,8 +98,8 @@
"@types/unzipper": "^0.10.10",
"@types/validator": "^13.12.2",
"@types/wavesurfer.js": "^6.0.12",
"@typescript-eslint/eslint-plugin": "^8.20.0",
"@typescript-eslint/parser": "^8.20.0",
"@typescript-eslint/eslint-plugin": "^8.24.1",
"@typescript-eslint/parser": "^8.24.1",
"@uidotdev/usehooks": "^2.4.1",
"@vidstack/react": "^1.12.12",
"@vitejs/plugin-react": "^4.3.4",
Expand All @@ -108,72 +109,73 @@
"axios": "^1.7.9",
"camelcase": "^8.0.0",
"camelcase-keys": "^9.1.3",
"chart.js": "^4.4.7",
"chart.js": "^4.4.8",
"cheerio": "^1.0.0",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"cmdk": "^1.0.4",
"command-exists": "^1.2.9",
"compromise": "^14.14.3",
"compromise": "^14.14.4",
"compromise-paragraphs": "^0.1.0",
"compromise-stats": "^0.1.0",
"dayjs": "^1.11.13",
"decamelize": "^6.0.0",
"decamelize-keys": "^2.0.1",
"dependencies-tree": "^2.0.0",
"electron": "^34.0.0",
"electron-context-menu": "^4.0.4",
"diff": "^7.0.0",
"electron": "^34.2.0",
"electron-context-menu": "^4.0.5",
"electron-devtools-installer": "^4.0.0",
"electron-forge-plugin-dependencies": "^1.0.0",
"electron-log": "^5.2.4",
"electron-log": "^5.3.0",
"electron-playwright-helpers": "^1.7.1",
"electron-squirrel-startup": "^1.0.1",
"eslint": "^9.18.0",
"eslint-import-resolver-typescript": "^3.7.0",
"eslint": "^9.21.0",
"eslint-import-resolver-typescript": "^3.8.3",
"eslint-plugin-import": "^2.31.0",
"flora-colossus": "^2.0.0",
"foliate-js": "https://github.com/johnfactotum/foliate-js.git#commit=b5ae4c22c197ef70e12ead88277dde2856447634",
"foliate-js": "https://github.com/johnfactotum/foliate-js.git",
"html-to-text": "^9.0.5",
"https-proxy-agent": "^7.0.6",
"i18next": "^24.2.1",
"i18next": "^24.2.2",
"input-otp": "^1.4.2",
"intl-tel-input": "^25.2.1",
"intl-tel-input": "^25.3.0",
"js-md5": "^0.8.3",
"langchain": "^0.3.11",
"langchain": "^0.3.19",
"lodash": "^4.17.21",
"lru-cache": "^11.0.2",
"lucide-react": "^0.471.1",
"lucide-react": "^0.475.0",
"mark.js": "^8.11.1",
"media-captions": "^0.0.18",
"microsoft-cognitiveservices-speech-sdk": "^1.42.0",
"mime-types": "^2.1.35",
"mustache": "^4.2.0",
"next-themes": "^0.4.4",
"octokit": "^4.1.0",
"openai": "^4.78.1",
"octokit": "^4.1.2",
"openai": "^4.85.4",
"pitchfinder": "^2.3.2",
"postcss": "^8.5.1",
"postcss": "^8.5.3",
"progress": "^2.0.3",
"prop-types": "^15.8.1",
"proxy-agent": "^6.5.0",
"react": "^18.3.1",
"react-activity-calendar": "^2.7.7",
"react-activity-calendar": "^2.7.8",
"react-audio-visualize": "^1.2.0",
"react-audio-voice-recorder": "^2.2.0",
"react-dom": "^18.3.1",
"react-frame-component": "^5.2.7",
"react-hook-form": "^7.54.2",
"react-hotkeys-hook": "^4.6.1",
"react-i18next": "^15.4.0",
"react-markdown": "^9.0.3",
"react-i18next": "^15.4.1",
"react-markdown": "^9.1.0",
"react-resizable-panels": "^2.1.7",
"react-router-dom": "^7.1.1",
"react-router-dom": "^7.2.0",
"react-shadow-root": "^6.2.0",
"react-tooltip": "^5.28.0",
"remark-gfm": "^4.0.0",
"remark-gfm": "^4.0.1",
"rimraf": "^6.0.1",
"semver": "^7.6.3",
"sonner": "^1.7.1",
"semver": "^7.7.1",
"sonner": "^1.7.4",
"tailwind-merge": "^2.6.0",
"tailwind-scrollbar": "^3.1.0",
"tailwind-scrollbar-hide": "^2.0.0",
Expand All @@ -183,23 +185,23 @@
"tslib": "^2.8.1",
"turndown": "^7.2.0",
"typescript": "^5.7.3",
"vite": "^6.0.7",
"vite": "^6.1.1",
"vite-plugin-static-copy": "^2.2.0",
"wavesurfer.js": "^7.8.16",
"zod": "^3.24.1",
"zod-to-json-schema": "^3.24.1",
"zx": "^8.3.0"
"wavesurfer.js": "^7.9.1",
"zod": "^3.24.2",
"zod-to-json-schema": "^3.24.3",
"zx": "^8.3.2"
},
"dependencies": {
"@andrkrn/ffprobe-static": "^5.2.0",
"@bugsnag/electron": "^8.1.2",
"@bugsnag/plugin-react": "^8.1.1",
"@bugsnag/electron": "^8.2.0",
"@bugsnag/plugin-react": "^8.2.0",
"echogarden": "^1.8.7",
"electron-settings": "^4.0.4",
"ffmpeg-static": "^5.2.0",
"file-type": "^19.6.0",
"fluent-ffmpeg": "^2.1.3",
"fs-extra": "^11.2.0",
"fs-extra": "^11.3.0",
"reflect-metadata": "^0.2.2",
"sequelize": "^6.37.5",
"sequelize-typescript": "^2.1.6",
Expand Down
2 changes: 0 additions & 2 deletions enjoy/src/constants/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,6 @@ export const AGENT_FIXTURE_ANDREW = {
},
};

export const BUGSNAG_API_KEY = "828ee1de10c079a250be7fd05177662f";

export const MIME_TYPES: Record<string, string> = {
".mp3": "audio/mpeg",
".wav": "audio/wav",
Expand Down
3 changes: 2 additions & 1 deletion enjoy/src/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,5 +940,6 @@
"copyFullText": "Copy full text",
"checkingForUpdate": "Checking for update",
"updateAvailable": "Update available",
"quitAndInstall": "Quit and install"
"quitAndInstall": "Quit and install",
"pleaseSelect": "Please select"
}
3 changes: 2 additions & 1 deletion enjoy/src/i18n/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,5 +940,6 @@
"copyFullText": "复制全文",
"checkingForUpdate": "正在检查更新",
"updateAvailable": "有新版本",
"quitAndInstall": "退出并安装新版本"
"quitAndInstall": "退出并安装新版本",
"pleaseSelect": "请选择"
}
24 changes: 20 additions & 4 deletions enjoy/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,35 @@ import ElectronSquirrelStartup from "electron-squirrel-startup";
import contextMenu from "electron-context-menu";
import Bugsnag from "@bugsnag/electron";
import { t } from "i18next";
import { BUGSNAG_API_KEY } from "./constants";
import { Client } from "./api";

const logger = log.scope("main");

const initBugsnag = async () => {
if (!app.isPackaged) return;
const webApi = new Client({
baseUrl: settings.apiUrl(),
logger,
});
try {
const apiKey = await webApi.config("bugsnag_api_key");
if (!apiKey) return;

Bugsnag.start({ apiKey: apiKey.bugsnagApiKey });
} catch (err) {
logger.error(err);
}
};

app.commandLine.appendSwitch("enable-features", "SharedArrayBuffer");

if (app.isPackaged) {
Bugsnag.start({ apiKey: BUGSNAG_API_KEY });
} else {
if (!app.isPackaged) {
app.disableHardwareAcceleration();
app.commandLine.appendSwitch("disable-software-rasterizer");
}

initBugsnag();

// Add context menu
contextMenu({
showSearchWithGoogle: false,
Expand Down
7 changes: 1 addition & 6 deletions enjoy/src/main/db/models/video.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,7 @@ import {
UserSetting,
} from "@main/db/models";
import settings from "@main/settings";
import {
AudioFormats,
MIME_TYPES,
VideoFormats,
WEB_API_URL,
} from "@/constants";
import { AudioFormats, MIME_TYPES, VideoFormats } from "@/constants";
import { hashFile } from "@main/utils";
import path from "path";
import fs from "fs-extra";
Expand Down
2 changes: 1 addition & 1 deletion enjoy/src/main/window.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import decompresser from "./decompresser";
import { UserSetting } from "@main/db/models";
import { t } from "i18next";
import { format } from "util";
import pkg from "../../package.json" assert { type: "json" };
import pkg from "../../package.json" with { type: "json" };

const __dirname = import.meta.dirname;

Expand Down
Loading
Loading