Avoid the onResolve callback.

This commit is contained in:
Logan Smyth
2017-04-05 15:24:34 -07:00
parent ac5c13c1c8
commit 1fecf286c6

View File

@@ -115,7 +115,6 @@ class OptionManager {
dirname,
}: MergeOptions) {
alias = alias || "foreign";
if (!rawOpts) return;
//
if (typeof rawOpts !== "object" || Array.isArray(rawOpts)) {
@@ -129,10 +128,6 @@ class OptionManager {
}
});
//
dirname = dirname || process.cwd();
loc = loc || alias;
if (type !== "arguments") {
if (opts.filename !== undefined) {
throw new Error(`${alias}.filename is only allowed as a root argument`);
@@ -192,7 +187,7 @@ class OptionManager {
if (opts.presets) {
if (!Array.isArray(rawOpts.presets)) throw new Error(`${alias}.presets should be an array`);
opts.presets = resolvePresets(opts.presets, dirname, (preset, presetLoc) => {
opts.presets = resolvePresets(opts.presets, dirname).map(([preset, presetLoc]) => {
this.mergeOptions({
type: "preset",
options: preset,
@@ -203,6 +198,8 @@ class OptionManager {
loc: presetLoc,
dirname: dirname,
});
return preset;
});
// If not passPerPreset, the plugins have all been merged into the parent config so the presets
@@ -275,7 +272,7 @@ class OptionManager {
* Resolves presets options which can be either direct object data,
* or a module name to require.
*/
function resolvePresets(presets: Array<string | Object>, dirname: string, onResolve?) {
function resolvePresets(presets: Array<string | Object>, dirname: string) {
return presets.map((preset) => {
let options;
if (Array.isArray(preset)) {
@@ -296,9 +293,7 @@ function resolvePresets(presets: Array<string | Object>, dirname: string, onReso
}
const resolvedPreset = loadPresetObject(preset, options, { dirname });
if (onResolve) onResolve(resolvedPreset, presetLoc);
return resolvedPreset;
return [ resolvedPreset, presetLoc ];
} catch (e) {
if (presetLoc) {
e.message += ` (While processing preset: ${JSON.stringify(presetLoc)})`;