Merge 321d43d into 0b844b1

vercel · Feb 22, 2023 · 39575a6 · 39575a6
2 parents 0b844b1 + 321d43d
commit 39575a6
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 30 deletions.
diff --git a/crates/next-core/src/next_client_component/with_client_chunks.rs b/crates/next-core/src/next_client_component/with_client_chunks.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use serde_json::Value;
+use indoc::formatdoc;
 use turbo_tasks::{primitives::StringVc, ValueToString, ValueToStringVc};
 use turbo_tasks_fs::FileSystemPathVc;
 use turbopack::ecmascript::{
@@ -116,31 +116,38 @@ impl EcmascriptChunkItem for WithClientChunksChunkItem {
         let group = ChunkGroupVc::from_asset(inner.asset.into(), self.context);
         let chunks = group.chunks().await?;
         let server_root = inner.server_root.await?;
-        let mut client_chunks = Vec::new();
+
+        let mut asset_paths = vec![];
         for chunk in chunks.iter() {
             for reference in chunk.references().await?.iter() {
                 let assets = &*reference.resolve_reference().primary_assets().await?;
                 for asset in assets.iter() {
-                    let path = &*asset.path().await?;
-
-                    // only client chunks have an path from the server root
-                    if let Some(path) = server_root.get_path_to(path) {
-                        client_chunks.push(Value::String(path.to_string()));
-                    }
+                    asset_paths.push(asset.path().await?);
                 }
             }
+
+            asset_paths.push(chunk.path().await?);
         }
+
+        let mut client_chunks = Vec::new();
+        for asset_path in asset_paths {
+            if let Some(path) = server_root.get_path_to(&asset_path) {
+                client_chunks.push(path.to_string());
+            }
+        }
+
         let module_id = stringify_js(&*inner.asset.as_chunk_item(self.context).id().await?);
         Ok(EcmascriptChunkItemContent {
-            inner_code: format!(
-                "__turbopack_esm__({{
-  default: () => __turbopack_import__({}),
-  chunks: () => chunks
-}});
-const chunks = {};
-",
+            inner_code: formatdoc!(
+                r#"
+                    __turbopack_esm__({{
+                        default: () => __turbopack_import__({}),
+                        chunks: () => chunks
+                    }});
+                    const chunks = {};
+                "#,
                 module_id,
-                Value::Array(client_chunks)
+                stringify_js(&client_chunks)
             )
             .into(),
             ..Default::default()

diff --git a/crates/turbo-tasks-memory/src/task.rs b/crates/turbo-tasks-memory/src/task.rs
@@ -850,7 +850,7 @@ impl Task {
             }) => {
                 // Connect the task to the current task. This makes strongly consistent behaving
                 // as expected and we can look up the collectibles in the current scope.
-                self.connect_child_internal(state, task_id, backend, &*turbo_tasks);
+                self.connect_child_internal(state, task_id, backend, turbo_tasks);
                 // state was dropped by previous method
                 Box::pin(Self::execute_read_task_collectibles(
                     self.id,
@@ -1222,18 +1222,16 @@ impl Task {
                 *optimization_counter += 1;
                 if merging_scopes > 0 {
                     *optimization_counter = optimization_counter.saturating_sub(merging_scopes);
-                } else {
-                    if should_optimize_to_root_scoped(*optimization_counter, children.len()) {
-                        list.remove(id);
-                        drop(self.make_root_scoped_internal(state, backend, turbo_tasks));
-                        return self.add_to_scope_internal_shallow(
-                            id,
-                            merging_scopes,
-                            backend,
-                            turbo_tasks,
-                            queue,
-                        );
-                    }
+                } else if should_optimize_to_root_scoped(*optimization_counter, children.len()) {
+                    list.remove(id);
+                    drop(self.make_root_scoped_internal(state, backend, turbo_tasks));
+                    return self.add_to_scope_internal_shallow(
+                        id,
+                        merging_scopes,
+                        backend,
+                        turbo_tasks,
+                        queue,
+                    );
                 }
 
                 if queue.capacity() == 0 {
@@ -2132,7 +2130,7 @@ impl Task {
                 let backend = turbo_tasks.backend();
                 backend.with_task(task_id, |task| {
                     let state =
-                        task.ensure_root_scoped(task.full_state_mut(), backend, &*turbo_tasks);
+                        task.ensure_root_scoped(task.full_state_mut(), backend, turbo_tasks);
                     if let TaskScopes::Root(scope_id) = state.scopes {
                         backend.with_scope(scope_id, |scope| {
                             scope.read_collectibles_and_children(