fixup! feat(@angular/cli): automatic formatting files modified by schematics

Author: alan-agius4

packages/angular/cli/src/command-builder/schematics-command-module.ts

@@ -368,7 +368,15 @@ export abstract class SchematicsCommandModule
 
       if (files.size) {
         // Note: we could use a task executor to format the files but this is simpler.
-        await formatFiles(this.context.root, files);
+        try {
+          await formatFiles(this.context.root, files);
+        } catch (error) {
+          assertIsError(error);
+
+          logger.warn(
+            `WARNING: Formatting of files failed with the following error: ${error.message}`,
+          );
+        }
       }
 
       return 0;

packages/angular/cli/src/command-builder/utilities/prettier.ts

@@ -7,6 +7,7 @@
  */
 
 import { execFile } from 'node:child_process';
+import { readFile } from 'node:fs/promises';
 import { createRequire } from 'node:module';
 import { dirname, extname, join, relative } from 'node:path';
 import { promisify } from 'node:util';
@@ -43,7 +44,10 @@ export async function formatFiles(cwd: string, files: Set<string>): Promise<void
   if (prettierCliPath === undefined) {
     try {
       const prettierPath = createRequire(cwd + '/').resolve('prettier/package.json');
-      prettierCliPath = join(dirname(prettierPath), 'bin/prettier.cjs');
+      const prettierPackageJson = JSON.parse(await readFile(prettierPath, 'utf-8')) as {
+        bin: { prettier: string };
+      };
+      prettierCliPath = join(dirname(prettierPath), prettierPackageJson.bin.prettier);
     } catch {
       // Prettier is not installed.
       prettierCliPath = null;