From 29128e12125d3d59073d0be825701d9822b59200 Mon Sep 17 00:00:00 2001 From: Pedro Rodrigues <4513618+pemsbr@users.noreply.github.com> Date: Tue, 22 Mar 2022 18:48:59 +0000 Subject: [PATCH 1/3] fix(core): check if `package.json` exists (#8707) --- .../workspace/src/utilities/buildable-libs-utils.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/workspace/src/utilities/buildable-libs-utils.ts b/packages/workspace/src/utilities/buildable-libs-utils.ts index 73e8af58d6d1a..2e22da1c06fea 100644 --- a/packages/workspace/src/utilities/buildable-libs-utils.ts +++ b/packages/workspace/src/utilities/buildable-libs-utils.ts @@ -1,5 +1,5 @@ import { dirname, join, relative, resolve } from 'path'; -import { directoryExists } from './fileutils'; +import { directoryExists, fileExists } from './fileutils'; import type { ProjectGraph, ProjectGraphProjectNode } from '@nrwl/devkit'; import { ProjectGraphExternalNode, @@ -50,12 +50,12 @@ export function calculateProjectDependencies( const depNode = projGraph.nodes[dep] || projGraph.externalNodes[dep]; if (depNode.type === 'lib') { if (isBuildable(targetName, depNode)) { - const libPackageJson = readJsonFile( - join(root, depNode.data.root, 'package.json') - ); + const libPackageJsonFile = join(depNode.data.root, 'package.json'); project = { - name: libPackageJson.name, // i.e. @workspace/mylib + name: fileExists(libPackageJsonFile) + ? readJsonFile(libPackageJsonFile).name // i.e. @workspace/mylib + : dep, outputs: getOutputsForTargetAndConfiguration( { overrides: {}, From b9d52d0d119018a0aecd0663c9d15e3b6662d181 Mon Sep 17 00:00:00 2001 From: Pedro Rodrigues <4513618+pemsbr@users.noreply.github.com> Date: Wed, 23 Mar 2022 20:26:50 +0000 Subject: [PATCH 2/3] fix(core): pass root --- packages/workspace/src/utilities/buildable-libs-utils.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/workspace/src/utilities/buildable-libs-utils.ts b/packages/workspace/src/utilities/buildable-libs-utils.ts index 2e22da1c06fea..306f04db27404 100644 --- a/packages/workspace/src/utilities/buildable-libs-utils.ts +++ b/packages/workspace/src/utilities/buildable-libs-utils.ts @@ -50,7 +50,11 @@ export function calculateProjectDependencies( const depNode = projGraph.nodes[dep] || projGraph.externalNodes[dep]; if (depNode.type === 'lib') { if (isBuildable(targetName, depNode)) { - const libPackageJsonFile = join(depNode.data.root, 'package.json'); + const libPackageJsonFile = join( + root, + depNode.data.root, + 'package.json' + ); project = { name: fileExists(libPackageJsonFile) From 9e9aaed53a77f9002aa024ef34eda69e54ea31ab Mon Sep 17 00:00:00 2001 From: Pedro Rodrigues <4513618+pemsbr@users.noreply.github.com> Date: Wed, 23 Mar 2022 20:29:56 +0000 Subject: [PATCH 3/3] cleanup(core): naming --- packages/workspace/src/utilities/buildable-libs-utils.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/workspace/src/utilities/buildable-libs-utils.ts b/packages/workspace/src/utilities/buildable-libs-utils.ts index 306f04db27404..2cd6d3a844eb8 100644 --- a/packages/workspace/src/utilities/buildable-libs-utils.ts +++ b/packages/workspace/src/utilities/buildable-libs-utils.ts @@ -50,15 +50,15 @@ export function calculateProjectDependencies( const depNode = projGraph.nodes[dep] || projGraph.externalNodes[dep]; if (depNode.type === 'lib') { if (isBuildable(targetName, depNode)) { - const libPackageJsonFile = join( + const libPackageJsonPath = join( root, depNode.data.root, 'package.json' ); project = { - name: fileExists(libPackageJsonFile) - ? readJsonFile(libPackageJsonFile).name // i.e. @workspace/mylib + name: fileExists(libPackageJsonPath) + ? readJsonFile(libPackageJsonPath).name // i.e. @workspace/mylib : dep, outputs: getOutputsForTargetAndConfiguration( {