fix(angular): prevent nested calls to formatFiles in generators (#15946)

nrwl · Mar 29, 2023 · d20bf77 · d20bf77
1 parent 8fd5bcf
commit d20bf77
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 11 deletions.
diff --git a/packages/angular/src/generators/add-linting/add-linting.ts b/packages/angular/src/generators/add-linting/add-linting.ts
@@ -1,4 +1,5 @@
 import {
+  formatFiles,
   GeneratorCallback,
   joinPathFragments,
   runTasksInSerial,
@@ -41,10 +42,14 @@ export async function addLintingGenerator(
   );
 
   if (!options.skipPackageJson) {
-    const installTask = await addAngularEsLintDependencies(tree);
+    const installTask = addAngularEsLintDependencies(tree);
     tasks.push(installTask);
   }
 
+  if (!options.skipFormat) {
+    await formatFiles(tree);
+  }
+
   return runTasksInSerial(...tasks);
 }
 

diff --git a/packages/angular/src/generators/application/lib/add-e2e.ts b/packages/angular/src/generators/application/lib/add-e2e.ts
@@ -20,9 +20,9 @@ export async function addE2e(tree: Tree, options: NormalizedSchema) {
       directory: options.directory,
       project: options.name,
       linter: options.linter,
-      skipFormat: options.skipFormat,
       standaloneConfig: options.standaloneConfig,
       skipPackageJson: options.skipPackageJson,
+      skipFormat: true,
     });
   }
 }

diff --git a/packages/angular/src/generators/application/lib/add-linting.ts b/packages/angular/src/generators/application/lib/add-linting.ts
@@ -15,5 +15,6 @@ export async function addLinting(host: Tree, options: NormalizedSchema) {
     setParserOptionsProject: options.setParserOptionsProject,
     skipPackageJson: options.skipPackageJson,
     unitTestRunner: options.unitTestRunner,
+    skipFormat: true,
   });
 }
diff --git a/packages/angular/src/generators/application/lib/add-unit-test-runner.ts b/packages/angular/src/generators/application/lib/add-unit-test-runner.ts
@@ -13,6 +13,7 @@ export async function addUnitTestRunner(host: Tree, options: NormalizedSchema) {
       supportTsx: false,
       skipSerializers: false,
       skipPackageJson: options.skipPackageJson,
+      skipFormat: true,
     });
   }
 }
diff --git a/packages/angular/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.ts b/packages/angular/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.ts
@@ -40,7 +40,7 @@ export async function conversionGenerator(
          * does and remove the config again if it doesn't, so that it is most efficient.
          */
         setParserOptionsProject: true,
-        skipFormat: options.skipFormat,
+        skipFormat: true,
       });
     },
   });
@@ -105,7 +105,7 @@ export async function conversionGenerator(
          * step of this parent generator, if applicable
          */
         removeTSLintIfNoMoreTSLintTargets: false,
-        skipFormat: options.skipFormat,
+        skipFormat: true,
       });
     } catch {
       logger.warn(

diff --git a/packages/angular/src/generators/ng-add/utilities/workspace.ts b/packages/angular/src/generators/ng-add/utilities/workspace.ts
@@ -264,7 +264,7 @@ export function cleanupEsLintPackages(tree: Tree): void {
 export async function createWorkspaceFiles(tree: Tree): Promise<void> {
   updateVsCodeRecommendedExtensions(tree);
 
-  await jsInitGenerator(tree, {});
+  await jsInitGenerator(tree, { skipFormat: true });
 
   generateFiles(tree, joinPathFragments(__dirname, '../files/root'), '.', {
     tmpl: '',

diff --git a/packages/angular/src/generators/remote/remote.ts b/packages/angular/src/generators/remote/remote.ts
@@ -38,6 +38,7 @@ export async function remote(tree: Tree, options: Schema) {
     standalone: options.standalone ?? false,
     routing: true,
     port,
+    skipFormat: true,
   });
 
   const skipE2E =

diff --git a/packages/angular/src/generators/scam-directive/scam-directive.ts b/packages/angular/src/generators/scam-directive/scam-directive.ts
@@ -22,6 +22,7 @@ export async function scamDirectiveGenerator(tree: Tree, rawOptions: Schema) {
     skipImport: true,
     export: false,
     standalone: false,
+    skipFormat: true,
   });
 
   const pipeFileInfo = getDirectiveFileInfo(tree, options);

diff --git a/packages/angular/src/generators/scam-pipe/scam-pipe.ts b/packages/angular/src/generators/scam-pipe/scam-pipe.ts
@@ -22,6 +22,7 @@ export async function scamPipeGenerator(tree: Tree, rawOptions: Schema) {
     skipImport: true,
     export: false,
     standalone: false,
+    skipFormat: true,
   });
 
   const pipeFileInfo = getPipeFileInfo(tree, options);

diff --git a/packages/angular/src/generators/setup-mf/lib/update-host-app-routes.ts b/packages/angular/src/generators/setup-mf/lib/update-host-app-routes.ts
@@ -28,8 +28,7 @@ export function updateHostAppRoutes(tree: Tree, options: Schema) {
   tree.write(
     joinPathFragments(sourceRoot, 'app/app.component.html'),
     `<ul class="remote-menu">
-<li><a routerLink='/'>Home</a></li>
-${remoteRoutes}
+<li><a routerLink='/'>Home</a></li>${remoteRoutes}
 </ul>
 <router-outlet></router-outlet>
 `

diff --git a/packages/angular/src/generators/storybook-configuration/lib/generate-stories.ts b/packages/angular/src/generators/storybook-configuration/lib/generate-stories.ts
@@ -21,5 +21,6 @@ export async function generateStories(
       options.configureCypress && options.generateCypressSpecs,
     cypressProject: e2eProjectName,
     ignorePaths: options.ignorePaths,
+    skipFormat: true,
   });
 }
diff --git a/...es/angular/src/generators/storybook-configuration/lib/generate-storybook-configuration.ts b/...es/angular/src/generators/storybook-configuration/lib/generate-storybook-configuration.ts
@@ -20,5 +20,6 @@ export async function generateStorybookConfiguration(
     configureTestRunner: options.configureTestRunner,
     storybook7Configuration: options.storybook7Configuration,
     configureStaticServe: options.configureStaticServe,
+    skipFormat: true,
   });
 }
diff --git a/packages/angular/src/migrations/update-15-9-0/update-testing-tsconfig.spec.ts b/packages/angular/src/migrations/update-15-9-0/update-testing-tsconfig.spec.ts
@@ -6,8 +6,10 @@ import {
   updateJson,
 } from '@nrwl/devkit';
 import { createTreeWithEmptyWorkspace } from 'nx/src/devkit-testing-exports';
-import applicationGenerator from '../../generators/application/application';
-import libraryGenerator from '../../generators/library/library';
+import {
+  generateTestApplication,
+  generateTestLibrary,
+} from '../../generators/utils/testing';
 import { updateTestingTsconfigForJest } from './update-testing-tsconfig';
 
 let projectGraph: ProjectGraph;
@@ -68,7 +70,7 @@ describe('Jest+Ng - 15.9.0 - tsconfig updates', () => {
 });
 
 async function setup(tree: Tree, name: string) {
-  await applicationGenerator(tree, {
+  await generateTestApplication(tree, {
     name,
     skipPackageJson: true,
   });
@@ -79,7 +81,7 @@ async function setup(tree: Tree, name: string) {
     return json;
   });
 
-  await libraryGenerator(tree, {
+  await generateTestLibrary(tree, {
     name: `${name}-lib`,
   });