update turbopack (vercel#50819)

### Turbopack Updates * vercel/turbo#5156 * vercel/turbo#5159 * vercel/turbo#5162 * vercel/turbo#5161 * vercel/turbo#5174 * vercel/turbo#5178 * vercel/turbo#5121 * vercel/turbo#5200 * vercel/turbo#5207 * vercel/turbo#5211 * vercel/turbo#5210 * vercel/turbo#5221 * vercel/turbo#5218 * vercel/turbo#5226 * vercel/turbo#5139 * vercel/turbo#5227 * vercel/turbo#5189
hydRAnger · Jun 12, 2023 · fea2213 · fea2213
1 parent 9f1605c
commit fea2213
Show file tree

Hide file tree

Showing 9 changed files with 95 additions and 86 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -38,15 +38,15 @@ next-transform-strip-page-exports = { path = "packages/next-swc/crates/next-tran
 
 # SWC crates
 # Keep consistent with preset_env_base through swc_core
-swc_core = { version = "0.76.37" }
+swc_core = { version = "0.76.41" }
 testing = { version = "0.33.13" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230601.3" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230608.1" }
 # [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-230601.3" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230608.1" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230601.3" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230608.1" }
 
 # General Deps
 

diff --git a/packages/next-swc/crates/next-core/js/package.json b/packages/next-swc/crates/next-core/js/package.json
@@ -10,8 +10,8 @@
     "check": "tsc --noEmit"
   },
   "dependencies": {
-    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230601.3",
-    "@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230601.3",
+    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230608.1",
+    "@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230608.1",
     "anser": "^2.1.1",
     "css.escape": "^1.5.1",
     "next": "*",

diff --git a/packages/next-swc/crates/next-core/src/app_source.rs b/packages/next-swc/crates/next-core/src/app_source.rs
@@ -42,6 +42,7 @@ use turbopack_binding::{
         },
         env::ProcessEnvAssetVc,
         node::{
+            debug::should_debug,
             execution_context::ExecutionContextVc,
             render::{
                 node_api_source::create_node_api_source,
@@ -587,6 +588,7 @@ async fn create_app_page_source_for_route(
         .into(),
         fallback_page,
         render_data,
+        should_debug("app_source"),
     );
 
     Ok(source.issue_context(app_dir, &format!("Next.js App Page Route {pathname}")))
@@ -630,6 +632,7 @@ async fn create_app_not_found_page_source(
         .into(),
         fallback_page,
         render_data,
+        should_debug("app_source"),
     );
 
     Ok(source.issue_context(app_dir, "Next.js App Page Route /404"))
@@ -673,6 +676,7 @@ async fn create_app_route_source_for_route(
         .cell()
         .into(),
         render_data,
+        should_debug("app_source"),
     );
 
     Ok(source.issue_context(app_dir, &format!("Next.js App Route {pathname}")))

diff --git a/packages/next-swc/crates/next-core/src/next_config.rs b/packages/next-swc/crates/next-core/src/next_config.rs
@@ -31,6 +31,7 @@ use turbopack_binding::{
             styled_components::StyledComponentsTransformConfig,
         },
         node::{
+            debug::should_debug,
             evaluate::evaluate,
             execution_context::{ExecutionContext, ExecutionContextVc},
             transforms::webpack::{WebpackLoaderItem, WebpackLoaderItemsVc},
@@ -688,7 +689,7 @@ pub async fn load_next_config_internal(
         None,
         vec![],
         config_changed,
-        /* debug */ false,
+        should_debug("next_config"),
     )
     .await?;
 

diff --git a/packages/next-swc/crates/next-core/src/next_font/google/mod.rs b/packages/next-swc/crates/next-core/src/next_font/google/mod.rs
@@ -414,7 +414,7 @@ async fn get_mock_stylesheet(
             ecmascript::{
                 EcmascriptInputTransformsVc, EcmascriptModuleAssetType, EcmascriptModuleAssetVc,
             },
-            node::{evaluate::evaluate, execution_context::ExecutionContext},
+            node::{debug::should_debug, evaluate::evaluate, execution_context::ExecutionContext},
             turbopack::evaluate_context::node_evaluate_asset_context,
         },
     };
@@ -473,7 +473,7 @@ async fn get_mock_stylesheet(
         None,
         vec![],
         CompletionVc::immutable(),
-        /* debug */ false,
+        should_debug("next_font::google"),
     )
     .await?;
 

diff --git a/packages/next-swc/crates/next-core/src/page_source.rs b/packages/next-swc/crates/next-core/src/page_source.rs
@@ -32,6 +32,7 @@ use turbopack_binding::{
         },
         env::ProcessEnvAssetVc,
         node::{
+            debug::should_debug,
             execution_context::ExecutionContextVc,
             render::{
                 node_api_source::create_node_api_source,
@@ -422,6 +423,7 @@ async fn create_page_source_for_file(
             .cell()
             .into(),
             render_data,
+            should_debug("page_source"),
         )
     } else {
         let data_pathname = pathname_for_path(client_root, client_path, PathType::Data);
@@ -465,6 +467,7 @@ async fn create_page_source_for_file(
                 ssr_entry,
                 fallback_page,
                 render_data,
+                should_debug("page_source"),
             ),
             create_node_rendered_source(
                 project_path,
@@ -476,6 +479,7 @@ async fn create_page_source_for_file(
                 ssr_data_entry,
                 fallback_page,
                 render_data,
+                should_debug("page_source"),
             ),
             create_page_loader(
                 client_root,
@@ -591,6 +595,7 @@ async fn create_not_found_page_source(
             ssr_entry,
             fallback_page,
             render_data,
+            should_debug("page_source"),
         ),
         page_loader,
     ])

diff --git a/packages/next-swc/crates/next-core/src/router.rs b/packages/next-swc/crates/next-core/src/router.rs
@@ -30,6 +30,7 @@ use turbopack_binding::{
         },
         dev::DevChunkingContextVc,
         node::{
+            debug::should_debug,
             evaluate::evaluate,
             execution_context::{ExecutionContext, ExecutionContextVc},
             source_map::{trace_stack, StructuredError},
@@ -376,7 +377,7 @@ async fn route_internal(
             JsonValueVc::cell(serde_json::to_value(ServerInfo::try_from(&*server_addr)?)?),
         ],
         CompletionsVc::all(vec![next_config_changed, routes_changed]),
-        /* debug */ false,
+        should_debug("router"),
     )
     .await?;
 

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml