archive/rsnext
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix uniqueness of layers (#58872)

Browse source 
### What?

* rename `ssr` in app to `app-ssr`
* rename `_` to `-` in layer names

### Why?

`ssr` layer name was used twice, but it must be unique to avoid hanging
compilation


Closes PACK-2036
This commit is contained in:
Tobias Koppers 2023-11-24 17:53:28 +01:00 committed by GitHub
parent 2a8f7ae1b1
commit 4465b1856f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/next-swc/crates/next-api/src/app.rs
View file

@ -232,7 +232,7 @@ impl AppProject {
self.project().server_compile_time_info(),
self.rsc_module_options_context(),
self.rsc_resolve_options_context(),
Vc::cell("rsc".to_string()),
Vc::cell("app-rsc".to_string()),
)
}
@ -262,7 +262,7 @@ impl AppProject {
self.project().edge_compile_time_info(),
self.rsc_module_options_context(),
self.edge_rsc_resolve_options_context(),
Vc::cell("edge_rsc".to_string()),
Vc::cell("app-edge-rsc".to_string()),
)
}
@ -319,7 +319,7 @@ impl AppProject {
self.project().server_compile_time_info(),
self.ssr_module_options_context(),
self.ssr_resolve_options_context(),
Vc::cell("ssr".to_string()),
Vc::cell("app-ssr".to_string()),
)
}
@ -329,7 +329,7 @@ impl AppProject {
self.project().edge_compile_time_info(),
self.ssr_module_options_context(),
self.edge_ssr_resolve_options_context(),
Vc::cell("edge_ssr".to_string()),
Vc::cell("app-edge-ssr".to_string()),
)
}

8
packages/next-swc/crates/next-api/src/pages.rs
View file

@ -340,7 +340,7 @@ impl PagesProject {
self.project().server_compile_time_info(),
self.ssr_data_module_options_context(),
self.ssr_resolve_options_context(),
Vc::cell("ssr_data".to_string()),
Vc::cell("ssr-data".to_string()),
)
}
@ -351,7 +351,7 @@ impl PagesProject {
self.project().edge_compile_time_info(),
self.ssr_module_options_context(),
self.edge_ssr_resolve_options_context(),
Vc::cell("edge_ssr".to_string()),
Vc::cell("edge-ssr".to_string()),
)
}
@ -362,7 +362,7 @@ impl PagesProject {
self.project().edge_compile_time_info(),
self.api_module_options_context(),
self.edge_ssr_resolve_options_context(),
Vc::cell("edge_api".to_string()),
Vc::cell("edge-api".to_string()),
)
}
@ -373,7 +373,7 @@ impl PagesProject {
self.project().edge_compile_time_info(),
self.ssr_data_module_options_context(),
self.edge_ssr_resolve_options_context(),
Vc::cell("edge_ssr_data".to_string()),
Vc::cell("edge-ssr-data".to_string()),
)
}

4
packages/next-swc/crates/next-build/src/next_app/app_entries.rs
View file

@ -137,7 +137,7 @@ pub async fn get_app_entries(
server_compile_time_info,
ssr_module_options_context,
ssr_resolve_options_context,
Vc::cell("ssr".to_string()),
Vc::cell("app-ssr".to_string()),
);
transitions.insert("next-ssr".to_string(), Vc::upcast(ssr_transition));
@ -184,7 +184,7 @@ pub async fn get_app_entries(
server_compile_time_info,
rsc_module_options_context,
rsc_resolve_options_context,
Vc::cell("rsc".to_string()),
Vc::cell("app-rsc".to_string()),
);
let entries = entrypoints