Merge branch 'canary' of github.com:vercel/next.js into get-stream

.alexignore

@@ -0,0 +1,2 @@
+CODE_OF_CONDUCT.md
+examples/

.alexrc

@@ -0,0 +1,21 @@
+{
+  "allow": [
+    "attacks",
+    "color",
+    "dead",
+    "execute",
+    "executed",
+    "executes",
+    "execution",
+    "executions",
+    "failed",
+    "failure",
+    "failures",
+    "fire",
+    "fires",
+    "hook",
+    "hooks",
+    "host-hostess",
+    "invalid"
+  ]
+}

.eslintignore

@@ -2,8 +2,15 @@ node_modules
 **/.next/**
 **/_next/**
 **/dist/**
+e2e-tests/**
+examples/with-eslint/**
 examples/with-typescript-eslint-jest/**
 examples/with-kea/**
+examples/with-custom-babel-config/**
+examples/with-flow/**
+examples/with-jest/**
+examples/with-mobx-state-tree/**
+examples/with-mobx/**
 packages/next/bundles/webpack/packages/*.runtime.js
 packages/next/compiled/**/*
 packages/react-refresh-utils/**/*.js
@@ -15,5 +22,10 @@ packages/next-codemod/transforms/__tests__/**/*
 packages/next-codemod/**/*.js
 packages/next-codemod/**/*.d.ts
 packages/next-env/**/*.d.ts
-test/integration/async-modules/**
-test-timings.json
+packages/create-next-app/templates/**
+test/integration/eslint/**
+test/development/basic/legacy-decorators/**/*
+test-timings.json
+packages/next-swc/crates/**
+bench/nested-deps/pages/**
+bench/nested-deps/components/**

.eslintrc.json

@@ -1,6 +1,6 @@
 {
   "root": true,
-  "parser": "babel-eslint",
+  "parser": "@babel/eslint-parser",
   "plugins": ["react", "react-hooks", "jest", "import"],
   "env": {
     "browser": true,
@@ -9,10 +9,17 @@
     "node": true
   },
   "parserOptions": {
-    "ecmaVersion": 2018,
+    "requireConfigFile": false,
     "sourceType": "module",
     "ecmaFeatures": {
       "jsx": true
+    },
+    "babelOptions": {
+      "presets": ["@babel/preset-env", "@babel/preset-react"],
+      "caller": {
+        // Eslint supports top level await when a parser for it is included. We enable the parser by default for Babel.
+        "supportsTopLevelAwait": true
+      }
     }
   },
   "settings": {
@@ -23,11 +30,15 @@
   },
   "overrides": [
     {
-      "files": ["test/**/*.test.js"],
+      "files": ["test/**/*.js", "test/**/*.ts", "**/*.test.ts"],
       "extends": ["plugin:jest/recommended"],
       "rules": {
         "jest/expect-expect": "off",
-        "jest/no-disabled-tests": "off"
+        "jest/no-disabled-tests": "off",
+        "jest/no-conditional-expect": "off",
+        "jest/valid-title": "off",
+        "jest/no-interpolation-in-snapshots": "off",
+        "jest/no-export": "off"
       }
     },
     { "files": ["**/__tests__/**"], "env": { "jest": true } },

.gitattributes

@@ -0,0 +1,2 @@
+packages/next/bundles/** -text
+packages/next/compiled/** -text

.github/.kodiak.toml

@@ -13,6 +13,7 @@ notify_on_conflict = false
 [merge.message]
 title = "pull_request_title"
 body = "pull_request_body"
+include_coauthors= true
 include_pr_number = true
 body_type = "markdown"
 strip_html_comments = true

.github/CODEOWNERS

@@ -1,6 +1,24 @@
 # 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 @ijjk @shuding @huozhi
+/.github/  @timneutkens @ijjk @shuding @styfle @huozhi @padmaia
+/docs/     @timneutkens @ijjk @shuding @styfle @huozhi @padmaia @leerob @lfades @molebox
+/examples/ @timneutkens @ijjk @shuding @leerob @lfades
+
+# SWC Build (@padmaia)
+
+/packages/next/build/   @timneutkens @ijjk @shuding @padmaia @huozhi 
+
+# Image Component (@styfle)
+
+/examples/image-component/                                   @timneutkens @ijjk @shuding @styfle
+/packages/next/build/webpack/loaders/next-image-loader.js    @timneutkens @ijjk @shuding @styfle
+/packages/next/client/image.tsx                              @timneutkens @ijjk @shuding @styfle
+/packages/next/image-types/                                  @timneutkens @ijjk @shuding @styfle
+/packages/next/server/image-config.ts                        @timneutkens @ijjk @shuding @styfle
+/packages/next/server/image-optimizer.ts                     @timneutkens @ijjk @shuding @styfle
+/packages/next/server/serve-static.ts                        @timneutkens @ijjk @shuding @styfle
+/packages/next/server/config.ts                              @timneutkens @ijjk @shuding @styfle
+/test/integration/image-optimizer/                           @timneutkens @ijjk @shuding @styfle
+/test/integration/image-component/                           @timneutkens @ijjk @shuding @styfle

.github/ISSUE_TEMPLATE/1.bug_report.yml

@@ -1,67 +1,73 @@
 name: Bug Report
-about: Create a bug report for the Next.js core
-title: ''
+description: Create a bug report for the Next.js core
 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

@@ -1,66 +1,73 @@
 name: Example Bug Report
-about: Create a bug report for the examples
-title: ''
+description: Create a bug report for the examples
 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

@@ -1,27 +1,28 @@
 name: Feature Request
-about: Create a feature request for the Next.js core
-title: ''
+description: Create a feature request for the Next.js core
 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/Dockerfile

@@ -1,8 +1,8 @@
-FROM node:10-buster
+FROM node:14-buster
 
 LABEL com.github.actions.name="Next.js PR Stats"
 LABEL com.github.actions.description="Compares stats of a PR with the main branch"
-LABEL repository="https://github.com/zeit/next-stats-action"
+LABEL repository="https://github.com/vercel/next-stats-action"
 
 COPY . /next-stats
 

.github/actions/next-stats-action/src/add-comment.js

@@ -83,7 +83,7 @@ module.exports = async function addComment(
         else if (!isGzipItem && !groupKey.match(gzipIgnoreRegex)) return
 
         if (
-          itemKey !== 'buildDuration' ||
+          !itemKey.startsWith('buildDuration') ||
           (isBenchmark && itemKey.match(/req\/sec/))
         ) {
           if (typeof mainItemVal === 'number') mainRepoTotal += mainItemVal