Browse Source

Merge pull request #4485 from abpframework/feat/upgrade-npm-packages

Upgraded NPM Packages
pull/4505/head
Levent Arman Özak 6 years ago
committed by GitHub
parent
commit
57eb0549d7
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 0
      npm/ng-packs/apps/dev-app/.browserslistrc
  2. 2
      npm/ng-packs/apps/dev-app/tsconfig.dev.json
  3. 2
      npm/ng-packs/apps/dev-app/tsconfig.spec.json
  4. 54
      npm/ng-packs/package.json
  5. 3
      npm/ng-packs/packages/account/package.json
  6. 7
      npm/ng-packs/packages/core/package.json
  7. 12
      npm/ng-packs/packages/core/src/lib/services/auth.service.ts
  8. 1
      npm/ng-packs/packages/core/src/lib/services/routes.service.ts
  9. 3
      npm/ng-packs/packages/feature-management/package.json
  10. 3
      npm/ng-packs/packages/identity/package.json
  11. 185
      npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
  12. 4
      npm/ng-packs/packages/identity/src/lib/identity.module.ts
  13. 3
      npm/ng-packs/packages/permission-management/package.json
  14. 3
      npm/ng-packs/packages/setting-management/package.json
  15. 3
      npm/ng-packs/packages/tenant-management/package.json
  16. 3
      npm/ng-packs/packages/theme-basic/package.json
  17. 9
      npm/ng-packs/packages/theme-shared/package.json
  18. 0
      npm/ng-packs/source-code-requirements/tsconfig.lib.prod.temp
  19. 0
      npm/ng-packs/source-code-requirements/tsconfig.lib.temp
  20. 0
      npm/ng-packs/source-code-requirements/tsconfig.spec.temp
  21. 38
      npm/ng-packs/tsconfig.base.json
  22. 75
      npm/ng-packs/tsconfig.json
  23. 52
      npm/ng-packs/tslint.json
  24. 2399
      npm/ng-packs/yarn.lock
  25. 30
      npm/packs/utils/package.json
  26. 2
      npm/packs/utils/projects/utils/tsconfig.lib.json
  27. 2
      npm/packs/utils/projects/utils/tsconfig.spec.json
  28. 24
      npm/packs/utils/tsconfig.base.json
  29. 34
      npm/packs/utils/tsconfig.json
  30. 1823
      npm/packs/utils/yarn.lock
  31. 13
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/tempkey.rsa
  32. 59
      templates/module/angular/package.json
  33. 0
      templates/module/angular/projects/dev-app/.browserslistrc
  34. 4
      templates/module/angular/projects/dev-app/e2e/tsconfig.json
  35. 4
      templates/module/angular/projects/dev-app/src/app/app.module.ts
  36. 2
      templates/module/angular/projects/dev-app/tsconfig.app.json
  37. 2
      templates/module/angular/projects/dev-app/tsconfig.spec.json
  38. 6
      templates/module/angular/projects/my-project-name/package.json
  39. 2
      templates/module/angular/projects/my-project-name/tsconfig.spec.json
  40. 13
      templates/module/angular/tsconfig.base.json
  41. 32
      templates/module/angular/tsconfig.json

0
npm/ng-packs/apps/dev-app/browserslist → npm/ng-packs/apps/dev-app/.browserslistrc

2
npm/ng-packs/apps/dev-app/tsconfig.dev.json

@ -1,5 +1,5 @@
{ {
"extends": "../../tsconfig.json", "extends": "../../tsconfig.base.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/app", "outDir": "../../out-tsc/app",
"types": [] "types": []

2
npm/ng-packs/apps/dev-app/tsconfig.spec.json

@ -1,5 +1,5 @@
{ {
"extends": "../../tsconfig.json", "extends": "../../tsconfig.base.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/spec", "outDir": "../../out-tsc/spec",
"types": ["node", "jest"] "types": ["node", "jest"]

54
npm/ng-packs/package.json

@ -32,35 +32,35 @@
"@abp/ng.tenant-management": "~2.9.0", "@abp/ng.tenant-management": "~2.9.0",
"@abp/ng.theme.basic": "~2.9.0", "@abp/ng.theme.basic": "~2.9.0",
"@abp/ng.theme.shared": "~2.9.0", "@abp/ng.theme.shared": "~2.9.0",
"@abp/utils": "^2.9.0", "@abp/utils": "^3.0.0-alpha.1",
"@angular-builders/jest": "^9.0.1", "@angular-builders/jest": "^9.0.1",
"@angular-devkit/build-angular": "~0.901.7", "@angular-devkit/build-angular": "~0.1000.0",
"@angular-devkit/build-ng-packagr": "~0.901.7", "@angular-devkit/build-ng-packagr": "~0.1000.0",
"@angular/animations": "~9.1.9", "@angular/animations": "~10.0.0",
"@angular/cli": "~9.1.7", "@angular/cli": "~10.0.0",
"@angular/common": "~9.1.9", "@angular/common": "~10.0.0",
"@angular/compiler": "~9.1.9", "@angular/compiler": "~10.0.0",
"@angular/compiler-cli": "~9.1.9", "@angular/compiler-cli": "~10.0.0",
"@angular/core": "~9.1.9", "@angular/core": "~10.0.0",
"@angular/forms": "~9.1.9", "@angular/forms": "~10.0.0",
"@angular/language-service": "~9.1.9", "@angular/language-service": "~10.0.0",
"@angular/localize": "~9.1.9", "@angular/localize": "~10.0.0",
"@angular/platform-browser": "~9.1.9", "@angular/platform-browser": "~10.0.0",
"@angular/platform-browser-dynamic": "~9.1.9", "@angular/platform-browser-dynamic": "~10.0.0",
"@angular/router": "~9.1.9", "@angular/router": "~10.0.0",
"@fortawesome/fontawesome-free": "^5.13.0", "@fortawesome/fontawesome-free": "^5.13.0",
"@ng-bootstrap/ng-bootstrap": "^6.1.0", "@ng-bootstrap/ng-bootstrap": "^6.1.0",
"@ngneat/spectator": "^4.5.0", "@ngneat/spectator": "^5.11.0",
"@ngx-validate/core": "^0.0.8", "@ngx-validate/core": "^0.0.9",
"@ngxs/devtools-plugin": "^3.6.2", "@ngxs/devtools-plugin": "^3.6.2",
"@ngxs/logger-plugin": "^3.6.2", "@ngxs/logger-plugin": "^3.6.2",
"@ngxs/router-plugin": "^3.6.2", "@ngxs/router-plugin": "^3.6.2",
"@ngxs/storage-plugin": "^3.6.2", "@ngxs/storage-plugin": "^3.6.2",
"@ngxs/store": "^3.6.2", "@ngxs/store": "^3.6.2",
"@swimlane/ngx-datatable": "^16.0.0", "@swimlane/ngx-datatable": "^17.0.0",
"@types/jest": "^25.2.3", "@types/jest": "^25.2.3",
"@types/node": "^12.11.1", "@types/node": "^12.11.1",
"angular-oauth2-oidc": "^8.0.4", "angular-oauth2-oidc": "^9.2.2",
"bootstrap": "^4.5.0", "bootstrap": "^4.5.0",
"chart.js": "^2.9.3", "chart.js": "^2.9.3",
"codelyzer": "^5.1.2", "codelyzer": "^5.1.2",
@ -73,23 +73,23 @@
"just-clone": "^3.1.0", "just-clone": "^3.1.0",
"just-compare": "^1.3.0", "just-compare": "^1.3.0",
"lerna": "^3.19.0", "lerna": "^3.19.0",
"ng-packagr": "^9.1.5", "ng-packagr": "^10.0.0",
"ngxs-reset-plugin": "^1.3.0", "ngxs-reset-plugin": "^1.3.0",
"ngxs-schematic": "^1.1.9", "ngxs-schematic": "^1.1.9",
"prettier": "^1.18.2", "prettier": "^1.18.2",
"protractor": "~5.4.0", "protractor": "~7.0.0",
"rxjs": "~6.5.4", "rxjs": "~6.5.4",
"snq": "^1.0.3", "snq": "^1.0.3",
"symlink-manager": "^1.5.0", "symlink-manager": "^1.5.0",
"ts-node": "~7.0.0", "ts-node": "~7.0.0",
"ts-toolbelt": "^6.3.6", "ts-toolbelt": "^6.9.9",
"tsickle": "^0.37.0", "tsickle": "^0.38.1",
"tslint": "~5.20.0", "tslint": "~6.1.0",
"typescript": "~3.8.0", "typescript": "~3.9.5",
"zone.js": "~0.10.2" "zone.js": "~0.10.2"
}, },
"dependencies": { "dependencies": {
"tslib": "^1.10.0" "tslib": "^2.0.0"
}, },
"config": { "config": {
"commitizen": { "commitizen": {
@ -99,4 +99,4 @@
"resolutions": { "resolutions": {
"@ngx-validate/core": "^0.0.8" "@ngx-validate/core": "^0.0.8"
} }
} }

3
npm/ng-packs/packages/account/package.json

@ -8,7 +8,8 @@
}, },
"dependencies": { "dependencies": {
"@abp/ng.theme.shared": "~2.9.0" "@abp/ng.theme.shared": "~2.9.0"
}, , "tslib": "^2.0.0"
},
"publishConfig": { "publishConfig": {
"access": "public" "access": "public"
} }

7
npm/ng-packs/packages/core/package.json

@ -8,15 +8,16 @@
}, },
"dependencies": { "dependencies": {
"@abp/utils": "^2.9.0", "@abp/utils": "^2.9.0",
"@angular/localize": "~9.1.9", "@angular/localize": "~9.1.11",
"@ngxs/router-plugin": "^3.6.2", "@ngxs/router-plugin": "^3.6.2",
"@ngxs/storage-plugin": "^3.6.2", "@ngxs/storage-plugin": "^3.6.2",
"@ngxs/store": "^3.6.2", "@ngxs/store": "^3.6.2",
"angular-oauth2-oidc": "^8.0.4", "angular-oauth2-oidc": "^9.2.2",
"just-clone": "^3.1.0", "just-clone": "^3.1.0",
"just-compare": "^1.3.0", "just-compare": "^1.3.0",
"snq": "^1.0.3", "snq": "^1.0.3",
"ts-toolbelt": "^6.3.6" "ts-toolbelt": "^6.9.9",
"tslib": "^2.0.0"
}, },
"publishConfig": { "publishConfig": {
"access": "public" "access": "public"

12
npm/ng-packs/packages/core/src/lib/services/auth.service.ts

@ -20,14 +20,14 @@ export class AuthService {
private oAuthService: OAuthService, private oAuthService: OAuthService,
private store: Store, private store: Store,
@Optional() @Inject('ACCOUNT_OPTIONS') private options: any, @Optional() @Inject('ACCOUNT_OPTIONS') private options: any,
) {} ) {
login(username: string, password: string): Observable<any> {
const tenant = this.store.selectSnapshot(SessionState.getTenant);
this.oAuthService.configure( this.oAuthService.configure(
this.store.selectSnapshot(ConfigState.getOne('environment')).oAuthConfig, this.store.selectSnapshot(ConfigState.getOne('environment')).oAuthConfig,
); );
}
login(username: string, password: string): Observable<any> {
const tenant = this.store.selectSnapshot(SessionState.getTenant);
return from(this.oAuthService.loadDiscoveryDocument()).pipe( return from(this.oAuthService.loadDiscoveryDocument()).pipe(
switchMap(() => switchMap(() =>
@ -63,7 +63,7 @@ export class AuthService {
) )
.pipe( .pipe(
switchMap(() => { switchMap(() => {
this.oAuthService.logOut(); this.oAuthService.logOut(true);
return this.store.dispatch(new GetAppConfiguration()); return this.store.dispatch(new GetAppConfiguration());
}), }),
); );

1
npm/ng-packs/packages/core/src/lib/services/routes.service.ts

@ -126,6 +126,7 @@ export abstract class AbstractTreeService<T extends object> {
} }
} }
@Injectable()
export abstract class AbstractNavTreeService<T extends ABP.Nav> extends AbstractTreeService<T> export abstract class AbstractNavTreeService<T extends ABP.Nav> extends AbstractTreeService<T>
implements OnDestroy { implements OnDestroy {
readonly id = 'name'; readonly id = 'name';

3
npm/ng-packs/packages/feature-management/package.json

@ -7,7 +7,8 @@
"url": "https://github.com/abpframework/abp.git" "url": "https://github.com/abpframework/abp.git"
}, },
"dependencies": { "dependencies": {
"@abp/ng.theme.shared": "~2.9.0" "@abp/ng.theme.shared": "~2.9.0",
"tslib": "^2.0.0"
}, },
"publishConfig": { "publishConfig": {
"access": "public" "access": "public"

3
npm/ng-packs/packages/identity/package.json

@ -8,7 +8,8 @@
}, },
"dependencies": { "dependencies": {
"@abp/ng.permission-management": "~2.9.0", "@abp/ng.permission-management": "~2.9.0",
"@abp/ng.theme.shared": "~2.9.0" "@abp/ng.theme.shared": "~2.9.0",
"tslib": "^2.0.0"
}, },
"publishConfig": { "publishConfig": {
"access": "public" "access": "public"

185
npm/ng-packs/packages/identity/src/lib/components/users/users.component.html

@ -102,109 +102,110 @@
></ng-template> ></ng-template>
<form *ngIf="form; else loaderRef" [formGroup]="form" (ngSubmit)="save()"> <form *ngIf="form; else loaderRef" [formGroup]="form" (ngSubmit)="save()">
<ngb-tabset> <ul ngbNav #nav="ngbNav" class="nav-tabs">
<ngb-tab [title]="'AbpIdentity::UserInformations' | abpLocalization"> <li ngbNavItem>
<ng-template ngbTabContent> <a ngbNavLink>{{ 'AbpIdentity::UserInformations' | abpLocalization }}</a>
<div class="mt-2 fade-in-top"> <ng-template ngbNavContent>
<div class="form-group"> <div class="form-group">
<label for="user-name">{{ 'AbpIdentity::UserName' | abpLocalization }}</label <label for="user-name">{{ 'AbpIdentity::UserName' | abpLocalization }}</label
><span> * </span> ><span> * </span>
<input <input
type="text" type="text"
id="user-name" id="user-name"
class="form-control" class="form-control"
formControlName="userName" formControlName="userName"
autofocus autofocus
/> />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="name">{{ 'AbpIdentity::DisplayName:Name' | abpLocalization }}</label> <label for="name">{{ 'AbpIdentity::DisplayName:Name' | abpLocalization }}</label>
<input type="text" id="name" class="form-control" formControlName="name" /> <input type="text" id="name" class="form-control" formControlName="name" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="surname">{{ <label for="surname">{{
'AbpIdentity::DisplayName:Surname' | abpLocalization 'AbpIdentity::DisplayName:Surname' | abpLocalization
}}</label> }}</label>
<input type="text" id="surname" class="form-control" formControlName="surname" /> <input type="text" id="surname" class="form-control" formControlName="surname" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="password">{{ 'AbpIdentity::Password' | abpLocalization }}</label <label for="password">{{ 'AbpIdentity::Password' | abpLocalization }}</label
><span *ngIf="!selected.userName"> * </span> ><span *ngIf="!selected.userName"> * </span>
<input <input
type="password" type="password"
id="password" id="password"
autocomplete="new-password" autocomplete="new-password"
class="form-control" class="form-control"
formControlName="password" formControlName="password"
/> />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="email">{{ 'AbpIdentity::EmailAddress' | abpLocalization }}</label <label for="email">{{ 'AbpIdentity::EmailAddress' | abpLocalization }}</label
><span> * </span> ><span> * </span>
<input type="text" id="email" class="form-control" formControlName="email" /> <input type="text" id="email" class="form-control" formControlName="email" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="phone-number">{{ 'AbpIdentity::PhoneNumber' | abpLocalization }}</label> <label for="phone-number">{{ 'AbpIdentity::PhoneNumber' | abpLocalization }}</label>
<input <input
type="text" type="text"
id="phone-number" id="phone-number"
class="form-control" class="form-control"
formControlName="phoneNumber" formControlName="phoneNumber"
/> />
</div> </div>
<div class="custom-checkbox custom-control mb-2"> <div class="custom-checkbox custom-control mb-2">
<input <input
type="checkbox" type="checkbox"
id="lockout-checkbox" id="lockout-checkbox"
class="custom-control-input" class="custom-control-input"
formControlName="lockoutEnabled" formControlName="lockoutEnabled"
/> />
<label class="custom-control-label" for="lockout-checkbox">{{ <label class="custom-control-label" for="lockout-checkbox">{{
'AbpIdentity::DisplayName:LockoutEnabled' | abpLocalization 'AbpIdentity::DisplayName:LockoutEnabled' | abpLocalization
}}</label> }}</label>
</div> </div>
<div class="custom-checkbox custom-control mb-2"> <div class="custom-checkbox custom-control mb-2">
<input <input
type="checkbox" type="checkbox"
id="two-factor-checkbox" id="two-factor-checkbox"
class="custom-control-input" class="custom-control-input"
formControlName="twoFactorEnabled" formControlName="twoFactorEnabled"
/> />
<label class="custom-control-label" for="two-factor-checkbox">{{ <label class="custom-control-label" for="two-factor-checkbox">{{
'AbpIdentity::DisplayName:TwoFactorEnabled' | abpLocalization 'AbpIdentity::DisplayName:TwoFactorEnabled' | abpLocalization
}}</label> }}</label>
</div>
</div> </div>
</ng-template> </ng-template>
</ngb-tab> </li>
<ngb-tab [title]="'AbpIdentity::Roles' | abpLocalization">
<ng-template ngbTabContent> <li ngbNavItem>
<div class="mt-2 fade-in-top"> <a ngbNavLink>{{ 'AbpIdentity::Roles' | abpLocalization }}</a>
<div <ng-template ngbNavContent>
*ngFor="let roleGroup of roleGroups; let i = index; trackBy: trackByFn" <div
class="custom-checkbox custom-control mb-2" *ngFor="let roleGroup of roleGroups; let i = index; trackBy: trackByFn"
> class="custom-checkbox custom-control mb-2"
<input >
type="checkbox" <input
class="custom-control-input" type="checkbox"
[attr.id]="'roles-' + i" class="custom-control-input"
[formControl]="roleGroup.controls[roles[i].name]" [attr.id]="'roles-' + i"
/> [formControl]="roleGroup.controls[roles[i].name]"
<label class="custom-control-label" [attr.for]="'roles-' + i">{{ />
roles[i].name <label class="custom-control-label" [attr.for]="'roles-' + i">{{
}}</label> roles[i].name
</div> }}</label>
</div> </div>
</ng-template> </ng-template>
</ngb-tab> </li>
</ngb-tabset> </ul>
<div class="mt-2 fade-in-top" [ngbNavOutlet]="nav"></div>
</form> </form>
</ng-template> </ng-template>

4
npm/ng-packs/packages/identity/src/lib/identity.module.ts

@ -2,7 +2,7 @@ import { CoreModule, LazyModuleFactory } from '@abp/ng.core';
import { PermissionManagementModule } from '@abp/ng.permission-management'; import { PermissionManagementModule } from '@abp/ng.permission-management';
import { ThemeSharedModule } from '@abp/ng.theme.shared'; import { ThemeSharedModule } from '@abp/ng.theme.shared';
import { ModuleWithProviders, NgModule, NgModuleFactory } from '@angular/core'; import { ModuleWithProviders, NgModule, NgModuleFactory } from '@angular/core';
import { NgbDropdownModule, NgbTabsetModule } from '@ng-bootstrap/ng-bootstrap'; import { NgbDropdownModule, NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
import { NgxValidateCoreModule } from '@ngx-validate/core'; import { NgxValidateCoreModule } from '@ngx-validate/core';
import { NgxsModule } from '@ngxs/store'; import { NgxsModule } from '@ngxs/store';
import { RolesComponent } from './components/roles/roles.component'; import { RolesComponent } from './components/roles/roles.component';
@ -17,7 +17,7 @@ import { IdentityState } from './states/identity.state';
NgxsModule.forFeature([IdentityState]), NgxsModule.forFeature([IdentityState]),
CoreModule, CoreModule,
IdentityRoutingModule, IdentityRoutingModule,
NgbTabsetModule, NgbNavModule,
ThemeSharedModule, ThemeSharedModule,
NgbDropdownModule, NgbDropdownModule,
PermissionManagementModule, PermissionManagementModule,

3
npm/ng-packs/packages/permission-management/package.json

@ -7,7 +7,8 @@
"url": "https://github.com/abpframework/abp.git" "url": "https://github.com/abpframework/abp.git"
}, },
"dependencies": { "dependencies": {
"@abp/ng.theme.shared": "~2.9.0" "@abp/ng.theme.shared": "~2.9.0",
"tslib": "^2.0.0"
}, },
"publishConfig": { "publishConfig": {
"access": "public" "access": "public"

3
npm/ng-packs/packages/setting-management/package.json

@ -7,7 +7,8 @@
"url": "https://github.com/abpframework/abp.git" "url": "https://github.com/abpframework/abp.git"
}, },
"dependencies": { "dependencies": {
"@abp/ng.theme.shared": "~2.9.0" "@abp/ng.theme.shared": "~2.9.0",
"tslib": "^2.0.0"
}, },
"publishConfig": { "publishConfig": {
"access": "public" "access": "public"

3
npm/ng-packs/packages/tenant-management/package.json

@ -8,7 +8,8 @@
}, },
"dependencies": { "dependencies": {
"@abp/ng.feature-management": "~2.9.0", "@abp/ng.feature-management": "~2.9.0",
"@abp/ng.theme.shared": "~2.9.0" "@abp/ng.theme.shared": "~2.9.0",
"tslib": "^2.0.0"
}, },
"publishConfig": { "publishConfig": {
"access": "public" "access": "public"

3
npm/ng-packs/packages/theme-basic/package.json

@ -8,7 +8,8 @@
}, },
"dependencies": { "dependencies": {
"@abp/ng.theme.shared": "~2.9.0" "@abp/ng.theme.shared": "~2.9.0"
}, , "tslib": "^2.0.0"
},
"publishConfig": { "publishConfig": {
"access": "public" "access": "public"
} }

9
npm/ng-packs/packages/theme-shared/package.json

@ -8,12 +8,13 @@
}, },
"dependencies": { "dependencies": {
"@abp/ng.core": "~2.9.0", "@abp/ng.core": "~2.9.0",
"@fortawesome/fontawesome-free": "^5.13.0", "@fortawesome/fontawesome-free": "^5.13.1",
"@ng-bootstrap/ng-bootstrap": "^6.1.0", "@ng-bootstrap/ng-bootstrap": "^6.1.0",
"@ngx-validate/core": "^0.0.8", "@ngx-validate/core": "^0.0.9",
"@swimlane/ngx-datatable": "^16.0.0", "@swimlane/ngx-datatable": "^17.0.0",
"bootstrap": "^4.5.0", "bootstrap": "^4.5.0",
"chart.js": "^2.9.3" "chart.js": "^2.9.3",
"tslib": "^2.0.0"
}, },
"publishConfig": { "publishConfig": {
"access": "public" "access": "public"

0
npm/ng-packs/source-code-requirements/tsconfig.lib.prod.json → npm/ng-packs/source-code-requirements/tsconfig.lib.prod.temp

0
npm/ng-packs/source-code-requirements/tsconfig.lib.json → npm/ng-packs/source-code-requirements/tsconfig.lib.temp

0
npm/ng-packs/source-code-requirements/tsconfig.spec.json → npm/ng-packs/source-code-requirements/tsconfig.spec.temp

38
npm/ng-packs/tsconfig.base.json

@ -0,0 +1,38 @@
{
"compileOnSave": false,
"compilerOptions": {
"baseUrl": "./",
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"downlevelIteration": true,
"experimentalDecorators": true,
"module": "esnext",
"moduleResolution": "node",
"importHelpers": true,
"target": "es2015",
"typeRoots": ["node_modules/@types"],
"lib": ["es2018", "dom"],
"types": ["jest"],
"paths": {
"@abp/ng.core": ["packages/core/src/public-api.ts"],
"@abp/ng.theme.shared": ["packages/theme-shared/src/public-api.ts"],
"@abp/ng.theme.shared/extensions": ["packages/theme-shared/src/public-api.ts"],
"@abp/ng.theme.basic": ["packages/theme-basic/src/public-api.ts"],
"@abp/ng.account": ["packages/account/src/public-api.ts"],
"@abp/ng.account/config": ["packages/account/config/src/public-api.ts"],
"@abp/ng.identity": ["packages/identity/src/public-api.ts"],
"@abp/ng.identity/config": ["packages/identity/config/src/public-api.ts"],
"@abp/ng.tenant-management": ["packages/tenant-management/src/public-api.ts"],
"@abp/ng.tenant-management/config": ["packages/tenant-management/config/src/public-api.ts"],
"@abp/ng.setting-management": ["packages/setting-management/src/public-api.ts"],
"@abp/ng.setting-management/config": ["packages/setting-management/config/src/public-api.ts"],
"@abp/ng.permission-management": ["packages/permission-management/src/public-api.ts"],
"@abp/ng.feature-management": ["packages/feature-management/src/public-api.ts"]
}
},
"angularCompilerOptions": {
"fullTemplateTypeCheck": true,
"strictInjectionParameters": true
}
}

75
npm/ng-packs/tsconfig.json

@ -1,38 +1,41 @@
/*
This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
It is not intended to be used to perform a compilation.
To learn more about this file see: https://angular.io/config/solution-tsconfig.
*/
{ {
"compileOnSave": false, "files": [],
"compilerOptions": { "references": [
"baseUrl": "./", {
"outDir": "./dist/out-tsc", "path": "./packages/core/tsconfig.lib.json"
"sourceMap": true, },
"declaration": false, {
"downlevelIteration": true, "path": "./packages/theme-shared/tsconfig.lib.json"
"experimentalDecorators": true, },
"module": "esnext", {
"moduleResolution": "node", "path": "./packages/theme-basic/tsconfig.lib.json"
"importHelpers": true, },
"target": "es2015", {
"typeRoots": ["node_modules/@types"], "path": "./packages/account/tsconfig.lib.json"
"lib": ["es2018", "dom"], },
"types": ["jest"], {
"paths": { "path": "./packages/permission-management/tsconfig.lib.json"
"@abp/ng.core": ["packages/core/src/public-api.ts"], },
"@abp/ng.theme.shared": ["packages/theme-shared/src/public-api.ts"], {
"@abp/ng.theme.shared/extensions": ["packages/theme-shared/src/public-api.ts"], "path": "./packages/identity/tsconfig.lib.json"
"@abp/ng.theme.basic": ["packages/theme-basic/src/public-api.ts"], },
"@abp/ng.account": ["packages/account/src/public-api.ts"], {
"@abp/ng.account/config": ["packages/account/config/src/public-api.ts"], "path": "./packages/feature-management/tsconfig.lib.json"
"@abp/ng.identity": ["packages/identity/src/public-api.ts"], },
"@abp/ng.identity/config": ["packages/identity/config/src/public-api.ts"], {
"@abp/ng.tenant-management": ["packages/tenant-management/src/public-api.ts"], "path": "./packages/tenant-management/tsconfig.lib.json"
"@abp/ng.tenant-management/config": ["packages/tenant-management/config/src/public-api.ts"], },
"@abp/ng.setting-management": ["packages/setting-management/src/public-api.ts"], {
"@abp/ng.setting-management/config": ["packages/setting-management/config/src/public-api.ts"], "path": "./packages/setting-management/tsconfig.lib.json"
"@abp/ng.permission-management": ["packages/permission-management/src/public-api.ts"], },
"@abp/ng.feature-management": ["packages/feature-management/src/public-api.ts"] {
"path": "./apps/dev-app/tsconfig.dev.json"
} }
}, ]
"angularCompilerOptions": { }
"fullTemplateTypeCheck": true,
"strictInjectionParameters": true
}
}

52
npm/ng-packs/tslint.json

@ -2,16 +2,38 @@
"extends": "tslint:recommended", "extends": "tslint:recommended",
"rulesDirectory": ["node_modules/codelyzer"], "rulesDirectory": ["node_modules/codelyzer"],
"rules": { "rules": {
"align": {
"options": [
"parameters",
"statements"
]
},
"array-type": false, "array-type": false,
"contextual-lifecycle": true, "contextual-lifecycle": true,
"component-class-suffix": [true, "Component"], "component-class-suffix": [true, "Component"],
"directive-class-suffix": [true, "Directive"], "directive-class-suffix": [true, "Directive"],
"eofline": true,
"import-spacing": true,
"indent": {
"options": [
"spaces"
]
},
"max-line-length": [true, 140], "max-line-length": [true, 140],
"no-consecutive-blank-lines": false, "no-consecutive-blank-lines": false,
"no-redundant-jsdoc": true, "no-redundant-jsdoc": true,
"no-var-requires": false, "no-var-requires": false,
"object-literal-key-quotes": [true, "as-needed"], "object-literal-key-quotes": [true, "as-needed"],
"ordered-imports": false, "ordered-imports": false,
"space-before-function-paren": {
"options": {
"anonymous": "never",
"asyncArrow": "always",
"constructor": "never",
"method": "never",
"named": "never"
}
},
"trailing-comma": false, "trailing-comma": false,
"component-max-inline-declarations": [true, { "animations": 20, "styles": 20, "template": 20 }], "component-max-inline-declarations": [true, { "animations": 20, "styles": 20, "template": 20 }],
"no-forward-ref": true, "no-forward-ref": true,
@ -21,6 +43,24 @@
"no-unused-css": true, "no-unused-css": true,
"prefer-output-readonly": true, "prefer-output-readonly": true,
"template-conditional-complexity": [true, 4], "template-conditional-complexity": [true, 4],
"typedef-whitespace": {
"options": [
{
"call-signature": "nospace",
"index-signature": "nospace",
"parameter": "nospace",
"property-declaration": "nospace",
"variable-declaration": "nospace"
},
{
"call-signature": "onespace",
"index-signature": "onespace",
"parameter": "onespace",
"property-declaration": "onespace",
"variable-declaration": "onespace"
}
]
},
"use-component-selector": true, "use-component-selector": true,
"max-classes-per-file": false, "max-classes-per-file": false,
"arrow-parens": false, "arrow-parens": false,
@ -96,5 +136,15 @@
"use-pipe-transform-interface": true, "use-pipe-transform-interface": true,
"variable-name": false, "variable-name": false,
"prefer-for-of": false "prefer-for-of": false
} , "whitespace": {
"options": [
"check-branch",
"check-decl",
"check-operator",
"check-separator",
"check-type",
"check-typecast"
]
}
}
} }

2399
npm/ng-packs/yarn.lock

File diff suppressed because it is too large

30
npm/packs/utils/package.json

@ -1,6 +1,6 @@
{ {
"name": "@abp/utils", "name": "@abp/utils",
"version": "2.9.0", "version": "3.0.0-alpha.1",
"scripts": { "scripts": {
"prepublish": "yarn install --ignore-scripts && node prepublish.js", "prepublish": "yarn install --ignore-scripts && node prepublish.js",
"ng": "ng", "ng": "ng",
@ -24,14 +24,14 @@
"sideEffects": false, "sideEffects": false,
"devDependencies": { "devDependencies": {
"@angular-builders/jest": "^9.0.0", "@angular-builders/jest": "^9.0.0",
"@angular-devkit/build-ng-packagr": "~0.901.0", "@angular-devkit/build-ng-packagr": "~0.1000.0",
"@angular/cli": "~9.1.0", "@angular/cli": "~10.0.0",
"@angular/common": "^9.1.0", "@angular/common": "^10.0.0",
"@angular/compiler": "~9.1.0", "@angular/compiler": "~10.0.0",
"@angular/compiler-cli": "~9.1.0", "@angular/compiler-cli": "~10.0.0",
"@angular/core": "~9.1.0", "@angular/core": "~10.0.0",
"@angular/platform-browser": "^9.1.0", "@angular/platform-browser": "^10.0.0",
"@angular/platform-browser-dynamic": "^9.1.0", "@angular/platform-browser-dynamic": "^10.0.0",
"@types/execa": "^2.0.0", "@types/execa": "^2.0.0",
"@types/fs-extra": "^8.1.0", "@types/fs-extra": "^8.1.0",
"@types/jest": "^25.1.4", "@types/jest": "^25.1.4",
@ -41,17 +41,15 @@
"fs-extra": "^9.0.0", "fs-extra": "^9.0.0",
"jest": "^25.2.4", "jest": "^25.2.4",
"jest-preset-angular": "^8.1.2", "jest-preset-angular": "^8.1.2",
"ng-packagr": "^9.0.0", "ng-packagr": "^10.0.0",
"protractor": "~5.4.3", "protractor": "~7.0.0",
"ts-node": "~8.3.0", "ts-node": "~8.3.0",
"tslib": "^1.10.0", "tslib": "^2.0.0",
"tslint": "~6.1.0", "tslint": "~6.1.0",
"typescript": "~3.6.0", "typescript": "~3.9.5",
"zone.js": "~0.10.2" "zone.js": "~0.10.2"
}, },
"peerDependencies": { "peerDependencies": {},
"tslib": "^1.10.0"
},
"dependencies": { "dependencies": {
"just-compare": "^1.3.0" "just-compare": "^1.3.0"
}, },

2
npm/packs/utils/projects/utils/tsconfig.lib.json

@ -1,5 +1,5 @@
{ {
"extends": "../../tsconfig.json", "extends": "../../tsconfig.base.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/lib", "outDir": "../../out-tsc/lib",
"target": "es2015", "target": "es2015",

2
npm/packs/utils/projects/utils/tsconfig.spec.json

@ -1,5 +1,5 @@
{ {
"extends": "../../tsconfig.json", "extends": "../../tsconfig.base.json",
"compilerOptions": { "compilerOptions": {
"emitDecoratorMetadata": true, "emitDecoratorMetadata": true,
"esModuleInterop": true, "esModuleInterop": true,

24
npm/packs/utils/tsconfig.base.json

@ -0,0 +1,24 @@
{
"compileOnSave": false,
"compilerOptions": {
"baseUrl": "./",
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"downlevelIteration": true,
"experimentalDecorators": true,
"module": "esnext",
"moduleResolution": "node",
"importHelpers": true,
"target": "es2015",
"strictBindCallApply": true,
"lib": ["es2018", "dom"],
"paths": {
"utils": ["dist/utils/utils", "dist/utils"]
}
},
"angularCompilerOptions": {
"fullTemplateTypeCheck": true,
"strictInjectionParameters": true
}
}

34
npm/packs/utils/tsconfig.json

@ -1,24 +1,14 @@
/*
This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
It is not intended to be used to perform a compilation.
To learn more about this file see: https://angular.io/config/solution-tsconfig.
*/
{ {
"compileOnSave": false, "files": [],
"compilerOptions": { "references": [
"baseUrl": "./", {
"outDir": "./dist/out-tsc", "path": "./projects/utils/tsconfig.lib.json"
"sourceMap": true,
"declaration": false,
"downlevelIteration": true,
"experimentalDecorators": true,
"module": "esnext",
"moduleResolution": "node",
"importHelpers": true,
"target": "es2015",
"strictBindCallApply": true,
"lib": ["es2018", "dom"],
"paths": {
"utils": ["dist/utils/utils", "dist/utils"]
} }
}, ]
"angularCompilerOptions": { }
"fullTemplateTypeCheck": true,
"strictInjectionParameters": true
}
}

1823
npm/packs/utils/yarn.lock

File diff suppressed because it is too large

13
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/tempkey.rsa

@ -0,0 +1,13 @@
{
"KeyId": "f788zGVUZh9H-HbWL1S-Mg",
"Parameters": {
"D": "F19hbC5PLO872DszGiJnVoU55ee7XGXmNf0KEKndJ/uGBv5lWklXA0QF80h1ytWXde0jV5isQPB1t7mPhRQlDoDTkywLi1CeOgBPbxzHEfLjZZ5c4olfeX0IJX9BDqgUntY0H1a/+Om/eDu4OZUz3EIJFFZBgz46YZSyTT6ZDvAEdpC/o66sNJmxvJIp+8zVoVDSqBUzxmc+oEamXLg7r2jdymxJMxau1kQFxEGLOrJnNxGsEe8UrYA3qSsm8m/Xg4uOh7RYgnuEEt88+KTvRq+CAMWhN3YNLtOJ3NmXowwE7e1Ma+jih9+UVfxZn14P5+SOJbQ2bYV2sCV+2vBiCQ==",
"DP": "oPiGO/qdOQfFEAS9fMInQnsrNylIZVpDYEVoDJ6/jQfE/IpuwxGcmsaGvCob3SKxZiJRLCWpwJYo1hCh/JOSVGWMkVyELky56nbbkkV5ymKLSGZ4JoetdQs+GchnPdR+k2P9Ij1Kjk13ylubN3htzNhcBASJpOfSEv5pPVzGKX0=",
"DQ": "z6imxLABHkyftbfUUtpeOlPanEHgpuIjmUdp3T1Ju1jziE63UEhuj0GPAXOF17uYxixwYE8JhOJ7+TyIK9oZeI3zH2OzJqQh8f5PCQ/E+0ULXZDeNV/ShDLCTufu3Fis9Rt64uTp/H/l21oMQ79jc0ysa8DTz1ReJLRc5qjL41U=",
"Exponent": "AQAB",
"InverseQ": "ieZcvSt5XYukKJKhXpv5Dm/1RD7iH88cZnhLSTEVTMoOUHoYWmApY5pNLGahbfjA9bxnkBWDYex/i7wE9uNNY5CsA6ovUaQLVJDt3kHvR9W+9QtN8D6jjG2TuRbbOdEg4RqhfjUaDfDIgTJX2Wxc8U98FOvOyGw1HzwUPFZKecM=",
"Modulus": "vk4z1Bmtmbo+gxITcY+FIlXzcO2wTOGlOXK5GMYj/6PUMFt7lbqkc72AkPsrAo5/JE8LYLhWj7fzSKbjvtowHCz5m2t+FlUYmuiKpvvnJsTqvQrckNlbZ1nm071q5PhP3Dar/OksfBhPtAX+c3+NjDnM/w53ccJJNaBDO/s9JYoN7vH5n6ed1pMSK71hmg4MPsxChcnc1f1PpnG2mqyJ253+GEUbj/kRyeBSmCCr9aadov2ZzxIKVaFNagJEHOzanQmorSLpP25GfOHCuy27Zkef94V/qU9elzjbH4uIKslVGx5T6H99TYh0sUGu11NytYJa5WNAZWow95CzurC2vw==",
"P": "4GMCQy+XTNzR5TsgFcdAZv2K6TcQR13fHVvPoxQp/b32V5YUJOBFEUAtqociy5ro4+KzpXP5WPSk1ZtznGKuNZyLq8gTnhpB3rwd0sdo4zxKnQ5nu+n1UhlhWNxg5A9V5TaciUAyPrHWJfLoYTQWygNTgJELQH5zZXi2ihC2uiU=",
"Q": "2R36pamnLAJggkPJxiW5qH6HizZ+bkQVg0BBftMLzkAM8Y9CwTW75GRUzGEJFpMckkw0GZSYb1Uwl3DVUpkcQ8LZ91IPYdPpDlYUshhIxl184M55pnO14besKxJtMZ64zhHKVAR2pBMO0n6W4/1iBXkkQqyPViJxdfvXPJMBbhM="
}
}

59
templates/module/angular/package.json

@ -5,49 +5,54 @@
"ng": "ng", "ng": "ng",
"start": "ng serve dev-app --open", "start": "ng serve dev-app --open",
"build": "ng build my-project-name --prod", "build": "ng build my-project-name --prod",
"build:app": "ng build dev-app --prod", "build:app": "npm run symlink:copy -- --no-watch && ng build dev-app --prod",
"symlink:copy": "symlink copy --angular --packages @my-company-name/my-project-name --prod",
"test": "ng test", "test": "ng test",
"lint": "ng lint", "lint": "ng lint",
"e2e": "ng e2e" "e2e": "ng e2e",
"compile:ivy": "yarn ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points --tsconfig './tsconfig.prod.json' --source node_modules --async false",
"postinstall": "npm run compile:ivy"
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "~9.1.11", "@abp/ng.account": "~2.9.0",
"@angular/common": "~9.1.11", "@abp/ng.identity": "~2.9.0",
"@angular/compiler": "~9.1.11", "@abp/ng.setting-management": "~2.9.0",
"@angular/core": "~9.1.11", "@abp/ng.tenant-management": "~2.9.0",
"@angular/forms": "~9.1.11", "@abp/ng.theme.basic": "~2.9.0",
"@angular/platform-browser": "~9.1.11", "@angular/animations": "~10.0.0",
"@angular/platform-browser-dynamic": "~9.1.11", "@angular/common": "~10.0.0",
"@angular/router": "~9.1.11", "@angular/compiler": "~10.0.0",
"@abp/ng.account": "~3.0.0", "@angular/core": "~10.0.0",
"@abp/ng.identity": "~3.0.0", "@angular/forms": "~10.0.0",
"@abp/ng.tenant-management": "~3.0.0", "@angular/platform-browser": "~10.0.0",
"@abp/ng.setting-management": "~3.0.0", "@angular/platform-browser-dynamic": "~10.0.0",
"@angular/router": "~10.0.0",
"rxjs": "~6.5.4", "rxjs": "~6.5.4",
"tslib": "^1.10.0", "tslib": "^2.0.0",
"zone.js": "~0.10.2" "zone.js": "~0.10.2"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "~0.901.9", "@angular-devkit/build-angular": "~0.1000.0",
"@angular-devkit/build-ng-packagr": "~0.901.9", "@angular-devkit/build-ng-packagr": "~0.1000.0",
"@angular/cli": "~9.1.9", "@angular/cli": "~10.0.0",
"@angular/compiler-cli": "~9.1.11", "@angular/compiler-cli": "~10.0.0",
"@types/node": "^12.11.1",
"@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",
"codelyzer": "^5.1.2", "codelyzer": "^5.1.2",
"jasmine-core": "~3.5.0", "jasmine-core": "~3.5.0",
"jasmine-spec-reporter": "~4.2.1", "jasmine-spec-reporter": "~5.0.0",
"karma": "~5.0.0", "karma": "~5.0.0",
"karma-chrome-launcher": "~3.1.0", "karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~2.1.0", "karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~3.0.1", "karma-jasmine": "~3.3.0",
"karma-jasmine-html-reporter": "^1.4.2", "karma-jasmine-html-reporter": "^1.5.0",
"ng-packagr": "^9.0.0", "ng-packagr": "^10.0.0",
"protractor": "~7.0.0", "protractor": "~7.0.0",
"symlink-manager": "^1.5.0",
"ts-node": "~8.3.0", "ts-node": "~8.3.0",
"tslint": "~6.1.0", "tslint": "~6.1.0",
"typescript": "~3.8.3" "typescript": "~3.9.5"
} }
} }

0
templates/module/angular/projects/dev-app/browserslist → templates/module/angular/projects/dev-app/.browserslistrc

4
templates/module/angular/projects/dev-app/e2e/tsconfig.json

@ -1,9 +1,9 @@
{ {
"extends": "../../../tsconfig.json", "extends": "../../../tsconfig.base.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../../../out-tsc/e2e", "outDir": "../../../out-tsc/e2e",
"module": "commonjs", "module": "commonjs",
"target": "es5", "target": "es2018",
"types": [ "types": [
"jasmine", "jasmine",
"jasminewd2", "jasminewd2",

4
templates/module/angular/projects/dev-app/src/app/app.module.ts

@ -13,7 +13,7 @@ import { environment } from '../environments/environment';
import { AppRoutingModule } from './app-routing.module'; 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 { SharedModule } from './shared/shared.module'; import { ThemeBasicModule } from '@abp/ng.theme.basic';
@NgModule({ @NgModule({
imports: [ imports: [
@ -32,7 +32,7 @@ import { SharedModule } from './shared/shared.module';
TenantManagementConfigModule.forRoot(), TenantManagementConfigModule.forRoot(),
SettingManagementConfigModule.forRoot(), SettingManagementConfigModule.forRoot(),
NgxsModule.forRoot(), NgxsModule.forRoot(),
SharedModule, ThemeBasicModule.forRoot(),
], ],
providers: [APP_ROUTE_PROVIDER], providers: [APP_ROUTE_PROVIDER],
declarations: [AppComponent], declarations: [AppComponent],

2
templates/module/angular/projects/dev-app/tsconfig.app.json

@ -1,5 +1,5 @@
{ {
"extends": "../../tsconfig.json", "extends": "../../tsconfig.base.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/app", "outDir": "../../out-tsc/app",
"types": [] "types": []

2
templates/module/angular/projects/dev-app/tsconfig.spec.json

@ -1,5 +1,5 @@
{ {
"extends": "../../tsconfig.json", "extends": "../../tsconfig.base.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/spec", "outDir": "../../out-tsc/spec",
"types": [ "types": [

6
templates/module/angular/projects/my-project-name/package.json

@ -1,5 +1,5 @@
{ {
"name": "my-project-name", "name": "@my-company-name/my-project-name",
"version": "0.0.1", "version": "0.0.1",
"peerDependencies": { "peerDependencies": {
"@angular/common": "^9.1.11", "@angular/common": "^9.1.11",
@ -8,6 +8,6 @@
"@abp/ng.theme.shared": ">=3.0.0" "@abp/ng.theme.shared": ">=3.0.0"
}, },
"dependencies": { "dependencies": {
"tslib": "^1.10.0" "tslib": "^2.0.0"
} }
} }

2
templates/module/angular/projects/my-project-name/tsconfig.spec.json

@ -1,5 +1,5 @@
{ {
"extends": "../../tsconfig.json", "extends": "../../tsconfig.base.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../../out-tsc/spec", "outDir": "../../out-tsc/spec",
"types": [ "types": [

13
templates/module/angular/tsconfig.base.json

@ -0,0 +1,13 @@
{
"extends": "./tsconfig.prod.json",
"compilerOptions": {
"paths": {
"@my-company-name/my-project-name": [
"projects/my-project-name/src/public-api.ts"
],
"@my-company-name/my-project-name/config": [
"projects/my-project-name/config/src/public-api.ts"
]
}
}
}

32
templates/module/angular/tsconfig.json

@ -1,13 +1,23 @@
/*
This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
It is not intended to be used to perform a compilation.
To learn more about this file see: https://angular.io/config/solution-tsconfig.
*/
{ {
"extends": "./tsconfig.prod.json", "files": [],
"compilerOptions": { "references": [
"paths": { {
"@my-company-name/my-project-name": [ "path": "./projects/my-project-name/tsconfig.lib.json"
"projects/my-project-name/src/public-api.ts" },
], {
"@my-company-name/my-project-name/config": [ "path": "./projects/my-project-name/tsconfig.spec.json"
"projects/my-project-name/config/src/public-api.ts" },
] {
"path": "./projects/dev-app/tsconfig.app.json"
},
{
"path": "./projects/dev-app/tsconfig.spec.json"
} }
} ]
} }
Loading…
Cancel
Save