From e5c17eec86ffa19350a831b2eb2b1adc156453a7 Mon Sep 17 00:00:00 2001 From: sibbng Date: Sun, 14 Nov 2021 03:18:04 +0300 Subject: [PATCH] chore: cleanup #5601 --- packages/vite/src/node/__tests__/build.spec.ts | 2 +- packages/vite/src/node/build.ts | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/vite/src/node/__tests__/build.spec.ts b/packages/vite/src/node/__tests__/build.spec.ts index b745c38aa44790..34d80736a5b430 100644 --- a/packages/vite/src/node/__tests__/build.spec.ts +++ b/packages/vite/src/node/__tests__/build.spec.ts @@ -67,7 +67,7 @@ describe('resolveLibFilename', () => { }) }) -describe('resolvePaths', () => { +describe('resolveBuildOptions', () => { test('resolve build.rollupOptions.input', async () => { const config = await resolveConfig({ build: { diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts index a374bc9908f353..76809b0af7a0ff 100644 --- a/packages/vite/src/node/build.ts +++ b/packages/vite/src/node/build.ts @@ -279,9 +279,8 @@ export function resolveBuildOptions(root: string, raw?: BuildOptions): ResolvedB input = Array.isArray(raw.rollupOptions.input) ? raw.rollupOptions.input.map(input => resolve(input)) : typeof raw.rollupOptions.input === 'object' - ? Object.assign( - // @ts-ignore - ...Object.keys(raw.rollupOptions.input).map(key => ({ [key]: resolve(raw.rollupOptions.input[key]) })) + ? Object.fromEntries( + Object.entries(raw.rollupOptions.input).map(([key, value]) => [key, resolve(value)]) ) : resolve(raw.rollupOptions.input) } else {