Merge branch 'canary' into fix/mark-api-as-internal

.alexrc

@@ -18,6 +18,7 @@
     "host-hostess",
     "invalid",
     "remains",
+    "special",
     "white"
   ]
 }

packages/next-swc/.cargo/config.toml → .cargo/config.toml

@@ -16,6 +16,7 @@ linker = "aarch64-linux-musl-gcc"
 rustflags = [
   "--cfg",
   "tokio_unstable",
+  "-Zshare-generics=y",
   "-Csymbol-mangling-version=v0",
   "-Ctarget-feature=-crt-static",
   "-Clink-arg=-lgcc",
@@ -28,6 +29,7 @@ linker = "arm-linux-gnueabihf-gcc"
 rustflags = [
   "--cfg",
   "tokio_unstable",
+  "-Zshare-generics=y",
   "-Csymbol-mangling-version=v0",
   "-Aclippy::too_many_arguments",
 ]

.eslintignore

@@ -1,6 +1,7 @@
 node_modules
 **/.next/**
 **/_next/**
+**/.vscode/**
 **/dist/**
 e2e-tests/**
 examples/with-eslint/**

.github/.kodiak.toml

@@ -6,7 +6,7 @@ automerge_label = "ready to land"
 require_automerge_label = false
 method = "squash"
 delete_branch_on_merge = true
-optimistic_updates = true
+optimistic_updates = false
 prioritize_ready_to_merge = true
 notify_on_conflict = false
 
@@ -16,4 +16,4 @@ body = "pull_request_body"
 include_coauthors= true
 include_pr_number = true
 body_type = "markdown"
-strip_html_comments = true
+strip_html_comments = true

.github/CODEOWNERS

@@ -1,29 +1,19 @@
 # Learn how to add code owners here:
 # https://help.github.com/en/articles/about-code-owners
 
-*                                             @timneutkens @ijjk @shuding @huozhi @feedthejim
+# Part of code owners now use Vercel Spaces
+# Search .vercel.approvers for all files
+
 /.git*                                        @vercel/next-js
-/docs/                                        @vercel/next-js @leerob
-/errors/                                      @vercel/next-js @leerob
-/examples/                                    @vercel/next-js @leerob @steven-tey
-/scripts/                                     @vercel/next-js
 /.alex*                                       @vercel/next-js @leerob
 /.eslint*                                     @vercel/next-js @leerob
 /.prettier*                                   @vercel/next-js @leerob
-/*.md                                         @vercel/next-js @leerob
-/packages/create-next-app/                    @vercel/next-js
 
 # Image Component (@styfle)
 
-/**/*image*                                   @timneutkens @ijjk @shuding @styfle
-/**/*image*/**                                @timneutkens @ijjk @shuding @styfle
+/**/*image*                                   @timneutkens @ijjk @shuding @styfle @huozhi
+/**/*image*/**                                @timneutkens @ijjk @shuding @styfle @huozhi
 /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
-/packages/next/server/config.ts               @timneutkens @ijjk @shuding @styfle
-
-# Tooling & Telemetry
-
-/packages/next/src/build/                     @timneutkens @ijjk @shuding @vercel/web-tooling @huozhi
-/packages/next/src/telemetry/                 @timneutkens @ijjk @shuding @padmaia
-/packages/next-swc/                           @timneutkens @ijjk @shuding @vercel/web-tooling
+/packages/next/server/serve-static.ts         @timneutkens @ijjk @shuding @styfle @huozhi
+/packages/next/server/config.ts               @timneutkens @ijjk @shuding @styfle @huozhi

.github/ISSUE_TEMPLATE/1.bug_report.yml

@@ -51,10 +51,11 @@ body:
         - 'TypeScript (plugin, built-in types)'
   - type: input
     attributes:
-      label: Link to the code that reproduces this issue
+      label: Link to the code that reproduces this issue or a replay of the bug
       description: |
-        A link to a GitHub repository, a [CodeSandbox](https://codesandbox.io/p/sandbox/github/vercel/next.js/tree/canary/examples/reproduction-template) or a [StackBlitz](https://stackblitz.com/fork/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.
-        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), [StackBlitz](https://stackblitz.com/fork/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)
+        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)
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/4.docs_request.yml

@@ -4,6 +4,12 @@ title: 'Docs: '
 labels:
   - 'template: documentation'
 body:
+  - type: markdown
+    attributes:
+      value: Before opening this issue to request a docs improvement, is this something you can help us with? Your contributions are welcomed and appreciated. See our [Docs Contribution Guide](https://nextjs.org/docs/community/contribution-guide) to learn how to edit the Next.js docs.
+  - type: markdown
+    attributes:
+      value: Thank you for helping us improve the docs!
   - type: textarea
     attributes:
       label: What is the improvement or update you wish to see?

.github/actions/issue-validator/canary.md

@@ -10,7 +10,7 @@ If the issue does not reproduce with the `canary` version, then it has already b
 
 ### **How can I quickly verify if my issue has been fixed in `canary`?**
 
-The safest way is to install `next@canary` in your project and test it, but you can also search through [closed Next.js issues](https://github.com/vercel/next.js/issues?q=is%3Aissue+is%3Aclosed) for duplicates or check the [Next.js releases](https://github.com/vercel/next.js/releases). You can also use the GitHub [template](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template) (preferred), or the [CodeSandbox](https://codesandbox.io/s/github/vercel/next.js/tree/canary/examples/reproduction-template) or [StackBlitz](https://stackblitz.com/fork/github/vercel/next.js/tree/canary/examples/reproduction-template) templates to create a reproduction with `canary` from scratch.
+The safest way is to install `next@canary` in your project and test it, but you can also search through [closed Next.js issues](https://github.com/vercel/next.js/issues?q=is%3Aissue+is%3Aclosed) for duplicates or check the [Next.js releases](https://github.com/vercel/next.js/releases). You can also use the GitHub templates (preferred) for [pages](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template) and [App Router](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template-app-dir), or the [CodeSandbox: `pages`](https://codesandbox.io/s/github/vercel/next.js/tree/canary/examples/reproduction-template) or [CodeSandbox: App Router](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template-app-dir) templates to create a reproduction with `canary` from scratch.
 
 ### **My issue has been open for a long time, why do I need to verify `canary` now?**
 

.github/actions/issue-validator/repro.md

@@ -2,7 +2,7 @@ We cannot recreate the issue with the provided information. **Please add a repro
 
 ### **Why was this issue marked with the `please add a complete reproduction` label?**
 
-To be able to investigate, we need access to a reproduction to identify what triggered the issue. We prefer a link to a public GitHub repository ([template](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template)), but you can also use a tool like [CodeSandbox](https://codesandbox.io/s/github/vercel/next.js/tree/canary/examples/reproduction-template) or [StackBlitz](https://stackblitz.com/fork/github/vercel/next.js/tree/canary/examples/reproduction-template).
+To be able to investigate, we need access to a reproduction to identify what triggered the issue. We prefer a link to a public GitHub repository ([template for `pages`](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template), [template for App Router](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template-app-dir)), but you can also use these templates: [CodeSandbox: `pages`](https://codesandbox.io/s/github/vercel/next.js/tree/canary/examples/reproduction-template) or [CodeSandbox: App Router](https://github.com/vercel/next.js/tree/canary/examples/reproduction-template-app-dir).
 
 To make sure the issue is resolved as quickly as possible, please make sure that the reproduction is as **minimal** as possible. This means that you should **remove unnecessary code, files, and dependencies** that do not contribute to the issue.
 

.github/actions/next-stats-action/Dockerfile

@@ -1,13 +1,20 @@
-FROM node:16-bullseye
+FROM ubuntu:22.04
 
 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/vercel/next-stats-action"
 
 COPY . /next-stats
 
+RUN apt update && apt upgrade -y
+RUN apt install unzip wget curl nano htop screen build-essential pkg-config libssl-dev git build-essential zlib1g-dev libncurses5-dev libgdbm-dev libnss3-dev libreadline-dev libffi-dev python3 moreutils jq iproute2 openssh-server sudo whois dnsutils -y
+
+RUN ln $(which python3) /usr/bin/python
+
+RUN curl -sfLS https://install-node.vercel.app/v18 | bash -s -- -f
+
 # Install node_modules
-RUN npm i -g pnpm@7.24.3
+RUN npm i -g pnpm@7.24.3 yarn@1.22.19
 RUN cd /next-stats && pnpm install --production
 
 RUN git config --global user.email 'stats@localhost'

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

@@ -8,9 +8,6 @@ const mainRepoDir = path.join(workDir, 'main-repo')
 const diffRepoDir = path.join(workDir, 'diff-repo')
 const statsAppDir = path.join(workDir, 'stats-app')
 const diffingDir = path.join(workDir, 'diff')
-const yarnEnvValues = {
-  YARN_CACHE_FOLDER: path.join(workDir, 'yarn-cache'),
-}
 const allowedConfigLocations = [
   './',
   '.stats-app',
@@ -25,6 +22,5 @@ module.exports = {
   mainRepoDir,
   diffRepoDir,
   statsAppDir,
-  yarnEnvValues,
   allowedConfigLocations,
 }

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

@@ -41,8 +41,7 @@ if (!allowedActions.has(actionInfo.actionName) && !actionInfo.isRelease) {
 
     // clone PR/newer repository/ref first to get settings
     if (!actionInfo.skipClone) {
-      await cloneRepo(actionInfo.prRepo, diffRepoDir)
-      await checkoutRef(actionInfo.prRef, diffRepoDir)
+      await cloneRepo(actionInfo.prRepo, diffRepoDir, actionInfo.prRef)
     }
 
     if (actionInfo.isRelease) {
@@ -67,8 +66,7 @@ if (!allowedActions.has(actionInfo.actionName) && !actionInfo.isRelease) {
 
     // clone main repository/ref
     if (!actionInfo.skipClone) {
-      await cloneRepo(statsConfig.mainRepo, mainRepoDir)
-      await checkoutRef(statsConfig.mainBranch, mainRepoDir)
+      await cloneRepo(statsConfig.mainRepo, mainRepoDir, statsConfig.mainBranch)
     }
     /* eslint-disable-next-line */
     actionInfo.commitId = await getCommitId(diffRepoDir)
@@ -134,6 +132,9 @@ if (!allowedActions.has(actionInfo.actionName) && !actionInfo.isRelease) {
         )
         .catch(console.error)
 
+      console.log(await exec(`ls ${path.join(__dirname, '../native')}`))
+      console.log(await exec(`cd ${dir} && ls ${dir}/packages/next-swc/native`))
+
       logger(`Linking packages in ${dir}`)
       const isMainRepo = dir === mainRepoDir
       const pkgPaths = await linkPackages({