From c7a6b4ba6cd791528bf674ad93dd5d0ce511ed5b Mon Sep 17 00:00:00 2001 From: Craigory Coppola Date: Tue, 16 May 2023 10:56:19 -0400 Subject: [PATCH] fix(core): nx init should setup default base correctly (#17050) --- .../command-line/init/implementation/utils.ts | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/nx/src/command-line/init/implementation/utils.ts b/packages/nx/src/command-line/init/implementation/utils.ts index 985f97af12..c73be6205f 100644 --- a/packages/nx/src/command-line/init/implementation/utils.ts +++ b/packages/nx/src/command-line/init/implementation/utils.ts @@ -52,17 +52,17 @@ export function createNxJsonFile( // eslint-disable-next-line no-empty } catch {} - nxJson.tasksRunnerOptions ||= {}; - nxJson.tasksRunnerOptions.default ||= {}; - nxJson.tasksRunnerOptions.default.runner ||= 'nx/tasks-runners/default'; - nxJson.tasksRunnerOptions.default.options ||= {}; + nxJson.tasksRunnerOptions ??= {}; + nxJson.tasksRunnerOptions.default ??= {}; + nxJson.tasksRunnerOptions.default.runner ??= 'nx/tasks-runners/default'; + nxJson.tasksRunnerOptions.default.options ??= {}; nxJson.tasksRunnerOptions.default.options.cacheableOperations = cacheableOperations; if (targetDefaults.length > 0) { - nxJson.targetDefaults ||= {}; + nxJson.targetDefaults ??= {}; for (const scriptName of targetDefaults) { - nxJson.targetDefaults[scriptName] ||= {}; + nxJson.targetDefaults[scriptName] ??= {}; nxJson.targetDefaults[scriptName] = { dependsOn: [`^${scriptName}`] }; } for (const [scriptName, output] of Object.entries(scriptOutputs)) { @@ -70,11 +70,12 @@ export function createNxJsonFile( // eslint-disable-next-line no-continue continue; } - nxJson.targetDefaults[scriptName] ||= {}; + nxJson.targetDefaults[scriptName] ??= {}; nxJson.targetDefaults[scriptName].outputs = [`{projectRoot}/${output}`]; } } - nxJson.defaultBase = deduceDefaultBase(); + nxJson.affected ??= {}; + nxJson.affected.defaultBase ??= deduceDefaultBase(); writeJsonFile(nxJsonPath, nxJson); }