Skip to content

Commit 0c4b751

Browse files
authored
Merge branch 'main' into feat/snapshot-etapi-notes-too
2 parents 2950c5e + 6e37c9e commit 0c4b751

File tree

194 files changed

+14029
-11203
lines changed

Some content is hidden

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

194 files changed

+14029
-11203
lines changed

.github/actions/report-size/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ runs:
4444
steps:
4545
# Checkout branch to compare to [required]
4646
- name: Checkout base branch
47-
uses: actions/checkout@v4
47+
uses: actions/checkout@v5
4848
with:
4949
ref: ${{ inputs.branch }}
5050
path: br-base

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
5858
steps:
5959
- name: Checkout repository
60-
uses: actions/checkout@v4
60+
uses: actions/checkout@v5
6161

6262
# Add any setup steps before running the `github/codeql-action/init` action.
6363
# This includes steps like installing compilers or runtimes (`actions/setup-node`

.github/workflows/dev.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- name: Checkout the repository
27-
uses: actions/checkout@v4
27+
uses: actions/checkout@v5
2828
with:
2929
fetch-depth: 0 # needed for https://github.com/marketplace/actions/nx-set-shas
3030

@@ -48,7 +48,7 @@ jobs:
4848
- check-affected
4949
steps:
5050
- name: Checkout the repository
51-
uses: actions/checkout@v4
51+
uses: actions/checkout@v5
5252

5353
- uses: pnpm/action-setup@v4
5454
- name: Set up node & dependencies
@@ -68,7 +68,7 @@ jobs:
6868
- test_dev
6969
- check-affected
7070
steps:
71-
- uses: actions/checkout@v4
71+
- uses: actions/checkout@v5
7272
- uses: pnpm/action-setup@v4
7373
- name: Install dependencies
7474
run: pnpm install --frozen-lockfile
@@ -103,7 +103,7 @@ jobs:
103103
- dockerfile: Dockerfile
104104
steps:
105105
- name: Checkout the repository
106-
uses: actions/checkout@v4
106+
uses: actions/checkout@v5
107107

108108
- uses: pnpm/action-setup@v4
109109
- name: Install dependencies

.github/workflows/main-docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- dockerfile: Dockerfile
3333
steps:
3434
- name: Checkout the repository
35-
uses: actions/checkout@v4
35+
uses: actions/checkout@v5
3636

3737
- name: Set IMAGE_NAME to lowercase
3838
run: echo "IMAGE_NAME=${IMAGE_NAME,,}" >> $GITHUB_ENV
@@ -141,7 +141,7 @@ jobs:
141141
run: echo "TEST_TAG=${TEST_TAG,,}" >> $GITHUB_ENV
142142

143143
- name: Checkout repository
144-
uses: actions/checkout@v4
144+
uses: actions/checkout@v5
145145
- uses: pnpm/action-setup@v4
146146
- name: Set up node & dependencies
147147
uses: actions/setup-node@v4

.github/workflows/nightly.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ permissions:
2727

2828
jobs:
2929
nightly-electron:
30+
if: github.repository == 'TriliumNext/Trilium'
3031
name: Deploy nightly
3132
strategy:
3233
fail-fast: false
@@ -47,7 +48,7 @@ jobs:
4748
forge_platform: win32
4849
runs-on: ${{ matrix.os.image }}
4950
steps:
50-
- uses: actions/checkout@v4
51+
- uses: actions/checkout@v5
5152
- uses: pnpm/action-setup@v4
5253
- name: Set up node & dependencies
5354
uses: actions/setup-node@v4
@@ -96,6 +97,7 @@ jobs:
9697
path: apps/desktop/upload
9798

9899
nightly-server:
100+
if: github.repository == 'TriliumNext/Trilium'
99101
name: Deploy server nightly
100102
strategy:
101103
fail-fast: false
@@ -108,7 +110,7 @@ jobs:
108110
runs-on: ubuntu-24.04-arm
109111
runs-on: ${{ matrix.runs-on }}
110112
steps:
111-
- uses: actions/checkout@v4
113+
- uses: actions/checkout@v5
112114

113115
- name: Run the build
114116
uses: ./.github/actions/build-server

.github/workflows/playwright.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
main:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v5
1818
with:
1919
filter: tree:0
2020
fetch-depth: 0

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
forge_platform: win32
3333
runs-on: ${{ matrix.os.image }}
3434
steps:
35-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v5
3636
- uses: pnpm/action-setup@v4
3737
- name: Set up node & dependencies
3838
uses: actions/setup-node@v4
@@ -78,7 +78,7 @@ jobs:
7878
runs-on: ubuntu-24.04-arm
7979
runs-on: ${{ matrix.runs-on }}
8080
steps:
81-
- uses: actions/checkout@v4
81+
- uses: actions/checkout@v5
8282

8383
- name: Run the build
8484
uses: ./.github/actions/build-server
@@ -101,7 +101,7 @@ jobs:
101101
steps:
102102
- run: mkdir upload
103103

104-
- uses: actions/checkout@v4
104+
- uses: actions/checkout@v5
105105
with:
106106
sparse-checkout: |
107107
docs/Release Notes

.vscode/i18n-ally-custom-framework.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
languageIds:
44
- javascript
55
- typescript
6+
- typescriptreact
67
- html
78

89
# An array of RegExes to find the key usage. **The key should be captured in the first match group**.
@@ -25,9 +26,10 @@ scopeRangeRegex: "useTranslation\\(\\s*\\[?\\s*['\"`](.*?)['\"`]"
2526
# The "$1" will be replaced by the keypath specified.
2627
refactorTemplates:
2728
- t("$1")
29+
- {t("$1")}
2830
- ${t("$1")}
2931
- <%= t("$1") %>
3032

3133

3234
# If set to true, only enables this custom framework (will disable all built-in frameworks)
33-
monopoly: true
35+
monopoly: true

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,15 @@ Feel free to join our official conversations. We would love to hear what feature
8282

8383
### Windows / MacOS
8484

85-
Download the binary release for your platform from the [latest release page](https://github.com/TriliumNext/Notes/releases/latest), unzip the package and run the `trilium` executable.
85+
Download the binary release for your platform from the [latest release page](https://github.com/TriliumNext/Trilium/releases/latest), unzip the package and run the `trilium` executable.
8686

8787
### Linux
8888

8989
If your distribution is listed in the table below, use your distribution's package.
9090

9191
[![Packaging status](https://repology.org/badge/vertical-allrepos/triliumnext.svg)](https://repology.org/project/triliumnext/versions)
9292

93-
You may also download the binary release for your platform from the [latest release page](https://github.com/TriliumNext/Notes/releases/latest), unzip the package and run the `trilium` executable.
93+
You may also download the binary release for your platform from the [latest release page](https://github.com/TriliumNext/Trilium/releases/latest), unzip the package and run the `trilium` executable.
9494

9595
TriliumNext is also provided as a Flatpak, but not yet published on FlatHub.
9696

_regroup/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@
4141
"@types/node": "22.17.1",
4242
"@types/yargs": "17.0.33",
4343
"@vitest/coverage-v8": "3.2.4",
44-
"eslint": "9.32.0",
44+
"eslint": "9.33.0",
4545
"eslint-plugin-simple-import-sort": "12.1.1",
4646
"esm": "3.2.25",
4747
"jsdoc": "4.0.4",
4848
"lorem-ipsum": "2.0.8",
4949
"rcedit": "4.0.1",
5050
"rimraf": "6.0.1",
5151
"tslib": "2.8.1",
52-
"typedoc": "0.28.9",
53-
"typedoc-plugin-missing-exports": "4.0.0"
52+
"typedoc": "0.28.10",
53+
"typedoc-plugin-missing-exports": "4.1.0"
5454
},
5555
"optionalDependencies": {
5656
"appdmg": "0.6.6"

0 commit comments

Comments
 (0)