Publish Stable

- @vercel/next@2.6.30

packages/now-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "2.6.29",
+  "version": "2.6.30",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",

packages/now-next/src/index.ts

@@ -10,7 +10,7 @@ import {
   PrepareCacheOptions,
   Prerender,
 } from '@vercel/build-utils';
-import { Handler, Route } from '@vercel/routing-utils';
+import { Handler, Route, Source } from '@vercel/routing-utils';
 import {
   convertHeaders,
   convertRedirects,
@@ -1651,6 +1651,7 @@ export const build = async ({
       // if there isn't a srcRoute then it's a non-dynamic SSG page and
       if (nonDynamicSsg || isFallback) {
         routeFileNoExt = addLocaleOrDefault(
+          // root index files are located without folder/index.html
           routeFileNoExt,
           routesManifest,
           locale
@@ -1968,22 +1969,27 @@ export const build = async ({
       ...headers,
 
       // redirects
-      ...redirects.map(redir => {
+      ...redirects.map(_redir => {
         if (i18n) {
+          const redir = _redir as Source;
           // detect the trailing slash redirect and make sure it's
           // kept above the wildcard mapping to prevent erroneous redirects
           // since non-continue routes come after continue the $wildcard
           // route will come before the redirect otherwise and if the
           // redirect is triggered it breaks locale mapping
+
+          const location =
+            redir.headers && (redir.headers.location || redir.headers.Location);
+
           if (
             redir.status === 308 &&
-            (redir.dest === '/$1' || redir.dest === '/$1/')
+            (location === '/$1' || location === '/$1/')
           ) {
             // we set continue true
-            (redir as any).continue = true;
+            redir.continue = true;
           }
         }
-        return redir;
+        return _redir;
       }),
 
       ...(i18n

packages/now-next/src/utils.ts

@@ -1110,7 +1110,9 @@ export function addLocaleOrDefault(
   if (!routesManifest?.i18n) return pathname;
   if (!locale) locale = routesManifest.i18n.defaultLocale;
 
-  return locale ? `/${locale}${pathname}` : pathname;
+  return locale
+    ? `/${locale}${pathname === '/index' ? '' : pathname}`
+    : pathname;
 }
 
 export {

packages/now-next/test/fixtures/00-i18n-support/pages/index.js

@@ -44,3 +44,12 @@ export default function Page(props) {
     </>
   );
 }
+
+export const getStaticProps = ({ locale, locales }) => {
+  return {
+    props: {
+      locale,
+      locales,
+    },
+  };
+};