Merge remote-tracking branch 'origin' into image-component-update-fill-sizing

Author: atcastle

.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/actions/next-stats-action/package.json

@@ -13,6 +13,7 @@
     "node-fetch": "^2.6.0",
     "prettier": "^1.18.2",
     "pretty-bytes": "^5.3.0",
-    "pretty-ms": "^5.0.0"
+    "pretty-ms": "^5.0.0",
+    "semver": "7.3.4"
   }
 }

.github/actions/next-stats-action/src/index.js

@@ -74,6 +74,7 @@ if (!allowedActions.has(actionInfo.actionName) && !actionInfo.isRelease) {
         logger('Release detected, resetting mainRepo to last stable tag')
         const lastStableTag = await getLastStable(mainRepoDir, actionInfo.prRef)
         if (!lastStableTag) throw new Error('failed to get last stable tag')
+        console.log('using latestStable', lastStableTag)
         await checkoutRef(lastStableTag, mainRepoDir)
 
         /* eslint-disable-next-line */

.github/actions/next-stats-action/src/prepare/repo-setup.js

@@ -3,6 +3,7 @@ const fs = require('fs-extra')
 const exec = require('../util/exec')
 const { remove } = require('fs-extra')
 const logger = require('../util/logger')
+const semver = require('semver')
 
 module.exports = (actionInfo) => {
   return {
@@ -22,8 +23,9 @@ module.exports = (actionInfo) => {
         const curTag = tags[i]
         // stable doesn't include `-canary` or `-beta`
         if (!curTag.includes('-') && !ref.includes(curTag)) {
-          lastStableTag = curTag
-          break
+          if (!lastStableTag || semver.gt(curTag, lastStableTag)) {
+            lastStableTag = curTag
+          }
         }
       }
       return lastStableTag

.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:
@@ -282,7 +282,7 @@ jobs:
   publishRelease:
     name: Potentially publish release
     runs-on: ubuntu-latest
-    needs: [testsPass]
+    needs: build
     env:
       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
     steps:

.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()
+}