Merge branch 'canary' into note-styles

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

@@ -64,22 +64,20 @@ if (!allowedActions.has(actionInfo.actionName) && !actionInfo.isRelease) {
       statsConfig.mainRepo = actionInfo.prRepo
     }
 
-    // clone main repository/ref
-    if (!actionInfo.skipClone) {
-      await cloneRepo(statsConfig.mainRepo, mainRepoDir, statsConfig.mainBranch)
-    }
     /* eslint-disable-next-line */
     actionInfo.commitId = await getCommitId(diffRepoDir)
     let mainNextSwcVersion
 
     if (!actionInfo.skipClone) {
+      let mainRef = statsConfig.mainBranch
+
       if (actionInfo.isRelease) {
-        logger('Release detected, resetting mainRepo to last stable tag')
-        const lastStableTag = await getLastStable(mainRepoDir, actionInfo.prRef)
+        logger('Release detected, using last stable tag')
+        const lastStableTag = await getLastStable(diffRepoDir, actionInfo.prRef)
+        mainRef = lastStableTag
         mainNextSwcVersion = lastStableTag
         if (!lastStableTag) throw new Error('failed to get last stable tag')
         console.log('using latestStable', lastStableTag)
-        await checkoutRef(lastStableTag, mainRepoDir)
 
         /* eslint-disable-next-line */
         actionInfo.lastStableTag = lastStableTag
@@ -90,12 +88,15 @@ if (!allowedActions.has(actionInfo.actionName) && !actionInfo.isRelease) {
           /* eslint-disable-next-line */
           actionInfo.commentEndpoint = `https://api.github.com/repos/${statsConfig.mainRepo}/commits/${actionInfo.commitId}/comments`
         }
-      } else if (statsConfig.autoMergeMain) {
+      }
+
+      await cloneRepo(statsConfig.mainRepo, mainRepoDir, mainRef)
+
+      if (!actionInfo.isRelease && statsConfig.autoMergeMain) {
         logger('Attempting auto merge of main branch')
         await mergeBranch(statsConfig.mainBranch, mainRepoDir, diffRepoDir)
       }
     }
-
     let mainRepoPkgPaths
     let diffRepoPkgPaths
 

.github/actions/next-stats-action/src/prepare/action-info.js

@@ -61,6 +61,10 @@ module.exports = function actionInfo() {
       (GITHUB_REF || '').includes('canary'),
   }
 
+  if (info.isRelease) {
+    info.prRef = 'canary'
+  }
+
   // get comment
   if (GITHUB_EVENT_PATH) {
     const event = require(GITHUB_EVENT_PATH)

.github/actions/next-stats-action/src/prepare/repo-setup.js

@@ -3,7 +3,6 @@ const fs = require('fs-extra')
 const exec = require('../util/exec')
 const { remove } = require('fs-extra')
 const logger = require('../util/logger')
-const semver = require('semver')
 const execa = require('execa')
 
 module.exports = (actionInfo) => {
@@ -14,21 +13,16 @@ module.exports = (actionInfo) => {
         `git clone ${actionInfo.gitRoot}${repoPath} --single-branch --branch ${branch} --depth=${depth} ${dest}`
       )
     },
-    async getLastStable(repoDir = '', ref) {
-      const { stdout } = await exec(`cd ${repoDir} && git tag -l`)
-      const tags = stdout.trim().split('\n')
-      let lastStableTag
+    async getLastStable(repoDir = '') {
+      const { stdout } = await exec(`cd ${repoDir} && git describe`)
+      const tag = stdout.trim()
 
-      for (let i = tags.length - 1; i >= 0; i--) {
-        const curTag = tags[i]
-        // stable doesn't include `-canary` or `-beta`
-        if (!curTag.includes('-') && !ref.includes(curTag)) {
-          if (!lastStableTag || semver.gt(curTag, lastStableTag)) {
-            lastStableTag = curTag
-          }
-        }
+      if (!tag || !tag.startsWith('v')) {
+        throw new Error(`Failed to get tag info ${stdout}`)
       }
-      return lastStableTag
+      const tagParts = tag.split('-canary')[0].split('.')
+      // last stable tag will always be 1 patch less than canary
+      return `${tagParts[0]}.${tagParts[1]}.${Number(tagParts[2]) - 1}`
     },
     async getCommitId(repoDir = '') {
       const { stdout } = await exec(`cd ${repoDir} && git rev-parse HEAD`)

.github/workflows/build_and_deploy.yml

@@ -166,7 +166,6 @@ jobs:
       TURBO_TEAM: 'vercel'
       TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
       TURBO_REMOTE_ONLY: 'true'
-      DATADOG_API_KEY: ${{ secrets.DATA_DOG_API_KEY }}
     steps:
       # https://github.com/actions/virtual-environments/issues/1187
       - name: tune linux network
@@ -253,12 +252,13 @@ jobs:
         run: if [[ ! -z $(ls .turbo/runs) ]]; then echo "DID_BUILD=yup" >> $GITHUB_OUTPUT; fi
 
       # Trying to upload metrics for the Turbopack to datadog's CI pipeline execution
-      - name: 'Upload turbopack build metrics'
+      - name: 'Collect turbopack build metrics'
+        id: check-turbopack-bytesize
         shell: bash
         if: ${{ steps.check-did-build.outputs.DID_BUILD == 'yup' }}
         continue-on-error: true
         run: |
-          npm install -g @datadog/datadog-ci
+          mkdir -p ./turbopack-bin-size
           shopt -s nullglob
           for filename in packages/next-swc/native/next-swc.*.node; do
             # Strip out filename to extract target triple
@@ -267,9 +267,16 @@ jobs:
             export FILENAME=${FILENAME%.node}
             export BYTESIZE=$(wc -c < $filename | xargs)
             echo "Reporting $FILENAME:$BYTESIZE for Turbopack bytesize"
-            datadog-ci metric --no-fail --level pipeline --metrics "turbopack.bytesize.$FILENAME:$BYTESIZE"
+            echo "turbopack.bytesize.$FILENAME:$BYTESIZE" > ./turbopack-bin-size/${{ matrix.settings.target }}
           done
 
+      - name: Upload turbopack bytesize artifact
+        if: ${{ steps.check-did-build.outputs.DID_BUILD == 'yup' }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: turbopack-bytesize
+          path: turbopack-bin-size/*
+
       - name: Upload swc artifact
         if: ${{ needs.build.outputs.isRelease == 'true' }}
         uses: actions/upload-artifact@v3
@@ -469,3 +476,25 @@ jobs:
       - uses: ./.github/actions/next-stats-action
         env:
           PR_STATS_COMMENT_TOKEN: ${{ secrets.PR_STATS_COMMENT_TOKEN }}
+
+  upload_turbopack_bytesize:
+    name: Upload Turbopack Bytesize trace to Datadog
+    runs-on: ubuntu-latest
+    needs: [build-native]
+    env:
+      DATADOG_API_KEY: ${{ secrets.DATA_DOG_API_KEY }}
+    steps:
+      - name: Collect bytesize traces
+        uses: actions/download-artifact@v3
+        with:
+          name: turbopack-bytesize
+          path: turbopack-bin-size
+      - name: Upload to Datadog
+        run: |
+          ls -al turbopack-bin-size
+          npm install -g @datadog/datadog-ci
+          for filename in turbopack-bin-size/*; do
+            export BYTESIZE+=" --metrics $(cat $filename)"
+          done
+          echo "Reporting $BYTESIZE"
+          datadog-ci metric --no-fail --level pipeline $BYTESIZE

docs/02-app/01-building-your-application/01-routing/03-linking-and-navigating.mdx

@@ -95,7 +95,7 @@ export function Navigation({ navLinks }) {
 
 The default behavior of `<Link>` is to [scroll to the top of the route segment that has changed](#focus-and-scroll-management). When there is an `id` defined in `href`, it will scroll to the specific `id`, similarly to a normal `<a>` tag.
 
-To prevent scrolling to the top of the route segment, set `scroll={false}` and pass the add a hashed `id` to `href`:
+To prevent scrolling to the top of the route segment, set `scroll={false}` and add a hashed `id` to `href`:
 
 ```jsx
 <Link href="/#hashid" scroll={false}>

docs/02-app/01-building-your-application/05-optimizing/01-images.mdx

@@ -18,7 +18,7 @@ related:
 
 </details>
 
-According to [Web Almanac](https://almanac.httparchive.org), images account for a huge portion of the typical website’s [page weight](https://almanac.httparchive.org/en/2022/page-weight#content-type-and-file-formats) and can have an sizable impact on your website's [LCP performance](https://almanac.httparchive.org/en/2022/performance#lcp-image-optimization).
+According to [Web Almanac](https://almanac.httparchive.org), images account for a huge portion of the typical website’s [page weight](https://almanac.httparchive.org/en/2022/page-weight#content-type-and-file-formats) and can have a sizable impact on your website's [LCP performance](https://almanac.httparchive.org/en/2022/performance#lcp-image-optimization).
 
 The Next.js Image component extends the HTML `<img>` element with features for automatic image optimization:
 

docs/02-app/02-api-reference/01-components/link.mdx

@@ -370,7 +370,7 @@ The default behavior of `Link` is to scroll to the top of the page. When there i
 
 It's common to use [Middleware](/docs/app/building-your-application/routing/middleware) for authentication or other purposes that involve rewriting the user to a different page. In order for the `<Link />` component to properly prefetch links with rewrites via Middleware, you need to tell Next.js both the URL to display and the URL to prefetch. This is required to avoid un-necessary fetches to middleware to know the correct route to prefetch.
 
-For example, if you have want to serve a `/dashboard` route that has authenticated and visitor views, you may add something similar to the following in your Middleware to redirect the user to the correct page:
+For example, if you want to serve a `/dashboard` route that has authenticated and visitor views, you may add something similar to the following in your Middleware to redirect the user to the correct page:
 
 ```js filename="middleware.js"
 export function middleware(req) {

docs/02-app/02-api-reference/04-functions/revalidatePath.mdx

@@ -27,11 +27,11 @@ export async function GET(request) {
 }
 ```
 
-**Good to know**:
-
-- `revalidatePath` is available in both [Node.js and Edge runtimes](/docs/pages/building-your-application/rendering/edge-and-nodejs-runtimes).
-- `revalidatePath` will revalidate _all segments_ under a dynamic route segment. For example, if you have a dynamic segment `/product/[id]` and you call `revalidatePath('/product/[id]')`, then all segments under `/product/[id]` will be revalidated as requested.
-- `revalidatePath` only invalidates the cache when the path is next visited. This means calling `revalidatePath` with a dynamic route segment will not immediately trigger many revalidations at once. The invalidation only happens when the path is next visited.
+> **Good to know**:
+>
+> - `revalidatePath` is available in both [Node.js and Edge runtimes](/docs/pages/building-your-application/rendering/edge-and-nodejs-runtimes).
+> - `revalidatePath` will revalidate _all segments_ under a dynamic route segment. For example, if you have a dynamic segment `/product/[id]` and you call `revalidatePath('/product/[id]')`, then all segments under `/product/[id]` will be revalidated as requested.
+> - `revalidatePath` only invalidates the cache when the path is next visited. This means calling `revalidatePath` with a dynamic route segment will not immediately trigger many revalidations at once. The invalidation only happens when the path is next visited.
 
 ## Parameters
 

lerna.json

@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "13.4.5-canary.10"
+  "version": "13.4.5"
 }

packages/create-next-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "13.4.5-canary.10",
+  "version": "13.4.5",
   "keywords": [
     "react",
     "next",

packages/eslint-config-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "13.4.5-canary.10",
+  "version": "13.4.5",
   "description": "ESLint configuration used by NextJS.",
   "main": "index.js",
   "license": "MIT",
@@ -9,7 +9,7 @@
     "directory": "packages/eslint-config-next"
   },
   "dependencies": {
-    "@next/eslint-plugin-next": "13.4.5-canary.10",
+    "@next/eslint-plugin-next": "13.4.5",
     "@rushstack/eslint-patch": "^1.1.3",
     "@typescript-eslint/parser": "^5.42.0",
     "eslint-import-resolver-node": "^0.3.6",

packages/eslint-plugin-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "13.4.5-canary.10",
+  "version": "13.4.5",
   "description": "ESLint plugin for NextJS.",
   "main": "dist/index.js",
   "license": "MIT",

packages/font/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/font",
-  "version": "13.4.5-canary.10",
+  "version": "13.4.5",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"

packages/next-bundle-analyzer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "13.4.5-canary.10",
+  "version": "13.4.5",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",

packages/next-codemod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "13.4.5-canary.10",
+  "version": "13.4.5",
   "license": "MIT",
   "repository": {
     "type": "git",

packages/next-env/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "13.4.5-canary.10",
+  "version": "13.4.5",
   "keywords": [
     "react",
     "next",

packages/next-mdx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "13.4.5-canary.10",
+  "version": "13.4.5",
   "main": "index.js",
   "license": "MIT",
   "repository": {

packages/next-plugin-storybook/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "13.4.5-canary.10",
+  "version": "13.4.5",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"

packages/next-polyfill-module/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "13.4.5-canary.10",
+  "version": "13.4.5",
   "description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
   "main": "dist/polyfill-module.js",
   "license": "MIT",

packages/next-polyfill-nomodule/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "13.4.5-canary.10",
+  "version": "13.4.5",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

packages/next-swc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "13.4.5-canary.10",
+  "version": "13.4.5",
   "private": true,
   "scripts": {
     "clean": "node ../../scripts/rm.mjs native",

packages/next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "13.4.5-canary.10",
+  "version": "13.4.5",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -83,7 +83,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "13.4.5-canary.10",
+    "@next/env": "13.4.5",
     "@swc/helpers": "0.5.1",
     "busboy": "1.6.0",
     "caniuse-lite": "^1.0.30001406",
@@ -141,11 +141,11 @@
     "@jest/types": "29.5.0",
     "@napi-rs/cli": "2.14.7",
     "@napi-rs/triples": "1.1.0",
-    "@next/polyfill-module": "13.4.5-canary.10",
-    "@next/polyfill-nomodule": "13.4.5-canary.10",
-    "@next/react-dev-overlay": "13.4.5-canary.10",
-    "@next/react-refresh-utils": "13.4.5-canary.10",
-    "@next/swc": "13.4.5-canary.10",
+    "@next/polyfill-module": "13.4.5",
+    "@next/polyfill-nomodule": "13.4.5",
+    "@next/react-dev-overlay": "13.4.5",
+    "@next/react-refresh-utils": "13.4.5",
+    "@next/swc": "13.4.5",
     "@opentelemetry/api": "1.4.1",
     "@segment/ajv-human-errors": "2.1.2",
     "@taskr/clear": "1.1.0",

packages/next/src/build/webpack-config.ts

@@ -903,10 +903,7 @@ export default async function getBaseWebpackConfig(
       // for middleware to tree shake the unused default optimized imports like "next/server".
       // This will cause some performance overhead but
       // acceptable as Babel will not be recommended.
-      [
-        getSwcLoader({ hasServerComponents: false, isServerLayer: false }),
-        getBabelLoader(),
-      ]
+      [getSwcLoader({ hasServerComponents: false }), getBabelLoader()]
 
   // Loader for API routes needs to be differently configured as it shouldn't
   // have RSC transpiler enabled, so syntax checks such as invalid imports won't

packages/next/src/build/webpack/plugins/flight-manifest-plugin.ts

@@ -219,13 +219,6 @@ export class ClientReferenceManifestPlugin {
               name: 'default',
               chunks: chunkCSS,
             }
-          } else {
-            // It is possible that there are multiple modules with the same resource,
-            // e.g. extracted by mini-css-extract-plugin. In that case we need to
-            // merge the chunks.
-            moduleReferences[exportName].chunks = [
-              ...new Set([...moduleReferences[exportName].chunks, ...chunkCSS]),
-            ]
           }
 
           return

packages/next/src/lib/metadata/get-metadata-route.ts

@@ -4,6 +4,7 @@ import { interpolateDynamicPath } from '../../server/server-utils'
 import { getNamedRouteRegex } from '../../shared/lib/router/utils/route-regex'
 import { djb2Hash } from '../../shared/lib/hash'
 import { normalizeAppPath } from '../../shared/lib/router/utils/app-paths'
+import { normalizePathSep } from '../../shared/lib/page-path/normalize-path-sep'
 
 /*
  * If there's special convention like (...) or @ in the page path,
@@ -42,7 +43,7 @@ export function fillMetadataSegment(
 
   const { name, ext } = path.parse(imageSegment)
 
-  return path.join(route, `${name}${routeSuffix}${ext}`)
+  return normalizePathSep(path.join(route, `${name}${routeSuffix}${ext}`))
 }
 
 /**