Skip to content

Commit 370b604

Browse files
committed
fix: async
1 parent 854d753 commit 370b604

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

packages/qwik/src/optimizer/src/plugins/rollup.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,26 +127,28 @@ export function qwikRollup(qwikRollupOpts: QwikRollupPluginOptions = {}): any {
127127
return rollupPlugin;
128128
}
129129

130-
export function normalizeRollupOutputOptions(
130+
export async function normalizeRollupOutputOptions(
131131
qwikPlugin: QwikPlugin,
132132
rollupOutputOpts: Rollup.OutputOptions | Rollup.OutputOptions[] | undefined,
133133
useAssetsDir: boolean,
134134
outDir?: string
135-
): Rollup.OutputOptions | Rollup.OutputOptions[] {
135+
): Promise<Rollup.OutputOptions | Rollup.OutputOptions[]> {
136136
if (Array.isArray(rollupOutputOpts)) {
137137
// make sure at least one output is present in every case
138138
if (!rollupOutputOpts.length) {
139139
rollupOutputOpts.push({});
140140
}
141141

142-
return rollupOutputOpts.map((outputOptsObj) => ({
143-
...normalizeRollupOutputOptionsObject(qwikPlugin, outputOptsObj, useAssetsDir),
144-
dir: outDir || outputOptsObj.dir,
145-
}));
142+
return await Promise.all(
143+
rollupOutputOpts.map(async (outputOptsObj) => ({
144+
...(await normalizeRollupOutputOptionsObject(qwikPlugin, outputOptsObj, useAssetsDir)),
145+
dir: outDir || outputOptsObj.dir,
146+
}))
147+
);
146148
}
147149

148150
return {
149-
...normalizeRollupOutputOptionsObject(qwikPlugin, rollupOutputOpts, useAssetsDir),
151+
...(await normalizeRollupOutputOptionsObject(qwikPlugin, rollupOutputOpts, useAssetsDir)),
150152
dir: outDir || rollupOutputOpts?.dir,
151153
};
152154
}

packages/qwik/src/optimizer/src/plugins/vite.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ export function qwikVite(qwikViteOpts: QwikVitePluginOptions = {}): any {
346346
const origOnwarn = updatedViteConfig.build!.rollupOptions?.onwarn;
347347
updatedViteConfig.build!.rollupOptions = {
348348
input: opts.input,
349-
output: normalizeRollupOutputOptions(
349+
output: await normalizeRollupOutputOptions(
350350
qwikPlugin,
351351
viteConfig.build?.rollupOptions?.output,
352352
useAssetsDir,

0 commit comments

Comments
 (0)