fix: do not run resolveConfig to get Vite configs in user root (#1670)

Author: kermanx

packages/slidev/node/commands/build.ts

@@ -2,12 +2,11 @@ import { resolve } from 'node:path'
 import http from 'node:http'
 import fs from 'fs-extra'
 import type { InlineConfig, ResolvedConfig } from 'vite'
-import { mergeConfig, build as viteBuild } from 'vite'
+import { build as viteBuild } from 'vite'
 import connect from 'connect'
 import sirv from 'sirv'
 import type { BuildArgs, ResolvedSlidevOptions } from '@slidev/types'
-import { ViteSlidevPlugin } from '../vite'
-import { getIndexHtml, mergeViteConfigs } from './shared'
+import { getIndexHtml, resolveViteConfigs } from './shared'
 
 export async function build(
   options: ResolvedSlidevOptions,
@@ -24,11 +23,9 @@ export async function build(
   let config: ResolvedConfig = undefined!
 
   try {
-    let inlineConfig = await mergeViteConfigs(
+    const inlineConfig = await resolveViteConfigs(
       options,
-      viteConfig,
-      <InlineConfig>({
-        root: options.userRoot,
+      {
         plugins: [
           {
             name: 'resolve-config',
@@ -40,19 +37,11 @@ export async function build(
         build: {
           chunkSizeWarningLimit: 2000,
         },
-      }),
+      } satisfies InlineConfig,
+      viteConfig,
       'build',
     )
 
-    inlineConfig = mergeConfig(
-      inlineConfig,
-      {
-        plugins: [
-          await ViteSlidevPlugin(options, inlineConfig.slidev || {}),
-        ],
-      },
-    )
-
     await viteBuild(inlineConfig)
   }
   finally {

packages/slidev/node/commands/server.ts

@@ -1,48 +1,31 @@
 import { join } from 'node:path'
 import process from 'node:process'
 import type { InlineConfig } from 'vite'
-import { createServer as createViteServer, mergeConfig } from 'vite'
+import { createServer as createViteServer } from 'vite'
 import type { ResolvedSlidevOptions, SlidevServerOptions } from '@slidev/types'
-import { ViteSlidevPlugin } from '../vite'
-import { mergeViteConfigs } from './shared'
+import { resolveViteConfigs } from './shared'
 
 export async function createServer(
   options: ResolvedSlidevOptions,
   viteConfig: InlineConfig = {},
-  serverOptions: SlidevServerOptions = {},
+  serverOptions?: SlidevServerOptions,
 ) {
   // default open editor to code, #312
   process.env.EDITOR = process.env.EDITOR || 'code'
 
-  const config = await mergeViteConfigs(
+  const inlineConfig = await resolveViteConfigs(
     options,
-    viteConfig,
-    <InlineConfig>({
-      root: options.userRoot,
+    {
       optimizeDeps: {
         entries: [
           join(options.clientRoot, 'main.ts'),
         ],
       },
-    }),
+    } satisfies InlineConfig,
+    viteConfig,
     'serve',
+    serverOptions,
   )
 
-  const server = await createViteServer(
-    mergeConfig(
-      config,
-      {
-        configFile: false,
-        plugins: [
-          await ViteSlidevPlugin(options, config.slidev || {}, serverOptions),
-        ],
-        define: {
-          // Fixes Vue production mode breaking PDF Export #1245
-          __VUE_PROD_DEVTOOLS__: JSON.stringify(true),
-        },
-      },
-    ),
-  )
-
-  return server
+  return await createViteServer(inlineConfig)
 }

packages/slidev/node/commands/shared.ts

@@ -1,14 +1,15 @@
 import { existsSync, promises as fs } from 'node:fs'
 import { join } from 'node:path'
-import { loadConfigFromFile, mergeConfig, resolveConfig } from 'vite'
+import { loadConfigFromFile, mergeConfig } from 'vite'
 import type { ConfigEnv, InlineConfig } from 'vite'
-import type { ResolvedSlidevOptions, SlidevData } from '@slidev/types'
+import type { ResolvedSlidevOptions, SlidevData, SlidevServerOptions } from '@slidev/types'
 import MarkdownIt from 'markdown-it'
 import { slash } from '@antfu/utils'
 import markdownItLink from '../syntax/markdown-it/markdown-it-link'
 import { generateGoogleFontsUrl, stringifyMarkdownTokens } from '../utils'
 import { toAtFS } from '../resolver'
 import { version } from '../../package.json'
+import { ViteSlidevPlugin } from '../vite'
 
 export const sharedMd = MarkdownIt({ html: true })
 sharedMd.use(markdownItLink)
@@ -72,34 +73,43 @@ export async function getIndexHtml({ entry, clientRoot, roots, data }: ResolvedS
   return main
 }
 
-export async function mergeViteConfigs(
-  { roots, entry }: ResolvedSlidevOptions,
-  viteConfig: InlineConfig,
-  config: InlineConfig,
+export async function resolveViteConfigs(
+  options: ResolvedSlidevOptions,
+  baseConfig: InlineConfig,
+  overrideConfigs: InlineConfig,
   command: 'serve' | 'build',
+  serverOptions?: SlidevServerOptions,
 ) {
   const configEnv: ConfigEnv = {
-    mode: 'development',
+    mode: command === 'build' ? 'production' : 'development',
     command,
   }
-  // Merge theme & addon configs
-  const files = roots.map(i => join(i, 'vite.config.ts'))
+  // Merge theme & addon & user configs
+  const files = options.roots.map(i => join(i, 'vite.config.ts'))
 
-  for await (const file of files) {
+  for (const file of files) {
     if (!existsSync(file))
       continue
     const viteConfig = await loadConfigFromFile(configEnv, file)
     if (!viteConfig?.config)
       continue
-    config = mergeConfig(config, viteConfig.config)
+    baseConfig = mergeConfig(baseConfig, viteConfig.config)
   }
 
-  // Merge viteConfig argument
-  config = mergeConfig(config, viteConfig)
-
-  // Merge local config (slidev options only)
-  const localConfig = await resolveConfig({}, command, entry)
-  config = mergeConfig(config, { slidev: localConfig.slidev || {} })
-
-  return config
+  baseConfig = mergeConfig(baseConfig, overrideConfigs)
+
+  // Merge common overrides
+  baseConfig = mergeConfig(baseConfig, {
+    configFile: false,
+    root: options.userRoot,
+    plugins: [
+      await ViteSlidevPlugin(options, baseConfig.slidev || {}, serverOptions),
+    ],
+    define: {
+      // Fixes Vue production mode breaking PDF Export #1245
+      __VUE_PROD_DEVTOOLS__: false,
+    },
+  })
+
+  return baseConfig
 }