fix: async_scope_block_on (#210)

houyunlu · web-flow · commit 51f1be1c0c9c · 2023-11-09T08:38:50.000-06:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/rolldown/Cargo.toml b/crates/rolldown/Cargo.toml
@@ -28,7 +28,7 @@ rustc-hash        = { workspace = true }
 tracing           = { workspace = true }
 anyhow            = { workspace = true }
 index_vec         = { workspace = true }
-futures           = "0.3.25"
+futures           = { workspace = true }
 rayon             = "1.6.0"
 string_wizard     = { workspace = true }
 async-trait       = { workspace = true }
diff --git a/crates/rolldown/src/bundler/module_loader/module_loader.rs b/crates/rolldown/src/bundler/module_loader/module_loader.rs
@@ -5,6 +5,7 @@ use rolldown_common::{ImportKind, ModuleId, RawPath, ResourceId};
 use rolldown_error::BuildError;
 use rolldown_fs::FileSystemExt;
 use rolldown_resolver::Resolver;
+use rolldown_utils::block_on_spawn_all;
 use rustc_hash::{FxHashMap, FxHashSet};
 
 use super::normal_module_task::NormalModuleTask;
@@ -127,7 +128,7 @@ impl<'a, T: FileSystemExt + 'static + Default> ModuleLoader<'a, T> {
   pub async fn fetch_all_modules(mut self) -> BatchedResult<()> {
     assert!(!self.input_options.input.is_empty(), "You must supply options.input to rolldown");
 
-    let resolved_entries = self.resolve_entries().await?;
+    let resolved_entries = self.resolve_entries()?;
 
     self.ctx.intermediate_modules.reserve(resolved_entries.len() + 1 /* runtime */);
 
@@ -199,12 +200,12 @@ impl<'a, T: FileSystemExt + 'static + Default> ModuleLoader<'a, T> {
   }
 
   #[allow(clippy::collection_is_never_read)]
-  async fn resolve_entries(&mut self) -> BatchedResult<Vec<(Option<String>, ResolvedRequestInfo)>> {
+  fn resolve_entries(&mut self) -> BatchedResult<Vec<(Option<String>, ResolvedRequestInfo)>> {
     let resolver = &self.resolver;
     let plugin_driver = &self.plugin_driver;
 
     let resolved_ids =
-      futures::future::join_all(self.input_options.input.iter().map(|input_item| async move {
+      block_on_spawn_all(self.input_options.input.iter().map(|input_item| async move {
         let specifier = &input_item.import;
         match resolve_id(resolver, plugin_driver, specifier, None, false).await {
           Ok(r) => {
@@ -220,8 +221,7 @@ impl<'a, T: FileSystemExt + 'static + Default> ModuleLoader<'a, T> {
           }
           Err(e) => Err(e),
         }
-      }))
-      .await;
+      }));
 
     let mut errors = BatchedErrors::default();
 
diff --git a/crates/rolldown_utils/Cargo.toml b/crates/rolldown_utils/Cargo.toml
@@ -11,3 +11,9 @@ repository.workspace = true
 
 [dependencies]
 string_wizard = { workspace = true }
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+async-scoped  = { workspace = true, features = ["use-tokio"] }
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+futures = { workspace = true, features = ["executor"]}
diff --git a/crates/rolldown_utils/src/lib.rs b/crates/rolldown_utils/src/lib.rs
@@ -3,3 +3,30 @@ mod magic_string_ext;
 pub mod reserved_word;
 
 pub use crate::magic_string_ext::MagicStringExt;
+use std::future::Future;
+
+#[cfg(not(target_arch = "wasm32"))]
+pub fn block_on_spawn_all<Iter, Out>(iter: Iter) -> Vec<Out>
+where
+  Iter: Iterator,
+  Out: Send + 'static,
+  Iter::Item: Future<Output = Out> + Send,
+{
+  use async_scoped::TokioScope;
+  let (_ret, collections) =
+    async_scoped::Scope::scope_and_block(|scope: &mut TokioScope<'_, _>| {
+      iter.into_iter().for_each(|fut| scope.spawn(fut));
+    });
+  collections.into_iter().map(Result::unwrap).collect()
+}
+
+#[cfg(target_arch = "wasm32")]
+pub fn block_on_spawn_all<Iter, Out>(iter: Iter) -> Vec<Out>
+where
+  Iter: Iterator,
+  Out: Send + 'static,
+  Iter::Item: Future<Output = Out> + Send,
+{
+  use futures::{executor::block_on, future};
+  block_on(future::join_all(iter))
+}
diff --git a/web/wasm/package.json b/web/wasm/package.json
@@ -17,4 +17,4 @@
   "sideEffects": [
     "./snippets/*"
   ]
-}
+}
diff --git a/web/wasm/rolldown_wasm.js b/web/wasm/rolldown_wasm.js
@@ -390,15 +390,15 @@ async function __wbg_load(module, imports) {
 function __wbg_get_imports() {
     const imports = {};
     imports.wbg = {};
+    imports.wbg.__wbg_assetitem_new = function() { return logError(function (arg0) {
+        const ret = AssetItem.__wrap(arg0);
+        return addHeapObject(ret);
+    }, arguments) };
     imports.wbg.__wbg_fileitem_unwrap = function() { return logError(function (arg0) {
         const ret = FileItem.__unwrap(takeObject(arg0));
         _assertNum(ret);
         return ret;
     }, arguments) };
-    imports.wbg.__wbg_assetitem_new = function() { return logError(function (arg0) {
-        const ret = AssetItem.__wrap(arg0);
-        return addHeapObject(ret);
-    }, arguments) };
     imports.wbg.__wbg_error_f851667af71bcfc6 = function() { return logError(function (arg0, arg1) {
         let deferred0_0;
         let deferred0_1;

Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,4 @@`
`17`	`17`	`"sideEffects": [`
`18`	`18`	`"./snippets/*"`
`19`	`19`	`]`
`20`		`-}`
	`20`	`+}`