[pull] canary from vercel:canary

.cargo/config.toml

@@ -18,6 +18,9 @@ rustflags = ["-C", "target-feature=+crt-static"]
 [target.i686-pc-windows-msvc]
 rustflags = ["-C", "target-feature=+crt-static"]
 
+[target.aarch64-pc-windows-msvc]
+linker = "rust-lld"
+
 [target.aarch64-apple-darwin]
 linker = "rust-lld"
 

.devcontainer/Dockerfile

@@ -1,5 +1,5 @@
 # [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
-ARG VARIANT=16-bullseye
+ARG VARIANT=20-bullseye
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
 
 # [Optional] Uncomment this section to install additional OS packages.

.devcontainer/base.Dockerfile

@@ -1,5 +1,5 @@
 # [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
-ARG VARIANT=16-bullseye
+ARG VARIANT=20-bullseye
 FROM node:${VARIANT}
 
 # [Option] Install zsh

.devcontainer/devcontainer.json

@@ -8,7 +8,7 @@
     // Append -bullseye or -buster to pin to an OS version.
     // Use -bullseye variants on local arm64/Apple Silicon.
     "args": {
-      "VARIANT": "16-bullseye"
+      "VARIANT": "20-bullseye"
     }
   },
   // Configure tool-specific properties.

.eslintignore

@@ -27,15 +27,17 @@ packages/next-codemod/**/*.js
 packages/next-codemod/**/*.d.ts
 packages/next-env/**/*.d.ts
 packages/create-next-app/templates/**
-test/integration/eslint/**
-test/integration/script-loader/**/*
-test/development/basic/legacy-decorators/**/*
+test/integration/eslint/**/*.js
+test/integration/script-loader/**/*.js
+test/development/basic/legacy-decorators/**/*.js
 test/production/emit-decorator-metadata/**/*.js
+!test/**/*.test.*
 test/e2e/app-dir/rsc-errors/app/swc/use-client/page.js
 test-timings.json
 packages/next-swc/crates/**
 bench/nested-deps/**
 bench/nested-deps-app-router/**
+bench/heavy-npm-deps/**
 packages/next-bundle-analyzer/index.d.ts
 examples/with-typescript-graphql/lib/gql/
 test/development/basic/hmr/components/parse-error.js

.eslintrc.json

@@ -93,7 +93,7 @@
         ],
         "no-unused-vars": "off",
         "@typescript-eslint/no-unused-vars": [
-          "warn",
+          "error",
           {
             "args": "none",
             "ignoreRestSiblings": true
@@ -102,7 +102,7 @@
         "no-use-before-define": "off",
         "no-useless-constructor": "off",
         "@typescript-eslint/no-use-before-define": "off",
-        "@typescript-eslint/no-useless-constructor": "warn",
+        "@typescript-eslint/no-useless-constructor": "error",
         "@typescript-eslint/prefer-literal-enum-member": "error"
       }
     },
@@ -150,7 +150,7 @@
         "packages/next/webpack.config.js"
       ],
       "rules": {
-        "no-shadow": ["warn", { "builtinGlobals": false }],
+        "no-shadow": ["error", { "builtinGlobals": false }],
         "import/no-extraneous-dependencies": [
           "error",
           { "devDependencies": false }
@@ -162,9 +162,9 @@
       "rules": {
         // Note: you must disable the base rule as it can report incorrect errors
         "no-shadow": "off",
-        "@typescript-eslint/no-shadow": ["warn", { "builtinGlobals": false }],
+        "@typescript-eslint/no-shadow": ["error", { "builtinGlobals": false }],
         "@typescript-eslint/no-unused-vars": [
-          "warn",
+          "error",
           {
             "args": "all",
             "argsIgnorePattern": "^_",
@@ -211,39 +211,39 @@
     }
   ],
   "rules": {
-    "array-callback-return": "warn",
-    "default-case": ["warn", { "commentPattern": "^no default$" }],
-    "dot-location": ["warn", "property"],
-    "eqeqeq": ["warn", "smart"],
-    "new-parens": "warn",
-    "no-array-constructor": "warn",
-    "no-caller": "warn",
-    "no-cond-assign": ["warn", "except-parens"],
-    "no-const-assign": "warn",
-    "no-control-regex": "warn",
-    "no-delete-var": "warn",
-    "no-dupe-args": "warn",
-    "no-dupe-class-members": "warn",
-    "no-dupe-keys": "warn",
-    "no-duplicate-case": "warn",
-    "no-empty-character-class": "warn",
-    "no-empty-pattern": "warn",
-    "no-eval": "warn",
-    "no-ex-assign": "warn",
-    "no-extend-native": "warn",
-    "no-extra-bind": "warn",
-    "no-extra-label": "warn",
-    "no-fallthrough": "warn",
-    "no-func-assign": "warn",
-    "no-implied-eval": "warn",
-    "no-invalid-regexp": "warn",
-    "no-iterator": "warn",
-    "no-label-var": "warn",
-    "no-labels": ["warn", { "allowLoop": true, "allowSwitch": false }],
-    "no-lone-blocks": "warn",
-    "no-loop-func": "warn",
+    "array-callback-return": "error",
+    "default-case": ["error", { "commentPattern": "^no default$" }],
+    "dot-location": ["error", "property"],
+    "eqeqeq": ["error", "smart"],
+    "new-parens": "error",
+    "no-array-constructor": "error",
+    "no-caller": "error",
+    "no-cond-assign": ["error", "except-parens"],
+    "no-const-assign": "error",
+    "no-control-regex": "error",
+    "no-delete-var": "error",
+    "no-dupe-args": "error",
+    "no-dupe-class-members": "error",
+    "no-dupe-keys": "error",
+    "no-duplicate-case": "error",
+    "no-empty-character-class": "error",
+    "no-empty-pattern": "error",
+    "no-eval": "error",
+    "no-ex-assign": "error",
+    "no-extend-native": "error",
+    "no-extra-bind": "error",
+    "no-extra-label": "error",
+    "no-fallthrough": "error",
+    "no-func-assign": "error",
+    "no-implied-eval": "error",
+    "no-invalid-regexp": "error",
+    "no-iterator": "error",
+    "no-label-var": "error",
+    "no-labels": ["error", { "allowLoop": true, "allowSwitch": false }],
+    "no-lone-blocks": "error",
+    "no-loop-func": "error",
     "no-mixed-operators": [
-      "warn",
+      "error",
       {
         "groups": [
           ["&", "|", "^", "~", "<<", ">>", ">>>"],
@@ -254,37 +254,37 @@
         "allowSamePrecedence": false
       }
     ],
-    "no-multi-str": "warn",
-    "no-native-reassign": "warn",
-    "no-negated-in-lhs": "warn",
-    "no-new-func": "warn",
-    "no-new-object": "warn",
-    "no-new-symbol": "warn",
-    "no-new-wrappers": "warn",
-    "no-obj-calls": "warn",
-    "no-octal": "warn",
-    "no-octal-escape": "warn",
-    "no-regex-spaces": "warn",
+    "no-multi-str": "error",
+    "no-native-reassign": "error",
+    "no-negated-in-lhs": "error",
+    "no-new-func": "error",
+    "no-new-object": "error",
+    "no-new-symbol": "error",
+    "no-new-wrappers": "error",
+    "no-obj-calls": "error",
+    "no-octal": "error",
+    "no-octal-escape": "error",
+    "no-regex-spaces": "error",
     "no-restricted-syntax": [
-      "warn",
+      "error",
       "WithStatement",
       {
         "message": "substr() is deprecated, use slice() or substring() instead",
         "selector": "MemberExpression > Identifier[name='substr']"
       }
     ],
-    "no-script-url": "warn",
-    "no-self-assign": "warn",
-    "no-self-compare": "warn",
-    "no-sequences": "warn",
-    "no-shadow-restricted-names": "warn",
-    "no-sparse-arrays": "warn",
+    "no-script-url": "error",
+    "no-self-assign": "error",
+    "no-self-compare": "error",
+    "no-sequences": "error",
+    "no-shadow-restricted-names": "error",
+    "no-sparse-arrays": "error",
     "no-template-curly-in-string": "error",
-    "no-this-before-super": "warn",
-    "no-throw-literal": "warn",
+    "no-this-before-super": "error",
+    "no-throw-literal": "error",
     "no-undef": "error",
-    "no-unexpected-multiline": "warn",
-    "no-unreachable": "warn",
+    "no-unexpected-multiline": "error",
+    "no-unreachable": "error",
     "no-unused-expressions": [
       "error",
       {
@@ -293,64 +293,64 @@
         "allowTaggedTemplates": true
       }
     ],
-    "no-unused-labels": "warn",
+    "no-unused-labels": "error",
     "no-unused-vars": [
-      "warn",
+      "error",
       {
         "args": "none",
         "ignoreRestSiblings": true
       }
     ],
     "no-use-before-define": "off",
-    "no-useless-computed-key": "warn",
-    "no-useless-concat": "warn",
-    "no-useless-constructor": "warn",
-    "no-useless-escape": "warn",
+    "no-useless-computed-key": "error",
+    "no-useless-concat": "error",
+    "no-useless-constructor": "error",
+    "no-useless-escape": "error",
     "no-useless-rename": [
-      "warn",
+      "error",
       {
         "ignoreDestructuring": false,
         "ignoreImport": false,
         "ignoreExport": false
       }
     ],
-    "no-with": "warn",
-    "no-whitespace-before-property": "warn",
-    "react-hooks/exhaustive-deps": "warn",
-    "require-yield": "warn",
-    "rest-spread-spacing": ["warn", "never"],
-    "strict": ["warn", "never"],
-    "unicode-bom": ["warn", "never"],
-    "use-isnan": "warn",
-    "valid-typeof": "warn",
-    "getter-return": "warn",
-    "react/forbid-foreign-prop-types": ["warn", { "allowInPropTypes": true }],
-    "react/jsx-no-comment-textnodes": "warn",
-    "react/jsx-no-duplicate-props": "warn",
-    "react/jsx-no-target-blank": "warn",
+    "no-with": "error",
+    "no-whitespace-before-property": "error",
+    "react-hooks/exhaustive-deps": "error",
+    "require-yield": "error",
+    "rest-spread-spacing": ["error", "never"],
+    "strict": ["error", "never"],
+    "unicode-bom": ["error", "never"],
+    "use-isnan": "error",
+    "valid-typeof": "error",
+    "getter-return": "error",
+    "react/forbid-foreign-prop-types": ["error", { "allowInPropTypes": true }],
+    "react/jsx-no-comment-textnodes": "error",
+    "react/jsx-no-duplicate-props": "error",
+    "react/jsx-no-target-blank": "error",
     "react/jsx-no-undef": "error",
     "react/jsx-pascal-case": [
-      "warn",
+      "error",
       {
         "allowAllCaps": true,
         "ignore": []
       }
     ],
-    "react/jsx-uses-react": "warn",
-    "react/jsx-uses-vars": "warn",
-    "react/no-danger-with-children": "warn",
-    "react/no-deprecated": "warn",
-    "react/no-direct-mutation-state": "warn",
-    "react/no-is-mounted": "warn",
+    "react/jsx-uses-react": "error",
+    "react/jsx-uses-vars": "error",
+    "react/no-danger-with-children": "error",
+    "react/no-deprecated": "error",
+    "react/no-direct-mutation-state": "error",
+    "react/no-is-mounted": "error",
     "react/no-typos": "error",
     "react/react-in-jsx-scope": "off",
     "react/require-render-return": "error",
-    "react/style-prop-object": "warn",
+    "react/style-prop-object": "error",
     "react-hooks/rules-of-hooks": "error",
-    // "@typescript-eslint/non-nullable-type-assertion-style": "warn",
-    "@typescript-eslint/prefer-as-const": "warn",
+    // "@typescript-eslint/non-nullable-type-assertion-style": "error",
+    "@typescript-eslint/prefer-as-const": "error",
     "@typescript-eslint/no-redeclare": [
-      "warn",
+      "error",
       { "builtinGlobals": false, "ignoreDeclarationMerge": true }
     ]
   }

.git-blame-ignore-revs

@@ -3,4 +3,10 @@
 # https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
 
 # chore(examples): use default prettier for examples/templates (#60530)
-4466ba436b996263307171d344cca199e8087744
+4466ba436b996263307171d344cca199e8087744
+
+# chore: update prettier to 3.2.5 (#65092)
+64b718c6618b6c419872abbf22163ae543ac259e
+
+# Replace createNextDescribe with nextTestSetup
+c6320ed87ab41eee6f3ac54352ad02a239f329b2

.github/CODEOWNERS

@@ -1,44 +1,2 @@
 # Learn how to add code owners here:
 # https://help.github.com/en/articles/about-code-owners
-
-
-*                                             @timneutkens @ijjk @shuding @huozhi @feedthejim @ztanner @wyattjoh
-/.git*                                        @vercel/next-js @vercel/devex
-/docs/                                        @vercel/next-js @vercel/devex
-/errors/                                      @vercel/next-js @vercel/devex
-/examples/                                    @vercel/next-js @vercel/devex
-/scripts/                                     @vercel/next-js
-/.alex*                                       @vercel/next-js @leerob
-/.eslint*                                     @vercel/next-js @leerob
-/.prettier*                                   @vercel/next-js @leerob
-/*.md                                         @vercel/next-js @vercel/devex
-/*.mdx                                        @vercel/next-js @vercel/devex
-/packages/create-next-app/                    @vercel/next-js
-/pnpm-lock.yaml                               @vercel/next-js @vercel/turbopack
-
-# Next.js CLI
-
-/packages/next/src/bin                        @timneutkens @ijjk @shuding @samcx
-/packages/next/src/cli                        @timneutkens @ijjk @shuding @samcx
-
-# Image Component (@styfle)
-
-/**/*image*                                   @timneutkens @ijjk @shuding @styfle @huozhi @ztanner @vercel/devex
-/**/*image*/**                                @timneutkens @ijjk @shuding @styfle @huozhi @ztanner @vercel/devex
-/**/*img*                                     @timneutkens @ijjk @shuding @styfle @huozhi @ztanner @vercel/devex
-/packages/next/client/use-intersection.tsx    @timneutkens @ijjk @shuding @styfle
-/packages/next/server/serve-static.ts         @timneutkens @ijjk @shuding @styfle @huozhi @ztanner
-/packages/next/server/config.ts               @timneutkens @ijjk @shuding @styfle @huozhi @ztanner
-
-# Tooling & Telemetry
-
-/packages/next/src/build/                                        @timneutkens @ijjk @shuding @huozhi @ztanner @feedthejim @vercel/turbopack
-/packages/next/src/server/lib/router-utils/setup-dev-bundler.ts  @timneutkens @ijjk @shuding @huozhi @feedthejim @ztanner @wyattjoh @vercel/turbopack
-/packages/next/src/telemetry/                                    @timneutkens @ijjk @shuding @padmaia
-/packages/next-swc/                                              @timneutkens @ijjk @shuding @huozhi @vercel/turbopack
-Cargo.toml                                                       @timneutkens @ijjk @shuding @huozhi @vercel/turbopack
-Cargo.lock                                                       @timneutkens @ijjk @shuding @huozhi @vercel/turbopack
-/.cargo/config.toml                                              @timneutkens @ijjk @shuding @huozhi @vercel/turbopack
-/.config/nextest.toml                                            @timneutkens @ijjk @shuding @huozhi @vercel/turbopack
-/test/build-turbopack-dev-tests-manifest.js                          @timneutkens @ijjk @shuding @huozhi @vercel/turbopack
-/test/turbopack-dev-tests-manifest.json                              @timneutkens @ijjk @shuding @huozhi @vercel/turbopack