fix: locale splat for _next/static redirect

Author: lindsaylevine

src/helpers/config.js

@@ -51,7 +51,7 @@ const getNetlifyRoutes = (nextRoute) => {
   return netlifyRoutes
 }
 
-exports.generateRedirects = async ({ netlifyConfig, basePath }) => {
+exports.generateRedirects = async ({ netlifyConfig, basePath, i18n }) => {
   const { dynamicRoutes } = await readJSON(join(netlifyConfig.build.publish, 'prerender-manifest.json'))
 
   const redirects = []
@@ -76,9 +76,12 @@ exports.generateRedirects = async ({ netlifyConfig, basePath }) => {
     redirects.push(...getNetlifyRoutes(route), ...getNetlifyRoutes(dataRoute))
   })
 
+  // Needed only for /_next/static
+  const i18nSplat = i18n ? '/:locale' : ''
+
   // This is only used in prod, so dev uses `next dev` directly
   netlifyConfig.redirects.push(
-    { from: `${basePath}/_next/static/*`, to: '/static/:splat', status: 200 },
+    { from: `${basePath}${i18nSplat}/_next/static/*`, to: `${i18nSplat}/static/:splat`, status: 200 },
     {
       from: `${basePath}/*`,
       to: HANDLER_FUNCTION_PATH,
@@ -119,7 +122,6 @@ exports.setIncludedFiles = ({ netlifyConfig, publish }) => {
     netlifyConfig.functions[functionName].included_files.push(
       `${publish}/server/**`,
       `${publish}/serverless/**`,
-      `${publish}/static/**`,
       `${publish}/*.json`,
       `${publish}/BUILD_ID`,
     )

src/index.js

@@ -42,7 +42,7 @@ module.exports = {
 
     checkNextSiteHasBuilt({ publish, failBuild })
 
-    const { images, target, appDir, basePath } = await getNextConfig({ publish, failBuild })
+    const { appDir, basePath, i18n, images, target } = await getNextConfig({ publish, failBuild })
 
     setBundler({ netlifyConfig, target })
 
@@ -59,6 +59,7 @@ module.exports = {
     await generateRedirects({
       netlifyConfig,
       basePath,
+      i18n,
     })
   },