From 6a43985bf78a934300745949f6e128f371c566cb Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Thu, 1 Sep 2022 16:42:53 +0200
Subject: [PATCH] feat: allow using `extends` alongside with `preset`

---
 package.json   |  2 +-
 pnpm-lock.yaml | 17 ++---------------
 src/options.ts |  3 ++-
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index b64fd66889..306e54a5cd 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "@rollup/pluginutils": "^4.2.1",
     "@vercel/nft": "^0.22.0",
     "archiver": "^5.3.1",
-    "c12": "^0.2.9",
+    "c12": "^0.2.10",
     "chalk": "^5.0.1",
     "chokidar": "^3.5.3",
     "consola": "^2.15.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 28e15217c1..b1544637cd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -29,7 +29,7 @@ importers:
       '@vercel/nft': ^0.22.0
       '@vitest/coverage-c8': ^0.22.1
       archiver: ^5.3.1
-      c12: ^0.2.9
+      c12: ^0.2.10
       c8: ^7.12.0
       chalk: ^5.0.1
       changelogen: ^0.2.3
@@ -99,7 +99,7 @@ importers:
       '@rollup/pluginutils': 4.2.1
       '@vercel/nft': 0.22.0
       archiver: 5.3.1
-      c12: 0.2.9
+      c12: 0.2.10
       chalk: 5.0.1
       chokidar: 3.5.3
       consola: 2.15.3
@@ -1652,19 +1652,6 @@ packages:
       mlly: 0.5.14
       pathe: 0.3.5
       rc9: 1.2.2
-    dev: true
-
-  /c12/0.2.9:
-    resolution: {integrity: sha512-6jYdexgAKr+3kYoTmvC5eDtDHUg7GmFQSdeQqZzAKiPlFAN1heGUoXDbAYYwUCfefZy+WgVJbmAej5TTQpp3jA==}
-    dependencies:
-      defu: 6.1.0
-      dotenv: 16.0.1
-      gittar: 0.1.1
-      jiti: 1.14.0
-      mlly: 0.5.14
-      pathe: 0.3.5
-      rc9: 1.2.2
-    dev: false
 
   /c8/7.12.0:
     resolution: {integrity: sha512-CtgQrHOkyxr5koX1wEUmN/5cfDa2ckbHRA4Gy5LAL0zaCFtVWJS5++n+w4/sr2GWGerBxgTjpKeDclk/Qk6W/A==}
diff --git a/src/options.ts b/src/options.ts
index 6fdb6d0bdd..33f3db393a 100644
--- a/src/options.ts
+++ b/src/options.ts
@@ -99,6 +99,7 @@ export async function loadOptions (userConfig: NitroConfig = {}): Promise<NitroO
     defaults: NitroDefaults,
     cwd: userConfig.rootDir,
     dotenv: userConfig.dev,
+    extend: { extendKey: ['extends', 'preset'] },
     resolve (id: string) {
       type PT = Map<String, NitroConfig>
       let matchedPreset = (PRESETS as any as PT)[id] || (PRESETS as any as PT)[camelCase(id)]
@@ -114,7 +115,7 @@ export async function loadOptions (userConfig: NitroConfig = {}): Promise<NitroO
     },
     overrides: {
       ...userConfig,
-      extends: [preset]
+      preset
     }
   })
   const options = klona(config) as NitroOptions