Merge branch 'main' into task/upgrade-ng-extract-i18n-merge

CHANGELOG.md

@@ -12,8 +12,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Lifted the asset profile identifier editing restriction for `MANUAL` data sources in the asset profile details dialog of the admin control panel
 - Upgraded `angular` from version `20.2.4` to `20.3.9`
 - Upgraded `ng-extract-i18n-merge` from `3.1.0` to `3.2.1`
-- Upgraded `Nx` from version `21.5.1` to `22.0.4`
+- Upgraded `Nx` from version `21.5.1` to `22.1.3`
 - Upgraded `shx` from version `0.3.4` to `0.4.0`
+- Upgraded `storybook` from version `9.1.5` to `10.1.10`
 
 ### Fixed
 

libs/ui/tsconfig.json

@@ -14,6 +14,7 @@
     }
   ],
   "compilerOptions": {
+    "moduleResolution": "bundler",
     "target": "es2020",
     // TODO: Remove once solved in tsconfig.base.json
     "strict": false,

package.json

@@ -153,19 +153,19 @@
     "@eslint/js": "9.35.0",
     "@nestjs/schematics": "11.0.9",
     "@nestjs/testing": "11.1.8",
-    "@nx/angular": "22.0.4",
-    "@nx/eslint-plugin": "22.0.4",
-    "@nx/jest": "22.0.4",
-    "@nx/js": "22.0.4",
-    "@nx/module-federation": "22.0.4",
-    "@nx/nest": "22.0.4",
-    "@nx/node": "22.0.4",
-    "@nx/storybook": "22.0.4",
-    "@nx/web": "22.0.4",
-    "@nx/workspace": "22.0.4",
+    "@nx/angular": "22.1.3",
+    "@nx/eslint-plugin": "22.1.3",
+    "@nx/jest": "22.1.3",
+    "@nx/js": "22.1.3",
+    "@nx/module-federation": "22.1.3",
+    "@nx/nest": "22.1.3",
+    "@nx/node": "22.1.3",
+    "@nx/storybook": "22.1.3",
+    "@nx/web": "22.1.3",
+    "@nx/workspace": "22.1.3",
     "@schematics/angular": "20.3.9",
-    "@storybook/addon-docs": "9.1.5",
-    "@storybook/angular": "9.1.5",
+    "@storybook/addon-docs": "10.1.10",
+    "@storybook/angular": "10.1.10",
     "@trivago/prettier-plugin-sort-imports": "5.2.2",
     "@types/big.js": "6.2.2",
     "@types/google-spreadsheet": "3.1.5",
@@ -180,12 +180,12 @@
     "eslint": "9.35.0",
     "eslint-config-prettier": "10.1.8",
     "eslint-plugin-import": "2.32.0",
-    "eslint-plugin-storybook": "9.1.5",
+    "eslint-plugin-storybook": "10.1.10",
     "husky": "9.1.7",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
     "jest-preset-angular": "14.6.0",
-    "nx": "22.0.4",
+    "nx": "22.1.3",
     "prettier": "3.7.4",
     "prettier-plugin-organize-attributes": "1.0.0",
     "prisma": "6.19.0",
@@ -193,7 +193,7 @@
     "react-dom": "18.2.0",
     "replace-in-file": "8.3.0",
     "shx": "0.4.0",
-    "storybook": "9.1.5",
+    "storybook": "10.1.10",
     "ts-jest": "29.4.0",
     "ts-node": "10.9.2",
     "tslib": "2.8.1",