Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/consolidate-config.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@workflow/builders": patch
"@workflow/nitro": patch
---

Consolidate builder configuration patterns
22 changes: 22 additions & 0 deletions packages/builders/src/config-helpers.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import type { WorkflowConfig } from './types.js';

/**
* Creates a partial configuration for builders that don't use bundle paths directly.
* Used by framework integrations like Nitro where the builder computes paths internally.
*/
export function createBaseBuilderConfig(options: {
workingDir: string;
dirs?: string[];
watch?: boolean;
externalPackages?: string[];
}): Omit<WorkflowConfig, 'buildTarget'> {
return {
dirs: options.dirs ?? ['workflows'],
workingDir: options.workingDir,
watch: options.watch,
stepsBundlePath: '', // Not used by base builder methods
workflowsBundlePath: '', // Not used by base builder methods
webhookBundlePath: '', // Not used by base builder methods
externalPackages: options.externalPackages,
};
}
1 change: 1 addition & 0 deletions packages/builders/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
export type { WorkflowManifest } from './apply-swc-transform.js';
export { applySwcTransform } from './apply-swc-transform.js';
export { BaseBuilder } from './base-builder.js';
export { createBaseBuilderConfig } from './config-helpers.js';
export { STEP_QUEUE_TRIGGER, WORKFLOW_QUEUE_TRIGGER } from './constants.js';
export { createDiscoverEntriesPlugin } from './discover-entries-esbuild-plugin.js';
export { createNodeModuleErrorPlugin } from './node-module-esbuild-plugin.js';
Expand Down
31 changes: 16 additions & 15 deletions packages/nitro/src/builders.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
import { mkdir, readFile, writeFile } from 'node:fs/promises';
import { BaseBuilder, VercelBuildOutputAPIBuilder } from '@workflow/builders';
import {
BaseBuilder,
VercelBuildOutputAPIBuilder,
createBaseBuilderConfig,
} from '@workflow/builders';
import type { Nitro } from 'nitro/types';
import { join, resolve } from 'pathe';

const CommonBuildOptions = {
buildTarget: 'next' as const, // unused in base
stepsBundlePath: '', // unused in base
workflowsBundlePath: '', // unused in base
webhookBundlePath: '', // unused in base
};

export class VercelBuilder extends VercelBuildOutputAPIBuilder {
constructor(nitro: Nitro) {
super({
...CommonBuildOptions,
dirs: getWorkflowDirs(nitro),
workingDir: nitro.options.rootDir,
...createBaseBuilderConfig({
workingDir: nitro.options.rootDir,
dirs: getWorkflowDirs(nitro),
}),
buildTarget: 'vercel-build-output-api',
});
}
override async build(): Promise<void> {
Expand All @@ -36,10 +35,12 @@ export class LocalBuilder extends BaseBuilder {
constructor(nitro: Nitro) {
const outDir = join(nitro.options.buildDir, 'workflow');
super({
...CommonBuildOptions,
dirs: getWorkflowDirs(nitro),
workingDir: nitro.options.rootDir,
watch: nitro.options.dev,
...createBaseBuilderConfig({
workingDir: nitro.options.rootDir,
watch: nitro.options.dev,
dirs: getWorkflowDirs(nitro),
}),
buildTarget: 'next', // Placeholder, not actually used
});
this.#outDir = outDir;
}
Expand Down