Merge branch 'refs/heads/canary' into elef/introduce-error-builder

# Conflicts:
#	packages/next/src/client/components/app-router.tsx
#	packages/next/src/client/components/is-next-router-error.ts
#	packages/next/src/client/components/layout-router.tsx
#	packages/next/src/client/components/ui-error-boundary.tsx
#	packages/next/src/export/helpers/is-navigation-signal-error.ts
#	packages/next/src/server/app-render/app-render.tsx
#	packages/next/src/server/app-render/create-component-tree.tsx

.eslintignore

@@ -34,7 +34,7 @@ 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/**
+crates/**
 bench/nested-deps/**
 bench/nested-deps-app-router/**
 bench/heavy-npm-deps/**

.eslintrc.cli.json

@@ -0,0 +1,20 @@
+{
+  "$schema": "https://json.schemastore.org/eslintrc",
+  "extends": [".eslintrc.json"],
+  "overrides": [
+    {
+      // This override adds type-checked rules.
+      "files": ["**/*.ts", "**/*.tsx"],
+      // Linting with type-checked rules is very slow and needs a lot of memory,
+      // so we exclude non-essential files.
+      "excludedFiles": ["examples/**/*", "test/**/*", "**/*.d.ts"],
+      "parserOptions": {
+        "project": true
+      },
+      "rules": {
+        // TODO: enable in follow-up PR
+        "@typescript-eslint/no-floating-promises": "off"
+      }
+    }
+  ]
+}

.eslintrc.json

@@ -1,4 +1,9 @@
 {
+  // This is the default eslint config that is used by IDEs. It does not use
+  // computation-heavy type-checked rules to ensure maximum responsiveness while
+  // writing code. In addition, there is .eslintrc.cli.json that does use
+  // type-checked rules, and it is used when running `pnpm lint-eslint`.
+  "$schema": "https://json.schemastore.org/eslintrc",
   "root": true,
   "parser": "@babel/eslint-parser",
   "plugins": ["react", "react-hooks", "jest", "import", "jsdoc"],

.github/.react-version

@@ -0,0 +1 @@
+19.0.0-rc-6230622a1a-20240610

.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

.github/actions/next-integration-stat/package.json

@@ -21,7 +21,7 @@
     "strip-ansi": "^7.0.1"
   },
   "engines": {
-    "node": ">=18.17.0"
+    "node": ">=18.18.0"
   },
-  "packageManager": "pnpm@8.15.7"
+  "packageManager": "pnpm@9.5.0"
 }