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 remote-tracking branch 'origin/develop' into feature/share_theme

Browse Source 
; Conflicts:
;	pnpm-lock.yaml
This commit is contained in:
Elian Doran 2025-06-10 08:58:20 +03:00
commit 9d347ecf74
No known key found for this signature in database
12 changed files with 426 additions and 275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_regroup/package.json
View File

@ -40,7 +40,7 @@
"@types/express": "5.0.3", "@types/express": "5.0.3",
"@types/node": "22.15.30", "@types/node": "22.15.30",
"@types/yargs": "17.0.33", "@types/yargs": "17.0.33",
"@vitest/coverage-v8": "3.2.2", "@vitest/coverage-v8": "3.2.3",
"eslint": "9.28.0", "eslint": "9.28.0",
"eslint-plugin-simple-import-sort": "12.1.1", "eslint-plugin-simple-import-sort": "12.1.1",
"esm": "3.2.25", "esm": "3.2.25",

2
apps/client/package.json
View File

@ -64,7 +64,7 @@
"@types/leaflet": "1.9.18", "@types/leaflet": "1.9.18",
"@types/leaflet-gpx": "1.3.7", "@types/leaflet-gpx": "1.3.7",
"@types/mark.js": "8.11.12", "@types/mark.js": "8.11.12",
"@types/react": "19.1.6", "@types/react": "19.1.7",
"@types/react-dom": "19.1.6", "@types/react-dom": "19.1.6",
"copy-webpack-plugin": "13.0.0", "copy-webpack-plugin": "13.0.0",
"happy-dom": "17.6.3", "happy-dom": "17.6.3",

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

@ -246,7 +246,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"]
}, },
"|", "|",
"outdent", "outdent",

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"
} }
} }
} }

4
apps/server/package.json
View File

@ -49,7 +49,7 @@
"axios": "1.9.0", "axios": "1.9.0",
"bindings": "1.5.0", "bindings": "1.5.0",
"chardet": "2.1.0", "chardet": "2.1.0",
"cheerio": "1.0.0", "cheerio": "1.1.0",
"chokidar": "4.0.3", "chokidar": "4.0.3",
"cls-hooked": "4.2.2", "cls-hooked": "4.2.2",
"compression": "1.8.0", "compression": "1.8.0",
@ -88,7 +88,7 @@
"multer": "2.0.1", "multer": "2.0.1",
"normalize-strings": "1.1.1", "normalize-strings": "1.1.1",
"ollama": "0.5.16", "ollama": "0.5.16",
"openai": "5.1.1", "openai": "5.2.0",
"rand-token": "1.0.1", "rand-token": "1.0.1",
"safe-compare": "1.1.4", "safe-compare": "1.1.4",
"sanitize-filename": "1.6.3", "sanitize-filename": "1.6.3",

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",

2
packages/ckeditor5-admonition/package.json
View File

@ -35,7 +35,7 @@
"@ckeditor/ckeditor5-dev-build-tools": "43.0.1", "@ckeditor/ckeditor5-dev-build-tools": "43.0.1",
"@ckeditor/ckeditor5-inspector": ">=4.1.0", "@ckeditor/ckeditor5-inspector": ">=4.1.0",
"@ckeditor/ckeditor5-package-tools": "^4.0.0", "@ckeditor/ckeditor5-package-tools": "^4.0.0",
"@typescript-eslint/eslint-plugin": "~8.33.0", "@typescript-eslint/eslint-plugin": "~8.34.0",
"@typescript-eslint/parser": "^8.0.0", "@typescript-eslint/parser": "^8.0.0",
"@vitest/browser": "^3.0.5", "@vitest/browser": "^3.0.5",
"@vitest/coverage-istanbul": "^3.0.5", "@vitest/coverage-istanbul": "^3.0.5",

2
packages/ckeditor5-footnotes/package.json
View File

@ -36,7 +36,7 @@
"@ckeditor/ckeditor5-dev-build-tools": "43.0.1", "@ckeditor/ckeditor5-dev-build-tools": "43.0.1",
"@ckeditor/ckeditor5-inspector": ">=4.1.0", "@ckeditor/ckeditor5-inspector": ">=4.1.0",
"@ckeditor/ckeditor5-package-tools": "^4.0.0", "@ckeditor/ckeditor5-package-tools": "^4.0.0",
"@typescript-eslint/eslint-plugin": "~8.33.0", "@typescript-eslint/eslint-plugin": "~8.34.0",
"@typescript-eslint/parser": "^8.0.0", "@typescript-eslint/parser": "^8.0.0",
"@vitest/browser": "^3.0.5", "@vitest/browser": "^3.0.5",
"@vitest/coverage-istanbul": "^3.0.5", "@vitest/coverage-istanbul": "^3.0.5",

2
packages/ckeditor5-keyboard-marker/package.json
View File

@ -38,7 +38,7 @@
"@ckeditor/ckeditor5-dev-build-tools": "43.0.1", "@ckeditor/ckeditor5-dev-build-tools": "43.0.1",
"@ckeditor/ckeditor5-inspector": ">=4.1.0", "@ckeditor/ckeditor5-inspector": ">=4.1.0",
"@ckeditor/ckeditor5-package-tools": "^4.0.0", "@ckeditor/ckeditor5-package-tools": "^4.0.0",
"@typescript-eslint/eslint-plugin": "~8.33.0", "@typescript-eslint/eslint-plugin": "~8.34.0",
"@typescript-eslint/parser": "^8.0.0", "@typescript-eslint/parser": "^8.0.0",
"@vitest/browser": "^3.0.5", "@vitest/browser": "^3.0.5",
"@vitest/coverage-istanbul": "^3.0.5", "@vitest/coverage-istanbul": "^3.0.5",

2
packages/ckeditor5-math/package.json
View File

@ -39,7 +39,7 @@
"@ckeditor/ckeditor5-dev-utils": "43.0.1", "@ckeditor/ckeditor5-dev-utils": "43.0.1",
"@ckeditor/ckeditor5-inspector": ">=4.1.0", "@ckeditor/ckeditor5-inspector": ">=4.1.0",
"@ckeditor/ckeditor5-package-tools": "^4.0.0", "@ckeditor/ckeditor5-package-tools": "^4.0.0",
"@typescript-eslint/eslint-plugin": "~8.33.0", "@typescript-eslint/eslint-plugin": "~8.34.0",
"@typescript-eslint/parser": "^8.0.0", "@typescript-eslint/parser": "^8.0.0",
"@vitest/browser": "^3.0.5", "@vitest/browser": "^3.0.5",
"@vitest/coverage-istanbul": "^3.0.5", "@vitest/coverage-istanbul": "^3.0.5",

2
packages/ckeditor5-mermaid/package.json
View File

@ -38,7 +38,7 @@
"@ckeditor/ckeditor5-dev-build-tools": "43.0.1", "@ckeditor/ckeditor5-dev-build-tools": "43.0.1",
"@ckeditor/ckeditor5-inspector": ">=4.1.0", "@ckeditor/ckeditor5-inspector": ">=4.1.0",
"@ckeditor/ckeditor5-package-tools": "^4.0.0", "@ckeditor/ckeditor5-package-tools": "^4.0.0",
"@typescript-eslint/eslint-plugin": "~8.33.0", "@typescript-eslint/eslint-plugin": "~8.34.0",
"@typescript-eslint/parser": "^8.0.0", "@typescript-eslint/parser": "^8.0.0",
"@vitest/browser": "^3.0.5", "@vitest/browser": "^3.0.5",
"@vitest/coverage-istanbul": "^3.0.5", "@vitest/coverage-istanbul": "^3.0.5",

673
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff