Skip to content
Open
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
49 changes: 33 additions & 16 deletions src/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,33 @@ export async function build(
// Create jiti instance for loading initial config
const jiti = createJiti(rootDir);

const _buildConfig: BuildConfig | BuildConfig[] =
(await jiti.import(inputConfig?.config || "./build.config", {
try: !inputConfig.config,
const [_buildConfig, pkg = {}] = await Promise.all([
jiti.import<BuildConfig | BuildConfig[] | undefined>(
inputConfig?.config || "./build.config",
{
try: !inputConfig.config,
default: true,
},
),
jiti.import<
| (PackageJson &
Partial<Record<"unbuild" | "build", BuildConfig | BuildConfig[]>>)
| undefined
>("./package.json", {
try: true,
default: true,
})) || {};
}),
]);

const buildConfigs = (
Array.isArray(_buildConfig) ? _buildConfig : [_buildConfig]
).filter(Boolean);
const pkgBuildConfig = pkg.unbuild || pkg.build;
const buildConfigs = [
...(Array.isArray(_buildConfig) ? _buildConfig : [_buildConfig]),
...(Array.isArray(pkgBuildConfig) ? pkgBuildConfig : []),
].filter(Boolean) as BuildConfig[];

const pkg: PackageJson & Partial<Record<"unbuild" | "build", BuildConfig>> =
((await jiti.import("./package.json", {
try: true,
default: true,
})) as PackageJson) || ({} as PackageJson);
if (buildConfigs.length === 0) {
buildConfigs.push({});
}

// Invoke build for every build config defined in build.config.ts
const cleanedDirs: string[] = [];
Expand All @@ -74,16 +86,21 @@ async function _build(
rootDir: string,
inputConfig: BuildConfig = {},
buildConfig: BuildConfig,
pkg: PackageJson & Partial<Record<"unbuild" | "build", BuildConfig>>,
pkg: PackageJson &
Partial<Record<"unbuild" | "build", BuildConfig | BuildConfig[]>>,
cleanedDirs: string[],
_stubMode: boolean,
_watchMode: boolean,
): Promise<void> {
const pkgBuildConfig = pkg.unbuild || pkg.build;
const pkgBuildConfigToMerge = Array.isArray(pkgBuildConfig)
? undefined
: pkgBuildConfig;

// Resolve preset
const preset = await resolvePreset(
buildConfig.preset ||
pkg.unbuild?.preset ||
pkg.build?.preset ||
pkgBuildConfigToMerge?.preset ||
inputConfig.preset ||
"auto",
rootDir,
Expand All @@ -92,7 +109,7 @@ async function _build(
// Merge options
const options = defu(
buildConfig,
pkg.unbuild || pkg.build,
pkgBuildConfigToMerge,
inputConfig,
preset,
<BuildOptions>{
Expand Down
Loading