From 584af76229fba3412c255d64c305ff833ef106cf Mon Sep 17 00:00:00 2001
From: Rob Stanford <me@robstanford.com>
Date: Tue, 21 Mar 2023 17:36:31 +0000
Subject: [PATCH 1/2] fix: data route rewrite for i18n root route

---
 packages/runtime/src/helpers/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/runtime/src/helpers/utils.ts b/packages/runtime/src/helpers/utils.ts
index c47ec1be71..2022fc6b00 100644
--- a/packages/runtime/src/helpers/utils.ts
+++ b/packages/runtime/src/helpers/utils.ts
@@ -74,7 +74,7 @@ export const generateNetlifyRoutes = ({
 }) => [...(withData ? toNetlifyRoute(dataRoute) : []), ...toNetlifyRoute(route)]
 
 export const routeToDataRoute = (route: string, buildId: string, locale?: string) =>
-  `/_next/data/${buildId}${locale ? `/${locale}` : ''}${route === '/' ? '/index' : route}.json`
+  `/_next/data/${buildId}${locale ? `/${locale}` : ''}${route === '/' ? (locale ? '' : '/index') : route}.json`
 
 // Default locale is served from root, not localized
 export const localizeRoute = (route: string, locale: string, defaultLocale: string) =>

From ba6f83330e5b8858b427ab87a2cbd33232b2de97 Mon Sep 17 00:00:00 2001
From: Rob Stanford <me@robstanford.com>
Date: Wed, 22 Mar 2023 08:47:17 +0000
Subject: [PATCH 2/2] chore: update snapshots for new rewrite

---
 test/__snapshots__/index.spec.js.snap | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/__snapshots__/index.spec.js.snap b/test/__snapshots__/index.spec.js.snap
index 31b8ba4181..565bcf0194 100644
--- a/test/__snapshots__/index.spec.js.snap
+++ b/test/__snapshots__/index.spec.js.snap
@@ -658,6 +658,12 @@ Array [
     "status": 200,
     "to": "/.netlify/builders/_ipx",
   },
+  Object {
+    "force": true,
+    "from": "/_next/data/build-id/en.json",
+    "status": 200,
+    "to": "/.netlify/builders/___netlify-odb-handler",
+  },
   Object {
     "force": false,
     "from": "/_next/data/build-id/en/500.json",
@@ -844,12 +850,6 @@ Array [
     "status": 200,
     "to": "/.netlify/functions/___netlify-handler",
   },
-  Object {
-    "force": true,
-    "from": "/_next/data/build-id/en/index.json",
-    "status": 200,
-    "to": "/.netlify/builders/___netlify-odb-handler",
-  },
   Object {
     "force": false,
     "from": "/_next/data/build-id/en/layouts.json",