Unverified Commit 476e43b4 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: Fix server action sourcemaps (#69884)

Closes #69861
Closes PACK-3240

The sourcemaps of server actions were invalid, the listed source file
was the file `AssetIdent` like
`turbopack://[project]/bench/basic-app/app/actions.ts [app-client]
(ecmascript, action)` instead of only the source file path.
This broke the sourcemap mapping logic of the error overlay.

---------
Co-authored-by: 's avatarTim Neutkens <tim@timneutkens.nl>
parent c58c6b70
...@@ -14,21 +14,19 @@ use turbo_tasks::{ ...@@ -14,21 +14,19 @@ use turbo_tasks::{
}; };
use turbo_tasks_fs::{self, rope::RopeBuilder, File, FileSystemPath}; use turbo_tasks_fs::{self, rope::RopeBuilder, File, FileSystemPath};
use turbopack_core::{ use turbopack_core::{
asset::{Asset, AssetContent}, asset::AssetContent,
chunk::{ChunkItemExt, ChunkableModule, ChunkingContext, EvaluatableAsset}, chunk::{ChunkItemExt, ChunkableModule, ChunkingContext, EvaluatableAsset},
context::AssetContext, context::AssetContext,
file_source::FileSource,
module::Module, module::Module,
output::OutputAsset, output::OutputAsset,
reference::primary_referenced_modules, reference::primary_referenced_modules,
reference_type::{ reference_type::{EcmaScriptModulesReferenceSubType, ReferenceType},
EcmaScriptModulesReferenceSubType, ReferenceType, TypeScriptReferenceSubType,
},
virtual_output::VirtualOutputAsset, virtual_output::VirtualOutputAsset,
virtual_source::VirtualSource, virtual_source::VirtualSource,
}; };
use turbopack_ecmascript::{ use turbopack_ecmascript::{
chunk::EcmascriptChunkPlaceable, parse::ParseResult, EcmascriptModuleAssetType, chunk::EcmascriptChunkPlaceable, parse::ParseResult, EcmascriptParsable,
EcmascriptParsable,
}; };
/// Scans the RSC entry point's full module graph looking for exported Server /// Scans the RSC entry point's full module graph looking for exported Server
...@@ -158,11 +156,6 @@ async fn build_manifest( ...@@ -158,11 +156,6 @@ async fn build_manifest(
))) )))
} }
#[turbo_tasks::function]
fn action_modifier() -> Vc<RcStr> {
Vc::cell("action".into())
}
/// Traverses the entire module graph starting from [Module], looking for magic /// Traverses the entire module graph starting from [Module], looking for magic
/// comment which identifies server actions. Every found server action will be /// comment which identifies server actions. Every found server action will be
/// returned along with the module which exports that action. /// returned along with the module which exports that action.
...@@ -230,23 +223,14 @@ async fn to_rsc_context( ...@@ -230,23 +223,14 @@ async fn to_rsc_context(
module: Vc<Box<dyn Module>>, module: Vc<Box<dyn Module>>,
asset_context: Vc<Box<dyn AssetContext>>, asset_context: Vc<Box<dyn AssetContext>>,
) -> Result<Vc<Box<dyn Module>>> { ) -> Result<Vc<Box<dyn Module>>> {
let source = VirtualSource::new_with_ident( let source = FileSource::new_with_query(module.ident().path(), module.ident().query());
module.ident().with_modifier(action_modifier()),
module.content(),
);
let ty = if let Some(module) =
Vc::try_resolve_sidecast::<Box<dyn EcmascriptParsable>>(module).await?
{
if *module.ty().await? == EcmascriptModuleAssetType::Ecmascript {
ReferenceType::EcmaScriptModules(EcmaScriptModulesReferenceSubType::Undefined)
} else {
ReferenceType::TypeScript(TypeScriptReferenceSubType::Undefined)
}
} else {
ReferenceType::TypeScript(TypeScriptReferenceSubType::Undefined)
};
let module = asset_context let module = asset_context
.process(Vc::upcast(source), Value::new(ty)) .process(
Vc::upcast(source),
Value::new(ReferenceType::EcmaScriptModules(
EcmaScriptModulesReferenceSubType::Undefined,
)),
)
.module(); .module();
Ok(module) Ok(module)
} }
......
...@@ -1111,4 +1111,101 @@ describe.each(['default', 'turbo'])('ReactRefreshLogBox app %s', () => { ...@@ -1111,4 +1111,101 @@ describe.each(['default', 'turbo'])('ReactRefreshLogBox app %s', () => {
await cleanup() await cleanup()
}) })
} }
test('Should show error location for server actions in client component', async () => {
const { session, browser, cleanup } = await sandbox(
next,
new Map([
[
'app/actions.ts',
`"use server";
export async function serverAction(a) {
throw new Error("server action was here");
}`,
],
[
'app/page.tsx',
`"use client";
import { serverAction } from "./actions";
export default function Home() {
return (
<>
<form action={serverAction}>
<button id="trigger-action">Submit</button>
</form>
</>
);
}`,
],
])
)
await browser.elementByCss('#trigger-action').click()
// Wait for patch to apply and new error to show.
await session.assertHasRedbox()
await retry(async () => {
expect(await session.getRedboxSource()).toMatchInlineSnapshot(`
"app/actions.ts (4:9) @ serverAction
2 |
3 | export async function serverAction(a) {
> 4 | throw new Error("server action was here");
| ^
5 | }"
`)
})
await cleanup()
})
test('Should show error location for server actions in server component', async () => {
const { session, browser, cleanup } = await sandbox(
next,
new Map([
[
'app/actions.ts',
`"use server";
export async function serverAction(a) {
throw new Error("server action was here");
}`,
],
[
'app/page.tsx',
`import { serverAction } from "./actions";
export default function Home() {
return (
<>
<form action={serverAction}>
<button id="trigger-action">Submit</button>
</form>
</>
);
}`,
],
])
)
await browser.elementByCss('#trigger-action').click()
// Wait for patch to apply and new error to show.
await session.assertHasRedbox()
await retry(async () => {
expect(await session.getRedboxSource()).toMatchInlineSnapshot(`
"app/actions.ts (4:9) @ serverAction
2 |
3 | export async function serverAction(a) {
> 4 | throw new Error("server action was here");
| ^
5 | }"
`)
})
await cleanup()
})
}) })
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment