Merge pull request #160 from abpframework/issue/159-update-angular-15…

…-abp-7

Update Client app to angular 15 and Abp 7.0

.github/workflows/dotnet.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

README.md

@@ -16,7 +16,7 @@ You can either run in Visual Studio, or using [Microsoft Tye](https://github.com
 
  ### Requirements
 
-- .NET 6.0+
+- .NET 7.0+
 - Docker
 - Yarn
 

apps/angular/package.json

@@ -12,34 +12,35 @@
   },
   "private": true,
   "dependencies": {
-    "@abp/ng.account": "~6.0.0",
-    "@abp/ng.components": "~6.0.0",
-    "@abp/ng.core": "~6.0.0",
-    "@abp/ng.identity": "~6.0.0",
-    "@abp/ng.setting-management": "~6.0.0",
-    "@abp/ng.tenant-management": "~6.0.0",
-    "@abp/ng.theme.basic": "~6.0.0",
+    "@abp/ng.account": "~7.0.0",
+    "@abp/ng.components": "~7.0.0",
+    "@abp/ng.core": "~7.0.0",
+    "@abp/ng.identity": "~7.0.0",
+    "@abp/ng.oauth": "^7.0.0",
+    "@abp/ng.setting-management": "~7.0.0",
+    "@abp/ng.tenant-management": "~7.0.0",
+    "@abp/ng.theme.basic": "~7.0.0",
     "@abp/ng.theme.lepton-x": "~1.0.0-rc.7",
-    "@abp/ng.theme.shared": "~6.0.0",
-    "@angular/animations": "^14.2.5",
-    "@angular/common": "^14.2.5",
-    "@angular/compiler": "^14.2.5",
-    "@angular/core": "^14.2.5",
-    "@angular/forms": "^14.2.5",
-    "@angular/localize": "^14.2.5",
-    "@angular/platform-browser": "^14.2.5",
-    "@angular/platform-browser-dynamic": "^14.2.5",
-    "@angular/router": "^14.2.5",
-    "rxjs": "~6.6.0",
-    "tslib": "^2.0.0",
+    "@abp/ng.theme.shared": "~7.0.0",
+    "@angular/animations": "^15.0.4",
+    "@angular/common": "^15.0.4",
+    "@angular/compiler": "^15.0.4",
+    "@angular/core": "^15.0.4",
+    "@angular/forms": "^15.0.4",
+    "@angular/localize": "^15.0.4",
+    "@angular/platform-browser": "^15.0.4",
+    "@angular/platform-browser-dynamic": "^15.0.4",
+    "@angular/router": "^15.0.4",
+    "rxjs": "7.5.6",
+    "tslib": "^2.3.0",
     "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@abp/ng.schematics": "~6.0.0",
-    "@angular-devkit/build-angular": "^14.2.5",
-    "@angular/cli": "^14.2.5",
-    "@angular/compiler-cli": "^14.2.5",
-    "@angular/language-service": "^14.2.5",
+    "@abp/ng.schematics": "~7.0.0",
+    "@angular-devkit/build-angular": "^15.0.4",
+    "@angular/cli": "^15.0.4",
+    "@angular/compiler-cli": "^15.0.4",
+    "@angular/language-service": "^15.0.4",
     "@types/jasmine": "~3.5.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",
@@ -51,11 +52,11 @@
     "karma-coverage-istanbul-reporter": "~3.0.2",
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
-    "ng-packagr": "^14.2.1",
+    "ng-packagr": "^15.0.3",
     "prettier": "^2.6.0",
     "protractor": "~7.0.0",
     "ts-node": "~8.3.0",
     "tslint": "~6.1.0",
-    "typescript": "~4.6.4"
+    "typescript": "~4.8.4"
   }
-}
+}

apps/angular/projects/catalog/src/test.ts

@@ -8,21 +8,9 @@ import {
   platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';
 
-declare const require: {
-  context(path: string, deep?: boolean, filter?: RegExp): {
-    keys(): string[];
-    <T>(id: string): T;
-  };
-};
-
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
   platformBrowserDynamicTesting(),
   { teardown: { destroyAfterEach: true }},
 );
-
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().map(context);

apps/angular/projects/catalog/tsconfig.lib.json

@@ -2,7 +2,6 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
-    "target": "es2020",
     "declaration": true,
     "declarationMap": true,
     "inlineSources": true,

apps/angular/projects/ordering/src/test.ts

@@ -8,21 +8,9 @@ import {
   platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';
 
-declare const require: {
-  context(path: string, deep?: boolean, filter?: RegExp): {
-    keys(): string[];
-    <T>(id: string): T;
-  };
-};
-
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
   platformBrowserDynamicTesting(),
   { teardown: { destroyAfterEach: true }},
 );
-
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().map(context);

apps/angular/projects/ordering/tsconfig.lib.json

@@ -2,7 +2,6 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
-    "target": "es2020",
     "declaration": true,
     "declarationMap": true,
     "inlineSources": true,

apps/angular/src/app/app-routing.module.ts

@@ -36,7 +36,7 @@ const routes: Routes = [
 ];
 
 @NgModule({
-  imports: [RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' })],
+  imports: [RouterModule.forRoot(routes, {})],
   exports: [RouterModule],
 })
 export class AppRoutingModule {}

apps/angular/src/app/app.module.ts

@@ -17,7 +17,7 @@ import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { APP_ROUTE_PROVIDER } from './route.provider';
 import { OrderingConfigModule } from '@eshoponabp/ordering/config';
-
+import { AbpOAuthModule } from '@abp/ng.oauth';
 @NgModule({
   imports: [
     BrowserModule,
@@ -27,6 +27,7 @@ import { OrderingConfigModule } from '@eshoponabp/ordering/config';
       environment,
       registerLocaleFn: registerLocale(),
     }),
+    AbpOAuthModule.forRoot(),
     ThemeSharedModule.forRoot(),
     AccountConfigModule.forRoot(),
     IdentityConfigModule.forRoot(),

apps/angular/src/test.ts

@@ -7,21 +7,10 @@ import {
   platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';
 
-declare const require: {
-  context(path: string, deep?: boolean, filter?: RegExp): {
-    keys(): string[];
-    <T>(id: string): T;
-  };
-};
-
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
   platformBrowserDynamicTesting(), {
     teardown: { destroyAfterEach: false }
 }
 );
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().map(context);

apps/angular/tsconfig.json

@@ -10,27 +10,33 @@
     "module": "esnext",
     "moduleResolution": "node",
     "importHelpers": true,
-    "target": "es2020",
-    "typeRoots": ["node_modules/@types"],
-    "lib": ["es2018", "dom"],
+    "target": "ES2022",
+    "typeRoots": [
+      "node_modules/@types"
+    ],
+    "lib": [
+      "es2018",
+      "dom"
+    ],
     "paths": {
       "@eshoponabp/catalog/config": [
         "node_modules/@eshoponabp/catalog/config",
         "projects/catalog/config/src/public-api.ts"
       ],
       "@eshoponabp/catalog": [
         "node_modules/@eshoponabp/catalog",
-        "projects/catalog/src/public-api.ts",
+        "projects/catalog/src/public-api.ts"
       ],
       "@eshoponabp/ordering/config": [
         "node_modules/@eshoponabp/ordering/config",
-        "projects/ordering/config/src/public-api.ts",
+        "projects/ordering/config/src/public-api.ts"
       ],
       "@eshoponabp/ordering": [
         "node_modules/@eshoponabp/ordering",
-        "projects/ordering/src/public-api.ts",
-      ],
-    }
+        "projects/ordering/src/public-api.ts"
+      ]
+    },
+    "useDefineForClassFields": false
   },
   "angularCompilerOptions": {
     "fullTemplateTypeCheck": true,