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

fix(core): override root config target dependencies instead of merge (#5424)

Browse Source
This commit is contained in:
Jason Jean 2021-04-21 18:29:44 -04:00 committed by GitHub
parent 05f2f94543
commit 8f7d959364
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/workspace/src/tasks-runner/utils.ts
View File

@ -81,17 +81,11 @@ export function getDependencyConfigs(
defaultDependencyConfigs: Record<string, TargetDependencyConfig[]>, defaultDependencyConfigs: Record<string, TargetDependencyConfig[]>,
projectGraph: ProjectGraph projectGraph: ProjectGraph
): TargetDependencyConfig[] | undefined { ): TargetDependencyConfig[] | undefined {
const dependencyConfigs = new Set<TargetDependencyConfig>( // DependencyConfigs configured in workspace.json override configurations at the root.
defaultDependencyConfigs[target] ?? [] const dependencyConfigs =
); projectGraph.nodes[project].data?.targets[target]?.dependsOn ??
const projectDependencyConfigs = defaultDependencyConfigs[target] ??
projectGraph.nodes[project].data?.targets[target]?.dependsOn; [];
if (projectDependencyConfigs) {
for (const dependencyConfig of projectDependencyConfigs) {
dependencyConfigs.add(dependencyConfig);
}
}
for (const dependencyConfig of dependencyConfigs) { for (const dependencyConfig of dependencyConfigs) {
if ( if (
@ -107,7 +101,7 @@ export function getDependencyConfigs(
process.exit(1); process.exit(1);
} }
} }
return Array.from(dependencyConfigs); return dependencyConfigs;
} }
export function getOutputs(p: Record<string, ProjectGraphNode>, task: Task) { export function getOutputs(p: Record<string, ProjectGraphNode>, task: Task) {