Skip to content

Commit fc2ebbb

Browse files
committed
Fix source mapping of generated cache wrapper calls
In the SWC transform we're now using the span of the original `"use cache"` function for the generated cache wrapper call, e.g. so that the captured timeout error stack can be source mapped correctly. This also fixes the wrongly placed `/*#__TURBOPACK_DISABLE_EXPORT_MERGING__*/` marker for the generated cache wrapper statements.
1 parent 1bce2cb commit fc2ebbb

File tree

27 files changed

+148
-94
lines changed

27 files changed

+148
-94
lines changed

crates/next-custom-transforms/src/transforms/server_actions.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,7 @@ impl<C: Comments> ServerActions<C> {
703703
span: DUMMY_SP,
704704
kind: VarDeclKind::Var,
705705
decls: vec![VarDeclarator {
706-
span: DUMMY_SP,
706+
span: arrow.span,
707707
name: Pat::Ident(cache_ident.clone().into()),
708708
init: Some(wrap_cache_expr(
709709
Box::new(Expr::Fn(FnExpr {
@@ -841,7 +841,7 @@ impl<C: Comments> ServerActions<C> {
841841
span: DUMMY_SP,
842842
kind: VarDeclKind::Var,
843843
decls: vec![VarDeclarator {
844-
span: DUMMY_SP,
844+
span: function.span,
845845
name: Pat::Ident(cache_ident.clone().into()),
846846
init: Some(wrap_cache_expr(
847847
Box::new(Expr::Fn(FnExpr {

crates/next-custom-transforms/tests/fixture/next-font-with-directive/use-cache/output.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/next-custom-transforms/tests/fixture/server-actions/server/33/output.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/next-custom-transforms/tests/fixture/server-actions/server/34/output.js

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/next-custom-transforms/tests/fixture/server-actions/server/35/output.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/next-custom-transforms/tests/fixture/server-actions/server/36/output.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/next-custom-transforms/tests/fixture/server-actions/server/37/output.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/next-custom-transforms/tests/fixture/server-actions/server/38/output.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/next-custom-transforms/tests/fixture/server-actions/server/39/output.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/next-custom-transforms/tests/fixture/server-actions/server/40/output.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)