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

fix(core): ngcli adapter should find changed matching files correctly (#7980)

Browse Source
This commit is contained in:
Craigory Coppola 2021-12-02 19:23:02 -06:00 committed by GitHub
parent 04d2884d12
commit 7dbb645b8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,15 +29,7 @@ import {
import { dirname, extname, resolve, join, basename } from 'path'; import { dirname, extname, resolve, join, basename } from 'path';
import { FileBuffer } from '@angular-devkit/core/src/virtual-fs/host/interface'; import { FileBuffer } from '@angular-devkit/core/src/virtual-fs/host/interface';
import type { Architect } from '@angular-devkit/architect'; import type { Architect } from '@angular-devkit/architect';
import { import { EMPTY, Observable, of, merge, forkJoin, NEVER } from 'rxjs';
EMPTY,
Observable,
of,
merge,
combineLatest,
forkJoin,
NEVER,
} from 'rxjs';
import { catchError, map, switchMap, tap, toArray } from 'rxjs/operators'; import { catchError, map, switchMap, tap, toArray } from 'rxjs/operators';
import { NX_ERROR, NX_PREFIX } from '../shared/logger'; import { NX_ERROR, NX_PREFIX } from '../shared/logger';
import { readJsonFile } from '../utils/fileutils'; import { readJsonFile } from '../utils/fileutils';
@ -600,10 +592,11 @@ export class NxScopeHostUsedForWrappedSchematics extends NxScopedHost {
const match = findWorkspaceConfigFileChange(this.host); const match = findWorkspaceConfigFileChange(this.host);
let workspaceJsonOverride: Observable<RawWorkspaceJsonConfiguration>; let workspaceJsonOverride: Observable<RawWorkspaceJsonConfiguration>;
if ( let actualConfigFileName: ConfigFilePath = [
this.host.exists('workspace.json') || '/workspace.json',
this.host.exists('angular.json') '/angular.json',
) { ].filter((f) => this.host.exists(f))[0] as ConfigFilePath;
if (actualConfigFileName) {
if (match) { if (match) {
workspaceJsonOverride = of(parseJson(match.content.toString())); workspaceJsonOverride = of(parseJson(match.content.toString()));
} }
@ -666,7 +659,7 @@ export class NxScopeHostUsedForWrappedSchematics extends NxScopedHost {
// we try to format it, if it changes, return it, otherwise return the original change // we try to format it, if it changes, return it, otherwise return the original change
try { try {
return this.__readWorkspaceConfiguration(match?.path, { return this.__readWorkspaceConfiguration(actualConfigFileName, {
// we are overriding workspaceJson + nxJson, // we are overriding workspaceJson + nxJson,
workspace: workspaceJsonOverride, workspace: workspaceJsonOverride,
nx: nxJsonChange nx: nxJsonChange
@ -764,10 +757,10 @@ function findDeletedProjects(host: Tree): FileChange[] {
} }
function findMatchingFileChange(host: Tree, path: Path) { function findMatchingFileChange(host: Tree, path: Path) {
const targetPath = path.startsWith('/') ? path.substring(1) : path.toString; const targetPath = path.startsWith('/') ? path.substring(1) : path.toString();
return host return host
.listChanges() .listChanges()
.find((f) => f.path == targetPath.toString() && f.type !== 'DELETE'); .find((f) => f.path === targetPath && f.type !== 'DELETE');
} }
function isWorkspaceConfigPath(p: Path | string) { function isWorkspaceConfigPath(p: Path | string) {