fix dynamic paths

crates/next-core/js/src/entry/server-renderer.tsx

@@ -130,6 +130,9 @@ async function runOperation(
     },
   };
 
+  if ("getStaticPaths" in otherExports) {
+    renderOpts.getStaticPaths = otherExports.getStaticPaths;
+  }
   if ("getStaticProps" in otherExports) {
     renderOpts.getStaticProps = otherExports.getStaticProps;
   }

crates/next-core/src/app_source.rs

@@ -65,7 +65,7 @@ use crate::{
         node_entry::{NodeRenderingEntry, NodeRenderingEntryVc},
         NodeEntry, NodeEntryVc,
     },
-    util::regular_expression_for_path,
+    util::{pathname_for_path, regular_expression_for_path},
 };
 
 #[turbo_tasks::function]
@@ -357,10 +357,14 @@ async fn create_app_source_for_directory(
         list.push(LayoutSegment { files, target }.cell());
         layouts = LayoutSegmentsVc::cell(list);
         if let Some(page_path) = page {
+            let pathname = pathname_for_path(server_root, target, true);
+            let path_regex = regular_expression_for_path(server_root, target, true);
+
             sources.push(create_node_rendered_source(
                 specificity,
                 server_root,
-                regular_expression_for_path(server_root, target, false),
+                pathname,
+                path_regex,
                 AppRenderer {
                     context_ssr,
                     context,

crates/next-core/src/nodejs/node_rendered_source.rs

@@ -38,6 +38,7 @@ use crate::path_regex::PathRegexVc;
 pub fn create_node_rendered_source(
     specificity: SpecificityVc,
     server_root: FileSystemPathVc,
+    pathname: StringVc,
     path_regex: PathRegexVc,
     entry: NodeEntryVc,
     runtime_entries: EcmascriptChunkPlaceablesVc,
@@ -46,6 +47,7 @@ pub fn create_node_rendered_source(
     let source = NodeRenderContentSource {
         specificity,
         server_root,
+        pathname,
         path_regex,
         entry,
         runtime_entries,
@@ -68,6 +70,7 @@ pub fn create_node_rendered_source(
 struct NodeRenderContentSource {
     specificity: SpecificityVc,
     server_root: FileSystemPathVc,
+    pathname: StringVc,
     path_regex: PathRegexVc,
     entry: NodeEntryVc,
     runtime_entries: EcmascriptChunkPlaceablesVc,
@@ -176,7 +179,7 @@ impl ContentSource for NodeRenderContentSource {
                                 .headers
                                 .clone()
                                 .ok_or_else(|| anyhow!("headers needs to be provided"))?,
-                            path: format!("/{path}"),
+                            path: format!("/{}", this.pathname.await?),
                         }
                         .cell(),
                     );

crates/next-core/src/server_rendered_source.rs

@@ -50,7 +50,7 @@ use crate::{
         node_entry::{NodeRenderingEntry, NodeRenderingEntryVc},
         NodeEntry, NodeEntryVc,
     },
-    util::regular_expression_for_path,
+    util::{pathname_for_path, regular_expression_for_path},
 };
 
 /// Create a content source serving the `pages` or `src/pages` directory as
@@ -165,11 +165,14 @@ async fn create_server_rendered_source_for_file(
     )
     .build();
 
+    let pathname = pathname_for_path(server_root, server_path, true);
+    let path_regex = regular_expression_for_path(server_root, server_path, true);
+
     Ok(if *is_api_path.await? {
         create_node_api_source(
             specificity,
             server_root,
-            regular_expression_for_path(server_root, server_path, true),
+            path_regex,
             SsrEntry {
                 context,
                 entry_asset,
@@ -185,7 +188,8 @@ async fn create_server_rendered_source_for_file(
         create_node_rendered_source(
             specificity,
             server_root,
-            regular_expression_for_path(server_root, server_path, true),
+            pathname,
+            path_regex,
             SsrEntry {
                 context,
                 entry_asset,

crates/next-core/src/util.rs

@@ -1,17 +1,16 @@
 use anyhow::{anyhow, bail, Result};
-use turbo_tasks::ValueToString;
+use turbo_tasks::{primitives::StringVc, ValueToString};
 use turbo_tasks_fs::FileSystemPathVc;
 
 use crate::path_regex::{PathRegexBuilder, PathRegexVc};
 
-/// Converts a filename within the server root to a regular expression with
-/// named capture groups for every dynamic segment.
+/// Converts a filename within the server root into a next pathname.
 #[turbo_tasks::function]
-pub async fn regular_expression_for_path(
+pub async fn pathname_for_path(
     server_root: FileSystemPathVc,
     server_path: FileSystemPathVc,
     has_extension: bool,
-) -> Result<PathRegexVc> {
+) -> Result<StringVc> {
     let server_path_value = &*server_path.await?;
     let path = if let Some(path) = server_root.await?.get_path_to(server_path_value) {
         path
@@ -34,6 +33,20 @@ pub async fn regular_expression_for_path(
     } else {
         path.strip_suffix("/index").unwrap_or(path)
     };
+
+    Ok(StringVc::cell(path.to_string()))
+}
+
+/// Converts a filename within the server root into a regular expression with
+/// named capture groups for every dynamic segment.
+#[turbo_tasks::function]
+pub async fn regular_expression_for_path(
+    server_root: FileSystemPathVc,
+    server_path: FileSystemPathVc,
+    has_extension: bool,
+) -> Result<PathRegexVc> {
+    let path = pathname_for_path(server_root, server_path, has_extension).await?;
+
     let mut path_regex = PathRegexBuilder::new();
     for segment in path.split('/') {
         if let Some(segment) = segment.strip_prefix('[') {