sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into refactor/typecheck_errors

pull/2029/head
Elian Doran 2025-05-29 09:35:12 +07:00
parent f87e7fb577 78236954e5
commit 7651083e63
No known key found for this signature in database
14 changed files with 376 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/dev.yml vendored
Unescape Escape View File

@ -128,7 +128,7 @@ jobs:
- run: pnpm install --frozen-lockfile
- name: Run the unit tests
run: pnpm run test
run: pnpm run test:all
build_docker:
name: Build Docker image

4
_regroup/package.json
Unescape Escape View File

@ -38,7 +38,7 @@
"@playwright/test": "1.52.0",
"@stylistic/eslint-plugin": "4.4.0",
"@types/express": "5.0.1",
"@types/node": "22.15.21",
"@types/node": "22.15.24",
"@types/yargs": "17.0.33",
"@vitest/coverage-v8": "3.1.4",
"eslint": "9.27.0",
@ -49,7 +49,7 @@
"rcedit": "4.0.1",
"rimraf": "6.0.1",
"tslib": "2.8.1",
"typedoc": "0.28.4",
"typedoc": "0.28.5",
"typedoc-plugin-missing-exports": "4.0.0"
},
"optionalDependencies": {

10
apps/client/package.json
Unescape Escape View File

@ -33,8 +33,8 @@
"debounce": "2.2.0",
"draggabilly": "3.0.0",
"force-graph": "1.49.6",
"globals": "16.1.0",
"i18next": "25.2.0",
"globals": "16.2.0",
"i18next": "25.2.1",
"i18next-http-backend": "3.0.2",
"jquery": "3.7.1",
"jquery-hotkeys": "0.2.2",
@ -47,7 +47,7 @@
"mark.js": "8.11.1",
"marked": "15.0.12",
"mermaid": "11.6.0",
"mind-elixir": "4.5.2",
"mind-elixir": "4.6.0",
"normalize.css": "8.0.1",
"panzoom": "9.4.3",
"react": "19.1.0",
@ -63,10 +63,10 @@
"@types/leaflet": "1.9.18",
"@types/leaflet-gpx": "1.3.7",
"@types/mark.js": "8.11.12",
"@types/react": "19.1.5",
"@types/react": "19.1.6",
"@types/react-dom": "19.1.5",
"copy-webpack-plugin": "13.0.0",
"happy-dom": "17.4.7",
"happy-dom": "17.5.6",
"script-loader": "0.7.2",
"vite-plugin-static-copy": "3.0.0"
},

9
apps/client/src/widgets/tab_row.ts
Unescape Escape View File

@ -386,15 +386,8 @@ export default class TabRowWidget extends BasicWidget {
};
setupScrollEvents() {
let isScrolling = false;
this.$tabScrollingContainer[0].addEventListener('wheel', (event) => {
if (!isScrolling) {
isScrolling = true;
requestAnimationFrame(() => {
this.scrollTabContainer(event.deltaY * 1.5, 'instant');
isScrolling = false;
});
}
this.scrollTabContainer(event.deltaY * 1.5);
});
this.$scrollButtonLeft[0].addEventListener('click', () => this.scrollTabContainer(-200));

2
apps/desktop/package.json
Unescape Escape View File

@ -17,7 +17,7 @@
"@types/electron-squirrel-startup": "1.0.2",
"@triliumnext/server": "workspace:*",
"copy-webpack-plugin": "13.0.0",
"electron": "36.3.1",
"electron": "36.3.2",
"@electron-forge/cli": "7.8.1",
"@electron-forge/maker-deb": "7.8.1",
"@electron-forge/maker-dmg": "7.8.1",

2
apps/dump-db/package.json
Unescape Escape View File

@ -8,7 +8,7 @@
"mime-types": "^3.0.0",
"sanitize-filename": "^1.6.3",
"tsx": "^4.19.3",
"yargs": "^17.3.1"
"yargs": "^18.0.0"
},
"devDependencies": {
"@types/better-sqlite3": "^7.6.11",

2
apps/edit-docs/package.json
Unescape Escape View File

@ -12,7 +12,7 @@
"@triliumnext/desktop": "workspace:*",
"@types/fs-extra": "11.0.4",
"copy-webpack-plugin": "13.0.0",
"electron": "36.3.1",
"electron": "36.3.2",
"fs-extra": "11.3.0"
},
"nx": {

4
apps/server/Dockerfile.alpine.rootless
Unescape Escape View File

@ -1,4 +1,4 @@
FROM node:22.15.0-alpine AS builder
FROM node:22.16.0-alpine AS builder
RUN corepack enable
# Install native dependencies since we might be building cross-platform.
@ -7,7 +7,7 @@ COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/
# We have to use --no-frozen-lockfile due to CKEditor patches
RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild
FROM node:22.15.0-alpine
FROM node:22.16.0-alpine
# Create a non-root user with configurable UID/GID
ARG USER=trilium
ARG UID=1001

4
apps/server/Dockerfile.rootless
Unescape Escape View File

@ -1,4 +1,4 @@
FROM node:22.15.0-bullseye-slim AS builder
FROM node:22.16.0-bullseye-slim AS builder
RUN corepack enable
# Install native dependencies since we might be building cross-platform.
@ -7,7 +7,7 @@ COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/
# We have to use --no-frozen-lockfile due to CKEditor patches
RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild
FROM node:22.15.0-bullseye-slim
FROM node:22.16.0-bullseye-slim
# Create a non-root user with configurable UID/GID
ARG USER=trilium
ARG UID=1001

4
apps/server/package.json
Unescape Escape View File

@ -59,7 +59,7 @@
"debounce": "2.2.0",
"debug": "4.4.1",
"ejs": "3.1.10",
"electron": "36.3.1",
"electron": "36.3.2",
"electron-debug": "4.1.0",
"electron-window-state": "5.0.3",
"escape-html": "1.0.3",
@ -74,7 +74,7 @@
"html2plaintext": "2.1.4",
"http-proxy-agent": "7.0.2",
"https-proxy-agent": "7.0.6",
"i18next": "25.2.0",
"i18next": "25.2.1",
"i18next-fs-backend": "2.6.0",
"image-type": "6.0.0",
"ini": "5.0.0",

1
docs/Release Notes/Release Notes/v0.94.0.md
Unescape Escape View File

@ -56,6 +56,7 @@
* [Metrics endpoint](https://github.com/TriliumNext/Notes/pull/2024) by @perfectra1n
* Docker: Rootless [Dockerfiles are now available](https://github.com/TriliumNext/Notes/pull/1923/files) by @perfectra1n
* [Text notes: add a way to move up and down text lines via a keyboard shortcut](https://github.com/TriliumNext/Notes/issues/1002) by @dogfuntom
* [improve tab scroll UX by switching from instant to smooth behavior](https://github.com/TriliumNext/Notes/pull/2030) by @SiriusXT
## 📖 Documentation

8
package.json
Unescape Escape View File

@ -19,7 +19,7 @@
"chore:generate-openapi": "tsx ./scripts/generate-openapi.ts",
"chore:update-build-info": "tsx ./scripts/update-build-info.ts",
"chore:update-version": "tsx ./scripts/update-version.ts",
"test": "pnpm test:parallel && pnpm test:sequential",
"test:all": "pnpm test:parallel && pnpm test:sequential",
"test:parallel": "pnpm nx run-many -t test --all --exclude=ckeditor5-mermaid,ckeditor5-math --parallel",
"test:sequential": "pnpm nx run-many -t test --projects=ckeditor5-mermaid,ckeditor5-math --parallel=1",
"coverage": "pnpm nx run-many -t coverage"
@ -40,7 +40,7 @@
"@playwright/test": "^1.36.0",
"@triliumnext/server": "workspace:*",
"@types/express": "^4.17.21",
"@types/node": "22.15.21",
"@types/node": "22.15.24",
"@vitest/coverage-v8": "^3.0.5",
"@vitest/ui": "^3.0.0",
"chalk": "5.4.1",
@ -49,7 +49,7 @@
"eslint": "^9.8.0",
"eslint-config-prettier": "^10.0.0",
"eslint-plugin-playwright": "^2.0.0",
"happy-dom": "~17.4.0",
"happy-dom": "~17.5.0",
"jiti": "2.4.2",
"jsdom": "~26.1.0",
"jsonc-eslint-parser": "^2.1.0",
@ -90,7 +90,7 @@
"ckeditor5": "patches/ckeditor5.patch"
},
"overrides": {
"node-abi": "4.8.0",
"node-abi": "4.9.0",
"@types/express-serve-static-core": "5.0.6",
"flat@<5.0.1": ">=5.0.1",
"minimatch@<3.0.5": ">=3.0.5",

5
packages/ckeditor5-math/src/mathui.ts
Unescape Escape View File

@ -54,6 +54,10 @@ export default class MathUI extends Plugin {
this._addFormView();
this._balloon.showStack( 'main' );
requestAnimationFrame(() => {
this.formView?.mathInputView.fieldView.element?.focus();
});
}
private _createFormView() {
@ -122,7 +126,6 @@ export default class MathUI extends Plugin {
formView.mathInputView.fieldView.once('render', () => {
const textarea = formView.mathInputView.fieldView.element;
if (!textarea) return;
textarea.focus();
Object.assign(textarea.style, {
resize: 'both',
height: '100px',

662
pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff