Merge 345214d into df97e13

vercel · Aug 11, 2023 · 82c2e3a · 82c2e3a
2 parents df97e13 + 345214d
commit 82c2e3a
Show file tree

Hide file tree

Showing 21 changed files with 416 additions and 87 deletions.
diff --git a/crates/turbopack-ecmascript/src/lib.rs b/crates/turbopack-ecmascript/src/lib.rs
@@ -616,6 +616,7 @@ async fn gen_content_with_visitors(
         source_map,
         globals,
         eval_context,
+        comments,
         ..
     } = &*parsed
     {
@@ -650,7 +651,7 @@ async fn gen_content_with_visitors(
                 ..Default::default()
             },
             cm: source_map.clone(),
-            comments: None,
+            comments: Some(&comments),
             wr: JsWriter::new(source_map.clone(), "\n", &mut bytes, Some(&mut srcmap)),
         };
 

diff --git a/crates/turbopack-ecmascript/src/parse.rs b/crates/turbopack-ecmascript/src/parse.rs
@@ -325,6 +325,7 @@ async fn parse_content(
                 source_map: &source_map,
                 top_level_mark,
                 unresolved_mark,
+                swc_file_name: &file_name,
                 file_path_str: &fs_path.path,
                 file_name_str: fs_path.file_name(),
                 file_name_hash: file_path_hash,

diff --git a/crates/turbopack-ecmascript/src/transform/mod.rs b/crates/turbopack-ecmascript/src/transform/mod.rs
@@ -4,7 +4,7 @@ use anyhow::Result;
 use async_trait::async_trait;
 use swc_core::{
     base::SwcComments,
-    common::{chain, comments::Comments, util::take::Take, Mark, SourceMap},
+    common::{chain, comments::Comments, util::take::Take, FileName, Mark, SourceMap},
     ecma::{
         ast::{Module, ModuleItem, Program, Script},
         preset_env::{
@@ -123,6 +123,7 @@ pub struct TransformContext<'a> {
     pub file_name_str: &'a str,
     pub file_name_hash: u128,
     pub file_path: Vc<FileSystemPath>,
+    pub swc_file_name: &'a FileName,
 }
 
 impl EcmascriptInputTransform {

diff --git a/...hunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_b53fce.js b/...hunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_b53fce.js
diff --git a/.../output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_b53fce.js.map b/.../output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_b53fce.js.map
diff --git a/...utput/crates_turbopack-tests_tests_snapshot_basic_top-level-await_input_UserAPI_030d34.js b/...utput/crates_turbopack-tests_tests_snapshot_basic_top-level-await_input_UserAPI_030d34.js
diff --git a/...t/crates_turbopack-tests_tests_snapshot_basic_top-level-await_input_UserAPI_030d34.js.map b/...t/crates_turbopack-tests_tests_snapshot_basic_top-level-await_input_UserAPI_030d34.js.map
diff --git a/.../output/crates_turbopack-tests_tests_snapshot_basic_top-level-await_input_index_b53fce.js b/.../output/crates_turbopack-tests_tests_snapshot_basic_top-level-await_input_index_b53fce.js
diff --git a/...put/crates_turbopack-tests_tests_snapshot_basic_top-level-await_input_index_b53fce.js.map b/...put/crates_turbopack-tests_tests_snapshot_basic_top-level-await_input_index_b53fce.js.map
diff --git a/...define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_b53fce.js b/...define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_b53fce.js
diff --git a/...ne/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_b53fce.js.map b/...ne/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_b53fce.js.map