From b026c32f1046ba40f1caf854f5b1c0f97d0823ae Mon Sep 17 00:00:00 2001 From: Tim Neutkens Date: Sun, 2 Feb 2025 21:29:47 +0100 Subject: [PATCH] Remove rust-side changes for runtime() api that is removed. --- crates/next-api/src/app.rs | 16 +------------ crates/next-api/src/empty.rs | 7 +----- crates/next-api/src/instrumentation.rs | 7 +----- crates/next-api/src/middleware.rs | 7 +----- crates/next-api/src/pages.rs | 32 +------------------------- crates/next-api/src/route.rs | 8 ------- 6 files changed, 5 insertions(+), 72 deletions(-) diff --git a/crates/next-api/src/app.rs b/crates/next-api/src/app.rs index 4e99601f195768..7413de5e7ae407 100644 --- a/crates/next-api/src/app.rs +++ b/crates/next-api/src/app.rs @@ -82,9 +82,7 @@ use crate::{ get_wasm_paths_from_root, paths_to_bindings, wasm_paths_to_bindings, }, project::{ModuleGraphs, Project}, - route::{ - AppPageRoute, Endpoint, EndpointOutput, EndpointOutputPaths, EndpointRuntime, Route, Routes, - }, + route::{AppPageRoute, Endpoint, EndpointOutput, EndpointOutputPaths, Route, Routes}, server_actions::{build_server_actions_loader, create_server_actions_manifest}, webpack_stats::generate_webpack_stats, }; @@ -1794,18 +1792,6 @@ async fn create_app_paths_manifest( #[turbo_tasks::value_impl] impl Endpoint for AppEndpoint { - #[turbo_tasks::function] - async fn runtime(self: ResolvedVc) -> Result> { - let app_entry = self.app_endpoint_entry().await?; - let runtime = app_entry.config.await?.runtime.unwrap_or_default(); - - Ok(match runtime { - NextRuntime::Edge => EndpointRuntime::Edge, - NextRuntime::NodeJs => EndpointRuntime::NodeJs, - } - .cell()) - } - #[turbo_tasks::function] async fn output(self: ResolvedVc) -> Result> { let this = self.await?; diff --git a/crates/next-api/src/empty.rs b/crates/next-api/src/empty.rs index deee5f56c9461b..ed3be880948805 100644 --- a/crates/next-api/src/empty.rs +++ b/crates/next-api/src/empty.rs @@ -2,7 +2,7 @@ use anyhow::{bail, Result}; use turbo_tasks::{Completion, Vc}; use turbopack_core::module::Modules; -use crate::route::{Endpoint, EndpointOutput, EndpointRuntime}; +use crate::route::{Endpoint, EndpointOutput}; #[turbo_tasks::value] pub struct EmptyEndpoint; @@ -17,11 +17,6 @@ impl EmptyEndpoint { #[turbo_tasks::value_impl] impl Endpoint for EmptyEndpoint { - #[turbo_tasks::function] - fn runtime(self: Vc) -> Result> { - bail!("Empty endpoint can't have runtime") - } - #[turbo_tasks::function] fn output(self: Vc) -> Result> { bail!("Empty endpoint can't have output") diff --git a/crates/next-api/src/instrumentation.rs b/crates/next-api/src/instrumentation.rs index 7aa7b01127bb93..f225854b3608db 100644 --- a/crates/next-api/src/instrumentation.rs +++ b/crates/next-api/src/instrumentation.rs @@ -30,7 +30,7 @@ use crate::{ all_server_paths, get_js_paths_from_root, get_wasm_paths_from_root, wasm_paths_to_bindings, }, project::Project, - route::{Endpoint, EndpointOutput, EndpointOutputPaths, EndpointRuntime}, + route::{Endpoint, EndpointOutput, EndpointOutputPaths}, }; #[turbo_tasks::value] @@ -248,11 +248,6 @@ struct InstrumentationCoreModules { #[turbo_tasks::value_impl] impl Endpoint for InstrumentationEndpoint { - #[turbo_tasks::function] - async fn runtime(self: ResolvedVc) -> Vc { - EndpointRuntime::Edge.cell() - } - #[turbo_tasks::function] async fn output(self: ResolvedVc) -> Result> { let span = tracing::info_span!("instrumentation endpoint"); diff --git a/crates/next-api/src/middleware.rs b/crates/next-api/src/middleware.rs index 16eda06cd46ba5..6d09104acc8fba 100644 --- a/crates/next-api/src/middleware.rs +++ b/crates/next-api/src/middleware.rs @@ -31,7 +31,7 @@ use crate::{ get_wasm_paths_from_root, paths_to_bindings, wasm_paths_to_bindings, }, project::Project, - route::{Endpoint, EndpointOutput, EndpointOutputPaths, EndpointRuntime}, + route::{Endpoint, EndpointOutput, EndpointOutputPaths}, }; #[turbo_tasks::value] @@ -276,11 +276,6 @@ impl MiddlewareEndpoint { #[turbo_tasks::value_impl] impl Endpoint for MiddlewareEndpoint { - #[turbo_tasks::function] - async fn runtime(self: ResolvedVc) -> Vc { - EndpointRuntime::Edge.cell() - } - #[turbo_tasks::function] async fn output(self: ResolvedVc) -> Result> { let span = tracing::info_span!("middleware endpoint"); diff --git a/crates/next-api/src/pages.rs b/crates/next-api/src/pages.rs index 8c7125fe47de88..e4ddb86b74ce21 100644 --- a/crates/next-api/src/pages.rs +++ b/crates/next-api/src/pages.rs @@ -77,7 +77,7 @@ use crate::{ get_wasm_paths_from_root, paths_to_bindings, wasm_paths_to_bindings, }, project::Project, - route::{Endpoint, EndpointOutput, EndpointOutputPaths, EndpointRuntime, Route, Routes}, + route::{Endpoint, EndpointOutput, EndpointOutputPaths, Route, Routes}, webpack_stats::generate_webpack_stats, }; @@ -1373,36 +1373,6 @@ pub struct InternalSsrChunkModule { #[turbo_tasks::value_impl] impl Endpoint for PageEndpoint { - #[turbo_tasks::function] - async fn runtime(self: Vc) -> Result> { - let this = &*self.await?; - let (reference_type, module_context) = match this.ty { - PageEndpointType::Html | PageEndpointType::SsrOnly => ( - Value::new(ReferenceType::Entry(EntryReferenceSubType::Page)), - this.pages_project.ssr_module_context(), - ), - PageEndpointType::Data => ( - Value::new(ReferenceType::Entry(EntryReferenceSubType::Page)), - this.pages_project.ssr_data_module_context(), - ), - PageEndpointType::Api => ( - Value::new(ReferenceType::Entry(EntryReferenceSubType::PagesApi)), - this.pages_project.api_module_context(), - ), - }; - - let ssr_module = module_context - .process(self.source(), reference_type.clone()) - .module(); - - let config = parse_config_from_source(ssr_module).await?; - Ok(match config.runtime { - NextRuntime::NodeJs => EndpointRuntime::NodeJs, - NextRuntime::Edge => EndpointRuntime::Edge, - } - .cell()) - } - #[turbo_tasks::function] async fn output(self: ResolvedVc) -> Result> { let this = self.await?; diff --git a/crates/next-api/src/route.rs b/crates/next-api/src/route.rs index 4430c33c32426f..b671433da7e693 100644 --- a/crates/next-api/src/route.rs +++ b/crates/next-api/src/route.rs @@ -44,16 +44,8 @@ pub enum Route { Conflict, } -#[derive(Copy, Clone)] -#[turbo_tasks::value(shared)] -pub enum EndpointRuntime { - NodeJs, - Edge, -} - #[turbo_tasks::value_trait] pub trait Endpoint { - fn runtime(self: Vc) -> Vc; fn output(self: Vc) -> Vc; // fn write_to_disk(self: Vc) -> Vc; fn server_changed(self: Vc) -> Vc;