Publish Stable

- @vercel/next@2.6.33
Publish Canary
2025-12-26 11:49:15 +00:00 · 2020-10-27 13:41:00 -05:00 · 2020-10-27 13:33:33 -05:00 · 2020-10-27 13:33:02 -05:00 · 2020-10-27 09:30:43 -05:00 · 2020-10-27 09:11:04 -05:00
22 changed files with 175 additions and 66 deletions
--- a/packages/frameworks/frameworks.json
+++ b/packages/frameworks/frameworks.json
@@ -56,7 +56,13 @@
      "outputDirectory": {
        "placeholder": "Next.js default"
      }
-    }
+    },
+    "recommendedIntegrations": [
+      {
+        "id": "oac_5lUsiANun1DEzgLg0NZx5Es3",
+        "dependencies": ["next-plugin-sentry", "next-sentry-source-maps"]
+      }
+    ]
  },
  {
    "name": "Gatsby.js",
--- a/packages/frameworks/index.d.ts
+++ b/packages/frameworks/index.d.ts
@@ -31,4 +31,8 @@ export interface Framework {
    devCommand: Setting;
    outputDirectory: Setting;
  };
+  recommendedIntegrations?: {
+    id: string;
+    dependencies: string[];
+  }[];
 }
--- a/packages/frameworks/package.json
+++ b/packages/frameworks/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/frameworks",
-  "version": "0.1.1",
+  "version": "0.1.2-canary.0",
  "main": "frameworks.json",
  "license": "UNLICENSED",
  "scripts": {
--- a/packages/frameworks/test/frameworks.unit.test.ts
+++ b/packages/frameworks/test/frameworks.unit.test.ts
@@ -97,6 +97,25 @@ const Schema = {
          outputDirectory: SchemaSettings,
        },
      },
+      recommendedIntegrations: {
+        type: 'array',
+        items: {
+          type: 'object',
+          required: ['id', 'dependencies'],
+          additionalProperties: false,
+          properties: {
+            id: {
+              type: 'string',
+            },
+            dependencies: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+            },
+          },
+        },
+      },
    },
  },
 };
--- a/packages/now-build-utils/package.json
+++ b/packages/now-build-utils/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/build-utils",
-  "version": "2.5.4",
+  "version": "2.5.5-canary.0",
  "license": "MIT",
  "main": "./dist/index.js",
  "types": "./dist/index.d.js",
@@ -29,7 +29,7 @@
    "@types/node-fetch": "^2.1.6",
    "@types/semver": "6.0.0",
    "@types/yazl": "^2.4.1",
-    "@vercel/frameworks": "0.1.1",
+    "@vercel/frameworks": "0.1.2-canary.0",
    "@vercel/ncc": "0.24.0",
    "aggregate-error": "3.0.1",
    "async-retry": "1.2.3",
--- a/packages/now-cli/package.json
+++ b/packages/now-cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vercel",
-  "version": "20.1.2",
+  "version": "20.1.3-canary.0",
  "preferGlobal": true,
  "license": "Apache-2.0",
  "description": "The command-line interface for Vercel",
@@ -61,7 +61,7 @@
    "node": ">= 10"
  },
  "dependencies": {
-    "@vercel/build-utils": "2.5.4",
+    "@vercel/build-utils": "2.5.5-canary.0",
    "@vercel/go": "1.1.6",
    "@vercel/node": "1.8.4",
    "@vercel/python": "1.2.3",
@@ -100,7 +100,7 @@
    "@types/universal-analytics": "0.4.2",
    "@types/which": "1.3.2",
    "@types/write-json-file": "2.2.1",
-    "@vercel/frameworks": "0.1.1",
+    "@vercel/frameworks": "0.1.2-canary.0",
    "@vercel/ncc": "0.24.0",
    "@zeit/fun": "0.11.2",
    "@zeit/source-map-support": "0.6.2",
--- a/packages/now-client/package.json
+++ b/packages/now-client/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/client",
-  "version": "9.0.3",
+  "version": "9.0.4-canary.0",
  "main": "dist/index.js",
  "typings": "dist/index.d.ts",
  "homepage": "https://vercel.com",
@@ -37,7 +37,7 @@
    ]
  },
  "dependencies": {
-    "@vercel/build-utils": "2.5.4",
+    "@vercel/build-utils": "2.5.5-canary.0",
    "@zeit/fetch": "5.2.0",
    "async-retry": "1.2.3",
    "async-sema": "3.0.0",
--- a/packages/now-next/package.json
+++ b/packages/now-next/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/next",
-  "version": "2.6.31",
+  "version": "2.6.33",
  "license": "MIT",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
--- a/packages/now-next/src/index.ts
+++ b/packages/now-next/src/index.ts
@@ -655,12 +655,13 @@ export const build = async ({

    return {
      output,
-      images: imagesManifest?.images
-        ? {
-            domains: imagesManifest.images.domains,
-            sizes: imagesManifest.images.sizes,
-          }
-        : undefined,
+      images:
+        imagesManifest?.images?.loader === 'default'
+          ? {
+              domains: imagesManifest.images.domains,
+              sizes: imagesManifest.images.sizes,
+            }
+          : undefined,
      routes: [
        // User headers
        ...headers,
@@ -1723,7 +1724,12 @@ export const build = async ({
      if (nonDynamicSsg || isFallback) {
        outputPathData = outputPathData.replace(
          new RegExp(`${escapeStringRegexp(origRouteFileNoExt)}.json$`),
-          `${routeFileNoExt}.json`
+          `${routeFileNoExt}${
+            routeFileNoExt !== origRouteFileNoExt &&
+            origRouteFileNoExt === '/index'
+              ? '/index'
+              : ''
+          }.json`
        );
      }

@@ -1952,12 +1958,13 @@ export const build = async ({
          };
        })
      : undefined,
-    images: imagesManifest?.images
-      ? {
-          domains: imagesManifest.images.domains,
-          sizes: imagesManifest.images.sizes,
-        }
-      : undefined,
+    images:
+      imagesManifest?.images?.loader === 'default'
+        ? {
+            domains: imagesManifest.images.domains,
+            sizes: imagesManifest.images.sizes,
+          }
+        : undefined,
    /*
      Desired routes order
      - Runtime headers
@@ -2019,13 +2026,26 @@ export const build = async ({
                  {
                    // TODO: enable redirecting between domains, will require
                    // updating the src with the desired locales to redirect
-                    src: '/',
+                    src: `^${path.join(
+                      '/',
+                      entryDirectory
+                    )}/?(?:${i18n.locales
+                      .map(locale => escapeStringRegexp(locale))
+                      .join('|')})?/?$`,
                    locale: {
                      redirect: i18n.domains.reduce(
                        (prev: Record<string, string>, item) => {
                          prev[item.defaultLocale] = `http${
                            item.http ? '' : 's'
                          }://${item.domain}/`;
+
+                          if (item.locales) {
+                            item.locales.map(locale => {
+                              prev[locale] = `http${item.http ? '' : 's'}://${
+                                item.domain
+                              }/${locale}`;
+                            });
+                          }
                          return prev;
                        },
                        {}
--- a/packages/now-next/src/utils.ts
+++ b/packages/now-next/src/utils.ts
@@ -332,6 +332,7 @@ export type RoutesManifest = {
    domains?: Array<{
      http?: boolean;
      domain: string;
+      locales?: string[];
      defaultLocale: string;
    }>;
  };
@@ -511,9 +512,12 @@ export async function getDynamicRoutes(
  return routes;
 }

+type LoaderKey = 'imgix' | 'cloudinary' | 'akamai' | 'default';
+
 type ImagesManifest = {
  version: number;
  images: {
+    loader: LoaderKey;
    sizes: number[];
    domains: string[];
  };
--- a/packages/now-next/test/fixtures/00-i18n-support-no-shared-lambdas/next.config.js
+++ b/packages/now-next/test/fixtures/00-i18n-support-no-shared-lambdas/next.config.js
@@ -2,22 +2,20 @@ module.exports = {
  generateBuildId() {
    return 'testing-build-id';
  },
-  experimental: {
-    i18n: {
-      locales: ['nl-NL', 'nl-BE', 'nl', 'fr-BE', 'fr', 'en-US', 'en'],
-      defaultLocale: 'en-US',
-      // TODO: testing locale domains support, will require custom
-      // testing set-up as test accounts are used currently
-      domains: [
-        {
-          domain: 'example.be',
-          defaultLocale: 'nl-BE',
-        },
-        {
-          domain: 'example.fr',
-          defaultLocale: 'fr',
-        },
-      ],
-    },
+  i18n: {
+    locales: ['nl-NL', 'nl-BE', 'nl', 'fr-BE', 'fr', 'en-US', 'en'],
+    defaultLocale: 'en-US',
+    // TODO: testing locale domains support, will require custom
+    // testing set-up as test accounts are used currently
+    domains: [
+      {
+        domain: 'example.be',
+        defaultLocale: 'nl-BE',
+      },
+      {
+        domain: 'example.fr',
+        defaultLocale: 'fr',
+      },
+    ],
  },
 };
--- a/packages/now-next/test/fixtures/00-i18n-support-no-shared-lambdas/pages/not-found/fallback/[slug].js
+++ b/packages/now-next/test/fixtures/00-i18n-support-no-shared-lambdas/pages/not-found/fallback/[slug].js
@@ -26,7 +26,7 @@ export default function Page(props) {
 export const getStaticProps = ({ params, locale, locales }) => {
  if (locale === 'en' || locale === 'nl') {
    return {
-      unstable_notFound: true,
+      notFound: true,
    };
  }

--- a/packages/now-next/test/fixtures/00-i18n-support-no-shared-lambdas/pages/not-found/index.js
+++ b/packages/now-next/test/fixtures/00-i18n-support-no-shared-lambdas/pages/not-found/index.js
@@ -24,7 +24,7 @@ export default function Page(props) {
 export const getStaticProps = ({ locale, locales }) => {
  if (locale === 'en' || locale === 'nl') {
    return {
-      unstable_notFound: true,
+      notFound: true,
    };
  }

--- a/packages/now-next/test/fixtures/00-i18n-support/next.config.js
+++ b/packages/now-next/test/fixtures/00-i18n-support/next.config.js
@@ -2,22 +2,20 @@ module.exports = {
  generateBuildId() {
    return 'testing-build-id';
  },
-  experimental: {
-    i18n: {
-      locales: ['nl-NL', 'nl-BE', 'nl', 'fr-BE', 'fr', 'en-US', 'en'],
-      defaultLocale: 'en-US',
-      // TODO: testing locale domains support, will require custom
-      // testing set-up as test accounts are used currently
-      domains: [
-        {
-          domain: 'example.be',
-          defaultLocale: 'nl-BE',
-        },
-        {
-          domain: 'example.fr',
-          defaultLocale: 'fr',
-        },
-      ],
-    },
+  i18n: {
+    locales: ['nl-NL', 'nl-BE', 'nl', 'fr-BE', 'fr', 'en-US', 'en'],
+    defaultLocale: 'en-US',
+    // TODO: testing locale domains support, will require custom
+    // testing set-up as test accounts are used currently
+    domains: [
+      {
+        domain: 'example.be',
+        defaultLocale: 'nl-BE',
+      },
+      {
+        domain: 'example.fr',
+        defaultLocale: 'fr',
+      },
+    ],
  },
 };
--- a/packages/now-next/test/fixtures/00-i18n-support/now.json
+++ b/packages/now-next/test/fixtures/00-i18n-support/now.json
@@ -385,6 +385,48 @@
      "path": "/fr/not-found/fallback/first",
      "status": 200,
      "mustContain": "gsp page"
+    },
+
+    {
+      "path": "/_next/data/testing-build-id/en-US/index.json",
+      "status": 200,
+      "mustContain": "\"locale\":\"en-US\""
+    },
+    {
+      "path": "/_next/data/testing-build-id/en/index.json",
+      "status": 200,
+      "mustContain": "\"locale\":\"en\""
+    },
+    {
+      "path": "/_next/data/testing-build-id/fr/index.json",
+      "status": 200,
+      "mustContain": "\"locale\":\"fr\""
+    },
+    {
+      "path": "/_next/data/testing-build-id/nl/index.json",
+      "status": 200,
+      "mustContain": "\"locale\":\"nl\""
+    },
+
+    {
+      "path": "/_next/data/testing-build-id/en-US/gsp.json",
+      "status": 200,
+      "mustContain": "\"locale\":\"en-US\""
+    },
+    {
+      "path": "/_next/data/testing-build-id/en/gsp.json",
+      "status": 200,
+      "mustContain": "\"locale\":\"en\""
+    },
+    {
+      "path": "/_next/data/testing-build-id/fr/gsp.json",
+      "status": 200,
+      "mustContain": "\"locale\":\"fr\""
+    },
+    {
+      "path": "/_next/data/testing-build-id/nl/gsp.json",
+      "status": 200,
+      "mustContain": "\"locale\":\"nl\""
    }
  ]
 }
--- a/packages/now-next/test/fixtures/00-i18n-support/pages/not-found/fallback/[slug].js
+++ b/packages/now-next/test/fixtures/00-i18n-support/pages/not-found/fallback/[slug].js
@@ -26,7 +26,7 @@ export default function Page(props) {
 export const getStaticProps = ({ params, locale, locales }) => {
  if (locale === 'en' || locale === 'nl') {
    return {
-      unstable_notFound: true,
+      notFound: true,
    };
  }

--- a/packages/now-next/test/fixtures/00-i18n-support/pages/not-found/index.js
+++ b/packages/now-next/test/fixtures/00-i18n-support/pages/not-found/index.js
@@ -24,7 +24,7 @@ export default function Page(props) {
 export const getStaticProps = ({ locale, locales }) => {
  if (locale === 'en' || locale === 'nl') {
    return {
-      unstable_notFound: true,
+      notFound: true,
    };
  }

--- a/packages/now-next/test/fixtures/22-ssg-v2/now.json
+++ b/packages/now-next/test/fixtures/22-ssg-v2/now.json
@@ -152,6 +152,16 @@
        "x-vercel-cache": "/HIT|STALE|PRERENDER/"
      }
    },
+    {
+      "path": "/",
+      "status": 200,
+      "mustContain": "Hi"
+    },
+    {
+      "path": "/_next/data/testing-build-id/index.json",
+      "status": 200,
+      "mustContain": "\"hello\":\"index\""
+    },
    {
      "path": "/_next/data/testing-build-id/api-docs/second.json",
      "status": 200
--- a/packages/now-next/test/fixtures/22-ssg-v2/pages/index.js
+++ b/packages/now-next/test/fixtures/22-ssg-v2/pages/index.js
@@ -1 +1,9 @@
 export default () => 'Hi';
+
+export const getStaticProps = () => {
+  return {
+    props: {
+      hello: 'index',
+    },
+  };
+};
--- a/packages/now-next/test/fixtures/31-blocking-fallback/pages/fixed/[slug].js
+++ b/packages/now-next/test/fixtures/31-blocking-fallback/pages/fixed/[slug].js
@@ -19,5 +19,5 @@ export function getStaticProps({ params }) {
 }

 export function getStaticPaths() {
-  return { paths: [], fallback: 'unstable_blocking' };
+  return { paths: [], fallback: 'blocking' };
 }
--- a/packages/now-next/test/fixtures/31-blocking-fallback/pages/regenerated/[slug].js
+++ b/packages/now-next/test/fixtures/31-blocking-fallback/pages/regenerated/[slug].js
@@ -19,5 +19,5 @@ export function getStaticProps({ params }) {
 }

 export function getStaticPaths() {
-  return { paths: [], fallback: 'unstable_blocking' };
+  return { paths: [], fallback: 'blocking' };
 }
--- a/packages/redwood/package.json
+++ b/packages/redwood/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/redwood",
-  "version": "0.1.1",
+  "version": "0.1.2-canary.0",
  "main": "./dist/index.js",
  "license": "MIT",
  "homepage": "https://vercel.com/docs",
@@ -19,7 +19,7 @@
  },
  "dependencies": {
    "@netlify/zip-it-and-ship-it": "1.2.0",
-    "@vercel/frameworks": "0.1.1"
+    "@vercel/frameworks": "0.1.2-canary.0"
  },
  "devDependencies": {
    "@types/aws-lambda": "8.10.19",
Author	SHA1	Message	Date
JJ Kasper	df5aa1f10d	Publish Stable - @vercel/next@2.6.33	2020-10-27 13:41:00 -05:00
JJ Kasper	eb1ba97309	Publish Canary - @vercel/next@2.6.33-canary.0	2020-10-27 13:33:33 -05:00
JJ Kasper	8047d6de49	[next] Fix index data path for non-locale path (#5339 ) * Fix index data path for non-locale path * Add index SSG test * Update tests for canary * Correct logic check to handle default locale	2020-10-27 13:33:02 -05:00
JJ Kasper	7470ff3724	Publish Stable - @vercel/next@2.6.32	2020-10-27 09:30:43 -05:00
JJ Kasper	8340d9327c	Publish Canary - @vercel/next@2.6.32-canary.1	2020-10-27 09:11:04 -05:00
JJ Kasper	d278425810	Update tests for stabilized field (#5337 )	2020-10-27 09:05:39 -05:00
JJ Kasper	8b26bbe643	[next] Add redirecting domain specific locales (#5333 ) Co-authored-by: Joe Haddad <joe.haddad@zeit.co>	2020-10-27 11:32:08 +01:00
JJ Kasper	fa8e1e73c8	Ensure index GSP data is available at correct path (#5336 )	2020-10-27 01:51:58 -05:00
JJ Kasper	f8abcbcd9f	Remove unstable_ prefix from unstable_blocking (#5334 )	2020-10-27 00:42:11 -05:00
Andy Bitz	e18ff683b2	Publish Canary - @vercel/frameworks@0.1.2-canary.0 - @vercel/build-utils@2.5.5-canary.0 - vercel@20.1.3-canary.0 - @vercel/client@9.0.4-canary.0 - @vercel/redwood@0.1.2-canary.0	2020-10-26 16:22:53 +01:00
Andy	f28293a5a8	[frameworks] Add recommended integrations and related dependencies (#5330 ) Adds the `recommendedIntegrations` property to the frameworks list with related dependencies. Story https://app.clubhouse.io/vercel/story/13391	2020-10-26 15:10:40 +00:00
Steven	a4963a89c7	Publish Canary - @vercel/next@2.6.32-canary.0	2020-10-25 16:58:01 -04:00
Steven	21df39fe8c	[next] Image Optimization for default loader (#5321 ) We currently pass through `images` whenever its defined, but this is enabling Image Optimization in the Proxy for every Next.js project. Instead, we should check to see if the default loader is used (the same use for `next dev`) as a signal to enable this feature in the deployment. Related to https://github.com/vercel/next.js/issues/18122	2020-10-24 12:55:53 +00:00