enum ParseSegmentMode

Author: mischnic

crates/next-api/src/app.rs

@@ -33,7 +33,7 @@ use next_core::{
     },
     next_server_utility::{NEXT_SERVER_UTILITY_MERGE_TAG, NextServerUtilityTransition},
     parse_segment_config_from_source,
-    segment_config::NextSegmentConfig,
+    segment_config::{NextSegmentConfig, ParseSegmentMode},
     util::{NextRuntime, app_function_name, module_styles_rule_condition, styles_rule_condition},
 };
 use serde::{Deserialize, Serialize};
@@ -1106,7 +1106,7 @@ impl AppEndpoint {
 
             for layout in root_layouts.iter().rev() {
                 let source = Vc::upcast(FileSource::new(layout.clone()));
-                let layout_config = parse_segment_config_from_source(source, true);
+                let layout_config = parse_segment_config_from_source(source, ParseSegmentMode::App);
                 config.apply_parent_config(&*layout_config.await?);
             }
 

crates/next-api/src/middleware.rs

@@ -8,6 +8,7 @@ use next_core::{
     next_manifests::{EdgeFunctionDefinition, MiddlewareMatcher, MiddlewaresManifestV2, Regions},
     next_server::{ServerContextType, get_server_runtime_entries},
     parse_segment_config_from_source,
+    segment_config::ParseSegmentMode,
     util::{MiddlewareMatcherKind, NextRuntime},
 };
 use tracing::Instrument;
@@ -87,7 +88,7 @@ impl MiddlewareEndpoint {
             userland_module,
         );
 
-        let runtime = parse_segment_config_from_source(*self.source, false)
+        let runtime = parse_segment_config_from_source(*self.source, ParseSegmentMode::Base)
             .await?
             .runtime
             .unwrap_or(NextRuntime::Edge);
@@ -178,7 +179,8 @@ impl MiddlewareEndpoint {
     async fn output_assets(self: Vc<Self>) -> Result<Vc<OutputAssets>> {
         let this = self.await?;
 
-        let config = parse_segment_config_from_source(*self.await?.source, false).await?;
+        let config =
+            parse_segment_config_from_source(*self.await?.source, ParseSegmentMode::Base).await?;
         let runtime = config.runtime.unwrap_or(NextRuntime::Edge);
 
         let next_config = this.project.next_config().await?;

crates/next-api/src/pages.rs

@@ -24,6 +24,7 @@ use next_core::{
         PagesDirectoryStructure, PagesStructure, PagesStructureItem, find_pages_structure,
     },
     parse_segment_config_from_source,
+    segment_config::ParseSegmentMode,
     util::{NextRuntime, get_asset_prefix_from_pathname, pages_function_name},
 };
 use serde::{Deserialize, Serialize};
@@ -928,7 +929,8 @@ impl PageEndpoint {
             .process(self.source(), reference_type.clone())
             .module();
 
-        let config = parse_segment_config_from_source(self.source(), false).await?;
+        let config =
+            parse_segment_config_from_source(self.source(), ParseSegmentMode::Base).await?;
 
         let runtime = config.runtime.unwrap_or(NextRuntime::NodeJs);
 

crates/next-api/src/project.rs

@@ -22,6 +22,7 @@ use next_core::{
     },
     next_telemetry::NextFeatureTelemetry,
     parse_segment_config_from_source,
+    segment_config::ParseSegmentMode,
     util::{NextRuntime, OptionEnvMap},
 };
 use serde::{Deserialize, Serialize};
@@ -1412,7 +1413,7 @@ impl Project {
         };
         let source = Vc::upcast(FileSource::new(fs_path.clone()));
 
-        let runtime = parse_segment_config_from_source(source, false)
+        let runtime = parse_segment_config_from_source(source, ParseSegmentMode::Base)
             .await?
             .runtime
             .unwrap_or(NextRuntime::Edge);

crates/next-core/src/next_app/app_route_entry.rs

@@ -15,7 +15,7 @@ use crate::{
     next_config::{NextConfig, OutputType},
     next_edge::entry::wrap_edge_entry,
     parse_segment_config_from_source,
-    segment_config::NextSegmentConfig,
+    segment_config::{NextSegmentConfig, ParseSegmentMode},
     util::{NextRuntime, app_function_name, load_next_js_template},
 };
 
@@ -36,7 +36,7 @@ pub async fn get_app_route_entry(
     original_segment_config: Option<Vc<NextSegmentConfig>>,
     next_config: Vc<NextConfig>,
 ) -> Result<Vc<AppEntry>> {
-    let segment_from_source = parse_segment_config_from_source(source, true);
+    let segment_from_source = parse_segment_config_from_source(source, ParseSegmentMode::App);
     let config = if let Some(original_segment_config) = original_segment_config {
         let mut segment_config = segment_from_source.owned().await?;
         segment_config.apply_parent_config(&*original_segment_config.await?);

crates/next-core/src/next_app/metadata/route.rs

@@ -27,6 +27,7 @@ use crate::{
     },
     next_config::NextConfig,
     parse_segment_config_from_source,
+    segment_config::ParseSegmentMode,
 };
 
 /// Computes the route source for a Next.js metadata file.
@@ -68,7 +69,7 @@ pub async fn get_app_metadata_route_entry(
     let original_path = metadata.clone().into_path();
 
     let source = Vc::upcast(FileSource::new(original_path));
-    let segment_config = parse_segment_config_from_source(source, true);
+    let segment_config = parse_segment_config_from_source(source, ParseSegmentMode::App);
     let is_dynamic_metadata = matches!(metadata, MetadataItem::Dynamic { .. });
     let is_multi_dynamic: bool = if Some(segment_config).is_some() {
         // is_multi_dynamic is true when config.generateSitemaps or

crates/next-core/src/segment_config.rs

@@ -15,7 +15,7 @@ use swc_core::{
 };
 use turbo_rcstr::{RcStr, rcstr};
 use turbo_tasks::{
-    NonLocalValue, ResolvedVc, TryJoinIterExt, ValueDefault, Vc, trace::TraceRawVcs,
+    NonLocalValue, ResolvedVc, TaskInput, TryJoinIterExt, ValueDefault, Vc, trace::TraceRawVcs,
     util::WrapFuture,
 };
 use turbo_tasks_fs::FileSystemPath;
@@ -281,10 +281,29 @@ impl Issue for NextSegmentConfigParsingIssue {
     }
 }
 
+#[derive(
+    Debug,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    Hash,
+    Serialize,
+    Deserialize,
+    TaskInput,
+    NonLocalValue,
+    TraceRawVcs,
+)]
+pub enum ParseSegmentMode {
+    Base,
+    // Disallows "use client + generateStatic" and ignores/warns about `export const config`
+    App,
+}
+
 #[turbo_tasks::function]
 pub async fn parse_segment_config_from_source(
     source: ResolvedVc<Box<dyn Source>>,
-    is_app_router: bool,
+    mode: ParseSegmentMode,
 ) -> Result<Vc<NextSegmentConfig>> {
     let path = source.ident().path().await?;
 
@@ -334,16 +353,7 @@ pub async fn parse_segment_config_from_source(
             let mut config = NextSegmentConfig::default();
 
             let mut parse = async |ident, init, span| {
-                parse_config_value(
-                    source,
-                    is_app_router,
-                    &mut config,
-                    eval_context,
-                    ident,
-                    init,
-                    span,
-                )
-                .await
+                parse_config_value(source, mode, &mut config, eval_context, ident, init, span).await
             };
 
             for item in &module_ast.body {
@@ -425,7 +435,7 @@ pub async fn parse_segment_config_from_source(
     )
     .await?;
 
-    if is_app_router
+    if mode == ParseSegmentMode::App
         && let Some(span) = config.generate_static_params
         && module_ast
             .body
@@ -491,7 +501,7 @@ async fn invalid_config(
 
 async fn parse_config_value(
     source: ResolvedVc<Box<dyn Source>>,
-    is_app_router: bool,
+    mode: ParseSegmentMode,
     config: &mut NextSegmentConfig,
     eval_context: &EvalContext,
     key: &str,
@@ -534,7 +544,7 @@ async fn parse_config_value(
                 .await;
             };
 
-            if is_app_router {
+            if mode == ParseSegmentMode::App {
                 return invalid_config(
                     source,
                     "config",
@@ -1258,7 +1268,9 @@ async fn parse_segment_config_from_loader_tree_internal(
     .flatten()
     {
         let source = Vc::upcast(FileSource::new(path.clone()));
-        config.apply_parent_config(&*parse_segment_config_from_source(source, true).await?);
+        config.apply_parent_config(
+            &*parse_segment_config_from_source(source, ParseSegmentMode::App).await?,
+        );
     }
 
     Ok(config)