Skip to content

Mirror of upstream PR #82124 #21

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

Closed
austinderek wants to merge 4 commits into from
Closed

Mirror of upstream PR #82124 #21

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
02f6705
[Fix]: Panic on unwrap from client reference
ricardonunez-io Jul 25, 2025
a895779
Merge branch 'canary' into ricardo/fix-unwrap-on-none-dynamic-imports
ricardonunez-io Jul 28, 2025
9505889
Merge branch 'canary' into ricardo/fix-unwrap-on-none-dynamic-imports
ricardonunez-io Jul 29, 2025
5c54038
Merge branch 'canary' into ricardo/fix-unwrap-on-none-dynamic-imports
ricardonunez-io Jul 31, 2025
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
9 changes: 6 additions & 3 deletions crates/next-api/src/dynamic_imports.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
//! to wait until all the dynamic components are being loaded, this ensures hydration mismatch
//! won't occur

use anyhow::Result;
use anyhow::{Result, anyhow};
use next_core::{
next_app::ClientReferencesChunks, next_client_reference::EcmascriptClientReferenceModule,
next_dynamic::NextDynamicEntryModule,
Expand Down Expand Up @@ -64,10 +64,13 @@ pub(crate) async fn collect_next_dynamic_chunks(
// containing the next/dynamic imports
let availability_info = match chunking_availability {
NextDynamicChunkAvailability::ClientReferences(client_reference_chunks) => {
let parent_ref = parent_client_reference
.ok_or_else(|| anyhow!("Parent client reference is None"))?;

client_reference_chunks
.client_component_client_chunks
.get(&parent_client_reference.unwrap())
.unwrap()
.get(&parent_ref)
.ok_or_else(|| anyhow!("No client reference in chunks"))?
.1
}
NextDynamicChunkAvailability::AvailabilityInfo(availability_info) => {
Expand Down