fix: do not overwrite rollupOptions.input in dev (#6025)

vitejs · Dec 13, 2021 · 6cdf13a · 6cdf13a
1 parent 8735294
commit 6cdf13a
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 11 deletions.
diff --git a/packages/vite/src/node/__tests__/dev.spec.ts b/packages/vite/src/node/__tests__/dev.spec.ts
@@ -0,0 +1,18 @@
+import { resolveConfig } from '..'
+
+describe('resolveBuildOptions in dev', () => {
+  test('build.rollupOptions should not have input in lib', async () => {
+    const config = await resolveConfig(
+      {
+        build: {
+          lib: {
+            entry: './index.js'
+          }
+        }
+      },
+      'serve'
+    )
+
+    expect(config.build.rollupOptions).not.toHaveProperty('input')
+  })
+})
diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts
@@ -236,7 +236,8 @@ export type ResolvedBuildOptions = Required<
 
 export function resolveBuildOptions(
   root: string,
-  raw?: BuildOptions
+  raw?: BuildOptions,
+  isBuild?: boolean
 ): ResolvedBuildOptions {
   const resolved: ResolvedBuildOptions = {
     target: 'modules',
@@ -291,14 +292,12 @@ export function resolveBuildOptions(
           ])
         )
       : resolve(raw.rollupOptions.input)
-  } else {
-    input = resolve(
-      raw?.lib
-        ? raw.lib.entry
-        : typeof raw?.ssr === 'string'
-        ? raw.ssr
-        : 'index.html'
-    )
+  } else if (raw?.lib && isBuild) {
+    input = resolve(raw.lib.entry)
+  } else if (typeof raw?.ssr === 'string') {
+    input = resolve(raw.ssr)
+  } else if (isBuild) {
+    input = resolve('index.html')
   }
 
   if (!!raw?.ssr && typeof input === 'string' && input.endsWith('.html')) {
@@ -308,7 +307,9 @@ export function resolveBuildOptions(
     )
   }
 
-  resolved.rollupOptions.input = input
+  if (input) {
+    resolved.rollupOptions.input = input
+  }
 
   // handle special build targets
   if (resolved.target === 'modules') {

diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts
@@ -367,7 +367,11 @@ export async function resolveConfig(
 
   // resolve public base url
   const BASE_URL = resolveBaseUrl(config.base, command === 'build', logger)
-  const resolvedBuildOptions = resolveBuildOptions(resolvedRoot, config.build)
+  const resolvedBuildOptions = resolveBuildOptions(
+    resolvedRoot,
+    config.build,
+    command === 'build'
+  )
 
   // resolve cache directory
   const pkgPath = lookupFile(