[pull] canary from vercel:canary

.alexrc

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

.eslintignore

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

.eslintrc.json

@@ -63,7 +63,7 @@
         "@typescript-eslint/consistent-type-assertions": "warn",
         "no-array-constructor": "off",
         "@typescript-eslint/no-array-constructor": "warn",
-        "@typescript-eslint/no-namespace": "error",
+        "@typescript-eslint/no-namespace": "off",
         "no-use-before-define": "off",
         "@typescript-eslint/no-use-before-define": [
           "warn",

.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

@@ -12,18 +12,23 @@
 /.prettier*                                   @vercel/next-js @leerob
 /*.md                                         @vercel/next-js @leerob
 /packages/create-next-app/                    @vercel/next-js
+/pnpm-lock.yaml                               @vercel/next-js @vercel/web-tooling
+
+# Image Component (@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 @huozhi
+/packages/next/server/config.ts               @timneutkens @ijjk @shuding @styfle @huozhi
 
 # 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
-
-# Image Component (@styfle)
-
-/**/*image*                                   @timneutkens @ijjk @shuding @styfle
-/**/*image*/**                                @timneutkens @ijjk @shuding @styfle
-/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
+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

.github/ISSUE_TEMPLATE/1.bug_report.yml

@@ -32,28 +32,29 @@ body:
         - 'Data fetching (gS(S)P, getInitialProps)'
         - 'Dynamic imports (next/dynamic)'
         - 'ESLint (eslint-config-next)'
-        - 'Font optimization (@next/font)'
+        - 'Font optimization (next/font)'
         - 'Image optimization (next/image, next/legacy/image)'
         - 'Internationalization (i18n)'
         - 'Jest (next/jest)'
         - 'MDX (@next/mdx)'
         - 'Metadata (metadata, generateMetadata, next/head, head.js)'
         - 'Middleware / Edge (API routes, runtime)'
+        - 'Operating System (Windows, MacOS, Linux)'
         - 'Package manager (npm, pnpm, Yarn)'
         - 'Routing (next/router, next/navigation, next/link)'
         - 'Script optimization (next/script)'
         - 'Standalone mode (output: "standalone")'
-        - 'Static HTML Export (next export)'
+        - 'Static HTML Export (output: "export")'
         - 'SWC minifier (swcMinify: true)'
         - 'SWC transpilation'
         - 'Turbopack (--turbo)'
-        - 'TypeScript'
+        - 'TypeScript (plugin, built-in types)'
   - type: input
     attributes:
       label: Link to the code that reproduces this issue
       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.
+        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
@@ -90,4 +91,4 @@ body:
   - type: input
     attributes:
       label: How are you deploying your application? (if relevant)
-      description: 'For example: next start, next export, Vercel, Other platform'
+      description: 'For example: next start, Vercel, Other platform'

.github/ISSUE_TEMPLATE/2.example_bug_report.yml

@@ -34,7 +34,7 @@ body:
   - type: input
     attributes:
       label: How are you deploying your application? (if relevant)
-      description: 'For example: next start, next export, Vercel, Other platform'
+      description: 'For example: next start, Vercel, Other platform'
   - type: textarea
     attributes:
       label: Describe the Bug

.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/src/prepare/repo-setup.js

@@ -55,146 +55,111 @@ module.exports = (actionInfo) => {
       }
     },
     async linkPackages({ repoDir, nextSwcVersion }) {
-      let useTestPack = process.env.NEXT_TEST_PACK
+      const pkgPaths = new Map()
+      const pkgDatas = new Map()
+      let pkgs
 
-      if (useTestPack) {
-        execa.sync('pnpm', ['turbo', 'run', 'test-pack'], {
-          cwd: repoDir,
-          env: { NEXT_SWC_VERSION: nextSwcVersion },
-        })
-
-        const pkgPaths = new Map()
-        const pkgs = (await fs.readdir(path.join(repoDir, 'packages'))).filter(
-          (item) => !item.startsWith('.')
-        )
-
-        pkgs.forEach((pkgDirname) => {
-          const { name } = require(path.join(
-            repoDir,
-            'packages',
-            pkgDirname,
-            'package.json'
-          ))
-          pkgPaths.set(
-            name,
-            path.join(
-              repoDir,
-              'packages',
-              pkgDirname,
-              `packed-${pkgDirname}.tgz`
-            )
-          )
-        })
-        return pkgPaths
-      } else {
-        // TODO: remove after next stable release (current v13.1.2)
-        const pkgPaths = new Map()
-        const pkgDatas = new Map()
-        let pkgs
-
-        try {
-          pkgs = await fs.readdir(path.join(repoDir, 'packages'))
-        } catch (err) {
-          if (err.code === 'ENOENT') {
-            require('console').log('no packages to link')
-            return pkgPaths
-          }
-          throw err
+      try {
+        pkgs = await fs.readdir(path.join(repoDir, 'packages'))
+      } catch (err) {
+        if (err.code === 'ENOENT') {
+          require('console').log('no packages to link')
+          return pkgPaths
         }
+        throw err
+      }
 
-        for (const pkg of pkgs) {
-          const pkgPath = path.join(repoDir, 'packages', pkg)
-          const packedPkgPath = path.join(pkgPath, `${pkg}-packed.tgz`)
+      for (const pkg of pkgs) {
+        const pkgPath = path.join(repoDir, 'packages', pkg)
+        const packedPkgPath = path.join(pkgPath, `${pkg}-packed.tgz`)
 
-          const pkgDataPath = path.join(pkgPath, 'package.json')
-          if (!fs.existsSync(pkgDataPath)) {
-            require('console').log(`Skipping ${pkgDataPath}`)
-            continue
-          }
-          const pkgData = require(pkgDataPath)
-          const { name } = pkgData
-          pkgDatas.set(name, {
-            pkgDataPath,
-            pkg,
-            pkgPath,
-            pkgData,
-            packedPkgPath,
-          })
-          pkgPaths.set(name, packedPkgPath)
+        const pkgDataPath = path.join(pkgPath, 'package.json')
+        if (!fs.existsSync(pkgDataPath)) {
+          require('console').log(`Skipping ${pkgDataPath}`)
+          continue
         }
+        const pkgData = require(pkgDataPath)
+        const { name } = pkgData
+        pkgDatas.set(name, {
+          pkgDataPath,
+          pkg,
+          pkgPath,
+          pkgData,
+          packedPkgPath,
+        })
+        pkgPaths.set(name, packedPkgPath)
+      }
 
-        for (const pkg of pkgDatas.keys()) {
-          const { pkgDataPath, pkgData } = pkgDatas.get(pkg)
+      for (const pkg of pkgDatas.keys()) {
+        const { pkgDataPath, pkgData } = pkgDatas.get(pkg)
 
-          for (const pkg of pkgDatas.keys()) {
-            const { packedPkgPath } = pkgDatas.get(pkg)
-            if (!pkgData.dependencies || !pkgData.dependencies[pkg]) continue
-            pkgData.dependencies[pkg] = packedPkgPath
-          }
+        for (const pkg of pkgDatas.keys()) {
+          const { packedPkgPath } = pkgDatas.get(pkg)
+          if (!pkgData.dependencies || !pkgData.dependencies[pkg]) continue
+          pkgData.dependencies[pkg] = packedPkgPath
+        }
 
-          // make sure native binaries are included in local linking
-          if (pkg === '@next/swc') {
-            if (!pkgData.files) {
-              pkgData.files = []
-            }
-            pkgData.files.push('native/*')
-            require('console').log(
-              'using swc binaries: ',
-              await exec(`ls ${path.join(path.dirname(pkgDataPath), 'native')}`)
-            )
+        // make sure native binaries are included in local linking
+        if (pkg === '@next/swc') {
+          if (!pkgData.files) {
+            pkgData.files = []
           }
+          pkgData.files.push('native/*')
+          require('console').log(
+            'using swc binaries: ',
+            await exec(`ls ${path.join(path.dirname(pkgDataPath), 'native')}`)
+          )
+        }
 
-          if (pkg === 'next') {
-            if (nextSwcVersion) {
-              Object.assign(pkgData.dependencies, {
-                '@next/swc-linux-x64-gnu': nextSwcVersion,
-              })
+        if (pkg === 'next') {
+          if (nextSwcVersion) {
+            Object.assign(pkgData.dependencies, {
+              '@next/swc-linux-x64-gnu': nextSwcVersion,
+            })
+          } else {
+            if (pkgDatas.get('@next/swc')) {
+              pkgData.dependencies['@next/swc'] =
+                pkgDatas.get('@next/swc').packedPkgPath
             } else {
-              if (pkgDatas.get('@next/swc')) {
-                pkgData.dependencies['@next/swc'] =
-                  pkgDatas.get('@next/swc').packedPkgPath
-              } else {
-                pkgData.files.push('native/*')
-              }
+              pkgData.files.push('native/*')
             }
           }
+        }
 
-          if (pkgData?.scripts?.prepublishOnly) {
-            // There's a bug in `pnpm pack` where it will run
-            // the prepublishOnly script and that will fail.
-            // See https://github.com/pnpm/pnpm/issues/2941
-            delete pkgData.scripts.prepublishOnly
-          }
-
-          await fs.writeFile(
-            pkgDataPath,
-            JSON.stringify(pkgData, null, 2),
-            'utf8'
-          )
+        if (pkgData?.scripts?.prepublishOnly) {
+          // There's a bug in `pnpm pack` where it will run
+          // the prepublishOnly script and that will fail.
+          // See https://github.com/pnpm/pnpm/issues/2941
+          delete pkgData.scripts.prepublishOnly
         }
 
-        // wait to pack packages until after dependency paths have been updated
-        // to the correct versions
-        await Promise.all(
-          Array.from(pkgDatas.keys()).map(async (pkgName) => {
-            const { pkg, pkgPath, pkgData, packedPkgPath } =
-              pkgDatas.get(pkgName)
-            // Copied from pnpm source: https://github.com/pnpm/pnpm/blob/5a5512f14c47f4778b8d2b6d957fb12c7ef40127/releasing/plugin-commands-publishing/src/pack.ts#L96
-            const tmpTarball = path.join(
-              pkgPath,
-              `${pkgData.name.replace('@', '').replace('/', '-')}-${
-                pkgData.version
-              }.tgz`
-            )
-            await execa('pnpm', ['pack'], {
-              cwd: pkgPath,
-            })
-            await fs.copyFile(tmpTarball, packedPkgPath)
-          })
+        await fs.writeFile(
+          pkgDataPath,
+          JSON.stringify(pkgData, null, 2),
+          'utf8'
         )
-
-        return pkgPaths
       }
+
+      // wait to pack packages until after dependency paths have been updated
+      // to the correct versions
+      await Promise.all(
+        Array.from(pkgDatas.keys()).map(async (pkgName) => {
+          const { pkg, pkgPath, pkgData, packedPkgPath } = pkgDatas.get(pkgName)
+          // Copied from pnpm source: https://github.com/pnpm/pnpm/blob/5a5512f14c47f4778b8d2b6d957fb12c7ef40127/releasing/plugin-commands-publishing/src/pack.ts#L96
+          const tmpTarball = path.join(
+            pkgPath,
+            `${pkgData.name.replace('@', '').replace('/', '-')}-${
+              pkgData.version
+            }.tgz`
+          )
+          await execa('pnpm', ['pack'], {
+            cwd: pkgPath,
+          })
+          await fs.copyFile(tmpTarball, packedPkgPath)
+        })
+      )
+
+      return pkgPaths
     },
   }
 }