Merge branch 'canary' into snyk-fix-52c74d69110d68f2acb32a8fdb48b7d7

.eslintignore

@@ -20,9 +20,10 @@ packages/react-refresh-utils/**/*.js
 packages/react-dev-overlay/lib/**
 **/__tmp__/**
 .github/actions/next-stats-action/.work
-.github/actions/issue-validator/index.mjs
 .github/actions/issue-labeler/lib/index.js
 .github/actions/validate-docs-links/lib/index.js
+.github/actions/needs-triage/index.js
+.github/actions/*/index.mjs
 packages/next-codemod/transforms/__testfixtures__/**/*
 packages/next-codemod/transforms/__tests__/**/*
 packages/next-codemod/**/*.js

.eslintrc.json

@@ -43,36 +43,51 @@
     },
     { "files": ["**/__tests__/**"], "env": { "jest": true } },
     {
+      "extends": [
+        "plugin:@typescript-eslint/recommended",
+        "plugin:@typescript-eslint/stylistic"
+      ],
       "files": ["**/*.ts", "**/*.tsx"],
       "parser": "@typescript-eslint/parser",
       "parserOptions": {
-        "ecmaVersion": 2018,
         "sourceType": "module",
-        "ecmaFeatures": {
-          "jsx": true
-        },
         "warnOnUnsupportedTypeScriptVersion": false
       },
       "plugins": ["@typescript-eslint"],
       "rules": {
-        // Already handled by TS
-        "no-dupe-class-members": "off",
-        "no-undef": "off",
-
-        // Add TypeScript specific rules (and turn off ESLint equivalents)
-        "@typescript-eslint/consistent-type-assertions": "warn",
-        "no-array-constructor": "off",
-        "@typescript-eslint/no-array-constructor": "warn",
+        // Todo: investigate, for each of these rules, whether we want them.
+        "@typescript-eslint/array-type": "off",
+        "@typescript-eslint/ban-ts-comment": "off",
+        "@typescript-eslint/ban-tslint-comment": "off",
+        "@typescript-eslint/ban-types": "off",
+        "@typescript-eslint/class-literal-property-style": "off",
+        "@typescript-eslint/consistent-generic-constructors": "off",
+        "@typescript-eslint/consistent-indexed-object-style": "off",
+        "@typescript-eslint/consistent-type-definitions": "off",
+        "@typescript-eslint/no-empty-function": "off",
         "@typescript-eslint/no-namespace": "off",
-        "no-use-before-define": "off",
-        "@typescript-eslint/no-use-before-define": [
-          "warn",
+        "@typescript-eslint/no-shadow": "off",
+        "@typescript-eslint/no-empty-interface": "off",
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/no-inferrable-types": "off",
+        "@typescript-eslint/no-var-requires": "off",
+        "@typescript-eslint/prefer-for-of": "off",
+        "@typescript-eslint/prefer-function-type": "off",
+        "@typescript-eslint/no-this-alias": "off",
+        "@typescript-eslint/triple-slash-reference": "off",
+        "no-var": "off",
+        "prefer-const": "off",
+        "prefer-rest-params": "off",
+        "prefer-spread": "off",
+
+        // These off- or differently-configured rules work well for us.
+        "no-unused-expressions": "off",
+        "@typescript-eslint/no-unused-expressions": [
+          "error",
           {
-            "functions": true,
-            "classes": true,
-            "variables": true,
-            "enums": true,
-            "typedefs": true
+            "allowShortCircuit": true,
+            "allowTernary": true,
+            "allowTaggedTemplates": true
           }
         ],
         "no-unused-vars": "off",
@@ -83,29 +98,28 @@
             "ignoreRestSiblings": true
           }
         ],
-        "no-unused-expressions": "off",
-        "@typescript-eslint/no-unused-expressions": [
-          "error",
+        "no-use-before-define": "off",
+        "@typescript-eslint/no-use-before-define": [
+          "warn",
           {
-            "allowShortCircuit": true,
-            "allowTernary": true,
-            "allowTaggedTemplates": true
+            "functions": true,
+            "classes": true,
+            "variables": true,
+            "enums": true,
+            "typedefs": true
           }
         ],
         "no-useless-constructor": "off",
         "@typescript-eslint/no-useless-constructor": "warn",
-        "@typescript-eslint/prefer-literal-enum-member": "error",
-        "@typescript-eslint/prefer-namespace-keyword": "error"
-      },
-      "overrides": [
-        {
-          "files": ["packages/**"],
-          "rules": {
-            "jsdoc/no-types": "error",
-            "jsdoc/no-undefined-types": "error"
-          }
-        }
-      ]
+        "@typescript-eslint/prefer-literal-enum-member": "error"
+      }
+    },
+    {
+      "files": ["packages/**/*.tsx?"],
+      "rules": {
+        "jsdoc/no-types": "error",
+        "jsdoc/no-undefined-types": "error"
+      }
     },
     {
       "files": [
@@ -147,6 +161,7 @@
     },
     {
       "files": ["packages/**"],
+      "excludedFiles": ["packages/next/taskfile.js"],
       "rules": {
         "no-shadow": ["warn", { "builtinGlobals": false }],
         "import/no-extraneous-dependencies": [

.gitattributes

@@ -2,4 +2,4 @@ packages/next/bundles/** -text
 packages/next/compiled/** -text
 
 # Make next/src/build folder indexable for github search
-packages/next/src/build/** linguist-generated=false
+build/** linguist-generated=false

.github/CODEOWNERS

@@ -2,7 +2,7 @@
 # https://help.github.com/en/articles/about-code-owners
 
 
-*                                             @timneutkens @ijjk @shuding @huozhi @feedthejim
+*                                             @timneutkens @ijjk @shuding @huozhi @feedthejim @ztanner
 /.git*                                        @vercel/next-js @vercel/devex
 /docs/                                        @vercel/next-js @vercel/devex
 /errors/                                      @vercel/next-js @vercel/devex
@@ -20,6 +20,7 @@
 
 /**/*image*                                   @timneutkens @ijjk @shuding @styfle @huozhi @vercel/devex
 /**/*image*/**                                @timneutkens @ijjk @shuding @styfle @huozhi @vercel/devex
+/**/*img*                                     @timneutkens @ijjk @shuding @styfle @huozhi @vercel/devex
 /packages/next/client/use-intersection.tsx    @timneutkens @ijjk @shuding @styfle
 /packages/next/server/lib/squoosh/            @timneutkens @ijjk @shuding @styfle
 /packages/next/server/serve-static.ts         @timneutkens @ijjk @shuding @styfle @huozhi
@@ -33,4 +34,4 @@
 Cargo.toml                                    @timneutkens @ijjk @shuding @vercel/web-tooling
 Cargo.lock                                    @timneutkens @ijjk @shuding @vercel/web-tooling
 /.cargo/config.toml                           @timneutkens @ijjk @shuding @vercel/web-tooling
-/.config/nextest.toml                         @timneutkens @ijjk @shuding @vercel/web-tooling
+/.config/nextest.toml                         @timneutkens @ijjk @shuding @vercel/web-tooling

.github/ISSUE_TEMPLATE/1.bug_report.yml

@@ -55,7 +55,7 @@ body:
       description: |
         A link to a [GitHub repository](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template) or a [CodeSandbox](https://codesandbox.io/p/sandbox/github/vercel/next.js/tree/canary/examples/reproduction-template) minimal reproduction. Minimal reproductions should be created from our [bug report template with `npx create-next-app -e reproduction-template`](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template) and should include only changes that contribute to the issue.
         If a minimal reproduction can't be created please share a [replay](https://www.replay.io/) of the bug which doesn't require sharing a private repo.
-        To report an App Router related issue, you can use these templates: [CodeSandbox](https://codesandbox.io/p/sandbox/github/vercel/next.js/tree/canary/examples/reproduction-template-app-dir) or [`npx create-next-app -e reproduction-template-app-dir`](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template-app-dir)
+        To report a Pages Router related issue, you can use these templates: [CodeSandbox](https://codesandbox.io/p/sandbox/github/vercel/next.js/tree/canary/examples/reproduction-template-pages) or [`npx create-next-app -e reproduction-template-pages`](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template-pages)
     validations:
       required: true
   - type: textarea