fix(js): do not ensure prettier package presence when skipPackageJson…

… is true
nrwl · Sep 24, 2024 · 68fa008 · 68fa008
1 parent 2c86214
commit 68fa008
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/packages/js/src/generators/init/init.ts b/packages/js/src/generators/init/init.ts
@@ -121,8 +121,12 @@ export async function initGeneratorInternal(
     : () => {};
   tasks.push(installTask);
 
-  if (!schema.skipFormat && schema.setUpPrettier) {
-    ensurePackage('prettier', prettierVersion);
+  if (!schema.skipFormat) {
+    if (!schema.skipPackageJson) {
+      ensurePackage('prettier', prettierVersion);
+    }
+    // even if skipPackageJson === true, we can safely run formatFiles, prettier might
+    // have been installed earlier and if not, the formatFiles function still handles it
     await formatFiles(tree);
   }
 

diff --git a/packages/js/src/generators/setup-prettier/generator.ts b/packages/js/src/generators/setup-prettier/generator.ts
@@ -17,7 +17,11 @@ export async function setupPrettierGenerator(
   });
 
   if (!options.skipFormat) {
-    ensurePackage('prettier', prettierVersion);
+    if (!options.skipPackageJson) {
+      ensurePackage('prettier', prettierVersion);
+    }
+    // even if skipPackageJson === true, we can safely run formatFiles, prettier might
+    // have been installed earlier and if not, the formatFiles function still handles it
     await formatFiles(tree);
   }