Merge branch 'canary' into shu/8xwc

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

@@ -4,24 +4,30 @@ import { setFailed, info } from '@actions/core'
 import { WebClient } from '@slack/web-api'
 
 function generateBlocks(prs) {
+  let text = ''
+  let count = 0
+
   const blocks = [
-    {
-      type: 'section',
-      text: {
-        type: 'mrkdwn',
-        text: '*A list of the top 15 PRs sorted by most :+1: reactions over the last 90 days.*\n_Note: This :github2: workflow will run every Monday at 1PM UTC (9AM EST)._',
-      },
-    },
     {
       type: 'divider',
     },
   ]
 
-  let text = ''
   prs.forEach((pr, i) => {
-    text += `${i + 1}. [<${pr.html_url}|#${pr.number}>, :+1: ${
-      pr.reactions['+1']
-    }]: ${pr.title}\n`
+    if (pr.reactions['+1'] > 1) {
+      text += `${i + 1}. [<${pr.html_url}|#${pr.number}>, :+1: ${
+        pr.reactions['+1']
+      }]: ${pr.title}\n`
+      count++
+    }
+  })
+
+  blocks.unshift({
+    type: 'section',
+    text: {
+      type: 'mrkdwn',
+      text: `*A list of the top ${count} PRs sorted by most :+1: reactions (> 1) over the last 90 days.*\n_Note: This :github2: workflow will run every Monday at 1PM UTC (9AM EST)._`,
+    },
   })
 
   blocks.push({

.github/actions/next-stats-action/src/run/collect-diffs.js

@@ -32,10 +32,15 @@ module.exports = async function collectDiffs(
     filesToTrack.map(async (fileGroup) => {
       const { globs } = fileGroup
       const curFiles = []
+      const prettierExts = ['.js', '.html', '.css', '.json']
 
       await Promise.all(
         globs.map(async (pattern) => {
-          curFiles.push(...(await glob(pattern, { cwd: statsAppDir })))
+          curFiles.push(
+            ...(await glob(pattern, { cwd: statsAppDir })).filter((item) =>
+              prettierExts.includes(path.extname(item))
+            )
+          )
         })
       )
 

.github/workflows/build_and_deploy.yml

@@ -473,6 +473,37 @@ jobs:
           VERCEL_API_TOKEN: ${{ secrets.VERCEL_API_TOKEN }}
           DEPLOY_ENVIRONMENT: production
 
+  deployTurbopackDocs:
+    name: Deploy Turbopack docs
+    runs-on: ubuntu-latest
+    needs: [build]
+    continue-on-error: true
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 25
+      - name: Install Vercel CLI
+        run: npm i -g vercel@latest
+      - name: Install Rust
+        uses: ./.github/actions/setup-rust
+      - name: Setup mdBook
+        uses: peaceiris/actions-mdbook@v1
+        with:
+          mdbook-version: 'latest'
+      - uses: Swatinem/rust-cache@v2
+      - name: Deploy preview docs
+        if: ${{ needs.build.outputs.isRelease != 'true' }}
+        run: ./scripts/deploy-turbopack-docs.sh
+        env:
+          VERCEL_API_TOKEN: ${{ secrets.VERCEL_API_TOKEN }}
+          DEPLOY_ENVIRONMENT: preview
+      - name: Deploy production docs
+        if: ${{ github.ref_name == 'canary' || needs.build.outputs.isRelease == 'true' }}
+        run: ./scripts/deploy-turbopack-docs.sh
+        env:
+          VERCEL_API_TOKEN: ${{ secrets.VERCEL_API_TOKEN }}
+          DEPLOY_ENVIRONMENT: production
+
   releaseStats:
     name: Release Stats
     runs-on:

.github/workflows/build_and_test.yml

@@ -138,6 +138,20 @@ jobs:
       stepName: 'rust-check'
     secrets: inherit
 
+  rust-doc-check:
+    name: rustdoc check
+    needs: ['changes', 'build-next']
+    if: ${{ needs.changes.outputs.docs-only == 'false' }}
+
+    uses: ./.github/workflows/build_reusable.yml
+    with:
+      needsRust: 'yes'
+      skipInstallBuild: 'yes'
+      skipNativeBuild: 'yes'
+      afterBuild: ./scripts/deploy-turbopack-docs.sh
+      stepName: 'rust-doc-check'
+    secrets: inherit
+
   test-turbopack-dev:
     name: test turbopack dev
     needs: ['changes', 'build-next']

.github/workflows/build_reusable.yml

@@ -108,6 +108,12 @@ jobs:
         with:
           components: rustfmt, clippy
 
+      - name: Setup mdBook
+        uses: peaceiris/actions-mdbook@v1
+        if: ${{ inputs.skipNativeBuild != 'yes' || inputs.needsNextest == 'yes' || inputs.needsRust == 'yes' }}
+        with:
+          mdbook-version: 'latest'
+
       - name: 'Install mold linker'
         if: ${{ inputs.mold == 'yes' }}
         run: |

.github/workflows/pull_request_popular.yml

@@ -1,4 +1,4 @@
-name: Notify about the top 15 PRs (most reacted) in the last 90 days
+name: Notify about the top PRs (most reacted) in the last 90 days
 
 on:
   schedule:

.github/workflows/triage.yml

@@ -17,7 +17,7 @@ jobs:
     name: Nissuer
     runs-on: ubuntu-latest
     steps:
-      - uses: balazsorban44/nissuer@1.8.2
+      - uses: balazsorban44/nissuer@1.9.2
         with:
           label-area-prefix: 'area:'
           label-area-section: 'Which area\(s\) are affected\? \(Select all that apply\)(.*)### Additional context'
@@ -34,4 +34,4 @@ jobs:
           reproduction-blocklist: 'github.com/vercel/next.js.*,github.com/\\w*/?$,github.com$'
           reproduction-link-section: '### Link to the code that reproduces this issue(.*)### To Reproduce'
           reproduction-invalid-label: 'invalid link'
-          reproduction-issue-labels: 'template: bug'
+          reproduction-issue-labels: 'template: bug,'