Skip to content
This repository was archived by the owner on Jun 24, 2025. It is now read-only.

Commit 6bfc78e

Browse files
committed
Merge branch 'develop' of https://github.com/jshprentz/TriliumNextNotes into develop
2 parents cc97ec3 + f2e4dad commit 6bfc78e

File tree

78 files changed

+3084
-959
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+3084
-959
lines changed

.env

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939

4040
- uses: nrwl/nx-set-shas@v4
4141
- name: Check affected
42-
run: pnpm nx affected --verbose -t typecheck build rebuild-deps
42+
run: pnpm nx affected --verbose -t typecheck build rebuild-deps test-build
4343

4444
test_dev:
4545
name: Test development

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,4 @@ upload
5252
*.tsbuildinfo
5353

5454
/result
55+
.svelte-kit

.nxignore

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
11
_regroup
2-
_regroup_monorepo
3-
4-
# Asset copying respects .gitignore / .nxignore for some reason.
5-
# See https://github.com/nrwl/nx/issues/20309
6-
!dist
7-
!node_modules
2+
_regroup_monorepo

.vscode/extensions.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
"redhat.vscode-yaml",
1010
"tobermory.es6-string-html",
1111
"vitest.explorer",
12-
"yzhang.markdown-all-in-one"
12+
"yzhang.markdown-all-in-one",
13+
"svelte.svelte-vscode",
14+
"bradlc.vscode-tailwindcss"
1315
]
1416
}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ See [screenshots](https://triliumnext.github.io/Docs/Wiki/screenshot-tour) for q
2222
* Seamless [note versioning](https://triliumnext.github.io/Docs/Wiki/note-revisions)
2323
* Note [attributes](https://triliumnext.github.io/Docs/Wiki/attributes) can be used for note organization, querying and advanced [scripting](https://triliumnext.github.io/Docs/Wiki/scripts)
2424
* UI available in English, German, Spanish, French, Romanian, and Chinese (simplified and traditional)
25-
* Direct [OpenID and TOTP integration](.docs/User%20Guide/User%20Guide/Installation%20%26%20Setup/Server%20Installation/Multi-Factor%20Authentication.md") for more secure login
25+
* Direct [OpenID and TOTP integration](./docs/User%20Guide/User%20Guide/Installation%20%26%20Setup/Server%20Installation/Multi-Factor%20Authentication.md) for more secure login
2626
* [Synchronization](https://triliumnext.github.io/Docs/Wiki/synchronization) with self-hosted sync server
2727
* there's a [3rd party service for hosting synchronisation server](https://trilium.cc/paid-hosting)
2828
* [Sharing](https://triliumnext.github.io/Docs/Wiki/sharing) (publishing) notes to public internet

_regroup/eslint.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ export default tseslint.config(
4444
"dist/*",
4545
"docs/*",
4646
"demo/*",
47-
"libraries/*",
4847
"src/public/app-dist/*",
4948
"src/public/app/doc_notes/*"
5049
]

_regroup/eslint.format.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ export default [
3838
"dist/*",
3939
"docs/*",
4040
"demo/*",
41-
"libraries/*",
4241
// TriliumNextTODO: check if we want to format packages here as well - for now skipping it
4342
"packages/*",
4443
"src/public/app-dist/*",

_regroup/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"@types/node": "22.15.31",
4242
"@types/yargs": "17.0.33",
4343
"@vitest/coverage-v8": "3.2.3",
44-
"eslint": "9.28.0",
44+
"eslint": "9.29.0",
4545
"eslint-plugin-simple-import-sort": "12.1.1",
4646
"esm": "3.2.25",
4747
"jsdoc": "4.0.4",

apps/client/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@triliumnext/client",
3-
"version": "0.94.1",
3+
"version": "0.95.0",
44
"description": "JQuery-based client for TriliumNext, used for both web and desktop (via Electron)",
55
"private": true,
66
"license": "AGPL-3.0-only",
@@ -10,7 +10,7 @@
1010
"url": "https://github.com/TriliumNext/Notes"
1111
},
1212
"dependencies": {
13-
"@eslint/js": "9.28.0",
13+
"@eslint/js": "9.29.0",
1414
"@excalidraw/excalidraw": "0.18.0",
1515
"@fullcalendar/core": "6.1.17",
1616
"@fullcalendar/daygrid": "6.1.17",
@@ -66,7 +66,7 @@
6666
"copy-webpack-plugin": "13.0.0",
6767
"happy-dom": "18.0.1",
6868
"script-loader": "0.7.2",
69-
"vite-plugin-static-copy": "3.0.0"
69+
"vite-plugin-static-copy": "3.0.2"
7070
},
7171
"nx": {
7272
"name": "client",

0 commit comments

Comments
 (0)