Skip to content

fix layout segment key to match up with manifest #60783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sokra merged 1 commit into from
Jan 17, 2024
Merged

fix layout segment key to match up with manifest #60783

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions packages/next-swc/crates/next-core/src/loader_tree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand All @@ -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!(
Expand All @@ -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(())
Expand Down