feat(turbopack): apply utoo patches to canary

Author: xusd320

Cargo.lock

@@ -304,6 +304,7 @@ napi-derive = "2"
 napi-build = "2"
 nohash-hasher = "0.2.0"
 notify = "8.1.0"
+notify-types = "2.0.0"
 owo-colors = "4.2.2"
 parcel_selectors = "0.28.2"
 parking_lot = "0.12.1"
@@ -317,6 +318,7 @@ qstring = "0.7.2"
 quick_cache = { version = "0.6.14" }
 quote = "1.0.45"
 rand = "0.10.1"
+getrandom = "0.3"
 rayon = "1.10.0"
 regex = "1.12.3"
 regress = "0.10.4"
@@ -347,7 +349,7 @@ tempfile = "3.20.0"
 terminal_size = "0.3.0"
 thiserror = "1.0.48"
 thread_local = "1.1.8"
-tokio = "1.52.1"
+tokio = "=1.51.0"
 tokio-util = { version = "0.7.18", features = ["io", "rt"] }
 tracing = "0.1.44"
 tracing-subscriber = "0.3.16"
@@ -369,3 +371,7 @@ virtue = { git = "https://github.com/bgw/virtue.git", branch = "bgw/fix-generic-
 mdxjs = { git = "https://github.com/vercel-labs/mdxjs-rs-turbopack.git", branch = "turbopack" }
 # Doesn't compile on recent nightly versions because of https://github.com/Michael-F-Bryan/include_dir/pull/117
 include_dir = { git = "https://github.com/vercel-labs/include_dir", branch = "turbopack" }
+libmimalloc-sys = { git = "https://github.com/utooland/mimalloc_rust.git" }
+mimalloc = { git = "https://github.com/utooland/mimalloc_rust.git" }
+tokio = { git = "https://github.com/utooland/tokio.git", package = "tokio" }
+tokio-util = { git = "https://github.com/utooland/tokio.git", package = "tokio-util" }

Cargo.toml

@@ -1,5 +1,14 @@
 'use client'
 
+async function fetchMore() {
+  const res = await Promise.resolve('more data')
+  return res
+}
+
 export default function Page() {
-  return <button>Client</button>
+  return (
+    <div>
+      <button onClick={() => fetchMore().then(console.log)}>Client</button>
+    </div>
+  )
 }

apps/docs/.source/index.ts

@@ -0,0 +1,7 @@
+// Server component page that uses top-level await (TLA).
+// Tests that TLA is properly transpiled for older browser targets.
+import { data } from '../tla'
+
+export default function TlaPage() {
+  return <div>{data.message}</div>
+}

test/production/escheck-output/app/foo/page.js

@@ -0,0 +1,3 @@
+// This module uses top-level await (TLA) to test that Turbopack/SWC
+// properly transpiles async/await for older browser targets.
+export const data = await Promise.resolve({ message: 'loaded' })

test/production/escheck-output/app/tla-page/page.js

@@ -97,4 +97,39 @@ describe('escheck-output', () => {
       expect(esCheckOutput).toContain('info: ✓ ES-Check passed!')
     })
   })
+
+  // Chrome 50 does not support async/await (added in Chrome 55).
+  // This validates that TLA and async functions in app/tla.js and app/foo/page.js
+  // are properly transpiled by SWC preset-env.
+  // Webpack doesn't properly downlevel
+  ;(process.env.IS_TURBOPACK_TEST ? describe : describe.skip)(
+    'pre-async browsers',
+    () => {
+      let browserslist = ['chrome 50']
+
+      const { next } = nextTestSetup({
+        files: __dirname,
+        dependencies,
+        packageJson: {
+          browserslist,
+        },
+      })
+
+      it('should downlevel async/await', () => {
+        let esCheckOutput = execSync(
+          `node_modules/.bin/es-check checkBrowser ".next/static/**/*.js" --browserslistQuery="${browserslist.join(', ')}" --noCache`,
+          { cwd: next.testDir, encoding: 'utf8' }
+        )
+
+        expect(esCheckOutput).toContain('info: ✓ ES-Check passed!')
+      })
+
+      it('should render TLA page correctly', async () => {
+        const res = await next.fetch('/tla-page')
+        expect(res.status).toBe(200)
+        const html = await res.text()
+        expect(html).toContain('loaded')
+      })
+    }
+  )
 })

test/production/escheck-output/app/tla.js

@@ -951,7 +951,6 @@ impl<E: Entry> StreamingSstWriter<E> {
             qfilter::Filter::new(actual_count.max(1), AMQF_FALSE_POSITIVE_RATE)
                 .expect("Filter can't be constructed"),
         );
-
         let fp_size = builder.fingerprint_size();
         assert!(fp_size < 32, "fp_size {fp_size} exceeds u32");
         let fp_mask = (1u32 << fp_size) - 1;

test/production/escheck-output/index.test.ts

@@ -56,12 +56,14 @@ smallvec = { workspace = true }
 tokio = { workspace = true }
 tracing = { workspace = true }
 turbo-bincode = { workspace = true }
-turbo-persistence = { workspace = true }
 turbo-rcstr = { workspace = true }
 turbo-tasks = { workspace = true }
 turbo-tasks-hash = { workspace = true }
 thread_local = { workspace = true }
 
+[target.'cfg(not(all(target_family = "wasm", target_os = "unknown")))'.dependencies]
+turbo-persistence = { workspace = true }
+
 [dev-dependencies]
 criterion = { workspace = true, features = ["async_tokio"] }
 futures = { workspace = true }

turbopack/crates/turbo-persistence/src/static_sorted_file_builder.rs

@@ -6,7 +6,7 @@ use std::{
     num::NonZeroU32,
     ops::{ControlFlow, Deref},
     thread::yield_now,
-    time::{Duration, Instant},
+    time::Duration,
 };
 
 use anyhow::Result;
@@ -15,6 +15,7 @@ use indexmap::map::Entry;
 use ringmap::RingSet;
 use rustc_hash::{FxBuildHasher, FxHashMap};
 use smallvec::{SmallVec, smallvec};
+use tokio::time::Instant;
 #[cfg(feature = "trace_aggregation_update_queue")]
 use tracing::span::Span;
 #[cfg(any(