Change how we accumulate data endpoints

Author: lukesandberg

crates/next-api/benches/hmr.rs

@@ -349,7 +349,9 @@ impl HmrBenchmark {
                     data_endpoint,
                 } => {
                     let _ = endpoint_write_to_disk(**html_endpoint).await?;
-                    let _ = endpoint_write_to_disk(**data_endpoint).await?;
+                    if let Some(data_endpoint) = data_endpoint {
+                        let _ = endpoint_write_to_disk(**data_endpoint).await?;
+                    }
                 }
                 next_api::route::Route::PageApi { endpoint } => {
                     let _ = endpoint_write_to_disk(**endpoint).await?;

crates/next-api/src/operation.rs

@@ -166,7 +166,7 @@ async fn pick_endpoint(
         }
         EndpointSelector::RoutePageData(name) => {
             if let Some(Route::Page { data_endpoint, .. }) = endpoints.routes.get(&name) {
-                Some(*data_endpoint)
+                *data_endpoint
             } else {
                 None
             }

crates/next-api/src/pages.rs

@@ -199,18 +199,23 @@ impl PagesProject {
                         .to_resolved()
                         .await?,
                     ),
-                    data_endpoint: ResolvedVc::upcast(
-                        PageEndpoint::new(
-                            PageEndpointType::Data,
-                            self,
-                            pathname,
-                            original_name,
-                            page,
-                            pages_structure,
-                        )
-                        .to_resolved()
-                        .await?,
-                    ),
+                    // The data endpoint is only needed in development mode to support HMR
+                    data_endpoint: if self.project().next_mode().await?.is_development() {
+                        Some(ResolvedVc::upcast(
+                            PageEndpoint::new(
+                                PageEndpointType::Data,
+                                self,
+                                pathname,
+                                original_name,
+                                page,
+                                pages_structure,
+                            )
+                            .to_resolved()
+                            .await?,
+                        ))
+                    } else {
+                        None
+                    },
                 })
             })
         };

crates/next-api/src/project.rs

@@ -869,7 +869,7 @@ impl Project {
                         endpoints.push(*html_endpoint);
                         // In development we want to include the data endpoint to support
                         // server side changes.  See PACK
-                        if self.next_mode().await?.is_development() {
+                        if let Some(data_endpoint) = data_endpoint {
                             endpoints.push(*data_endpoint);
                         }
                     }

crates/next-api/src/route.rs

@@ -34,7 +34,7 @@ pub struct AppPageRoute {
 pub enum Route {
     Page {
         html_endpoint: ResolvedVc<Box<dyn Endpoint>>,
-        data_endpoint: ResolvedVc<Box<dyn Endpoint>>,
+        data_endpoint: Option<ResolvedVc<Box<dyn Endpoint>>>,
     },
     PageApi {
         endpoint: ResolvedVc<Box<dyn Endpoint>>,