Resolve .browserslistrc as a project-wide file (#13028)
This commit is contained in:
@@ -126,7 +126,7 @@ export default function* loadPrivatePartialConfig(
|
||||
|
||||
const options: NormalizedOptions = {
|
||||
...merged,
|
||||
targets: resolveTargets(merged, absoluteRootDir, filename),
|
||||
targets: resolveTargets(merged, absoluteRootDir, absoluteRootDir),
|
||||
|
||||
// Tack the passes onto the object itself so that, if this object is
|
||||
// passed back to Babel a second time, it will be in the right structure
|
||||
|
||||
@@ -8,7 +8,7 @@ export function resolveTargets(
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
root: string,
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
filename: string | void,
|
||||
configFilePath: string | void,
|
||||
): Targets {
|
||||
let { targets } = options;
|
||||
if (typeof targets === "string" || Array.isArray(targets)) {
|
||||
|
||||
@@ -14,7 +14,7 @@ import getTargets, { type Targets } from "@babel/helper-compilation-targets";
|
||||
export function resolveTargets(
|
||||
options: ValidatedOptions,
|
||||
root: string,
|
||||
filename: string | void,
|
||||
configFilePath: string = root,
|
||||
): Targets {
|
||||
let { targets } = options;
|
||||
if (typeof targets === "string" || Array.isArray(targets)) {
|
||||
@@ -27,13 +27,13 @@ export function resolveTargets(
|
||||
|
||||
let configFile;
|
||||
if (typeof options.browserslistConfigFile === "string") {
|
||||
configFile = path.resolve(root, options.browserslistConfigFile);
|
||||
configFile = path.resolve(configFilePath, options.browserslistConfigFile);
|
||||
}
|
||||
|
||||
return getTargets((targets: any), {
|
||||
ignoreBrowserslistConfig: options.browserslistConfigFile === false,
|
||||
configFile,
|
||||
configPath: filename ?? root,
|
||||
configPath: root,
|
||||
browserslistEnv: options.browserslistEnv,
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user