@@ -81,23 +81,6 @@ export function waitForWebpackRuntimeHotUpdate() {
8181 return pendingHotUpdateWebpack
8282}
8383
84- function handleSuccessfulHotUpdateWebpack (
85- dispatcher : Dispatcher ,
86- sendMessage : ( message : string ) => void ,
87- updatedModules : ReadonlyArray < string >
88- ) {
89- resolvePendingHotUpdateWebpack ( )
90- dispatcher . onBuildOk ( )
91- reportHmrLatency (
92- sendMessage ,
93- updatedModules ,
94- webpackStartMsSinceEpoch ! ,
95- Date . now ( )
96- )
97-
98- dispatcher . onRefresh ( )
99- }
100-
10184// There is a newer version of the code available.
10285function handleAvailableHash ( hash : string ) {
10386 // Update last known compilation hash.
@@ -160,10 +143,8 @@ function performFullReload(err: any, sendMessage: any) {
160143}
161144
162145// Attempt to update code on the fly, fall back to a hard reload.
163- function tryApplyUpdates (
164- onBeforeUpdate : ( hasUpdates : boolean ) => void ,
165- onHotUpdateSuccess : ( updatedModules : string [ ] ) => void ,
166- sendMessage : any ,
146+ function tryApplyUpdatesWebpack (
147+ sendMessage : ( message : string ) => void ,
167148 dispatcher : Dispatcher
168149) {
169150 if ( ! isUpdateAvailable ( ) || ! canApplyUpdates ( ) ) {
@@ -173,8 +154,11 @@ function tryApplyUpdates(
173154 return
174155 }
175156
176- function handleApplyUpdates ( err : any , updatedModules : string [ ] | null ) {
177- if ( err || RuntimeErrorHandler . hadRuntimeError || ! updatedModules ) {
157+ function handleApplyUpdates (
158+ err : any ,
159+ updatedModules : ( string | number ) [ ] | null
160+ ) {
161+ if ( err || RuntimeErrorHandler . hadRuntimeError || updatedModules == null ) {
178162 if ( err ) {
179163 console . warn ( REACT_REFRESH_FULL_RELOAD )
180164 } else if ( RuntimeErrorHandler . hadRuntimeError ) {
@@ -184,50 +168,50 @@ function tryApplyUpdates(
184168 return
185169 }
186170
187- const hasUpdates = Boolean ( updatedModules . length )
188- if ( typeof onHotUpdateSuccess === 'function' ) {
189- // Maybe we want to do something.
190- onHotUpdateSuccess ( updatedModules )
191- }
171+ dispatcher . onBuildOk ( )
192172
193173 if ( isUpdateAvailable ( ) ) {
194174 // While we were updating, there was a new update! Do it again.
195- tryApplyUpdates (
196- hasUpdates ? ( ) => { } : onBeforeUpdate ,
197- hasUpdates ? ( ) => dispatcher . onBuildOk ( ) : onHotUpdateSuccess ,
198- sendMessage ,
199- dispatcher
200- )
201- } else {
202- dispatcher . onBuildOk ( )
203- if ( process . env . __NEXT_TEST_MODE ) {
204- afterApplyUpdates ( ( ) => {
205- if ( self . __NEXT_HMR_CB ) {
206- self . __NEXT_HMR_CB ( )
207- self . __NEXT_HMR_CB = null
208- }
209- } )
210- }
175+ tryApplyUpdatesWebpack ( sendMessage , dispatcher )
176+ return
177+ }
178+
179+ dispatcher . onRefresh ( )
180+ resolvePendingHotUpdateWebpack ( )
181+ reportHmrLatency (
182+ sendMessage ,
183+ updatedModules ,
184+ webpackStartMsSinceEpoch ! ,
185+ Date . now ( )
186+ )
187+
188+ if ( process . env . __NEXT_TEST_MODE ) {
189+ afterApplyUpdates ( ( ) => {
190+ if ( self . __NEXT_HMR_CB ) {
191+ self . __NEXT_HMR_CB ( )
192+ self . __NEXT_HMR_CB = null
193+ }
194+ } )
211195 }
212196 }
213197
214198 // https://webpack.js.org/api/hot-module-replacement/#check
215199 module . hot
216200 . check ( /* autoApply */ false )
217- . then ( ( updatedModules : any [ ] | null ) => {
218- if ( ! updatedModules ) {
201+ . then ( ( updatedModules : ( string | number ) [ ] | null ) => {
202+ if ( updatedModules == null ) {
219203 return null
220204 }
221205
222- if ( typeof onBeforeUpdate === 'function' ) {
223- const hasUpdates = Boolean ( updatedModules . length )
224- onBeforeUpdate ( hasUpdates )
225- }
206+ // We should always handle an update, even if updatedModules is empty (but
207+ // non-null) for any reason. That's what webpack would normally do:
208+ // https://github.com/webpack/webpack/blob/3aa6b6bc3a64/lib/hmr/HotModuleReplacement.runtime.js#L296-L298
209+ dispatcher . onBeforeRefresh ( )
226210 // https://webpack.js.org/api/hot-module-replacement/#apply
227211 return module . hot . apply ( )
228212 } )
229213 . then (
230- ( updatedModules : any [ ] | null ) => {
214+ ( updatedModules : ( string | number ) [ ] | null ) => {
231215 handleApplyUpdates ( null , updatedModules )
232216 } ,
233217 ( err : any ) => {
@@ -236,7 +220,7 @@ function tryApplyUpdates(
236220 )
237221}
238222
239- /** Handles messages from the sevrer for the App Router. */
223+ /** Handles messages from the server for the App Router. */
240224function processMessage (
241225 obj : HMR_ACTION_TYPES ,
242226 sendMessage : ( message : string ) => void ,
@@ -288,24 +272,7 @@ function processMessage(
288272 }
289273 dispatcher . onBuildOk ( )
290274 } else {
291- tryApplyUpdates (
292- function onBeforeHotUpdate ( hasUpdates : boolean ) {
293- if ( hasUpdates ) {
294- dispatcher . onBeforeRefresh ( )
295- }
296- } ,
297- function onSuccessfulHotUpdate ( webpackUpdatedModules : string [ ] ) {
298- // Only dismiss it when we're sure it's a hot update.
299- // Otherwise it would flicker right before the reload.
300- handleSuccessfulHotUpdateWebpack (
301- dispatcher ,
302- sendMessage ,
303- webpackUpdatedModules
304- )
305- } ,
306- sendMessage ,
307- dispatcher
308- )
275+ tryApplyUpdatesWebpack ( sendMessage , dispatcher )
309276 }
310277 }
311278
0 commit comments