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

Merge remote-tracking branch 'origin/main' into feat/tree-context-menu/relocate-duplicate-note-command

Browse Source
This commit is contained in:
Elian Doran 2025-07-12 18:41:58 +03:00
commit c8cca26ca4
No known key found for this signature in database
10 changed files with 1358 additions and 1072 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.github/workflows/checks.yml vendored Normal file
View File

@ -0,0 +1,17 @@
name: Checks
on:
push:
pull_request_target:
types: [synchronize]
jobs:
main:
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- name: Check if PRs have conflicts
uses: eps1lon/actions-label-merge-conflict@v3
with:
dirtyLabel: "merge-conflicts"
repoToken: "${{ secrets.GITHUB_TOKEN }}"

6
_regroup/package.json
View File

@ -35,13 +35,13 @@
"chore:generate-openapi": "tsx bin/generate-openapi.js"
},
"devDependencies": {
"@playwright/test": "1.53.2",
"@playwright/test": "1.54.1",
"@stylistic/eslint-plugin": "5.1.0",
"@types/express": "5.0.3",
"@types/node": "22.16.2",
"@types/node": "22.16.3",
"@types/yargs": "17.0.33",
"@vitest/coverage-v8": "3.2.4",
"eslint": "9.30.1",
"eslint": "9.31.0",
"eslint-plugin-simple-import-sort": "12.1.1",
"esm": "3.2.25",
"jsdoc": "4.0.4",

2
apps/client/package.json
View File

@ -10,7 +10,7 @@
"url": "https://github.com/TriliumNext/Notes"
},
"dependencies": {
"@eslint/js": "9.30.1",
"@eslint/js": "9.31.0",
"@excalidraw/excalidraw": "0.18.0",
"@fullcalendar/core": "6.1.18",
"@fullcalendar/daygrid": "6.1.18",

2
apps/desktop-e2e/package.json
View File

@ -18,7 +18,7 @@
}
},
"devDependencies": {
"dotenv": "17.1.0",
"dotenv": "17.2.0",
"electron": "37.2.0"
}
}

2
apps/server-e2e/package.json
View File

@ -17,6 +17,6 @@
}
},
"devDependencies": {
"dotenv": "17.1.0"
"dotenv": "17.2.0"
}
}

2
apps/server/package.json
View File

@ -88,7 +88,7 @@
"multer": "2.0.1",
"normalize-strings": "1.1.1",
"ollama": "0.5.16",
"openai": "5.8.3",
"openai": "5.9.0",
"rand-token": "1.0.1",
"safe-compare": "1.1.4",
"sanitize-filename": "1.6.3",

24
package.json
View File

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

2
packages/codemirror/package.json
View File

@ -62,6 +62,6 @@
"codemirror-lang-elixir": "4.0.0",
"codemirror-lang-hcl": "0.1.0",
"codemirror-lang-mermaid": "0.5.0",
"eslint-linter-browserify": "9.30.1"
"eslint-linter-browserify": "9.31.0"
}
}

2287
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff

84
renovate.json
View File

@ -1,39 +1,53 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["config:recommended"],
"schedule": ["before 3am"],
"labels": ["dependencies", "renovate"],
"prHourlyLimit": 0,
"prConcurrentLimit": 0,
"branchConcurrentLimit": 0,
"ignorePaths": [
"**/node_modules/**",
"apps/edit-docs/demo/**",
"apps/server/src/assets/doc_notes/**",
"docs/**"
],
"html": {
"enabled": false
},
"bun": {
"enabled": false
},
"packageRules": [
{
"matchPackageNames": "@fsegurai/codemirror-theme-**",
"groupName": "codemirror themes"
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended"
],
"schedule": [
"before 3am"
],
"labels": [
"dependencies",
"renovate"
],
"prHourlyLimit": 0,
"prConcurrentLimit": 0,
"branchConcurrentLimit": 0,
"ignorePaths": [
"**/node_modules/**",
"apps/edit-docs/demo/**",
"apps/server/src/assets/doc_notes/**",
"docs/**"
],
"html": {
"enabled": false
},
{
"matchPackageNames": "**-config-ckeditor5",
"groupName": "ckeditor5 config packages"
"bun": {
"enabled": false
},
{
"matchPackageNames": [
"@ckeditor/**",
"ckeditor5",
"ckeditor5-premium-features"
],
"groupName": "ckeditor monorepo"
}
]
"packageRules": [
{
"matchPackageNames": "@fsegurai/codemirror-theme-**",
"groupName": "codemirror themes"
},
{
"matchPackageNames": "**-config-ckeditor5",
"groupName": "ckeditor5 config packages"
},
{
"matchPackageNames": [
"@ckeditor/**",
"ckeditor5",
"ckeditor5-premium-features"
],
"groupName": "ckeditor monorepo"
},
{
"matchPackageNames": [
"@sveltejs/**",
"svelte"
],
"groupName": "svelte monorepo"
}
]
}