Unverified Commit 80635d8a authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

fix reporting of illegal segments when directory only contains irrelevant files (#56076)

### What?

fixes

```
[Error: Invalid segment components, catch all segment must be the last segment

Debug info:
- Execution of directory_tree_to_entrypoints_internal failed
- Invalid segment components, catch all segment must be the last segment] {
  code: 'GenericFailure'
}
```


Closes WEB-1668
parent a751bbf6
...@@ -721,7 +721,7 @@ async fn directory_tree_to_entrypoints_internal( ...@@ -721,7 +721,7 @@ async fn directory_tree_to_entrypoints_internal(
add_app_page( add_app_page(
app_dir, app_dir,
&mut result, &mut result,
app_page.clone().complete(PageType::Page)?, app_page.complete(PageType::Page)?,
if current_level_is_parallel_route { if current_level_is_parallel_route {
LoaderTree { LoaderTree {
page: app_page.clone(), page: app_page.clone(),
...@@ -766,7 +766,7 @@ async fn directory_tree_to_entrypoints_internal( ...@@ -766,7 +766,7 @@ async fn directory_tree_to_entrypoints_internal(
add_app_page( add_app_page(
app_dir, app_dir,
&mut result, &mut result,
app_page.clone().complete(PageType::Page)?, app_page.complete(PageType::Page)?,
if current_level_is_parallel_route { if current_level_is_parallel_route {
LoaderTree { LoaderTree {
page: app_page.clone(), page: app_page.clone(),
...@@ -811,7 +811,7 @@ async fn directory_tree_to_entrypoints_internal( ...@@ -811,7 +811,7 @@ async fn directory_tree_to_entrypoints_internal(
add_app_route( add_app_route(
app_dir, app_dir,
&mut result, &mut result,
app_page.clone().complete(PageType::Route)?, app_page.complete(PageType::Route)?,
route, route,
); );
} }
...@@ -927,8 +927,14 @@ async fn directory_tree_to_entrypoints_internal( ...@@ -927,8 +927,14 @@ async fn directory_tree_to_entrypoints_internal(
let parallel_route_key = match_parallel_route(subdir_name); let parallel_route_key = match_parallel_route(subdir_name);
let mut app_page = app_page.clone(); let mut app_page = app_page.clone();
let mut illegal_path = None;
if parallel_route_key.is_none() { if parallel_route_key.is_none() {
app_page.push_str(subdir_name)?; // When constructing the app_page fails (e. g. due to limitations of the order),
// we only want to emit the error when there are actual pages below that
// directory.
if let Err(e) = app_page.push_str(subdir_name) {
illegal_path = Some(e);
}
} }
let map = directory_tree_to_entrypoints_internal( let map = directory_tree_to_entrypoints_internal(
...@@ -940,6 +946,12 @@ async fn directory_tree_to_entrypoints_internal( ...@@ -940,6 +946,12 @@ async fn directory_tree_to_entrypoints_internal(
) )
.await?; .await?;
if let Some(illegal_path) = illegal_path {
if !map.is_empty() {
return Err(illegal_path);
}
}
for (_, entrypoint) in map.iter() { for (_, entrypoint) in map.iter() {
match *entrypoint { match *entrypoint {
Entrypoint::AppPage { Entrypoint::AppPage {
......
...@@ -152,15 +152,18 @@ impl AppPage { ...@@ -152,15 +152,18 @@ impl AppPage {
) && !matches!(segment, PageSegment::PageType(..)) ) && !matches!(segment, PageSegment::PageType(..))
{ {
bail!( bail!(
"Invalid segment {}, catch all segment must be the last segment", "Invalid segment {:?}, catch all segment must be the last segment (segments: {:?})",
segment segment,
self.0
) )
} }
if self.is_complete() { if self.is_complete() {
bail!( bail!(
"Invalid segment {}, this page path already has the final PageType appended", "Invalid segment {:?}, this page path already has the final PageType appended \
segment (segments: {:?})",
segment,
self.0
) )
} }
...@@ -206,7 +209,7 @@ impl AppPage { ...@@ -206,7 +209,7 @@ impl AppPage {
matches!(self.0.last(), Some(PageSegment::PageType(..))) matches!(self.0.last(), Some(PageSegment::PageType(..)))
} }
pub fn complete(self, page_type: PageType) -> Result<Self> { pub fn complete(&self, page_type: PageType) -> Result<Self> {
self.clone_push(PageSegment::PageType(page_type)) self.clone_push(PageSegment::PageType(page_type))
} }
} }
......
...@@ -65,6 +65,16 @@ export class NextStartInstance extends NextInstance { ...@@ -65,6 +65,16 @@ export class NextStartInstance extends NextInstance {
startArgs = this.startCommand.split(' ') startArgs = this.startCommand.split(' ')
} }
if (process.env.NEXT_SKIP_ISOLATE) {
// without isolation yarn can't be used and pnpm must be used instead
if (buildArgs[0] === 'yarn') {
buildArgs[0] = 'pnpm'
}
if (startArgs[0] === 'yarn') {
startArgs[0] = 'pnpm'
}
}
console.log('running', buildArgs.join(' ')) console.log('running', buildArgs.join(' '))
await new Promise<void>((resolve, reject) => { await new Promise<void>((resolve, reject) => {
try { try {
......
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