fix(core): fix formatFiles schematic to write changes to correct work…

…space config file (#7944)
nrwl · Dec 2, 2021 · f65d6fd · f65d6fd
1 parent d689416
commit f65d6fd
Showing 1 changed file with 11 additions and 14 deletions.
diff --git a/packages/workspace/src/utils/rules/format-files.ts b/packages/workspace/src/utils/rules/format-files.ts
@@ -10,7 +10,10 @@ import { from } from 'rxjs';
 import { filter, map, mergeMap } from 'rxjs/operators';
 import * as path from 'path';
 import { appRootPath } from '@nrwl/tao/src/utils/app-root';
-import { reformattedWorkspaceJsonOrNull } from '@nrwl/tao/src/shared/workspace';
+import {
+  reformattedWorkspaceJsonOrNull,
+  workspaceConfigName,
+} from '@nrwl/tao/src/shared/workspace';
 import { parseJson, serializeJson } from '@nrwl/devkit';
 
 export function formatFiles(
@@ -27,7 +30,7 @@ export function formatFiles(
   }
 
   return (host: Tree, context: SchematicContext) => {
-    updateWorkspaceJsonToMatchFormatVersion(host, directory);
+    updateWorkspaceJsonToMatchFormatVersion(host);
 
     if (!prettier) {
       return host;
@@ -76,21 +79,15 @@ export function formatFiles(
   };
 }
 
-function updateWorkspaceJsonToMatchFormatVersion(
-  host: Tree,
-  directory: string
-) {
-  const possibleFiles = [
-    `${directory}/workspace.json`,
-    `${directory}/angular.json`,
-  ];
-  const path = possibleFiles.filter((path) => host.exists(path))[0];
+function updateWorkspaceJsonToMatchFormatVersion(host: Tree) {
+  const workspaceConfig = workspaceConfigName(appRootPath);
+
   try {
-    if (path) {
-      const workspaceJson = parseJson(host.read(path).toString());
+    if (workspaceConfig) {
+      const workspaceJson = parseJson(host.read(workspaceConfig).toString());
       const reformatted = reformattedWorkspaceJsonOrNull(workspaceJson);
       if (reformatted) {
-        host.overwrite(path, serializeJson(reformatted));
+        host.overwrite(workspaceConfig, serializeJson(reformatted));
       }
     }
   } catch (e) {