fix(core): add outputs to nx.json for nx init in monorepo (#22061)

nrwl · Mar 5, 2024 · 22de9b5 · 22de9b5
1 parent 587fe6a
commit 22de9b5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 30 deletions.
diff --git a/packages/nx/src/command-line/init/implementation/add-nx-to-nest.ts b/packages/nx/src/command-line/init/implementation/add-nx-to-nest.ts
@@ -113,20 +113,15 @@ export async function addNxToNest(options: Options, packageJson: PackageJson) {
     repoRoot,
     [],
     [...cacheableOperations, ...nestCacheableScripts],
-    {}
+    scriptOutputs
   );
 
   const pmc = getPackageManagerCommand();
 
   updateGitIgnore(repoRoot);
   addDepsToPackageJson(repoRoot);
   addNestPluginToPackageJson(repoRoot);
-  markRootPackageJsonAsNxProject(
-    repoRoot,
-    cacheableOperations,
-    scriptOutputs,
-    pmc
-  );
+  markRootPackageJsonAsNxProject(repoRoot, cacheableOperations, pmc);
 
   createProjectJson(repoRoot, packageJson, nestCLIConfiguration);
   removeFile(repoRoot, 'nest-cli.json');

diff --git a/packages/nx/src/command-line/init/implementation/add-nx-to-npm-repo.ts b/packages/nx/src/command-line/init/implementation/add-nx-to-npm-repo.ts
@@ -72,18 +72,13 @@ export async function addNxToNpmRepo(options: Options) {
         : false);
   }
 
-  createNxJsonFile(repoRoot, [], cacheableOperations, {});
+  createNxJsonFile(repoRoot, [], cacheableOperations, scriptOutputs);
 
   const pmc = getPackageManagerCommand();
 
   updateGitIgnore(repoRoot);
   addDepsToPackageJson(repoRoot);
-  markRootPackageJsonAsNxProject(
-    repoRoot,
-    cacheableOperations,
-    scriptOutputs,
-    pmc
-  );
+  markRootPackageJsonAsNxProject(repoRoot, cacheableOperations, pmc);
 
   output.log({ title: '📦 Installing dependencies' });
 

diff --git a/packages/nx/src/command-line/init/implementation/utils.ts b/packages/nx/src/command-line/init/implementation/utils.ts
@@ -39,14 +39,14 @@ export function createNxJsonFile(
       nxJson.targetDefaults[scriptName] ??= {};
       nxJson.targetDefaults[scriptName] = { dependsOn: [`^${scriptName}`] };
     }
-    for (const [scriptName, output] of Object.entries(scriptOutputs)) {
-      if (!output) {
-        // eslint-disable-next-line no-continue
-        continue;
-      }
-      nxJson.targetDefaults[scriptName] ??= {};
-      nxJson.targetDefaults[scriptName].outputs = [`{projectRoot}/${output}`];
+  }
+  for (const [scriptName, output] of Object.entries(scriptOutputs)) {
+    if (!output) {
+      // eslint-disable-next-line no-continue
+      continue;
     }
+    nxJson.targetDefaults[scriptName] ??= {};
+    nxJson.targetDefaults[scriptName].outputs = [`{projectRoot}/${output}`];
   }
 
   for (const target of cacheableOperations) {
@@ -171,20 +171,12 @@ export function addVsCodeRecommendedExtensions(
 export function markRootPackageJsonAsNxProject(
   repoRoot: string,
   cacheableScripts: string[],
-  scriptOutputs: { [script: string]: string },
   pmc: PackageManagerCommands
 ) {
   const json = readJsonFile<PackageJson>(
     joinPathFragments(repoRoot, `package.json`)
   );
-  json.nx = { targets: {} };
-  for (let script of Object.keys(scriptOutputs)) {
-    if (scriptOutputs[script]) {
-      json.nx.targets[script] = {
-        outputs: [`{projectRoot}/${scriptOutputs[script]}`],
-      };
-    }
-  }
+  json.nx = {};
   for (let script of cacheableScripts) {
     const scriptDefinition = json.scripts[script];
     if (!scriptDefinition) {