Skip to content

Commit

Permalink
fix(core): updateWorkspaceConfiguration does not respect extends
Browse files Browse the repository at this point in the history
  • Loading branch information
Nrwl CI Machine authored and vsavkin committed Aug 23, 2021
1 parent e263776 commit 8cc41de
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions packages/devkit/src/generators/project-configuration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export function updateWorkspaceConfiguration(
workspaceConfig: WorkspaceConfiguration
): void {
const {
// Angular Json Properties
// Workspace Json Properties
version,
cli,
defaultProject,
Expand Down Expand Up @@ -179,12 +179,12 @@ export function updateWorkspaceConfiguration(

if (tree.exists('nx.json')) {
updateJson<NxJsonConfiguration>(tree, 'nx.json', (json) => {
const nxJsonExtends = readNxJsonExtends(tree, nxJson as any);
const nxJsonExtends = readNxJsonExtends(tree, json as any);
if (nxJsonExtends) {
const changedPropsOfNxJson = {};
Object.keys(nxJson).forEach((prop) => {
if (
JSON.stringify([prop], null, 2) !=
JSON.stringify(nxJson[prop], null, 2) !=
JSON.stringify(nxJsonExtends[prop], null, 2)
) {
changedPropsOfNxJson[prop] = nxJson[prop];
Expand Down

0 comments on commit 8cc41de

Please sign in to comment.