cleanup(core): improve prettier bin path resolution (#18672)

nrwl · Aug 22, 2023 · 3f3f247 · 3f3f247 · vercel · Aug 22, 2023
1 parent 9123271
commit 3f3f247
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/packages/nx/src/command-line/format/format.ts b/packages/nx/src/command-line/format/format.ts
@@ -24,7 +24,6 @@ import { readNxJson } from '../../config/configuration';
 import { ProjectGraph } from '../../config/project-graph';
 import { chunkify } from '../../utils/chunkify';
 import { allFileData } from '../../utils/all-file-data';
-import { gte } from 'semver';
 
 const PRETTIER_PATH = getPrettierPath();
 
@@ -214,9 +213,6 @@ function sortTsConfig() {
 }
 
 function getPrettierPath() {
-  const prettierVersion = readModulePackageJson('prettier').packageJson.version;
-  if (gte(prettierVersion, '3.0.0')) {
-    return require.resolve('prettier/bin/prettier.cjs');
-  }
-  return require.resolve('prettier/bin-prettier');
+  const { bin } = readModulePackageJson('prettier').packageJson;
+  return require.resolve(path.join('prettier', bin as string));
 }
diff --git a/packages/nx/src/utils/package-json.ts b/packages/nx/src/utils/package-json.ts
@@ -57,7 +57,7 @@ export interface PackageJson {
   peerDependenciesMeta?: Record<string, { optional: boolean }>;
   resolutions?: Record<string, string>;
   overrides?: PackageOverride;
-  bin?: Record<string, string>;
+  bin?: Record<string, string> | string;
   workspaces?:
     | string[]
     | {