Merge branch 'canary' into respect-cache-headers

.github/CODEOWNERS

@@ -1,6 +1,6 @@
 # Learn how to add code owners here:
 # https://help.github.com/en/articles/about-code-owners
 
-*          @timneutkens @Timer @ijjk @lfades
-/docs/     @timneutkens @Timer @ijjk @lfades @chibicode
-/examples/ @timneutkens @Timer @ijjk @lfades @chibicode
+*          @timneutkens @Timer @ijjk @lfades @divmain
+/docs/     @timneutkens @Timer @ijjk @lfades @divmain @leerob
+/examples/ @timneutkens @Timer @ijjk @lfades @divmain @leerob

.github/ISSUE_TEMPLATE/1.bug_report.yml

@@ -3,65 +3,73 @@ about: Create a bug report for the Next.js core
 title: ''
 labels: 'template: bug'
 issue_body: true
-inputs:
-  - type: description
+body:
+  - type: markdown
     attributes:
       value: Thanks for taking the time to file a bug report! Please fill out this form as completely as possible.
-  - type: description
+  - type: markdown
     attributes:
       value: If you leave out sections there is a high likelihood it will be moved to the GitHub Discussions "Help" section.
-  - type: description
+  - type: markdown
     attributes:
       value: 'Please first verify if your issue exists in the Next.js canary release line: `npm install next@canary`.'
-  - type: description
+  - type: markdown
     attributes:
       value: 'next@canary is the beta version of Next.js. It includes all features and fixes that are pending to land on the stable release line.'
   - type: input
     attributes:
       label: What version of Next.js are you using?
       description: 'For example: 10.0.1'
+    validations:
       required: true
   - type: input
     attributes:
       label: What version of Node.js are you using?
       description: 'For example: 12.0.0'
+    validations:
       required: true
   - type: input
     attributes:
       label: What browser are you using?
       description: 'For example: Chrome, Safari'
+    validations:
       required: true
   - type: input
     attributes:
       label: What operating system are you using?
       description: 'For example: macOS, Windows'
+    validations:
       required: true
   - type: input
     attributes:
       label: How are you deploying your application?
       description: 'For example: next start, next export, Vercel, Other platform'
+    validations:
       required: true
   - type: textarea
     attributes:
       label: Describe the Bug
       description: A clear and concise description of what the bug is.
+    validations:
       required: true
   - type: textarea
     attributes:
       label: Expected Behavior
       description: A clear and concise description of what you expected to happen.
+    validations:
       required: true
   - type: textarea
     attributes:
       label: To Reproduce
       description: Steps to reproduce the behavior, please provide a clear code snippets that always reproduces the issue or a GitHub repository. Screenshots can be provided in the issue body below.
+    validations:
       required: true
-  - type: description
+  - type: markdown
     attributes:
       value: Before posting the issue go through the steps you've written down to make sure the steps provided are detailed and clear.
-  - type: description
+  - type: markdown
     attributes:
       value: Contributors should be able to follow the steps provided in order to reproduce the bug.
-  - type: description
+  - type: markdown
     attributes:
       value: These steps are used to add integration tests to ensure the same issue does not happen again. Thanks in advance!

.github/ISSUE_TEMPLATE/2.example_bug_report.yml

@@ -3,64 +3,73 @@ about: Create a bug report for the examples
 title: ''
 labels: 'type: example,template: bug'
 issue_body: true
-inputs:
-  - type: description
+body:
+  - type: markdown
     attributes:
       value: Thanks for taking the time to file a examples bug report! Please fill out this form as completely as possible.
-  - type: description
+  - type: markdown
     attributes:
       value: If you leave out sections there is a high likelihood it will be moved to the GitHub Discussions "Help" section.
   - type: input
     attributes:
       label: What example does this report relate to?
       description: 'For example: with-styled-components'
+    validations:
       required: true
   - type: input
     attributes:
       label: What version of Next.js are you using?
       description: 'For example: 10.0.1'
+    validations:
       required: true
   - type: input
     attributes:
       label: What version of Node.js are you using?
       description: 'For example: 12.0.0'
+    validations:
       required: true
   - type: input
     attributes:
       label: What browser are you using?
       description: 'For example: Chrome, Safari'
+    validations:
       required: true
   - type: input
     attributes:
       label: What operating system are you using?
       description: 'For example: macOS, Windows'
+    validations:
       required: true
   - type: input
     attributes:
       label: How are you deploying your application?
       description: 'For example: next start, next export, Vercel, Other platform'
+    validations:
       required: true
   - type: textarea
     attributes:
       label: Describe the Bug
       description: A clear and concise description of what the bug is.
+    validations:
       required: true
   - type: textarea
     attributes:
       label: Expected Behavior
       description: A clear and concise description of what you expected to happen.
+    validations:
       required: true
   - type: textarea
     attributes:
       label: To Reproduce
       description: Steps to reproduce the behavior, please provide a clear code snippets that always reproduces the issue or a GitHub repository. Screenshots can be provided in the issue body below.
+    validations:
       required: true
-  - type: description
+  - type: markdown
     attributes:
       value: Before posting the issue go through the steps you've written down to make sure the steps provided are detailed and clear.
-  - type: description
+  - type: markdown
     attributes:
       value: Contributors should be able to follow the steps provided in order to reproduce the bug.
-  - type: description
+  - type: markdown
     attributes:
       value: Thanks in advance!

.github/ISSUE_TEMPLATE/3.feature_request.yml

@@ -3,25 +3,28 @@ about: Create a feature request for the Next.js core
 title: ''
 labels: 'template: story'
 issue_body: true
-inputs:
-  - type: description
+body:
+  - type: markdown
     attributes:
       value: Thanks for taking the time to file a feature request! Please fill out this form as completely as possible.
-  - type: description
+  - type: markdown
     attributes:
       value: 'Feature requests will be converted to the GitHub Discussions "Ideas" section.'
   - type: textarea
     attributes:
       label: Describe the feature you'd like to request
       description: A clear and concise description of what you want and what your use case is.
+    validations:
       required: true
   - type: textarea
     attributes:
       label: Describe the solution you'd like
       description: A clear and concise description of what you want to happen.
+    validations:
       required: true
   - type: textarea
     attributes:
       label: Describe alternatives you've considered
       description: A clear and concise description of any alternative solutions or features you've considered.
+    validations:
       required: true

.github/workflows/build_test_deploy.yml

@@ -181,7 +181,7 @@ jobs:
       - run: yarn install --check-files
         if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
 
-      - run: xvfb-run node run-tests.js test/integration/{link-ref,production,basic,async-modules,font-optimization,ssr-ctx}/test/index.test.js test/acceptance/*.test.js
+      - run: xvfb-run node run-tests.js test/integration/{fallback-modules,link-ref,production,basic,async-modules,font-optimization,ssr-ctx}/test/index.test.js test/acceptance/*.test.js
         if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
 
   testLegacyReact:

.vscode/launch.json

@@ -25,6 +25,17 @@
       "port": 9229,
       "outFiles": ["${workspaceFolder}/packages/next/dist/**/*"]
     },
+    {
+      "name": "Launch app build trace",
+      "type": "node",
+      "request": "launch",
+      "cwd": "${workspaceFolder}",
+      "runtimeExecutable": "yarn",
+      "runtimeArgs": ["run", "trace-debug", "build", "test/integration/basic"],
+      "skipFiles": ["<node_internals>/**"],
+      "port": 9229,
+      "outFiles": ["${workspaceFolder}/packages/next/dist/**/*"]
+    },
     {
       "name": "Launch app production",
       "type": "node",

bench/capture-trace.js

@@ -0,0 +1,66 @@
+const http = require('http')
+const fs = require('fs')
+
+const PORT = 9411
+const HOST = '0.0.0.0'
+
+const traces = []
+
+const onReady = () => console.log(`Listening on http://${HOST}:${PORT}`)
+const onRequest = async (req, res) => {
+  if (
+    req.method !== 'POST' ||
+    req.url !== '/api/v2/spans' ||
+    (req.headers && req.headers['content-type']) !== 'application/json'
+  ) {
+    res.writeHead(200)
+    return res.end()
+  }
+
+  try {
+    const body = JSON.parse(await getBody(req))
+    for (const traceEvent of body) {
+      traces.push(traceEvent)
+    }
+    res.writeHead(200)
+  } catch (err) {
+    console.warn(err)
+    res.writeHead(500)
+  }
+
+  res.end()
+}
+
+const getBody = (req) =>
+  new Promise((resolve, reject) => {
+    let data = ''
+    req.on('data', (chunk) => {
+      data += chunk
+    })
+    req.on('end', () => {
+      if (!req.complete) {
+        return reject('Connection terminated before body was received.')
+      }
+      resolve(data)
+    })
+    req.on('aborted', () => reject('Connection aborted.'))
+    req.on('error', () => reject('Connection error.'))
+  })
+
+const main = () => {
+  const args = process.argv.slice(2)
+  const outFile = args[0] || `./trace-${Date.now()}.json`
+
+  process.on('SIGINT', () => {
+    console.log(`\nSaving to ${outFile}...`)
+    fs.writeFileSync(outFile, JSON.stringify(traces, null, 2))
+    process.exit()
+  })
+
+  const server = http.createServer(onRequest)
+  server.listen(PORT, HOST, onReady)
+}
+
+if (require.main === module) {
+  main()
+}

docs/api-reference/next.config.js/headers.md

@@ -227,6 +227,17 @@ module.exports = {
           },
         ],
       },
+      {
+        // this gets converted to /(en|fr|de)/(.*) so will not match the top-level
+        // `/` or `/fr` routes like /:path* would
+        source: '/(.*)',
+        headers: [
+          {
+            key: 'x-hello',
+            value: 'worlld',
+          },
+        ],
+      },
     ]
   },
 }

docs/api-reference/next.config.js/redirects.md

@@ -152,6 +152,13 @@ module.exports = {
         locale: false,
         permanent: false,
       },
+      {
+        // this gets converted to /(en|fr|de)/(.*) so will not match the top-level
+        // `/` or `/fr` routes like /:path* would
+        source: '/(.*)',
+        destination: '/another',
+        permanent: false,
+      },
     ]
   },
 }

docs/api-reference/next.config.js/rewrites.md

@@ -244,6 +244,12 @@ module.exports = {
         destination: '/en/another',
         locale: false,
       },
+      {
+        // this gets converted to /(en|fr|de)/(.*) so will not match the top-level
+        // `/` or `/fr` routes like /:path* would
+        source: '/(.*)',
+        destination: '/another',
+      },
     ]
   },
 }

docs/api-reference/next/router.md

@@ -50,6 +50,7 @@ The following is the definition of the `router` object returned by both [`useRou
 - `locales`: `String[]` - All supported locales (if enabled).
 - `defaultLocale`: `String` - The current default locale (if enabled).
 - `isReady`: `boolean` - Whether the router fields are updated client-side and ready for use. Should only be used inside of `useEffect` methods and not for conditionally rendering on the server.
+- `isPreview`: `boolean` - Whether the application is currently in [preview mode](/docs/advanced-features/preview-mode.md).
 
 Additionally, the following methods are also included inside `router`:
 
@@ -71,6 +72,7 @@ router.push(url, as, options)
 - `url` - The URL to navigate to
 - `as` - Optional decorator for the URL that will be shown in the browser. Before Next.js 9.5.3 this was used for dynamic routes, check our [previous docs](https://nextjs.org/docs/tag/v9.5.2/api-reference/next/link#dynamic-routes) to see how it worked
 - `options` - Optional object with the following configuration options:
+  - `scroll`: Scroll to the top of the page after a navigation. Defaults to `true`
   - [`shallow`](/docs/routing/shallow-routing.md): Update the path of the current page without rerunning [`getStaticProps`](/docs/basic-features/data-fetching.md#getstaticprops-static-generation), [`getServerSideProps`](/docs/basic-features/data-fetching.md#getserversideprops-server-side-rendering) or [`getInitialProps`](/docs/api-reference/data-fetching/getInitialProps.md). Defaults to `false`
 
 > You don't need to use `router.push` for external URLs. [window.location](https://developer.mozilla.org/en-US/docs/Web/API/Window/location) is better suited for those cases.

docs/api-routes/dynamic-api-routes.md

@@ -17,10 +17,7 @@ For example, the API route `pages/api/post/[pid].js` has the following code:
 
 ```js
 export default function handler(req, res) {
-  const {
-    query: { pid },
-  } = req
-
+  const { pid } = req.query
   res.end(`Post: ${pid}`)
 }
 ```
@@ -69,10 +66,7 @@ An API route for `pages/api/post/[...slug].js` could look like this:
 
 ```js
 export default function handler(req, res) {
-  const {
-    query: { slug },
-  } = req
-
+  const { slug } = req.query
   res.end(`Post: ${slug.join(', ')}`)
 }
 ```

docs/api-routes/response-helpers.md

@@ -26,3 +26,5 @@ The included helpers are:
 - `res.json(json)` - Sends a JSON response. `json` must be a valid JSON object
 - `res.send(body)` - Sends the HTTP response. `body` can be a `string`, an `object` or a `Buffer`
 - `res.redirect([status,] path)` - Redirects to a specified path or URL. `status` must be a valid [HTTP status code](https://en.wikipedia.org/wiki/List_of_HTTP_status_codes). If not specified, `status` defaults to "307" "Temporary redirect".
+
+To view an example using types, check out the [TypeScript documentation](/docs/basic-features/typescript.md#api-routes).