Skip to content

Commit 59e8aea

Browse files
Ensuring there is a single source of truth for supported prettier config file names
1 parent b737a86 commit 59e8aea

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/config_prettier.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,4 +149,4 @@ const getPrettierConfigResolved = async (filePath: string, filesNames: string[])
149149
return resolved;
150150
};
151151

152-
export { Loaders, getPrettierConfig, getPrettierConfigsMap, getPrettierConfigsUp, getPrettierConfigResolved };
152+
export { Loaders, File2Loader, Ext2Loader, getPrettierConfig, getPrettierConfigsMap, getPrettierConfigsUp, getPrettierConfigResolved };

src/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import process from "node:process";
66
import Cache from "./cache.js";
77
import { getEditorConfigsMap, getEditorConfigResolved, getEditorConfigFormatOptions } from "./config_editorconfig.js";
88
import { getIgnoresContentMap, getIgnoreBys, getIgnoreResolved } from "./config_ignore.js";
9-
import { Loaders, getPrettierConfigsMap, getPrettierConfigResolved } from "./config_prettier.js";
9+
import { Loaders, File2Loader, getPrettierConfigsMap, getPrettierConfigResolved } from "./config_prettier.js";
1010
import { PRETTIER_VERSION, CLI_VERSION } from "./constants.js";
1111
import Known from "./known.js";
1212
import Logger from "./logger.js";
1313
import { makePrettier } from "./prettier.js";
1414
import { castArray, getExpandedFoldersPaths, getFoldersChildrenPaths, getPluginsVersions, getProjectPath, getStdin, getTargetsPaths } from "./utils.js";
15-
import { fastRelativePath, isNull, isString, isUndefined, negate, pluralize, trimFinalNewline, uniq } from "./utils.js";
15+
import { fastRelativePath, isNull, isString, isUndefined, negate, pluralize, trimFinalNewline, uniq, without } from "./utils.js";
1616
import type { FormatOptions, Options, PluginsOptions } from "./types.js";
1717

1818
async function run(options: Options, pluginsDefaultOptions: PluginsOptions, pluginsCustomOptions: PluginsOptions): Promise<void> {
@@ -76,7 +76,7 @@ async function runGlobs(options: Options, pluginsDefaultOptions: PluginsOptions,
7676

7777
const editorConfigNames = options.editorConfig ? [".editorconfig"].filter(Known.hasFileName) : [];
7878
const ignoreNames = options.ignore ? [".gitignore", ".prettierignore"].filter(Known.hasFileName) : [];
79-
const prettierConfigNames = options.config ? ["package.json", ".prettierrc", ".prettierrc.yml", ".prettierrc.yaml", ".prettierrc.json", ".prettierrc.jsonc", ".prettierrc.json5", ".prettierrc.js", "prettier.config.js", ".prettierrc.cjs", "prettier.config.cjs", ".prettierrc.mjs", "prettier.config.mjs"].filter(Known.hasFileName) : []; // prettier-ignore
79+
const prettierConfigNames = options.config ? without(Object.keys(File2Loader), ["default"]).filter(Known.hasFileName) : [];
8080

8181
const fileNames2parentPaths = (names: string[]) => names.flatMap((name) => filesNamesToPaths[name]?.map(path.dirname) || []);
8282
const editorConfigPaths = uniq([...fileNames2parentPaths(editorConfigNames), rootPath, ...foldersExtraPaths]);

0 commit comments

Comments
 (0)