Unverified Commit 25e6db42 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

Turbopack: add edge app routes (#53387)

### What?

* adds middleware manifest and other missing items for edge app routes
* fixes react-server condition in edge context
* fixes node.js route context

---------
Co-authored-by: 's avatarAlex Kirszenberg <alex.kirszenberg@vercel.com>
parent 9483ff17
use anyhow::{Context, Result}; use anyhow::{bail, Context, Result};
use next_core::{ use next_core::{
all_server_paths, all_server_paths,
app_structure::{ app_structure::{
...@@ -18,8 +18,10 @@ use next_core::{ ...@@ -18,8 +18,10 @@ use next_core::{
ClientReferenceGraph, ClientReferenceType, NextEcmascriptClientReferenceTransition, ClientReferenceGraph, ClientReferenceType, NextEcmascriptClientReferenceTransition,
}, },
next_dynamic::{NextDynamicEntries, NextDynamicTransition}, next_dynamic::{NextDynamicEntries, NextDynamicTransition},
next_edge::route_regex::get_named_middleware_regex,
next_manifests::{ next_manifests::{
AppBuildManifest, AppPathsManifest, BuildManifest, ClientReferenceManifest, PagesManifest, AppBuildManifest, AppPathsManifest, BuildManifest, ClientReferenceManifest,
EdgeFunctionDefinition, MiddlewareMatcher, MiddlewaresManifestV2, PagesManifest, Regions,
}, },
next_server::{ next_server::{
get_server_module_options_context, get_server_resolve_options_context, get_server_module_options_context, get_server_resolve_options_context,
...@@ -638,37 +640,105 @@ impl AppEndpoint { ...@@ -638,37 +640,105 @@ impl AppEndpoint {
let endpoint_output = match app_entry.config.await?.runtime.unwrap_or_default() { let endpoint_output = match app_entry.config.await?.runtime.unwrap_or_default() {
NextRuntime::Edge => { NextRuntime::Edge => {
// create edge chunks
let chunking_context = this.app_project.project().edge_rsc_chunking_context(); let chunking_context = this.app_project.project().edge_rsc_chunking_context();
let mut evaluatable_assets = this
.app_project
.edge_rsc_runtime_entries()
.await?
.clone_value();
let Some(evaluatable) = Vc::try_resolve_sidecast(app_entry.rsc_entry).await? else {
bail!("Entry module must be evaluatable");
};
evaluatable_assets.push(evaluatable);
let files = chunking_context.evaluated_chunk_group( let files = chunking_context.evaluated_chunk_group(
app_entry app_entry
.rsc_entry .rsc_entry
.as_root_chunk(Vc::upcast(chunking_context)), .as_root_chunk(Vc::upcast(chunking_context)),
this.app_project.edge_rsc_runtime_entries(), Vc::cell(evaluatable_assets),
); );
// TODO concatenation is not good, we should use all files once next.js supports output_assets.extend(files.await?.iter().copied());
// that output_assets.extend(files.await?.iter().copied());
let file = concatenate_output_assets( let node_root_value = node_root.await?;
server_path.join(format!( let files_paths_from_root = files
"app/{original_name}.js", .await?
.iter()
.map(move |&file| {
let node_root_value = node_root_value.clone();
async move {
Ok(node_root_value
.get_path_to(&*file.ident().path().await?)
.map(|path| path.to_string()))
}
})
.try_flat_join()
.await?;
let server_path_value = server_path.await?;
let files_paths_from_server = files
.await?
.iter()
.map(move |&file| {
let server_path_value = server_path_value.clone();
async move {
Ok(server_path_value
.get_path_to(&*file.ident().path().await?)
.map(|path| path.to_string()))
}
})
.try_flat_join()
.await?;
let base_file = files_paths_from_server[0].to_string();
// create middleware manifest
// TODO(alexkirsz) This should be shared with next build.
let named_regex = get_named_middleware_regex(&app_entry.pathname);
let matchers = MiddlewareMatcher {
regexp: named_regex,
original_source: app_entry.pathname.clone(),
..Default::default()
};
let edge_function_definition = EdgeFunctionDefinition {
files: files_paths_from_root,
name: app_entry.original_name.to_string(),
page: app_entry.original_name.clone(),
regions: app_entry
.config
.await?
.preferred_region
.clone()
.map(Regions::Single),
matchers: vec![matchers],
..Default::default()
};
let middleware_manifest_v2 = MiddlewaresManifestV2 {
sorted_middleware: vec![app_entry.original_name.clone()],
middleware: Default::default(),
functions: [(app_entry.original_name.clone(), edge_function_definition)]
.into_iter()
.collect(),
};
let middleware_manifest_v2 = Vc::upcast(VirtualOutputAsset::new(
node_root.join(format!(
"server/app{original_name}/middleware-manifest.json",
original_name = app_entry.original_name original_name = app_entry.original_name
)), )),
files, AssetContent::file(
); FileContent::Content(File::from(serde_json::to_string_pretty(
output_assets.push(file); &middleware_manifest_v2,
)?))
let app_paths_manifest_output = create_app_paths_manifest( .cell(),
node_root, ),
&app_entry.original_name, ));
server_path output_assets.push(middleware_manifest_v2);
.await?
.get_path_to(&*file.ident().path().await?) // create app paths manifest
.expect("edge bundle path should be within app paths manifest directory") let app_paths_manifest_output =
.to_string(), create_app_paths_manifest(node_root, &app_entry.original_name, base_file)?;
)?;
output_assets.push(app_paths_manifest_output); output_assets.push(app_paths_manifest_output);
AppEndpointOutput::Edge { AppEndpointOutput::Edge {
file, files,
output_assets: Vc::cell(output_assets), output_assets: Vc::cell(output_assets),
} }
} }
...@@ -772,13 +842,20 @@ impl Endpoint for AppEndpoint { ...@@ -772,13 +842,20 @@ impl Endpoint for AppEndpoint {
server_paths, server_paths,
}, },
AppEndpointOutput::Edge { AppEndpointOutput::Edge {
file, files,
output_assets: _, output_assets: _,
} => WrittenEndpoint::Edge { } => WrittenEndpoint::Edge {
files: vec![node_root_ref files: files
.get_path_to(&*file.ident().path().await?) .await?
.context("edge chunk file path must be inside the node root")? .iter()
.to_string()], .map(|&file| async move {
Ok(node_root_ref
.get_path_to(&*file.ident().path().await?)
.context("edge chunk file path must be inside the node root")?
.to_string())
})
.try_join()
.await?,
global_var_name: "TODO".to_string(), global_var_name: "TODO".to_string(),
server_paths, server_paths,
}, },
...@@ -800,7 +877,7 @@ enum AppEndpointOutput { ...@@ -800,7 +877,7 @@ enum AppEndpointOutput {
output_assets: Vc<OutputAssets>, output_assets: Vc<OutputAssets>,
}, },
Edge { Edge {
file: Vc<Box<dyn OutputAsset>>, files: Vc<OutputAssets>,
output_assets: Vc<OutputAssets>, output_assets: Vc<OutputAssets>,
}, },
} }
...@@ -815,7 +892,7 @@ impl AppEndpointOutput { ...@@ -815,7 +892,7 @@ impl AppEndpointOutput {
output_assets, output_assets,
} => output_assets, } => output_assets,
AppEndpointOutput::Edge { AppEndpointOutput::Edge {
file: _, files: _,
output_assets, output_assets,
} => output_assets, } => output_assets,
} }
......
...@@ -85,9 +85,12 @@ use crate::{ ...@@ -85,9 +85,12 @@ use crate::{
route_transition::NextEdgeRouteTransition, route_transition::NextEdgeRouteTransition,
}, },
next_route_matcher::{NextFallbackMatcher, NextParamsMatcher}, next_route_matcher::{NextFallbackMatcher, NextParamsMatcher},
next_server::context::{ next_server::{
get_server_compile_time_info, get_server_module_options_context, context::{
get_server_resolve_options_context, ServerContextType, get_server_compile_time_info, get_server_module_options_context,
get_server_resolve_options_context, ServerContextType,
},
route_transition::NextRouteTransition,
}, },
util::{render_data, NextRuntime}, util::{render_data, NextRuntime},
}; };
...@@ -231,12 +234,12 @@ fn next_server_component_transition( ...@@ -231,12 +234,12 @@ fn next_server_component_transition(
execution_context: Vc<ExecutionContext>, execution_context: Vc<ExecutionContext>,
app_dir: Vc<FileSystemPath>, app_dir: Vc<FileSystemPath>,
server_root: Vc<FileSystemPath>, server_root: Vc<FileSystemPath>,
mode: NextMode,
process_env: Vc<Box<dyn ProcessEnv>>, process_env: Vc<Box<dyn ProcessEnv>>,
next_config: Vc<NextConfig>, next_config: Vc<NextConfig>,
server_addr: Vc<ServerAddr>, server_addr: Vc<ServerAddr>,
ecmascript_client_reference_transition_name: Vc<String>, ecmascript_client_reference_transition_name: Vc<String>,
) -> Vc<Box<dyn Transition>> { ) -> Vc<Box<dyn Transition>> {
let mode = NextMode::DevServer;
let ty = Value::new(ServerContextType::AppRSC { let ty = Value::new(ServerContextType::AppRSC {
app_dir, app_dir,
client_transition: None, client_transition: None,
...@@ -261,6 +264,37 @@ fn next_server_component_transition( ...@@ -261,6 +264,37 @@ fn next_server_component_transition(
) )
} }
#[turbo_tasks::function]
fn next_route_transition(
project_path: Vc<FileSystemPath>,
app_dir: Vc<FileSystemPath>,
process_env: Vc<Box<dyn ProcessEnv>>,
next_config: Vc<NextConfig>,
server_addr: Vc<ServerAddr>,
execution_context: Vc<ExecutionContext>,
) -> Vc<Box<dyn Transition>> {
let mode = NextMode::DevServer;
let server_ty = Value::new(ServerContextType::AppRoute { app_dir });
let server_compile_time_info = get_server_compile_time_info(mode, process_env, server_addr);
let server_resolve_options_context = get_server_resolve_options_context(
project_path,
server_ty,
mode,
next_config,
execution_context,
);
Vc::upcast(
NextRouteTransition {
server_compile_time_info,
server_resolve_options_context,
}
.cell(),
)
}
#[turbo_tasks::function] #[turbo_tasks::function]
fn next_edge_server_component_transition( fn next_edge_server_component_transition(
project_path: Vc<FileSystemPath>, project_path: Vc<FileSystemPath>,
...@@ -422,6 +456,17 @@ fn app_context( ...@@ -422,6 +456,17 @@ fn app_context(
execution_context, execution_context,
), ),
); );
transitions.insert(
"next-route".to_string(),
next_route_transition(
project_path,
app_dir,
env,
next_config,
server_addr,
execution_context,
),
);
transitions.insert( transitions.insert(
"next-edge-page".to_string(), "next-edge-page".to_string(),
next_edge_page_transition( next_edge_page_transition(
...@@ -443,7 +488,6 @@ fn app_context( ...@@ -443,7 +488,6 @@ fn app_context(
execution_context, execution_context,
app_dir, app_dir,
server_root, server_root,
mode,
env, env,
next_config, next_config,
server_addr, server_addr,
...@@ -1080,6 +1124,14 @@ impl AppRoute { ...@@ -1080,6 +1124,14 @@ impl AppRoute {
Some(NextRuntime::NodeJs) | None => { Some(NextRuntime::NodeJs) | None => {
let bootstrap_asset = next_asset("entry/app/route.ts".to_string()); let bootstrap_asset = next_asset("entry/app/route.ts".to_string());
let entry_asset = this
.context
.with_transition("next-route".to_string())
.process(
Vc::upcast(entry_file_source),
Value::new(ReferenceType::Entry(EntryReferenceSubType::AppRoute)),
);
route_bootstrap( route_bootstrap(
entry_asset, entry_asset,
Vc::upcast(this.context), Vc::upcast(this.context),
......
...@@ -27,7 +27,7 @@ mod next_client_component; ...@@ -27,7 +27,7 @@ mod next_client_component;
pub mod next_client_reference; pub mod next_client_reference;
pub mod next_config; pub mod next_config;
pub mod next_dynamic; pub mod next_dynamic;
mod next_edge; pub mod next_edge;
mod next_font; mod next_font;
pub mod next_image; pub mod next_image;
mod next_import_map; mod next_import_map;
......
...@@ -77,7 +77,7 @@ pub async fn get_app_route_favicon_entry( ...@@ -77,7 +77,7 @@ pub async fn get_app_route_favicon_entry(
let file = File::from(code.build()); let file = File::from(code.build());
let source = let source =
// TODO(alexkirsz) Figure out how to name this virtual source. // TODO(alexkirsz) Figure out how to name this virtual source.
VirtualSource::new(project_root.join("todo.tsx".to_string()), AssetContent::file(file.into())); VirtualSource::new(project_root.join("favicon-entry.tsx".to_string()), AssetContent::file(file.into()));
Ok(get_app_route_entry( Ok(get_app_route_entry(
nodejs_context, nodejs_context,
......
...@@ -37,7 +37,8 @@ pub async fn get_app_page_entry( ...@@ -37,7 +37,8 @@ pub async fn get_app_page_entry(
project_root: Vc<FileSystemPath>, project_root: Vc<FileSystemPath>,
) -> Result<Vc<AppEntry>> { ) -> Result<Vc<AppEntry>> {
let config = parse_segment_config_from_loader_tree(loader_tree, Vc::upcast(nodejs_context)); let config = parse_segment_config_from_loader_tree(loader_tree, Vc::upcast(nodejs_context));
let context = if matches!(config.await?.runtime, Some(NextRuntime::Edge)) { let is_edge = matches!(config.await?.runtime, Some(NextRuntime::Edge));
let context = if is_edge {
edge_context edge_context
} else { } else {
nodejs_context nodejs_context
...@@ -139,6 +140,10 @@ pub async fn get_app_page_entry( ...@@ -139,6 +140,10 @@ pub async fn get_app_page_entry(
Value::new(ReferenceType::Internal(Vc::cell(inner_assets))), Value::new(ReferenceType::Internal(Vc::cell(inner_assets))),
); );
if is_edge {
todo!("edge pages are not supported yet")
}
let Some(rsc_entry) = let Some(rsc_entry) =
Vc::try_resolve_downcast::<Box<dyn EcmascriptChunkPlaceable>>(rsc_entry).await? Vc::try_resolve_downcast::<Box<dyn EcmascriptChunkPlaceable>>(rsc_entry).await?
else { else {
......
use std::io::Write;
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use indexmap::indexmap; use indexmap::indexmap;
use indoc::writedoc;
use turbo_tasks::{Value, ValueToString, Vc}; use turbo_tasks::{Value, ValueToString, Vc};
use turbopack_binding::{ use turbopack_binding::{
turbo::tasks_fs::{rope::RopeBuilder, File, FileSystemPath}, turbo::tasks_fs::{rope::RopeBuilder, File, FileSystemPath},
...@@ -7,9 +10,8 @@ use turbopack_binding::{ ...@@ -7,9 +10,8 @@ use turbopack_binding::{
core::{ core::{
asset::AssetContent, asset::AssetContent,
context::AssetContext, context::AssetContext,
reference_type::{ module::Module,
EcmaScriptModulesReferenceSubType, EntryReferenceSubType, ReferenceType, reference_type::{EntryReferenceSubType, ReferenceType},
},
source::Source, source::Source,
virtual_source::VirtualSource, virtual_source::VirtualSource,
}, },
...@@ -41,7 +43,8 @@ pub async fn get_app_route_entry( ...@@ -41,7 +43,8 @@ pub async fn get_app_route_entry(
), ),
source, source,
); );
let context = if matches!(config.await?.runtime, Some(NextRuntime::Edge)) { let is_edge = matches!(config.await?.runtime, Some(NextRuntime::Edge));
let context = if is_edge {
edge_context edge_context
} else { } else {
nodejs_context nodejs_context
...@@ -102,22 +105,24 @@ pub async fn get_app_route_entry( ...@@ -102,22 +105,24 @@ pub async fn get_app_route_entry(
let virtual_source = VirtualSource::new(template_path, AssetContent::file(file.into())); let virtual_source = VirtualSource::new(template_path, AssetContent::file(file.into()));
let entry = context.process( let userland_module = context.process(
source, source,
Value::new(ReferenceType::EcmaScriptModules( Value::new(ReferenceType::Entry(EntryReferenceSubType::AppRoute)),
EcmaScriptModulesReferenceSubType::Undefined,
)),
); );
let inner_assets = indexmap! { let inner_assets = indexmap! {
"VAR_USERLAND".to_string() => entry "VAR_USERLAND".to_string() => userland_module
}; };
let rsc_entry = context.process( let mut rsc_entry = context.process(
Vc::upcast(virtual_source), Vc::upcast(virtual_source),
Value::new(ReferenceType::Internal(Vc::cell(inner_assets))), Value::new(ReferenceType::Internal(Vc::cell(inner_assets))),
); );
if is_edge {
rsc_entry = wrap_edge_entry(context, project_root, rsc_entry, original_page_name.clone());
}
let Some(rsc_entry) = let Some(rsc_entry) =
Vc::try_resolve_downcast::<Box<dyn EcmascriptChunkPlaceable>>(rsc_entry).await? Vc::try_resolve_downcast::<Box<dyn EcmascriptChunkPlaceable>>(rsc_entry).await?
else { else {
...@@ -133,6 +138,44 @@ pub async fn get_app_route_entry( ...@@ -133,6 +138,44 @@ pub async fn get_app_route_entry(
.cell()) .cell())
} }
#[turbo_tasks::function]
pub async fn wrap_edge_entry(
context: Vc<ModuleAssetContext>,
project_root: Vc<FileSystemPath>,
entry: Vc<Box<dyn Module>>,
original_name: String,
) -> Result<Vc<Box<dyn Module>>> {
let mut source = RopeBuilder::default();
writedoc!(
source,
r#"
import {{ EdgeRouteModuleWrapper }} from 'next/dist/esm/server/web/edge-route-module-wrapper'
import * as module from "MODULE"
self._ENTRIES ||= {{}}
self._ENTRIES[{}] = {{
ComponentMod: module,
default: EdgeRouteModuleWrapper.wrap(module.routeModule),
}}
"#,
StringifyJs(&format_args!("middleware_{}", original_name))
)?;
let file = File::from(source.build());
// TODO(alexkirsz) Figure out how to name this virtual asset.
let virtual_source = VirtualSource::new(
project_root.join("edge-wrapper.js".to_string()),
AssetContent::file(file.into()),
);
let inner_assets = indexmap! {
"MODULE".to_string() => entry
};
Ok(context.process(
Vc::upcast(virtual_source),
Value::new(ReferenceType::Internal(Vc::cell(inner_assets))),
))
}
fn get_original_route_name(pathname: &str) -> String { fn get_original_route_name(pathname: &str) -> String {
match pathname { match pathname {
"/" => "/route".to_string(), "/" => "/route".to_string(),
......
...@@ -96,14 +96,13 @@ pub async fn get_edge_resolve_options_context( ...@@ -96,14 +96,13 @@ pub async fn get_edge_resolve_options_context(
]; ];
match ty { match ty {
ServerContextType::AppRSC { .. } ServerContextType::AppRSC { .. } | ServerContextType::AppRoute { .. } => {
| ServerContextType::AppRoute { .. }
| ServerContextType::Middleware { .. } => {
custom_conditions.push("react-server".to_string()) custom_conditions.push("react-server".to_string())
} }
ServerContextType::Pages { .. } ServerContextType::Pages { .. }
| ServerContextType::PagesData { .. } | ServerContextType::PagesData { .. }
| ServerContextType::AppSSR { .. } => {} | ServerContextType::AppSSR { .. }
| ServerContextType::Middleware { .. } => {}
}; };
let resolve_options_context = ResolveOptionsContext { let resolve_options_context = ResolveOptionsContext {
...@@ -141,8 +140,8 @@ pub fn get_edge_chunking_context( ...@@ -141,8 +140,8 @@ pub fn get_edge_chunking_context(
Vc::upcast( Vc::upcast(
DevChunkingContext::builder( DevChunkingContext::builder(
project_path, project_path,
node_root.join("edge".to_string()), node_root.join("server/edge".to_string()),
node_root.join("edge/chunks".to_string()), node_root.join("server/edge/chunks".to_string()),
get_client_assets_path(client_root), get_client_assets_path(client_root),
environment, environment,
) )
......
pub mod context; pub mod context;
pub mod page_transition; pub mod page_transition;
pub mod route_regex;
pub mod route_transition; pub mod route_transition;
//! The following code was mostly generated using GTP-4 from
//! next.js/packages/next/src/shared/lib/router/utils/route-regex.ts
use std::collections::HashMap;
use once_cell::sync::Lazy;
use regex::Regex;
const INTERCEPTION_ROUTE_MARKERS: [&str; 4] = ["(..)(..)", "(.)", "(..)", "(...)"];
const NEXT_QUERY_PARAM_PREFIX: &str = "nxtP";
const NEXT_INTERCEPTION_MARKER_PREFIX: &str = "nxtI";
#[derive(Debug, Clone)]
pub struct Group {
pub pos: usize,
pub repeat: bool,
pub optional: bool,
}
#[derive(Debug)]
pub struct RouteRegex {
pub groups: HashMap<String, Group>,
pub regex: String,
}
#[derive(Debug)]
pub struct NamedRouteRegex {
pub regex: RouteRegex,
pub named_regex: String,
pub route_keys: HashMap<String, String>,
}
#[derive(Debug)]
pub struct NamedMiddlewareRegex {
pub named_regex: String,
}
struct ParsedParameter {
key: String,
repeat: bool,
optional: bool,
}
/// Parses a given parameter from a route to a data structure that can be used
/// to generate the parametrized route. Examples:
/// - `[...slug]` -> `{ key: 'slug', repeat: true, optional: true }`
/// - `...slug` -> `{ key: 'slug', repeat: true, optional: false }`
/// - `[foo]` -> `{ key: 'foo', repeat: false, optional: true }`
/// - `bar` -> `{ key: 'bar', repeat: false, optional: false }`
fn parse_parameter(param: &str) -> ParsedParameter {
let mut key = param.to_string();
let optional = key.starts_with('[') && key.ends_with(']');
if optional {
key = key[1..key.len() - 1].to_string();
}
let repeat = key.starts_with("...");
if repeat {
key = key[3..].to_string();
}
ParsedParameter {
key,
repeat,
optional,
}
}
fn escape_string_regexp(segment: &str) -> String {
regex::escape(segment)
}
fn remove_trailing_slash(route: &str) -> &str {
route.trim_end_matches('/')
}
static PARAM_MATCH_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"\[((?:\[.*\])|.+)\]").unwrap());
fn get_parametrized_route(route: &str) -> (String, HashMap<String, Group>) {
let segments: Vec<&str> = remove_trailing_slash(route)[1..].split('/').collect();
let mut groups: HashMap<String, Group> = HashMap::new();
let mut group_index = 1;
let parameterized_route = segments
.iter()
.map(|segment| {
let marker_match = INTERCEPTION_ROUTE_MARKERS
.iter()
.find(|&&m| segment.starts_with(m))
.copied();
let param_matches = PARAM_MATCH_REGEX.captures(segment);
if let Some(matches) = param_matches {
let ParsedParameter {
key,
optional,
repeat,
} = parse_parameter(&matches[1]);
groups.insert(
key,
Group {
pos: group_index,
repeat,
optional,
},
);
group_index += 1;
if let Some(marker) = marker_match {
return format!("/{}([^/]+?)", escape_string_regexp(marker));
} else {
return match (repeat, optional) {
(true, true) => "(?:/(.+?))?",
(true, false) => "/(.+?)",
(false, true) => "(?:/([^/]+?))?",
(false, false) => "/([^/]+?)",
}
.to_string();
}
}
format!("/{}", escape_string_regexp(segment))
})
.collect::<Vec<String>>()
.join("");
(parameterized_route, groups)
}
/// From a normalized route this function generates a regular expression and
/// a corresponding groups object intended to be used to store matching groups
/// from the regular expression.
pub fn get_route_regex(normalized_route: &str) -> RouteRegex {
let (parameterized_route, groups) = get_parametrized_route(normalized_route);
RouteRegex {
regex: format!("^{}(?:/)?$", parameterized_route),
groups,
}
}
/// Builds a function to generate a minimal routeKey using only a-z and minimal
/// number of characters.
fn build_get_safe_route_key() -> impl FnMut() -> String {
let mut i = 0;
move || {
let mut route_key = String::new();
i += 1;
let mut j = i;
while j > 0 {
route_key.push((97 + ((j - 1) % 26)) as u8 as char);
j = (j - 1) / 26;
}
i += 1;
route_key
}
}
fn get_safe_key_from_segment(
get_safe_route_key: &mut impl FnMut() -> String,
segment: &str,
route_keys: &mut HashMap<String, String>,
key_prefix: Option<&'static str>,
) -> String {
let ParsedParameter {
key,
optional,
repeat,
} = parse_parameter(segment);
// replace any non-word characters since they can break
// the named regex
let mut cleaned_key = key.replace(|c: char| !c.is_alphanumeric(), "");
if let Some(prefix) = key_prefix {
cleaned_key = format!("{}{}", prefix, cleaned_key);
}
let mut invalid_key = false;
// check if the key is still invalid and fallback to using a known
// safe key
if cleaned_key.is_empty() || cleaned_key.len() > 30 {
invalid_key = true;
}
if cleaned_key.chars().next().unwrap().is_numeric() {
invalid_key = true;
}
if invalid_key {
cleaned_key = get_safe_route_key();
}
if let Some(prefix) = key_prefix {
route_keys.insert(cleaned_key.clone(), format!("{}{}", prefix, key));
} else {
route_keys.insert(cleaned_key.clone(), key);
}
match (repeat, optional) {
(true, true) => format!(r"(?:/(?P<{}>.+?))?", cleaned_key),
(true, false) => format!(r"/(?P<{}>.+?)", cleaned_key),
(false, true) => format!(r"(?:/(?P<{}>[^/]+?))?", cleaned_key),
(false, false) => format!(r"/(?P<{}>[^/]+?)", cleaned_key),
}
}
fn get_named_parametrized_route(
route: &str,
prefix_route_keys: bool,
) -> (String, HashMap<String, String>) {
let segments: Vec<&str> = remove_trailing_slash(route)[1..].split('/').collect();
let get_safe_route_key = &mut build_get_safe_route_key();
let mut route_keys: HashMap<String, String> = HashMap::new();
let parameterized_route = segments
.iter()
.map(|segment| {
let key_prefix = if prefix_route_keys {
let has_interception_marker = INTERCEPTION_ROUTE_MARKERS
.iter()
.any(|&m| segment.starts_with(m));
if has_interception_marker {
Some(NEXT_INTERCEPTION_MARKER_PREFIX)
} else {
Some(NEXT_QUERY_PARAM_PREFIX)
}
} else {
None
};
let param_matches = Regex::new(r"\[((?:\[.*\])|.+)\]")
.unwrap()
.captures(segment);
if let Some(matches) = param_matches {
return get_safe_key_from_segment(
get_safe_route_key,
&matches[1],
&mut route_keys,
key_prefix,
);
}
format!("/{}", escape_string_regexp(segment))
})
.collect::<Vec<String>>()
.join("");
(parameterized_route, route_keys)
}
/// This function extends `getRouteRegex` generating also a named regexp where
/// each group is named along with a routeKeys object that indexes the assigned
/// named group with its corresponding key. When the routeKeys need to be
/// prefixed to uniquely identify internally the "prefixRouteKey" arg should
/// be "true" currently this is only the case when creating the routes-manifest
/// during the build
pub fn get_named_route_regex(normalized_route: &str) -> NamedRouteRegex {
let (parameterized_route, route_keys) = get_named_parametrized_route(normalized_route, false);
let regex = get_route_regex(normalized_route);
NamedRouteRegex {
regex,
named_regex: format!("^{}(?:/)?$", parameterized_route),
route_keys,
}
}
/// Generates a named regexp.
/// This is intended to be using for build time only.
pub fn get_named_middleware_regex(normalized_route: &str) -> String {
let (parameterized_route, _route_keys) = get_named_parametrized_route(normalized_route, true);
format!("^{}(?:/)?$", parameterized_route)
}
...@@ -29,6 +29,7 @@ use crate::{ ...@@ -29,6 +29,7 @@ use crate::{
local::{NextFontLocalCssModuleReplacer, NextFontLocalReplacer}, local::{NextFontLocalCssModuleReplacer, NextFontLocalReplacer},
}, },
next_server::context::ServerContextType, next_server::context::ServerContextType,
util::NextRuntime,
}; };
// Make sure to not add any external requests here. // Make sure to not add any external requests here.
...@@ -211,7 +212,7 @@ pub async fn get_next_server_import_map( ...@@ -211,7 +212,7 @@ pub async fn get_next_server_import_map(
let ty = ty.into_value(); let ty = ty.into_value();
insert_next_server_special_aliases(&mut import_map, ty, mode).await?; insert_next_server_special_aliases(&mut import_map, ty, mode, NextRuntime::NodeJs).await?;
let external = ImportMapping::External(None).cell(); let external = ImportMapping::External(None).cell();
match ty { match ty {
...@@ -283,7 +284,7 @@ pub async fn get_next_edge_import_map( ...@@ -283,7 +284,7 @@ pub async fn get_next_edge_import_map(
let ty = ty.into_value(); let ty = ty.into_value();
insert_next_server_special_aliases(&mut import_map, ty, mode).await?; insert_next_server_special_aliases(&mut import_map, ty, mode, NextRuntime::Edge).await?;
match ty { match ty {
ServerContextType::Pages { .. } | ServerContextType::PagesData { .. } => {} ServerContextType::Pages { .. } | ServerContextType::PagesData { .. } => {}
...@@ -356,25 +357,30 @@ static NEXT_ALIASES: [(&str, &str); 23] = [ ...@@ -356,25 +357,30 @@ static NEXT_ALIASES: [(&str, &str); 23] = [
("setImmediate", "next/dist/compiled/setimmediate"), ("setImmediate", "next/dist/compiled/setimmediate"),
]; ];
pub async fn insert_next_server_special_aliases( async fn insert_next_server_special_aliases(
import_map: &mut ImportMap, import_map: &mut ImportMap,
ty: ServerContextType, ty: ServerContextType,
mode: NextMode, mode: NextMode,
runtime: NextRuntime,
) -> Result<()> { ) -> Result<()> {
let external_if_node = move |context_dir: Vc<FileSystemPath>, request: &str| match runtime {
NextRuntime::Edge => request_to_import_mapping(context_dir, request),
NextRuntime::NodeJs => external_request_to_import_mapping(request),
};
match (mode, ty) { match (mode, ty) {
(_, ServerContextType::Pages { pages_dir }) => { (_, ServerContextType::Pages { pages_dir }) => {
import_map.insert_exact_alias( import_map.insert_exact_alias(
"@opentelemetry/api", "@opentelemetry/api",
// TODO(WEB-625) this actually need to prefer the local version of // TODO(WEB-625) this actually need to prefer the local version of
// @opentelemetry/api // @opentelemetry/api
external_request_to_import_mapping("next/dist/compiled/@opentelemetry/api"), external_if_node(pages_dir, "next/dist/compiled/@opentelemetry/api"),
); );
insert_alias_to_alternatives( insert_alias_to_alternatives(
import_map, import_map,
format!("{VIRTUAL_PACKAGE_NAME}/pages/_app"), format!("{VIRTUAL_PACKAGE_NAME}/pages/_app"),
vec![ vec![
request_to_import_mapping(pages_dir, "./_app"), request_to_import_mapping(pages_dir, "./_app"),
external_request_to_import_mapping("next/app"), external_if_node(pages_dir, "next/app"),
], ],
); );
insert_alias_to_alternatives( insert_alias_to_alternatives(
...@@ -382,7 +388,7 @@ pub async fn insert_next_server_special_aliases( ...@@ -382,7 +388,7 @@ pub async fn insert_next_server_special_aliases(
format!("{VIRTUAL_PACKAGE_NAME}/pages/_document"), format!("{VIRTUAL_PACKAGE_NAME}/pages/_document"),
vec![ vec![
request_to_import_mapping(pages_dir, "./_document"), request_to_import_mapping(pages_dir, "./_document"),
external_request_to_import_mapping("next/document"), external_if_node(pages_dir, "next/document"),
], ],
); );
insert_alias_to_alternatives( insert_alias_to_alternatives(
...@@ -390,7 +396,7 @@ pub async fn insert_next_server_special_aliases( ...@@ -390,7 +396,7 @@ pub async fn insert_next_server_special_aliases(
format!("{VIRTUAL_PACKAGE_NAME}/pages/_error"), format!("{VIRTUAL_PACKAGE_NAME}/pages/_error"),
vec![ vec![
request_to_import_mapping(pages_dir, "./_error"), request_to_import_mapping(pages_dir, "./_error"),
external_request_to_import_mapping("next/error"), external_if_node(pages_dir, "next/error"),
], ],
); );
} }
...@@ -485,14 +491,15 @@ pub async fn insert_next_server_special_aliases( ...@@ -485,14 +491,15 @@ pub async fn insert_next_server_special_aliases(
// * maps react-dom -> react-dom/server-rendering-stub // * maps react-dom -> react-dom/server-rendering-stub
// * passes through react and (react|react-dom|react-server-dom-webpack)/(.*) to // * passes through react and (react|react-dom|react-server-dom-webpack)/(.*) to
// next/dist/compiled/react and next/dist/compiled/$1/$2 resp. // next/dist/compiled/react and next/dist/compiled/$1/$2 resp.
(NextMode::Build | NextMode::Development, ServerContextType::AppSSR { .. }) => { (NextMode::Build | NextMode::Development, ServerContextType::AppSSR { app_dir }) => {
import_map.insert_exact_alias( import_map.insert_exact_alias(
"react", "react",
external_request_to_import_mapping("next/dist/compiled/react"), external_if_node(app_dir, "next/dist/compiled/react"),
); );
import_map.insert_exact_alias( import_map.insert_exact_alias(
"react-dom", "react-dom",
external_request_to_import_mapping( external_if_node(
app_dir,
"next/dist/compiled/react-dom/server-rendering-stub", "next/dist/compiled/react-dom/server-rendering-stub",
), ),
); );
...@@ -505,7 +512,7 @@ pub async fn insert_next_server_special_aliases( ...@@ -505,7 +512,7 @@ pub async fn insert_next_server_special_aliases(
"next/dist/compiled/react-server-dom-webpack/*", "next/dist/compiled/react-server-dom-webpack/*",
), ),
] { ] {
let import_mapping = external_request_to_import_mapping(request); let import_mapping = external_if_node(app_dir, request);
import_map.insert_wildcard_alias(wildcard_alias, import_mapping); import_map.insert_wildcard_alias(wildcard_alias, import_mapping);
} }
} }
......
...@@ -41,11 +41,74 @@ impl Default for MiddlewaresManifest { ...@@ -41,11 +41,74 @@ impl Default for MiddlewaresManifest {
} }
} }
#[derive(Serialize, Debug)]
#[serde(tag = "type", rename_all = "kebab-case")]
pub enum RouteHas {
Header {
key: String,
#[serde(skip_serializing_if = "Option::is_none")]
value: Option<String>,
},
Cookie {
key: String,
#[serde(skip_serializing_if = "Option::is_none")]
value: Option<String>,
},
Query {
key: String,
#[serde(skip_serializing_if = "Option::is_none")]
value: Option<String>,
},
Host {
value: String,
},
}
#[derive(Serialize, Default, Debug)]
#[serde(rename_all = "camelCase")]
pub struct MiddlewareMatcher {
pub regexp: String,
#[serde(skip_serializing_if = "bool_is_true")]
pub locale: bool,
#[serde(skip_serializing_if = "Option::is_none")]
pub has: Option<Vec<RouteHas>>,
#[serde(skip_serializing_if = "Option::is_none")]
pub missing: Option<Vec<RouteHas>>,
pub original_source: String,
}
fn bool_is_true(b: &bool) -> bool {
*b
}
#[derive(Serialize, Default, Debug)]
pub struct EdgeFunctionDefinition {
pub files: Vec<String>,
pub name: String,
pub page: String,
pub matchers: Vec<MiddlewareMatcher>,
// TODO: AssetBinding[]
#[serde(skip_serializing_if = "Option::is_none")]
pub wasm: Option<Vec<()>>,
// TODO: AssetBinding[]
#[serde(skip_serializing_if = "Option::is_none")]
pub assets: Option<Vec<()>>,
#[serde(skip_serializing_if = "Option::is_none")]
pub regions: Option<Regions>,
}
#[derive(Serialize, Debug)]
#[serde(untagged)]
pub enum Regions {
Multiple(Vec<String>),
Single(String),
}
#[derive(Serialize, Default, Debug)] #[derive(Serialize, Default, Debug)]
pub struct MiddlewaresManifestV2 { pub struct MiddlewaresManifestV2 {
pub sorted_middleware: Vec<()>, pub sorted_middleware: Vec<String>,
pub middleware: HashMap<String, ()>, pub middleware: HashMap<String, ()>,
pub functions: HashMap<String, ()>, pub functions: HashMap<String, EdgeFunctionDefinition>,
} }
#[derive(Serialize, Default, Debug)] #[derive(Serialize, Default, Debug)]
......
...@@ -108,14 +108,13 @@ pub async fn get_server_resolve_options_context( ...@@ -108,14 +108,13 @@ pub async fn get_server_resolve_options_context(
let mut custom_conditions = vec![mode.node_env().to_string(), "node".to_string()]; let mut custom_conditions = vec![mode.node_env().to_string(), "node".to_string()];
match ty { match ty {
ServerContextType::AppRSC { .. } ServerContextType::AppRSC { .. } | ServerContextType::AppRoute { .. } => {
| ServerContextType::AppRoute { .. }
| ServerContextType::Middleware { .. } => {
custom_conditions.push("react-server".to_string()) custom_conditions.push("react-server".to_string())
} }
ServerContextType::Pages { .. } ServerContextType::Pages { .. }
| ServerContextType::PagesData { .. } | ServerContextType::PagesData { .. }
| ServerContextType::AppSSR { .. } => {} | ServerContextType::AppSSR { .. }
| ServerContextType::Middleware { .. } => {}
}; };
let external_cjs_modules_plugin = ExternalCjsModulesResolvePlugin::new( let external_cjs_modules_plugin = ExternalCjsModulesResolvePlugin::new(
project_path, project_path,
......
pub(crate) mod context; pub(crate) mod context;
pub(crate) mod resolve; pub(crate) mod resolve;
pub mod route_transition;
pub(crate) mod transforms; pub(crate) mod transforms;
pub use context::{ pub use context::{
......
use turbo_tasks::Vc;
use turbopack_binding::turbopack::{
core::compile_time_info::CompileTimeInfo,
turbopack::{resolve_options_context::ResolveOptionsContext, transition::Transition},
};
#[turbo_tasks::value(shared)]
pub struct NextRouteTransition {
pub server_compile_time_info: Vc<CompileTimeInfo>,
pub server_resolve_options_context: Vc<ResolveOptionsContext>,
}
#[turbo_tasks::value_impl]
impl Transition for NextRouteTransition {
#[turbo_tasks::function]
fn process_compile_time_info(
&self,
_compile_time_info: Vc<CompileTimeInfo>,
) -> Vc<CompileTimeInfo> {
self.server_compile_time_info
}
#[turbo_tasks::function]
fn process_resolve_options_context(
&self,
_context: Vc<ResolveOptionsContext>,
) -> Vc<ResolveOptionsContext> {
self.server_resolve_options_context
}
}
import edgeThenNode from 'edge-then-node' import edgeThenNode from 'edge-then-node'
import nodeThenEdge from 'node-then-edge' import nodeThenEdge from 'node-then-edge'
import reactServer from 'react-server'
import ClientComponent from '../client' import ClientComponent from '../client'
export const runtime = 'edge' export const runtime = 'edge'
...@@ -11,6 +12,7 @@ export default function AppEdge() { ...@@ -11,6 +12,7 @@ export default function AppEdge() {
{JSON.stringify({ {JSON.stringify({
edgeThenNode, edgeThenNode,
nodeThenEdge, nodeThenEdge,
reactServer,
})} })}
</div> </div>
<ClientComponent /> <ClientComponent />
......
import edgeThenNode from 'edge-then-node' import edgeThenNode from 'edge-then-node'
import nodeThenEdge from 'node-then-edge' import nodeThenEdge from 'node-then-edge'
import reactServer from 'react-server'
import ClientComponent from '../client' import ClientComponent from '../client'
export const runtime = 'nodejs' export const runtime = 'nodejs'
...@@ -11,6 +12,7 @@ export default function AppNodeJs() { ...@@ -11,6 +12,7 @@ export default function AppNodeJs() {
{JSON.stringify({ {JSON.stringify({
edgeThenNode, edgeThenNode,
nodeThenEdge, nodeThenEdge,
reactServer,
})} })}
</div> </div>
<ClientComponent /> <ClientComponent />
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
import edgeThenNode from 'edge-then-node' import edgeThenNode from 'edge-then-node'
import nodeThenEdge from 'node-then-edge' import nodeThenEdge from 'node-then-edge'
import reactServer from 'react-server'
export const runtime = 'edge' export const runtime = 'edge'
...@@ -11,6 +12,7 @@ export default function ClientComponent() { ...@@ -11,6 +12,7 @@ export default function ClientComponent() {
{JSON.stringify({ {JSON.stringify({
edgeThenNode, edgeThenNode,
nodeThenEdge, nodeThenEdge,
reactServer,
})} })}
</div> </div>
) )
......
import edgeThenNode from 'edge-then-node' import edgeThenNode from 'edge-then-node'
import nodeThenEdge from 'node-then-edge' import nodeThenEdge from 'node-then-edge'
import reactServer from 'react-server'
export const runtime = 'edge' export const runtime = 'edge'
...@@ -7,5 +8,6 @@ export function GET() { ...@@ -7,5 +8,6 @@ export function GET() {
return Response.json({ return Response.json({
edgeThenNode, edgeThenNode,
nodeThenEdge, nodeThenEdge,
reactServer,
}) })
} }
import edgeThenNode from 'edge-then-node' import edgeThenNode from 'edge-then-node'
import nodeThenEdge from 'node-then-edge' import nodeThenEdge from 'node-then-edge'
import reactServer from 'react-server'
export const runtime = 'nodejs' export const runtime = 'nodejs'
...@@ -7,5 +8,6 @@ export function GET() { ...@@ -7,5 +8,6 @@ export function GET() {
return Response.json({ return Response.json({
edgeThenNode, edgeThenNode,
nodeThenEdge, nodeThenEdge,
reactServer,
}) })
} }
...@@ -39,6 +39,7 @@ function runTests() { ...@@ -39,6 +39,7 @@ function runTests() {
server: { server: {
edgeThenNode: 'node', edgeThenNode: 'node',
nodeThenEdge: 'node', nodeThenEdge: 'node',
reactServer: 'default',
}, },
}) })
}) })
...@@ -51,6 +52,7 @@ function runTests() { ...@@ -51,6 +52,7 @@ function runTests() {
server: { server: {
edgeThenNode: 'edge', edgeThenNode: 'edge',
nodeThenEdge: 'edge', nodeThenEdge: 'edge',
reactServer: 'default',
}, },
}) })
// TODO: delete this. // TODO: delete this.
...@@ -58,6 +60,7 @@ function runTests() { ...@@ -58,6 +60,7 @@ function runTests() {
server: { server: {
edgeThenNode: 'node', edgeThenNode: 'node',
nodeThenEdge: 'node', nodeThenEdge: 'node',
reactServer: 'default',
}, },
}) })
}) })
...@@ -67,6 +70,7 @@ function runTests() { ...@@ -67,6 +70,7 @@ function runTests() {
expect(json).toMatchObject({ expect(json).toMatchObject({
edgeThenNode: 'node', edgeThenNode: 'node',
nodeThenEdge: 'node', nodeThenEdge: 'node',
reactServer: 'default',
}) })
}) })
...@@ -75,6 +79,7 @@ function runTests() { ...@@ -75,6 +79,7 @@ function runTests() {
expect(json).toMatchObject({ expect(json).toMatchObject({
edgeThenNode: 'edge', edgeThenNode: 'edge',
nodeThenEdge: 'edge', nodeThenEdge: 'edge',
reactServer: 'default',
}) })
}) })
...@@ -84,10 +89,12 @@ function runTests() { ...@@ -84,10 +89,12 @@ function runTests() {
server: { server: {
edgeThenNode: 'node', edgeThenNode: 'node',
nodeThenEdge: 'node', nodeThenEdge: 'node',
reactServer: 'react-server',
}, },
client: { client: {
edgeThenNode: 'node', edgeThenNode: 'node',
nodeThenEdge: 'node', nodeThenEdge: 'node',
reactServer: 'default',
}, },
}) })
}) })
...@@ -98,10 +105,12 @@ function runTests() { ...@@ -98,10 +105,12 @@ function runTests() {
server: { server: {
edgeThenNode: 'edge', edgeThenNode: 'edge',
nodeThenEdge: 'edge', nodeThenEdge: 'edge',
reactServer: 'react-server',
}, },
client: { client: {
edgeThenNode: 'edge', edgeThenNode: 'edge',
nodeThenEdge: 'edge', nodeThenEdge: 'edge',
reactServer: 'default',
}, },
}) })
}) })
...@@ -111,6 +120,7 @@ function runTests() { ...@@ -111,6 +120,7 @@ function runTests() {
expect(json).toMatchObject({ expect(json).toMatchObject({
edgeThenNode: 'node', edgeThenNode: 'node',
nodeThenEdge: 'node', nodeThenEdge: 'node',
reactServer: 'react-server',
}) })
}) })
...@@ -119,6 +129,7 @@ function runTests() { ...@@ -119,6 +129,7 @@ function runTests() {
expect(json).toMatchObject({ expect(json).toMatchObject({
edgeThenNode: 'edge', edgeThenNode: 'edge',
nodeThenEdge: 'edge', nodeThenEdge: 'edge',
reactServer: 'react-server',
}) })
}) })
...@@ -127,6 +138,7 @@ function runTests() { ...@@ -127,6 +138,7 @@ function runTests() {
expect(json).toMatchObject({ expect(json).toMatchObject({
edgeThenNode: 'edge', edgeThenNode: 'edge',
nodeThenEdge: 'edge', nodeThenEdge: 'edge',
reactServer: 'default',
}) })
}) })
} }
import edgeThenNode from 'edge-then-node' import edgeThenNode from 'edge-then-node'
import nodeThenEdge from 'node-then-edge' import nodeThenEdge from 'node-then-edge'
import reactServer from 'react-server'
export const config = { export const config = {
matcher: '/middleware', matcher: '/middleware',
...@@ -9,5 +10,6 @@ export function middleware() { ...@@ -9,5 +10,6 @@ export function middleware() {
return Response.json({ return Response.json({
edgeThenNode, edgeThenNode,
nodeThenEdge, nodeThenEdge,
reactServer,
}) })
} }
import edgeThenNode from 'edge-then-node' import edgeThenNode from 'edge-then-node'
import nodeThenEdge from 'node-then-edge' import nodeThenEdge from 'node-then-edge'
import reactServer from 'react-server'
export const config = { export const config = {
runtime: 'edge', runtime: 'edge',
...@@ -10,5 +11,6 @@ export default function ApiEdge() { ...@@ -10,5 +11,6 @@ export default function ApiEdge() {
NEXT_RUNTIME: process.env.NEXT_RUNTIME, NEXT_RUNTIME: process.env.NEXT_RUNTIME,
edgeThenNode, edgeThenNode,
nodeThenEdge, nodeThenEdge,
reactServer,
}) })
} }
import edgeThenNode from 'edge-then-node' import edgeThenNode from 'edge-then-node'
import nodeThenEdge from 'node-then-edge' import nodeThenEdge from 'node-then-edge'
import reactServer from 'react-server'
export const config = { export const config = {
runtime: 'nodejs', runtime: 'nodejs',
...@@ -10,5 +11,6 @@ export default function ApiNodeJs(req, res) { ...@@ -10,5 +11,6 @@ export default function ApiNodeJs(req, res) {
NEXT_RUNTIME: process.env.NEXT_RUNTIME, NEXT_RUNTIME: process.env.NEXT_RUNTIME,
edgeThenNode, edgeThenNode,
nodeThenEdge, nodeThenEdge,
reactServer,
}) })
} }
import edgeThenNode from 'edge-then-node' import edgeThenNode from 'edge-then-node'
import nodeThenEdge from 'node-then-edge' import nodeThenEdge from 'node-then-edge'
import reactServer from 'react-server'
export const config = { export const config = {
runtime: 'experimental-edge', runtime: 'experimental-edge',
...@@ -11,6 +12,7 @@ export default function PageEdge() { ...@@ -11,6 +12,7 @@ export default function PageEdge() {
{JSON.stringify({ {JSON.stringify({
edgeThenNode, edgeThenNode,
nodeThenEdge, nodeThenEdge,
reactServer,
})} })}
</div> </div>
) )
......
import edgeThenNode from 'edge-then-node' import edgeThenNode from 'edge-then-node'
import nodeThenEdge from 'node-then-edge' import nodeThenEdge from 'node-then-edge'
import reactServer from 'react-server'
export const config = { export const config = {
runtime: 'nodejs', runtime: 'nodejs',
...@@ -11,6 +12,7 @@ export default function PageNodeJs() { ...@@ -11,6 +12,7 @@ export default function PageNodeJs() {
{JSON.stringify({ {JSON.stringify({
edgeThenNode, edgeThenNode,
nodeThenEdge, nodeThenEdge,
reactServer,
})} })}
</div> </div>
) )
......
{
"main": "main.js",
"exports": {
".": {
"react-server": "./react-server.js",
"default": "./default.js"
}
}
}
...@@ -48,6 +48,7 @@ import { ...@@ -48,6 +48,7 @@ import {
COMPILER_NAMES, COMPILER_NAMES,
DEV_CLIENT_PAGES_MANIFEST, DEV_CLIENT_PAGES_MANIFEST,
DEV_MIDDLEWARE_MANIFEST, DEV_MIDDLEWARE_MANIFEST,
MIDDLEWARE_MANIFEST,
NEXT_FONT_MANIFEST, NEXT_FONT_MANIFEST,
PAGES_MANIFEST, PAGES_MANIFEST,
PHASE_DEVELOPMENT_SERVER, PHASE_DEVELOPMENT_SERVER,
...@@ -78,6 +79,7 @@ import { PagesManifest } from '../../../build/webpack/plugins/pages-manifest-plu ...@@ -78,6 +79,7 @@ import { PagesManifest } from '../../../build/webpack/plugins/pages-manifest-plu
import { AppBuildManifest } from '../../../build/webpack/plugins/app-build-manifest-plugin' import { AppBuildManifest } from '../../../build/webpack/plugins/app-build-manifest-plugin'
import { PageNotFoundError } from '../../../shared/lib/utils' import { PageNotFoundError } from '../../../shared/lib/utils'
import { srcEmptySsgManifest } from '../../../build/webpack/plugins/build-manifest-plugin' import { srcEmptySsgManifest } from '../../../build/webpack/plugins/build-manifest-plugin'
import { MiddlewareManifest } from '../../../build/webpack/plugins/middleware-plugin'
type SetupOpts = { type SetupOpts = {
dir: string dir: string
...@@ -203,6 +205,7 @@ async function startWatcher(opts: SetupOpts) { ...@@ -203,6 +205,7 @@ async function startWatcher(opts: SetupOpts) {
const appBuildManifests = new Map<string, AppBuildManifest>() const appBuildManifests = new Map<string, AppBuildManifest>()
const pagesManifests = new Map<string, PagesManifest>() const pagesManifests = new Map<string, PagesManifest>()
const appPathsManifests = new Map<string, PagesManifest>() const appPathsManifests = new Map<string, PagesManifest>()
const middlewareManifests = new Map<string, MiddlewareManifest>()
function mergeBuildManifests(manifests: Iterable<BuildManifest>) { function mergeBuildManifests(manifests: Iterable<BuildManifest>) {
const manifest: Partial<BuildManifest> & Pick<BuildManifest, 'pages'> = { const manifest: Partial<BuildManifest> & Pick<BuildManifest, 'pages'> = {
...@@ -245,6 +248,21 @@ async function startWatcher(opts: SetupOpts) { ...@@ -245,6 +248,21 @@ async function startWatcher(opts: SetupOpts) {
return manifest return manifest
} }
function mergeMiddlewareManifests(
manifests: Iterable<MiddlewareManifest>
): MiddlewareManifest {
const manifest: MiddlewareManifest = {
version: 2,
middleware: {},
sortedMiddleware: [],
functions: {},
}
for (const m of manifests) {
Object.assign(manifest.functions, m.functions)
}
return manifest
}
async function processResult( async function processResult(
result: TurbopackResult<WrittenEndpoint> | undefined result: TurbopackResult<WrittenEndpoint> | undefined
): Promise<TurbopackResult<WrittenEndpoint> | undefined> { ): Promise<TurbopackResult<WrittenEndpoint> | undefined> {
...@@ -352,6 +370,9 @@ async function startWatcher(opts: SetupOpts) { ...@@ -352,6 +370,9 @@ async function startWatcher(opts: SetupOpts) {
} }
async function writeMiddlewareManifest(): Promise<void> { async function writeMiddlewareManifest(): Promise<void> {
const middlewareManifest = mergeMiddlewareManifests(
middlewareManifests.values()
)
const middlewareManifestPath = path.join( const middlewareManifestPath = path.join(
distDir, distDir,
'server/middleware-manifest.json' 'server/middleware-manifest.json'
...@@ -359,16 +380,7 @@ async function startWatcher(opts: SetupOpts) { ...@@ -359,16 +380,7 @@ async function startWatcher(opts: SetupOpts) {
await clearCache(middlewareManifestPath) await clearCache(middlewareManifestPath)
await writeFile( await writeFile(
middlewareManifestPath, middlewareManifestPath,
JSON.stringify( JSON.stringify(middlewareManifest, null, 2),
{
sortedMiddleware: [],
middleware: {},
functions: {},
version: 2,
},
null,
2
),
'utf-8' 'utf-8'
) )
} }
...@@ -499,6 +511,22 @@ async function startWatcher(opts: SetupOpts) { ...@@ -499,6 +511,22 @@ async function startWatcher(opts: SetupOpts) {
) )
} }
async function loadMiddlewareManifest(
pageName: string,
isApp: boolean = false,
isRoute: boolean = false
): Promise<void> {
middlewareManifests.set(
pageName,
await loadPartialManifest(
MIDDLEWARE_MANIFEST,
pageName,
isApp,
isRoute
)
)
}
if (page === '/_error') { if (page === '/_error') {
await processResult(await globalEntries.app?.writeToDisk()) await processResult(await globalEntries.app?.writeToDisk())
await loadBuildManifest('_app') await loadBuildManifest('_app')
...@@ -594,13 +622,18 @@ async function startWatcher(opts: SetupOpts) { ...@@ -594,13 +622,18 @@ async function startWatcher(opts: SetupOpts) {
break break
} }
case 'app-route': { case 'app-route': {
await processResult(await route.endpoint.writeToDisk()) const type = (
await processResult(await route.endpoint.writeToDisk())
)?.type
await loadAppPathManifest(page, true) await loadAppPathManifest(page, true)
if (type === 'edge')
await loadMiddlewareManifest(page, true, true)
await writeAppBuildManifest() await writeAppBuildManifest()
await writeAppPathsManifest() await writeAppPathsManifest()
await writeMiddlewareManifest() await writeMiddlewareManifest()
if (type === 'edge') await writeMiddlewareManifest()
await writeOtherManifests() await writeOtherManifests()
break break
......
...@@ -83,35 +83,30 @@ export function getRouteRegex(normalizedRoute: string): RouteRegex { ...@@ -83,35 +83,30 @@ export function getRouteRegex(normalizedRoute: string): RouteRegex {
* number of characters. * number of characters.
*/ */
function buildGetSafeRouteKey() { function buildGetSafeRouteKey() {
let routeKeyCharCode = 97 let i = 0
let routeKeyCharLength = 1
return () => { return () => {
let routeKey = '' let routeKey = ''
for (let i = 0; i < routeKeyCharLength; i++) { let j = ++i
routeKey += String.fromCharCode(routeKeyCharCode) while (j > 0) {
routeKeyCharCode++ routeKey += String.fromCharCode(97 + ((j - 1) % 26))
j = Math.floor((j - 1) / 26)
if (routeKeyCharCode > 122) {
routeKeyCharLength++
routeKeyCharCode = 97
}
} }
return routeKey return routeKey
} }
} }
function getSafeKeyFromSegment({ function getSafeKeyFromSegment({
getSafeRouteKey,
segment, segment,
routeKeys, routeKeys,
keyPrefix, keyPrefix,
}: { }: {
getSafeRouteKey: () => string
segment: string segment: string
routeKeys: Record<string, string> routeKeys: Record<string, string>
keyPrefix?: string keyPrefix?: string
}) { }) {
const getSafeRouteKey = buildGetSafeRouteKey()
const { key, optional, repeat } = parseParameter(segment) const { key, optional, repeat } = parseParameter(segment)
// replace any non-word characters since they can break // replace any non-word characters since they can break
...@@ -151,6 +146,7 @@ function getSafeKeyFromSegment({ ...@@ -151,6 +146,7 @@ function getSafeKeyFromSegment({
function getNamedParametrizedRoute(route: string, prefixRouteKeys: boolean) { function getNamedParametrizedRoute(route: string, prefixRouteKeys: boolean) {
const segments = removeTrailingSlash(route).slice(1).split('/') const segments = removeTrailingSlash(route).slice(1).split('/')
const getSafeRouteKey = buildGetSafeRouteKey()
const routeKeys: { [named: string]: string } = {} const routeKeys: { [named: string]: string } = {}
return { return {
namedParameterizedRoute: segments namedParameterizedRoute: segments
...@@ -162,6 +158,7 @@ function getNamedParametrizedRoute(route: string, prefixRouteKeys: boolean) { ...@@ -162,6 +158,7 @@ function getNamedParametrizedRoute(route: string, prefixRouteKeys: boolean) {
if (hasInterceptionMarker && paramMatches) { if (hasInterceptionMarker && paramMatches) {
return getSafeKeyFromSegment({ return getSafeKeyFromSegment({
getSafeRouteKey,
segment: paramMatches[1], segment: paramMatches[1],
routeKeys, routeKeys,
keyPrefix: prefixRouteKeys keyPrefix: prefixRouteKeys
...@@ -170,6 +167,7 @@ function getNamedParametrizedRoute(route: string, prefixRouteKeys: boolean) { ...@@ -170,6 +167,7 @@ function getNamedParametrizedRoute(route: string, prefixRouteKeys: boolean) {
}) })
} else if (paramMatches) { } else if (paramMatches) {
return getSafeKeyFromSegment({ return getSafeKeyFromSegment({
getSafeRouteKey,
segment: paramMatches[1], segment: paramMatches[1],
routeKeys, routeKeys,
keyPrefix: prefixRouteKeys ? NEXT_QUERY_PARAM_PREFIX : undefined, keyPrefix: prefixRouteKeys ? NEXT_QUERY_PARAM_PREFIX : undefined,
......
import { createNextDescribe } from 'e2e-utils'
const bathPath = process.env.BASE_PATH ?? ''
createNextDescribe(
'app-simple-routes',
{
files: __dirname,
},
({ next }) => {
describe('works with simple routes', () => {
it('renders a node route', async () => {
expect(
JSON.parse(await next.render(bathPath + '/api/node.json'))
).toEqual({
pathname: '/api/node.json',
})
})
it('renders a edge route', async () => {
expect(
JSON.parse(await next.render(bathPath + '/api/edge.json'))
).toEqual({
pathname: '/api/edge.json',
})
})
})
}
)
import { NextRequest, NextResponse } from 'next/server'
export const GET = (req: NextRequest) => {
return NextResponse.json({
pathname: req.nextUrl.pathname,
})
}
export const runtime = 'edge'
import { NextRequest, NextResponse } from 'next/server'
export const GET = (req: NextRequest) => {
return NextResponse.json({
pathname: req.nextUrl.pathname,
})
}
/**
* @type {import('next').NextConfig}
*/
const config = {
typescript: {
ignoreBuildErrors: true,
},
}
module.exports = config
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
// be enabled here // be enabled here
const enabledTests = [ const enabledTests = [
'test/development/api-cors-with-rewrite/index.test.ts', 'test/development/api-cors-with-rewrite/index.test.ts',
'test/e2e/app-dir/app-rendering/rendering.test.ts',
'test/e2e/app-dir/app-simple-routes/app-simple-routes.test.ts',
'test/integration/bigint/test/index.test.js', 'test/integration/bigint/test/index.test.js',
] ]
......
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