cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[Bug Fix] option manager: val = val.buildPreset should be before the check if the preset supports options

Browse Source
This commit is contained in:
Christophe Hurpeau
2016-08-05 12:06:07 +02:00
committed by GitHub
parent 3b5a94ed0f
commit 425d460ebf
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/babel-core/src/transformation/file/options/option-manager.js
View File

@@ -268,16 +268,15 @@ export default class OptionManager {
val = require(presetLoc);
}
if (typeof val !== "function" && options !== undefined) {
throw new Error(`Options ${JSON.stringify(options)} passed to ` +
(presetLoc || "a preset") + " which does not accept options.");
}
// For compatibility with babel-core < 6.13.x, allow presets to export an object with a
// a 'buildPreset' function that will return the preset itself, while still exporting a
// simple object (rather than a function), for supporting old Babel versions.
if (typeof val === "object" && val.buildPreset) val = val.buildPreset;
if (typeof val !== "function" && options !== undefined) {
throw new Error(`Options ${JSON.stringify(options)} passed to ` +
(presetLoc || "a preset") + " which does not accept options.");
}
if (typeof val === "function") val = val(context, options);
if (typeof val !== "object") {