Merge branch 'canary' into correctly-rethrow-instrumentation-load-error

.git-blame-ignore-revs

@@ -3,4 +3,7 @@
 # https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
 
 # chore(examples): use default prettier for examples/templates (#60530)
-4466ba436b996263307171d344cca199e8087744
+4466ba436b996263307171d344cca199e8087744
+
+# chore: update prettier to 3.2.5 (#65092)
+64b718c6618b6c419872abbf22163ae543ac259e

.github/actions/next-integration-stat/src/index.ts

@@ -447,29 +447,32 @@ async function getTestResultDiffBase(
 
   // Find the latest test result tree, iterate results file names to find out the latest one.
   // Filename follow ${yyyyMMddHHmm}-${sha}.json format.
-  const actualTestResultTree = testResultJsonTree.reduce((acc, value) => {
-    const dateStr = value.path?.split('-')[0].match(/(....)(..)(..)(..)(..)/)
+  const actualTestResultTree = testResultJsonTree.reduce(
+    (acc, value) => {
+      const dateStr = value.path?.split('-')[0].match(/(....)(..)(..)(..)(..)/)
 
-    if (!dateStr || dateStr.length < 5) {
-      return acc
-    }
+      if (!dateStr || dateStr.length < 5) {
+        return acc
+      }
 
-    const date = new Date(
-      dateStr![1] as any,
-      (dateStr![2] as any) - 1,
-      dateStr![3] as any,
-      dateStr![4] as any,
-      dateStr![5] as any
-    )
-    if (!acc) {
-      return {
-        date,
-        value,
+      const date = new Date(
+        dateStr![1] as any,
+        (dateStr![2] as any) - 1,
+        dateStr![3] as any,
+        dateStr![4] as any,
+        dateStr![5] as any
+      )
+      if (!acc) {
+        return {
+          date,
+          value,
+        }
       }
-    }
 
-    return acc.date >= date ? acc : { date, value }
-  }, null as any as { date: Date; value: (typeof testResultJsonTree)[0] })
+      return acc.date >= date ? acc : { date, value }
+    },
+    null as any as { date: Date; value: (typeof testResultJsonTree)[0] }
+  )
 
   if (!actualTestResultTree || !actualTestResultTree?.value?.sha) {
     console.log('There is no test results json stored in the base yet')

.github/actions/next-repo-info/src/popular-issues.mjs

@@ -10,7 +10,7 @@ function generateBlocks(issues) {
       type: 'section',
       text: {
         type: 'mrkdwn',
-        text: '*A list of the top 15 issues sorted by the most reactions over the last 90 days.*\n_Note: This :github2: <https://github.com/vercel/next.js/blob/canary/.github/workflows/popular.yml|workflow> → <https://github.com/vercel/next.js/blob/canary/.github/actions/next-repo-info/src/popular-issues.mjs|action> will run every Monday at 10AM UTC (6AM EST)._',
+        text: '*A list of the top 15 issues sorted by the most reactions over the last 90 days.*\n_Note: This :github2: <https://github.com/vercel/next.js/blob/canary/.github/workflows/popular.yml|workflow> → <https://github.com/vercel/next.js/blob/canary/.github/actions/next-repo-info/src/popular-issues.mjs|action> will run every Monday at 10AM UTC (6AM EST). These issues are automatically synced to Linear._',
       },
     },
     {
@@ -54,6 +54,15 @@ async function run() {
     })
 
     if (data.items.length > 0) {
+      data.items.forEach(async (item) => {
+        await octoClient.rest.issues.addLabels({
+          owner,
+          repo,
+          issue_number: item.number,
+          labels: ['linear: next'],
+        })
+      })
+
       await slackClient.chat.postMessage({
         blocks: generateBlocks(data.items),
         channel: '#team-next-js',

.github/actions/next-stats-action/src/add-comment.js

@@ -106,8 +106,8 @@ module.exports = async function addComment(
                   ? '⚠️ '
                   : ''
                 : change > 0
-                ? '⚠️ '
-                : ''
+                  ? '⚠️ '
+                  : ''
               change = `${warn}${change < 0 ? '-' : '+'}${
                 useRawValue ? absChange : prettify(absChange, prettyType)
               }`

.github/actions/next-stats-action/src/prepare/load-stats-config.js

@@ -10,11 +10,9 @@ function loadStatsConfig() {
   for (const configPath of allowedConfigLocations) {
     try {
       relativeStatsAppDir = configPath
-      statsConfig = require(path.join(
-        diffRepoDir,
-        configPath,
-        'stats-config.js'
-      ))
+      statsConfig = require(
+        path.join(diffRepoDir, configPath, 'stats-config.js')
+      )
       break
     } catch (err) {
       if (err.code !== 'MODULE_NOT_FOUND') {

.github/workflows/build_reusable.yml

@@ -175,7 +175,7 @@ jobs:
       - run: turbo run get-test-timings -- --build ${{ github.sha }}
 
       - run: /bin/bash -c "${{ inputs.afterBuild }}"
-        timeout-minutes: 15
+        timeout-minutes: 30
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4

.github/workflows/update_fonts_data.yml

@@ -1,4 +1,4 @@
-name: update-font-data
+name: Update Font Data
 
 on:
   # Run every every day at midnight https://crontab.guru/#0_0_*_*_*/1

.prettierignore

@@ -4,7 +4,6 @@
 _next/
 __tmp__/
 dist/
-node_modules/
 target/
 compiled/
 
@@ -19,6 +18,14 @@ packages/next/src/bundles/webpack/packages/lazy-compilation-*.js
 
 packages/next-swc/crates/**/tests/**/output*
 packages/next-swc/crates/core/tests/loader/issue-32553/input.js
+# prettier destroys the directives here
+packages/next-swc/crates/next-custom-transforms/tests/errors/react-server-components/client-graph/use-client/input.js
+packages/next-swc/crates/next-custom-transforms/tests/errors/react-server-components/server-graph/fake-client-entry/input.js
+packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/8/input.js
+packages/next-swc/crates/next-custom-transforms/tests/errors/server-actions/server-graph/9/input.js
+packages/next-swc/crates/next-custom-transforms/tests/fixture/optimize-barrel/normal/4/input.js
+packages/next-swc/crates/next-custom-transforms/tests/fixture/react-server-components/client-graph/client-entry/input.js
+packages/next-swc/crates/next-custom-transforms/tests/fixture/react-server-components/server-graph/client-entry/input.js
 packages/next-swc/native/**/*
 packages/next-swc/docs/assets/**/*