Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-07-27 18:12:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into ckeditor5-alignment

Browse Source
This commit is contained in:
SiriusXT 2025-06-10 09:07:21 +08:00
commit 17ff0e8afc
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/client/src/widgets/type_widgets/ckeditor/config.ts
View File

@ -250,7 +250,7 @@ export function buildFloatingToolbar() {
{ {
label: "Insert", label: "Insert",
icon: "plus", icon: "plus",
items: ["bookmark", "internallink", "includeNote", "|", "math", "mermaid", "horizontalLine", "pageBreak", "dateTime"] items: ["link", "bookmark", "internallink", "includeNote", "|", "math", "mermaid", "horizontalLine", "pageBreak", "dateTime"]
}, },
"|", "|",
"alignment", "alignment",

6
apps/desktop/package.json
View File

@ -165,21 +165,21 @@
"build", "build",
"rebuild-deps" "rebuild-deps"
], ],
"command": "pnpm -C apps/desktop exec cross-env NODE_INSTALLER=npm electron-forge make dist" "command": "pnpm -C apps/desktop exec cross-env NODE_INSTALLER=npm NODE_OPTIONS=\"--max-old-space-size=4096\" electron-forge make dist"
}, },
"electron-forge:package": { "electron-forge:package": {
"dependsOn": [ "dependsOn": [
"build", "build",
"rebuild-deps" "rebuild-deps"
], ],
"command": "pnpm -C apps/desktop exec cross-env NODE_INSTALLER=npm electron-forge package dist" "command": "pnpm -C apps/desktop exec cross-env NODE_INSTALLER=npm NODE_OPTIONS=\"--max-old-space-size=4096\" electron-forge package dist"
}, },
"electron-forge:start": { "electron-forge:start": {
"dependsOn": [ "dependsOn": [
"build", "build",
"rebuild-deps" "rebuild-deps"
], ],
"command": "pnpm -C apps/desktop exec cross-env NODE_INSTALLER=npm TRILIUM_DATA_DIR=./data electron-forge start dist" "command": "pnpm -C apps/desktop exec cross-env NODE_INSTALLER=npm NODE_OPTIONS=\"--max-old-space-size=4096\" TRILIUM_DATA_DIR=./data electron-forge start dist"
} }
} }
} }

2
package.json
View File

@ -83,7 +83,7 @@
"axios": "^1.6.0", "axios": "^1.6.0",
"express": "^5.0.0" "express": "^5.0.0"
}, },
"packageManager": "pnpm@10.11.1+sha512.e519b9f7639869dc8d5c3c5dfef73b3f091094b0a006d7317353c72b124e80e1afd429732e28705ad6bfa1ee879c1fce46c128ccebd3192101f43dd67c667912", "packageManager": "pnpm@10.12.1+sha512.f0dda8580f0ee9481c5c79a1d927b9164f2c478e90992ad268bbb2465a736984391d6333d2c327913578b2804af33474ca554ba29c04a8b13060a717675ae3ac",
"pnpm": { "pnpm": {
"patchedDependencies": { "patchedDependencies": {
"@ckeditor/ckeditor5-mention": "patches/@ckeditor__ckeditor5-mention.patch", "@ckeditor/ckeditor5-mention": "patches/@ckeditor__ckeditor5-mention.patch",