Skip to content

Commit

Permalink
fix(core): overrideTargets inherit the named maker config in the Forg…
Browse files Browse the repository at this point in the history
…e config
  • Loading branch information
malept committed Mar 4, 2020
1 parent 8874746 commit c0e2939
Showing 1 changed file with 20 additions and 7 deletions.
27 changes: 20 additions & 7 deletions packages/api/core/src/api/make.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,23 @@ class MakerImpl extends MakerBase<any> {
defaultPlatforms = [];
}

type MakeTarget = IForgeResolvableMaker | MakerBase<any>;

function generateTargets(forgeConfig: ForgeConfig, overrideTargets?: MakeTarget[]) {
if (overrideTargets) {
return overrideTargets.map((target) => {
if (typeof target === 'string') {
return forgeConfig.makers.find(
(maker) => (maker as IForgeResolvableMaker).name === target,
) || { name: target };
}

return target;
});
}
return forgeConfig.makers;
}

export interface MakeOptions {
/**
* The path to the app from which distrubutables are generated
Expand All @@ -42,7 +59,7 @@ export interface MakeOptions {
/**
* An array of make targets to override your forge config
*/
overrideTargets?: (IForgeResolvableMaker | MakerBase<any>)[];
overrideTargets?: MakeTarget[];
/**
* The target architecture
*/
Expand Down Expand Up @@ -90,12 +107,8 @@ export default async ({
const makers: {
[key: number]: MakerBase<any>;
} = {};
let targets = (overrideTargets || forgeConfig.makers).map((target) => {
if (typeof target === 'string') {
return { name: target };
}
return target;
});

let targets = generateTargets(forgeConfig, overrideTargets);

let targetId = 0;
for (const target of targets) {
Expand Down

0 comments on commit c0e2939

Please sign in to comment.