From 33fca533bb11828c3699cbcd164f30c07ab66846 Mon Sep 17 00:00:00 2001
From: OJ Kwon <1210596+kwonoj@users.noreply.github.com>
Date: Mon, 27 Mar 2023 10:03:07 -0700
Subject: [PATCH] build(next_font): update build error

---
 .../crates/next-core/src/next_config.rs       |  3 +--
 .../next-core/src/next_font/google/mod.rs     | 27 +++++++++----------
 .../next-dev-tests/tests/integration.rs       |  8 +++---
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/packages/next-swc/crates/next-core/src/next_config.rs b/packages/next-swc/crates/next-core/src/next_config.rs
index 36fe0c6376e1..a4cd90e38395 100644
--- a/packages/next-swc/crates/next-core/src/next_config.rs
+++ b/packages/next-swc/crates/next-core/src/next_config.rs
@@ -7,7 +7,6 @@ use turbo_tasks::{
     trace::TraceRawVcs,
     CompletionVc, Value,
 };
-use turbo_tasks_bytes::stream::SingleValue;
 use turbo_tasks_env::EnvMapVc;
 use turbo_tasks_fs::{json::parse_json_with_source_context, FileSystemPathVc};
 use turbopack::evaluate_context::node_evaluate_asset_context;
@@ -605,7 +604,7 @@ pub async fn load_next_config_internal(
     )
     .await?;
 
-    let SingleValue::Single(val) = config_value.try_into_single().await.context("Evaluation of Next.js config failed")? else {
+    let turbo_tasks_bytes::stream::SingleValue::Single(val) = config_value.try_into_single().await.context("Evaluation of Next.js config failed")? else {
         return Ok(NextConfig::default().cell());
     };
     let next_config: NextConfig = parse_json_with_source_context(val.to_str()?)?;
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
index ca5ce664c3c8..e4ca746984dc 100644
--- 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
@@ -5,6 +5,7 @@ use turbo_tasks::{
     primitives::{OptionStringVc, StringVc, U32Vc},
     Value,
 };
+
 use turbo_tasks_fs::{json::parse_json_with_source_context, FileContent, FileSystemPathVc};
 use turbopack_core::{
     resolve::{
@@ -383,19 +384,15 @@ async fn get_mock_stylesheet(
     use std::{collections::HashMap, path::Path};
 
     use turbo_tasks::CompletionVc;
+    use turbo_tasks_bytes::stream::SingleValue;
     use turbo_tasks_env::{CommandLineProcessEnvVc, ProcessEnv};
-    use turbo_tasks_fs::{
-        json::parse_json_with_source_context, DiskFileSystemVc, File, FileSystem,
-    };
+    use turbo_tasks_fs::{DiskFileSystemVc, File, FileSystem};
     use turbopack::evaluate_context::node_evaluate_asset_context;
     use turbopack_core::{context::AssetContext, ident::AssetIdentVc};
     use turbopack_ecmascript::{
         EcmascriptInputTransformsVc, EcmascriptModuleAssetType, EcmascriptModuleAssetVc,
     };
-    use turbopack_node::{
-        evaluate::{evaluate, JavaScriptValue},
-        execution_context::ExecutionContext,
-    };
+    use turbopack_node::{evaluate::evaluate, execution_context::ExecutionContext};
 
     let env = CommandLineProcessEnvVc::new().as_process_env();
     let mocked_response_js = &*env.read("NEXT_FONT_GOOGLE_MOCKED_RESPONSES").await?;
@@ -438,6 +435,7 @@ async fn get_mock_stylesheet(
         context,
         Value::new(EcmascriptModuleAssetType::Ecmascript),
         EcmascriptInputTransformsVc::cell(vec![]),
+        Default::default(),
         context.compile_time_info(),
     )
     .into();
@@ -457,15 +455,14 @@ async fn get_mock_stylesheet(
     )
     .await?;
 
-    match &*val {
-        JavaScriptValue::Value(val) => {
-            let mock_map: HashMap<String, Option<String>> =
-                parse_json_with_source_context(&val.to_str()?)?;
-            Ok((mock_map.get(url).context("url not found")?).clone())
+    match &val.try_into_single().await? {
+        SingleValue::Single(val) => {
+            let val: HashMap<String, Option<String>> =
+                parse_json_with_source_context(val.to_str()?)?;
+            Ok(val.get(url).context("url not found")?.clone())
         }
-        JavaScriptValue::Error => panic!("Unexpected error evaluating JS"),
-        JavaScriptValue::Stream(_) => {
-            unimplemented!("Stream not supported now");
+        _ => {
+            panic!("Unexpected error evaluating JS")
         }
     }
 }
diff --git a/packages/next-swc/crates/next-dev-tests/tests/integration.rs b/packages/next-swc/crates/next-dev-tests/tests/integration.rs
index 30578bce448e..970fc43f86d5 100644
--- a/packages/next-swc/crates/next-dev-tests/tests/integration.rs
+++ b/packages/next-swc/crates/next-dev-tests/tests/integration.rs
@@ -410,12 +410,10 @@ async fn run_browser(addr: SocketAddr) -> Result<JestRunResult> {
                                 message
                             ))
                         }
+                    } else if expected_error {
+                        println!("Exception throw in page:\n{}", message);
                     } else {
-                        if expected_error {
-                            println!("Exception throw in page:\n{}", message);
-                        } else {
-                            println!("Exception throw in page (this would fail the test case without TURBOPACK_DEBUG_BROWSER):\n{}", message);
-                        }
+                        println!("Exception throw in page (this would fail the test case without TURBOPACK_DEBUG_BROWSER):\n{}", message);
                     }
                 } else {
                     return Err(anyhow!("Error events channel ended unexpectedly"));