Skip to content

Commit

Permalink
Revert "Fix action loader modules in graph traversal" (#69359)
Browse files Browse the repository at this point in the history
  • Loading branch information
@huozhi
huozhi committed Aug 27, 2024
1 parent 2e74ed6 commit d21fc56
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 61 deletions.
61 changes: 7 additions & 54 deletions crates/next-api/src/app.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ use turbopack_core::{
asset::AssetContent,
chunk::{
availability_info::AvailabilityInfo, ChunkingContext, ChunkingContextExt,
EntryChunkGroupResult, EvaluatableAsset, EvaluatableAssets,
EntryChunkGroupResult, EvaluatableAssets,
},
file_source::FileSource,
ident::AssetIdent,
Expand All @@ -75,7 +75,7 @@ use crate::{
},
project::Project,
route::{AppPageRoute, Endpoint, Route, Routes, WrittenEndpoint},
server_actions::{build_server_actions_loader, create_server_actions_manifest, get_actions},
server_actions::create_server_actions_manifest,
};

#[turbo_tasks::value]
Expand Down Expand Up @@ -764,42 +764,6 @@ impl AppEndpoint {
Ok(app_entry)
}

#[turbo_tasks::function]
async fn server_actions_loader(self: Vc<Self>) -> Result<Vc<Box<dyn EvaluatableAsset>>> {
let this = self.await?;

let app_entry = self.app_endpoint_entry().await?;
let rsc_entry = app_entry.rsc_entry;

let runtime = app_entry.config.await?.runtime.unwrap_or_default();

let rsc_entry_asset = Vc::upcast(rsc_entry);
let client_references = client_reference_graph(Vc::cell(vec![rsc_entry_asset]));
let client_reference_types = client_references.types();
let app_server_reference_modules = get_app_server_reference_modules(client_reference_types);

let asset_context = match runtime {
NextRuntime::Edge => Vc::upcast(this.app_project.edge_rsc_module_context()),
NextRuntime::NodeJs => Vc::upcast(this.app_project.rsc_module_context()),
};

let actions = get_actions(rsc_entry, app_server_reference_modules, asset_context);

let server_actions_loader = build_server_actions_loader(
this.app_project.project().project_path(),
app_entry.original_name.clone(),
actions,
asset_context,
);

let evaluatable_server_actions_loader =
Vc::try_resolve_sidecast::<Box<dyn EvaluatableAsset>>(server_actions_loader)
.await?
.context("loader module must be evaluatable")?;

Ok(evaluatable_server_actions_loader)
}

#[turbo_tasks::function]
fn output_assets(self: Vc<Self>) -> Vc<OutputAssets> {
self.output().output_assets()
Expand Down Expand Up @@ -1084,12 +1048,11 @@ impl AppEndpoint {
.context("Entry module must be evaluatable")?;
evaluatable_assets.push(evaluatable);

let loader = self.server_actions_loader();
if let Some(app_server_reference_modules) = app_server_reference_modules {
let manifest = create_server_actions_manifest(
let (loader, manifest) = create_server_actions_manifest(
Vc::upcast(app_entry.rsc_entry),
loader,
app_server_reference_modules,
this.app_project.project().project_path(),
node_root,
&app_entry.original_name,
NextRuntime::Edge,
Expand Down Expand Up @@ -1229,12 +1192,11 @@ impl AppEndpoint {
.project()
.server_chunking_context(process_client);

let loader = self.server_actions_loader();
if let Some(app_server_reference_modules) = app_server_reference_modules {
let manifest = create_server_actions_manifest(
let (loader, manifest) = create_server_actions_manifest(
Vc::upcast(app_entry.rsc_entry),
loader,
app_server_reference_modules,
this.app_project.project().project_path(),
node_root,
&app_entry.original_name,
NextRuntime::NodeJs,
Expand Down Expand Up @@ -1409,17 +1371,8 @@ impl Endpoint for AppEndpoint {

#[turbo_tasks::function]
async fn root_modules(self: Vc<Self>) -> Result<Vc<Modules>> {
let this = self.await?;

let rsc_entry = self.app_endpoint_entry().await?.rsc_entry;
let mut modules = vec![rsc_entry];

if matches!(this.ty, AppEndpointType::Page { .. }) {
let server_actions_loader_module = Vc::upcast(self.server_actions_loader());
modules.push(server_actions_loader_module);
}

Ok(Vc::cell(modules))
Ok(Vc::cell(vec![rsc_entry]))
}
}

Expand Down
19 changes: 12 additions & 7 deletions crates/next-api/src/server_actions.rs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::{collections::BTreeMap, io::Write, iter::once};

use anyhow::{bail, Result};
use anyhow::{bail, Context, Result};
use indexmap::{map::Entry, IndexMap};
use next_core::{
next_manifests::{ActionLayer, ActionManifestWorkerEntry, ServerReferenceManifest},
Expand Down Expand Up @@ -40,22 +40,27 @@ use turbopack_ecmascript::{
/// loader.
pub(crate) async fn create_server_actions_manifest(
rsc_entry: Vc<Box<dyn Module>>,
loader: Vc<Box<dyn EvaluatableAsset>>,
server_reference_modules: Vc<Vec<Vc<Box<dyn Module>>>>,
project_path: Vc<FileSystemPath>,
node_root: Vc<FileSystemPath>,
page_name: &str,
runtime: NextRuntime,
asset_context: Vc<Box<dyn AssetContext>>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<Vc<Box<dyn OutputAsset>>> {
) -> Result<(Vc<Box<dyn EvaluatableAsset>>, Vc<Box<dyn OutputAsset>>)> {
let actions = get_actions(rsc_entry, server_reference_modules, asset_context);
let loader =
build_server_actions_loader(project_path, page_name.into(), actions, asset_context);
let evaluable = Vc::try_resolve_sidecast::<Box<dyn EvaluatableAsset>>(loader)
.await?
.context("loader module must be evaluatable")?;

let loader_id = loader
.as_chunk_item(Vc::upcast(chunking_context))
.id()
.to_string();
let manifest = build_manifest(node_root, page_name, runtime, actions, loader_id).await?;
Ok(manifest)
Ok((evaluable, manifest))
}

/// Builds the "action loader" entry point, which reexports every found action
Expand All @@ -65,7 +70,7 @@ pub(crate) async fn create_server_actions_manifest(
/// file's name and the action name). This hash matches the id sent to the
/// client and present inside the paired manifest.
#[turbo_tasks::function]
pub async fn build_server_actions_loader(
async fn build_server_actions_loader(
project_path: Vc<FileSystemPath>,
page_name: RcStr,
actions: Vc<AllActions>,
Expand Down Expand Up @@ -162,7 +167,7 @@ fn action_modifier() -> Vc<RcStr> {
/// comment which identifies server actions. Every found server action will be
/// returned along with the module which exports that action.
#[turbo_tasks::function]
pub async fn get_actions(
async fn get_actions(
rsc_entry: Vc<Box<dyn Module>>,
server_reference_modules: Vc<Vec<Vc<Box<dyn Module>>>>,
asset_context: Vc<Box<dyn AssetContext>>,
Expand Down Expand Up @@ -327,7 +332,7 @@ type HashToLayerNameModule = IndexMap<String, (ActionLayer, String, Vc<Box<dyn M
/// A mapping of every module which exports a Server Action, with the hashed id
/// and exported name of each found action.
#[turbo_tasks::value(transparent)]
pub struct AllActions(HashToLayerNameModule);
struct AllActions(HashToLayerNameModule);

#[turbo_tasks::value_impl]
impl AllActions {
Expand Down

0 comments on commit d21fc56

Please sign in to comment.