From a6397d7bd902376e322f7fd3d47d67b276ad3b52 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 31 Oct 2023 19:38:27 +0000
Subject: [PATCH 1/2] chore(deps): update dependency defu to v6.1.3

---
 yarn.lock | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 183e9e08..0f286a3a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5527,16 +5527,11 @@ defu@^5.0.0:
   resolved "https://registry.yarnpkg.com/defu/-/defu-5.0.1.tgz#a034278f9b032bf0845d261aa75e9ad98da878ac"
   integrity sha512-EPS1carKg+dkEVy3qNTqIdp2qV7mUP08nIsupfwQpz++slCVRw7qbQyWvSTig+kFPwz2XXp5/kIIkH+CwrJKkQ==
 
-defu@^6.0.0:
+defu@^6.0.0, defu@^6.1.2:
   version "6.1.3"
   resolved "https://registry.yarnpkg.com/defu/-/defu-6.1.3.tgz#6d7f56bc61668e844f9f593ace66fd67ef1205fd"
   integrity sha512-Vy2wmG3NTkmHNg/kzpuvHhkqeIx3ODWqasgCRbKtbXEN0G+HpEEv9BtJLp7ZG1CZloFaC41Ah3ZFbq7aqCqMeQ==
 
-defu@^6.1.2:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/defu/-/defu-6.1.2.tgz#1217cba167410a1765ba93893c6dbac9ed9d9e5c"
-  integrity sha512-+uO4+qr7msjNNWKYPHqN/3+Dx3NFkmIzayk2L1MyZQlvgZb/J1A0fo410dpKrN2SnqFjt8n4JL8fDJE0wIgjFQ==
-
 degenerator@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-5.0.1.tgz#9403bf297c6dad9a1ece409b37db27954f91f2f5"

From 80a98baf14c14c59fe4c9b69b4e836b58660e5fa Mon Sep 17 00:00:00 2001
From: Rafal Chlodnicki <rafal@squareup.com>
Date: Tue, 31 Oct 2023 21:20:42 +0100
Subject: [PATCH 2/2] workaround issue caused by defu change

---
 test/utils.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/utils.ts b/test/utils.ts
index 9e6152f2..8196b2c9 100644
--- a/test/utils.ts
+++ b/test/utils.ts
@@ -18,7 +18,9 @@ export async function $$ (selector: string, page: Page): Promise<string | null>
 }
 
 export async function loadConfig (dir: string, fixture: string | null = null, override: Record<string, unknown> = {}, { merge = false } = {}): Promise<Record<string, unknown>> {
-  const config = await import(`${dir}/fixture/${fixture ? fixture + '/' : ''}nuxt.config.cjs`)
+  // Returned object has "Module" type which defu ignores because it's not plain object.
+  // Copy properties to the new object so that the object is not ignored.
+  const config = Object.assign({}, await import(`${dir}/fixture/${fixture ? fixture + '/' : ''}nuxt.config.cjs`))
 
   if (merge) {
     return defu(override, config)