Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
90232b56
Commit
90232b56
authored
Mar 05, 2026
by
Jimmy Lai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move chunk retries into runtime loaders
parent
ad650741
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
315 additions
and
271 deletions
+315
-271
app-webpack.ts
packages/next/src/client/app-webpack.ts
+3
-0
retry-chunk-load-error.ts
...ent/components/chunk-load-error/retry-chunk-load-error.ts
+29
-0
patch-webpack-chunk-load.ts
packages/next/src/client/patch-webpack-chunk-load.ts
+57
-0
webpack.ts
packages/next/src/client/webpack.ts
+3
-0
react-server-dom-turbopack-client.browser.development.js
.../react-server-dom-turbopack-client.browser.development.js
+1
-22
react-server-dom-turbopack-client.browser.production.js
...s/react-server-dom-turbopack-client.browser.production.js
+1
-22
react-server-dom-turbopack-client.browser.development.js
.../react-server-dom-turbopack-client.browser.development.js
+1
-22
react-server-dom-turbopack-client.browser.production.js
...s/react-server-dom-turbopack-client.browser.production.js
+1
-22
react-server-dom-webpack-client.browser.development.js
...js/react-server-dom-webpack-client.browser.development.js
+1
-4
react-server-dom-webpack-client.browser.production.js
...cjs/react-server-dom-webpack-client.browser.production.js
+1
-4
react-server-dom-webpack-client.browser.development.js
...js/react-server-dom-webpack-client.browser.development.js
+1
-4
react-server-dom-webpack-client.browser.production.js
...cjs/react-server-dom-webpack-client.browser.production.js
+1
-4
loadable.tsx
packages/next/src/shared/lib/lazy-dynamic/loadable.tsx
+1
-10
loadable.shared-runtime.tsx
packages/next/src/shared/lib/loadable.shared-runtime.tsx
+1
-6
taskfile.js
packages/next/taskfile.js
+7
-71
chunk-load-failure.test.ts
.../production/chunk-load-failure/chunk-load-failure.test.ts
+68
-0
runtime-backend-dom.ts
...runtime/js/src/browser/runtime/dom/runtime-backend-dom.ts
+138
-80
No files found.
packages/next/src/client/app-webpack.ts
View file @
90232b56
...
@@ -2,11 +2,14 @@
...
@@ -2,11 +2,14 @@
// https://github.com/webpack/webpack/blob/2738eebc7880835d88c727d364ad37f3ec557593/lib/RuntimeGlobals.js#L204
// https://github.com/webpack/webpack/blob/2738eebc7880835d88c727d364ad37f3ec557593/lib/RuntimeGlobals.js#L204
import
'./register-deployment-id-global'
import
'./register-deployment-id-global'
import
{
patchWebpackChunkLoad
}
from
'./patch-webpack-chunk-load'
import
{
getAssetToken
,
getAssetTokenQuery
}
from
'../shared/lib/deployment-id'
import
{
getAssetToken
,
getAssetTokenQuery
}
from
'../shared/lib/deployment-id'
import
{
encodeURIPath
}
from
'../shared/lib/encode-uri-path'
import
{
encodeURIPath
}
from
'../shared/lib/encode-uri-path'
declare
const
__webpack_require__
:
any
declare
const
__webpack_require__
:
any
patchWebpackChunkLoad
()
// If we have a deployment ID, we need to append it to the webpack chunk names
// If we have a deployment ID, we need to append it to the webpack chunk names
// I am keeping the process check explicit so this can be statically optimized
// I am keeping the process check explicit so this can be statically optimized
if
(
getAssetToken
())
{
if
(
getAssetToken
())
{
...
...
packages/next/src/client/components/chunk-load-error/retry-chunk-load-error.ts
View file @
90232b56
...
@@ -5,6 +5,30 @@ import {
...
@@ -5,6 +5,30 @@ import {
sleep
,
sleep
,
}
from
'./chunk-load-error-handler'
}
from
'./chunk-load-error-handler'
const
RETRY_EXHAUSTED
=
Symbol
.
for
(
'next.chunk-load-error.retry-exhausted'
)
type
RetryTaggedError
=
Error
&
{
[
RETRY_EXHAUSTED
]?:
true
}
function
hasExhaustedChunkLoadRetry
(
error
:
unknown
):
error
is
RetryTaggedError
{
return
!!
(
error
&&
typeof
error
===
'object'
&&
(
error
as
RetryTaggedError
)[
RETRY_EXHAUSTED
]
)
}
function
markExhaustedChunkLoadRetry
(
error
:
unknown
)
{
if
(
!
error
||
typeof
error
!==
'object'
)
{
return
}
try
{
;(
error
as
RetryTaggedError
)[
RETRY_EXHAUSTED
]
=
true
}
catch
{}
}
export
function
retryChunkLoadError
<
T
>
(
load
:
()
=>
Promise
<
T
>
):
Promise
<
T
>
{
export
function
retryChunkLoadError
<
T
>
(
load
:
()
=>
Promise
<
T
>
):
Promise
<
T
>
{
let
retries
=
0
let
retries
=
0
...
@@ -15,6 +39,7 @@ export function retryChunkLoadError<T>(load: () => Promise<T>): Promise<T> {
...
@@ -15,6 +39,7 @@ export function retryChunkLoadError<T>(load: () => Promise<T>): Promise<T> {
if
(
if
(
typeof
window
!==
'undefined'
&&
typeof
window
!==
'undefined'
&&
isChunkLoadError
(
err
)
&&
isChunkLoadError
(
err
)
&&
!
hasExhaustedChunkLoadRetry
(
err
)
&&
retries
<
MAX_RETRY_ATTEMPTS
retries
<
MAX_RETRY_ATTEMPTS
)
{
)
{
retries
++
retries
++
...
@@ -22,6 +47,10 @@ export function retryChunkLoadError<T>(load: () => Promise<T>): Promise<T> {
...
@@ -22,6 +47,10 @@ export function retryChunkLoadError<T>(load: () => Promise<T>): Promise<T> {
return
run
()
return
run
()
}
}
if
(
isChunkLoadError
(
err
))
{
markExhaustedChunkLoadRetry
(
err
)
}
throw
err
throw
err
}
}
}
}
...
...
packages/next/src/client/patch-webpack-chunk-load.ts
0 → 100644
View file @
90232b56
import
{
retryChunkLoadError
}
from
'./components/chunk-load-error/retry-chunk-load-error'
type
ChunkLoad
=
((...
args
:
any
[])
=>
Promise
<
any
>
)
&
{
[
patched
]?:
true
}
declare
const
__webpack_require__
:
{
e
?:
ChunkLoad
[
patched
]?:
true
}
declare
let
__webpack_chunk_load__
:
ChunkLoad
|
undefined
const
patched
=
Symbol
.
for
(
'next.webpack.chunk-load.retry.patched'
)
function
markPatched
(
load
:
ChunkLoad
):
ChunkLoad
{
load
[
patched
]
=
true
return
load
}
function
wrapChunkLoad
(
load
:
ChunkLoad
):
ChunkLoad
{
// Webpack can reject from either the low-level script loader or the higher-level
// ensureChunk Promise. `retryChunkLoadError()` tags exhausted errors so these
// wrappers can compose without multiplying retries.
return
markPatched
((...
args
:
any
[])
=>
retryChunkLoadError
(()
=>
load
(...
args
))
)
}
export
function
patchWebpackChunkLoad
()
{
if
(
__webpack_require__
[
patched
])
{
return
}
const
originalChunkLoad
=
typeof
__webpack_chunk_load__
===
'function'
?
__webpack_chunk_load__
:
null
const
originalEnsureChunk
=
typeof
__webpack_require__
.
e
===
'function'
?
__webpack_require__
.
e
:
null
if
(
originalChunkLoad
&&
!
originalChunkLoad
[
patched
])
{
const
wrappedChunkLoad
=
wrapChunkLoad
(
originalChunkLoad
)
__webpack_chunk_load__
=
wrappedChunkLoad
if
(
originalEnsureChunk
===
originalChunkLoad
)
{
__webpack_require__
.
e
=
wrappedChunkLoad
}
}
if
(
originalEnsureChunk
&&
originalEnsureChunk
!==
originalChunkLoad
&&
!
originalEnsureChunk
[
patched
]
)
{
__webpack_require__
.
e
=
wrapChunkLoad
(
originalEnsureChunk
)
}
__webpack_require__
[
patched
]
=
true
}
packages/next/src/client/webpack.ts
View file @
90232b56
...
@@ -2,6 +2,9 @@ declare const __webpack_require__: any
...
@@ -2,6 +2,9 @@ declare const __webpack_require__: any
declare
let
__webpack_public_path__
:
string
declare
let
__webpack_public_path__
:
string
import
{
getAssetToken
,
getAssetTokenQuery
}
from
'../shared/lib/deployment-id'
import
{
getAssetToken
,
getAssetTokenQuery
}
from
'../shared/lib/deployment-id'
import
{
patchWebpackChunkLoad
}
from
'./patch-webpack-chunk-load'
patchWebpackChunkLoad
()
// If we have a deployment ID query string, we need to append it to the webpack chunk names
// If we have a deployment ID query string, we need to append it to the webpack chunk names
// I am keeping the process check explicit so this can be statically optimized
// I am keeping the process check explicit so this can be statically optimized
...
...
packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.development.js
View file @
90232b56
...
@@ -81,34 +81,13 @@
...
@@ -81,34 +81,13 @@
return
promise
;
return
promise
;
}
}
function
ignoreReject
()
{}
function
ignoreReject
()
{}
var
retryChunkLoadError
=
require
(
"next/dist/client/components/chunk-load-error/retry-chunk-load-error"
).
retryChunkLoadError
;
var
retryingChunks
=
new
Map
();
function
loadChunk
(
chunkUrl
)
{
var
entry
=
retryingChunks
.
get
(
chunkUrl
);
if
(
void
0
===
entry
)
{
entry
=
retryChunkLoadError
(
function
()
{
return
__turbopack_load_by_url__
(
chunkUrl
);
}).
then
(
function
(
value
)
{
retryingChunks
.
delete
(
chunkUrl
);
return
value
;
},
function
(
error
)
{
retryingChunks
.
delete
(
chunkUrl
);
throw
error
;
}
);
retryingChunks
.
set
(
chunkUrl
,
entry
);
}
return
entry
;
}
function
preloadModule
(
metadata
)
{
function
preloadModule
(
metadata
)
{
for
(
for
(
var
chunks
=
metadata
[
1
],
promises
=
[],
i
=
0
;
var
chunks
=
metadata
[
1
],
promises
=
[],
i
=
0
;
i
<
chunks
.
length
;
i
<
chunks
.
length
;
i
++
i
++
)
{
)
{
var
thenable
=
loadChunk
(
chunks
[
i
]);
var
thenable
=
__turbopack_load_by_url__
(
chunks
[
i
]);
loadedChunks
.
has
(
thenable
)
||
promises
.
push
(
thenable
);
loadedChunks
.
has
(
thenable
)
||
promises
.
push
(
thenable
);
if
(
!
instrumentedChunks
.
has
(
thenable
))
{
if
(
!
instrumentedChunks
.
has
(
thenable
))
{
var
resolve
=
loadedChunks
.
add
.
bind
(
loadedChunks
,
thenable
);
var
resolve
=
loadedChunks
.
add
.
bind
(
loadedChunks
,
thenable
);
...
...
packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.production.js
View file @
90232b56
...
@@ -72,30 +72,9 @@ function requireAsyncModule(id) {
...
@@ -72,30 +72,9 @@ function requireAsyncModule(id) {
var
instrumentedChunks
=
new
WeakSet
(),
var
instrumentedChunks
=
new
WeakSet
(),
loadedChunks
=
new
WeakSet
();
loadedChunks
=
new
WeakSet
();
function
ignoreReject
()
{}
function
ignoreReject
()
{}
var
retryChunkLoadError
=
require
(
"next/dist/client/components/chunk-load-error/retry-chunk-load-error"
).
retryChunkLoadError
;
var
retryingChunks
=
new
Map
();
function
loadChunk
(
chunkUrl
)
{
var
entry
=
retryingChunks
.
get
(
chunkUrl
);
if
(
void
0
===
entry
)
{
entry
=
retryChunkLoadError
(
function
()
{
return
__turbopack_load_by_url__
(
chunkUrl
);
}).
then
(
function
(
value
)
{
retryingChunks
.
delete
(
chunkUrl
);
return
value
;
},
function
(
error
)
{
retryingChunks
.
delete
(
chunkUrl
);
throw
error
;
}
);
retryingChunks
.
set
(
chunkUrl
,
entry
);
}
return
entry
;
}
function
preloadModule
(
metadata
)
{
function
preloadModule
(
metadata
)
{
for
(
var
chunks
=
metadata
[
1
],
promises
=
[],
i
=
0
;
i
<
chunks
.
length
;
i
++
)
{
for
(
var
chunks
=
metadata
[
1
],
promises
=
[],
i
=
0
;
i
<
chunks
.
length
;
i
++
)
{
var
thenable
=
loadChunk
(
chunks
[
i
]);
var
thenable
=
__turbopack_load_by_url__
(
chunks
[
i
]);
loadedChunks
.
has
(
thenable
)
||
promises
.
push
(
thenable
);
loadedChunks
.
has
(
thenable
)
||
promises
.
push
(
thenable
);
if
(
!
instrumentedChunks
.
has
(
thenable
))
{
if
(
!
instrumentedChunks
.
has
(
thenable
))
{
var
resolve
=
loadedChunks
.
add
.
bind
(
loadedChunks
,
thenable
);
var
resolve
=
loadedChunks
.
add
.
bind
(
loadedChunks
,
thenable
);
...
...
packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.development.js
View file @
90232b56
...
@@ -81,34 +81,13 @@
...
@@ -81,34 +81,13 @@
return
promise
;
return
promise
;
}
}
function
ignoreReject
()
{}
function
ignoreReject
()
{}
var
retryChunkLoadError
=
require
(
"next/dist/client/components/chunk-load-error/retry-chunk-load-error"
).
retryChunkLoadError
;
var
retryingChunks
=
new
Map
();
function
loadChunk
(
chunkUrl
)
{
var
entry
=
retryingChunks
.
get
(
chunkUrl
);
if
(
void
0
===
entry
)
{
entry
=
retryChunkLoadError
(
function
()
{
return
__turbopack_load_by_url__
(
chunkUrl
);
}).
then
(
function
(
value
)
{
retryingChunks
.
delete
(
chunkUrl
);
return
value
;
},
function
(
error
)
{
retryingChunks
.
delete
(
chunkUrl
);
throw
error
;
}
);
retryingChunks
.
set
(
chunkUrl
,
entry
);
}
return
entry
;
}
function
preloadModule
(
metadata
)
{
function
preloadModule
(
metadata
)
{
for
(
for
(
var
chunks
=
metadata
[
1
],
promises
=
[],
i
=
0
;
var
chunks
=
metadata
[
1
],
promises
=
[],
i
=
0
;
i
<
chunks
.
length
;
i
<
chunks
.
length
;
i
++
i
++
)
{
)
{
var
thenable
=
loadChunk
(
chunks
[
i
]);
var
thenable
=
__turbopack_load_by_url__
(
chunks
[
i
]);
loadedChunks
.
has
(
thenable
)
||
promises
.
push
(
thenable
);
loadedChunks
.
has
(
thenable
)
||
promises
.
push
(
thenable
);
if
(
!
instrumentedChunks
.
has
(
thenable
))
{
if
(
!
instrumentedChunks
.
has
(
thenable
))
{
var
resolve
=
loadedChunks
.
add
.
bind
(
loadedChunks
,
thenable
);
var
resolve
=
loadedChunks
.
add
.
bind
(
loadedChunks
,
thenable
);
...
...
packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.production.js
View file @
90232b56
...
@@ -72,30 +72,9 @@ function requireAsyncModule(id) {
...
@@ -72,30 +72,9 @@ function requireAsyncModule(id) {
var
instrumentedChunks
=
new
WeakSet
(),
var
instrumentedChunks
=
new
WeakSet
(),
loadedChunks
=
new
WeakSet
();
loadedChunks
=
new
WeakSet
();
function
ignoreReject
()
{}
function
ignoreReject
()
{}
var
retryChunkLoadError
=
require
(
"next/dist/client/components/chunk-load-error/retry-chunk-load-error"
).
retryChunkLoadError
;
var
retryingChunks
=
new
Map
();
function
loadChunk
(
chunkUrl
)
{
var
entry
=
retryingChunks
.
get
(
chunkUrl
);
if
(
void
0
===
entry
)
{
entry
=
retryChunkLoadError
(
function
()
{
return
__turbopack_load_by_url__
(
chunkUrl
);
}).
then
(
function
(
value
)
{
retryingChunks
.
delete
(
chunkUrl
);
return
value
;
},
function
(
error
)
{
retryingChunks
.
delete
(
chunkUrl
);
throw
error
;
}
);
retryingChunks
.
set
(
chunkUrl
,
entry
);
}
return
entry
;
}
function
preloadModule
(
metadata
)
{
function
preloadModule
(
metadata
)
{
for
(
var
chunks
=
metadata
[
1
],
promises
=
[],
i
=
0
;
i
<
chunks
.
length
;
i
++
)
{
for
(
var
chunks
=
metadata
[
1
],
promises
=
[],
i
=
0
;
i
<
chunks
.
length
;
i
++
)
{
var
thenable
=
loadChunk
(
chunks
[
i
]);
var
thenable
=
__turbopack_load_by_url__
(
chunks
[
i
]);
loadedChunks
.
has
(
thenable
)
||
promises
.
push
(
thenable
);
loadedChunks
.
has
(
thenable
)
||
promises
.
push
(
thenable
);
if
(
!
instrumentedChunks
.
has
(
thenable
))
{
if
(
!
instrumentedChunks
.
has
(
thenable
))
{
var
resolve
=
loadedChunks
.
add
.
bind
(
loadedChunks
,
thenable
);
var
resolve
=
loadedChunks
.
add
.
bind
(
loadedChunks
,
thenable
);
...
...
packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.development.js
View file @
90232b56
...
@@ -81,7 +81,6 @@
...
@@ -81,7 +81,6 @@
return
promise
;
return
promise
;
}
}
function
ignoreReject
()
{}
function
ignoreReject
()
{}
var
retryChunkLoadError
=
require
(
"next/dist/client/components/chunk-load-error/retry-chunk-load-error"
).
retryChunkLoadError
;
function
clearChunkCache
(
chunkId
)
{
function
clearChunkCache
(
chunkId
)
{
chunkCache
.
delete
(
chunkId
);
chunkCache
.
delete
(
chunkId
);
}
}
...
@@ -126,9 +125,7 @@
...
@@ -126,9 +125,7 @@
}
}
function
loadChunk
(
chunkId
,
filename
)
{
function
loadChunk
(
chunkId
,
filename
)
{
chunkMap
.
set
(
chunkId
,
filename
);
chunkMap
.
set
(
chunkId
,
filename
);
return
retryChunkLoadError
(
function
()
{
return
__webpack_chunk_load__
(
chunkId
);
return
__webpack_chunk_load__
(
chunkId
);
});
}
}
function
getIteratorFn
(
maybeIterable
)
{
function
getIteratorFn
(
maybeIterable
)
{
if
(
null
===
maybeIterable
||
"object"
!==
typeof
maybeIterable
)
if
(
null
===
maybeIterable
||
"object"
!==
typeof
maybeIterable
)
...
...
packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.production.js
View file @
90232b56
...
@@ -71,7 +71,6 @@ function requireAsyncModule(id) {
...
@@ -71,7 +71,6 @@ function requireAsyncModule(id) {
return
promise
;
return
promise
;
}
}
function
ignoreReject
()
{}
function
ignoreReject
()
{}
var
retryChunkLoadError
=
require
(
"next/dist/client/components/chunk-load-error/retry-chunk-load-error"
).
retryChunkLoadError
;
function
clearChunkCache
(
chunkId
)
{
function
clearChunkCache
(
chunkId
)
{
chunkCache
.
delete
(
chunkId
);
chunkCache
.
delete
(
chunkId
);
}
}
...
@@ -82,9 +81,7 @@ function preloadModule(metadata) {
...
@@ -82,9 +81,7 @@ function preloadModule(metadata) {
entry
=
chunkCache
.
get
(
chunkId
);
entry
=
chunkCache
.
get
(
chunkId
);
void
0
===
entry
void
0
===
entry
?
(
chunkMap
.
set
(
chunkId
,
chunkFilename
),
?
(
chunkMap
.
set
(
chunkId
,
chunkFilename
),
(
chunkFilename
=
retryChunkLoadError
(
function
()
{
(
chunkFilename
=
__webpack_chunk_load__
(
chunkId
)),
return
__webpack_chunk_load__
(
chunkId
);
})),
promises
.
push
(
chunkFilename
),
promises
.
push
(
chunkFilename
),
(
entry
=
chunkCache
.
set
.
bind
(
chunkCache
,
chunkId
,
null
)),
(
entry
=
chunkCache
.
set
.
bind
(
chunkCache
,
chunkId
,
null
)),
chunkFilename
.
then
(
entry
,
clearChunkCache
.
bind
(
null
,
chunkId
)),
chunkFilename
.
then
(
entry
,
clearChunkCache
.
bind
(
null
,
chunkId
)),
...
...
packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.development.js
View file @
90232b56
...
@@ -81,7 +81,6 @@
...
@@ -81,7 +81,6 @@
return
promise
;
return
promise
;
}
}
function
ignoreReject
()
{}
function
ignoreReject
()
{}
var
retryChunkLoadError
=
require
(
"next/dist/client/components/chunk-load-error/retry-chunk-load-error"
).
retryChunkLoadError
;
function
clearChunkCache
(
chunkId
)
{
function
clearChunkCache
(
chunkId
)
{
chunkCache
.
delete
(
chunkId
);
chunkCache
.
delete
(
chunkId
);
}
}
...
@@ -126,9 +125,7 @@
...
@@ -126,9 +125,7 @@
}
}
function
loadChunk
(
chunkId
,
filename
)
{
function
loadChunk
(
chunkId
,
filename
)
{
chunkMap
.
set
(
chunkId
,
filename
);
chunkMap
.
set
(
chunkId
,
filename
);
return
retryChunkLoadError
(
function
()
{
return
__webpack_chunk_load__
(
chunkId
);
return
__webpack_chunk_load__
(
chunkId
);
});
}
}
function
getIteratorFn
(
maybeIterable
)
{
function
getIteratorFn
(
maybeIterable
)
{
if
(
null
===
maybeIterable
||
"object"
!==
typeof
maybeIterable
)
if
(
null
===
maybeIterable
||
"object"
!==
typeof
maybeIterable
)
...
...
packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.production.js
View file @
90232b56
...
@@ -71,7 +71,6 @@ function requireAsyncModule(id) {
...
@@ -71,7 +71,6 @@ function requireAsyncModule(id) {
return
promise
;
return
promise
;
}
}
function
ignoreReject
()
{}
function
ignoreReject
()
{}
var
retryChunkLoadError
=
require
(
"next/dist/client/components/chunk-load-error/retry-chunk-load-error"
).
retryChunkLoadError
;
function
clearChunkCache
(
chunkId
)
{
function
clearChunkCache
(
chunkId
)
{
chunkCache
.
delete
(
chunkId
);
chunkCache
.
delete
(
chunkId
);
}
}
...
@@ -82,9 +81,7 @@ function preloadModule(metadata) {
...
@@ -82,9 +81,7 @@ function preloadModule(metadata) {
entry
=
chunkCache
.
get
(
chunkId
);
entry
=
chunkCache
.
get
(
chunkId
);
void
0
===
entry
void
0
===
entry
?
(
chunkMap
.
set
(
chunkId
,
chunkFilename
),
?
(
chunkMap
.
set
(
chunkId
,
chunkFilename
),
(
chunkFilename
=
retryChunkLoadError
(
function
()
{
(
chunkFilename
=
__webpack_chunk_load__
(
chunkId
)),
return
__webpack_chunk_load__
(
chunkId
);
})),
promises
.
push
(
chunkFilename
),
promises
.
push
(
chunkFilename
),
(
entry
=
chunkCache
.
set
.
bind
(
chunkCache
,
chunkId
,
null
)),
(
entry
=
chunkCache
.
set
.
bind
(
chunkCache
,
chunkId
,
null
)),
chunkFilename
.
then
(
entry
,
clearChunkCache
.
bind
(
null
,
chunkId
)),
chunkFilename
.
then
(
entry
,
clearChunkCache
.
bind
(
null
,
chunkId
)),
...
...
packages/next/src/shared/lib/lazy-dynamic/loadable.tsx
View file @
90232b56
...
@@ -2,7 +2,6 @@ import { Suspense, Fragment, lazy } from 'react'
...
@@ -2,7 +2,6 @@ import { Suspense, Fragment, lazy } from 'react'
import
{
BailoutToCSR
}
from
'./dynamic-bailout-to-csr'
import
{
BailoutToCSR
}
from
'./dynamic-bailout-to-csr'
import
type
{
ComponentModule
}
from
'./types'
import
type
{
ComponentModule
}
from
'./types'
import
{
PreloadChunks
}
from
'./preload-chunks'
import
{
PreloadChunks
}
from
'./preload-chunks'
import
{
retryChunkLoadError
}
from
'../../../client/components/chunk-load-error/retry-chunk-load-error'
// Normalize loader to return the module as form { default: Component } for `React.lazy`.
// Normalize loader to return the module as form { default: Component } for `React.lazy`.
// Also for backward compatible since next/dynamic allows to resolve a component directly with loader
// Also for backward compatible since next/dynamic allows to resolve a component directly with loader
...
@@ -26,10 +25,6 @@ function convertModule<P>(
...
@@ -26,10 +25,6 @@ function convertModule<P>(
}
}
}
}
function
createRetryableLoader
<
T
>
(
loader
:
()
=>
Promise
<
T
>
):
()
=>
Promise
<
T
>
{
return
()
=>
retryChunkLoadError
(
loader
)
}
const
defaultOptions
=
{
const
defaultOptions
=
{
loader
:
()
=>
Promise
.
resolve
(
convertModule
(()
=>
null
)),
loader
:
()
=>
Promise
.
resolve
(
convertModule
(()
=>
null
)),
loading
:
null
,
loading
:
null
,
...
@@ -45,11 +40,7 @@ interface LoadableOptions {
...
@@ -45,11 +40,7 @@ interface LoadableOptions {
function
Loadable
(
options
:
LoadableOptions
)
{
function
Loadable
(
options
:
LoadableOptions
)
{
const
opts
=
{
...
defaultOptions
,
...
options
}
const
opts
=
{
...
defaultOptions
,
...
options
}
// Wrap loader with retry logic for chunk load errors (client-side only)
const
Lazy
=
lazy
(()
=>
opts
.
loader
().
then
(
convertModule
))
const
retryableLoader
=
createRetryableLoader
(()
=>
opts
.
loader
().
then
(
convertModule
)
)
const
Lazy
=
lazy
(
retryableLoader
)
const
Loading
=
opts
.
loading
const
Loading
=
opts
.
loading
function
LoadableComponent
(
props
:
any
)
{
function
LoadableComponent
(
props
:
any
)
{
...
...
packages/next/src/shared/lib/loadable.shared-runtime.tsx
View file @
90232b56
...
@@ -24,7 +24,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
...
@@ -24,7 +24,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
import
React
from
'react'
import
React
from
'react'
import
{
LoadableContext
}
from
'./loadable-context.shared-runtime'
import
{
LoadableContext
}
from
'./loadable-context.shared-runtime'
import
{
retryChunkLoadError
}
from
'../../client/components/chunk-load-error/retry-chunk-load-error'
function
resolve
(
obj
:
any
)
{
function
resolve
(
obj
:
any
)
{
return
obj
&&
obj
.
default
?
obj
.
default
:
obj
return
obj
&&
obj
.
default
?
obj
.
default
:
obj
...
@@ -34,12 +33,8 @@ const ALL_INITIALIZERS: any[] = []
...
@@ -34,12 +33,8 @@ const ALL_INITIALIZERS: any[] = []
const
READY_INITIALIZERS
:
any
[]
=
[]
const
READY_INITIALIZERS
:
any
[]
=
[]
let
initialized
=
false
let
initialized
=
false
function
retryChunkLoadErrorOnce
(
loader
:
any
)
{
return
retryChunkLoadError
(
loader
)
}
function
load
(
loader
:
any
)
{
function
load
(
loader
:
any
)
{
let
promise
=
retryChunkLoadErrorOnce
(
loader
)
let
promise
=
loader
(
)
let
state
:
any
=
{
let
state
:
any
=
{
loading
:
true
,
loading
:
true
,
...
...
packages/next/taskfile.js
View file @
90232b56
...
@@ -1635,81 +1635,23 @@ export async function copy_vendor_react(task_) {
...
@@ -1635,81 +1635,23 @@ export async function copy_vendor_react(task_) {
)
)
}
}
const
retryChunkLoadErrorRequire
=
`var retryChunkLoadError = require("next/dist/client/components/chunk-load-error/retry-chunk-load-error").retryChunkLoadError;`
const
webpackChunkLoadCacheHelpers
=
`function clearChunkCache(chunkId) {
const
webpackChunkLoadRetryHelpers
=
`
${
retryChunkLoadErrorRequire
}
function clearChunkCache(chunkId) {
chunkCache.delete(chunkId);
chunkCache.delete(chunkId);
}`
}`
function
patchReactServerDomWebpackBrowserClient
(
source
)
{
function
patchReactServerDomWebpackBrowserClient
(
source
)
{
le
t
newSource
=
insertAfterIgnoreReject
(
cons
t
newSource
=
insertAfterIgnoreReject
(
source
,
source
,
webpackChunkLoad
Retry
Helpers
,
webpackChunkLoad
Cache
Helpers
,
'insert webpack browser chunk
retry
helpers'
'insert webpack browser chunk
cache
helpers'
)
)
newSource
=
replaceOnce
(
return
replaceOnce
(
newSource
,
newSource
,
'chunkFilename.then(entry, ignoreReject),'
,
'chunkFilename.then(entry, ignoreReject),'
,
'chunkFilename.then(entry, clearChunkCache.bind(null, chunkId)),'
,
'chunkFilename.then(entry, clearChunkCache.bind(null, chunkId)),'
,
'clear failed webpack browser chunk cache'
'clear failed webpack browser chunk cache'
)
)
if
(
newSource
.
includes
(
'function loadChunk(chunkId, filename)'
))
{
return
replaceOnce
(
newSource
,
/^
(\s
*
)
return __webpack_chunk_load__
\(
chunkId
\)
;$/m
,
(
match
,
indent
)
=>
`
${
indent
}
return retryChunkLoadError(function () {\n
${
indent
}
return __webpack_chunk_load__(chunkId);\n
${
indent
}
});`
,
'wrap webpack browser chunk loader'
)
}
return
replaceOnce
(
newSource
,
/^
(\s
*
)\(
chunkFilename = __webpack_chunk_load__
\(
chunkId
\)\)
,$/m
,
(
match
,
indent
)
=>
`
${
indent
}
(chunkFilename = retryChunkLoadError(function () {\n
${
indent
}
return __webpack_chunk_load__(chunkId);\n
${
indent
}
})),`
,
'wrap webpack browser chunk loader'
)
}
const
turbopackChunkLoadRetryHelpers
=
`
${
retryChunkLoadErrorRequire
}
var retryingChunks = new Map();
function loadChunk(chunkUrl) {
var entry = retryingChunks.get(chunkUrl);
if (void 0 === entry) {
entry = retryChunkLoadError(function () {
return __turbopack_load_by_url__(chunkUrl);
}).then(
function (value) {
retryingChunks.delete(chunkUrl);
return value;
},
function (error) {
retryingChunks.delete(chunkUrl);
throw error;
}
);
retryingChunks.set(chunkUrl, entry);
}
return entry;
}`
function
patchReactServerDomTurbopackBrowserClient
(
source
)
{
let
newSource
=
insertAfterIgnoreReject
(
source
,
turbopackChunkLoadRetryHelpers
,
'insert turbopack browser chunk retry helpers'
)
return
replaceOnce
(
newSource
,
'__turbopack_load_by_url__(chunks[i])'
,
'loadChunk(chunks[i])'
,
'wrap turbopack browser chunk loader'
)
}
}
// Remove unused files
// Remove unused files
...
@@ -1810,8 +1752,8 @@ function loadChunk(chunkUrl) {
...
@@ -1810,8 +1752,8 @@ function loadChunk(chunkUrl) {
// eslint-disable-next-line require-yield
// eslint-disable-next-line require-yield
.
run
({
every
:
true
},
function
*
(
file
)
{
.
run
({
every
:
true
},
function
*
(
file
)
{
// Server builds replace the module loading indirection for Next's
// Server builds replace the module loading indirection for Next's
// runtime bundle constraints. Browser clients stay upstream
except for
// runtime bundle constraints. Browser clients stay upstream
because
//
a one-shot ChunkLoadError retry around client reference chunk loads
.
//
runtime-level chunk retries now live below React
.
if
(
if
(
(
file
.
base
.
startsWith
(
'react-server-dom-turbopack-client'
)
||
(
file
.
base
.
startsWith
(
'react-server-dom-turbopack-client'
)
||
...
@@ -1837,12 +1779,6 @@ function loadChunk(chunkUrl) {
...
@@ -1837,12 +1779,6 @@ function loadChunk(chunkUrl) {
)
)
file
.
data
=
recast
.
print
(
ast
).
code
file
.
data
=
recast
.
print
(
ast
).
code
}
else
if
(
file
.
base
.
startsWith
(
'react-server-dom-turbopack-client.browser'
)
)
{
file
.
data
=
patchReactServerDomTurbopackBrowserClient
(
file
.
data
.
toString
()
)
}
else
if
(
file
.
base
===
'package.json'
)
{
}
else
if
(
file
.
base
===
'package.json'
)
{
file
.
data
=
overridePackageName
(
file
.
data
)
file
.
data
=
overridePackageName
(
file
.
data
)
}
}
...
...
test/production/chunk-load-failure/chunk-load-failure.test.ts
View file @
90232b56
...
@@ -240,6 +240,74 @@ describe('chunk-load-failure', () => {
...
@@ -240,6 +240,74 @@ describe('chunk-load-failure', () => {
expect
(
pageError
.
message
).
toContain
(
'/_next/static/'
+
appRouterChunk
)
expect
(
pageError
.
message
).
toContain
(
'/_next/static/'
+
appRouterChunk
)
})
})
it
(
'should recover after a later app-router navigation once a failed chunk is available again'
,
async
()
=>
{
let
appRouterChunk
=
await
getChunkContainingText
(
'this is other'
)
let
chunkRequestCount
=
0
let
rscRequestCount
=
0
let
documentRequestCount
=
0
let
pageErrorCount
=
0
const
browser
=
await
next
.
browser
(
'/dynamic'
,
{
beforePageLoad
(
page
)
{
page
.
route
(
`**/
${
appRouterChunk
}
*`
,
async
(
route
)
=>
{
chunkRequestCount
++
if
(
chunkRequestCount
<=
2
)
{
await
route
.
abort
(
'connectionreset'
)
return
}
await
route
.
continue
()
})
page
.
on
(
'request'
,
(
request
)
=>
{
const
url
=
new
URL
(
request
.
url
())
if
(
request
.
resourceType
()
===
'document'
&&
url
.
pathname
===
'/other'
)
{
documentRequestCount
++
}
if
(
url
.
pathname
===
'/other'
&&
url
.
searchParams
.
has
(
'_rsc'
))
{
rscRequestCount
++
}
})
page
.
on
(
'pageerror'
,
()
=>
{
pageErrorCount
++
})
},
})
await
browser
.
elementByCss
(
'#to-other'
).
click
()
await
retry
(
async
()
=>
{
const
body
=
await
browser
.
elementByCss
(
'body'
)
expect
(
await
body
.
text
()).
toMatch
(
/This page couldn
\u
2019t load/
)
})
expect
(
chunkRequestCount
).
toBe
(
2
)
expect
(
pageErrorCount
).
toBe
(
1
)
await
browser
.
back
()
await
retry
(
async
()
=>
{
const
link
=
await
browser
.
elementByCss
(
'#to-other'
)
expect
(
await
link
.
text
()).
toBe
(
'to other'
)
})
await
browser
.
elementByCss
(
'#to-other'
).
click
()
await
retry
(
async
()
=>
{
const
body
=
await
browser
.
elementByCss
(
'body'
)
expect
(
await
body
.
text
()).
toContain
(
'this is other'
)
},
10
_000
,
250
)
expect
(
chunkRequestCount
).
toBeGreaterThanOrEqual
(
3
)
expect
(
rscRequestCount
).
toBe
(
2
)
expect
(
documentRequestCount
).
toBe
(
0
)
})
it
(
'should report aborted chunks when navigating away'
,
async
()
=>
{
it
(
'should report aborted chunks when navigating away'
,
async
()
=>
{
let
nextDynamicChunk
=
await
getChunkContainingText
(
let
nextDynamicChunk
=
await
getChunkContainingText
(
'this is a lazy loaded async component'
'this is a lazy loaded async component'
...
...
turbopack/crates/turbopack-ecmascript-runtime/js/src/browser/runtime/dom/runtime-backend-dom.ts
View file @
90232b56
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment