From 209702f799933507ecda6b635dbcedf86fe82c98 Mon Sep 17 00:00:00 2001 From: Benny Megidish Date: Thu, 10 Mar 2022 19:24:19 +0200 Subject: [PATCH] feat: do not generate package json while serving --- packages/nx-electron/src/executors/execute/executor.ts | 7 +++---- packages/nx-electron/src/utils/generate-package-json.ts | 6 +----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/nx-electron/src/executors/execute/executor.ts b/packages/nx-electron/src/executors/execute/executor.ts index 323b5dc..4cff0c2 100644 --- a/packages/nx-electron/src/executors/execute/executor.ts +++ b/packages/nx-electron/src/executors/execute/executor.ts @@ -142,20 +142,19 @@ async function* startBuild(options: ElectronExecuteBuilderOptions, context: Exec buildTarget, { ...options.buildTargetOptions, + generatePackageJson: false, watch: options.watch, }, context ); } -function runWaitUntilTargets( - options: ElectronExecuteBuilderOptions, - context: ExecutorContext -): Promise<{ success: boolean }[]> { +function runWaitUntilTargets(options: ElectronExecuteBuilderOptions, context: ExecutorContext): Promise<{ success: boolean }[]> { return Promise.all( options.waitUntilTargets.map(async (waitUntilTarget) => { const target = parseTargetString(waitUntilTarget); const output = await runExecutor(target, {}, context); + return new Promise<{ success: boolean }>(async (resolve) => { let event = await output.next(); // Resolve after first event diff --git a/packages/nx-electron/src/utils/generate-package-json.ts b/packages/nx-electron/src/utils/generate-package-json.ts index 91ee9e8..f026a7e 100644 --- a/packages/nx-electron/src/utils/generate-package-json.ts +++ b/packages/nx-electron/src/utils/generate-package-json.ts @@ -13,11 +13,7 @@ import { INDEX_OUTPUT_FILENAME } from './config'; * @param options * @constructor */ -export function generatePackageJson( - projectName: string, - graph: ProjectGraph, - options: BuildElectronBuilderOptions -) { +export function generatePackageJson(projectName: string, graph: ProjectGraph, options: BuildElectronBuilderOptions) { // default package.json if one does not exist let packageJson = { name: projectName,