Skip to content

Commit ac7b2a9

Browse files
ismcagdasismcagdas
authored
Merge pull request #643 from aspnetboilerplate/feat/abp-8.0
ABP 8.0 upgrade
2 parents c46a12c + 416b2d1 commit ac7b2a9

30 files changed

+5861
-4838
lines changed

‎angular/.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ bin/
2626
!.vscode/extensions.json
2727

2828
# misc
29-
/.sass-cache
29+
//.angular/cache
30+
.sass-cache
3031
/connect.lock
3132
/coverage/*
3233
/libpeerconnection.log
@@ -41,3 +42,5 @@ testem.log
4142
#System Files
4243
.DS_Store
4344
Thumbs.db
45+
46+
.angular

‎angular/angular.json

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -156,15 +156,6 @@
156156
"node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.moment.js"
157157
]
158158
}
159-
},
160-
"lint": {
161-
"builder": "@angular-devkit/build-angular:tslint",
162-
"options": {
163-
"tsConfig": [
164-
"src/tsconfig.json"
165-
],
166-
"exclude": []
167-
}
168159
}
169160
}
170161
},
@@ -179,20 +170,10 @@
179170
"protractorConfig": "./protractor.conf.js",
180171
"devServerTarget": "AbpProjectName:serve"
181172
}
182-
},
183-
"lint": {
184-
"builder": "@angular-devkit/build-angular:tslint",
185-
"options": {
186-
"tsConfig": [
187-
"e2e/tsconfig.json"
188-
],
189-
"exclude": []
190-
}
191173
}
192174
}
193175
}
194176
},
195-
"defaultProject": "AbpProjectName",
196177
"schematics": {
197178
"@schematics/angular:component": {
198179
"prefix": "app",

‎angular/nswag/service.config.nswag

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
{
1+
{
22
"runtime": "Default",
33
"defaultVariables": null,
44
"documentGenerator": {
55
"fromDocument": {
66
"url": "https://localhost:44311/swagger/v1/swagger.json",
7-
"output": null
7+
"output": null,
8+
"newLineBehavior": "Auto"
89
}
910
},
1011
"codeGenerators": {
@@ -16,9 +17,10 @@
1617
"template": "Angular",
1718
"promiseType": "Promise",
1819
"httpClass": "HttpClient",
20+
"withCredentials": false,
1921
"useSingletonProvider": false,
2022
"injectionTokenType": "InjectionToken",
21-
"rxJsVersion": 6.0,
23+
"rxJsVersion": 7.0,
2224
"dateTimeType": "MomentJS",
2325
"nullValue": "Undefined",
2426
"generateClientClasses": true,
@@ -41,34 +43,41 @@
4143
"markOptionalProperties": false,
4244
"generateCloneMethod": true,
4345
"typeStyle": "Class",
46+
"enumStyle": "Enum",
47+
"useLeafType": false,
4448
"classTypes": [],
4549
"extendedClasses": [],
4650
"extensionCode": null,
4751
"generateDefaultValues": true,
4852
"excludedTypeNames": [],
4953
"excludedParameterNames": [],
5054
"handleReferences": false,
55+
"generateTypeCheckFunctions": false,
5156
"generateConstructorInterface": true,
5257
"convertConstructorInterfaceData": false,
5358
"importRequiredTypes": true,
5459
"useGetBaseUrlMethod": false,
5560
"baseUrlTokenName": "API_BASE_URL",
5661
"queryNullValue": "",
62+
"useAbortSignal": false,
5763
"inlineNamedDictionaries": false,
5864
"inlineNamedAny": false,
65+
"includeHttpContext": false,
5966
"templateDirectory": null,
6067
"typeNameGeneratorType": null,
6168
"propertyNameGeneratorType": null,
6269
"enumNameGeneratorType": null,
6370
"serviceHost": null,
6471
"serviceSchemes": null,
65-
"output": "../src/shared/service-proxies/service-proxies.ts"
72+
"output": "../src/shared/service-proxies/service-proxies.ts",
73+
"newLineBehavior": "Auto"
6674
},
6775
"openApiToCSharpClient": {
6876
"clientBaseClass": null,
6977
"configurationClass": null,
7078
"generateClientClasses": true,
7179
"generateClientInterfaces": false,
80+
"clientBaseInterface": null,
7281
"injectHttpClient": false,
7382
"disposeHttpClient": true,
7483
"protectedMethods": [],
@@ -81,14 +90,17 @@
8190
"useBaseUrl": true,
8291
"generateBaseUrlProperty": true,
8392
"generateSyncMethods": false,
93+
"generatePrepareRequestAndProcessResponseAsAsyncMethods": false,
8494
"exposeJsonSerializerSettings": false,
8595
"clientClassAccessModifier": "public",
8696
"typeAccessModifier": "public",
8797
"generateContractsOutput": false,
8898
"contractsNamespace": null,
8999
"contractsOutputFilePath": null,
90100
"parameterDateTimeFormat": "s",
101+
"parameterDateFormat": "yyyy-MM-dd",
91102
"generateUpdateJsonSerializerSettingsMethod": true,
103+
"useRequestAndResponseSerializationSettings": false,
92104
"serializeTypeInformation": false,
93105
"queryNullValue": "",
94106
"className": "{controller}Client",
@@ -121,6 +133,7 @@
121133
"arrayBaseType": "System.Collections.ObjectModel.ObservableCollection",
122134
"dictionaryBaseType": "System.Collections.Generic.Dictionary",
123135
"classStyle": "Inpc",
136+
"jsonLibrary": "NewtonsoftJson",
124137
"generateDefaultValues": true,
125138
"generateDataAnnotations": true,
126139
"excludedTypeNames": [],
@@ -135,13 +148,15 @@
135148
"inlineNamedAny": false,
136149
"generateDtoTypes": true,
137150
"generateOptionalPropertiesAsNullable": false,
151+
"generateNullableReferenceTypes": false,
138152
"templateDirectory": null,
139153
"typeNameGeneratorType": null,
140154
"propertyNameGeneratorType": null,
141155
"enumNameGeneratorType": null,
142156
"serviceHost": null,
143157
"serviceSchemes": null,
144-
"output": null
158+
"output": null,
159+
"newLineBehavior": "Auto"
145160
},
146161
"openApiToCSharpController": {
147162
"controllerBaseClass": null,
@@ -151,6 +166,7 @@
151166
"useActionResultType": false,
152167
"generateModelValidationAttributes": false,
153168
"routeNamingStrategy": "None",
169+
"basePath": null,
154170
"className": "{controller}",
155171
"operationGenerationMode": "MultipleClientsFromOperationId",
156172
"additionalNamespaceUsages": [
@@ -183,6 +199,7 @@
183199
"arrayBaseType": "System.Collections.ObjectModel.ObservableCollection",
184200
"dictionaryBaseType": "System.Collections.Generic.Dictionary",
185201
"classStyle": "Inpc",
202+
"jsonLibrary": "NewtonsoftJson",
186203
"generateDefaultValues": true,
187204
"generateDataAnnotations": true,
188205
"excludedTypeNames": [],
@@ -197,13 +214,15 @@
197214
"inlineNamedAny": false,
198215
"generateDtoTypes": true,
199216
"generateOptionalPropertiesAsNullable": false,
217+
"generateNullableReferenceTypes": false,
200218
"templateDirectory": null,
201219
"typeNameGeneratorType": null,
202220
"propertyNameGeneratorType": null,
203221
"enumNameGeneratorType": null,
204222
"serviceHost": null,
205223
"serviceSchemes": null,
206-
"output": null
224+
"output": null,
225+
"newLineBehavior": "Auto"
207226
}
208227
}
209228
}

‎angular/package.json

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -13,58 +13,57 @@
1313
"test": "ng test"
1414
},
1515
"dependencies": {
16-
"@angular/animations": "^12.0.5",
17-
"@angular/common": "^12.0.5",
18-
"@angular/compiler": "^12.0.5",
19-
"@angular/core": "^12.0.5",
20-
"@angular/forms": "^12.0.5",
21-
"@angular/platform-browser": "^12.0.5",
22-
"@angular/platform-browser-dynamic": "^12.0.5",
23-
"@angular/router": "^12.0.5",
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",
2424
"@aspnet/signalr": "^1.1.4",
25-
"@fortawesome/fontawesome-free": "^5.15.3",
26-
"abp-ng2-module": "^6.2.0",
27-
"abp-web-resources": "^5.3.0",
28-
"admin-lte-css-only": "^3.1.0",
29-
"core-js": "^3.2.1",
25+
"@fortawesome/fontawesome-free": "^6.2.1",
26+
"abp-ng2-module": "8.0.0",
27+
"abp-web-resources": "^5.7.0",
28+
"admin-lte-css-only": "^3.2.0",
29+
"core-js": "^3.26.1",
3030
"famfamfam-flags": "^1.0.0",
3131
"lodash-es": "^4.17.15",
32-
"moment": "2.24.0",
33-
"moment-timezone": "0.5.33",
34-
"ngx-bootstrap": "^5.6.1",
35-
"ngx-pagination": "^5.0.0",
32+
"moment": "2.29.4",
33+
"moment-timezone": "0.5.40",
34+
"ngx-bootstrap": "^9.0.0",
35+
"ngx-pagination": "^6.0.3",
3636
"push.js": "1.0.12",
37-
"rxjs": "^6.4.0",
38-
"sweetalert2": "^10.15.6",
37+
"rxjs": "^7.6.0",
38+
"sweetalert2": "^11.6.15",
3939
"ts-helpers": "^1.1.2",
40-
"tslib": "^2.0.0",
41-
"web-animations-js": "^2.3.2",
42-
"zone.js": "~0.11.4"
40+
"tslib": "^2.4.1",
41+
"zone.js": "~0.12.0"
4342
},
4443
"devDependencies": {
45-
"@angular-devkit/build-angular": "~12.0.5",
46-
"@angular/cli": "^12.0.5",
47-
"@angular/compiler-cli": "^12.0.5",
48-
"@angularclass/hmr": "^2.1.3",
49-
"@types/jasmine": "~3.6.0",
50-
"@types/lodash-es": "^4.17.3",
44+
"@angular-devkit/build-angular": "^15.0.3",
45+
"@angular/cli": "^15.0.3",
46+
"@angular/compiler-cli": "^15.0.3",
47+
"@angularclass/hmr": "^3.0.0",
48+
"@types/jasmine": "~4.3.1",
49+
"@types/lodash-es": "^4.17.6",
5150
"@types/moment-timezone": "^0.5.30",
52-
"@types/node": "^13.13.4",
51+
"@types/node": "^18.11.15",
5352
"codelyzer": "^6.0.0",
54-
"jasmine-core": "~3.6.0",
55-
"jasmine-spec-reporter": "~5.0.0",
56-
"karma": "~6.3.4",
57-
"karma-chrome-launcher": "~3.1.0",
53+
"jasmine-core": "~4.5.0",
54+
"jasmine-spec-reporter": "~7.0.0",
55+
"karma": "~6.4.1",
56+
"karma-chrome-launcher": "~3.1.1",
5857
"karma-cli": "^2.0.0",
5958
"karma-coverage-istanbul-reporter": "~3.0.2",
60-
"karma-jasmine": "~4.0.0",
61-
"karma-jasmine-html-reporter": "^1.5.0",
62-
"nswag": "^13.4.2",
59+
"karma-jasmine": "~5.1.0",
60+
"karma-jasmine-html-reporter": "^2.0.0",
61+
"nswag": "^13.18.1",
6362
"protractor": "~7.0.0",
64-
"ts-node": "^8.10.1",
63+
"ts-node": "^10.9.1",
6564
"tslint": "~6.1.0",
66-
"typescript": "4.2.4",
67-
"webpack-bundle-analyzer": "^3.7.0"
65+
"typescript": "4.8.4",
66+
"webpack-bundle-analyzer": "^4.7.0"
6867
},
6968
"angular-cli": {}
70-
}
69+
}

‎angular/src/account/account.module.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ import { TenantChangeDialogComponent } from './tenant/tenant-change-dialog.compo
3939
// tenant
4040
TenantChangeComponent,
4141
TenantChangeDialogComponent,
42-
],
43-
entryComponents: [
44-
// tenant
45-
TenantChangeDialogComponent
4642
]
4743
})
4844
export class AccountModule {

‎angular/src/app-initializer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export class AppInitializer {
3535
const angularLocale = this.convertAbpLocaleToAngularLocale(
3636
abp.localization.currentLanguage.name
3737
);
38-
import(`@angular/common/locales/${angularLocale}.js`).then(
38+
import(`/node_modules/@angular/common/locales/${angularLocale}.mjs`).then(
3939
(module) => {
4040
registerLocaleData(module.default);
4141
resolve(result);

0 commit comments

Comments
 (0)