support site config .extends being an array

vuejs · Oct 24, 2023 · 77a3499 · 77a3499
1 parent a31e143
commit 77a3499
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/__tests__/e2e/.vitepress/config.ts b/__tests__/e2e/.vitepress/config.ts
@@ -84,10 +84,18 @@ const sidebar: DefaultTheme.Config['sidebar'] = {
 }
 
 export default defineConfig({
-  title: 'Example',
-  description: 'An example app using VitePress.',
+  extends: [
+    {
+      title: 'Example',
+      description: 'An example app using VitePress.'
+    },
+    {
+      themeConfig: {
+        sidebar
+      }
+    }
+  ],
   themeConfig: {
-    sidebar,
     search: {
       provider: 'local',
       options: {

diff --git a/src/node/config.ts b/src/node/config.ts
@@ -180,8 +180,13 @@ async function resolveConfigExtends(
 ): Promise<UserConfig> {
   const resolved = await (typeof config === 'function' ? config() : config)
   if (resolved.extends) {
-    const base = await resolveConfigExtends(resolved.extends)
-    return mergeConfig(base, resolved)
+    const extendsRaw = [resolved.extends].flat()
+    const manyBases = await Promise.all(
+      extendsRaw.map((config) => resolveConfigExtends(config))
+    )
+    // or reduceRight() depending on which side gets priority
+    const singleBase = manyBases.reduce((prev, curr) => mergeConfig(prev, curr))
+    return mergeConfig(singleBase, resolved)
   }
   return resolved
 }

diff --git a/src/node/siteConfig.ts b/src/node/siteConfig.ts
@@ -56,7 +56,7 @@ export interface TransformPageContext {
 
 export interface UserConfig<ThemeConfig = any>
   extends LocaleSpecificConfig<ThemeConfig> {
-  extends?: RawConfigExports<ThemeConfig>
+  extends?: RawConfigExports<ThemeConfig> | RawConfigExports<ThemeConfig>[]
 
   base?: string
   srcDir?: string