From cb8357c520dc45d02b553b8bb7e8bf941149f3ea Mon Sep 17 00:00:00 2001 From: Arman Ozak Date: Tue, 3 Nov 2020 19:10:40 +0300 Subject: [PATCH 1/3] build: add @ngneat/inspector to devDependencies --- npm/ng-packs/package.json | 1 + npm/ng-packs/yarn.lock | 129 ++++++++++++++++++++++---------------- 2 files changed, 75 insertions(+), 55 deletions(-) diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 9ce382c01f..33abdb7d94 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -54,6 +54,7 @@ "@angular/router": "~10.1.2", "@fortawesome/fontawesome-free": "^5.14.0", "@ng-bootstrap/ng-bootstrap": "^7.0.0", + "@ngneat/inspector": "^1.0.0", "@ngneat/spectator": "^5.13.0", "@ngx-validate/core": "^0.0.12", "@ngxs/devtools-plugin": "^3.7.0", diff --git a/npm/ng-packs/yarn.lock b/npm/ng-packs/yarn.lock index c23b6f2c88..cf075a5875 100644 --- a/npm/ng-packs/yarn.lock +++ b/npm/ng-packs/yarn.lock @@ -2,20 +2,20 @@ # yarn lockfile v1 -"@abp/ng.account@~3.3.0": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@abp/ng.account/-/ng.account-3.3.0.tgz#db36a62b9b3106096a95844c5f8c8df664dc68f0" - integrity sha512-jJuGUIsQL4rBgpr8TqnEKp9PKtrl4KooeizeQIQWrm4JwC0ZQRyo1PB+D3mDI6sPXQo4Uc2YA14nRSGJ9OSdXA== +"@abp/ng.account@~3.3.1": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@abp/ng.account/-/ng.account-3.3.1.tgz#e660ede11f2e73b62f9a58ada24afe38836056b3" + integrity sha512-IJeCB+Y8IeZIF54f406OYw/Bsg0hGSLbYC9X0up/o0Lwm16+UTCZOXVBQ4OifIf8mmWLDlX81zO2KX68fEm97g== dependencies: - "@abp/ng.theme.shared" "~3.3.0" + "@abp/ng.theme.shared" "~3.3.1" tslib "^2.0.0" -"@abp/ng.core@~3.3.0": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@abp/ng.core/-/ng.core-3.3.0.tgz#dd013e171c18a66eede4b8404211d69f09a60533" - integrity sha512-ERH1XyAY1tviWctyYKL8w/9stGogcN5g2ty/6OdZf3dUPcN2MrjXt8o8nRdvA7yUfP4VFKH8xl7qAnSMO+5iCQ== +"@abp/ng.core@~3.3.1": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@abp/ng.core/-/ng.core-3.3.1.tgz#230518da3cd1a8b4efef85df9d4d07e5c66b2549" + integrity sha512-x2zD3zhK5YD9EaV1p8AEboj9yoqzYCvyOkb7YDDBNR1VP2v+m7T8NRASBHkVrGZLwLkyd/qwOBUjEitz8XAbUA== dependencies: - "@abp/utils" "^3.3.0-rc.2" + "@abp/utils" "^3.3.0" "@angular/localize" "~10.0.10" "@ngxs/router-plugin" "^3.7.0" "@ngxs/storage-plugin" "^3.7.0" @@ -27,35 +27,35 @@ ts-toolbelt "6.15.4" tslib "^2.0.0" -"@abp/ng.feature-management@~3.3.0": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@abp/ng.feature-management/-/ng.feature-management-3.3.0.tgz#6f83895acd8cf2bb163cc5260404eab86d6d7a4d" - integrity sha512-XjCEDw1aiQ9zt8McEazqx+lgbtMicQn2KAq/Z45G3Pp138twvT7nDYKwEy3Zo/kzeaQcZYya9/xNP6r7aSnI4A== +"@abp/ng.feature-management@~3.3.1": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@abp/ng.feature-management/-/ng.feature-management-3.3.1.tgz#b4497d999e87049b266473daf8d274d5fb26b248" + integrity sha512-SdUrZ67bGJQZ0RchS7bcA5wSF6PiD3hcJwsReWzw49nM2Qr8vbHlsstXww6slvq8nT5gwC6O0OA71zsHarpHfg== dependencies: - "@abp/ng.theme.shared" "~3.3.0" + "@abp/ng.theme.shared" "~3.3.1" tslib "^2.0.0" -"@abp/ng.identity@~3.3.0": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@abp/ng.identity/-/ng.identity-3.3.0.tgz#587b81e806d35185bee0a72cc400969c0992a8bc" - integrity sha512-AzIMkWpiHSVdq4E8n6LNl/QXZHn0KNB3Ok6cfOVIPWWUl1NuTmdG3UdGOZAXGOm9bQmflbTKbBZcdhLOzHlLGw== +"@abp/ng.identity@~3.3.1": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@abp/ng.identity/-/ng.identity-3.3.1.tgz#e357e8bb1281e4fcbdeb20ef9d288eee6b274d3c" + integrity sha512-NjCmLdHUQtyGWPqIBo0OVSxUeQ4laQ501xPsJYZG7WOWmMJGTkBQKIFkUAG8gLKv8EDTIzBuVs8V8scr+EUSiw== dependencies: - "@abp/ng.permission-management" "~3.3.0" - "@abp/ng.theme.shared" "~3.3.0" + "@abp/ng.permission-management" "~3.3.1" + "@abp/ng.theme.shared" "~3.3.1" tslib "^2.0.0" -"@abp/ng.permission-management@~3.3.0": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@abp/ng.permission-management/-/ng.permission-management-3.3.0.tgz#c686dca6d80fa5dafe9d940accf4b91853743ec1" - integrity sha512-jHVmgsZ06umNuMp9Uj1SWXm9dz7UNKMyDZjYrbWuG0S8ciwCCmykfOar0C+BK1kvycJXXJw2VKd0Kj36/57FxQ== +"@abp/ng.permission-management@~3.3.1": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@abp/ng.permission-management/-/ng.permission-management-3.3.1.tgz#2870a517b00b266c064df0914f0c4227c83677d7" + integrity sha512-69h0MLXOOQ9Iav4drwg1P6dcA+tl7+Vgt34IGJW1o0Aj0pYBlqBZQqq8IOW2g/xVLRE8qkfRnmoyAGBQfbJkTA== dependencies: - "@abp/ng.theme.shared" "~3.3.0" + "@abp/ng.theme.shared" "~3.3.1" tslib "^2.0.0" -"@abp/ng.schematics@~3.3.0": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@abp/ng.schematics/-/ng.schematics-3.3.0.tgz#b2e05826e19fa8096ca11f2117ff81061fbde24f" - integrity sha512-WSIDGoxX2HGtIpLY6uMpX0r/vOClilN478sHKdzX4OL3yXetdvrRp8evB87EOteP4r5DbRIjpWk3GEbknlyeEg== +"@abp/ng.schematics@~3.3.1": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@abp/ng.schematics/-/ng.schematics-3.3.1.tgz#ca5588574a6bbe10551d828ae0940b2004bdd3b2" + integrity sha512-1altHVHSWL0RLXKcsVltSqAUdiqxFItBYReR8YniJT7nQNOy+QeWiwX6H+Epv79K3m0Uf7G1d3fH1uCM6Qqq4A== dependencies: "@angular-devkit/core" "~10.0.3" "@angular-devkit/schematics" "~10.0.3" @@ -63,37 +63,37 @@ jsonc-parser "^2.3.0" typescript "~3.9.2" -"@abp/ng.setting-management@~3.3.0": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@abp/ng.setting-management/-/ng.setting-management-3.3.0.tgz#a53a370e201760570945e9130c7e85bdfcb48ac8" - integrity sha512-54EhudWaXrN0e7bFXNBVkK3bwEM6A/y8OF79Q9//YCD7eB56KvNdP4XXdSRKUfH7P9bvxJn/bmSAZcRQ1uk9Ww== +"@abp/ng.setting-management@~3.3.1": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@abp/ng.setting-management/-/ng.setting-management-3.3.1.tgz#f89ed79ab5b6348a5bd57a8699ee6298279e30ec" + integrity sha512-TGIeAUemaKEFcC/HG6d9JEYOG9EIYTry1goAKJReI0CShrykZUM5WPHe3wK0CQIqgI6MChVSYeq4yC+oyl8JnQ== dependencies: - "@abp/ng.theme.shared" "~3.3.0" + "@abp/ng.theme.shared" "~3.3.1" tslib "^2.0.0" -"@abp/ng.tenant-management@~3.3.0": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@abp/ng.tenant-management/-/ng.tenant-management-3.3.0.tgz#c5479c3d2b17a96308f8e2e87907dd405003fb5d" - integrity sha512-NPqTP2vU40IxZ0sQ8QNEgl5okptwf6J99Vkl1ELYwa8ztEnfBBo94gK/1q+I8CiQHp3fr//3ycrimPRszW/CCQ== +"@abp/ng.tenant-management@~3.3.1": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@abp/ng.tenant-management/-/ng.tenant-management-3.3.1.tgz#315fdc5980adddbc9d561fba15bed6c27d8203ec" + integrity sha512-dehegHTe459UCc+45G0yL/ptGBk4xDk+Nl5DIRKDyf0k7l5HZstS5UrWwOAY8JO2SECUB5RjX33yvqt2/nxt4Q== dependencies: - "@abp/ng.feature-management" "~3.3.0" - "@abp/ng.theme.shared" "~3.3.0" + "@abp/ng.feature-management" "~3.3.1" + "@abp/ng.theme.shared" "~3.3.1" tslib "^2.0.0" -"@abp/ng.theme.basic@~3.3.0": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@abp/ng.theme.basic/-/ng.theme.basic-3.3.0.tgz#c216c344273a2f816fa723ddcb3840e416dc5a5d" - integrity sha512-BiwpYd8C5ZL0ew8eVwtpC+nXoSNaP64tJkw1CJScvgJ0fPRiVPddFzgEd3PDFPjqeWtupN1Q8pyp5ng7vqOOpA== +"@abp/ng.theme.basic@~3.3.1": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@abp/ng.theme.basic/-/ng.theme.basic-3.3.1.tgz#e9d711c3d1895a481d15409f35e52608d71259fc" + integrity sha512-DcAdBQNdgpkEGhFHXClBJIfTOuG43AQkk6o4yzaglCkYKQDuJ4XRtbRdFQNb/we/OtdIFHQtxVLEeqrMTZYYcQ== dependencies: - "@abp/ng.theme.shared" "~3.3.0" + "@abp/ng.theme.shared" "~3.3.1" tslib "^2.0.0" -"@abp/ng.theme.shared@~3.3.0": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@abp/ng.theme.shared/-/ng.theme.shared-3.3.0.tgz#08c6af4ca5877d5cad0a49e002889938b7904c70" - integrity sha512-2X1O+JAUQWlFmuTWm/bHypHEVN084g6w4cVWUuum7+X2Fk01LVRjnJPwCEIRklS3teFoTX/IbKZXG24wVC6liA== +"@abp/ng.theme.shared@~3.3.1": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@abp/ng.theme.shared/-/ng.theme.shared-3.3.1.tgz#694453546b4e4147a9f89058570dbbef81ef1196" + integrity sha512-21wJPa/cNBU3OoLiact4w1sHnQpsm0R5JUD6pRCzp14EyPN3QgOY8JC+/YgGuasKY2xm5pvgbgIdTryy9j4IyQ== dependencies: - "@abp/ng.core" "~3.3.0" + "@abp/ng.core" "~3.3.1" "@fortawesome/fontawesome-free" "^5.14.0" "@ng-bootstrap/ng-bootstrap" "^7.0.0" "@ngx-validate/core" "^0.0.12" @@ -109,10 +109,10 @@ dependencies: just-compare "^1.3.0" -"@abp/utils@^3.3.0-rc.2": - version "3.3.0-rc.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.3.0-rc.2.tgz#f7b8ce37a88ee870212c39fb7bc1aa112ae41765" - integrity sha512-Q9ZB1Qiosz7WbeVS5fqUHdu6GvsnZyzOzJFNCD4rmN80hfDcEWgh5va9LZLO2EZiqZvHlDkOn9UlXzGU1ecbSA== +"@abp/utils@^3.3.1": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.3.1.tgz#f1759161ac8af10e57b50ac90538a24a51b64ebd" + integrity sha512-XEYJYp94zDdln48P7X51wa4v1yg3Q+p0o2DdZxQbZxXChRkCwVC/B0uyMGPs75wkft6xiz965Xr7vcNvMo0nOA== dependencies: just-compare "^1.3.0" @@ -2402,6 +2402,15 @@ dependencies: tslib "^2.0.0" +"@ngneat/inspector@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@ngneat/inspector/-/inspector-1.0.0.tgz#88e0f645f4292df8e050320e2855ce327c710b64" + integrity sha512-FO3iUcFdDEvc2IDgGfF490C3GI9O6dnPQZhBrwA3NNE7bMX0pvC/5fdSQh5wewVqu+1+1NpuT2+3aTjiam3FFQ== + dependencies: + ace-builds "^1.4.12" + tinykeys "^1.1.0" + tslib "^2.0.0" + "@ngneat/spectator@^5.13.0": version "5.13.3" resolved "https://registry.yarnpkg.com/@ngneat/spectator/-/spectator-5.13.3.tgz#e02104fcd6938c921d6a792601ec609e665eafda" @@ -3172,6 +3181,11 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: mime-types "~2.1.24" negotiator "0.6.2" +ace-builds@^1.4.12: + version "1.4.12" + resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.4.12.tgz#888efa386e36f4345f40b5233fcc4fe4c588fae7" + integrity sha512-G+chJctFPiiLGvs3+/Mly3apXTcfgE45dT5yp12BcWZ1kUs+gm0qd3/fv4gsz6fVag4mM0moHVpjHDIgph6Psg== + acorn-globals@^4.3.2: version "4.3.4" resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7" @@ -12922,6 +12936,11 @@ tinycolor2@^1.4.1: resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8" integrity sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g= +tinykeys@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/tinykeys/-/tinykeys-1.1.1.tgz#2535e8b24c8e2be447dd0ee1cff656ef435cd63d" + integrity sha512-YEA1TGMlkMabXI0NGddRFti+c1eMO2QP7wefwibSz0Pip8sA+d99yX5Pp7pK7wUeTKmrF4ys4XZVz44YydlTYg== + tmp@0.0.30: version "0.0.30" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.30.tgz#72419d4a8be7d6ce75148fd8b324e593a711c2ed" From 0b90e75f94101794753d190191982fc538a4136b Mon Sep 17 00:00:00 2001 From: Arman Ozak Date: Tue, 3 Nov 2020 19:11:21 +0300 Subject: [PATCH 2/3] feat: import InspectorModule when in dev mode --- npm/ng-packs/apps/dev-app/src/app/app.module.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/npm/ng-packs/apps/dev-app/src/app/app.module.ts b/npm/ng-packs/apps/dev-app/src/app/app.module.ts index 4ad16e13e8..461275f255 100644 --- a/npm/ng-packs/apps/dev-app/src/app/app.module.ts +++ b/npm/ng-packs/apps/dev-app/src/app/app.module.ts @@ -8,6 +8,7 @@ import { ThemeSharedModule } from '@abp/ng.theme.shared'; import { NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { InspectorModule } from '@ngneat/inspector'; import { NgxsLoggerPluginModule } from '@ngxs/logger-plugin'; import { NgxsModule } from '@ngxs/store'; import { environment } from '../environments/environment'; @@ -15,7 +16,10 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { APP_ROUTE_PROVIDER } from './route.provider'; -const LOGGERS = [NgxsLoggerPluginModule.forRoot({ disabled: true })]; +const INSPECTION_TOOLS = [ + NgxsLoggerPluginModule.forRoot({ disabled: true }), + InspectorModule.forRoot(), +]; @NgModule({ imports: [ @@ -34,7 +38,7 @@ const LOGGERS = [NgxsLoggerPluginModule.forRoot({ disabled: true })]; SettingManagementConfigModule.forRoot(), NgxsModule.forRoot(), ThemeBasicModule.forRoot(), - ...(environment.production ? [] : LOGGERS), + ...(environment.production ? [] : INSPECTION_TOOLS), ], providers: [APP_ROUTE_PROVIDER], declarations: [AppComponent], From 580d4a9c53f542f58c5db4902c0e61703619e785 Mon Sep 17 00:00:00 2001 From: Arman Ozak Date: Wed, 4 Nov 2020 11:53:26 +0300 Subject: [PATCH 3/3] Disable inspection tools while regression tests --- npm/ng-packs/angular.json | 12 ++++++ .../apps/dev-app/src/app/app.module.ts | 2 +- .../environments/environment.regression.ts | 43 +++++++++++++++++++ npm/ng-packs/package.json | 1 + .../packages/core/src/lib/models/config.ts | 1 + 5 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 npm/ng-packs/apps/dev-app/src/environments/environment.regression.ts diff --git a/npm/ng-packs/angular.json b/npm/ng-packs/angular.json index 0f1ca59f48..1f4aed25fa 100644 --- a/npm/ng-packs/angular.json +++ b/npm/ng-packs/angular.json @@ -496,6 +496,15 @@ "with": "apps/dev-app/src/environments/environment.internal.ts" } ] + }, + "regression": { + "tsConfig": "apps/dev-app/tsconfig.dev.json", + "fileReplacements": [ + { + "replace": "apps/dev-app/src/environments/environment.ts", + "with": "apps/dev-app/src/environments/environment.regression.ts" + } + ] } } }, @@ -510,6 +519,9 @@ }, "internal": { "browserTarget": "dev-app:build:internal" + }, + "regression": { + "browserTarget": "dev-app:build:regression" } } }, diff --git a/npm/ng-packs/apps/dev-app/src/app/app.module.ts b/npm/ng-packs/apps/dev-app/src/app/app.module.ts index 461275f255..11d1ab48b2 100644 --- a/npm/ng-packs/apps/dev-app/src/app/app.module.ts +++ b/npm/ng-packs/apps/dev-app/src/app/app.module.ts @@ -38,7 +38,7 @@ const INSPECTION_TOOLS = [ SettingManagementConfigModule.forRoot(), NgxsModule.forRoot(), ThemeBasicModule.forRoot(), - ...(environment.production ? [] : INSPECTION_TOOLS), + ...(environment.production || environment.test ? [] : INSPECTION_TOOLS), ], providers: [APP_ROUTE_PROVIDER], declarations: [AppComponent], diff --git a/npm/ng-packs/apps/dev-app/src/environments/environment.regression.ts b/npm/ng-packs/apps/dev-app/src/environments/environment.regression.ts new file mode 100644 index 0000000000..1ce44bfc74 --- /dev/null +++ b/npm/ng-packs/apps/dev-app/src/environments/environment.regression.ts @@ -0,0 +1,43 @@ +import { Config } from '@abp/ng.core'; + +const baseUrl = 'http://localhost:4200'; + +export const environment = { + test: true, + production: false, + hmr: false, + application: { + baseUrl, + name: 'MyProjectName', + logoUrl: '', + }, + oAuthConfig: { + issuer: 'https://localhost:44305', + redirectUri: baseUrl, + clientId: 'MyProjectName_App', + responseType: 'code', + scope: 'offline_access MyProjectName', + }, + apis: { + default: { + url: 'https://localhost:44305', + rootNamespace: 'MyCompanyName.MyProjectName', + }, + AbpFeatureManagement: { + url: 'https://localhost:44305', + rootNamespace: 'Volo.Abp', + }, + AbpPermissionManagement: { + url: 'https://localhost:44305', + rootNamespace: 'Volo.Abp.PermissionManagement', + }, + AbpTenantManagement: { + url: 'https://localhost:44305', + rootNamespace: 'Volo.Abp.TenantManagement', + }, + AbpIdentity: { + url: 'https://localhost:44305', + rootNamespace: 'Volo.Abp', + }, + }, +} as Config.Environment; diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 33abdb7d94..42284c0e07 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -9,6 +9,7 @@ "symlink": "symlink", "start": "ng serve dev-app", "start:internal": "ng serve dev-app --configuration=internal", + "start:regression": "ng serve dev-app --configuration=regression", "build": "ng build", "test": "ng test --watchAll --runInBand", "commit": "git-cz", diff --git a/npm/ng-packs/packages/core/src/lib/models/config.ts b/npm/ng-packs/packages/core/src/lib/models/config.ts index cf4eb007c9..be2c128d37 100644 --- a/npm/ng-packs/packages/core/src/lib/models/config.ts +++ b/npm/ng-packs/packages/core/src/lib/models/config.ts @@ -10,6 +10,7 @@ export namespace Config { apis: Apis; application: Application; hmr?: boolean; + test?: boolean; localization?: { defaultResourceName?: string }; oAuthConfig: AuthConfig; production: boolean;