miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

fix(core): issue with formatting in migrations

Browse Source
This commit is contained in:
Victor Savkin 2020-12-17 10:11:50 -05:00
parent 5990d9d5aa
commit c09bbe9a0e
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/tao/src/commands/ngcli-adapter.ts
View File

@ -373,10 +373,11 @@ export class NxScopedHostForMigrations extends NxScopedHost {
isFile(path: Path): Observable<boolean> { isFile(path: Path): Observable<boolean> {
return this.hasWorkspaceJson().pipe( return this.hasWorkspaceJson().pipe(
concatMap((hasWorkspace) => { concatMap((hasWorkspace) => {
if (this.isWorkspaceConfig(path)) { if (
return hasWorkspace hasWorkspace &&
? super.isFile('/workspace.json' as any) (path == '/angular.json' || path == 'angular.json')
: super.isFile('/angular.json' as any); ) {
return super.isFile('/workspace.json' as any);
} else { } else {
return super.isFile(path); return super.isFile(path);
} }
@ -387,10 +388,11 @@ export class NxScopedHostForMigrations extends NxScopedHost {
exists(path: Path): Observable<boolean> { exists(path: Path): Observable<boolean> {
return this.hasWorkspaceJson().pipe( return this.hasWorkspaceJson().pipe(
concatMap((hasWorkspace) => { concatMap((hasWorkspace) => {
if (this.isWorkspaceConfig(path)) { if (
return hasWorkspace hasWorkspace &&
? super.exists('/workspace.json' as any) (path == '/angular.json' || path == 'angular.json')
: super.exists('/angular.json' as any); ) {
return super.exists('/workspace.json' as any);
} else { } else {
return super.exists(path); return super.exists(path);
} }