Unverified Commit a2a3f5e3 authored by Justin Ridgewell's avatar Justin Ridgewell Committed by GitHub

turbopack: parse and propagate `output: 'export'` (#48046)

Depends on https://github.com/vercel/turbo/pull/4491

This adds support for the new `output: 'export'` configuration, and
propagates the value through to our Node.js rendering code to render.
Unfortunately, we don't support page-level configs at the moment, so we
can't set a `export const config = { dynamic: 'force-dynamic' }` and
test that the export value is being received (I've manually verified it,
though).

Fixes WEB-842
parent e260adb8
This diff is collapsed.
......@@ -42,11 +42,11 @@ swc_relay = { version = "0.2.5" }
testing = { version = "0.33.4" }
# Turbo crates
turbo-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230427.2" }
turbo-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230427.3" }
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230427.2" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230427.3" }
# [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230427.2" }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230427.3" }
# General Deps
......
......@@ -10,8 +10,8 @@
"check": "tsc --noEmit"
},
"dependencies": {
"@vercel/turbopack-dev": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230427.2",
"@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230427.2",
"@vercel/turbopack-dev": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230427.3",
"@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230427.3",
"anser": "^2.1.1",
"css.escape": "^1.5.1",
"next": "*",
......
......@@ -284,6 +284,7 @@ async function runOperation(renderData: RenderData) {
assetPrefix: '',
pageConfig: {},
reactLoadableManifest: {},
nextConfigOutput: renderData.data?.nextConfigOutput,
}
const result = await renderToHTMLOrFlight(
req,
......
......@@ -181,6 +181,7 @@ export default function startHandler({
basePath: '',
// TODO(WEB-583) this isn't correct, instead it should set `dev: true`
nextExport: true,
nextConfigOutput: renderData.data?.nextConfigOutput,
resolvedUrl: renderData.url,
optimizeFonts: false,
optimizeCss: false,
......
import { NextParsedUrlQuery } from 'next/dist/server/request-meta'
import type { RenderOptsPartial } from 'next/dist/server/render'
export type RenderData = {
params: Record<string, string | string[]>
......@@ -7,4 +7,7 @@ export type RenderData = {
path: string
rawQuery: string
rawHeaders: Array<[string, string]>
data?: {
nextConfigOutput?: RenderOptsPartial['nextConfigOutput']
}
}
......@@ -60,7 +60,7 @@ use turbo_binding::{
},
},
};
use turbo_tasks::{TryJoinIterExt, ValueToString};
use turbo_tasks::{primitives::JsonValueVc, TryJoinIterExt, ValueToString};
use crate::{
app_render::next_layout_entry_transition::NextServerComponentTransition,
......@@ -96,6 +96,7 @@ use crate::{
get_server_compile_time_info, get_server_module_options_context,
get_server_resolve_options_context, ServerContextType,
},
util::render_data,
};
#[turbo_tasks::function]
......@@ -421,6 +422,7 @@ pub async fn create_app_source(
client_compile_time_info,
next_config,
);
let render_data = render_data(next_config);
let sources = entrypoints
.await?
......@@ -438,6 +440,7 @@ pub async fn create_app_source(
server_runtime_entries,
fallback_page,
output_path,
render_data,
),
Entrypoint::AppRoute { path } => create_app_route_source_for_route(
pathname,
......@@ -449,6 +452,7 @@ pub async fn create_app_source(
server_root,
server_runtime_entries,
output_path,
render_data,
),
})
.chain(once(create_global_metadata_source(
......@@ -517,6 +521,7 @@ async fn create_app_page_source_for_route(
runtime_entries: AssetsVc,
fallback_page: DevHtmlAssetVc,
intermediate_output_path_root: FileSystemPathVc,
render_data: JsonValueVc,
) -> Result<ContentSourceVc> {
let pathname_vc = StringVc::cell(pathname.to_string());
......@@ -542,6 +547,7 @@ async fn create_app_page_source_for_route(
.cell()
.into(),
fallback_page,
render_data,
);
Ok(source.issue_context(app_dir, &format!("Next.js App Page Route {pathname}")))
......@@ -559,6 +565,7 @@ async fn create_app_route_source_for_route(
server_root: FileSystemPathVc,
runtime_entries: AssetsVc,
intermediate_output_path_root: FileSystemPathVc,
render_data: JsonValueVc,
) -> Result<ContentSourceVc> {
let pathname_vc = StringVc::cell(pathname.to_string());
......@@ -582,6 +589,7 @@ async fn create_app_route_source_for_route(
}
.cell()
.into(),
render_data,
);
Ok(source.issue_context(app_dir, &format!("Next.js App Route {pathname}")))
......
......@@ -63,6 +63,8 @@ pub struct NextConfig {
// Partially supported
pub compiler: Option<CompilerConfig>,
pub output: Option<OutputType>,
// unsupported
cross_origin: Option<String>,
amp: AmpConfig,
......@@ -85,7 +87,6 @@ pub struct NextConfig {
i18n: Option<I18NConfig>,
on_demand_entries: OnDemandEntriesConfig,
optimize_fonts: bool,
output: Option<OutputType>,
output_file_tracing: bool,
powered_by_header: bool,
production_browser_source_maps: bool,
......@@ -165,8 +166,9 @@ struct I18NConfig {
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, TraceRawVcs)]
#[serde(rename_all = "kebab-case")]
enum OutputType {
pub enum OutputType {
Standalone,
Export,
}
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, TraceRawVcs)]
......
......@@ -43,7 +43,7 @@ use turbo_binding::{
},
};
use turbo_tasks::{
primitives::{OptionStringVc, StringVc, StringsVc},
primitives::{JsonValueVc, OptionStringVc, StringVc, StringsVc},
trace::TraceRawVcs,
Value,
};
......@@ -78,7 +78,7 @@ use crate::{
pages_structure::{
OptionPagesStructureVc, PagesStructure, PagesStructureItem, PagesStructureVc,
},
util::{parse_config_from_source, pathname_for_path, NextRuntime},
util::{parse_config_from_source, pathname_for_path, render_data, NextRuntime},
};
/// Create a content source serving the `pages` or `src/pages` directory as
......@@ -245,6 +245,7 @@ pub async fn create_page_source(
next_config,
);
let render_data = render_data(next_config);
let page_extensions = next_config.page_extensions();
let force_not_found_source = create_not_found_page_source(
project_path,
......@@ -259,6 +260,7 @@ pub async fn create_page_source(
output_path.join("force_not_found"),
SpecificityVc::exact(),
NextExactMatcherVc::new(StringVc::cell("_next/404".to_string())).into(),
render_data,
);
let fallback_not_found_source = create_not_found_page_source(
project_path,
......@@ -273,6 +275,7 @@ pub async fn create_page_source(
output_path.join("fallback_not_found"),
SpecificityVc::not_found(),
NextFallbackMatcherVc::new().into(),
render_data,
);
let page_source = create_page_source_for_directory(
pages_structure,
......@@ -286,6 +289,7 @@ pub async fn create_page_source(
fallback_page,
server_root,
output_path,
render_data,
);
let fallback_source =
AssetGraphContentSourceVc::new_eager(server_root, fallback_page.as_asset());
......@@ -325,6 +329,7 @@ async fn create_page_source_for_file(
is_api_path: bool,
intermediate_output_path: FileSystemPathVc,
output_root: FileSystemPathVc,
render_data: JsonValueVc,
) -> Result<ContentSourceVc> {
let server_chunking_context = DevChunkingContextVc::builder(
project_path,
......@@ -384,6 +389,7 @@ async fn create_page_source_for_file(
}
.cell()
.into(),
render_data,
)
} else {
let data_pathname = pathname_for_path(server_root, server_path, true, true);
......@@ -426,6 +432,7 @@ async fn create_page_source_for_file(
pathname,
ssr_entry,
fallback_page,
render_data,
),
create_node_rendered_source(
project_path,
......@@ -436,6 +443,7 @@ async fn create_page_source_for_file(
pathname,
ssr_data_entry,
fallback_page,
render_data,
),
create_page_loader(
server_root,
......@@ -478,6 +486,7 @@ async fn create_not_found_page_source(
intermediate_output_path: FileSystemPathVc,
specificity: SpecificityVc,
route_matcher: RouteMatcherVc,
render_data: JsonValueVc,
) -> Result<ContentSourceVc> {
let server_chunking_context = DevChunkingContextVc::builder(
project_path,
......@@ -549,6 +558,7 @@ async fn create_not_found_page_source(
pathname,
ssr_entry,
fallback_page,
render_data,
),
page_loader,
])
......@@ -571,6 +581,7 @@ async fn create_page_source_for_directory(
fallback_page: DevHtmlAssetVc,
server_root: FileSystemPathVc,
output_root: FileSystemPathVc,
render_data: JsonValueVc,
) -> Result<ContentSourceVc> {
let PagesStructure {
ref items,
......@@ -601,6 +612,7 @@ async fn create_page_source_for_directory(
false,
output_root,
output_root,
render_data,
)
.issue_context(page, "Next.js pages directory"),
PagesStructureItem::Api {
......@@ -623,6 +635,7 @@ async fn create_page_source_for_directory(
true,
output_root,
output_root,
render_data,
)
.issue_context(api, "Next.js pages api directory"),
};
......@@ -642,6 +655,7 @@ async fn create_page_source_for_directory(
fallback_page,
server_root,
output_root,
render_data,
))
}
......
......@@ -22,9 +22,13 @@ use turbo_binding::{
turbopack::condition::ContextCondition,
},
};
use turbo_tasks::{primitives::StringVc, trace::TraceRawVcs, Value, ValueToString};
use turbo_tasks::{
primitives::{JsonValue, JsonValueVc, StringVc},
trace::TraceRawVcs,
Value, ValueToString,
};
use crate::next_config::NextConfigVc;
use crate::next_config::{NextConfigVc, OutputType};
/// Converts a filename within the server root into a next pathname.
#[turbo_tasks::function]
......@@ -348,3 +352,19 @@ pub async fn load_next_json<T: DeserializeOwned>(
Ok(result)
}
#[turbo_tasks::function]
pub async fn render_data(next_config: NextConfigVc) -> Result<JsonValueVc> {
#[derive(Serialize)]
#[serde(rename_all = "camelCase")]
struct Data {
next_config_output: Option<OutputType>,
}
let config = next_config.await?;
let value = serde_json::to_value(Data {
next_config_output: config.output.clone(),
})?;
Ok(JsonValue(value).cell())
}
......@@ -1018,8 +1018,8 @@ importers:
'@types/react': 18.0.37
'@types/react-dom': 18.0.11
'@vercel/ncc': ^0.36.0
'@vercel/turbopack-dev': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230427.2
'@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230427.2
'@vercel/turbopack-dev': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230427.3
'@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230427.3
anser: ^2.1.1
css.escape: ^1.5.1
find-up: ^6.3.0
......@@ -1031,8 +1031,8 @@ importers:
stacktrace-parser: ^0.1.10
strip-ansi: ^7.0.1
dependencies:
'@vercel/turbopack-dev': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230427.2_react-refresh@0.12.0'
'@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230427.2'
'@vercel/turbopack-dev': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230427.3_react-refresh@0.12.0'
'@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230427.3'
anser: 2.1.1
css.escape: 1.5.1
next: link:../../../../next
......@@ -6002,7 +6002,7 @@ packages:
dependencies:
'@mdx-js/mdx': 2.2.1
source-map: 0.7.3
webpack: 5.74.0
webpack: 5.74.0_@swc+core@1.3.55
transitivePeerDependencies:
- supports-color
......@@ -6672,7 +6672,6 @@ packages:
cpu: [arm64]
os: [darwin]
requiresBuild: true
dev: true
optional: true
/@swc/core-darwin-x64/1.3.55:
......@@ -6681,7 +6680,6 @@ packages:
cpu: [x64]
os: [darwin]
requiresBuild: true
dev: true
optional: true
/@swc/core-linux-arm-gnueabihf/1.3.55:
......@@ -6690,7 +6688,6 @@ packages:
cpu: [arm]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@swc/core-linux-arm64-gnu/1.3.55:
......@@ -6699,7 +6696,6 @@ packages:
cpu: [arm64]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@swc/core-linux-arm64-musl/1.3.55:
......@@ -6708,7 +6704,6 @@ packages:
cpu: [arm64]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@swc/core-linux-x64-gnu/1.3.55:
......@@ -6717,7 +6712,6 @@ packages:
cpu: [x64]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@swc/core-linux-x64-musl/1.3.55:
......@@ -6726,7 +6720,6 @@ packages:
cpu: [x64]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@swc/core-win32-arm64-msvc/1.3.55:
......@@ -6735,7 +6728,6 @@ packages:
cpu: [arm64]
os: [win32]
requiresBuild: true
dev: true
optional: true
/@swc/core-win32-ia32-msvc/1.3.55:
......@@ -6744,7 +6736,6 @@ packages:
cpu: [ia32]
os: [win32]
requiresBuild: true
dev: true
optional: true
/@swc/core-win32-x64-msvc/1.3.55:
......@@ -6753,7 +6744,6 @@ packages:
cpu: [x64]
os: [win32]
requiresBuild: true
dev: true
optional: true
/@swc/core/1.3.55_@swc+helpers@0.5.1:
......@@ -6778,7 +6768,6 @@ packages:
'@swc/core-win32-arm64-msvc': 1.3.55
'@swc/core-win32-ia32-msvc': 1.3.55
'@swc/core-win32-x64-msvc': 1.3.55
dev: true
/@swc/helpers/0.4.14:
resolution: {integrity: sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==}
......@@ -23775,7 +23764,6 @@ packages:
source-map: 0.6.1
terser: 5.14.1
webpack: 5.74.0_@swc+core@1.3.55
dev: true
/terser-webpack-plugin/5.2.4_webpack@5.74.0:
resolution: {integrity: sha512-E2CkNMN+1cho04YpdANyRrn8CyN4yMy+WdFKZIySFZrGXZxJwJP6PMNGGc/Mcr6qygQHUUqRxnAPmi0M9f00XA==}
......@@ -25181,7 +25169,6 @@ packages:
- '@swc/core'
- esbuild
- uglify-js
dev: true
/websocket-driver/0.7.3:
resolution: {integrity: sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==}
......@@ -25587,9 +25574,9 @@ packages:
/zwitch/2.0.4:
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
'@gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230427.2_react-refresh@0.12.0':
resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230427.2}
id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230427.2'
'@gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230427.3_react-refresh@0.12.0':
resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230427.3}
id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230427.3'
name: '@vercel/turbopack-dev'
version: 0.0.0
dependencies:
......@@ -25599,8 +25586,8 @@ packages:
- webpack
dev: false
'@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230427.2':
resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230427.2}
'@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230427.3':
resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230427.3}
name: '@vercel/turbopack-node'
version: 0.0.0
dependencies:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment