gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-21 15:49:00 +02:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/TriliumNext/trilium

Browse Source
This commit is contained in:
Elian Doran 2025-07-19 14:24:12 +03:00
commit 2c730d1f0b
No known key found for this signature in database
5 changed files with 1177 additions and 958 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_regroup/package.json
View File

@ -38,7 +38,7 @@
"@playwright/test": "1.54.1", "@playwright/test": "1.54.1",
"@stylistic/eslint-plugin": "5.2.0", "@stylistic/eslint-plugin": "5.2.0",
"@types/express": "5.0.3", "@types/express": "5.0.3",
"@types/node": "22.16.4", "@types/node": "22.16.5",
"@types/yargs": "17.0.33", "@types/yargs": "17.0.33",
"@vitest/coverage-v8": "3.2.4", "@vitest/coverage-v8": "3.2.4",
"eslint": "9.31.0", "eslint": "9.31.0",

2
apps/client/package.json
View File

@ -46,7 +46,7 @@
"leaflet": "1.9.4", "leaflet": "1.9.4",
"leaflet-gpx": "2.2.0", "leaflet-gpx": "2.2.0",
"mark.js": "8.11.1", "mark.js": "8.11.1",
"marked": "16.1.0", "marked": "16.1.1",
"mermaid": "11.9.0", "mermaid": "11.9.0",
"mind-elixir": "5.0.2", "mind-elixir": "5.0.2",
"normalize.css": "8.0.1", "normalize.css": "8.0.1",

2
apps/server/package.json
View File

@ -83,7 +83,7 @@
"jimp": "1.6.0", "jimp": "1.6.0",
"js-yaml": "4.1.0", "js-yaml": "4.1.0",
"jsdom": "26.1.0", "jsdom": "26.1.0",
"marked": "16.1.0", "marked": "16.1.1",
"mime-types": "3.0.1", "mime-types": "3.0.1",
"multer": "2.0.2", "multer": "2.0.2",
"normalize-strings": "1.1.1", "normalize-strings": "1.1.1",

24
package.json
View File

@ -27,20 +27,20 @@
"private": true, "private": true,
"devDependencies": { "devDependencies": {
"@electron/rebuild": "4.0.1", "@electron/rebuild": "4.0.1",
"@nx/devkit": "21.2.4", "@nx/devkit": "21.3.0",
"@nx/esbuild": "21.2.4", "@nx/esbuild": "21.3.0",
"@nx/eslint": "21.2.4", "@nx/eslint": "21.3.0",
"@nx/eslint-plugin": "21.2.4", "@nx/eslint-plugin": "21.3.0",
"@nx/express": "21.2.4", "@nx/express": "21.3.0",
"@nx/js": "21.2.4", "@nx/js": "21.3.0",
"@nx/node": "21.2.4", "@nx/node": "21.3.0",
"@nx/playwright": "21.2.4", "@nx/playwright": "21.3.0",
"@nx/vite": "21.2.4", "@nx/vite": "21.3.0",
"@nx/web": "21.2.4", "@nx/web": "21.3.0",
"@playwright/test": "^1.36.0", "@playwright/test": "^1.36.0",
"@triliumnext/server": "workspace:*", "@triliumnext/server": "workspace:*",
"@types/express": "^5.0.0", "@types/express": "^5.0.0",
"@types/node": "22.16.4", "@types/node": "22.16.5",
"@vitest/coverage-v8": "^3.0.5", "@vitest/coverage-v8": "^3.0.5",
"@vitest/ui": "^3.0.0", "@vitest/ui": "^3.0.0",
"chalk": "5.4.1", "chalk": "5.4.1",
@ -54,7 +54,7 @@
"jiti": "2.4.2", "jiti": "2.4.2",
"jsdom": "~26.1.0", "jsdom": "~26.1.0",
"jsonc-eslint-parser": "^2.1.0", "jsonc-eslint-parser": "^2.1.0",
"nx": "21.2.4", "nx": "21.3.0",
"react-refresh": "^0.17.0", "react-refresh": "^0.17.0",
"rollup-plugin-webpack-stats": "2.1.0", "rollup-plugin-webpack-stats": "2.1.0",
"tslib": "^2.3.0", "tslib": "^2.3.0",

2105
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff