diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index ec541eeede..8b0fe3f95b 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -71,7 +71,7 @@ "@angular/platform-browser-dynamic": "14.2.1", "@angular/router": "14.2.1", "@fortawesome/fontawesome-free": "^5.15.4", - "@ng-bootstrap/ng-bootstrap": "~12.0.0-beta.4", + "@ng-bootstrap/ng-bootstrap": "~13.0.0", "@ngneat/spectator": "^10.0.0", "@ngx-validate/core": "^0.1.2", "@nrwl/angular": "14.7.5", @@ -106,7 +106,7 @@ "just-compare": "^1.4.0", "lerna": "^4.0.0", "ng-packagr": "14.2.1", - "ng-zorro-antd": "^13.0.0", + "ng-zorro-antd": "^14.0.0", "nx": "14.7.5", "postcss": "^8.3.9", "postcss-import": "14.1.0", diff --git a/npm/ng-packs/packages/components/package.json b/npm/ng-packs/packages/components/package.json index 479f9b3785..a9e1f03d0b 100644 --- a/npm/ng-packs/packages/components/package.json +++ b/npm/ng-packs/packages/components/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "chart.js": "^3.5.1", - "ng-zorro-antd": "^13.0.0", + "ng-zorro-antd": "^14.0.0", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts index 672899da50..6f64a260fb 100644 --- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts +++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts @@ -1,4 +1,4 @@ -import { EXTENSIONS_FORM_PROP_DATA, EXTENSIONS_FORM_PROP } from './../../tokens/extensions.token'; +import { EXTENSIONS_FORM_PROP, EXTENSIONS_FORM_PROP_DATA } from './../../tokens/extensions.token'; import { ABP, AbpValidators, ConfigStateService, TrackByService } from '@abp/ng.core'; import { AfterViewInit, @@ -16,8 +16,8 @@ import { } from '@angular/core'; import { ControlContainer, - UntypedFormGroup, FormGroupDirective, + UntypedFormGroup, ValidatorFn, Validators, } from '@angular/forms'; diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json index 58d16d0e96..6dfba128b1 100644 --- a/npm/ng-packs/packages/theme-shared/package.json +++ b/npm/ng-packs/packages/theme-shared/package.json @@ -9,11 +9,11 @@ "dependencies": { "@abp/ng.core": "~6.0.0-rc.3", "@fortawesome/fontawesome-free": "^5.15.4", - "@ng-bootstrap/ng-bootstrap": "~12.0.0-beta.4", + "@ng-bootstrap/ng-bootstrap": "13.0.0", "@ngx-validate/core": "^0.1.2", "@popperjs/core": "~2.11.2", "@swimlane/ngx-datatable": "^20.0.0", - "bootstrap": "^5.1.1", + "bootstrap": "^5.2.0", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/templates/app-nolayers/angular/angular.json b/templates/app-nolayers/angular/angular.json index 1ce6edee2c..715d6bbb09 100644 --- a/templates/app-nolayers/angular/angular.json +++ b/templates/app-nolayers/angular/angular.json @@ -2,9 +2,7 @@ "$schema": "./node_modules/@angular/cli/lib/config/schema.json", "cli": { "analytics": false, - "schematicCollections": [ - "@angular-eslint/schematics" - ] + "schematicCollections": ["@angular-eslint/schematics"] }, "version": 1, "newProjectRoot": "projects", @@ -29,14 +27,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "allowedCommonJsDependencies": [ - "chart.js", - "js-sha256" - ], - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "allowedCommonJsDependencies": ["chart.js", "js-sha256"], + "assets": ["src/favicon.ico", "src/assets"], "styles": [ { "input": "node_modules/@fortawesome/fontawesome-free/css/all.min.css", @@ -64,14 +56,24 @@ "bundleName": "ngx-datatable-material" }, { - "input": "node_modules/bootstrap/dist/css/bootstrap.rtl.min.css", + "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/bootstrap-dim.css", "inject": false, - "bundleName": "bootstrap-rtl.min" + "bundleName": "bootstrap-dim" }, { - "input": "node_modules/bootstrap/dist/css/bootstrap.min.css", - "inject": true, - "bundleName": "bootstrap-ltr.min" + "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" }, "node_modules/bootstrap-icons/font/bootstrap-icons.css", "src/styles.scss" @@ -137,23 +139,15 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] } }, "lint": { "builder": "@angular-eslint/builder:lint", "options": { - "lintFilePatterns": [ - "src/**/*.ts", - "src/**/*.html" - ] + "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"] } } } diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index bc86f9ae4f..2ad8631ce0 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -36,13 +36,13 @@ }, "devDependencies": { "@abp/ng.schematics": "~6.0.0-rc.3", - "@angular-devkit/build-angular": "^14.2.2", - "@angular-eslint/builder": "~14.0.4", - "@angular-eslint/eslint-plugin": "~14.0.4", - "@angular-eslint/eslint-plugin-template": "~14.0.4", - "@angular-eslint/schematics": "~14.0.4", - "@angular-eslint/template-parser": "~14.0.4", - "@angular/cli": "^14.2.2", + "@angular-devkit/build-angular": "^14.2.3", + "@angular-eslint/builder": "~14.1.1", + "@angular-eslint/eslint-plugin": "~14.1.1", + "@angular-eslint/eslint-plugin-template": "~14.1.1", + "@angular-eslint/schematics": "~14.1.1", + "@angular-eslint/template-parser": "~14.1.1", + "@angular/cli": "^14.2.3", "@angular/compiler-cli": "^14.2.1", "@angular/language-service": "^14.2.1", "@types/jasmine": "~3.6.0", @@ -59,4 +59,4 @@ "ng-packagr": "^14.2.1", "typescript": "~4.8.3" } -} +} \ No newline at end of file diff --git a/templates/app/angular/angular.json b/templates/app/angular/angular.json index 1ce6edee2c..715d6bbb09 100644 --- a/templates/app/angular/angular.json +++ b/templates/app/angular/angular.json @@ -2,9 +2,7 @@ "$schema": "./node_modules/@angular/cli/lib/config/schema.json", "cli": { "analytics": false, - "schematicCollections": [ - "@angular-eslint/schematics" - ] + "schematicCollections": ["@angular-eslint/schematics"] }, "version": 1, "newProjectRoot": "projects", @@ -29,14 +27,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "allowedCommonJsDependencies": [ - "chart.js", - "js-sha256" - ], - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "allowedCommonJsDependencies": ["chart.js", "js-sha256"], + "assets": ["src/favicon.ico", "src/assets"], "styles": [ { "input": "node_modules/@fortawesome/fontawesome-free/css/all.min.css", @@ -64,14 +56,24 @@ "bundleName": "ngx-datatable-material" }, { - "input": "node_modules/bootstrap/dist/css/bootstrap.rtl.min.css", + "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/bootstrap-dim.css", "inject": false, - "bundleName": "bootstrap-rtl.min" + "bundleName": "bootstrap-dim" }, { - "input": "node_modules/bootstrap/dist/css/bootstrap.min.css", - "inject": true, - "bundleName": "bootstrap-ltr.min" + "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" }, "node_modules/bootstrap-icons/font/bootstrap-icons.css", "src/styles.scss" @@ -137,23 +139,15 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] } }, "lint": { "builder": "@angular-eslint/builder:lint", "options": { - "lintFilePatterns": [ - "src/**/*.ts", - "src/**/*.html" - ] + "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"] } } } diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index bc86f9ae4f..b9e09e52c7 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -18,8 +18,8 @@ "@abp/ng.identity": "~6.0.0-rc.3", "@abp/ng.setting-management": "~6.0.0-rc.3", "@abp/ng.tenant-management": "~6.0.0-rc.3", - "@abp/ng.theme.shared": "~6.0.0-rc.3", "@abp/ng.theme.lepton-x": "~1.0.0-rc.3", + "@abp/ng.theme.shared": "~6.0.0-rc.3", "@angular/animations": "^14.2.1", "@angular/common": "^14.2.1", "@angular/compiler": "^14.2.1", @@ -29,20 +29,20 @@ "@angular/platform-browser": "^14.2.1", "@angular/platform-browser-dynamic": "^14.2.1", "@angular/router": "^14.2.1", + "bootstrap-icons": "~1.8.3", "rxjs": "~6.6.0", "tslib": "^2.1.0", - "bootstrap-icons": "~1.8.3", "zone.js": "~0.11.4" }, "devDependencies": { "@abp/ng.schematics": "~6.0.0-rc.3", - "@angular-devkit/build-angular": "^14.2.2", - "@angular-eslint/builder": "~14.0.4", - "@angular-eslint/eslint-plugin": "~14.0.4", - "@angular-eslint/eslint-plugin-template": "~14.0.4", - "@angular-eslint/schematics": "~14.0.4", - "@angular-eslint/template-parser": "~14.0.4", - "@angular/cli": "^14.2.2", + "@angular-devkit/build-angular": "^14.2.3", + "@angular-eslint/builder": "~14.1.1", + "@angular-eslint/eslint-plugin": "~14.1.1", + "@angular-eslint/eslint-plugin-template": "~14.1.1", + "@angular-eslint/schematics": "~14.1.1", + "@angular-eslint/template-parser": "~14.1.1", + "@angular/cli": "^14.2.3", "@angular/compiler-cli": "^14.2.1", "@angular/language-service": "^14.2.1", "@types/jasmine": "~3.6.0", @@ -57,6 +57,7 @@ "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.7.0", "ng-packagr": "^14.2.1", + "raw-loader": "^4.0.2", "typescript": "~4.8.3" } -} +} \ No newline at end of file diff --git a/templates/app/angular/tsconfig.json b/templates/app/angular/tsconfig.json index bf75909a03..9e918832d9 100644 --- a/templates/app/angular/tsconfig.json +++ b/templates/app/angular/tsconfig.json @@ -12,10 +12,7 @@ "importHelpers": true, "target": "es2020", "module": "es2020", - "lib": [ - "es2018", - "dom" - ], + "lib": ["es2018", "dom"], "paths": { "@proxy": ["src/app/proxy/index.ts"], "@proxy/*": ["src/app/proxy/*"] diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json index 3d7dc2a8be..dfafa0550b 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json @@ -1,6 +1,6 @@ { "ConnectionStrings": { - "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName;Trusted_Connection=True" + "Default": "Server=localhost;Database=MyProjectNamssse;User Id=sa;password=myPassw0rd;MultipleActiveResultSets=true" }, "OpenIddict": { "Applications": { diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json index 5131851809..67cc5015d1 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json @@ -1,19 +1,19 @@ { - "App": { - "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200,https://localhost:44307" - }, - "ConnectionStrings": { - "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName;Trusted_Connection=True" - }, - "Redis": { - "Configuration": "127.0.0.1" - }, - "AuthServer": { - "Authority": "https://localhost:44301", - "RequireHttpsMetadata": "true", - "SwaggerClientId": "MyProjectName_Swagger" - }, - "StringEncryption": { - "DefaultPassPhrase": "gsKnGZ041HLL4IM8" - } + "App": { + "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200,https://localhost:44307" + }, + "ConnectionStrings": { + "Default": "Server=localhost;Database=MyProjectNamssse;User Id=sa;password=myPassw0rd;MultipleActiveResultSets=true" + }, + "Redis": { + "Configuration": "127.0.0.1" + }, + "AuthServer": { + "Authority": "https://localhost:44301", + "RequireHttpsMetadata": "true", + "SwaggerClientId": "MyProjectName_Swagger" + }, + "StringEncryption": { + "DefaultPassPhrase": "gsKnGZ041HLL4IM8" + } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/appsettings.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/appsettings.json index 3fc189b8ae..f7ef012070 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/appsettings.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/appsettings.json @@ -1,19 +1,19 @@ { - "App": { - "SelfUrl": "https://localhost:44305", - "ClientUrl": "http://localhost:4200", - "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200,https://localhost:44307", - "RedirectAllowedUrls": "http://localhost:4200,https://localhost:44307" - }, - "ConnectionStrings": { - "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyProjectName;Trusted_Connection=True" - }, - "AuthServer": { - "Authority": "https://localhost:44305", - "RequireHttpsMetadata": "false", - "SwaggerClientId": "MyProjectName_Swagger" - }, - "StringEncryption": { - "DefaultPassPhrase": "gsKnGZ041HLL4IM8" - } + "App": { + "SelfUrl": "https://localhost:44305", + "ClientUrl": "http://localhost:4200", + "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200,https://localhost:44307", + "RedirectAllowedUrls": "http://localhost:4200,https://localhost:44307" + }, + "ConnectionStrings": { + "Default": "Server=localhost;Database=MyProjectName;User Id=sa;password=myPassw0rd;MultipleActiveResultSets=true" + }, + "AuthServer": { + "Authority": "https://localhost:44305", + "RequireHttpsMetadata": "false", + "SwaggerClientId": "MyProjectName_Swagger" + }, + "StringEncryption": { + "DefaultPassPhrase": "gsKnGZ041HLL4IM8" + } } diff --git a/templates/module/angular/angular.json b/templates/module/angular/angular.json index 377b320a97..f989948313 100644 --- a/templates/module/angular/angular.json +++ b/templates/module/angular/angular.json @@ -66,14 +66,8 @@ "polyfills": "projects/dev-app/src/polyfills.ts", "tsConfig": "projects/dev-app/tsconfig.app.json", "inlineStyleLanguage": "scss", - "allowedCommonJsDependencies": [ - "chart.js", - "js-sha256" - ], - "assets": [ - "projects/dev-app/src/favicon.ico", - "projects/dev-app/src/assets" - ], + "allowedCommonJsDependencies": ["chart.js", "js-sha256"], + "assets": ["projects/dev-app/src/favicon.ico", "projects/dev-app/src/assets"], "styles": [ { "input": "node_modules/@fortawesome/fontawesome-free/css/all.min.css", @@ -101,14 +95,24 @@ "bundleName": "ngx-datatable-material" }, { - "input": "node_modules/bootstrap/dist/css/bootstrap.rtl.min.css", + "input": "node_modules/@volo/ngx-lepton-x.lite/assets/css/bootstrap-dim.css", "inject": false, - "bundleName": "bootstrap-rtl.min" + "bundleName": "bootstrap-dim" }, { - "input": "node_modules/bootstrap/dist/css/bootstrap.min.css", - "inject": true, - "bundleName": "bootstrap-ltr.min" + "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" }, "projects/dev-app/src/styles.scss" ], @@ -173,10 +177,7 @@ "tsConfig": "projects/dev-app/tsconfig.spec.json", "karmaConfig": "projects/dev-app/karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "projects/dev-app/src/favicon.ico", - "projects/dev-app/src/assets" - ], + "assets": ["projects/dev-app/src/favicon.ico", "projects/dev-app/src/assets"], "styles": [ "node_modules/bootstrap/dist/css/bootstrap.min.css", "node_modules/@fortawesome/fontawesome-free/css/all.min.css", @@ -192,10 +193,7 @@ "lint": { "builder": "@angular-eslint/builder:lint", "options": { - "lintFilePatterns": [ - "projects/dev-app/**/*.ts", - "projects/dev-app/**/*.html" - ] + "lintFilePatterns": ["projects/dev-app/**/*.ts", "projects/dev-app/**/*.html"] } } } diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index 7fbb338a97..8c8490bd87 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -38,13 +38,13 @@ }, "devDependencies": { "@abp/ng.schematics": "~6.0.0-rc.3", - "@angular-devkit/build-angular": "^14.2.2", - "@angular-eslint/builder": "~14.0.4", - "@angular-eslint/eslint-plugin": "~14.0.4", - "@angular-eslint/eslint-plugin-template": "~14.0.4", - "@angular-eslint/schematics": "~14.0.4", - "@angular-eslint/template-parser": "~14.0.4", - "@angular/cli": "^14.2.2", + "@angular-devkit/build-angular": "^14.2.3", + "@angular-eslint/builder": "~14.1.1", + "@angular-eslint/eslint-plugin": "~14.1.1", + "@angular-eslint/eslint-plugin-template": "~14.1.1", + "@angular-eslint/schematics": "~14.1.1", + "@angular-eslint/template-parser": "~14.1.1", + "@angular/cli": "^14.2.3", "@angular/compiler-cli": "^14.2.1", "@angular/language-service": "^14.2.1", "@types/jasmine": "~3.6.0", @@ -62,4 +62,4 @@ "symlink-manager": "^1.5.0", "typescript": "~4.8.3" } -} +} \ No newline at end of file