Merge branch 'main' into v4

Author: ascorbic

package-lock.json

@@ -52,7 +52,7 @@
   "dependencies": {
     "@babel/core": "^7.15.0",
     "@netlify/functions": "^0.7.2",
-    "@netlify/ipx": "^0.0.5",
+    "@netlify/ipx": "^0.0.7",
     "@vercel/node": "^1.11.2-canary.4",
     "chalk": "^4.1.2",
     "fs-extra": "^10.0.0",

package.json

@@ -76,12 +76,12 @@ exports.generateRedirects = async ({ netlifyConfig, basePath, i18n }) => {
     redirects.push(...getNetlifyRoutes(route), ...getNetlifyRoutes(dataRoute))
   })
 
-  // Needed only for /_next/static
-  const i18nSplat = i18n ? '/:locale' : ''
-
+  if (i18n) {
+    netlifyConfig.redirects.push({ from: `${basePath}/:locale/_next/static/*`, to: `/static/:splat`, status: 200 })
+  }
   // This is only used in prod, so dev uses `next dev` directly
   netlifyConfig.redirects.push(
-    { from: `${basePath}${i18nSplat}/_next/static/*`, to: `${i18nSplat}/static/:splat`, status: 200 },
+    { from: `${basePath}/_next/static/*`, to: `/static/:splat`, status: 200 },
     {
       from: `${basePath}/*`,
       to: HANDLER_FUNCTION_PATH,

src/helpers/config.js

@@ -74,7 +74,12 @@ Array [
   Object {
     "from": "/:locale/_next/static/*",
     "status": 200,
-    "to": "/:locale/static/:splat",
+    "to": "/static/:splat",
+  },
+  Object {
+    "from": "/_next/static/*",
+    "status": 200,
+    "to": "/static/:splat",
   },
   Object {
     "conditions": Object {