Merge branch 'main' into mk/ef-null-check

Author: kodiakhq[bot]

package-lock.json

@@ -52,7 +52,7 @@
     "@babel/preset-env": "^7.15.8",
     "@babel/preset-typescript": "^7.16.0",
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^29.5.1",
+    "@netlify/build": "^29.5.2",
     "@netlify/eslint-config-node": "^7.0.1",
     "@testing-library/cypress": "^8.0.1",
     "@types/fs-extra": "^9.0.13",

package.json

@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^29.5.1",
+    "@netlify/build": "^29.5.2",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",

packages/runtime/package.json

@@ -9,6 +9,7 @@ import slash from 'slash'
 import { HANDLER_FUNCTION_NAME, ODB_FUNCTION_NAME } from '../constants'
 
 import type { RoutesManifest } from './types'
+import { escapeStringRegexp } from './utils'
 
 const ROUTES_MANIFEST_FILE = 'routes-manifest.json'
 
@@ -214,7 +215,9 @@ export const generateCustomHeaders = (nextConfig: NextConfig, netlifyHeaders: Ne
 
     if (useLocale) {
       const { locales } = i18n
-      const joinedLocales = locales.join('|')
+
+      // escape the locale strings to match the way Next writes the routes-manifest.json file
+      const joinedLocales = locales.map((locale: string) => escapeStringRegexp(locale)).join('|')
 
       /**
        *  converts e.g.

packages/runtime/src/helpers/config.ts

@@ -313,3 +313,8 @@ export const getRemotePatterns = (experimental: ExperimentalConfigWithLegacy, im
   }
   return []
 }
+
+// Taken from next/src/shared/lib/escape-regexp.ts
+const reHasRegExp = /[|\\{}()[\]^$+*?.-]/
+const reReplaceRegExp = /[|\\{}()[\]^$+*?.-]/g
+export const escapeStringRegexp = (str: string) => (reHasRegExp.test(str) ? str.replace(reReplaceRegExp, '\\$&') : str)

packages/runtime/src/helpers/utils.ts

@@ -1606,13 +1606,13 @@ describe('function helpers', () => {
         // Next.js has modified the routesManifest to have the locales in the source.
         const nextConfig = {
           i18n: {
-            locales: ['en', 'fr'],
+            locales: ['en-US', 'fr'],
             defaultLocale: 'en',
           },
           routesManifest: {
             headers: [
               {
-                source: '/:nextInternalLocale(en|fr)/with-locale/:path*',
+                source: '/:nextInternalLocale(en\\-US|fr)/with-locale/:path*',
                 headers: [
                   {
                     key: 'X-Unit-Test',
@@ -1635,7 +1635,7 @@ describe('function helpers', () => {
             },
           },
           {
-            for: '/en/with-locale/*',
+            for: '/en-US/with-locale/*',
             values: {
               'X-Unit-Test': 'true',
             },