diff --git a/src/cli/format.js b/src/cli/format.js index c2ad3aadf..9385eeff8 100644 --- a/src/cli/format.js +++ b/src/cli/format.js @@ -1,6 +1,5 @@ import fs from "node:fs/promises"; import path from "node:path"; -import picocolors from "picocolors"; import * as prettier from "../index.js"; import { expandPatterns } from "./expand-patterns.js"; import findCacheFile from "./find-cache-file.js"; @@ -12,6 +11,7 @@ import { createTwoFilesPatch, errors, mockable, + picocolors, } from "./prettier-internal.js"; import { normalizeToPosix, statSafe } from "./utils.js"; diff --git a/src/cli/logger.js b/src/cli/logger.js index e957c13b8..1eab35dee 100644 --- a/src/cli/logger.js +++ b/src/cli/logger.js @@ -1,7 +1,7 @@ import readline from "node:readline"; -import picocolors from "picocolors"; import stripAnsi from "strip-ansi"; import wcwidth from "wcwidth.js"; +import { picocolors } from "./prettier-internal.js"; const countLines = (stream, text) => { const columns = stream.columns || 80; diff --git a/src/cli/options/normalize-cli-options.js b/src/cli/options/normalize-cli-options.js index 2d9c93226..cb1afa65a 100644 --- a/src/cli/options/normalize-cli-options.js +++ b/src/cli/options/normalize-cli-options.js @@ -1,6 +1,9 @@ -import leven from "leven"; -import picocolors from "picocolors"; -import { normalizeOptions, vnopts } from "../prettier-internal.js"; +import { + leven, + normalizeOptions, + picocolors, + vnopts, +} from "../prettier-internal.js"; const descriptor = { key: (key) => (key.length === 1 ? `-${key}` : `--${key}`), diff --git a/src/cli/prettier-internal.js b/src/cli/prettier-internal.js index 6f5abd314..ef7d83d61 100644 --- a/src/cli/prettier-internal.js +++ b/src/cli/prettier-internal.js @@ -13,4 +13,6 @@ export const { fastGlob, createTwoFilesPatch, mockable, + picocolors, + leven, } = sharedWithCli; diff --git a/src/index.js b/src/index.js index 4fc4f9130..e5c25d368 100644 --- a/src/index.js +++ b/src/index.js @@ -1,6 +1,14 @@ -// "fast-glob" and `createTwoFilesPatch` are bundled here since the API uses `micromatch` and `diff` too +/* +The following are bundled here since they are used in API too +- fast-glob +- createTwoFilesPatch +- leven +- picocolors +*/ import { createTwoFilesPatch } from "diff"; import fastGlob from "fast-glob"; +import leven from "leven"; +import picocolors from "picocolors"; import * as vnopts from "vnopts"; import * as errors from "./common/errors.js"; import getFileInfoWithoutPlugins from "./common/get-file-info.js"; @@ -95,6 +103,8 @@ const sharedWithCli = { }, fastGlob, createTwoFilesPatch, + picocolors, + leven, utils: { omit, },