From 2a6d34ce78af61065e13d1d4d806a29a26063e86 Mon Sep 17 00:00:00 2001
From: sumeyye <sum.the.developer@gmail.com>
Date: Mon, 29 Jun 2026 17:15:02 +0300
Subject: [PATCH] fix: merger problem for the versions

---
 npm/ng-packs/package.json | 51 ++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json
index f27e905f84..1151323ac9 100644
--- a/npm/ng-packs/package.json
+++ b/npm/ng-packs/package.json
@@ -32,7 +32,7 @@
     "dep-graph": "nx dep-graph",
     "help": "nx help",
     "build:schematics": "cd scripts && yarn && yarn build:schematics && cd ..",
-    "dev:schematics": "tsc -p packages/schematics/tsconfig.lib.json -w",
+    "dev:schematics": "tsc -p packages/schematics/tsconfig.json -w",
     "mock:schematics": "cd scripts/mock-schematic && yarn && yarn start",
     "debug:schematics": "./node_modules/.bin/nx g ./packages/schematics/src/collection.json:proxy-add --module identity --apiName __default --source __default --target __default --url https://localhost:44305 --serviceType application --entryPoint  __default ",
     "debug:schematics-dist": "./node_modules/.bin/ng g ./dist/packages/schematics/collection.json:proxy-add --module __default --apiName __default --source __default --target __default --url http://localhost:4300 --service-type application --entryPoint  __default",
@@ -49,30 +49,31 @@
   "private": true,
   "devDependencies": {
     "@abp/ng.theme.lepton-x": "~5.5.0-rc.4",
+    "@abp/ng.schematics": "~10.5.0-rc.4",
     "@abp/utils": "~10.5.0-rc.4",
-    "@angular-devkit/build-angular": "~21.2.0",
-    "@angular-devkit/core": "~21.2.0",
-    "@angular-devkit/schematics": "~21.2.0",
-    "@angular-devkit/schematics-cli": "~21.2.0",
-    "@angular-eslint/eslint-plugin": "~21.2.0",
-    "@angular-eslint/eslint-plugin-template": "~21.2.0",
-    "@angular-eslint/template-parser": "~21.2.0",
-    "@angular/animations": "~21.2.0",
-    "@angular/aria": "~21.2.0",
-    "@angular/build": "~21.2.0",
-    "@angular/cli": "~21.2.0",
-    "@angular/common": "~21.2.0",
-    "@angular/compiler": "~21.2.0",
-    "@angular/compiler-cli": "~21.2.0",
-    "@angular/core": "~21.2.0",
-    "@angular/forms": "~21.2.0",
-    "@angular/language-service": "~21.2.0",
-    "@angular/localize": "~21.2.0",
-    "@angular/platform-browser": "~21.2.0",
-    "@angular/platform-browser-dynamic": "~21.2.0",
-    "@angular/platform-server": "~21.2.0",
-    "@angular/router": "~21.2.0",
-    "@angular/ssr": "~21.2.0",
+    "@angular-devkit/build-angular": "~22.0.0",
+    "@angular-devkit/core": "~22.0.0",
+    "@angular-devkit/schematics": "~22.0.0",
+    "@angular-devkit/schematics-cli": "~22.0.0",
+    "@angular-eslint/eslint-plugin": "~22.0.0",
+    "@angular-eslint/eslint-plugin-template": "~22.0.0",
+    "@angular-eslint/template-parser": "~22.0.0",
+    "@angular/animations": "~22.0.0",
+    "@angular/aria": "~22.0.0",
+    "@angular/build": "~22.0.0",
+    "@angular/cli": "~22.0.0",
+    "@angular/common": "~22.0.0",
+    "@angular/compiler": "~22.0.0",
+    "@angular/compiler-cli": "~22.0.0",
+    "@angular/core": "~22.0.0",
+    "@angular/forms": "~22.0.0",
+    "@angular/language-service": "~22.0.0",
+    "@angular/localize": "~22.0.0",
+    "@angular/platform-browser": "~22.0.0",
+    "@angular/platform-browser-dynamic": "~22.0.0",
+    "@angular/platform-server": "~22.0.0",
+    "@angular/router": "~22.0.0",
+    "@angular/ssr": "~22.0.0",
     "@fortawesome/fontawesome-free": "^6.0.0",
     "@ng-bootstrap/ng-bootstrap": "~20.0.0",
     "@ngneat/spectator": "~19.6.2",
@@ -159,4 +160,4 @@
   "dependencies": {
     "openid-client": "^6.6.4"
   }
-}
+}
\ No newline at end of file