Skip to content

Commit 35641de

Browse files
committed
Merge remote-tracking branch 'upstream/dev' into future
2 parents cc13e63 + 62c54cf commit 35641de

File tree

27 files changed

+2977
-2429
lines changed

27 files changed

+2977
-2429
lines changed

src/Moryx.ControlSystem.ProcessEngine.Web/app/package-lock.json

Lines changed: 246 additions & 206 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Moryx.ControlSystem.ProcessEngine.Web/app/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
"@angular/build": "^21.1.0",
3535
"@angular/cli": "^21.1.0",
3636
"@angular/compiler-cli": "^21.1.0",
37-
"@types/node": "^20.11.0",
38-
"jsdom": "^26.0.0",
37+
"jsdom": "^28.1.0",
3938
"typescript": "~5.9.3",
4039
"vitest": "^4.0.8"
4140
}

0 commit comments

Comments
 (0)