From dc51a90745db53fd7f279fc3ffbe5b3ff57f5128 Mon Sep 17 00:00:00 2001 From: Katerina Skroumpelou Date: Thu, 9 Nov 2023 11:49:20 +0200 Subject: [PATCH] fix(core): create nodes plugin fixes (#20134) --- .../src/utils/replace-project-configuration-with-plugin.ts | 2 +- .../create-nodes-plugin/__snapshots__/generator.spec.ts.snap | 2 +- .../create-nodes-plugin/files/src/plugins/plugin.ts.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/devkit/src/utils/replace-project-configuration-with-plugin.ts b/packages/devkit/src/utils/replace-project-configuration-with-plugin.ts index fc3aedcae3..42027b9282 100644 --- a/packages/devkit/src/utils/replace-project-configuration-with-plugin.ts +++ b/packages/devkit/src/utils/replace-project-configuration-with-plugin.ts @@ -54,7 +54,7 @@ export function replaceProjectConfigurationsWithPlugin( for (const [targetName, targetConfig] of Object.entries(node.targets)) { const targetFromProjectConfig = projectConfig.targets[targetName]; - if (targetFromProjectConfig.executor !== targetConfig.executor) { + if (targetFromProjectConfig?.executor !== targetConfig.executor) { continue; } diff --git a/tools/workspace-plugin/src/generators/create-nodes-plugin/__snapshots__/generator.spec.ts.snap b/tools/workspace-plugin/src/generators/create-nodes-plugin/__snapshots__/generator.spec.ts.snap index bf06487e4c..6e06280769 100644 --- a/tools/workspace-plugin/src/generators/create-nodes-plugin/__snapshots__/generator.spec.ts.snap +++ b/tools/workspace-plugin/src/generators/create-nodes-plugin/__snapshots__/generator.spec.ts.snap @@ -79,7 +79,7 @@ export const createNodes: CreateNodes = [ const projectRoot = dirname(configFilePath); // Do not create a project if package.json and project.json isn't there. - const siblingFiles = readdirSync(projectRoot); + const siblingFiles = readdirSync(join(context.workspaceRoot, projectRoot)); if ( !siblingFiles.includes('package.json') && !siblingFiles.includes('project.json') diff --git a/tools/workspace-plugin/src/generators/create-nodes-plugin/files/src/plugins/plugin.ts.template b/tools/workspace-plugin/src/generators/create-nodes-plugin/files/src/plugins/plugin.ts.template index 8dbcfa926f..3c39caa744 100644 --- a/tools/workspace-plugin/src/generators/create-nodes-plugin/files/src/plugins/plugin.ts.template +++ b/tools/workspace-plugin/src/generators/create-nodes-plugin/files/src/plugins/plugin.ts.template @@ -22,7 +22,7 @@ export const createNodes: CreateNodes<<%= className %>PluginOptions> = [ const projectRoot = dirname(configFilePath); // Do not create a project if package.json and project.json isn't there. - const siblingFiles = readdirSync(projectRoot); + const siblingFiles = readdirSync(join(context.workspaceRoot, projectRoot)); if ( !siblingFiles.includes('package.json') && !siblingFiles.includes('project.json')