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

Commit fb9f5a7

Browse files
authored
Merge branch 'develop' into renovate/softprops-action-gh-release-2.x
2 parents d6c2501 + 825c2c1 commit fb9f5a7

12 files changed

Lines changed: 729 additions & 1260 deletions

File tree

.github/workflows/ci.yml

Lines changed: 0 additions & 49 deletions
This file was deleted.

_regroup/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
"chore:generate-openapi": "tsx bin/generate-openapi.js"
3636
},
3737
"devDependencies": {
38-
"@playwright/test": "1.52.0",
38+
"@playwright/test": "1.53.0",
3939
"@stylistic/eslint-plugin": "4.4.1",
4040
"@types/express": "5.0.3",
41-
"@types/node": "22.15.30",
41+
"@types/node": "22.15.31",
4242
"@types/yargs": "17.0.33",
4343
"@vitest/coverage-v8": "3.2.3",
4444
"eslint": "9.28.0",

apps/client/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@
5151
"mind-elixir": "4.6.0",
5252
"normalize.css": "8.0.1",
5353
"panzoom": "9.4.3",
54-
"react": "19.1.0",
55-
"react-dom": "19.1.0",
54+
"preact": "10.26.8",
5655
"split.js": "1.6.5",
5756
"svg-pan-zoom": "3.6.2",
5857
"vanilla-js-wheel-zoom": "9.0.4"
@@ -64,18 +63,18 @@
6463
"@types/leaflet": "1.9.18",
6564
"@types/leaflet-gpx": "1.3.7",
6665
"@types/mark.js": "8.11.12",
67-
"@types/react": "19.1.7",
68-
"@types/react-dom": "19.1.6",
6966
"copy-webpack-plugin": "13.0.0",
70-
"happy-dom": "17.6.3",
67+
"happy-dom": "18.0.1",
7168
"script-loader": "0.7.2",
7269
"vite-plugin-static-copy": "3.0.0"
7370
},
7471
"nx": {
7572
"name": "client",
7673
"targets": {
7774
"serve": {
78-
"dependsOn": ["^build"]
75+
"dependsOn": [
76+
"^build"
77+
]
7978
}
8079
}
8180
}

apps/client/src/types-assets.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ declare module "*.png" {
33
export default path;
44
}
55

6-
declare module "@triliumnext/ckeditor5/emoji_definitions/en.json?url" {
6+
declare module "*?url" {
77
var path: string;
88
export default path;
99
}

apps/client/src/types.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ declare global {
5757

5858
process?: ElectronProcess;
5959
glob?: CustomGlobals;
60+
61+
EXCALIDRAW_ASSET_PATH?: string;
6062
}
6163

6264
interface AutoCompleteConfig {

0 commit comments

Comments
 (0)