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

fix(core): updateWorkspaceConfiguration does not respect extends

Browse Source
This commit is contained in:
Nrwl CI Machine 2021-08-23 09:56:18 -04:00 committed by Victor Savkin
parent e2637760ca
commit 8cc41de22a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/devkit/src/generators/project-configuration.ts
View File

@ -138,7 +138,7 @@ export function updateWorkspaceConfiguration(
workspaceConfig: WorkspaceConfiguration workspaceConfig: WorkspaceConfiguration
): void { ): void {
const { const {
// Angular Json Properties // Workspace Json Properties
version, version,
cli, cli,
defaultProject, defaultProject,
@ -179,12 +179,12 @@ export function updateWorkspaceConfiguration(
if (tree.exists('nx.json')) { if (tree.exists('nx.json')) {
updateJson<NxJsonConfiguration>(tree, 'nx.json', (json) => { updateJson<NxJsonConfiguration>(tree, 'nx.json', (json) => {
const nxJsonExtends = readNxJsonExtends(tree, nxJson as any); const nxJsonExtends = readNxJsonExtends(tree, json as any);
if (nxJsonExtends) { if (nxJsonExtends) {
const changedPropsOfNxJson = {}; const changedPropsOfNxJson = {};
Object.keys(nxJson).forEach((prop) => { Object.keys(nxJson).forEach((prop) => {
if ( if (
JSON.stringify([prop], null, 2) != JSON.stringify(nxJson[prop], null, 2) !=
JSON.stringify(nxJsonExtends[prop], null, 2) JSON.stringify(nxJsonExtends[prop], null, 2)
) { ) {
changedPropsOfNxJson[prop] = nxJson[prop]; changedPropsOfNxJson[prop] = nxJson[prop];