Skip to content

Commit e74e04e

Browse files
committed
Revert "select NextConfig::output field instead of depending on the whole config"
This reverts commit 860b5bf.
1 parent 9d1540b commit e74e04e

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ pub async fn get_app_route_entry(
6060
let inner = rcstr!("INNER_APP_ROUTE");
6161

6262
let output_type: &str = next_config
63-
.output()
6463
.await?
64+
.output
6565
.as_ref()
6666
.map(|o| match o {
6767
OutputType::Standalone => "\"standalone\"",

crates/next-core/src/next_config.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ pub struct NextConfig {
107107
pub i18n: Option<I18NConfig>,
108108
cross_origin: Option<CrossOriginConfig>,
109109
pub dev_indicators: Option<DevIndicatorsConfig>,
110-
output: Option<OutputType>,
110+
pub output: Option<OutputType>,
111111
pub turbopack: Option<TurbopackConfig>,
112112
production_browser_source_maps: bool,
113113
output_file_tracing_includes: Option<serde_json::Value>,
@@ -287,17 +287,14 @@ pub struct I18NConfig {
287287
}
288288

289289
#[derive(
290-
Clone, Debug, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, NonLocalValue, OperationValue,
290+
Clone, Debug, PartialEq, Serialize, Deserialize, TraceRawVcs, NonLocalValue, OperationValue,
291291
)]
292292
#[serde(rename_all = "kebab-case")]
293293
pub enum OutputType {
294294
Standalone,
295295
Export,
296296
}
297297

298-
#[turbo_tasks::value(transparent)]
299-
pub struct OptionOutputType(Option<OutputType>);
300-
301298
#[derive(
302299
Debug,
303300
Clone,
@@ -1868,11 +1865,6 @@ impl NextConfig {
18681865
Vc::cell(self.cross_origin.clone())
18691866
}
18701867

1871-
#[turbo_tasks::function]
1872-
pub fn output(&self) -> Vc<OptionOutputType> {
1873-
Vc::cell(self.output.clone())
1874-
}
1875-
18761868
#[turbo_tasks::function]
18771869
pub fn output_file_tracing_includes(&self) -> Vc<OptionJsonValue> {
18781870
Vc::cell(self.output_file_tracing_includes.clone())

0 commit comments

Comments
 (0)