imhven
/
abp
mirror of https://github.com/abpframework/abp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3465 from abpframework/refactor/dev

Browse Source 
Development environment enhanced
pull/3469/head
Levent Arman Özak 6 years ago committed by GitHub
parent 7da95c5847 fcf9ebe0c9
commit aaf9bd81b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 121 additions and 98 deletions
Show Stats Download Patch File Download Diff File

10
npm/ng-packs/angular.json
Unescape View File

@ -32,7 +32,6 @@
}
}
},
"theme-shared": {
"projectType": "library",
"root": "packages/theme-shared",
@ -436,7 +435,7 @@
"index": "apps/dev-app/src/index.html",
"main": "apps/dev-app/src/main.ts",
"polyfills": "apps/dev-app/src/polyfills.ts",
"tsConfig": "apps/dev-app/tsconfig.app.json",
"tsConfig": "apps/dev-app/tsconfig.prod.json",
"aot": false,
"assets": ["apps/dev-app/src/favicon.ico", "apps/dev-app/src/assets"],
"extractCss": true,
@ -487,6 +486,7 @@
]
},
"internal": {
"tsConfig": "apps/dev-app/tsconfig.dev.json",
"fileReplacements": [
{
"replace": "apps/dev-app/src/environments/environment.ts",
@ -519,7 +519,11 @@
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["apps/dev-app/tsconfig.app.json", "apps/dev-app/tsconfig.spec.json"],
"tsConfig": [
"apps/dev-app/tsconfig.dev.json",
"apps/dev-app/tsconfig.prod.json",
"apps/dev-app/tsconfig.spec.json"
],
"exclude": ["**/node_modules/**"]
}
}

10
npm/ng-packs/apps/dev-app/tsconfig.dev.json
Unescape View File

@ -0,0 +1,10 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/app",
"types": []
},
"files": ["src/main.ts", "src/polyfills.ts"],
"include": ["src/**/*.ts"],
"exclude": ["src/test.ts", "src/**/*.spec.ts"]
}

2
npm/ng-packs/apps/dev-app/tsconfig.app.json → npm/ng-packs/apps/dev-app/tsconfig.prod.json
Unescape View File

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

1
npm/ng-packs/package.json
Unescape View File

@ -9,6 +9,7 @@
"symlink": "symlink",
"start": "ng serve dev-app",
"start:internal": "ng serve dev-app --configuration=internal",
"build": "ng build",
"test": "ng test --watchAll --runInBand",
"commit": "git-cz",
"lint": "ng lint",

12
npm/ng-packs/packages/account-config/tsconfig.lib.json
Unescape View File

@ -1,15 +1,12 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.prod.json",
"compilerOptions": {
"outDir": "../../out-tsc/lib",
"target": "es2015",
"declaration": true,
"inlineSources": true,
"types": [],
"lib": [
"dom",
"es2018"
]
"lib": ["dom", "es2018"]
},
"angularCompilerOptions": {
"annotateForClosureCompiler": true,
@ -19,8 +16,5 @@
"strictInjectionParameters": true,
"enableResourceInlining": true
},
"exclude": [
"src/test.ts",
"**/*.spec.ts"
]
"exclude": ["src/test.ts", "**/*.spec.ts"]
}

2
npm/ng-packs/packages/account-config/tsconfig.spec.json
Unescape View File

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

2
npm/ng-packs/packages/account/tsconfig.lib.json
Unescape View File

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

2
npm/ng-packs/packages/account/tsconfig.spec.json
Unescape View File

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

2
npm/ng-packs/packages/core/tsconfig.lib.json
Unescape View File

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

2
npm/ng-packs/packages/core/tsconfig.spec.json
Unescape View File

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

12
npm/ng-packs/packages/feature-management/tsconfig.lib.json
Unescape View File

@ -1,15 +1,12 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.prod.json",
"compilerOptions": {
"outDir": "../../out-tsc/lib",
"target": "es2015",
"declaration": true,
"inlineSources": true,
"types": [],
"lib": [
"dom",
"es2018"
]
"lib": ["dom", "es2018"]
},
"angularCompilerOptions": {
"annotateForClosureCompiler": true,
@ -19,8 +16,5 @@
"strictInjectionParameters": true,
"enableResourceInlining": true
},
"exclude": [
"src/test.ts",
"**/*.spec.ts"
]
"exclude": ["src/test.ts", "**/*.spec.ts"]
}

2
npm/ng-packs/packages/feature-management/tsconfig.spec.json
Unescape View File

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

12
npm/ng-packs/packages/identity-config/tsconfig.lib.json
Unescape View File

@ -1,15 +1,12 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.prod.json",
"compilerOptions": {
"outDir": "../../out-tsc/lib",
"target": "es2015",
"declaration": true,
"inlineSources": true,
"types": [],
"lib": [
"dom",
"es2018"
]
"lib": ["dom", "es2018"]
},
"angularCompilerOptions": {
"annotateForClosureCompiler": true,
@ -19,8 +16,5 @@
"strictInjectionParameters": true,
"enableResourceInlining": true
},
"exclude": [
"src/test.ts",
"**/*.spec.ts"
]
"exclude": ["src/test.ts", "**/*.spec.ts"]
}

2
npm/ng-packs/packages/identity-config/tsconfig.spec.json
Unescape View File

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

6
npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts
Unescape View File

@ -1,5 +1,5 @@
import { ABP } from '@abp/ng.core';
import { ConfirmationService, Toaster } from '@abp/ng.theme.shared';
import { ConfirmationService, Confirmation } from '@abp/ng.theme.shared';
import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
import { Select, Store } from '@ngxs/store';
@ -116,8 +116,8 @@ export class RolesComponent implements OnInit {
.warn('AbpIdentity::RoleDeletionConfirmationMessage', 'AbpIdentity::AreYouSure', {
messageLocalizationParams: [name],
})
.subscribe((status: Toaster.Status) => {
if (status === Toaster.Status.confirm) {
.subscribe((status: Confirmation.Status) => {
if (status === Confirmation.Status.confirm) {
this.store.dispatch(new DeleteRole(id)).subscribe(() => this.get());
}
});

2
npm/ng-packs/packages/identity/tsconfig.lib.json
Unescape View File

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

2
npm/ng-packs/packages/identity/tsconfig.spec.json
Unescape View File

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

2
npm/ng-packs/packages/permission-management/tsconfig.lib.json
Unescape View File

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

2
npm/ng-packs/packages/permission-management/tsconfig.spec.json
Unescape View File

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

12
npm/ng-packs/packages/setting-management-config/tsconfig.lib.json
Unescape View File

@ -1,15 +1,12 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.prod.json",
"compilerOptions": {
"outDir": "../../out-tsc/lib",
"target": "es2015",
"declaration": true,
"inlineSources": true,
"types": [],
"lib": [
"dom",
"es2018"
]
"lib": ["dom", "es2018"]
},
"angularCompilerOptions": {
"annotateForClosureCompiler": true,
@ -19,8 +16,5 @@
"strictInjectionParameters": true,
"enableResourceInlining": true
},
"exclude": [
"src/test.ts",
"**/*.spec.ts"
]
"exclude": ["src/test.ts", "**/*.spec.ts"]
}

2
npm/ng-packs/packages/setting-management-config/tsconfig.spec.json
Unescape View File

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

12
npm/ng-packs/packages/setting-management/tsconfig.lib.json
Unescape View File

@ -1,15 +1,12 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.prod.json",
"compilerOptions": {
"outDir": "../../out-tsc/lib",
"target": "es2015",
"declaration": true,
"inlineSources": true,
"types": [],
"lib": [
"dom",
"es2018"
]
"lib": ["dom", "es2018"]
},
"angularCompilerOptions": {
"annotateForClosureCompiler": true,
@ -19,8 +16,5 @@
"strictInjectionParameters": true,
"enableResourceInlining": true
},
"exclude": [
"src/test.ts",
"**/*.spec.ts"
]
"exclude": ["src/test.ts", "**/*.spec.ts"]
}

2
npm/ng-packs/packages/setting-management/tsconfig.spec.json
Unescape View File

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

12
npm/ng-packs/packages/tenant-management-config/tsconfig.lib.json
Unescape View File

@ -1,15 +1,12 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.prod.json",
"compilerOptions": {
"outDir": "../../out-tsc/lib",
"target": "es2015",
"declaration": true,
"inlineSources": true,
"types": [],
"lib": [
"dom",
"es2018"
]
"lib": ["dom", "es2018"]
},
"angularCompilerOptions": {
"annotateForClosureCompiler": true,
@ -19,8 +16,5 @@
"strictInjectionParameters": true,
"enableResourceInlining": true
},
"exclude": [
"src/test.ts",
"**/*.spec.ts"
]
"exclude": ["src/test.ts", "**/*.spec.ts"]
}

2
npm/ng-packs/packages/tenant-management-config/tsconfig.spec.json
Unescape View File

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

6
npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts
Unescape View File

@ -1,5 +1,5 @@
import { ABP } from '@abp/ng.core';
import { ConfirmationService, Toaster } from '@abp/ng.theme.shared';
import { ConfirmationService, Confirmation } from '@abp/ng.theme.shared';
import { Component, OnInit, TemplateRef, ViewChild, ChangeDetectorRef } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { Select, Store } from '@ngxs/store';
@ -252,8 +252,8 @@ export class TenantsComponent implements OnInit {
messageLocalizationParams: [name],
},
)
.subscribe((status: Toaster.Status) => {
if (status === Toaster.Status.confirm) {
.subscribe((status: Confirmation.Status) => {
if (status === Confirmation.Status.confirm) {
this.store.dispatch(new DeleteTenant(id)).subscribe(() => this.get());
}
});

12
npm/ng-packs/packages/tenant-management/tsconfig.lib.json
Unescape View File

@ -1,15 +1,12 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.prod.json",
"compilerOptions": {
"outDir": "../../out-tsc/lib",
"target": "es2015",
"declaration": true,
"inlineSources": true,
"types": [],
"lib": [
"dom",
"es2018"
],
"lib": ["dom", "es2018"],
"paths": {}
},
"angularCompilerOptions": {
@ -20,8 +17,5 @@
"strictInjectionParameters": true,
"enableResourceInlining": true
},
"exclude": [
"src/test.ts",
"**/*.spec.ts"
]
"exclude": ["src/test.ts", "**/*.spec.ts"]
}

2
npm/ng-packs/packages/tenant-management/tsconfig.spec.json
Unescape View File

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

2
npm/ng-packs/packages/theme-basic/tsconfig.lib.json
Unescape View File

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

2
npm/ng-packs/packages/theme-basic/tsconfig.spec.json
Unescape View File

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

6
npm/ng-packs/packages/theme-shared/src/lib/components/modal/modal.component.ts
Unescape View File

@ -14,7 +14,7 @@ import {
import { fromEvent, Subject } from 'rxjs';
import { debounceTime, filter, takeUntil } from 'rxjs/operators';
import { fadeAnimation } from '../../animations/modal.animations';
import { Toaster } from '../../models/toaster';
import { Confirmation } from '../../models/confirmation';
import { ConfirmationService } from '../../services/confirmation.service';
import { ButtonComponent } from '../button/button.component';
@ -133,9 +133,9 @@ export class ModalComponent implements OnDestroy {
'AbpAccount::AreYouSureYouWantToCancelEditingWarningMessage',
'AbpAccount::AreYouSure',
)
.subscribe((status: Toaster.Status) => {
.subscribe((status: Confirmation.Status) => {
this.isConfirmationOpen = false;
if (status === Toaster.Status.confirm) {
if (status === Confirmation.Status.confirm) {
this.visible = false;
}
});

4
npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts
Unescape View File

@ -17,7 +17,7 @@ import { Observable, Subject } from 'rxjs';
import snq from 'snq';
import { HttpErrorWrapperComponent } from '../components/http-error-wrapper/http-error-wrapper.component';
import { HttpErrorConfig, ErrorScreenErrorCodes } from '../models/common';
import { Toaster } from '../models/toaster';
import { Confirmation } from '../models/confirmation';
import { ConfirmationService } from '../services/confirmation.service';
export const DEFAULT_ERROR_MESSAGES = {
@ -185,7 +185,7 @@ export class ErrorHandler {
message?: Config.LocalizationParam,
title?: Config.LocalizationParam,
body?: any,
): Observable<Toaster.Status> {
): Observable<Confirmation.Status> {
if (body) {
if (body.details) {
message = body.details;

2
npm/ng-packs/packages/theme-shared/tsconfig.lib.json
Unescape View File

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

2
npm/ng-packs/packages/theme-shared/tsconfig.spec.json
Unescape View File

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

30
npm/ng-packs/tsconfig.json
Unescape View File

@ -13,7 +13,35 @@
"target": "es2015",
"typeRoots": ["node_modules/@types"],
"lib": ["es2018", "dom"],
"types": ["jest"]
"types": ["jest"],
"paths": {
"@abp/ng.core": ["packages/core/src/public-api.ts"],
"@abp/ng.core/*": ["packages/core/src/lib/*"],
"@abp/ng.theme.shared": ["packages/theme-shared/src/public-api.ts"],
"@abp/ng.theme.shared/*": ["packages/theme-shared/src/lib/*"],
"@abp/ng.theme.basic": ["packages/theme-basic/src/public-api.ts"],
"@abp/ng.theme.basic/*": ["packages/theme-basic/src/lib/*"],
"@abp/ng.account": ["packages/account/src/public-api.ts"],
"@abp/ng.account/*": ["packages/account/src/lib/*"],
"@abp/ng.account.config": ["packages/account-config/src/public-api.ts"],
"@abp/ng.account.config/*": ["packages/account-config/src/lib/*"],
"@abp/ng.identity": ["packages/identity/src/public-api.ts"],
"@abp/ng.identity/*": ["packages/identity/src/lib/*"],
"@abp/ng.identity.config": ["packages/identity-config/src/public-api.ts"],
"@abp/ng.identity.config/*": ["packages/identity-config/src/lib/*"],
"@abp/ng.tenant-management": ["packages/tenant-management/src/public-api.ts"],
"@abp/ng.tenant-management/*": ["packages/tenant-management/src/lib/*"],
"@abp/ng.tenant-management.config": ["packages/tenant-management-config/src/public-api.ts"],
"@abp/ng.tenant-management.config/*": ["packages/tenant-management-config/src/lib/*"],
"@abp/ng.setting-management": ["packages/setting-management/src/public-api.ts"],
"@abp/ng.setting-management/*": ["packages/setting-management/src/lib/*"],
"@abp/ng.setting-management.config": ["packages/setting-management-config/src/public-api.ts"],
"@abp/ng.setting-management.config/*": ["packages/setting-management-config/src/lib/*"],
"@abp/ng.permission-management": ["packages/permission-management/src/public-api.ts"],
"@abp/ng.permission-management/*": ["packages/permission-management/src/lib/*"],
"@abp/ng.feature-management": ["packages/feature-management/src/public-api.ts"],
"@abp/ng.feature-management/*": ["packages/feature-management/src/lib/*"]
}
},
"angularCompilerOptions": {
"fullTemplateTypeCheck": true,

22
npm/ng-packs/tsconfig.prod.json
Unescape View File

@ -0,0 +1,22 @@
{
"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"]
},
"angularCompilerOptions": {
"fullTemplateTypeCheck": true,
"strictInjectionParameters": true
}
}
Write Preview
Loading…
Cancel
Save