diff --git a/package-lock.json b/package-lock.json
index ab4f02a1e..49592dd0c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2497,9 +2497,6 @@
         "arm64"
       ],
       "dev": true,
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2517,9 +2514,6 @@
         "arm64"
       ],
       "dev": true,
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2537,9 +2531,6 @@
         "ppc64"
       ],
       "dev": true,
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2557,9 +2548,6 @@
         "riscv64"
       ],
       "dev": true,
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2577,9 +2565,6 @@
         "riscv64"
       ],
       "dev": true,
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2597,9 +2582,6 @@
         "s390x"
       ],
       "dev": true,
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2617,9 +2599,6 @@
         "x64"
       ],
       "dev": true,
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2637,9 +2616,6 @@
         "x64"
       ],
       "dev": true,
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2852,9 +2828,6 @@
         "arm64"
       ],
       "dev": true,
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2869,9 +2842,6 @@
         "arm64"
       ],
       "dev": true,
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2886,9 +2856,6 @@
         "ppc64"
       ],
       "dev": true,
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2903,9 +2870,6 @@
         "riscv64"
       ],
       "dev": true,
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2920,9 +2884,6 @@
         "riscv64"
       ],
       "dev": true,
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2937,9 +2898,6 @@
         "s390x"
       ],
       "dev": true,
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2954,9 +2912,6 @@
         "x64"
       ],
       "dev": true,
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2971,9 +2926,6 @@
         "x64"
       ],
       "dev": true,
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3330,9 +3282,9 @@
       }
     },
     "node_modules/@ui5/builder": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@ui5/builder/-/builder-4.1.5.tgz",
-      "integrity": "sha512-eDd1mICbgL7fcK6MgpinG/cXDrkjTigaKSAmC/PlV+1RJKCN7fIpjSfW8HiRYvbAh81/HNUIo1FZ0JS+0gilTA==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/@ui5/builder/-/builder-4.1.6.tgz",
+      "integrity": "sha512-e0SdT7f8HP4Fz1yZUofs4f6BJZCxh/KtxSyFIOuuidzoIK0f9Lpd4Rr135fzates+YZSrteb4BoECu3kevvFPg==",
       "dev": true,
       "license": "Apache-2.0",
       "peer": true,
@@ -10649,9 +10601,9 @@
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.15.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.15.1.tgz",
-      "integrity": "sha512-WOG+Jj8ZOvR0a3rAn+Tuf1UQJRxw5venr6DgdbJzngJE3qG7X0kL83CZGpdHMxEm+ZK3seAbvFsw4FfOfP9vxg==",
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.15.2.tgz",
+      "integrity": "sha512-wLrXxPtcrPTsNlJmKjkPnNPK2Ihe0hn0wGSaTEiHRPxwjvJwT3hKmXF4dpqxmPO9SoNb2FsYXj/xEo0gHN+D5A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10818,9 +10770,9 @@
       }
     },
     "node_modules/bare-os": {
-      "version": "3.8.7",
-      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.8.7.tgz",
-      "integrity": "sha512-G4Gr1UsGeEy2qtDTZwL7JFLo2wapUarz7iTMcYcMFdS89AIQuBoyjgXZz0Utv7uHs3xA9LckhVbeBi8lEQrC+w==",
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.9.0.tgz",
+      "integrity": "sha512-JTjuZyNIDpw+GytMO4a6TK1VXdVKKJr6DRxEHasyuYyShV2deuiHJK/ahGZlebc+SG0/wJCB9XK8gprBGDFi/Q==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -10865,9 +10817,9 @@
       }
     },
     "node_modules/bare-url": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.4.1.tgz",
-      "integrity": "sha512-fZapLWNB25gS+etK27NV9KgBNXgo2yeYHuj+OyPblQd6GYAE3JVy6aKxszMV5jhGGFwraXQKA5fldvf3lMyEqw==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.4.2.tgz",
+      "integrity": "sha512-/9a2j4ac6ckpmAHvod/ob7x439OAHst/drc2Clnq+reRYd/ovddwcF4LfoxHyNk5AuGBnPg+HqFjmE/Zpq6v0A==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -10906,9 +10858,9 @@
       }
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.10.20",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.20.tgz",
-      "integrity": "sha512-1AaXxEPfXT+GvTBJFuy4yXVHWJBXa4OdbIebGN/wX5DlsIkU0+wzGnd2lOzokSk51d5LUmqjgBLRLlypLUqInQ==",
+      "version": "2.10.21",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.21.tgz",
+      "integrity": "sha512-Q+rUQ7Uz8AHM7DEaNdwvfFCTq7a43lNTzuS94eiWqwyxfV/wJv+oUivef51T91mmRY4d4A1u9rcSvkeufCVXlA==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -11353,9 +11305,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001788",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001788.tgz",
-      "integrity": "sha512-6q8HFp+lOQtcf7wBK+uEenxymVWkGKkjFpCvw5W25cmMwEDU45p1xQFBQv8JDlMMry7eNxyBaR+qxgmTUZkIRQ==",
+      "version": "1.0.30001790",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001790.tgz",
+      "integrity": "sha512-bOoxfJPyYo+ds6W0YfptaCWbFnJYjh2Y1Eow5lRv+vI2u8ganPZqNm1JwNh0t2ELQCqIWg4B3dWEusgAmsoyOw==",
       "dev": true,
       "funding": [
         {
@@ -12374,9 +12326,9 @@
       "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.340",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.340.tgz",
-      "integrity": "sha512-908qahOGocRMinT2nM3ajCEM99H4iPdv84eagPP3FfZy/1ZGeOy2CZYzjhms81ckOPCXPlW7LkY4XpxD8r1DrA==",
+      "version": "1.5.344",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.344.tgz",
+      "integrity": "sha512-4MxfbmNDm+KPh066EZy+eUnkcDPcZ35wNmOWzFuh/ijvHsve6kbLTLURy88uCNK5FbpN+yk2nQY6BYh1GEt+wg==",
       "dev": true,
       "license": "ISC"
     },
@@ -16167,9 +16119,9 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.37",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.37.tgz",
-      "integrity": "sha512-1h5gKZCF+pO/o3Iqt5Jp7wc9rH3eJJ0+nh/CIoiRwjRxde/hAHyLPXYN4V3CqKAbiZPSeJFSWHmJsbkicta0Eg==",
+      "version": "2.0.38",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.38.tgz",
+      "integrity": "sha512-3qT/88Y3FbH/Kx4szpQQ4HzUbVrHPKTLVpVocKiLfoYvw9XSGOX2FmD2d6DrXbVYyAQTF2HeF6My8jmzx7/CRw==",
       "dev": true,
       "license": "MIT"
     },
@@ -19056,9 +19008,9 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.46.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.1.tgz",
-      "integrity": "sha512-vzCjQO/rgUuK9sf8VJZvjqiqiHFaZLnOiimmUuOKODxWL8mm/xua7viT7aqX7dgPY60otQjUotzFMmCB4VdmqQ==",
+      "version": "5.46.2",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.2.tgz",
+      "integrity": "sha512-uxfo9fPcSgLDYob/w1FuL0c99MWiJDnv+5qXSQc5+Ki5NjVNsYi66INnMFBjf6uFz6OnX12piJQPF4IpjJTNTw==",
       "dev": true,
       "license": "BSD-2-Clause",
       "peer": true,
@@ -19269,9 +19221,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.9.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
-      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz",
+      "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -20399,7 +20351,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20411,7 +20363,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20423,7 +20375,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20441,7 +20393,7 @@
       "version": "1.0.0",
       "devDependencies": {
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20453,7 +20405,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20465,7 +20417,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20477,7 +20429,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20489,7 +20441,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20501,7 +20453,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20513,7 +20465,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20525,7 +20477,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20537,7 +20489,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20549,7 +20501,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20561,7 +20513,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20573,7 +20525,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20585,7 +20537,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20597,7 +20549,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20609,7 +20561,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20621,7 +20573,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20633,7 +20585,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20645,7 +20597,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20657,7 +20609,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20669,7 +20621,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20681,7 +20633,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20693,7 +20645,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20705,7 +20657,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-tooling-transpile": "^3.11.0"
@@ -20717,7 +20669,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-middleware-simpleproxy": "^3.7.0",
@@ -20730,7 +20682,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-middleware-simpleproxy": "^3.7.0",
@@ -20743,7 +20695,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-middleware-simpleproxy": "^3.7.0",
@@ -20756,7 +20708,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-middleware-simpleproxy": "^3.7.0",
@@ -20769,7 +20721,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-middleware-simpleproxy": "^3.7.0",
@@ -20782,7 +20734,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-middleware-simpleproxy": "^3.7.0",
@@ -20795,7 +20747,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-middleware-simpleproxy": "^3.7.0",
@@ -20808,7 +20760,7 @@
       "devDependencies": {
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-middleware-simpleproxy": "^3.7.0",
@@ -20822,7 +20774,7 @@
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
         "@ui5/ts-interface-generator": "^0.10.5",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-middleware-simpleproxy": "^3.7.0",
@@ -20836,7 +20788,7 @@
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
         "@ui5/ts-interface-generator": "^0.10.5",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-middleware-simpleproxy": "^3.7.0",
@@ -20850,7 +20802,7 @@
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
         "@ui5/ts-interface-generator": "^0.10.5",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-middleware-simpleproxy": "^3.7.0",
@@ -20864,7 +20816,7 @@
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
         "@ui5/ts-interface-generator": "^0.10.5",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-middleware-simpleproxy": "^3.7.0",
@@ -20878,7 +20830,7 @@
         "@types/openui5": "^1.147.0",
         "@ui5/cli": "^4.0.52",
         "@ui5/ts-interface-generator": "^0.10.5",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-middleware-simpleproxy": "^3.7.0",
@@ -20893,7 +20845,7 @@
         "@ui5/cli": "^4.0.52",
         "@ui5/ts-interface-generator": "^0.10.5",
         "local-web-server": "^5.4.0",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "ui5-middleware-livereload": "^3.3.0",
         "ui5-middleware-serveframework": "^3.8.0",
         "ui5-middleware-simpleproxy": "^3.7.0",
diff --git a/packages/quickstart/steps/01/README.md b/packages/quickstart/steps/01/README.md
index 93e615984..17c07e48e 100644
--- a/packages/quickstart/steps/01/README.md
+++ b/packages/quickstart/steps/01/README.md
@@ -175,20 +175,24 @@ We specify the compiler options as follow:
 ```json
 {
   "compilerOptions": {
-    "target": "es2023",
-    "module": "es2022",
-    "moduleResolution": "node",
+    "target": "es2025",
+    "types": [
+      "node",
+      "@types/openui5"
+    ],
     "skipLibCheck": true,
     "allowJs": true,
-    "strict": true,
     "strictPropertyInitialization": false,
-    "rootDir": "webapp",
-    "baseUrl": "./",
+    "rootDir": "./webapp",
     "paths": {
-      "ui5/quickstart/*": ["webapp/*"]
+      "ui5/quickstart/*": [
+        "./webapp/*"
+      ]
     }
   },
-  "include": ["webapp/**/*"]
+  "include": [
+    "./webapp/**/*"
+  ]
 }
 ```
 
diff --git a/packages/quickstart/steps/01/package.json b/packages/quickstart/steps/01/package.json
index 2b20591ae..43a403a2d 100644
--- a/packages/quickstart/steps/01/package.json
+++ b/packages/quickstart/steps/01/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/quickstart/steps/01/tsconfig.json b/packages/quickstart/steps/01/tsconfig.json
index 7bfb38f1f..cebcaac0a 100644
--- a/packages/quickstart/steps/01/tsconfig.json
+++ b/packages/quickstart/steps/01/tsconfig.json
@@ -1,21 +1,21 @@
 {
   "compilerOptions": {
-    "target": "es2023",
-    "module": "es2022",
-    "moduleResolution": "node",
+    "target": "es2025",
+    "types": [
+      "node",
+      "@types/openui5"
+    ],
     "skipLibCheck": true,
     "allowJs": true,
-    "strict": true,
     "strictPropertyInitialization": false,
-    "rootDir": "webapp",
-    "baseUrl": "./",
+    "rootDir": "./webapp",
     "paths": {
       "ui5/quickstart/*": [
-        "webapp/*"
+        "./webapp/*"
       ]
     }
   },
   "include": [
-    "webapp/**/*"
+    "./webapp/**/*"
   ]
 }
diff --git a/packages/quickstart/steps/02/package.json b/packages/quickstart/steps/02/package.json
index 91bf17e93..19fb38795 100644
--- a/packages/quickstart/steps/02/package.json
+++ b/packages/quickstart/steps/02/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/quickstart/steps/02/tsconfig.json b/packages/quickstart/steps/02/tsconfig.json
index edd641848..cebcaac0a 100644
--- a/packages/quickstart/steps/02/tsconfig.json
+++ b/packages/quickstart/steps/02/tsconfig.json
@@ -1,17 +1,21 @@
 {
-    "compilerOptions": {
-        "target": "es2023",
-        "module": "es2022",
-        "moduleResolution": "node",
-        "skipLibCheck": true,
-        "allowJs": true,
-        "strict": true,
-        "strictPropertyInitialization": false,
-        "rootDir": "webapp",
-        "baseUrl": "./",
-        "paths": {
-            "ui5/quickstart/*": ["webapp/*"]
-        }
-    },
-    "include": ["webapp/**/*"]
+  "compilerOptions": {
+    "target": "es2025",
+    "types": [
+      "node",
+      "@types/openui5"
+    ],
+    "skipLibCheck": true,
+    "allowJs": true,
+    "strictPropertyInitialization": false,
+    "rootDir": "./webapp",
+    "paths": {
+      "ui5/quickstart/*": [
+        "./webapp/*"
+      ]
+    }
+  },
+  "include": [
+    "./webapp/**/*"
+  ]
 }
diff --git a/packages/quickstart/steps/03/package.json b/packages/quickstart/steps/03/package.json
index 3132f22b6..75b3dd9e5 100644
--- a/packages/quickstart/steps/03/package.json
+++ b/packages/quickstart/steps/03/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/quickstart/steps/03/tsconfig.json b/packages/quickstart/steps/03/tsconfig.json
index edd641848..cebcaac0a 100644
--- a/packages/quickstart/steps/03/tsconfig.json
+++ b/packages/quickstart/steps/03/tsconfig.json
@@ -1,17 +1,21 @@
 {
-    "compilerOptions": {
-        "target": "es2023",
-        "module": "es2022",
-        "moduleResolution": "node",
-        "skipLibCheck": true,
-        "allowJs": true,
-        "strict": true,
-        "strictPropertyInitialization": false,
-        "rootDir": "webapp",
-        "baseUrl": "./",
-        "paths": {
-            "ui5/quickstart/*": ["webapp/*"]
-        }
-    },
-    "include": ["webapp/**/*"]
+  "compilerOptions": {
+    "target": "es2025",
+    "types": [
+      "node",
+      "@types/openui5"
+    ],
+    "skipLibCheck": true,
+    "allowJs": true,
+    "strictPropertyInitialization": false,
+    "rootDir": "./webapp",
+    "paths": {
+      "ui5/quickstart/*": [
+        "./webapp/*"
+      ]
+    }
+  },
+  "include": [
+    "./webapp/**/*"
+  ]
 }
diff --git a/packages/walkthrough/steps/02/README.md b/packages/walkthrough/steps/02/README.md
index 618ccc947..da5ac1f5d 100644
--- a/packages/walkthrough/steps/02/README.md
+++ b/packages/walkthrough/steps/02/README.md
@@ -74,20 +74,17 @@ We specify the compiler options as follow:
 ```json
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
 ```
 
@@ -111,7 +108,7 @@ Let's go through the compiler options specified in the file:
 
 - `"baseUrl": "./"`: The `baseUrl` parameter is used to resolve non-relative module names. We specified that non-relative module names are resolved relative to the location of the `tsconfig.json` file.
 
-- `"paths": { "ui5/walkthrough/*": ["webapp/*"] }`: The `path` paramter specifies path mappings for module resolution. It allows you to define custom module paths that map to specific directories or files. In this case, it maps the module path `ui5/walkthrough/*`
+- `"paths": { "ui5/walkthrough/*": ["./webapp/*"] }`: The `path` paramter specifies path mappings for module resolution. It allows you to define custom module paths that map to specific directories or files. In this case, it maps the module path `ui5/walkthrough/*`
 
 ***
 
diff --git a/packages/walkthrough/steps/02/package.json b/packages/walkthrough/steps/02/package.json
index 3cfae4420..5c440adf3 100644
--- a/packages/walkthrough/steps/02/package.json
+++ b/packages/walkthrough/steps/02/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/walkthrough/steps/02/tsconfig.json b/packages/walkthrough/steps/02/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/02/tsconfig.json
+++ b/packages/walkthrough/steps/02/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/03/package.json b/packages/walkthrough/steps/03/package.json
index 67d0f7a5f..e90415efd 100644
--- a/packages/walkthrough/steps/03/package.json
+++ b/packages/walkthrough/steps/03/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/walkthrough/steps/03/tsconfig.json b/packages/walkthrough/steps/03/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/03/tsconfig.json
+++ b/packages/walkthrough/steps/03/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/04/package.json b/packages/walkthrough/steps/04/package.json
index b952e1d9c..86942b263 100644
--- a/packages/walkthrough/steps/04/package.json
+++ b/packages/walkthrough/steps/04/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/walkthrough/steps/04/tsconfig.json b/packages/walkthrough/steps/04/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/04/tsconfig.json
+++ b/packages/walkthrough/steps/04/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/05/package.json b/packages/walkthrough/steps/05/package.json
index 90a364a45..decff3956 100644
--- a/packages/walkthrough/steps/05/package.json
+++ b/packages/walkthrough/steps/05/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/walkthrough/steps/05/tsconfig.json b/packages/walkthrough/steps/05/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/05/tsconfig.json
+++ b/packages/walkthrough/steps/05/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/06/package.json b/packages/walkthrough/steps/06/package.json
index 68bacc2fc..7c5170e5a 100644
--- a/packages/walkthrough/steps/06/package.json
+++ b/packages/walkthrough/steps/06/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/walkthrough/steps/06/tsconfig.json b/packages/walkthrough/steps/06/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/06/tsconfig.json
+++ b/packages/walkthrough/steps/06/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/07/package.json b/packages/walkthrough/steps/07/package.json
index 7ac18fcb1..f7906f964 100644
--- a/packages/walkthrough/steps/07/package.json
+++ b/packages/walkthrough/steps/07/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/walkthrough/steps/07/tsconfig.json b/packages/walkthrough/steps/07/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/07/tsconfig.json
+++ b/packages/walkthrough/steps/07/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/08/package.json b/packages/walkthrough/steps/08/package.json
index e8a865652..6d03be65f 100644
--- a/packages/walkthrough/steps/08/package.json
+++ b/packages/walkthrough/steps/08/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/walkthrough/steps/08/tsconfig.json b/packages/walkthrough/steps/08/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/08/tsconfig.json
+++ b/packages/walkthrough/steps/08/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/09/package.json b/packages/walkthrough/steps/09/package.json
index 10cbe6c97..434314233 100644
--- a/packages/walkthrough/steps/09/package.json
+++ b/packages/walkthrough/steps/09/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/walkthrough/steps/09/tsconfig.json b/packages/walkthrough/steps/09/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/09/tsconfig.json
+++ b/packages/walkthrough/steps/09/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/10/package.json b/packages/walkthrough/steps/10/package.json
index fa2277b77..e8eb88c93 100644
--- a/packages/walkthrough/steps/10/package.json
+++ b/packages/walkthrough/steps/10/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/walkthrough/steps/10/tsconfig.json b/packages/walkthrough/steps/10/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/10/tsconfig.json
+++ b/packages/walkthrough/steps/10/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/11/package.json b/packages/walkthrough/steps/11/package.json
index 449f287da..d1c2ce240 100644
--- a/packages/walkthrough/steps/11/package.json
+++ b/packages/walkthrough/steps/11/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/walkthrough/steps/11/tsconfig.json b/packages/walkthrough/steps/11/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/11/tsconfig.json
+++ b/packages/walkthrough/steps/11/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/12/package.json b/packages/walkthrough/steps/12/package.json
index 7ed6c82c6..02b0e1263 100644
--- a/packages/walkthrough/steps/12/package.json
+++ b/packages/walkthrough/steps/12/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/walkthrough/steps/12/tsconfig.json b/packages/walkthrough/steps/12/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/12/tsconfig.json
+++ b/packages/walkthrough/steps/12/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/13/package.json b/packages/walkthrough/steps/13/package.json
index 6cfe786ad..56e410522 100644
--- a/packages/walkthrough/steps/13/package.json
+++ b/packages/walkthrough/steps/13/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/walkthrough/steps/13/tsconfig.json b/packages/walkthrough/steps/13/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/13/tsconfig.json
+++ b/packages/walkthrough/steps/13/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/14/package.json b/packages/walkthrough/steps/14/package.json
index c2375ab21..e4f069032 100644
--- a/packages/walkthrough/steps/14/package.json
+++ b/packages/walkthrough/steps/14/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/walkthrough/steps/14/tsconfig.json b/packages/walkthrough/steps/14/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/14/tsconfig.json
+++ b/packages/walkthrough/steps/14/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/15/package.json b/packages/walkthrough/steps/15/package.json
index 91ee064a4..bc1d032db 100644
--- a/packages/walkthrough/steps/15/package.json
+++ b/packages/walkthrough/steps/15/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/walkthrough/steps/15/tsconfig.json b/packages/walkthrough/steps/15/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/15/tsconfig.json
+++ b/packages/walkthrough/steps/15/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/16/package.json b/packages/walkthrough/steps/16/package.json
index 959a37562..7de7f76e0 100644
--- a/packages/walkthrough/steps/16/package.json
+++ b/packages/walkthrough/steps/16/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/walkthrough/steps/16/tsconfig.json b/packages/walkthrough/steps/16/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/16/tsconfig.json
+++ b/packages/walkthrough/steps/16/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/17/package.json b/packages/walkthrough/steps/17/package.json
index f6152c2db..5617b01af 100644
--- a/packages/walkthrough/steps/17/package.json
+++ b/packages/walkthrough/steps/17/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/walkthrough/steps/17/tsconfig.json b/packages/walkthrough/steps/17/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/17/tsconfig.json
+++ b/packages/walkthrough/steps/17/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/18/package.json b/packages/walkthrough/steps/18/package.json
index 35b437467..99240141d 100644
--- a/packages/walkthrough/steps/18/package.json
+++ b/packages/walkthrough/steps/18/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/walkthrough/steps/18/tsconfig.json b/packages/walkthrough/steps/18/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/18/tsconfig.json
+++ b/packages/walkthrough/steps/18/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/19/package.json b/packages/walkthrough/steps/19/package.json
index 131c06932..01c8020ba 100644
--- a/packages/walkthrough/steps/19/package.json
+++ b/packages/walkthrough/steps/19/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/walkthrough/steps/19/tsconfig.json b/packages/walkthrough/steps/19/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/19/tsconfig.json
+++ b/packages/walkthrough/steps/19/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/20/package.json b/packages/walkthrough/steps/20/package.json
index af9f44b3b..5c26e84cd 100644
--- a/packages/walkthrough/steps/20/package.json
+++ b/packages/walkthrough/steps/20/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/walkthrough/steps/20/tsconfig.json b/packages/walkthrough/steps/20/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/20/tsconfig.json
+++ b/packages/walkthrough/steps/20/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/21/package.json b/packages/walkthrough/steps/21/package.json
index 7e384cbfa..680951c35 100644
--- a/packages/walkthrough/steps/21/package.json
+++ b/packages/walkthrough/steps/21/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/walkthrough/steps/21/tsconfig.json b/packages/walkthrough/steps/21/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/21/tsconfig.json
+++ b/packages/walkthrough/steps/21/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/22/package.json b/packages/walkthrough/steps/22/package.json
index 1a0b7cc8c..cf210da11 100644
--- a/packages/walkthrough/steps/22/package.json
+++ b/packages/walkthrough/steps/22/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/walkthrough/steps/22/tsconfig.json b/packages/walkthrough/steps/22/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/22/tsconfig.json
+++ b/packages/walkthrough/steps/22/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/23/package.json b/packages/walkthrough/steps/23/package.json
index 977903825..252b83e24 100644
--- a/packages/walkthrough/steps/23/package.json
+++ b/packages/walkthrough/steps/23/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/walkthrough/steps/23/tsconfig.json b/packages/walkthrough/steps/23/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/23/tsconfig.json
+++ b/packages/walkthrough/steps/23/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/24/package.json b/packages/walkthrough/steps/24/package.json
index 3bca6467d..981430aec 100644
--- a/packages/walkthrough/steps/24/package.json
+++ b/packages/walkthrough/steps/24/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-tooling-transpile": "^3.11.0"
diff --git a/packages/walkthrough/steps/24/tsconfig.json b/packages/walkthrough/steps/24/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/24/tsconfig.json
+++ b/packages/walkthrough/steps/24/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/25/package.json b/packages/walkthrough/steps/25/package.json
index f0f11626f..450968a05 100644
--- a/packages/walkthrough/steps/25/package.json
+++ b/packages/walkthrough/steps/25/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-middleware-simpleproxy": "^3.7.0",
diff --git a/packages/walkthrough/steps/25/tsconfig.json b/packages/walkthrough/steps/25/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/25/tsconfig.json
+++ b/packages/walkthrough/steps/25/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/26/package.json b/packages/walkthrough/steps/26/package.json
index 77dcaa6cc..7e4b7c800 100644
--- a/packages/walkthrough/steps/26/package.json
+++ b/packages/walkthrough/steps/26/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-middleware-simpleproxy": "^3.7.0",
diff --git a/packages/walkthrough/steps/26/tsconfig.json b/packages/walkthrough/steps/26/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/26/tsconfig.json
+++ b/packages/walkthrough/steps/26/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/27/package.json b/packages/walkthrough/steps/27/package.json
index ced7ada2d..f5690618e 100644
--- a/packages/walkthrough/steps/27/package.json
+++ b/packages/walkthrough/steps/27/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-middleware-simpleproxy": "^3.7.0",
diff --git a/packages/walkthrough/steps/27/tsconfig.json b/packages/walkthrough/steps/27/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/27/tsconfig.json
+++ b/packages/walkthrough/steps/27/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/28/package.json b/packages/walkthrough/steps/28/package.json
index 8613c8ba8..e9a44a734 100644
--- a/packages/walkthrough/steps/28/package.json
+++ b/packages/walkthrough/steps/28/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-middleware-simpleproxy": "^3.7.0",
diff --git a/packages/walkthrough/steps/28/tsconfig.json b/packages/walkthrough/steps/28/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/28/tsconfig.json
+++ b/packages/walkthrough/steps/28/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/29/package.json b/packages/walkthrough/steps/29/package.json
index 801f7788f..51cc5fbc5 100644
--- a/packages/walkthrough/steps/29/package.json
+++ b/packages/walkthrough/steps/29/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-middleware-simpleproxy": "^3.7.0",
diff --git a/packages/walkthrough/steps/29/tsconfig.json b/packages/walkthrough/steps/29/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/29/tsconfig.json
+++ b/packages/walkthrough/steps/29/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/30/package.json b/packages/walkthrough/steps/30/package.json
index 7e7d8bfb0..448fce6e8 100644
--- a/packages/walkthrough/steps/30/package.json
+++ b/packages/walkthrough/steps/30/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-middleware-simpleproxy": "^3.7.0",
diff --git a/packages/walkthrough/steps/30/tsconfig.json b/packages/walkthrough/steps/30/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/30/tsconfig.json
+++ b/packages/walkthrough/steps/30/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/31/package.json b/packages/walkthrough/steps/31/package.json
index 86a95b1c5..d73e5d145 100644
--- a/packages/walkthrough/steps/31/package.json
+++ b/packages/walkthrough/steps/31/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-middleware-simpleproxy": "^3.7.0",
diff --git a/packages/walkthrough/steps/31/tsconfig.json b/packages/walkthrough/steps/31/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/31/tsconfig.json
+++ b/packages/walkthrough/steps/31/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/32/package.json b/packages/walkthrough/steps/32/package.json
index 06fd129f1..3916bc399 100644
--- a/packages/walkthrough/steps/32/package.json
+++ b/packages/walkthrough/steps/32/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-middleware-simpleproxy": "^3.7.0",
diff --git a/packages/walkthrough/steps/32/tsconfig.json b/packages/walkthrough/steps/32/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/32/tsconfig.json
+++ b/packages/walkthrough/steps/32/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/33/package.json b/packages/walkthrough/steps/33/package.json
index 348ec4f2c..fa4ded974 100644
--- a/packages/walkthrough/steps/33/package.json
+++ b/packages/walkthrough/steps/33/package.json
@@ -12,7 +12,7 @@
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
     "@ui5/ts-interface-generator": "^0.10.5",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-middleware-simpleproxy": "^3.7.0",
diff --git a/packages/walkthrough/steps/33/tsconfig.json b/packages/walkthrough/steps/33/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/33/tsconfig.json
+++ b/packages/walkthrough/steps/33/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/34/package.json b/packages/walkthrough/steps/34/package.json
index 72a842e99..fa446025d 100644
--- a/packages/walkthrough/steps/34/package.json
+++ b/packages/walkthrough/steps/34/package.json
@@ -12,7 +12,7 @@
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
     "@ui5/ts-interface-generator": "^0.10.5",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-middleware-simpleproxy": "^3.7.0",
diff --git a/packages/walkthrough/steps/34/tsconfig.json b/packages/walkthrough/steps/34/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/34/tsconfig.json
+++ b/packages/walkthrough/steps/34/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/35/package.json b/packages/walkthrough/steps/35/package.json
index 64e30c219..41d68129a 100644
--- a/packages/walkthrough/steps/35/package.json
+++ b/packages/walkthrough/steps/35/package.json
@@ -12,7 +12,7 @@
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
     "@ui5/ts-interface-generator": "^0.10.5",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-middleware-simpleproxy": "^3.7.0",
diff --git a/packages/walkthrough/steps/35/tsconfig.json b/packages/walkthrough/steps/35/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/35/tsconfig.json
+++ b/packages/walkthrough/steps/35/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/36/package.json b/packages/walkthrough/steps/36/package.json
index 22eb2d9c2..558905ffd 100644
--- a/packages/walkthrough/steps/36/package.json
+++ b/packages/walkthrough/steps/36/package.json
@@ -12,7 +12,7 @@
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
     "@ui5/ts-interface-generator": "^0.10.5",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-middleware-simpleproxy": "^3.7.0",
diff --git a/packages/walkthrough/steps/36/tsconfig.json b/packages/walkthrough/steps/36/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/36/tsconfig.json
+++ b/packages/walkthrough/steps/36/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/37/package.json b/packages/walkthrough/steps/37/package.json
index 43df5bcc0..139aed54d 100644
--- a/packages/walkthrough/steps/37/package.json
+++ b/packages/walkthrough/steps/37/package.json
@@ -12,7 +12,7 @@
     "@types/openui5": "^1.147.0",
     "@ui5/cli": "^4.0.52",
     "@ui5/ts-interface-generator": "^0.10.5",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-middleware-simpleproxy": "^3.7.0",
diff --git a/packages/walkthrough/steps/37/tsconfig.json b/packages/walkthrough/steps/37/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/37/tsconfig.json
+++ b/packages/walkthrough/steps/37/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }
diff --git a/packages/walkthrough/steps/38/package.json b/packages/walkthrough/steps/38/package.json
index 519c82ba0..46566e008 100644
--- a/packages/walkthrough/steps/38/package.json
+++ b/packages/walkthrough/steps/38/package.json
@@ -15,7 +15,7 @@
     "@ui5/cli": "^4.0.52",
     "@ui5/ts-interface-generator": "^0.10.5",
     "local-web-server": "^5.4.0",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "ui5-middleware-livereload": "^3.3.0",
     "ui5-middleware-serveframework": "^3.8.0",
     "ui5-middleware-simpleproxy": "^3.7.0",
diff --git a/packages/walkthrough/steps/38/tsconfig.json b/packages/walkthrough/steps/38/tsconfig.json
index 644279d16..ded2460e3 100644
--- a/packages/walkthrough/steps/38/tsconfig.json
+++ b/packages/walkthrough/steps/38/tsconfig.json
@@ -1,17 +1,14 @@
 {
     "compilerOptions": {
-      "target": "es2023",
-      "module": "es2022",
-      "moduleResolution": "node",
+      "target": "es2025",
+      "types": ["node", "@types/openui5"],
       "skipLibCheck": true,
       "allowJs": true,
-      "strict": true,
       "strictPropertyInitialization": false,
-      "rootDir": "webapp",
-      "baseUrl": "./",
+      "rootDir": "./webapp",
       "paths": {
-        "ui5/walkthrough/*": ["webapp/*"]
+        "ui5/walkthrough/*": ["./webapp/*"]
       }
     },
-    "include": ["webapp/**/*"]
+    "include": ["./webapp/**/*"]
   }