Skip to content

Commit 88bfe2d

Browse files
mischnictimneutkens
authored andcommitted
Fix server action manifest id format
1 parent d0a8666 commit 88bfe2d

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

crates/next-api/src/server_actions.rs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@ use swc_core::{
1919
},
2020
};
2121
use turbo_rcstr::{RcStr, rcstr};
22-
use turbo_tasks::{FxIndexMap, ResolvedVc, TryFlatJoinIterExt, ValueToString, Vc};
22+
use turbo_tasks::{FxIndexMap, ResolvedVc, TryFlatJoinIterExt, Vc};
2323
use turbo_tasks_fs::{self, File, FileSystemPath, rope::RopeBuilder};
2424
use turbopack_core::{
2525
asset::AssetContent,
26-
chunk::{ChunkItem, ChunkItemExt, ChunkableModule, ChunkingContext, EvaluatableAsset},
26+
chunk::{
27+
ChunkItem, ChunkItemExt, ChunkableModule, ChunkingContext, EvaluatableAsset, ModuleId,
28+
},
2729
context::AssetContext,
2830
file_source::FileSource,
2931
ident::AssetIdent,
@@ -168,7 +170,11 @@ async fn build_manifest(
168170
let key = format!("app{page_name}");
169171

170172
let actions_value = actions.await?;
171-
let loader_id = chunk_item.id().to_string().await?;
173+
let loader_id = chunk_item.id().await?;
174+
let loader_id = match &*loader_id {
175+
ModuleId::Number(id) => ActionManifestModuleId::Number(*id),
176+
ModuleId::String(id) => ActionManifestModuleId::String(id),
177+
};
172178
let mapping = match runtime {
173179
NextRuntime::Edge => &mut manifest.edge,
174180
NextRuntime::NodeJs => &mut manifest.node,
@@ -190,7 +196,7 @@ async fn build_manifest(
190196
entry.workers.insert(
191197
&key,
192198
ActionManifestWorkerEntry {
193-
module_id: ActionManifestModuleId::String(loader_id.as_str()),
199+
module_id: loader_id.clone(),
194200
is_async: *async_module_info.is_async(chunk_item.module()).await?,
195201
exported_name: name.as_str(),
196202
filename: filename.as_str(),

crates/next-core/src/next_manifests/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,11 +329,11 @@ pub struct ActionManifestWorkerEntry<'a> {
329329
pub filename: &'a str,
330330
}
331331

332-
#[derive(Serialize, Debug)]
332+
#[derive(Serialize, Debug, Clone)]
333333
#[serde(untagged)]
334334
pub enum ActionManifestModuleId<'a> {
335335
String(&'a str),
336-
Number(f64),
336+
Number(u64),
337337
}
338338

339339
#[derive(

0 commit comments

Comments
 (0)