Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: allow a custom out dir from forge config #2714

Closed
wants to merge 1 commit into from
Closed

feat: allow a custom out dir from forge config #2714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/api/core/src/api/make.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export default async ({
forgeConfig = await getForgeConfig(dir);
});

const actualOutDir = outDir || getCurrentOutDir(dir, forgeConfig);
const actualOutDir = outDir || forgeConfig.outDir || getCurrentOutDir(dir, forgeConfig);

const actualTargetPlatform = platform;
platform = platform === 'mas' ? 'darwin' : platform;
Expand Down
2 changes: 1 addition & 1 deletion packages/api/core/src/api/package.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export default async ({
throw new Error('packageJSON.main must be set to a valid entry point for your Electron app');
}

const calculatedOutDir = outDir || getCurrentOutDir(dir, forgeConfig);
const calculatedOutDir = outDir || forgeConfig.outDir || getCurrentOutDir(dir, forgeConfig);
let packagerSpinner: OraImpl | undefined;

const pruneEnabled = !('prune' in forgeConfig.packagerConfig) || forgeConfig.packagerConfig.prune;
Expand Down
2 changes: 1 addition & 1 deletion packages/api/core/src/api/publish.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ const publish = async ({

const forgeConfig = await getForgeConfig(dir);

const calculatedOutDir = outDir || getCurrentOutDir(dir, forgeConfig);
const calculatedOutDir = outDir || forgeConfig.outDir || getCurrentOutDir(dir, forgeConfig);
const dryRunDir = path.resolve(calculatedOutDir, 'publish-dry-run');

if (dryRunResume) {
Expand Down
1 change: 1 addition & 0 deletions packages/utils/types/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export interface ForgeConfig {
* If a function is provided, it must synchronously return the buildIdentifier
*/
buildIdentifier?: string | (() => string);
outDir?: string,
hooks?: {
[hookName: string]: ForgeHookFn;
};
Expand Down