Skip to content

Commit b2a9bbc

Browse files
malimingmaliming
committed
Merge branch 'master' into System.Text.Json
2 parents 6aca74e + 1dcae73 commit b2a9bbc

File tree

19 files changed

+2999
-2018
lines changed

19 files changed

+2999
-2018
lines changed

‎angular/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# stage 1
2-
FROM node:14 as node
2+
FROM node:20 as node
33
WORKDIR /app
44
COPY . .
55
# This is a workaround to avoid updating appconfig.production.json file.

‎angular/angular.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,21 +98,21 @@
9898
"serve": {
9999
"builder": "@angular-devkit/build-angular:dev-server",
100100
"options": {
101-
"browserTarget": "AbpProjectName:build"
101+
"buildTarget": "AbpProjectName:build"
102102
},
103103
"configurations": {
104104
"production": {
105-
"browserTarget": "AbpProjectName:build:production"
105+
"buildTarget": "AbpProjectName:build:production"
106106
},
107107
"hmr": {
108-
"browserTarget": "AbpProjectName:build:hmr"
108+
"buildTarget": "AbpProjectName:build:hmr"
109109
}
110110
}
111111
},
112112
"extract-i18n": {
113113
"builder": "@angular-devkit/build-angular:extract-i18n",
114114
"options": {
115-
"browserTarget": "AbpProjectName:build"
115+
"buildTarget": "AbpProjectName:build"
116116
}
117117
},
118118
"test": {

‎angular/package.json

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -13,57 +13,57 @@
1313
"test": "ng test"
1414
},
1515
"dependencies": {
16-
"@angular/animations": "^15.0.3",
17-
"@angular/common": "^15.0.3",
18-
"@angular/compiler": "^15.0.3",
19-
"@angular/core": "^15.0.3",
20-
"@angular/forms": "^15.0.3",
21-
"@angular/platform-browser": "^15.0.3",
22-
"@angular/platform-browser-dynamic": "^15.0.3",
23-
"@angular/router": "^15.0.3",
16+
"@angular/animations": "^17.0.4",
17+
"@angular/common": "^17.0.4",
18+
"@angular/compiler": "^17.0.4",
19+
"@angular/core": "^17.0.4",
20+
"@angular/forms": "^17.0.4",
21+
"@angular/platform-browser": "^17.0.4",
22+
"@angular/platform-browser-dynamic": "^17.0.4",
23+
"@angular/router": "^17.0.4",
2424
"@aspnet/signalr": "^1.1.4",
25-
"@fortawesome/fontawesome-free": "^6.2.1",
26-
"abp-ng2-module": "8.0.0",
27-
"abp-web-resources": "^5.7.0",
25+
"@fortawesome/fontawesome-free": "^6.4.2",
26+
"abp-ng2-module": "10.0.0",
27+
"abp-web-resources": "^5.9.1",
2828
"admin-lte-css-only": "^3.2.0",
29-
"core-js": "^3.26.1",
29+
"core-js": "^3.33.3",
3030
"famfamfam-flags": "^1.0.0",
3131
"lodash-es": "^4.17.15",
3232
"moment": "2.29.4",
33-
"moment-timezone": "0.5.40",
34-
"ngx-bootstrap": "^9.0.0",
33+
"moment-timezone": "0.5.43",
34+
"ngx-bootstrap": "^11.0.2",
3535
"ngx-pagination": "^6.0.3",
3636
"push.js": "1.0.12",
37-
"rxjs": "^7.6.0",
38-
"sweetalert2": "^11.6.15",
37+
"rxjs": "^7.8.1",
38+
"sweetalert2": "^11.10.1",
3939
"ts-helpers": "^1.1.2",
40-
"tslib": "^2.4.1",
41-
"zone.js": "~0.12.0"
40+
"tslib": "^2.6.2",
41+
"zone.js": "~0.14.2"
4242
},
4343
"devDependencies": {
44-
"@angular-devkit/build-angular": "^15.0.3",
45-
"@angular/cli": "^15.0.3",
46-
"@angular/compiler-cli": "^15.0.3",
44+
"@angular-devkit/build-angular": "^17.0.2",
45+
"@angular/cli": "^17.0.2",
46+
"@angular/compiler-cli": "^17.0.4",
4747
"@angularclass/hmr": "^3.0.0",
48-
"@types/jasmine": "~4.3.1",
49-
"@types/lodash-es": "^4.17.6",
48+
"@types/jasmine": "~5.1.3",
49+
"@types/lodash-es": "^4.17.11",
5050
"@types/moment-timezone": "^0.5.30",
51-
"@types/node": "^18.11.15",
51+
"@types/node": "^20.9.3",
5252
"codelyzer": "^6.0.0",
53-
"jasmine-core": "~4.5.0",
53+
"jasmine-core": "~5.1.1",
5454
"jasmine-spec-reporter": "~7.0.0",
55-
"karma": "~6.4.1",
56-
"karma-chrome-launcher": "~3.1.1",
55+
"karma": "~6.4.2",
56+
"karma-chrome-launcher": "~3.2.0",
5757
"karma-cli": "^2.0.0",
5858
"karma-coverage-istanbul-reporter": "~3.0.2",
5959
"karma-jasmine": "~5.1.0",
60-
"karma-jasmine-html-reporter": "^2.0.0",
61-
"nswag": "^13.18.1",
60+
"karma-jasmine-html-reporter": "^2.1.0",
61+
"nswag": "^13.20.0",
6262
"protractor": "~7.0.0",
6363
"ts-node": "^10.9.1",
6464
"tslint": "~6.1.0",
65-
"typescript": "4.8.4",
66-
"webpack-bundle-analyzer": "^4.7.0"
65+
"typescript": "5.2.2",
66+
"webpack-bundle-analyzer": "^4.10.1"
6767
},
6868
"angular-cli": {}
6969
}

‎angular/src/app/layout/sidebar-menu.component.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,20 @@ export class SidebarMenuComponent extends AppComponentBase implements OnInit {
2323

2424
constructor(injector: Injector, private router: Router) {
2525
super(injector);
26-
this.router.events.subscribe(this.routerEvents);
2726
}
2827

2928
ngOnInit(): void {
3029
this.menuItems = this.getMenuItems();
3130
this.patchMenuItems(this.menuItems);
32-
this.routerEvents
33-
.pipe(filter((event) => event instanceof NavigationEnd))
34-
.subscribe((event) => {
35-
const currentUrl = event.url !== '/' ? event.url : this.homeRoute;
31+
32+
this.router.events.subscribe((event: NavigationEnd) => {
33+
const currentUrl = event.url !== '/' ? event.url : this.homeRoute;
3634
const primaryUrlSegmentGroup = this.router.parseUrl(currentUrl).root
3735
.children[PRIMARY_OUTLET];
3836
if (primaryUrlSegmentGroup) {
3937
this.activateMenuItems('/' + primaryUrlSegmentGroup.toString());
4038
}
41-
});
39+
});
4240
}
4341

4442
getMenuItems(): MenuItem[] {

‎angular/src/shared/auth/auth-route-guard.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,10 @@ import { Injectable } from '@angular/core';
22
import { PermissionCheckerService } from 'abp-ng2-module';
33
import { AppSessionService } from '../session/app-session.service';
44

5-
import {
6-
CanActivate, Router,
7-
ActivatedRouteSnapshot,
8-
RouterStateSnapshot,
9-
CanActivateChild
10-
} from '@angular/router';
5+
import { Router, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
116

127
@Injectable()
13-
export class AppRouteGuard implements CanActivate, CanActivateChild {
8+
export class AppRouteGuard {
149

1510
constructor(
1611
private _permissionChecker: PermissionCheckerService,

‎angular/src/shared/helpers/SignalRAspNetCoreHelper.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ export class SignalRAspNetCoreHelper {
1212
qs: AppConsts.authorization.encryptedAuthTokenName + '=' + encodeURIComponent(encryptedAuthToken),
1313
remoteServiceBaseUrl: AppConsts.remoteServiceBaseUrl,
1414
startConnection: undefined,
15-
url: '/signalr'
15+
url: '/signalr',
16+
withUrlOptions: {}
1617
};
1718

1819
const script = document.createElement('script');

‎angular/src/shared/service-proxies/service-proxies.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//----------------------
22
// <auto-generated>
3-
// Generated using the NSwag toolchain v13.18.1.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v13.0.0.0)) (http://NSwag.org)
3+
// Generated using the NSwag toolchain v13.20.0.0 (NJsonSchema v10.9.0.0 (Newtonsoft.Json v13.0.0.0)) (http://NSwag.org)
44
// </auto-generated>
55
//----------------------
66

0 commit comments

Comments
 (0)