Browse Source

Update Client app to angular 15 and Abp 7.0

gterdem/swagger_update
Mahmut Gundogdu 4 years ago
parent
commit
8c4df2e91a
  1. 55
      apps/angular/package.json
  2. 12
      apps/angular/projects/catalog/src/test.ts
  3. 1
      apps/angular/projects/catalog/tsconfig.lib.json
  4. 12
      apps/angular/projects/ordering/src/test.ts
  5. 1
      apps/angular/projects/ordering/tsconfig.lib.json
  6. 2
      apps/angular/src/app/app-routing.module.ts
  7. 3
      apps/angular/src/app/app.module.ts
  8. 11
      apps/angular/src/test.ts
  9. 22
      apps/angular/tsconfig.json
  10. 3521
      apps/angular/yarn.lock

55
apps/angular/package.json

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

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

@ -8,21 +8,9 @@ import {
platformBrowserDynamicTesting platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing'; } 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. // First, initialize the Angular testing environment.
getTestBed().initTestEnvironment( getTestBed().initTestEnvironment(
BrowserDynamicTestingModule, BrowserDynamicTestingModule,
platformBrowserDynamicTesting(), platformBrowserDynamicTesting(),
{ teardown: { destroyAfterEach: true }}, { teardown: { destroyAfterEach: true }},
); );
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().map(context);

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

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

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

@ -8,21 +8,9 @@ import {
platformBrowserDynamicTesting platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing'; } 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. // First, initialize the Angular testing environment.
getTestBed().initTestEnvironment( getTestBed().initTestEnvironment(
BrowserDynamicTestingModule, BrowserDynamicTestingModule,
platformBrowserDynamicTesting(), platformBrowserDynamicTesting(),
{ teardown: { destroyAfterEach: true }}, { teardown: { destroyAfterEach: true }},
); );
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().map(context);

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

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

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

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

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

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

11
apps/angular/src/test.ts

@ -7,13 +7,6 @@ import {
platformBrowserDynamicTesting platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing'; } 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. // First, initialize the Angular testing environment.
getTestBed().initTestEnvironment( getTestBed().initTestEnvironment(
BrowserDynamicTestingModule, BrowserDynamicTestingModule,
@ -21,7 +14,3 @@ getTestBed().initTestEnvironment(
teardown: { destroyAfterEach: false } teardown: { destroyAfterEach: false }
} }
); );
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().map(context);

22
apps/angular/tsconfig.json

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

3521
apps/angular/yarn.lock

File diff suppressed because it is too large
Loading…
Cancel
Save