Merge branch 'canary' into patch-1

vercel · Dec 10, 2020 · 004a4bf · 004a4bf
2 parents 19802a7 + f4809b9
commit 004a4bf
Show file tree

Hide file tree

Showing 55 changed files with 364 additions and 78 deletions.
diff --git a/.github/workflows/cancel.yml b/.github/workflows/cancel.yml
@@ -0,0 +1,17 @@
+name: Cancel
+on:
+  pull_request_target:
+    types:
+      - edited
+      - synchronize
+
+jobs:
+  cancel:
+    name: 'Cancel Previous Runs'
+    runs-on: ubuntu-latest
+    timeout-minutes: 2
+    steps:
+      - uses: styfle/cancel-workflow-action@0.5.0
+        with:
+          workflow_id: 444921, 444987
+          access_token: ${{ github.token }}
diff --git a/docs/advanced-features/i18n-routing.md b/docs/advanced-features/i18n-routing.md
@@ -214,6 +214,12 @@ export default function IndexPage(props) {
 }
 ```
 
+## Leveraging the NEXT_LOCALE cookie
+
+Next.js supports overriding the accept-language header with a `NEXT_LOCALE=the-locale` cookie. This cookie can be set using a language switcher and then when a user comes back to the site it will leverage the locale specified in the cookie.
+
+For example, if a user prefers the locale `fr` but a `NEXT_LOCALE=en` cookie is set the `en` locale will be used instead until the cookie is removed or expired.
+
 ## Search Engine Optimization
 
 Since Next.js knows what language the user is visiting it will automatically add the `lang` attribute to the `<html>` tag.

diff --git a/errors/next-export-no-build-id.md b/errors/next-export-no-build-id.md
@@ -0,0 +1,10 @@
+# Could not find a production build
+
+#### Why This Error Occurred
+
+When running `next export` a production build is needed.
+
+#### Possible Ways to Fix It
+
+- Run `next build` to create a production build before running `next export`.
+- If your intention was to run the development server run `next dev` instead.
diff --git a/errors/production-start-no-build-id.md b/errors/production-start-no-build-id.md
@@ -0,0 +1,10 @@
+# Could not find a production build
+
+#### Why This Error Occurred
+
+When running `next start` or a custom server in production mode a production build is needed.
+
+#### Possible Ways to Fix It
+
+- Run `next build` to create a production build before booting up the production server.
+- If your intention was to run the development server run `next dev` instead.
diff --git a/examples/with-apollo/lib/apolloClient.js b/examples/with-apollo/lib/apolloClient.js
@@ -2,6 +2,7 @@ import { useMemo } from 'react'
 import { ApolloClient, HttpLink, InMemoryCache } from '@apollo/client'
 import { concatPagination } from '@apollo/client/utilities'
 import merge from 'deepmerge'
+import isEqual from 'lodash/isEqual'
 
 export const APOLLO_STATE_PROP_NAME = '__APOLLO_STATE__'
 
@@ -36,7 +37,15 @@ export function initializeApollo(initialState = null) {
     const existingCache = _apolloClient.extract()
 
     // Merge the existing cache into data passed from getStaticProps/getServerSideProps
-    const data = merge(initialState, existingCache)
+    const data = merge(initialState, existingCache, {
+      // combine arrays using object equality (like in sets)
+      arrayMerge: (destinationArray, sourceArray) => [
+        ...sourceArray,
+        ...destinationArray.filter((d) =>
+          sourceArray.every((s) => !isEqual(d, s))
+        ),
+      ],
+    })
 
     // Restore the cache with the merged data
     _apolloClient.cache.restore(data)

diff --git a/examples/with-apollo/package.json b/examples/with-apollo/package.json
@@ -9,6 +9,7 @@
   "dependencies": {
     "@apollo/client": "3.1.1",
     "deepmerge": "^4.2.2",
+    "lodash": "4.17.20",
     "graphql": "^15.3.0",
     "next": "latest",
     "prop-types": "^15.6.2",

diff --git a/examples/with-apollo/pages/client-only.js b/examples/with-apollo/pages/client-only.js
@@ -8,7 +8,7 @@ const ClientOnlyPage = (props) => (
   <App>
     <Header />
     <InfoBox>
-      ℹ️ This page shows how use Apollo only in the client. If you{' '}
+      ℹ️ This page shows how to use Apollo only in the client. If you{' '}
       <a href="/client-only">reload</a> this page, you will see a loader since
       Apollo didn't fetch any data on the server. This is useful when the page
       doesn't have SEO requirements or blocking data fetching requirements.

diff --git a/examples/with-docker/Dockerfile.multistage b/examples/with-docker/Dockerfile.multistage
@@ -14,7 +14,7 @@ RUN yarn install --production --frozen-lockfile
 
 
 # Stage 2: And then copy over node_modules, etc from that stage to the smaller base image
-FROM mhart/alpine-node:base as production
+FROM mhart/alpine-node:slim as production
 
 WORKDIR /app
 

diff --git a/examples/with-electron/README.md b/examples/with-electron/README.md
@@ -1,8 +1,8 @@
 # Electron application example
 
-This example show how you can use Next.js inside an Electron application to avoid a lot of configuration, use Next.js router as view and use server-render to speed up the initial render of the application.
+This example shows how you can use Next.js inside an Electron application to avoid a lot of configuration. It uses the Next.js router as view and server-render to speed up the initial render of the application.
 
-For development it's going to run a HTTP server and let Next.js handle routing. In production it use `next export` to pre-generate HTML static files and use them in your app instead of running an HTTP server.
+For development it's going to run an HTTP server and let Next.js handle routing. In production it uses `next export` to pre-generate HTML static files and uses them in your app instead of running an HTTP server.
 
 **You can find a detailed documentation about how to build Electron apps with Next.js [here](https://leo.im/2017/electron-next)!**
 

diff --git a/examples/with-facebook-pixel/README.md b/examples/with-facebook-pixel/README.md
@@ -1,6 +1,6 @@
 ## Example app using Facebook Pixel
 
-This example shows how to use Next.js along with Facebook Pixel. A [custom `App`](https://nextjs.org/docs/advanced-features/custom-app) is used to track route changes and send page views to Facebook Pixel. This example uses [react-facebook-pixel](https://www.npmjs.com/package/react-facebook-pixel).
+This example shows how to use Next.js along with Facebook Pixel. A custom [\_document](https://nextjs.org/docs/advanced-features/custom-document) is used to inject [base code](https://developers.facebook.com/docs/facebook-pixel/implementation/?locale=en_US). A [\_app](https://nextjs.org/docs/advanced-features/custom-app) is used to track route changes and send page views to Facebook Pixel.
 
 ## Deploy your own
 
@@ -24,6 +24,6 @@ Next, copy the `.env.local.example` file in this directory to `.env.local` (whic
 cp .env.local.example .env.local
 ```
 
-Set the `NEXT_PUBLIC_FACEBOOK_PIXEL_ID` variable in `.env.local` to match your facebook app's pixel ID. If not specified, tracking will be disabled.
+Set the `NEXT_PUBLIC_FACEBOOK_PIXEL_ID` variable in `.env.local` to match your facebook app's pixel ID.
 
 Deploy it to the cloud with [Vercel](https://vercel.com/import?filter=next.js&utm_source=github&utm_medium=readme&utm_campaign=next-example) ([Documentation](https://nextjs.org/docs/deployment)).
diff --git a/examples/with-facebook-pixel/package.json b/examples/with-facebook-pixel/package.json
@@ -9,8 +9,7 @@
   "dependencies": {
     "next": "latest",
     "react": "^16.13.1",
-    "react-dom": "^16.13.1",
-    "react-facebook-pixel": "^1.0.3"
+    "react-dom": "^16.13.1"
   },
   "license": "MIT"
 }
diff --git a/examples/with-next-translate/.gitignore b/examples/with-next-translate/.gitignore
@@ -32,6 +32,3 @@ yarn-error.log*
 
 # vercel
 .vercel
-
-# next-translate
-pages/
diff --git a/examples/with-next-translate/i18n.json b/examples/with-next-translate/i18n.json
@@ -1,9 +1,6 @@
 {
   "locales": ["en", "ca"],
   "defaultLocale": "en",
-  "currentPagesDir": "_pages",
-  "finalPagesDir": "pages",
-  "localesPath": "locales",
   "pages": {
     "*": ["common"],
     "/": ["home"]

diff --git a/examples/with-next-translate/next.config.js b/examples/with-next-translate/next.config.js
@@ -1,8 +1,3 @@
-const { locales, defaultLocale } = require('./i18n.json')
+const nextTranslate = require('next-translate')
 
-module.exports = {
-  i18n: {
-    locales,
-    defaultLocale,
-  },
-}
+module.exports = nextTranslate({})
diff --git a/examples/with-next-translate/package.json b/examples/with-next-translate/package.json
@@ -1,13 +1,13 @@
 {
   "name": "with-next-translate",
   "scripts": {
-    "dev": "next-translate && next dev",
-    "build": "next-translate && next build",
+    "dev": "next dev",
+    "build": "next build",
     "start": "next start"
   },
   "dependencies": {
-    "next": "10.0.0",
-    "next-translate": "0.19.0",
+    "next": "10.0.3",
+    "next-translate": "1.0.0",
     "react": "17.0.1",
     "react-dom": "17.0.1"
   },

diff --git a/examples/with-next-translate/_pages/index.js → examples/with-next-translate/pages/index.js b/examples/with-next-translate/_pages/index.js → examples/with-next-translate/pages/index.js
diff --git a/lerna.json b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "10.0.4-canary.2"
+  "version": "10.0.4-canary.4"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "10.0.4-canary.2",
+  "version": "10.0.4-canary.4",
   "keywords": [
     "react",
     "next",

diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "10.0.4-canary.2",
+  "version": "10.0.4-canary.4",
   "description": "ESLint plugin for NextJS.",
   "main": "lib/index.js",
   "license": "MIT",

diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "10.0.4-canary.2",
+  "version": "10.0.4-canary.4",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "10.0.4-canary.2",
+  "version": "10.0.4-canary.4",
   "license": "MIT",
   "dependencies": {
     "chalk": "4.1.0",

diff --git a/packages/next-env/package.json b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "10.0.4-canary.2",
+  "version": "10.0.4-canary.4",
   "keywords": [
     "react",
     "next",

diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "10.0.4-canary.2",
+  "version": "10.0.4-canary.4",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-plugin-google-analytics/package.json b/packages/next-plugin-google-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-google-analytics",
-  "version": "10.0.4-canary.2",
+  "version": "10.0.4-canary.4",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-google-analytics"

diff --git a/packages/next-plugin-sentry/package.json b/packages/next-plugin-sentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-sentry",
-  "version": "10.0.4-canary.2",
+  "version": "10.0.4-canary.4",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-sentry"

diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "10.0.4-canary.2",
+  "version": "10.0.4-canary.4",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"

diff --git a/packages/next-polyfill-module/package.json b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "10.0.4-canary.2",
+  "version": "10.0.4-canary.4",
   "description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
   "main": "dist/polyfill-module.js",
   "license": "MIT",

diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "10.0.4-canary.2",
+  "version": "10.0.4-canary.4",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next/README.md b/packages/next/README.md
@@ -1,4 +1,9 @@
-[![Next.js](https://assets.vercel.com/image/upload/v1538361091/repositories/next-js/next-js.png)](https://nextjs.org)
+<p align="center">
+  <a href="https://nextjs.org">
+    <img src="https://assets.vercel.com/image/upload/v1607554385/repositories/next-js/next-logo.png" height="128">
+    <h1 align="center">Next.js</h1>
+  </a>
+</p>
 
 <p align="center">
   <a aria-label="Vercel logo" href="https://vercel.com">

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -364,15 +364,6 @@ export default async function getBaseWebpackConfig(
       ...nodePathList, // Support for NODE_PATH environment variable
     ],
     alias: {
-      // These aliases make sure the wrapper module is not included in the bundles
-      // Which makes bundles slightly smaller, but also skips parsing a module that we know will result in this alias
-      'next/head': 'next/dist/next-server/lib/head.js',
-      'next/router': 'next/dist/client/router.js',
-      'next/experimental-script': config.experimental.scriptLoader
-        ? 'next/dist/client/experimental-script.js'
-        : '',
-      'next/config': 'next/dist/next-server/lib/runtime-config.js',
-      'next/dynamic': 'next/dist/next-server/lib/dynamic.js',
       next: NEXT_PROJECT_ROOT,
       ...(isWebpack5 && !isServer
         ? {

diff --git a/packages/next/cli/next-export.ts b/packages/next/cli/next-export.ts
@@ -62,7 +62,7 @@ const nextExport: cliCommand = (argv) => {
 
   exportApp(dir, options)
     .then(() => {
-      printAndExit('Export successful', 0)
+      printAndExit(`Export successful. Files written to ${options.outdir}`, 0)
     })
     .catch((err) => {
       printAndExit(err)

diff --git a/packages/next/compiled/terser-webpack-plugin/cjs.js b/packages/next/compiled/terser-webpack-plugin/cjs.js
diff --git a/packages/next/compiled/terser/LICENSE b/packages/next/compiled/terser/LICENSE
@@ -1,4 +1,4 @@
-UglifyJS is released under the BSD license:
+Terser is released under the BSD license:
 
 Copyright 2012-2018 (c) Mihai Bazon <mihai.bazon@gmail.com>
 

diff --git a/packages/next/compiled/terser/bundle.min.js b/packages/next/compiled/terser/bundle.min.js
diff --git a/packages/next/export/index.ts b/packages/next/export/index.ts
@@ -164,9 +164,11 @@ export default async function exportApp(
     Log.info(`using build directory: ${distDir}`)
   }
 
-  if (!existsSync(distDir)) {
+  const buildIdFile = join(distDir, BUILD_ID_FILE)
+
+  if (!existsSync(buildIdFile)) {
     throw new Error(
-      `Build directory ${distDir} does not exist. Make sure you run "next build" before running "next start" or "next export".`
+      `Could not find a production build in the '${distDir}' directory. Try building your app with 'next build' before starting the static export. https://err.sh/vercel/next.js/next-export-no-build-id`
     )
   }
 
@@ -186,7 +188,7 @@ export default async function exportApp(
     )
   }
 
-  const buildId = readFileSync(join(distDir, BUILD_ID_FILE), 'utf8')
+  const buildId = readFileSync(buildIdFile, 'utf8')
   const pagesManifest =
     !options.pages &&
     (require(join(

diff --git a/packages/next/lib/load-custom-routes.ts b/packages/next/lib/load-custom-routes.ts
@@ -466,12 +466,14 @@ export default async function loadCustomRoutes(
         destination: '/:file',
         permanent: true,
         locale: config.i18n ? false : undefined,
+        internal: true,
       } as Redirect,
       {
         source: '/:notfile((?!\\.well-known(?:/.*)?)(?:[^/]+/)*[^/\\.]+)',
         destination: '/:notfile/',
         permanent: true,
         locale: config.i18n ? false : undefined,
+        internal: true,
       } as Redirect
     )
     if (config.basePath) {
@@ -481,6 +483,7 @@ export default async function loadCustomRoutes(
         permanent: true,
         basePath: false,
         locale: config.i18n ? false : undefined,
+        internal: true,
       } as Redirect)
     }
   } else {
@@ -489,6 +492,7 @@ export default async function loadCustomRoutes(
       destination: '/:path+',
       permanent: true,
       locale: config.i18n ? false : undefined,
+      internal: true,
     } as Redirect)
     if (config.basePath) {
       redirects.unshift({
@@ -497,6 +501,7 @@ export default async function loadCustomRoutes(
         permanent: true,
         basePath: false,
         locale: config.i18n ? false : undefined,
+        internal: true,
       } as Redirect)
     }
   }

diff --git a/packages/next/next-server/lib/post-process.ts b/packages/next/next-server/lib/post-process.ts
@@ -1,7 +1,8 @@
 import { parse, HTMLElement } from 'node-html-parser'
 import { OPTIMIZED_FONT_PROVIDERS } from './constants'
 
-const MIDDLEWARE_TIME_BUDGET = 10
+const MIDDLEWARE_TIME_BUDGET =
+  parseInt(process.env.__POST_PROCESS_MIDDLEWARE_TIME_BUDGET || '', 10) || 10
 const MAXIMUM_IMAGE_PRELOADS = 2
 const IMAGE_PRELOAD_SIZE_THRESHOLD = 2500
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,6 +32,3 @@ yarn-error.log* @@
     # vercel
     .vercel
-    # next-translate
-    pages/