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

fix layout segment key to match up with manifest (#60783)

Browse source 
### What?

When webpack loaders are applied on a page file and it's renamed with
the `as` key, layout segment key no longer matches. This fixes that

### Why?

### How?

Closes NEXT-
Fixes #

-->


Closes PACK-2251
This commit is contained in:
Tobias Koppers 2024-01-17 18:11:50 +01:00 committed by GitHub
parent 72e381c8b0
commit 861b472b12
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
packages/next-swc/crates/next-core/src/loader_tree.rs
View file

@ -107,6 +107,15 @@ impl LoaderTreeBuilder {
let i = self.unique_number();
let identifier = magic_identifier::mangle(&format!("{name} #{i}"));
let source = Vc::upcast(FileSource::new(component));
let reference_ty = Value::new(ReferenceType::EcmaScriptModules(
EcmaScriptModulesReferenceSubType::Undefined,
));
let module = self
.server_component_transition
.process(source, self.context, reference_ty)
.module();
match self.mode {
NextMode::Development => {
let chunks_identifier =
@ -131,7 +140,7 @@ impl LoaderTreeBuilder {
self.loader_tree_code,
" {name}: [() => {identifier}, {path}],",
name = StringifyJs(name),
path = StringifyJs(&component.to_string().await?)
path = StringifyJs(&module.ident().path().to_string().await?)
)?;
self.imports.push(formatdoc!(
@ -144,16 +153,6 @@ impl LoaderTreeBuilder {
}
}
let source = Vc::upcast(FileSource::new(component));
let reference_ty = Value::new(ReferenceType::EcmaScriptModules(
EcmaScriptModulesReferenceSubType::Undefined,
));
let module = self
.server_component_transition
.process(source, self.context, reference_ty)
.module();
self.inner_assets.insert(format!("COMPONENT_{i}"), module);
}
Ok(())