MLH-Fellowship · pull · Mar 12, 2023 · Mar 5, 2023 · Mar 5, 2023 · Mar 5, 2023
diff --git a/.github/ISSUE_TEMPLATE/1.bug_report.yml b/.github/ISSUE_TEMPLATE/1.bug_report.yml
@@ -51,7 +51,9 @@ body:
   - type: input
     attributes:
       label: Link to the code that reproduces this issue
-      description: A link to a GitHub repository, a [StackBlitz](https://stackblitz.com/fork/github/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.
+      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)
     validations:
       required: true
   - type: textarea

diff --git a/.github/labeler.json b/.github/labeler.json
@@ -1,53 +1,65 @@
 {
   "labels": {
-    "area: examples": ["examples/**"],
-    "area: documentation": ["docs/**", "errors/**"],
     "area: create-next-app": ["packages/create-next-app/**"],
-    "type: next": [
-      "packages/next/**",
-      "packages/react-dev-overlay/**",
-      "packages/react-refresh-utils/**",
-      "packages/next-codemod/**",
-      "packages/eslint-plugin-next/**",
-      "packages/eslint-config-next/**",
-      "packages/next-env/**",
-      "packages/next-swc/**"
+    "area: documentation": ["docs/**", "errors/**"],
+    "area: examples": ["examples/**"],
+    "area: next/image": [
+      "**/*image*",
+      "**/*image*/**",
+      "packages/next/src/client/use-intersection.tsx",
+      "packages/next/src/server/lib/squoosh/",
+      "packages/next/src/server/serve-static.ts"
     ],
+    "area: Font Optimization": ["**/*font*"],
+    "area: tests": ["test/**", "bench/**"],
     "created-by: Chrome Aurora": [
-      { "type": "user", "pattern": "spanicker" },
-      { "type": "user", "pattern": "housseindjirdeh" },
+      { "type": "user", "pattern": "atcastle" },
       { "type": "user", "pattern": "devknoll" },
+      { "type": "user", "pattern": "housseindjirdeh" },
       { "type": "user", "pattern": "janicklas-ralph" },
-      { "type": "user", "pattern": "atcastle" },
+      { "type": "user", "pattern": "kara" },
       { "type": "user", "pattern": "kyliau" },
-      { "type": "user", "pattern": "kara" }
+      { "type": "user", "pattern": "spanicker" }
     ],
     "created-by: Next.js team": [
+      { "type": "user", "pattern": "acdlite" },
+      { "type": "user", "pattern": "balazsorban44" },
+      { "type": "user", "pattern": "Brooooooklyn" },
+      { "type": "user", "pattern": "feedthejim" },
+      { "type": "user", "pattern": "ForsakenHarmony" },
+      { "type": "user", "pattern": "gnoff" },
+      { "type": "user", "pattern": "hanneslund" },
+      { "type": "user", "pattern": "huozhi" },
       { "type": "user", "pattern": "ijjk" },
+      { "type": "user", "pattern": "JanKaifer" },
+      { "type": "user", "pattern": "kdy1" },
+      { "type": "user", "pattern": "kwonoj" },
+      { "type": "user", "pattern": "leerob" },
       { "type": "user", "pattern": "padmaia" },
-      { "type": "user", "pattern": "huozhi" },
+      { "type": "user", "pattern": "sebmarkbage" },
       { "type": "user", "pattern": "shuding" },
       { "type": "user", "pattern": "sokra" },
       { "type": "user", "pattern": "styfle" },
-      { "type": "user", "pattern": "leerob" },
-      { "type": "user", "pattern": "kdy1" },
       { "type": "user", "pattern": "timneutkens" },
-      { "type": "user", "pattern": "sebmarkbage" },
-      { "type": "user", "pattern": "wyattjoh" },
-      { "type": "user", "pattern": "kwonoj" },
-      { "type": "user", "pattern": "gnoff" },
-      { "type": "user", "pattern": "padmaia" },
-      { "type": "user", "pattern": "Brooooooklyn" },
-      { "type": "user", "pattern": "ForsakenHarmony" },
-      { "type": "user", "pattern": "feedthejim" },
-      { "type": "user", "pattern": "JanKaifer" },
-      { "type": "user", "pattern": "balazsorban44" },
-      { "type": "user", "pattern": "hanneslund" }
+      { "type": "user", "pattern": "wyattjoh" }
     ],
     "created-by: Next.js docs team": [
+      { "type": "user", "pattern": "ismaelrumzan" },
       { "type": "user", "pattern": "MaedahBatool" },
-      { "type": "user", "pattern": "molebox" },
-      { "type": "user", "pattern": "ismaelrumzan" }
+      { "type": "user", "pattern": "molebox" }
+    ],
+    "type: next": [
+      "packages/eslint-config-next/**",
+      "packages/eslint-plugin-next/**",
+      "packages/font/**",
+      "packages/next-bundle-analyzer/**",
+      "packages/next-codemod/**",
+      "packages/next-env/**",
+      "packages/next-mdx/**",
+      "packages/next-swc/**",
+      "packages/next/**",
+      "packages/react-dev-overlay/**",
+      "packages/react-refresh-utils/**"
     ]
   }
 }
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,25 +1,45 @@
-<!--
-Thanks for opening a PR! Your contribution is much appreciated.
+<!-- Thanks for opening a PR! Your contribution is much appreciated.
 To make sure your PR is handled as smoothly as possible we request that you follow the checklist sections below.
 Choose the right checklist for the change(s) that you're making:
--->
 
-## Bug
+## For Contributors
+
+### Improving Documentation or adding/fixing Examples
+
+- The "examples guidelines" are followed from our contributing doc https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md
+- Make sure the linting passes by running `pnpm build && pnpm lint`. See https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md
+
+### Fixing a bug
+
+- Related issues linked using `fixes #number`
+- Tests added. See: https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
+- Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md
+
+### Adding a feature
 
-- [ ] Related issues linked using `fixes #number`
-- [ ] Integration tests added
-- [ ] Errors have a helpful link attached, see [`contributing.md`](https://github.com/vercel/next.js/blob/canary/contributing.md)
+- Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR. (A discussion must be opened, see https://github.com/vercel/next.js/discussions/new?category=ideas)
+- Related issues/discussions are linked using `fixes #number`
+- e2e tests added (https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
+- Documentation added
+- Telemetry added. In case of a feature if it's used or not.
+- Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md
 
-## Feature
 
-- [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
-- [ ] Related issues linked using `fixes #number`
-- [ ] [e2e](https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs) tests added
-- [ ] Documentation added
-- [ ] Telemetry added. In case of a feature if it's used or not.
-- [ ] Errors have a helpful link attached, see [`contributing.md`](https://github.com/vercel/next.js/blob/canary/contributing.md)
 
-## Documentation / Examples
+## For Maintainers
 
-- [ ] Make sure the linting passes by running `pnpm build && pnpm lint`
-- [ ] The "examples guidelines" are followed from [our contributing doc](https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md)
+- Minimal description (aim for explaining to someone not on the team to understand the PR)
+- When linking to a Slack thread, you might want to share details of the conclusion
+- Link both the Linear (Fixes NEXT-xxx) and the GitHub issues
+- Add review comments if necessary to explain to the reviewer the logic behind a change
+
+### What?
+
+### Why?
+
+### How?
+
+Closes NEXT-
+Fixes #
+
+-->
diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml
@@ -9,7 +9,7 @@ name: Build, test, and deploy
 env:
   NAPI_CLI_VERSION: 2.14.7
   TURBO_VERSION: 1.6.3
-  RUST_TOOLCHAIN: nightly-2022-11-04
+  RUST_TOOLCHAIN: nightly-2023-03-09
   PNPM_VERSION: 7.24.3
   NODE_MAINTENANCE_VERSION: 16
   NODE_LTS_VERSION: 18
@@ -1022,6 +1022,10 @@ jobs:
   build-native-test:
     name: Build native binary for tests and metrics
     runs-on: ubuntu-latest
+    env:
+      TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+      TURBO_TEAM: 'vercel'
+
     steps:
       # https://github.com/actions/virtual-environments/issues/1187
       - name: tune linux network
@@ -1076,7 +1080,7 @@ jobs:
         if: ${{ steps.docs-change.outputs.DOCS_CHANGE == 'nope' }}
         with:
           image: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2022-10-24-x64
-          options: -e RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }} -e NAPI_CLI_VERSION=${{ env.NAPI_CLI_VERSION }} -e TURBO_VERSION=${{ env.TURBO_VERSION }} -v ${{ env.HOME }}/.cargo/git:/root/.cargo/git -v ${{ env.HOME }}/.cargo/registry:/root/.cargo/registry -v ${{ github.workspace }}:/build -w /build
+          options: -e TURBO_TOKEN=${{ env.TURBO_TOKEN }} -e TURBO_TEAM=${{ env.TURBO_TEAM }} -e RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }} -e NAPI_CLI_VERSION=${{ env.NAPI_CLI_VERSION }} -e TURBO_VERSION=${{ env.TURBO_VERSION }} -v ${{ env.HOME }}/.cargo/git:/root/.cargo/git -v ${{ env.HOME }}/.cargo/registry:/root/.cargo/registry -v ${{ github.workspace }}:/build -w /build
           # turn on some optimization while building Rust codes to prevent tests timeout
           run: |
             set -e &&

diff --git a/.github/workflows/pull_request_stats.yml b/.github/workflows/pull_request_stats.yml
@@ -7,7 +7,7 @@ name: Generate Pull Request Stats
 env:
   NAPI_CLI_VERSION: 2.14.7
   TURBO_VERSION: 1.6.3
-  RUST_TOOLCHAIN: nightly-2022-11-04
+  RUST_TOOLCHAIN: nightly-2023-03-09
   PNPM_VERSION: 7.24.3
 
 jobs:

diff --git a/docs/advanced-features/dynamic-import.md b/docs/advanced-features/dynamic-import.md
@@ -23,7 +23,7 @@ By using `next/dynamic`, the header component will not be included in the page's
 import dynamic from 'next/dynamic'
 
 const DynamicHeader = dynamic(() => import('../components/header'), {
-  loading: () => 'Loading...',
+  loading: () => <p>Loading...</p>,
 })
 
 export default function Home() {

diff --git a/errors/google-fonts-missing-subsets.md b/errors/google-fonts-missing-subsets.md
@@ -1,4 +1,4 @@
-# Missing specified subset for a `@next/font/google` font
+# Missing specified subset for a `next/font/google` font
 
 #### Why This Error Occurred
 
@@ -21,7 +21,7 @@ const inter = Inter({ subsets: ['latin'] })
 module.exports = {
   experimental: {
     fontLoaders: [
-      { loader: '@next/font/google', options: { subsets: ['latin'] } },
+      { loader: 'next/font/google', options: { subsets: ['latin'] } },
     ],
   },
 }

diff --git a/examples/app-dir-mdx/app/page.tsx b/examples/app-dir-mdx/app/page.tsx
@@ -1,5 +1,5 @@
 import Image from 'next/image'
-import { Inter } from '@next/font/google'
+import { Inter } from 'next/font/google'
 import styles from './page.module.css'
 import Content from './message.mdx'
 

diff --git a/examples/app-dir-mdx/package.json b/examples/app-dir-mdx/package.json
@@ -6,7 +6,6 @@
     "start": "next start"
   },
   "dependencies": {
-    "@next/font": "latest",
     "@next/mdx": "latest",
     "@types/mdx": "2.0.3",
     "@types/node": "18.11.18",

@@ -15,7 +15,7 @@ const ViewSource = ({ pathname }: ViewSourceProps) => (
   >
     <a
       title="View Source"
-      href={`https://github.com/vercel/next.js/tree/canary/examples/image-component/${pathname}`}
+      href={`https://github.com/vercel/next.js/blob/canary/examples/image-component/${pathname}`}
     >
       <path d="M0 0l115 115h15l12 27 108 108V0z" fill="#fff" />
       <path

diff --git a/examples/with-jest-babel/__tests__/__snapshots__/snapshot.tsx.snap b/examples/with-jest-babel/__tests__/__snapshots__/snapshot.tsx.snap
@@ -86,28 +86,16 @@ exports[`renders homepage unchanged 1`] = `
         <span
           class="logo"
         >
-          <span
-            style="box-sizing: border-box; display: inline-block; overflow: hidden; background: none; opacity: 1; border: 0px; margin: 0px; padding: 0px; position: relative; max-width: 100%;"
-          >
-            <span
-              style="box-sizing: border-box; display: block; background: none; opacity: 1; border: 0px; margin: 0px; padding: 0px; max-width: 100%;"
-            >
-              <img
-                alt=""
-                aria-hidden="true"
-                src="data:image/svg+xml,%3csvg%20xmlns=%27http://www.w3.org/2000/svg%27%20version=%271.1%27%20width=%2772%27%20height=%2716%27/%3e"
-                style="display: block; max-width: 100%; background: none; opacity: 1; border: 0px; margin: 0px; padding: 0px;"
-              />
-            </span>
-            <img
-              alt="Vercel Logo"
-              data-nimg="intrinsic"
-              decoding="async"
-              src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7"
-              style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; box-sizing: border-box; padding: 0px; margin: auto; display: block; width: 0px; height: 0px; min-width: 100%; max-width: 100%; min-height: 100%; max-height: 100%;"
-            />
-            <noscript />
-          </span>
+          <img
+            alt="Vercel Logo"
+            data-nimg="1"
+            decoding="async"
+            height="16"
+            loading="lazy"
+            src="/vercel.svg"
+            style="color: transparent;"
+            width="72"
+          />
         </span>
       </a>
     </footer>

diff --git a/examples/with-jest/__tests__/__snapshots__/snapshot.tsx.snap b/examples/with-jest/__tests__/__snapshots__/snapshot.tsx.snap
@@ -86,28 +86,16 @@ exports[`renders homepage unchanged 1`] = `
         <span
           class="logo"
         >
-          <span
-            style="box-sizing: border-box; display: inline-block; overflow: hidden; background: none; opacity: 1; border: 0px; margin: 0px; padding: 0px; position: relative; max-width: 100%;"
-          >
-            <span
-              style="box-sizing: border-box; display: block; background: none; opacity: 1; border: 0px; margin: 0px; padding: 0px; max-width: 100%;"
-            >
-              <img
-                alt=""
-                aria-hidden="true"
-                src="data:image/svg+xml,%3csvg%20xmlns=%27http://www.w3.org/2000/svg%27%20version=%271.1%27%20width=%2772%27%20height=%2716%27/%3e"
-                style="display: block; max-width: 100%; background: none; opacity: 1; border: 0px; margin: 0px; padding: 0px;"
-              />
-            </span>
-            <img
-              alt="Vercel Logo"
-              data-nimg="intrinsic"
-              decoding="async"
-              src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7"
-              style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; box-sizing: border-box; padding: 0px; margin: auto; display: block; width: 0px; height: 0px; min-width: 100%; max-width: 100%; min-height: 100%; max-height: 100%;"
-            />
-            <noscript />
-          </span>
+          <img
+            alt="Vercel Logo"
+            data-nimg="1"
+            decoding="async"
+            height="16"
+            loading="lazy"
+            src="/vercel.svg"
+            style="color: transparent;"
+            width="72"
+          />
         </span>
       </a>
     </footer>

diff --git a/examples/with-sfcc/package.json b/examples/with-sfcc/package.json
@@ -6,7 +6,6 @@
     "start": "next start"
   },
   "dependencies": {
-    "@next/font": "latest",
     "commerce-sdk": "^2.8.0",
     "next": "latest",
     "react": "^18.2.0",

diff --git a/examples/with-sfcc/pages/_app.tsx b/examples/with-sfcc/pages/_app.tsx
@@ -1,7 +1,7 @@
 import '../styles/globals.css'
 import Footer from '../components/Footer'
 import Head from 'next/head'
-import { Montserrat } from '@next/font/google'
+import { Montserrat } from 'next/font/google'
 
 const montserrat = Montserrat({
   subsets: ['latin'],

@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "13.2.4-canary.3"
+  "version": "13.2.5-canary.1"
 }
@@ -180,6 +180,7 @@
     "pixrem": "5.0.0",
     "playwright-chromium": "1.28.1",
     "plop": "3.0.5",
+    "postcss": "8.4.14",
     "postcss-nested": "4.2.1",
     "postcss-pseudoelements": "5.0.0",
     "postcss-short-size": "4.0.0",
@@ -190,11 +191,11 @@
     "random-seed": "0.3.0",
     "react": "18.2.0",
     "react-17": "npm:[email protected]",
-    "react-builtin": "npm:[email protected]41110021f-20230301",
+    "react-builtin": "npm:[email protected]3706edb81-20230308",
     "react-dom": "18.2.0",
     "react-dom-17": "npm:[email protected]",
-    "react-dom-builtin": "npm:[email protected]41110021f-20230301",
-    "react-server-dom-webpack": "18.3.0-next-41110021f-20230301",
+    "react-dom-builtin": "npm:[email protected]3706edb81-20230308",
+    "react-server-dom-webpack": "18.3.0-next-3706edb81-20230308",
     "react-ssr-prepass": "1.0.8",
     "react-virtualized": "9.22.3",
     "relay-compiler": "13.0.2",

diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "13.2.4-canary.3",
+  "version": "13.2.5-canary.1",
   "keywords": [
     "react",
     "next",