Revert "make all next config fields private"

This reverts commit da6fc2c.

Author: sokra

crates/next-api/src/middleware.rs

@@ -157,14 +157,14 @@ impl MiddlewareEndpoint {
             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();
-        let i18n = next_config.i18n().await?;
-        let has_i18n = i18n.is_some();
-        let has_i18n_locales = i18n
+        let next_config = this.project.next_config().await?;
+        let has_i18n = next_config.i18n.is_some();
+        let has_i18n_locales = next_config
+            .i18n
             .as_ref()
             .map(|i18n| i18n.locales.len() > 1)
             .unwrap_or(false);
-        let base_path = next_config.base_path().await?;
+        let base_path = next_config.base_path.as_ref();
 
         let matchers = if let Some(matchers) = config.middleware_matcher.as_ref() {
             matchers
@@ -202,7 +202,7 @@ impl MiddlewareEndpoint {
 
                     source.insert_str(0, "/:nextData(_next/data/[^/]{1,})?");
 
-                    if let Some(base_path) = base_path.as_ref() {
+                    if let Some(base_path) = base_path {
                         source.insert_str(0, base_path);
                     }
 

crates/next-api/src/project.rs

@@ -479,8 +479,8 @@ impl ProjectContainer {
         }
 
         let dist_dir = next_config
-            .dist_dir()
             .await?
+            .dist_dir
             .as_ref()
             .map_or_else(|| rcstr!(".next"), |d| d.clone());
 
@@ -722,17 +722,13 @@ impl Project {
 
     #[turbo_tasks::function]
     pub async fn client_relative_path(self: Vc<Self>) -> Result<Vc<FileSystemPath>> {
-        let next_config = self.next_config();
+        let next_config = self.next_config().await?;
         Ok(self
             .client_root()
             .await?
             .join(&format!(
                 "{}/_next",
-                next_config
-                    .base_path()
-                    .await?
-                    .as_deref()
-                    .unwrap_or_default(),
+                next_config.base_path.clone().unwrap_or_default(),
             ))?
             .cell())
     }
@@ -1160,38 +1156,26 @@ impl Project {
             *config.persistent_caching_enabled().await?,
         );
 
-        emit_event(
-            "modularizeImports",
-            !config.modularize_imports().await?.is_empty(),
-        );
-        emit_event(
-            "transpilePackages",
-            !config.transpile_packages().await?.is_empty(),
-        );
+        let config = &config.await?;
+
+        emit_event("modularizeImports", config.modularize_imports.is_some());
+        emit_event("transpilePackages", config.transpile_packages.is_some());
         emit_event("turbotrace", false);
 
         // compiler options
-        let compiler_options = config.compiler().await?;
-        let swc_relay_enabled = compiler_options.relay.is_some();
+        let compiler_options = config.compiler.as_ref();
+        let swc_relay_enabled = compiler_options.and_then(|c| c.relay.as_ref()).is_some();
         let styled_components_enabled = compiler_options
-            .styled_components
-            .as_ref()
-            .map(|sc| sc.is_enabled())
+            .and_then(|c| c.styled_components.as_ref().map(|sc| sc.is_enabled()))
             .unwrap_or_default();
         let react_remove_properties_enabled = compiler_options
-            .react_remove_properties
-            .as_ref()
-            .map(|rc| rc.is_enabled())
+            .and_then(|c| c.react_remove_properties.as_ref().map(|rc| rc.is_enabled()))
             .unwrap_or_default();
         let remove_console_enabled = compiler_options
-            .remove_console
-            .as_ref()
-            .map(|rc| rc.is_enabled())
+            .and_then(|c| c.remove_console.as_ref().map(|rc| rc.is_enabled()))
             .unwrap_or_default();
         let emotion_enabled = compiler_options
-            .emotion
-            .as_ref()
-            .map(|e| e.is_enabled())
+            .and_then(|c| c.emotion.as_ref().map(|e| e.is_enabled()))
             .unwrap_or_default();
 
         emit_event("swcRelay", swc_relay_enabled);

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

@@ -48,7 +48,7 @@ pub async fn get_app_page_entry(
     let server_component_transition =
         ResolvedVc::upcast(NextServerComponentTransition::new().to_resolved().await?);
 
-    let base_path = next_config.base_path().owned().await?;
+    let base_path = next_config.await?.base_path.clone();
     let loader_tree = AppPageLoaderTreeModule::build(
         loader_tree,
         module_asset_context,

crates/next-core/src/next_config.rs

@@ -75,40 +75,40 @@ impl Default for CacheKinds {
 #[derive(Clone, Debug, Default, PartialEq)]
 #[serde(default, rename_all = "camelCase")]
 pub struct NextConfig {
-    // IMPORTANT: all fields should be private and access should be wrapped within a turbo-tasks
-    // function. Otherwise changing NextConfig will lead to invalidating all tasks accessing it.
-    config_file: Option<RcStr>,
-    config_file_name: RcStr,
+    // TODO all fields should be private and access should be wrapped within a turbo-tasks function
+    // Otherwise changing NextConfig will lead to invalidating all tasks accessing it.
+    pub config_file: Option<RcStr>,
+    pub config_file_name: RcStr,
 
     /// In-memory cache size in bytes.
     ///
     /// If `cache_max_memory_size: 0` disables in-memory caching.
-    cache_max_memory_size: Option<f64>,
+    pub cache_max_memory_size: Option<f64>,
     /// custom path to a cache handler to use
-    cache_handler: Option<RcStr>,
-
-    env: FxIndexMap<String, JsonValue>,
-    experimental: ExperimentalConfig,
-    images: ImageConfig,
-    page_extensions: Vec<RcStr>,
-    react_compiler: Option<ReactCompilerOptionsOrBoolean>,
-    react_production_profiling: Option<bool>,
-    react_strict_mode: Option<bool>,
-    transpile_packages: Option<Vec<RcStr>>,
-    modularize_imports: Option<FxIndexMap<String, ModularizeImportPackageConfig>>,
-    dist_dir: Option<RcStr>,
-    deployment_id: Option<RcStr>,
+    pub cache_handler: Option<RcStr>,
+
+    pub env: FxIndexMap<String, JsonValue>,
+    pub experimental: ExperimentalConfig,
+    pub images: ImageConfig,
+    pub page_extensions: Vec<RcStr>,
+    pub react_compiler: Option<ReactCompilerOptionsOrBoolean>,
+    pub react_production_profiling: Option<bool>,
+    pub react_strict_mode: Option<bool>,
+    pub transpile_packages: Option<Vec<RcStr>>,
+    pub modularize_imports: Option<FxIndexMap<String, ModularizeImportPackageConfig>>,
+    pub dist_dir: Option<RcStr>,
+    pub deployment_id: Option<RcStr>,
     sass_options: Option<serde_json::Value>,
-    trailing_slash: Option<bool>,
-    asset_prefix: Option<RcStr>,
-    base_path: Option<RcStr>,
-    skip_middleware_url_normalize: Option<bool>,
-    skip_trailing_slash_redirect: Option<bool>,
-    i18n: Option<I18NConfig>,
+    pub trailing_slash: Option<bool>,
+    pub asset_prefix: Option<RcStr>,
+    pub base_path: Option<RcStr>,
+    pub skip_middleware_url_normalize: Option<bool>,
+    pub skip_trailing_slash_redirect: Option<bool>,
+    pub i18n: Option<I18NConfig>,
     cross_origin: Option<CrossOriginConfig>,
-    dev_indicators: Option<DevIndicatorsConfig>,
+    pub dev_indicators: Option<DevIndicatorsConfig>,
     output: Option<OutputType>,
-    turbopack: Option<TurbopackConfig>,
+    pub turbopack: Option<TurbopackConfig>,
     production_browser_source_maps: bool,
     output_file_tracing_includes: Option<serde_json::Value>,
     output_file_tracing_excludes: Option<serde_json::Value>,
@@ -119,21 +119,21 @@ pub struct NextConfig {
     /// server-side bundles.
     ///
     /// [API Reference](https://nextjs.org/docs/pages/api-reference/next-config-js/bundlePagesRouterDependencies)
-    bundle_pages_router_dependencies: Option<bool>,
+    pub bundle_pages_router_dependencies: Option<bool>,
 
     /// A list of packages that should be treated as external on the server
     /// build.
     ///
     /// [API Reference](https://nextjs.org/docs/app/api-reference/next-config-js/serverExternalPackages)
-    server_external_packages: Option<Vec<RcStr>>,
+    pub server_external_packages: Option<Vec<RcStr>>,
 
     #[serde(rename = "_originalRedirects")]
-    original_redirects: Option<Vec<Redirect>>,
+    pub original_redirects: Option<Vec<Redirect>>,
 
     // Partially supported
-    compiler: Option<CompilerConfig>,
+    pub compiler: Option<CompilerConfig>,
 
-    optimize_fonts: Option<bool>,
+    pub optimize_fonts: Option<bool>,
 
     clean_dist_dir: bool,
     compress: bool,
@@ -265,7 +265,7 @@ struct HttpAgentConfig {
 }
 
 #[derive(
-    Clone, Debug, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, NonLocalValue, OperationValue,
+    Clone, Debug, PartialEq, Serialize, Deserialize, TraceRawVcs, NonLocalValue, OperationValue,
 )]
 #[serde(rename_all = "camelCase")]
 pub struct DomainLocale {
@@ -276,7 +276,7 @@ pub struct DomainLocale {
 }
 
 #[derive(
-    Clone, Debug, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, NonLocalValue, OperationValue,
+    Clone, Debug, PartialEq, Serialize, Deserialize, TraceRawVcs, NonLocalValue, OperationValue,
 )]
 #[serde(rename_all = "camelCase")]
 pub struct I18NConfig {
@@ -286,9 +286,6 @@ pub struct I18NConfig {
     pub locales: Vec<String>,
 }
 
-#[turbo_tasks::value(transparent)]
-pub struct OptionI18NConfig(Option<I18NConfig>);
-
 #[derive(
     Clone, Debug, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, NonLocalValue, OperationValue,
 )]
@@ -1339,11 +1336,6 @@ impl NextConfig {
         Vc::cell(self.output == Some(OutputType::Standalone))
     }
 
-    #[turbo_tasks::function]
-    pub fn base_path(&self) -> Vc<Option<RcStr>> {
-        Vc::cell(self.base_path.clone())
-    }
-
     #[turbo_tasks::function]
     pub fn cache_handler(&self, project_path: FileSystemPath) -> Result<Vc<OptionFileSystemPath>> {
         if let Some(handler) = &self.cache_handler {
@@ -1545,11 +1537,6 @@ impl NextConfig {
         }))
     }
 
-    #[turbo_tasks::function]
-    pub fn inline_css(&self) -> Vc<bool> {
-        Vc::cell(self.experimental.inline_css.unwrap_or(false))
-    }
-
     #[turbo_tasks::function]
     pub fn mdx_rs(&self) -> Vc<OptionalMdxTransformOptions> {
         let options = &self.experimental.mdx_rs;
@@ -1585,11 +1572,6 @@ impl NextConfig {
         Vc::cell(self.modularize_imports.clone().unwrap_or_default())
     }
 
-    #[turbo_tasks::function]
-    pub fn dist_dir(&self) -> Vc<Option<RcStr>> {
-        Vc::cell(self.dist_dir.clone())
-    }
-
     #[turbo_tasks::function]
     pub fn experimental_cache_handlers(
         &self,
@@ -1886,11 +1868,6 @@ impl NextConfig {
         Vc::cell(self.cross_origin.clone())
     }
 
-    #[turbo_tasks::function]
-    pub fn i18n(&self) -> Vc<OptionI18NConfig> {
-        Vc::cell(self.i18n.clone())
-    }
-
     #[turbo_tasks::function]
     pub fn output(&self) -> Vc<OptionOutputType> {
         Vc::cell(self.output.clone())

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

@@ -438,7 +438,8 @@ async fn build_manifest(
                 cached_chunk_paths(&mut client_chunk_path_cache, client_chunks.iter().copied())
                     .await?;
             // Inlining breaks HMR so it is always disabled in dev.
-            let inlined_css = *next_config.inline_css().await? && mode.is_production();
+            let inlined_css =
+                next_config.await?.experimental.inline_css.unwrap_or(false) && mode.is_production();
 
             for (chunk, chunk_path) in client_chunks_with_path {
                 if let Some(path) = client_relative_path.get_path_to(&chunk_path) {