diff --git a/npm/ng-packs/.eslintignore b/npm/ng-packs/.eslintignore
index 191ae4cc94..982e2bfac2 100644
--- a/npm/ng-packs/.eslintignore
+++ b/npm/ng-packs/.eslintignore
@@ -1 +1,2 @@
+node_modules
 *.d.ts
\ No newline at end of file
diff --git a/npm/ng-packs/.eslintrc.json b/npm/ng-packs/.eslintrc.json
index 87fe5b1589..db77e663de 100644
--- a/npm/ng-packs/.eslintrc.json
+++ b/npm/ng-packs/.eslintrc.json
@@ -1,12 +1,12 @@
 {
   "root": true,
   "ignorePatterns": ["**/*"],
-  "plugins": ["@nrwl/nx"],
+  "plugins": ["@nx"],
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
       "rules": {
-        "@nrwl/nx/enforce-module-boundaries": [
+        "@nx/enforce-module-boundaries": [
           "error",
           {
             "enforceBuildableLibDependency": true,
@@ -23,7 +23,7 @@
     },
     {
       "files": ["*.ts", "*.tsx"],
-      "extends": ["plugin:@nrwl/nx/typescript"],
+      "extends": ["plugin:@nx/typescript"],
       "rules": {
         "@typescript-eslint/no-namespace": "off",
         "@typescript-eslint/no-empty-function": ["warn"],
@@ -32,7 +32,7 @@
     },
     {
       "files": ["*.js", "*.jsx"],
-      "extends": ["plugin:@nrwl/nx/javascript"],
+      "extends": ["plugin:@nx/javascript"],
       "rules": {}
     }
   ]
diff --git a/npm/ng-packs/angular.json b/npm/ng-packs/angular.json
deleted file mode 100644
index 14416d1d3a..0000000000
--- a/npm/ng-packs/angular.json
+++ /dev/null
@@ -1,762 +0,0 @@
-{
-  "version": 1,
-  "projects": {
-    "account": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
-      "projectType": "library",
-      "root": "packages/account",
-      "sourceRoot": "packages/account/src",
-      "prefix": "abp",
-      "architect": {
-        "build": {
-          "builder": "@nrwl/angular:package",
-          "outputs": ["{workspaceRoot}/dist/packages/account"],
-          "options": {
-            "project": "packages/account/ng-package.json"
-          },
-          "configurations": {
-            "production": {
-              "tsConfig": "packages/account/tsconfig.lib.prod.json"
-            },
-            "development": {
-              "tsConfig": "packages/account/tsconfig.lib.json"
-            }
-          },
-          "defaultConfiguration": "production"
-        },
-        "test": {
-          "builder": "@nrwl/jest:jest",
-          "outputs": ["{workspaceRoot}/coverage/packages/account"],
-          "options": {
-            "jestConfig": "packages/account/jest.config.ts",
-            "passWithNoTests": true
-          }
-        },
-        "lint": {
-          "builder": "@nrwl/linter:eslint",
-          "options": {
-            "lintFilePatterns": ["packages/account/src/**/*.ts", "packages/account/src/**/*.html"]
-          },
-          "outputs": ["{options.outputFile}"]
-        }
-      },
-      "tags": [],
-      "implicitDependencies": ["core", "theme-shared", "account-core"]
-    },
-    "account-core": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
-      "projectType": "library",
-      "root": "packages/account-core",
-      "sourceRoot": "packages/account-core/src",
-      "prefix": "abp",
-      "architect": {
-        "build": {
-          "builder": "@nrwl/angular:package",
-          "outputs": ["{workspaceRoot}/dist/packages/account-core"],
-          "options": {
-            "project": "packages/account-core/ng-package.json"
-          },
-          "configurations": {
-            "production": {
-              "tsConfig": "packages/account-core/tsconfig.lib.prod.json"
-            },
-            "development": {
-              "tsConfig": "packages/account-core/tsconfig.lib.json"
-            }
-          },
-          "defaultConfiguration": "production"
-        },
-        "test": {
-          "builder": "@nrwl/jest:jest",
-          "outputs": ["{workspaceRoot}/coverage/packages/account-core"],
-          "options": {
-            "jestConfig": "packages/account-core/jest.config.ts",
-            "passWithNoTests": true
-          }
-        },
-        "lint": {
-          "builder": "@nrwl/linter:eslint",
-          "options": {
-            "lintFilePatterns": [
-              "packages/account-core/src/**/*.ts",
-              "packages/account-core/src/**/*.html"
-            ]
-          },
-          "outputs": ["{options.outputFile}"]
-        }
-      },
-      "tags": [],
-      "implicitDependencies": ["core", "theme-shared"]
-    },
-    "components": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
-      "projectType": "library",
-      "root": "packages/components",
-      "sourceRoot": "packages/components/src",
-      "prefix": "abp",
-      "architect": {
-        "build": {
-          "builder": "@nrwl/angular:package",
-          "outputs": ["{workspaceRoot}/dist/packages/components"],
-          "options": {
-            "project": "packages/components/ng-package.json"
-          },
-          "configurations": {
-            "production": {
-              "tsConfig": "packages/components/tsconfig.lib.prod.json"
-            },
-            "development": {
-              "tsConfig": "packages/components/tsconfig.lib.json"
-            }
-          },
-          "defaultConfiguration": "production"
-        },
-        "test": {
-          "builder": "@nrwl/jest:jest",
-          "outputs": ["{workspaceRoot}/coverage/packages/components"],
-          "options": {
-            "jestConfig": "packages/components/jest.config.ts",
-            "passWithNoTests": true
-          }
-        },
-        "lint": {
-          "builder": "@nrwl/linter:eslint",
-          "options": {
-            "lintFilePatterns": [
-              "packages/components/src/**/*.ts",
-              "packages/components/src/**/*.html"
-            ]
-          },
-          "outputs": ["{options.outputFile}"]
-        }
-      },
-      "tags": [],
-      "implicitDependencies": ["core", "theme-shared"]
-    },
-    "core": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
-      "projectType": "library",
-      "root": "packages/core",
-      "sourceRoot": "packages/core/src",
-      "prefix": "abp",
-      "architect": {
-        "build": {
-          "builder": "@nrwl/angular:package",
-          "outputs": ["{workspaceRoot}/dist/packages/core"],
-          "options": {
-            "project": "packages/core/ng-package.json"
-          },
-          "configurations": {
-            "production": {
-              "tsConfig": "packages/core/tsconfig.lib.prod.json"
-            },
-            "development": {
-              "tsConfig": "packages/core/tsconfig.lib.json"
-            }
-          },
-          "defaultConfiguration": "production"
-        },
-        "test": {
-          "builder": "@nrwl/jest:jest",
-          "outputs": ["{workspaceRoot}/coverage/packages/core"],
-          "options": {
-            "jestConfig": "packages/core/jest.config.ts",
-            "passWithNoTests": true
-          }
-        },
-        "lint": {
-          "builder": "@nrwl/linter:eslint",
-          "options": {
-            "lintFilePatterns": ["packages/core/src/**/*.ts", "packages/core/src/**/*.html"]
-          },
-          "outputs": ["{options.outputFile}"]
-        }
-      },
-      "tags": []
-    },
-    "dev-app": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
-      "projectType": "application",
-      "root": "apps/dev-app",
-      "sourceRoot": "apps/dev-app/src",
-      "prefix": "app",
-      "architect": {
-        "build": {
-          "builder": "@angular-devkit/build-angular:browser",
-          "outputs": ["{options.outputPath}"],
-          "options": {
-            "outputPath": "dist/apps/dev-app",
-            "index": "apps/dev-app/src/index.html",
-            "main": "apps/dev-app/src/main.ts",
-            "polyfills": "apps/dev-app/src/polyfills.ts",
-            "tsConfig": "apps/dev-app/tsconfig.app.json",
-            "inlineStyleLanguage": "scss",
-            "allowedCommonJsDependencies": ["chart.js", "js-sha256"],
-            "assets": ["apps/dev-app/src/favicon.ico", "apps/dev-app/src/assets"],
-            "styles": [
-              {
-                "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/bootstrap-dim.css",
-                "inject": false,
-                "bundleName": "bootstrap-dim"
-              },
-              {
-                "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/ng-bundle.css",
-                "inject": false,
-                "bundleName": "ng-bundle"
-              },
-              {
-                "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/side-menu/layout-bundle.css",
-                "inject": false,
-                "bundleName": "layout-bundle"
-              },
-              {
-                "input": "node_modules/@abp/ng.theme.lepton-x/assets/css/abp-bundle.css",
-                "inject": false,
-                "bundleName": "abp-bundle"
-              },
-              {
-                "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/bootstrap-dim.rtl.css",
-                "inject": false,
-                "bundleName": "bootstrap-dim.rtl"
-              },
-              {
-                "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/ng-bundle.rtl.css",
-                "inject": false,
-                "bundleName": "ng-bundle.rtl"
-              },
-              {
-                "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/side-menu/layout-bundle.rtl.css",
-                "inject": false,
-                "bundleName": "layout-bundle.rtl"
-              },
-              {
-                "input": "node_modules/@abp/ng.theme.lepton-x/assets/css/abp-bundle.rtl.css",
-                "inject": false,
-                "bundleName": "abp-bundle.rtl"
-              },
-              {
-                "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/font-bundle.rtl.css",
-                "inject": false,
-                "bundleName": "font-bundle.rtl"
-              },
-              {
-                "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/font-bundle.css",
-                "inject": false,
-                "bundleName": "font-bundle"
-              },
-              {
-                "input": "node_modules/@fortawesome/fontawesome-free/css/all.min.css",
-                "inject": true,
-                "bundleName": "fontawesome-all.min"
-              },
-              {
-                "input": "node_modules/@fortawesome/fontawesome-free/css/v4-shims.min.css",
-                "inject": true,
-                "bundleName": "fontawesome-v4-shims.min"
-              },
-              {
-                "input": "node_modules/@swimlane/ngx-datatable/index.css",
-                "inject": true,
-                "bundleName": "ngx-datatable-index"
-              },
-              {
-                "input": "node_modules/@swimlane/ngx-datatable/assets/icons.css",
-                "inject": true,
-                "bundleName": "ngx-datatable-icons"
-              },
-              {
-                "input": "node_modules/@swimlane/ngx-datatable/themes/material.css",
-                "inject": true,
-                "bundleName": "ngx-datatable-material"
-              },
-              {
-                "input": "node_modules/ng-zorro-antd/tree/style/index.min.css",
-                "inject": false,
-                "bundleName": "ng-zorro-antd-tree"
-              },
-              "node_modules/bootstrap-icons/font/bootstrap-icons.css",
-              "apps/dev-app/src/styles.scss"
-            ],
-            "scripts": []
-          },
-          "configurations": {
-            "production": {
-              "tsConfig": "apps/dev-app/tsconfig.app.json",
-              "budgets": [
-                {
-                  "type": "initial",
-                  "maximumWarning": "1mb",
-                  "maximumError": "5mb"
-                },
-                {
-                  "type": "anyComponentStyle",
-                  "maximumWarning": "6kb",
-                  "maximumError": "10kb"
-                }
-              ],
-              "fileReplacements": [
-                {
-                  "replace": "apps/dev-app/src/environments/environment.ts",
-                  "with": "apps/dev-app/src/environments/environment.prod.ts"
-                }
-              ],
-              "outputHashing": "all"
-            },
-            "development": {
-              "buildOptimizer": false,
-              "optimization": false,
-              "vendorChunk": true,
-              "extractLicenses": false,
-              "sourceMap": true,
-              "namedChunks": true
-            }
-          },
-          "defaultConfiguration": "production"
-        },
-        "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
-          "configurations": {
-            "production": {
-              "browserTarget": "dev-app:build:production"
-            },
-            "development": {
-              "browserTarget": "dev-app:build:development"
-            }
-          },
-          "defaultConfiguration": "development"
-        },
-        "extract-i18n": {
-          "builder": "@angular-devkit/build-angular:extract-i18n",
-          "options": {
-            "browserTarget": "dev-app:build"
-          }
-        },
-        "lint": {
-          "builder": "@nrwl/linter:eslint",
-          "options": {
-            "lintFilePatterns": ["apps/dev-app/src/**/*.ts", "apps/dev-app/src/**/*.html"]
-          }
-        },
-        "test": {
-          "builder": "@nrwl/jest:jest",
-          "outputs": ["{workspaceRoot}/coverage/apps/dev-app"],
-          "options": {
-            "jestConfig": "apps/dev-app/jest.config.ts",
-            "passWithNoTests": true
-          }
-        }
-      }
-    },
-    "dev-app-e2e": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
-      "root": "apps/dev-app-e2e",
-      "sourceRoot": "apps/dev-app-e2e/src",
-      "projectType": "application",
-      "architect": {
-        "e2e": {
-          "builder": "@nrwl/cypress:cypress",
-          "options": {
-            "cypressConfig": "apps/dev-app-e2e/cypress.json",
-            "tsConfig": "apps/dev-app-e2e/tsconfig.e2e.json",
-            "devServerTarget": "dev-app:serve:development"
-          },
-          "configurations": {
-            "production": {
-              "devServerTarget": "dev-app:serve:production"
-            }
-          }
-        },
-        "lint": {
-          "builder": "@nrwl/linter:eslint",
-          "options": {
-            "lintFilePatterns": ["apps/dev-app-e2e/**/*.{js,ts}"]
-          },
-          "outputs": ["{options.outputFile}"]
-        }
-      },
-      "tags": [],
-      "implicitDependencies": ["dev-app"]
-    },
-    "feature-management": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
-      "projectType": "library",
-      "root": "packages/feature-management",
-      "sourceRoot": "packages/feature-management/src",
-      "prefix": "abp",
-      "architect": {
-        "build": {
-          "builder": "@nrwl/angular:package",
-          "outputs": ["{workspaceRoot}/dist/packages/feature-management"],
-          "options": {
-            "project": "packages/feature-management/ng-package.json"
-          },
-          "configurations": {
-            "production": {
-              "tsConfig": "packages/feature-management/tsconfig.lib.prod.json"
-            },
-            "development": {
-              "tsConfig": "packages/feature-management/tsconfig.lib.json"
-            }
-          },
-          "defaultConfiguration": "production"
-        },
-        "test": {
-          "builder": "@nrwl/jest:jest",
-          "outputs": ["{workspaceRoot}/coverage/packages/feature-management"],
-          "options": {
-            "jestConfig": "packages/feature-management/jest.config.ts",
-            "passWithNoTests": true
-          }
-        },
-        "lint": {
-          "builder": "@nrwl/linter:eslint",
-          "options": {
-            "lintFilePatterns": [
-              "packages/feature-management/src/**/*.ts",
-              "packages/feature-management/src/**/*.html"
-            ]
-          },
-          "outputs": ["{options.outputFile}"]
-        }
-      },
-      "tags": [],
-      "implicitDependencies": ["core", "theme-shared"]
-    },
-    "identity": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
-      "projectType": "library",
-      "root": "packages/identity",
-      "sourceRoot": "packages/identity/src",
-      "prefix": "abp",
-      "architect": {
-        "build": {
-          "builder": "@nrwl/angular:package",
-          "outputs": ["{workspaceRoot}/dist/packages/identity"],
-          "options": {
-            "project": "packages/identity/ng-package.json"
-          },
-          "configurations": {
-            "production": {
-              "tsConfig": "packages/identity/tsconfig.lib.prod.json"
-            },
-            "development": {
-              "tsConfig": "packages/identity/tsconfig.lib.json"
-            }
-          },
-          "defaultConfiguration": "production"
-        },
-        "test": {
-          "builder": "@nrwl/jest:jest",
-          "outputs": ["{workspaceRoot}/coverage/packages/identity"],
-          "options": {
-            "jestConfig": "packages/identity/jest.config.ts",
-            "passWithNoTests": true
-          }
-        },
-        "lint": {
-          "builder": "@nrwl/linter:eslint",
-          "options": {
-            "lintFilePatterns": ["packages/identity/src/**/*.ts", "packages/identity/src/**/*.html"]
-          },
-          "outputs": ["{options.outputFile}"]
-        }
-      },
-      "tags": [],
-      "implicitDependencies": ["core", "theme-shared", "permission-management"]
-    },
-    "oauth": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
-      "projectType": "library",
-      "root": "packages/oauth",
-      "sourceRoot": "packages/oauth/src",
-      "prefix": "abp",
-      "architect": {
-        "build": {
-          "builder": "@nrwl/angular:package",
-          "outputs": ["{workspaceRoot}/dist/packages/oauth"],
-          "options": {
-            "project": "packages/oauth/ng-package.json"
-          },
-          "configurations": {
-            "production": {
-              "tsConfig": "packages/oauth/tsconfig.lib.prod.json"
-            },
-            "development": {
-              "tsConfig": "packages/oauth/tsconfig.lib.json"
-            }
-          },
-          "defaultConfiguration": "production"
-        },
-        "test": {
-          "builder": "@nrwl/jest:jest",
-          "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
-          "options": {
-            "jestConfig": "packages/oauth/jest.config.ts",
-            "passWithNoTests": true
-          }
-        },
-        "lint": {
-          "builder": "@nrwl/linter:eslint",
-          "options": {
-            "lintFilePatterns": ["packages/oauth/**/*.ts", "packages/oauth/**/*.html"]
-          }
-        }
-      },
-      "tags": [],
-      "implicitDependencies": ["core"]
-    },
-    "permission-management": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
-      "projectType": "library",
-      "root": "packages/permission-management",
-      "sourceRoot": "packages/permission-management/src",
-      "prefix": "abp",
-      "architect": {
-        "build": {
-          "builder": "@nrwl/angular:package",
-          "outputs": ["{workspaceRoot}/dist/packages/permission-management"],
-          "options": {
-            "project": "packages/permission-management/ng-package.json"
-          },
-          "configurations": {
-            "production": {
-              "tsConfig": "packages/permission-management/tsconfig.lib.prod.json"
-            },
-            "development": {
-              "tsConfig": "packages/permission-management/tsconfig.lib.json"
-            }
-          },
-          "defaultConfiguration": "production"
-        },
-        "test": {
-          "builder": "@nrwl/jest:jest",
-          "outputs": ["{workspaceRoot}/coverage/packages/permission-management"],
-          "options": {
-            "jestConfig": "packages/permission-management/jest.config.ts",
-            "passWithNoTests": true
-          }
-        },
-        "lint": {
-          "builder": "@nrwl/linter:eslint",
-          "options": {
-            "lintFilePatterns": [
-              "packages/permission-management/src/**/*.ts",
-              "packages/permission-management/src/**/*.html"
-            ]
-          },
-          "outputs": ["{options.outputFile}"]
-        }
-      },
-      "tags": [],
-      "implicitDependencies": ["core", "theme-shared"]
-    },
-    "schematics": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
-      "projectType": "library",
-      "root": "packages/schematics",
-      "sourceRoot": "packages/schematics/src",
-      "prefix": "abp",
-      "architect": {
-        "test": {
-          "builder": "@nrwl/jest:jest",
-          "outputs": ["{workspaceRoot}/coverage/packages/schematics"],
-          "options": {
-            "jestConfig": "packages/schematics/jest.config.ts",
-            "passWithNoTests": true
-          }
-        },
-        "lint": {
-          "builder": "@nrwl/linter:eslint",
-          "options": {
-            "lintFilePatterns": [
-              "packages/schematics/src/**/*.ts",
-              "packages/schematics/src/**/*.html"
-            ]
-          },
-          "outputs": ["{options.outputFile}"]
-        }
-      },
-      "tags": []
-    },
-    "setting-management": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
-      "projectType": "library",
-      "root": "packages/setting-management",
-      "sourceRoot": "packages/setting-management/src",
-      "prefix": "abp",
-      "architect": {
-        "build": {
-          "builder": "@nrwl/angular:package",
-          "outputs": ["{workspaceRoot}/dist/packages/setting-management"],
-          "options": {
-            "project": "packages/setting-management/ng-package.json"
-          },
-          "configurations": {
-            "production": {
-              "tsConfig": "packages/setting-management/tsconfig.lib.prod.json"
-            },
-            "development": {
-              "tsConfig": "packages/setting-management/tsconfig.lib.json"
-            }
-          },
-          "defaultConfiguration": "production"
-        },
-        "test": {
-          "builder": "@nrwl/jest:jest",
-          "outputs": ["{workspaceRoot}/coverage/packages/setting-management"],
-          "options": {
-            "jestConfig": "packages/setting-management/jest.config.ts",
-            "passWithNoTests": true
-          }
-        },
-        "lint": {
-          "builder": "@nrwl/linter:eslint",
-          "options": {
-            "lintFilePatterns": [
-              "packages/setting-management/src/**/*.ts",
-              "packages/setting-management/src/**/*.html"
-            ]
-          },
-          "outputs": ["{options.outputFile}"]
-        }
-      },
-      "tags": [],
-      "implicitDependencies": ["core", "theme-shared", "components"]
-    },
-    "tenant-management": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
-      "projectType": "library",
-      "root": "packages/tenant-management",
-      "sourceRoot": "packages/tenant-management/src",
-      "prefix": "abp",
-      "architect": {
-        "build": {
-          "builder": "@nrwl/angular:package",
-          "outputs": ["{workspaceRoot}/dist/packages/tenant-management"],
-          "options": {
-            "project": "packages/tenant-management/ng-package.json"
-          },
-          "configurations": {
-            "production": {
-              "tsConfig": "packages/tenant-management/tsconfig.lib.prod.json"
-            },
-            "development": {
-              "tsConfig": "packages/tenant-management/tsconfig.lib.json"
-            }
-          },
-          "defaultConfiguration": "production"
-        },
-        "test": {
-          "builder": "@nrwl/jest:jest",
-          "outputs": ["{workspaceRoot}/coverage/packages/tenant-management"],
-          "options": {
-            "jestConfig": "packages/tenant-management/jest.config.ts",
-            "passWithNoTests": true
-          }
-        },
-        "lint": {
-          "builder": "@nrwl/linter:eslint",
-          "options": {
-            "lintFilePatterns": [
-              "packages/tenant-management/src/**/*.ts",
-              "packages/tenant-management/src/**/*.html"
-            ]
-          },
-          "outputs": ["{options.outputFile}"]
-        }
-      },
-      "tags": [],
-      "implicitDependencies": ["core", "theme-shared", "feature-management"]
-    },
-    "theme-basic": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
-      "projectType": "library",
-      "root": "packages/theme-basic",
-      "sourceRoot": "packages/theme-basic/src",
-      "prefix": "abp",
-      "architect": {
-        "build": {
-          "builder": "@nrwl/angular:package",
-          "outputs": ["{workspaceRoot}/dist/packages/theme-basic"],
-          "options": {
-            "project": "packages/theme-basic/ng-package.json"
-          },
-          "configurations": {
-            "production": {
-              "tsConfig": "packages/theme-basic/tsconfig.lib.prod.json"
-            },
-            "development": {
-              "tsConfig": "packages/theme-basic/tsconfig.lib.json"
-            }
-          },
-          "defaultConfiguration": "production"
-        },
-        "test": {
-          "builder": "@nrwl/jest:jest",
-          "outputs": ["{workspaceRoot}/coverage/packages/theme-basic"],
-          "options": {
-            "jestConfig": "packages/theme-basic/jest.config.ts",
-            "passWithNoTests": true
-          }
-        },
-        "lint": {
-          "builder": "@nrwl/linter:eslint",
-          "options": {
-            "lintFilePatterns": [
-              "packages/theme-basic/src/**/*.ts",
-              "packages/theme-basic/src/**/*.html"
-            ]
-          },
-          "outputs": ["{options.outputFile}"]
-        }
-      },
-      "tags": [],
-      "implicitDependencies": ["core", "theme-shared", "account-core"]
-    },
-    "theme-shared": {
-      "$schema": "../../node_modules/nx/schemas/project-schema.json",
-      "projectType": "library",
-      "root": "packages/theme-shared",
-      "sourceRoot": "packages/theme-shared/src",
-      "prefix": "abp",
-      "architect": {
-        "build": {
-          "builder": "@nrwl/angular:package",
-          "outputs": ["{workspaceRoot}/dist/packages/theme-shared"],
-          "options": {
-            "project": "packages/theme-shared/ng-package.json"
-          },
-          "configurations": {
-            "production": {
-              "tsConfig": "packages/theme-shared/tsconfig.lib.prod.json"
-            },
-            "development": {
-              "tsConfig": "packages/theme-shared/tsconfig.lib.json"
-            }
-          },
-          "defaultConfiguration": "production"
-        },
-        "test": {
-          "builder": "@nrwl/jest:jest",
-          "outputs": ["{workspaceRoot}/coverage/packages/theme-shared"],
-          "options": {
-            "jestConfig": "packages/theme-shared/jest.config.ts",
-            "passWithNoTests": true
-          }
-        },
-        "lint": {
-          "builder": "@nrwl/linter:eslint",
-          "options": {
-            "lintFilePatterns": [
-              "packages/theme-shared/src/**/*.ts",
-              "packages/theme-shared/src/**/*.html"
-            ]
-          },
-          "outputs": ["{options.outputFile}"]
-        }
-      },
-      "tags": [],
-      "implicitDependencies": ["core", "oauth"]
-    }
-  }
-}
diff --git a/npm/ng-packs/apps/dev-app-e2e/project.json b/npm/ng-packs/apps/dev-app-e2e/project.json
new file mode 100644
index 0000000000..da264535ee
--- /dev/null
+++ b/npm/ng-packs/apps/dev-app-e2e/project.json
@@ -0,0 +1,30 @@
+{
+  "name": "dev-app-e2e",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "apps/dev-app-e2e/src",
+  "projectType": "application",
+  "targets": {
+    "e2e": {
+      "executor": "@nx/cypress:cypress",
+      "options": {
+        "cypressConfig": "apps/dev-app-e2e/cypress.json",
+        "tsConfig": "apps/dev-app-e2e/tsconfig.e2e.json",
+        "devServerTarget": "dev-app:serve:development"
+      },
+      "configurations": {
+        "production": {
+          "devServerTarget": "dev-app:serve:production"
+        }
+      }
+    },
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "options": {
+        "lintFilePatterns": ["apps/dev-app-e2e/**/*.{js,ts}"]
+      },
+      "outputs": ["{options.outputFile}"]
+    }
+  },
+  "tags": [],
+  "implicitDependencies": ["dev-app"]
+}
diff --git a/npm/ng-packs/apps/dev-app-e2e/src/plugins/index.js b/npm/ng-packs/apps/dev-app-e2e/src/plugins/index.js
index 5b06a6c11d..5bc231af9b 100644
--- a/npm/ng-packs/apps/dev-app-e2e/src/plugins/index.js
+++ b/npm/ng-packs/apps/dev-app-e2e/src/plugins/index.js
@@ -11,7 +11,7 @@
 // This function is called when a project is opened or re-opened (e.g. due to
 // the project's config changing)
 
-const { preprocessTypescript } = require('@nrwl/cypress/plugins/preprocessor');
+const { preprocessTypescript } = require('@nx/cypress/plugins/preprocessor');
 
 module.exports = (on, config) => {
   // `on` is used to hook into various events Cypress emits
diff --git a/npm/ng-packs/apps/dev-app/.eslintrc.json b/npm/ng-packs/apps/dev-app/.eslintrc.json
index fd1ac7ecb9..e0b12a59a7 100644
--- a/npm/ng-packs/apps/dev-app/.eslintrc.json
+++ b/npm/ng-packs/apps/dev-app/.eslintrc.json
@@ -4,10 +4,7 @@
   "overrides": [
     {
       "files": ["*.ts"],
-      "extends": [
-        "plugin:@nrwl/nx/angular",
-        "plugin:@angular-eslint/template/process-inline-templates"
-      ],
+      "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
       "rules": {
         "@angular-eslint/directive-selector": [
           "error",
@@ -29,7 +26,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]
diff --git a/npm/ng-packs/apps/dev-app/jest.config.ts b/npm/ng-packs/apps/dev-app/jest.config.ts
index d99acad413..1978d6ab89 100644
--- a/npm/ng-packs/apps/dev-app/jest.config.ts
+++ b/npm/ng-packs/apps/dev-app/jest.config.ts
@@ -3,15 +3,16 @@ export default {
   displayName: 'dev-app',
   preset: '../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-      stringifyContentPathRegex: '\\.(html|svg)$',
-    },
-  },
+  globals: {},
   coverageDirectory: '../../coverage/apps/dev-app',
   transform: {
-    '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
+    '^.+.(ts|mjs|js|html)$': [
+      'jest-preset-angular',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+        stringifyContentPathRegex: '\\.(html|svg)$',
+      },
+    ],
   },
   transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
   snapshotSerializers: [
diff --git a/npm/ng-packs/apps/dev-app/project.json b/npm/ng-packs/apps/dev-app/project.json
new file mode 100644
index 0000000000..fa47ae5bb1
--- /dev/null
+++ b/npm/ng-packs/apps/dev-app/project.json
@@ -0,0 +1,173 @@
+{
+  "name": "dev-app",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "application",
+  "sourceRoot": "apps/dev-app/src",
+  "prefix": "app",
+  "targets": {
+    "build": {
+      "executor": "@angular-devkit/build-angular:browser",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "dist/apps/dev-app",
+        "index": "apps/dev-app/src/index.html",
+        "main": "apps/dev-app/src/main.ts",
+        "polyfills": "apps/dev-app/src/polyfills.ts",
+        "tsConfig": "apps/dev-app/tsconfig.app.json",
+        "inlineStyleLanguage": "scss",
+        "allowedCommonJsDependencies": ["chart.js", "js-sha256"],
+        "assets": ["apps/dev-app/src/favicon.ico", "apps/dev-app/src/assets"],
+        "styles": [
+          {
+            "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/bootstrap-dim.css",
+            "inject": false,
+            "bundleName": "bootstrap-dim"
+          },
+          {
+            "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/ng-bundle.css",
+            "inject": false,
+            "bundleName": "ng-bundle"
+          },
+          {
+            "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/side-menu/layout-bundle.css",
+            "inject": false,
+            "bundleName": "layout-bundle"
+          },
+          {
+            "input": "node_modules/@abp/ng.theme.lepton-x/assets/css/abp-bundle.css",
+            "inject": false,
+            "bundleName": "abp-bundle"
+          },
+          {
+            "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/bootstrap-dim.rtl.css",
+            "inject": false,
+            "bundleName": "bootstrap-dim.rtl"
+          },
+          {
+            "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/ng-bundle.rtl.css",
+            "inject": false,
+            "bundleName": "ng-bundle.rtl"
+          },
+          {
+            "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/side-menu/layout-bundle.rtl.css",
+            "inject": false,
+            "bundleName": "layout-bundle.rtl"
+          },
+          {
+            "input": "node_modules/@abp/ng.theme.lepton-x/assets/css/abp-bundle.rtl.css",
+            "inject": false,
+            "bundleName": "abp-bundle.rtl"
+          },
+          {
+            "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/font-bundle.rtl.css",
+            "inject": false,
+            "bundleName": "font-bundle.rtl"
+          },
+          {
+            "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/font-bundle.css",
+            "inject": false,
+            "bundleName": "font-bundle"
+          },
+          {
+            "input": "node_modules/@fortawesome/fontawesome-free/css/all.min.css",
+            "inject": true,
+            "bundleName": "fontawesome-all.min"
+          },
+          {
+            "input": "node_modules/@fortawesome/fontawesome-free/css/v4-shims.min.css",
+            "inject": true,
+            "bundleName": "fontawesome-v4-shims.min"
+          },
+          {
+            "input": "node_modules/@swimlane/ngx-datatable/index.css",
+            "inject": true,
+            "bundleName": "ngx-datatable-index"
+          },
+          {
+            "input": "node_modules/@swimlane/ngx-datatable/assets/icons.css",
+            "inject": true,
+            "bundleName": "ngx-datatable-icons"
+          },
+          {
+            "input": "node_modules/@swimlane/ngx-datatable/themes/material.css",
+            "inject": true,
+            "bundleName": "ngx-datatable-material"
+          },
+          {
+            "input": "node_modules/ng-zorro-antd/tree/style/index.min.css",
+            "inject": false,
+            "bundleName": "ng-zorro-antd-tree"
+          },
+          "node_modules/bootstrap-icons/font/bootstrap-icons.css",
+          "apps/dev-app/src/styles.scss"
+        ],
+        "scripts": []
+      },
+      "configurations": {
+        "production": {
+          "tsConfig": "apps/dev-app/tsconfig.app.json",
+          "budgets": [
+            {
+              "type": "initial",
+              "maximumWarning": "1mb",
+              "maximumError": "5mb"
+            },
+            {
+              "type": "anyComponentStyle",
+              "maximumWarning": "6kb",
+              "maximumError": "10kb"
+            }
+          ],
+          "fileReplacements": [
+            {
+              "replace": "apps/dev-app/src/environments/environment.ts",
+              "with": "apps/dev-app/src/environments/environment.prod.ts"
+            }
+          ],
+          "outputHashing": "all"
+        },
+        "development": {
+          "buildOptimizer": false,
+          "optimization": false,
+          "vendorChunk": true,
+          "extractLicenses": false,
+          "sourceMap": true,
+          "namedChunks": true
+        }
+      },
+      "defaultConfiguration": "production"
+    },
+    "serve": {
+      "executor": "@angular-devkit/build-angular:dev-server",
+      "configurations": {
+        "production": {
+          "browserTarget": "dev-app:build:production"
+        },
+        "development": {
+          "browserTarget": "dev-app:build:development"
+        }
+      },
+      "defaultConfiguration": "development"
+    },
+    "extract-i18n": {
+      "executor": "@angular-devkit/build-angular:extract-i18n",
+      "options": {
+        "browserTarget": "dev-app:build"
+      }
+    },
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "options": {
+        "lintFilePatterns": ["apps/dev-app/src/**/*.ts", "apps/dev-app/src/**/*.html"]
+      }
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/apps/dev-app"],
+      "options": {
+        "jestConfig": "apps/dev-app/jest.config.ts",
+        "passWithNoTests": true
+      }
+    }
+  }
+}
diff --git a/npm/ng-packs/decorate-angular-cli.js b/npm/ng-packs/decorate-angular-cli.js
index 7e9dbc1e10..a795830bd1 100644
--- a/npm/ng-packs/decorate-angular-cli.js
+++ b/npm/ng-packs/decorate-angular-cli.js
@@ -27,10 +27,10 @@ const cp = require('child_process');
 const isWindows = os.platform() === 'win32';
 let output;
 try {
-  output = require('@nrwl/workspace').output;
+  output = require('@nx/workspace').output;
 } catch (e) {
   console.warn(
-    'Angular CLI could not be decorated to enable computation caching. Please ensure @nrwl/workspace is installed.',
+    'Angular CLI could not be decorated to enable computation caching. Please ensure @nx/workspace is installed.',
   );
   process.exit(0);
 }
diff --git a/npm/ng-packs/jest.config.ts b/npm/ng-packs/jest.config.ts
index 2a738f7746..d0dbd1b889 100644
--- a/npm/ng-packs/jest.config.ts
+++ b/npm/ng-packs/jest.config.ts
@@ -1,4 +1,4 @@
-import { getJestProjects } from '@nrwl/jest';
+import { getJestProjects } from '@nx/jest';
 
 export default {
   projects: getJestProjects(),
diff --git a/npm/ng-packs/jest.preset.js b/npm/ng-packs/jest.preset.js
index e6c8ebea00..c1c3c4cdcd 100644
--- a/npm/ng-packs/jest.preset.js
+++ b/npm/ng-packs/jest.preset.js
@@ -1,3 +1,15 @@
-const nxPreset = require('@nrwl/jest/preset').default;
+const nxPreset = require('@nx/jest/preset').default;
 
-module.exports = { ...nxPreset };
+module.exports = {
+  ...nxPreset,
+  /* TODO: Update to latest Jest snapshotFormat
+   * By default Nx has kept the older style of Jest Snapshot formats
+   * to prevent breaking of any existing tests with snapshots.
+   * It's recommend you update to the latest format.
+   * You can do this by removing snapshotFormat property
+   * and running tests with --update-snapshot flag.
+   * Example: "nx affected --targets=test --update-snapshot"
+   * More info: https://jestjs.io/docs/upgrading-to-jest29#snapshot-format
+   */
+  snapshotFormat: { escapeString: true, printBasicPrototype: true },
+};
diff --git a/npm/ng-packs/migrations.json b/npm/ng-packs/migrations.json
index a44c341a86..46a1a2dffe 100644
--- a/npm/ng-packs/migrations.json
+++ b/npm/ng-packs/migrations.json
@@ -1,162 +1,25 @@
 {
   "migrations": [
     {
-      "cli": "nx",
-      "version": "15.0.0-beta.1",
-      "description": "Replace implicitDependencies with namedInputs + target inputs",
-      "implementation": "./src/migrations/update-15-0-0/migrate-to-inputs",
-      "package": "nx",
-      "name": "15.0.0-migrate-to-inputs"
+      "version": "16.0.0",
+      "factory": "./update-16/remove-default-project-option",
+      "description": "Remove 'defaultProject' option from workspace configuration. The project to use will be determined from the current working directory.",
+      "package": "@angular/cli",
+      "name": "remove-default-project-option"
     },
     {
-      "cli": "nx",
-      "version": "15.0.0-beta.1",
-      "description": "Prefix outputs with {workspaceRoot}/{projectRoot} if needed",
-      "implementation": "./src/migrations/update-15-0-0/prefix-outputs",
-      "package": "nx",
-      "name": "15.0.0-prefix-outputs"
+      "version": "16.0.0",
+      "factory": "./update-16/replace-default-collection-option",
+      "description": "Replace removed 'defaultCollection' option in workspace configuration with 'schematicCollections'.",
+      "package": "@angular/cli",
+      "name": "replace-default-collection-option"
     },
     {
-      "cli": "nx",
-      "version": "15.0.12-beta.1",
-      "description": "Set project names in project.json files",
-      "implementation": "./src/migrations/update-15-1-0/set-project-names",
-      "package": "nx",
-      "name": "15.1.0-set-project-names"
-    },
-    {
-      "cli": "nx",
-      "version": "15.0.0-beta.0",
-      "description": "Rename @nrwl/angular:webpack-server executor to @nrwl/angular:webpack-dev-server",
-      "factory": "./src/migrations/update-14-8-0/rename-webpack-server",
-      "package": "@nrwl/angular",
-      "name": "rename-webpack-server-executor"
-    },
-    {
-      "cli": "nx",
-      "version": "15.0.0-beta.0",
-      "description": "Update the usages of @nrwl/angular/testing to import jasmine-marbles symbols from jasmine-marbles itself.",
-      "factory": "./src/migrations/update-15-0-0/switch-to-jasmine-marbles",
-      "package": "@nrwl/angular",
-      "name": "switch-to-jasmine-marbles"
-    },
-    {
-      "cli": "nx",
-      "version": "15.0.0-beta.1",
-      "description": "Stop hashing karma spec files and config files for build targets and dependent tasks",
-      "factory": "./src/migrations/update-15-0-0/add-karma-inputs",
-      "package": "@nrwl/angular",
-      "name": "add-karma-inputs"
-    },
-    {
-      "cli": "nx",
-      "version": "15.2.0-beta.0",
-      "description": "Update the @angular/cli package version to ~15.0.0.",
-      "factory": "./src/migrations/update-15-2-0/update-angular-cli",
-      "package": "@nrwl/angular",
-      "name": "update-angular-cli-version-15-0-0"
-    },
-    {
-      "cli": "nx",
-      "version": "15.2.0-beta.0",
-      "description": "Remove browserlist config as it's handled by build-angular",
-      "factory": "./src/migrations/update-15-2-0/remove-browserlist-config",
-      "package": "@nrwl/angular",
-      "name": "remove-browserlist-config"
-    },
-    {
-      "cli": "nx",
-      "version": "15.2.0-beta.0",
-      "description": "Update typescript target to ES2022",
-      "factory": "./src/migrations/update-15-2-0/update-typescript-target",
-      "package": "@nrwl/angular",
-      "name": "update-typescript-target"
-    },
-    {
-      "cli": "nx",
-      "version": "15.2.0-beta.0",
-      "description": "Remove bundleDependencies from server targets",
-      "factory": "./src/migrations/update-15-2-0/update-workspace-config",
-      "package": "@nrwl/angular",
-      "name": "update-workspace-config"
-    },
-    {
-      "cli": "ng",
-      "version": "15.2.0-beta.0",
-      "description": "Remove exported `@angular/platform-server` `renderModule` method. The `renderModule` method is now exported by the Angular CLI.",
-      "factory": "./src/migrations/update-15-2-0/remove-platform-server-exports",
-      "package": "@nrwl/angular",
-      "name": "update-platform-server-exports"
-    },
-    {
-      "cli": "ng",
-      "version": "15.2.0-beta.0",
-      "description": "Remove no longer needed require calls in Karma builder main file.",
-      "factory": "./src/migrations/update-15-2-0/update-karma-main-file",
-      "package": "@nrwl/angular",
-      "name": "update-karma-main-file"
-    },
-    {
-      "version": "15.0.0-beta",
-      "description": "Since Angular v15, the `RouterLink` contains the logic of the `RouterLinkWithHref` directive. This migration replaces all `RouterLinkWithHref` references with `RouterLink`.",
-      "factory": "./migrations/router-link-with-href/index",
-      "package": "@angular/core",
-      "name": "migration-v15-router-link-with-href"
-    },
-    {
-      "version": "15.0.0-beta",
-      "description": "In Angular version 15, the deprecated `relativeLinkResolution` config parameter of the Router is removed. This migration removes all `relativeLinkResolution` fields from the Router config objects.",
-      "factory": "./migrations/relative-link-resolution/index",
-      "package": "@angular/core",
-      "name": "migration-v15-relative-link-resolution"
-    },
-    {
-      "cli": "nx",
-      "version": "15.0.0-beta.0",
-      "description": "Stop hashing cypress spec files and config files for build targets and dependent tasks",
-      "factory": "./src/migrations/update-15-0-0/add-cypress-inputs",
-      "package": "@nrwl/cypress",
-      "name": "add-cypress-inputs"
-    },
-    {
-      "cli": "nx",
-      "version": "15.0.0-beta.4",
-      "description": "Update to using cy.mount in the commands.ts file instead of importing mount for each component test file",
-      "factory": "./src/migrations/update-15-0-0/update-cy-mount-usage",
-      "package": "@nrwl/cypress",
-      "name": "update-cy-mount-usage"
-    },
-    {
-      "cli": "nx",
-      "version": "15.1.0-beta.0",
-      "description": "Update to Cypress v11. This migration will only update if the workspace is already on v10. https://www.cypress.io/blog/2022/11/04/upcoming-changes-to-component-testing/",
-      "factory": "./src/migrations/update-15-1-0/cypress-11",
-      "package": "@nrwl/cypress",
-      "name": "update-to-cypress-11"
-    },
-    {
-      "version": "15.0.0-beta.0",
-      "cli": "nx",
-      "description": "Stop hashing jest spec files and config files for build targets and dependent tasks",
-      "factory": "./src/migrations/update-15-0-0/add-jest-inputs",
-      "package": "@nrwl/jest",
-      "name": "add-jest-inputs"
-    },
-    {
-      "cli": "nx",
-      "version": "15.0.0-beta.0",
-      "description": "Stop hashing eslint config files for build targets and dependent tasks",
-      "factory": "./src/migrations/update-15-0-0/add-eslint-inputs",
-      "package": "@nrwl/linter",
-      "name": "add-eslint-inputs"
-    },
-    {
-      "version": "14.8.0-beta.0",
-      "description": "Migrates from @nrwl/workspace:run-commands to nx:run-commands",
-      "cli": "nx",
-      "implementation": "./src/migrations/update-14-8-0/change-run-commands-executor",
-      "package": "@nrwl/workspace",
-      "name": "14-8-0-change-run-commands-executor"
+      "version": "16.0.0",
+      "factory": "./update-16/update-server-builder-config",
+      "description": "Update the '@angular-devkit/build-angular:server' builder configuration to disable 'buildOptimizer' for non optimized builds.",
+      "package": "@angular/cli",
+      "name": "update-server-builder-config"
     }
   ]
 }
diff --git a/npm/ng-packs/nx.json b/npm/ng-packs/nx.json
index 68238cd979..3897fa16f1 100644
--- a/npm/ng-packs/nx.json
+++ b/npm/ng-packs/nx.json
@@ -21,30 +21,30 @@
   },
   "defaultProject": "dev-app",
   "generators": {
-    "@nrwl/angular": {
-      "application": {
-        "linter": "eslint"
-      },
-      "library": {
-        "linter": "eslint"
-      },
-      "storybook-configuration": {
-        "linter": "eslint"
-      }
-    },
-    "@nrwl/angular:application": {
+    "@nx/angular:application": {
       "style": "scss",
       "linter": "eslint",
       "unitTestRunner": "jest",
       "e2eTestRunner": "cypress"
     },
-    "@nrwl/angular:library": {
+    "@nx/angular:library": {
       "linter": "eslint",
       "unitTestRunner": "jest",
       "strict": false
     },
-    "@nrwl/angular:component": {
+    "@nx/angular:component": {
       "style": "scss"
+    },
+    "@nx/angular": {
+      "application": {
+        "linter": "eslint"
+      },
+      "library": {
+        "linter": "eslint"
+      },
+      "storybook-configuration": {
+        "linter": "eslint"
+      }
     }
   },
   "$schema": "./node_modules/nx/schemas/nx-schema.json",
diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json
index 27e0d13b5f..72d54cd09c 100644
--- a/npm/ng-packs/package.json
+++ b/npm/ng-packs/package.json
@@ -7,7 +7,7 @@
     "nx": "nx",
     "start": "ng serve",
     "build": "ng build",
-    "build:all": "nx run-many --target=build --all --exclude=dev-app,schematics --prod && yarn build:schematics",
+    "build:all": "nx run-many --target=build --all --exclude=dev-app,schematics --prod  ",
     "test": "ng test --detect-open-handles=true --run-in-band=true --watch-all=true",
     "test:all": "nx run-many --target=test --all",
     "lint-staged": "lint-staged",
@@ -30,7 +30,7 @@
     "dep-graph": "nx dep-graph",
     "help": "nx help",
     "compile:ivy": "yarn ngcc --properties es2020 browser module main --first-only --create-ivy-entry-points --tsconfig './tsconfig.prod.json' --source node_modules",
-    "postinstall": "node ./decorate-angular-cli.js && yarn compile:ivy",
+    "postinstall2": "node ./decorate-angular-cli.js && yarn compile:ivy",
     "build:schematics": "cd scripts && yarn && yarn build:schematics && cd ..",
     "dev:schematics": "tsc -p packages/schematics/tsconfig.json -w",
     "mock:schematics": "cd scripts/mock-schematic && yarn && yarn start",
@@ -57,41 +57,41 @@
     "@abp/ng.theme.lepton-x": "^2.2.0",
     "@abp/ng.theme.shared": "~7.2.1",
     "@abp/utils": "~7.2.1",
-    "@angular-devkit/build-angular": "~15.0.1",
+    "@angular-devkit/build-angular": "16.0.1",
+    "@angular-devkit/core": "16.0.1",
+    "@angular-devkit/schematics": "16.0.1",
     "@angular-devkit/schematics-cli": "~15.0.1",
-    "@angular-eslint/eslint-plugin": "15.1.0",
-    "@angular-eslint/eslint-plugin-template": "15.1.0",
-    "@angular-eslint/template-parser": "15.1.0",
-    "@angular/animations": "~15.0.1",
-    "@angular/cli": "~15.0.1",
-    "@angular/common": "~15.0.1",
-    "@angular/compiler": "~15.0.1",
-    "@angular/compiler-cli": "~15.0.1",
-    "@angular/core": "~15.0.1",
-    "@angular/forms": "~15.0.1",
-    "@angular/language-service": "~15.0.1",
-    "@angular/localize": "~15.0.1",
-    "@angular/platform-browser": "~15.0.1",
-    "@angular/platform-browser-dynamic": "~15.0.1",
-    "@angular/router": "~15.0.1",
+    "@angular-eslint/eslint-plugin": "16.0.1",
+    "@angular-eslint/eslint-plugin-template": "16.0.1",
+    "@angular-eslint/template-parser": "16.0.1",
+    "@angular/animations": "16.0.1",
+    "@angular/cli": "16.0.1",
+    "@angular/common": "16.0.1",
+    "@angular/compiler": "16.0.1",
+    "@angular/compiler-cli": "16.0.1",
+    "@angular/core": "16.0.1",
+    "@angular/forms": "16.0.1",
+    "@angular/language-service": "16.0.1",
+    "@angular/localize": "16.0.1",
+    "@angular/platform-browser": "16.0.1",
+    "@angular/platform-browser-dynamic": "16.0.1",
+    "@angular/router": "16.0.1",
     "@fortawesome/fontawesome-free": "^5.15.4",
     "@ng-bootstrap/ng-bootstrap": "^14.0.0",
     "@ngneat/spectator": "^10.0.0",
     "@ngx-validate/core": "^0.2.0",
-    "@nrwl/angular": "15.2.1",
-    "@nrwl/cli": "15.2.1",
-    "@nrwl/cypress": "15.2.1",
-    "@nrwl/eslint-plugin-nx": "15.2.1",
-    "@nrwl/jest": "15.2.1",
-    "@nrwl/linter": "15.2.1",
-    "@nrwl/workspace": "15.2.1",
+    "@nx/cypress": "16.1.4",
+    "@nx/eslint-plugin": "16.1.4",
+    "@nx/jest": "16.1.4",
+    "@nx/linter": "16.1.4",
+    "@nx/workspace": "16.1.4",
     "@popperjs/core": "~2.11.2",
     "@schematics/angular": "~15.0.1",
     "@swimlane/ngx-datatable": "^20.0.0",
-    "@types/jest": "28.1.1",
+    "@types/jest": "29.4.4",
     "@types/node": "16.11.7",
-    "@typescript-eslint/eslint-plugin": "5.44.0",
-    "@typescript-eslint/parser": "5.44.0",
+    "@typescript-eslint/eslint-plugin": "5.59.5",
+    "@typescript-eslint/parser": "5.59.5",
     "angular-oauth2-oidc": "^15.0.1",
     "bootstrap": "^5.1.1",
     "bootstrap-icons": "^1.10.3",
@@ -102,10 +102,10 @@
     "eslint-config-prettier": "8.1.0",
     "eslint-plugin-cypress": "^2.10.3",
     "got": "^11.5.2",
-    "jest": "28.1.1",
+    "jest": "29.4.3",
     "jest-canvas-mock": "^2.3.1",
-    "jest-environment-jsdom": "28.1.1",
-    "jest-preset-angular": "^12.2.2",
+    "jest-environment-jsdom": "29.4.3",
+    "jest-preset-angular": "13.1.0",
     "jsonc-parser": "^2.3.0",
     "just-clone": "^6.1.1",
     "just-compare": "^2.3.0",
@@ -113,7 +113,7 @@
     "lint-staged": "^13.0.3",
     "ng-packagr": "15.0.1",
     "ng-zorro-antd": "^15.0.0",
-    "nx": "15.2.1",
+    "nx": "16.1.4",
     "perfect-scrollbar": "^1.5.5",
     "postcss": "^8.3.9",
     "postcss-import": "14.1.0",
@@ -121,19 +121,22 @@
     "postcss-url": "10.1.3",
     "prettier": "2.7.1",
     "protractor": "~7.0.0",
-    "rxjs": "7.5.6",
+    "rxjs": "7.8.1",
     "should-quote": "^1.0.0",
-    "ts-jest": "28.0.5",
+    "ts-jest": "29.1.0",
     "ts-node": "10.9.1",
     "ts-toolbelt": "6.15.4",
     "tslib": "^2.3.0",
     "tslint": "~6.1.0",
-    "typescript": "4.8.4",
-    "zone.js": "0.11.4"
+    "typescript": "5.0.4",
+    "zone.js": "0.11.4",
+    "@nx/angular": "16.1.4"
   },
   "lint-staged": {
     "**/*.{js,jsx,ts,tsx,html,css,scss}": [
       "npx prettier --write --config .prettierrc "
     ]
-  }
+  },
+  "dependencies": {}
 }
+
diff --git a/npm/ng-packs/packages/account-core/.eslintrc.json b/npm/ng-packs/packages/account-core/.eslintrc.json
index 9c51584494..5e303d20bb 100644
--- a/npm/ng-packs/packages/account-core/.eslintrc.json
+++ b/npm/ng-packs/packages/account-core/.eslintrc.json
@@ -4,10 +4,7 @@
   "overrides": [
     {
       "files": ["*.ts"],
-      "extends": [
-        "plugin:@nrwl/nx/angular",
-        "plugin:@angular-eslint/template/process-inline-templates"
-      ],
+      "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
       "rules": {
         "@angular-eslint/directive-selector": [
           "error",
@@ -29,7 +26,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]
diff --git a/npm/ng-packs/packages/account-core/jest.config.ts b/npm/ng-packs/packages/account-core/jest.config.ts
index 5e75611ffb..7ef24776c3 100644
--- a/npm/ng-packs/packages/account-core/jest.config.ts
+++ b/npm/ng-packs/packages/account-core/jest.config.ts
@@ -3,15 +3,16 @@ export default {
   displayName: 'account-core',
   preset: '../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-      stringifyContentPathRegex: '\\.(html|svg)$',
-    },
-  },
+  globals: {},
   coverageDirectory: '../../coverage/packages/account-core',
   transform: {
-    '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
+    '^.+.(ts|mjs|js|html)$': [
+      'jest-preset-angular',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+        stringifyContentPathRegex: '\\.(html|svg)$',
+      },
+    ],
   },
   transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
   snapshotSerializers: [
diff --git a/npm/ng-packs/packages/account-core/project.json b/npm/ng-packs/packages/account-core/project.json
new file mode 100644
index 0000000000..fe5e34ea61
--- /dev/null
+++ b/npm/ng-packs/packages/account-core/project.json
@@ -0,0 +1,45 @@
+{
+  "name": "account-core",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "library",
+  "sourceRoot": "packages/account-core/src",
+  "prefix": "abp",
+  "targets": {
+    "build": {
+      "executor": "@nx/angular:package",
+      "outputs": ["{workspaceRoot}/dist/packages/account-core"],
+      "options": {
+        "project": "packages/account-core/ng-package.json"
+      },
+      "configurations": {
+        "production": {
+          "tsConfig": "packages/account-core/tsconfig.lib.prod.json"
+        },
+        "development": {
+          "tsConfig": "packages/account-core/tsconfig.lib.json"
+        }
+      },
+      "defaultConfiguration": "production"
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/packages/account-core"],
+      "options": {
+        "jestConfig": "packages/account-core/jest.config.ts",
+        "passWithNoTests": true
+      }
+    },
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "options": {
+        "lintFilePatterns": [
+          "packages/account-core/src/**/*.ts",
+          "packages/account-core/src/**/*.html"
+        ]
+      },
+      "outputs": ["{options.outputFile}"]
+    }
+  },
+  "tags": [],
+  "implicitDependencies": ["core", "theme-shared"]
+}
diff --git a/npm/ng-packs/packages/account/.eslintrc.json b/npm/ng-packs/packages/account/.eslintrc.json
index 9c51584494..5e303d20bb 100644
--- a/npm/ng-packs/packages/account/.eslintrc.json
+++ b/npm/ng-packs/packages/account/.eslintrc.json
@@ -4,10 +4,7 @@
   "overrides": [
     {
       "files": ["*.ts"],
-      "extends": [
-        "plugin:@nrwl/nx/angular",
-        "plugin:@angular-eslint/template/process-inline-templates"
-      ],
+      "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
       "rules": {
         "@angular-eslint/directive-selector": [
           "error",
@@ -29,7 +26,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]
diff --git a/npm/ng-packs/packages/account/jest.config.ts b/npm/ng-packs/packages/account/jest.config.ts
index e30aceabc6..7630a18eb3 100644
--- a/npm/ng-packs/packages/account/jest.config.ts
+++ b/npm/ng-packs/packages/account/jest.config.ts
@@ -3,15 +3,16 @@ export default {
   displayName: 'account',
   preset: '../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-      stringifyContentPathRegex: '\\.(html|svg)$',
-    },
-  },
+  globals: {},
   coverageDirectory: '../../coverage/packages/account',
   transform: {
-    '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
+    '^.+.(ts|mjs|js|html)$': [
+      'jest-preset-angular',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+        stringifyContentPathRegex: '\\.(html|svg)$',
+      },
+    ],
   },
   transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
   snapshotSerializers: [
diff --git a/npm/ng-packs/packages/account/project.json b/npm/ng-packs/packages/account/project.json
new file mode 100644
index 0000000000..8b20413f23
--- /dev/null
+++ b/npm/ng-packs/packages/account/project.json
@@ -0,0 +1,42 @@
+{
+  "name": "account",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "library",
+  "sourceRoot": "packages/account/src",
+  "prefix": "abp",
+  "targets": {
+    "build": {
+      "executor": "@nx/angular:package",
+      "outputs": ["{workspaceRoot}/dist/packages/account"],
+      "options": {
+        "project": "packages/account/ng-package.json"
+      },
+      "configurations": {
+        "production": {
+          "tsConfig": "packages/account/tsconfig.lib.prod.json"
+        },
+        "development": {
+          "tsConfig": "packages/account/tsconfig.lib.json"
+        }
+      },
+      "defaultConfiguration": "production"
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/packages/account"],
+      "options": {
+        "jestConfig": "packages/account/jest.config.ts",
+        "passWithNoTests": true
+      }
+    },
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "options": {
+        "lintFilePatterns": ["packages/account/src/**/*.ts", "packages/account/src/**/*.html"]
+      },
+      "outputs": ["{options.outputFile}"]
+    }
+  },
+  "tags": [],
+  "implicitDependencies": ["core", "theme-shared", "account-core"]
+}
diff --git a/npm/ng-packs/packages/account/src/lib/guards/authentication-flow.guard.ts b/npm/ng-packs/packages/account/src/lib/guards/authentication-flow.guard.ts
index 6828615403..c669e32a97 100644
--- a/npm/ng-packs/packages/account/src/lib/guards/authentication-flow.guard.ts
+++ b/npm/ng-packs/packages/account/src/lib/guards/authentication-flow.guard.ts
@@ -1,9 +1,9 @@
 import { AuthService } from '@abp/ng.core';
 import { Injectable } from '@angular/core';
-import { CanActivate } from '@angular/router';
+
 
 @Injectable()
-export class AuthenticationFlowGuard implements CanActivate {
+export class AuthenticationFlowGuard  {
   constructor(private authService: AuthService) {}
 
   canActivate() {
diff --git a/npm/ng-packs/packages/account/src/lib/guards/extensions.guard.ts b/npm/ng-packs/packages/account/src/lib/guards/extensions.guard.ts
index 7c50eadf5e..be000782c2 100644
--- a/npm/ng-packs/packages/account/src/lib/guards/extensions.guard.ts
+++ b/npm/ng-packs/packages/account/src/lib/guards/extensions.guard.ts
@@ -1,5 +1,5 @@
 import { Injectable, Injector } from '@angular/core';
-import { CanActivate } from '@angular/router';
+
 import { Observable } from 'rxjs';
 import {
   ExtensionsService,
@@ -17,7 +17,7 @@ import { AccountEditFormPropContributors } from '../models/config-options';
 import { eAccountComponents } from '../enums/components';
 
 @Injectable()
-export class AccountExtensionsGuard implements CanActivate {
+export class AccountExtensionsGuard  {
   constructor(private injector: Injector) {}
 
   canActivate(): Observable<boolean> {
diff --git a/npm/ng-packs/packages/components/.eslintrc.json b/npm/ng-packs/packages/components/.eslintrc.json
index 9c51584494..5e303d20bb 100644
--- a/npm/ng-packs/packages/components/.eslintrc.json
+++ b/npm/ng-packs/packages/components/.eslintrc.json
@@ -4,10 +4,7 @@
   "overrides": [
     {
       "files": ["*.ts"],
-      "extends": [
-        "plugin:@nrwl/nx/angular",
-        "plugin:@angular-eslint/template/process-inline-templates"
-      ],
+      "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
       "rules": {
         "@angular-eslint/directive-selector": [
           "error",
@@ -29,7 +26,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]
diff --git a/npm/ng-packs/packages/components/jest.config.ts b/npm/ng-packs/packages/components/jest.config.ts
index 9ddcf41913..ff37b7e9e4 100644
--- a/npm/ng-packs/packages/components/jest.config.ts
+++ b/npm/ng-packs/packages/components/jest.config.ts
@@ -3,15 +3,16 @@ export default {
   displayName: 'components',
   preset: '../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-      stringifyContentPathRegex: '\\.(html|svg)$',
-    },
-  },
+  globals: {},
   coverageDirectory: '../../coverage/packages/components',
   transform: {
-    '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
+    '^.+.(ts|mjs|js|html)$': [
+      'jest-preset-angular',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+        stringifyContentPathRegex: '\\.(html|svg)$',
+      },
+    ],
   },
   transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
   snapshotSerializers: [
diff --git a/npm/ng-packs/packages/components/project.json b/npm/ng-packs/packages/components/project.json
new file mode 100644
index 0000000000..12a03b4ad1
--- /dev/null
+++ b/npm/ng-packs/packages/components/project.json
@@ -0,0 +1,42 @@
+{
+  "name": "components",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "library",
+  "sourceRoot": "packages/components/src",
+  "prefix": "abp",
+  "targets": {
+    "build": {
+      "executor": "@nx/angular:package",
+      "outputs": ["{workspaceRoot}/dist/packages/components"],
+      "options": {
+        "project": "packages/components/ng-package.json"
+      },
+      "configurations": {
+        "production": {
+          "tsConfig": "packages/components/tsconfig.lib.prod.json"
+        },
+        "development": {
+          "tsConfig": "packages/components/tsconfig.lib.json"
+        }
+      },
+      "defaultConfiguration": "production"
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/packages/components"],
+      "options": {
+        "jestConfig": "packages/components/jest.config.ts",
+        "passWithNoTests": true
+      }
+    },
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "options": {
+        "lintFilePatterns": ["packages/components/src/**/*.ts", "packages/components/src/**/*.html"]
+      },
+      "outputs": ["{options.outputFile}"]
+    }
+  },
+  "tags": [],
+  "implicitDependencies": ["core", "theme-shared"]
+}
diff --git a/npm/ng-packs/packages/core/.eslintrc.json b/npm/ng-packs/packages/core/.eslintrc.json
index 9c51584494..5e303d20bb 100644
--- a/npm/ng-packs/packages/core/.eslintrc.json
+++ b/npm/ng-packs/packages/core/.eslintrc.json
@@ -4,10 +4,7 @@
   "overrides": [
     {
       "files": ["*.ts"],
-      "extends": [
-        "plugin:@nrwl/nx/angular",
-        "plugin:@angular-eslint/template/process-inline-templates"
-      ],
+      "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
       "rules": {
         "@angular-eslint/directive-selector": [
           "error",
@@ -29,7 +26,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]
diff --git a/npm/ng-packs/packages/core/jest.config.ts b/npm/ng-packs/packages/core/jest.config.ts
index 2080d6850d..3dda0ce769 100644
--- a/npm/ng-packs/packages/core/jest.config.ts
+++ b/npm/ng-packs/packages/core/jest.config.ts
@@ -3,15 +3,16 @@ export default {
   displayName: 'core',
   preset: '../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-      stringifyContentPathRegex: '\\.(html|svg)$',
-    },
-  },
+  globals: {},
   coverageDirectory: '../../coverage/packages/core',
   transform: {
-    '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
+    '^.+.(ts|mjs|js|html)$': [
+      'jest-preset-angular',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+        stringifyContentPathRegex: '\\.(html|svg)$',
+      },
+    ],
   },
   transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
   snapshotSerializers: [
diff --git a/npm/ng-packs/packages/core/project.json b/npm/ng-packs/packages/core/project.json
new file mode 100644
index 0000000000..7afb4b248c
--- /dev/null
+++ b/npm/ng-packs/packages/core/project.json
@@ -0,0 +1,41 @@
+{
+  "name": "core",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "library",
+  "sourceRoot": "packages/core/src",
+  "prefix": "abp",
+  "targets": {
+    "build": {
+      "executor": "@nx/angular:package",
+      "outputs": ["{workspaceRoot}/dist/packages/core"],
+      "options": {
+        "project": "packages/core/ng-package.json"
+      },
+      "configurations": {
+        "production": {
+          "tsConfig": "packages/core/tsconfig.lib.prod.json"
+        },
+        "development": {
+          "tsConfig": "packages/core/tsconfig.lib.json"
+        }
+      },
+      "defaultConfiguration": "production"
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/packages/core"],
+      "options": {
+        "jestConfig": "packages/core/jest.config.ts",
+        "passWithNoTests": true
+      }
+    },
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "options": {
+        "lintFilePatterns": ["packages/core/src/**/*.ts", "packages/core/src/**/*.html"]
+      },
+      "outputs": ["{options.outputFile}"]
+    }
+  },
+  "tags": []
+}
diff --git a/npm/ng-packs/packages/core/src/lib/abstracts/auth.guard.ts b/npm/ng-packs/packages/core/src/lib/abstracts/auth.guard.ts
index fff0bdb8f5..8e380a46e3 100644
--- a/npm/ng-packs/packages/core/src/lib/abstracts/auth.guard.ts
+++ b/npm/ng-packs/packages/core/src/lib/abstracts/auth.guard.ts
@@ -1,4 +1,4 @@
-import { CanActivate, UrlTree } from '@angular/router';
+import { UrlTree } from '@angular/router';
 import { Observable } from 'rxjs';
 import { Injectable } from '@angular/core';
 @Injectable({
@@ -10,4 +10,4 @@ export class AuthGuard implements IAuthGuard {
     return false;
   }
 }
-export interface IAuthGuard extends CanActivate {}
+export interface IAuthGuard  {}
diff --git a/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts b/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts
index 35b7e55f1e..01df2d4556 100644
--- a/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts
+++ b/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts
@@ -1,6 +1,6 @@
 import { HttpErrorResponse } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router';
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
 import { Observable, of } from 'rxjs';
 import { tap } from 'rxjs/operators';
 import { HttpErrorReporterService } from '../services/http-error-reporter.service';
@@ -11,7 +11,7 @@ import { findRoute, getRoutePath } from '../utils/route-utils';
 @Injectable({
   providedIn: 'root',
 })
-export class PermissionGuard implements CanActivate {
+export class PermissionGuard  {
   constructor(
     private router: Router,
     private routesService: RoutesService,
diff --git a/npm/ng-packs/packages/feature-management/.eslintrc.json b/npm/ng-packs/packages/feature-management/.eslintrc.json
index 9c51584494..5e303d20bb 100644
--- a/npm/ng-packs/packages/feature-management/.eslintrc.json
+++ b/npm/ng-packs/packages/feature-management/.eslintrc.json
@@ -4,10 +4,7 @@
   "overrides": [
     {
       "files": ["*.ts"],
-      "extends": [
-        "plugin:@nrwl/nx/angular",
-        "plugin:@angular-eslint/template/process-inline-templates"
-      ],
+      "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
       "rules": {
         "@angular-eslint/directive-selector": [
           "error",
@@ -29,7 +26,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]
diff --git a/npm/ng-packs/packages/feature-management/jest.config.ts b/npm/ng-packs/packages/feature-management/jest.config.ts
index 6ae56ddba7..be424e36af 100644
--- a/npm/ng-packs/packages/feature-management/jest.config.ts
+++ b/npm/ng-packs/packages/feature-management/jest.config.ts
@@ -3,15 +3,16 @@ export default {
   displayName: 'feature-management',
   preset: '../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-      stringifyContentPathRegex: '\\.(html|svg)$',
-    },
-  },
+  globals: {},
   coverageDirectory: '../../coverage/packages/feature-management',
   transform: {
-    '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
+    '^.+.(ts|mjs|js|html)$': [
+      'jest-preset-angular',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+        stringifyContentPathRegex: '\\.(html|svg)$',
+      },
+    ],
   },
   transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
   snapshotSerializers: [
diff --git a/npm/ng-packs/packages/feature-management/project.json b/npm/ng-packs/packages/feature-management/project.json
new file mode 100644
index 0000000000..6770a0e8d3
--- /dev/null
+++ b/npm/ng-packs/packages/feature-management/project.json
@@ -0,0 +1,45 @@
+{
+  "name": "feature-management",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "library",
+  "sourceRoot": "packages/feature-management/src",
+  "prefix": "abp",
+  "targets": {
+    "build": {
+      "executor": "@nx/angular:package",
+      "outputs": ["{workspaceRoot}/dist/packages/feature-management"],
+      "options": {
+        "project": "packages/feature-management/ng-package.json"
+      },
+      "configurations": {
+        "production": {
+          "tsConfig": "packages/feature-management/tsconfig.lib.prod.json"
+        },
+        "development": {
+          "tsConfig": "packages/feature-management/tsconfig.lib.json"
+        }
+      },
+      "defaultConfiguration": "production"
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/packages/feature-management"],
+      "options": {
+        "jestConfig": "packages/feature-management/jest.config.ts",
+        "passWithNoTests": true
+      }
+    },
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "options": {
+        "lintFilePatterns": [
+          "packages/feature-management/src/**/*.ts",
+          "packages/feature-management/src/**/*.html"
+        ]
+      },
+      "outputs": ["{options.outputFile}"]
+    }
+  },
+  "tags": [],
+  "implicitDependencies": ["core", "theme-shared"]
+}
diff --git a/npm/ng-packs/packages/identity/.eslintrc.json b/npm/ng-packs/packages/identity/.eslintrc.json
index 9c51584494..5e303d20bb 100644
--- a/npm/ng-packs/packages/identity/.eslintrc.json
+++ b/npm/ng-packs/packages/identity/.eslintrc.json
@@ -4,10 +4,7 @@
   "overrides": [
     {
       "files": ["*.ts"],
-      "extends": [
-        "plugin:@nrwl/nx/angular",
-        "plugin:@angular-eslint/template/process-inline-templates"
-      ],
+      "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
       "rules": {
         "@angular-eslint/directive-selector": [
           "error",
@@ -29,7 +26,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]
diff --git a/npm/ng-packs/packages/identity/jest.config.ts b/npm/ng-packs/packages/identity/jest.config.ts
index 9a8941019d..469457531d 100644
--- a/npm/ng-packs/packages/identity/jest.config.ts
+++ b/npm/ng-packs/packages/identity/jest.config.ts
@@ -3,15 +3,16 @@ export default {
   displayName: 'identity',
   preset: '../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-      stringifyContentPathRegex: '\\.(html|svg)$',
-    },
-  },
+  globals: {},
   coverageDirectory: '../../coverage/packages/identity',
   transform: {
-    '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
+    '^.+.(ts|mjs|js|html)$': [
+      'jest-preset-angular',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+        stringifyContentPathRegex: '\\.(html|svg)$',
+      },
+    ],
   },
   transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
   snapshotSerializers: [
diff --git a/npm/ng-packs/packages/identity/project.json b/npm/ng-packs/packages/identity/project.json
new file mode 100644
index 0000000000..6efcfce40a
--- /dev/null
+++ b/npm/ng-packs/packages/identity/project.json
@@ -0,0 +1,42 @@
+{
+  "name": "identity",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "library",
+  "sourceRoot": "packages/identity/src",
+  "prefix": "abp",
+  "targets": {
+    "build": {
+      "executor": "@nx/angular:package",
+      "outputs": ["{workspaceRoot}/dist/packages/identity"],
+      "options": {
+        "project": "packages/identity/ng-package.json"
+      },
+      "configurations": {
+        "production": {
+          "tsConfig": "packages/identity/tsconfig.lib.prod.json"
+        },
+        "development": {
+          "tsConfig": "packages/identity/tsconfig.lib.json"
+        }
+      },
+      "defaultConfiguration": "production"
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/packages/identity"],
+      "options": {
+        "jestConfig": "packages/identity/jest.config.ts",
+        "passWithNoTests": true
+      }
+    },
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "options": {
+        "lintFilePatterns": ["packages/identity/src/**/*.ts", "packages/identity/src/**/*.html"]
+      },
+      "outputs": ["{options.outputFile}"]
+    }
+  },
+  "tags": [],
+  "implicitDependencies": ["core", "theme-shared", "permission-management"]
+}
diff --git a/npm/ng-packs/packages/identity/src/lib/guards/extensions.guard.ts b/npm/ng-packs/packages/identity/src/lib/guards/extensions.guard.ts
index 3b5d592acc..5fc747c6fb 100644
--- a/npm/ng-packs/packages/identity/src/lib/guards/extensions.guard.ts
+++ b/npm/ng-packs/packages/identity/src/lib/guards/extensions.guard.ts
@@ -7,7 +7,7 @@ import {
   mergeWithDefaultProps,
 } from '@abp/ng.theme.shared/extensions';
 import { Injectable, Injector } from '@angular/core';
-import { CanActivate } from '@angular/router';
+
 import { Observable } from 'rxjs';
 import { map, mapTo, tap } from 'rxjs/operators';
 import { eIdentityComponents } from '../enums/components';
@@ -32,7 +32,7 @@ import {
 } from '../tokens/extensions.token';
 
 @Injectable()
-export class IdentityExtensionsGuard implements CanActivate {
+export class IdentityExtensionsGuard  {
   constructor(private injector: Injector) {}
 
   canActivate(): Observable<boolean> {
diff --git a/npm/ng-packs/packages/oauth/.eslintrc.json b/npm/ng-packs/packages/oauth/.eslintrc.json
index 9c51584494..5e303d20bb 100644
--- a/npm/ng-packs/packages/oauth/.eslintrc.json
+++ b/npm/ng-packs/packages/oauth/.eslintrc.json
@@ -4,10 +4,7 @@
   "overrides": [
     {
       "files": ["*.ts"],
-      "extends": [
-        "plugin:@nrwl/nx/angular",
-        "plugin:@angular-eslint/template/process-inline-templates"
-      ],
+      "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
       "rules": {
         "@angular-eslint/directive-selector": [
           "error",
@@ -29,7 +26,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]
diff --git a/npm/ng-packs/packages/oauth/jest.config.ts b/npm/ng-packs/packages/oauth/jest.config.ts
index 4dd4b3eaf8..eb598713d5 100644
--- a/npm/ng-packs/packages/oauth/jest.config.ts
+++ b/npm/ng-packs/packages/oauth/jest.config.ts
@@ -3,15 +3,16 @@ export default {
   displayName: 'oauth',
   preset: '../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-      stringifyContentPathRegex: '\\.(html|svg)$',
-    },
-  },
+  globals: {},
   coverageDirectory: '../../coverage/packages/oauth',
   transform: {
-    '^.+\\.(ts|mjs|js|html)$': 'jest-preset-angular',
+    '^.+\\.(ts|mjs|js|html)$': [
+      'jest-preset-angular',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+        stringifyContentPathRegex: '\\.(html|svg)$',
+      },
+    ],
   },
   transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
   snapshotSerializers: [
diff --git a/npm/ng-packs/packages/oauth/project.json b/npm/ng-packs/packages/oauth/project.json
new file mode 100644
index 0000000000..6cb66f8b9a
--- /dev/null
+++ b/npm/ng-packs/packages/oauth/project.json
@@ -0,0 +1,41 @@
+{
+  "name": "oauth",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "library",
+  "sourceRoot": "packages/oauth/src",
+  "prefix": "abp",
+  "targets": {
+    "build": {
+      "executor": "@nx/angular:package",
+      "outputs": ["{workspaceRoot}/dist/packages/oauth"],
+      "options": {
+        "project": "packages/oauth/ng-package.json"
+      },
+      "configurations": {
+        "production": {
+          "tsConfig": "packages/oauth/tsconfig.lib.prod.json"
+        },
+        "development": {
+          "tsConfig": "packages/oauth/tsconfig.lib.json"
+        }
+      },
+      "defaultConfiguration": "production"
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "packages/oauth/jest.config.ts",
+        "passWithNoTests": true
+      }
+    },
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "options": {
+        "lintFilePatterns": ["packages/oauth/**/*.ts", "packages/oauth/**/*.html"]
+      }
+    }
+  },
+  "tags": [],
+  "implicitDependencies": ["core"]
+}
diff --git a/npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts b/npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts
index 357e861ba0..80fb17ebdd 100644
--- a/npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts
+++ b/npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { CanActivate, UrlTree } from '@angular/router';
+import { UrlTree } from '@angular/router';
 import { OAuthService } from 'angular-oauth2-oidc';
 import { Observable } from 'rxjs';
 import { AuthService, IAuthGuard } from '@abp/ng.core';
@@ -7,7 +7,7 @@ import { AuthService, IAuthGuard } from '@abp/ng.core';
 @Injectable({
   providedIn: 'root',
 })
-export class AbpOAuthGuard implements CanActivate, IAuthGuard {
+export class AbpOAuthGuard  implements IAuthGuard {
   constructor(private oauthService: OAuthService, private authService: AuthService) {}
 
   canActivate(): Observable<boolean> | boolean | UrlTree {
diff --git a/npm/ng-packs/packages/permission-management/.eslintrc.json b/npm/ng-packs/packages/permission-management/.eslintrc.json
index 9c51584494..5e303d20bb 100644
--- a/npm/ng-packs/packages/permission-management/.eslintrc.json
+++ b/npm/ng-packs/packages/permission-management/.eslintrc.json
@@ -4,10 +4,7 @@
   "overrides": [
     {
       "files": ["*.ts"],
-      "extends": [
-        "plugin:@nrwl/nx/angular",
-        "plugin:@angular-eslint/template/process-inline-templates"
-      ],
+      "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
       "rules": {
         "@angular-eslint/directive-selector": [
           "error",
@@ -29,7 +26,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]
diff --git a/npm/ng-packs/packages/permission-management/jest.config.ts b/npm/ng-packs/packages/permission-management/jest.config.ts
index 8466605cec..78cb7d6c8f 100644
--- a/npm/ng-packs/packages/permission-management/jest.config.ts
+++ b/npm/ng-packs/packages/permission-management/jest.config.ts
@@ -3,15 +3,16 @@ export default {
   displayName: 'permission-management',
   preset: '../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-      stringifyContentPathRegex: '\\.(html|svg)$',
-    },
-  },
+  globals: {},
   coverageDirectory: '../../coverage/packages/permission-management',
   transform: {
-    '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
+    '^.+.(ts|mjs|js|html)$': [
+      'jest-preset-angular',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+        stringifyContentPathRegex: '\\.(html|svg)$',
+      },
+    ],
   },
   transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
   snapshotSerializers: [
diff --git a/npm/ng-packs/packages/permission-management/project.json b/npm/ng-packs/packages/permission-management/project.json
new file mode 100644
index 0000000000..f75b3db322
--- /dev/null
+++ b/npm/ng-packs/packages/permission-management/project.json
@@ -0,0 +1,45 @@
+{
+  "name": "permission-management",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "library",
+  "sourceRoot": "packages/permission-management/src",
+  "prefix": "abp",
+  "targets": {
+    "build": {
+      "executor": "@nx/angular:package",
+      "outputs": ["{workspaceRoot}/dist/packages/permission-management"],
+      "options": {
+        "project": "packages/permission-management/ng-package.json"
+      },
+      "configurations": {
+        "production": {
+          "tsConfig": "packages/permission-management/tsconfig.lib.prod.json"
+        },
+        "development": {
+          "tsConfig": "packages/permission-management/tsconfig.lib.json"
+        }
+      },
+      "defaultConfiguration": "production"
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/packages/permission-management"],
+      "options": {
+        "jestConfig": "packages/permission-management/jest.config.ts",
+        "passWithNoTests": true
+      }
+    },
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "options": {
+        "lintFilePatterns": [
+          "packages/permission-management/src/**/*.ts",
+          "packages/permission-management/src/**/*.html"
+        ]
+      },
+      "outputs": ["{options.outputFile}"]
+    }
+  },
+  "tags": [],
+  "implicitDependencies": ["core", "theme-shared"]
+}
diff --git a/npm/ng-packs/packages/schematics/.eslintrc.json b/npm/ng-packs/packages/schematics/.eslintrc.json
index 66898d21b1..15e5145560 100644
--- a/npm/ng-packs/packages/schematics/.eslintrc.json
+++ b/npm/ng-packs/packages/schematics/.eslintrc.json
@@ -4,10 +4,7 @@
   "overrides": [
     {
       "files": ["*.ts"],
-      "extends": [
-        "plugin:@nrwl/nx/angular",
-        "plugin:@angular-eslint/template/process-inline-templates"
-      ],
+      "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
       "rules": {
         "@angular-eslint/directive-selector": [
           "error",
@@ -29,7 +26,7 @@
     },
     {
       "files": ["*.ts", "*.tsx"],
-      "extends": ["plugin:@nrwl/nx/typescript"],
+      "extends": ["plugin:@nx/typescript"],
       "rules": {
         "@typescript-eslint/no-non-null-assertion": "off",
         "@typescript-eslint/no-empty-function": ["warn"]
@@ -37,12 +34,12 @@
     },
     {
       "files": ["*.js", "*.jsx"],
-      "extends": ["plugin:@nrwl/nx/javascript"],
+      "extends": ["plugin:@nx/javascript"],
       "rules": {}
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]
diff --git a/npm/ng-packs/packages/schematics/jest.config.ts b/npm/ng-packs/packages/schematics/jest.config.ts
index c3b8ca27ef..fd25a52a8f 100644
--- a/npm/ng-packs/packages/schematics/jest.config.ts
+++ b/npm/ng-packs/packages/schematics/jest.config.ts
@@ -3,15 +3,16 @@ export default {
   displayName: 'schematics',
   preset: '../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-      stringifyContentPathRegex: '\\.(html|svg)$',
-    },
-  },
+  globals: {},
   coverageDirectory: '../../coverage/packages/schematics',
   transform: {
-    '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
+    '^.+.(ts|mjs|js|html)$': [
+      'jest-preset-angular',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+        stringifyContentPathRegex: '\\.(html|svg)$',
+      },
+    ],
   },
   transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
   snapshotSerializers: [
diff --git a/npm/ng-packs/packages/schematics/project.json b/npm/ng-packs/packages/schematics/project.json
new file mode 100644
index 0000000000..9455c9ce14
--- /dev/null
+++ b/npm/ng-packs/packages/schematics/project.json
@@ -0,0 +1,25 @@
+{
+  "name": "schematics",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "library",
+  "sourceRoot": "packages/schematics/src",
+  "prefix": "abp",
+  "targets": {
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/packages/schematics"],
+      "options": {
+        "jestConfig": "packages/schematics/jest.config.ts",
+        "passWithNoTests": true
+      }
+    },
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "options": {
+        "lintFilePatterns": ["packages/schematics/src/**/*.ts", "packages/schematics/src/**/*.html"]
+      },
+      "outputs": ["{options.outputFile}"]
+    }
+  },
+  "tags": []
+}
diff --git a/npm/ng-packs/packages/setting-management/.eslintrc.json b/npm/ng-packs/packages/setting-management/.eslintrc.json
index 9c51584494..5e303d20bb 100644
--- a/npm/ng-packs/packages/setting-management/.eslintrc.json
+++ b/npm/ng-packs/packages/setting-management/.eslintrc.json
@@ -4,10 +4,7 @@
   "overrides": [
     {
       "files": ["*.ts"],
-      "extends": [
-        "plugin:@nrwl/nx/angular",
-        "plugin:@angular-eslint/template/process-inline-templates"
-      ],
+      "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
       "rules": {
         "@angular-eslint/directive-selector": [
           "error",
@@ -29,7 +26,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]
diff --git a/npm/ng-packs/packages/setting-management/jest.config.ts b/npm/ng-packs/packages/setting-management/jest.config.ts
index e8e33a8588..17d04089d0 100644
--- a/npm/ng-packs/packages/setting-management/jest.config.ts
+++ b/npm/ng-packs/packages/setting-management/jest.config.ts
@@ -3,15 +3,16 @@ export default {
   displayName: 'setting-management',
   preset: '../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-      stringifyContentPathRegex: '\\.(html|svg)$',
-    },
-  },
+  globals: {},
   coverageDirectory: '../../coverage/packages/setting-management',
   transform: {
-    '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
+    '^.+.(ts|mjs|js|html)$': [
+      'jest-preset-angular',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+        stringifyContentPathRegex: '\\.(html|svg)$',
+      },
+    ],
   },
   transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
   snapshotSerializers: [
diff --git a/npm/ng-packs/packages/setting-management/project.json b/npm/ng-packs/packages/setting-management/project.json
new file mode 100644
index 0000000000..aaecb3eff6
--- /dev/null
+++ b/npm/ng-packs/packages/setting-management/project.json
@@ -0,0 +1,45 @@
+{
+  "name": "setting-management",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "library",
+  "sourceRoot": "packages/setting-management/src",
+  "prefix": "abp",
+  "targets": {
+    "build": {
+      "executor": "@nx/angular:package",
+      "outputs": ["{workspaceRoot}/dist/packages/setting-management"],
+      "options": {
+        "project": "packages/setting-management/ng-package.json"
+      },
+      "configurations": {
+        "production": {
+          "tsConfig": "packages/setting-management/tsconfig.lib.prod.json"
+        },
+        "development": {
+          "tsConfig": "packages/setting-management/tsconfig.lib.json"
+        }
+      },
+      "defaultConfiguration": "production"
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/packages/setting-management"],
+      "options": {
+        "jestConfig": "packages/setting-management/jest.config.ts",
+        "passWithNoTests": true
+      }
+    },
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "options": {
+        "lintFilePatterns": [
+          "packages/setting-management/src/**/*.ts",
+          "packages/setting-management/src/**/*.html"
+        ]
+      },
+      "outputs": ["{options.outputFile}"]
+    }
+  },
+  "tags": [],
+  "implicitDependencies": ["core", "theme-shared", "components"]
+}
diff --git a/npm/ng-packs/packages/tenant-management/.eslintrc.json b/npm/ng-packs/packages/tenant-management/.eslintrc.json
index 9c51584494..5e303d20bb 100644
--- a/npm/ng-packs/packages/tenant-management/.eslintrc.json
+++ b/npm/ng-packs/packages/tenant-management/.eslintrc.json
@@ -4,10 +4,7 @@
   "overrides": [
     {
       "files": ["*.ts"],
-      "extends": [
-        "plugin:@nrwl/nx/angular",
-        "plugin:@angular-eslint/template/process-inline-templates"
-      ],
+      "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
       "rules": {
         "@angular-eslint/directive-selector": [
           "error",
@@ -29,7 +26,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]
diff --git a/npm/ng-packs/packages/tenant-management/jest.config.ts b/npm/ng-packs/packages/tenant-management/jest.config.ts
index fb7aedc3b9..e69152e9ab 100644
--- a/npm/ng-packs/packages/tenant-management/jest.config.ts
+++ b/npm/ng-packs/packages/tenant-management/jest.config.ts
@@ -3,15 +3,16 @@ export default {
   displayName: 'tenant-management',
   preset: '../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-      stringifyContentPathRegex: '\\.(html|svg)$',
-    },
-  },
+  globals: {},
   coverageDirectory: '../../coverage/packages/tenant-management',
   transform: {
-    '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
+    '^.+.(ts|mjs|js|html)$': [
+      'jest-preset-angular',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+        stringifyContentPathRegex: '\\.(html|svg)$',
+      },
+    ],
   },
   transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
   snapshotSerializers: [
diff --git a/npm/ng-packs/packages/tenant-management/project.json b/npm/ng-packs/packages/tenant-management/project.json
new file mode 100644
index 0000000000..944722d8df
--- /dev/null
+++ b/npm/ng-packs/packages/tenant-management/project.json
@@ -0,0 +1,45 @@
+{
+  "name": "tenant-management",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "library",
+  "sourceRoot": "packages/tenant-management/src",
+  "prefix": "abp",
+  "targets": {
+    "build": {
+      "executor": "@nx/angular:package",
+      "outputs": ["{workspaceRoot}/dist/packages/tenant-management"],
+      "options": {
+        "project": "packages/tenant-management/ng-package.json"
+      },
+      "configurations": {
+        "production": {
+          "tsConfig": "packages/tenant-management/tsconfig.lib.prod.json"
+        },
+        "development": {
+          "tsConfig": "packages/tenant-management/tsconfig.lib.json"
+        }
+      },
+      "defaultConfiguration": "production"
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/packages/tenant-management"],
+      "options": {
+        "jestConfig": "packages/tenant-management/jest.config.ts",
+        "passWithNoTests": true
+      }
+    },
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "options": {
+        "lintFilePatterns": [
+          "packages/tenant-management/src/**/*.ts",
+          "packages/tenant-management/src/**/*.html"
+        ]
+      },
+      "outputs": ["{options.outputFile}"]
+    }
+  },
+  "tags": [],
+  "implicitDependencies": ["core", "theme-shared", "feature-management"]
+}
diff --git a/npm/ng-packs/packages/tenant-management/src/lib/guards/extensions.guard.ts b/npm/ng-packs/packages/tenant-management/src/lib/guards/extensions.guard.ts
index 32f014ddfd..cbe63210da 100644
--- a/npm/ng-packs/packages/tenant-management/src/lib/guards/extensions.guard.ts
+++ b/npm/ng-packs/packages/tenant-management/src/lib/guards/extensions.guard.ts
@@ -7,7 +7,7 @@ import {
   mergeWithDefaultProps,
 } from '@abp/ng.theme.shared/extensions';
 import { Injectable, Injector } from '@angular/core';
-import { CanActivate } from '@angular/router';
+
 import { Observable } from 'rxjs';
 import { map, mapTo, tap } from 'rxjs/operators';
 import { eTenantManagementComponents } from '../enums/components';
@@ -32,7 +32,7 @@ import {
 } from '../tokens/extensions.token';
 
 @Injectable()
-export class TenantManagementExtensionsGuard implements CanActivate {
+export class TenantManagementExtensionsGuard  {
   constructor(private injector: Injector) {}
 
   canActivate(): Observable<boolean> {
diff --git a/npm/ng-packs/packages/theme-basic/.eslintrc.json b/npm/ng-packs/packages/theme-basic/.eslintrc.json
index 9c51584494..5e303d20bb 100644
--- a/npm/ng-packs/packages/theme-basic/.eslintrc.json
+++ b/npm/ng-packs/packages/theme-basic/.eslintrc.json
@@ -4,10 +4,7 @@
   "overrides": [
     {
       "files": ["*.ts"],
-      "extends": [
-        "plugin:@nrwl/nx/angular",
-        "plugin:@angular-eslint/template/process-inline-templates"
-      ],
+      "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
       "rules": {
         "@angular-eslint/directive-selector": [
           "error",
@@ -29,7 +26,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]
diff --git a/npm/ng-packs/packages/theme-basic/jest.config.ts b/npm/ng-packs/packages/theme-basic/jest.config.ts
index 98804937a1..5e30d9abd6 100644
--- a/npm/ng-packs/packages/theme-basic/jest.config.ts
+++ b/npm/ng-packs/packages/theme-basic/jest.config.ts
@@ -3,15 +3,16 @@ export default {
   displayName: 'theme-basic',
   preset: '../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-      stringifyContentPathRegex: '\\.(html|svg)$',
-    },
-  },
+  globals: {},
   coverageDirectory: '../../coverage/packages/theme-basic',
   transform: {
-    '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
+    '^.+.(ts|mjs|js|html)$': [
+      'jest-preset-angular',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+        stringifyContentPathRegex: '\\.(html|svg)$',
+      },
+    ],
   },
   transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
   snapshotSerializers: [
diff --git a/npm/ng-packs/packages/theme-basic/project.json b/npm/ng-packs/packages/theme-basic/project.json
new file mode 100644
index 0000000000..653c109edd
--- /dev/null
+++ b/npm/ng-packs/packages/theme-basic/project.json
@@ -0,0 +1,45 @@
+{
+  "name": "theme-basic",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "library",
+  "sourceRoot": "packages/theme-basic/src",
+  "prefix": "abp",
+  "targets": {
+    "build": {
+      "executor": "@nx/angular:package",
+      "outputs": ["{workspaceRoot}/dist/packages/theme-basic"],
+      "options": {
+        "project": "packages/theme-basic/ng-package.json"
+      },
+      "configurations": {
+        "production": {
+          "tsConfig": "packages/theme-basic/tsconfig.lib.prod.json"
+        },
+        "development": {
+          "tsConfig": "packages/theme-basic/tsconfig.lib.json"
+        }
+      },
+      "defaultConfiguration": "production"
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/packages/theme-basic"],
+      "options": {
+        "jestConfig": "packages/theme-basic/jest.config.ts",
+        "passWithNoTests": true
+      }
+    },
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "options": {
+        "lintFilePatterns": [
+          "packages/theme-basic/src/**/*.ts",
+          "packages/theme-basic/src/**/*.html"
+        ]
+      },
+      "outputs": ["{options.outputFile}"]
+    }
+  },
+  "tags": [],
+  "implicitDependencies": ["core", "theme-shared", "account-core"]
+}
diff --git a/npm/ng-packs/packages/theme-shared/.eslintrc.json b/npm/ng-packs/packages/theme-shared/.eslintrc.json
index 9c51584494..5e303d20bb 100644
--- a/npm/ng-packs/packages/theme-shared/.eslintrc.json
+++ b/npm/ng-packs/packages/theme-shared/.eslintrc.json
@@ -4,10 +4,7 @@
   "overrides": [
     {
       "files": ["*.ts"],
-      "extends": [
-        "plugin:@nrwl/nx/angular",
-        "plugin:@angular-eslint/template/process-inline-templates"
-      ],
+      "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
       "rules": {
         "@angular-eslint/directive-selector": [
           "error",
@@ -29,7 +26,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]
diff --git a/npm/ng-packs/packages/theme-shared/jest.config.ts b/npm/ng-packs/packages/theme-shared/jest.config.ts
index b383024573..af6440fc3e 100644
--- a/npm/ng-packs/packages/theme-shared/jest.config.ts
+++ b/npm/ng-packs/packages/theme-shared/jest.config.ts
@@ -3,15 +3,16 @@ export default {
   displayName: 'theme-shared',
   preset: '../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-      stringifyContentPathRegex: '\\.(html|svg)$',
-    },
-  },
+  globals: {},
   coverageDirectory: '../../coverage/packages/theme-shared',
   transform: {
-    '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
+    '^.+.(ts|mjs|js|html)$': [
+      'jest-preset-angular',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+        stringifyContentPathRegex: '\\.(html|svg)$',
+      },
+    ],
   },
   transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
   snapshotSerializers: [
diff --git a/npm/ng-packs/packages/theme-shared/project.json b/npm/ng-packs/packages/theme-shared/project.json
new file mode 100644
index 0000000000..71a02e2be4
--- /dev/null
+++ b/npm/ng-packs/packages/theme-shared/project.json
@@ -0,0 +1,45 @@
+{
+  "name": "theme-shared",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "library",
+  "sourceRoot": "packages/theme-shared/src",
+  "prefix": "abp",
+  "targets": {
+    "build": {
+      "executor": "@nx/angular:package",
+      "outputs": ["{workspaceRoot}/dist/packages/theme-shared"],
+      "options": {
+        "project": "packages/theme-shared/ng-package.json"
+      },
+      "configurations": {
+        "production": {
+          "tsConfig": "packages/theme-shared/tsconfig.lib.prod.json"
+        },
+        "development": {
+          "tsConfig": "packages/theme-shared/tsconfig.lib.json"
+        }
+      },
+      "defaultConfiguration": "production"
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/packages/theme-shared"],
+      "options": {
+        "jestConfig": "packages/theme-shared/jest.config.ts",
+        "passWithNoTests": true
+      }
+    },
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "options": {
+        "lintFilePatterns": [
+          "packages/theme-shared/src/**/*.ts",
+          "packages/theme-shared/src/**/*.html"
+        ]
+      },
+      "outputs": ["{options.outputFile}"]
+    }
+  },
+  "tags": [],
+  "implicitDependencies": ["core", "oauth"]
+}
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/breadcrumb.component.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/breadcrumb.component.spec.ts
index bf06105b27..75f0c8ab55 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/tests/breadcrumb.component.spec.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/breadcrumb.component.spec.ts
@@ -8,7 +8,7 @@ import {
 import { HttpClient } from '@angular/common/http';
 import { RouterModule } from '@angular/router';
 import { createRoutingFactory, SpectatorRouting } from '@ngneat/spectator/jest';
-// eslint-disable-next-line @nrwl/nx/enforce-module-boundaries
+// eslint-disable-next-line @nx/enforce-module-boundaries
 import { mockRoutesService } from '../../../../core/src/lib/tests/routes.service.spec';
 import { BreadcrumbComponent, BreadcrumbItemsComponent } from '../components';
 
diff --git a/npm/ng-packs/scripts/mock-schematic/package.json b/npm/ng-packs/scripts/mock-schematic/package.json
index 72bdd34635..b4e4242ea3 100644
--- a/npm/ng-packs/scripts/mock-schematic/package.json
+++ b/npm/ng-packs/scripts/mock-schematic/package.json
@@ -16,7 +16,7 @@
     "ts-node": "^8.5.4",
     "tsconfig-paths": "^3.9.0",
     "typescript": "^3.7.4",
-    "nodemon":  "^2.0.19",
+    "nodemon": "^2.0.19",
     "@types/express": "^4.17.13"
   }
 }
diff --git a/npm/ng-packs/tools/generators/.gitkeep b/npm/ng-packs/tools/generators/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000