diff --git a/src/cli/file-info.js b/src/cli/file-info.js index 1b21bdfbc..95b387c4c 100644 --- a/src/cli/file-info.js +++ b/src/cli/file-info.js @@ -16,7 +16,7 @@ async function logFileInfoOrDie(context) { const fileInfo = await getFileInfo(path.resolve(file), { ignorePath, withNodeModules, - plugins: plugins.length > 0 ? plugins : undefined, + plugins, resolveConfig: config !== false, }); diff --git a/src/common/get-file-info.js b/src/common/get-file-info.js index 6a967db6f..92ae4f9e8 100644 --- a/src/common/get-file-info.js +++ b/src/common/get-file-info.js @@ -1,5 +1,5 @@ import { resolveConfig } from "../config/resolve-config.js"; -import { loadBuiltinPlugins, loadPlugins } from "../main/plugins/index.js"; +import { loadPlugins } from "../main/plugins/index.js"; import { isIgnored } from "../utils/ignore.js"; import inferParser from "../utils/infer-parser.js"; @@ -54,10 +54,10 @@ async function getParser(file, options) { return config.parser; } - let plugins = options.plugins ?? config?.plugins ?? []; - plugins = ( - await Promise.all([loadBuiltinPlugins(), loadPlugins(plugins)]) - ).flat(); + const plugins = [ + ...options.plugins, + ...(await loadPlugins(config?.plugins ?? [])), + ]; return inferParser({ plugins }, { physicalFile: file }); } diff --git a/src/index.js b/src/index.js index 8a8a7050b..31c67a0da 100644 --- a/src/index.js +++ b/src/index.js @@ -11,6 +11,7 @@ import { closestMatch as closetLevenshteinMatch } 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"; import { mockable } from "./common/mockable.js"; import { clearCache as clearConfigCache, @@ -90,6 +91,8 @@ const inferParser = withPlugins((file, options) => inferParserWithoutPlugins(options, { physicalFile: file }), ); +const getFileInfo = withPlugins(getFileInfoWithoutPlugins); + // Internal shared with cli const sharedWithCli = { errors, @@ -132,11 +135,11 @@ export { clearCache as clearConfigCache, format, formatWithCursor, + getFileInfo, getSupportInfo, resolveConfig, resolveConfigFile, }; -export { default as getFileInfo } from "./common/get-file-info.js"; export * as doc from "./document/public.js"; export { default as version } from "./main/version.evaluate.js"; export * as util from "./utils/public.js";