merge canary

.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

@@ -477,6 +477,7 @@ jobs:
     name: Deploy Turbopack docs
     runs-on: ubuntu-latest
     needs: [build]
+    continue-on-error: true
     steps:
       - uses: actions/checkout@v4
         with:
@@ -485,14 +486,19 @@ jobs:
         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: ${{ needs.build.outputs.isRelease == 'true' }}
+        if: ${{ github.ref_name == 'canary' || needs.build.outputs.isRelease == 'true' }}
         run: ./scripts/deploy-turbopack-docs.sh
         env:
           VERCEL_API_TOKEN: ${{ secrets.VERCEL_API_TOKEN }}

.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: |

Cargo.toml

@@ -37,11 +37,11 @@ swc_core = { version = "0.90.7", features = [
 testing = { version = "0.35.18" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240213.4" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240213.5" }
 # [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
-turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240213.4" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240213.5" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240213.4" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240213.5" }
 
 # General Deps