1212'use strict' ;
1313
1414import path from 'path' ;
15- import url from 'url' ;
15+ import { pathToFileURL } from 'url' ;
1616import asyncLib from 'neo-async' ;
1717import ModuleDependency from 'webpack/lib/dependencies/ModuleDependency' ;
1818import NullDependency from 'webpack/lib/dependencies/NullDependency' ;
@@ -126,7 +126,6 @@ export default class ReactFlightWebpackPlugin {
126126 }
127127 ) ;
128128 } ) ;
129-
130129
131130 compiler . hooks . thisCompilation . tap ( PLUGIN_NAME , function ( compilation : Compilation , { normalModuleFactory} ) {
132131 compilation . dependencyFactories . set (
@@ -204,9 +203,9 @@ export default class ReactFlightWebpackPlugin {
204203 return ;
205204 }
206205
207- var json = { } ;
206+ const json = { } ;
208207 compilation . chunkGroups . forEach ( function ( chunkGroup ) {
209- var chunkIds = chunkGroup . chunks . map ( function ( c ) {
208+ const chunkIds = chunkGroup . chunks . map ( function ( c ) {
210209 return c . id ;
211210 } ) ;
212211
@@ -223,7 +222,7 @@ export default class ReactFlightWebpackPlugin {
223222 . getExportsInfo ( module )
224223 . getProvidedExports ( ) ;
225224
226- var moduleExports = { } ;
225+ const moduleExports = { } ;
227226 [ '' , '*' ]
228227 . concat ( Array . isArray ( moduleProvidedExports ) ? moduleProvidedExports : [ ] )
229228 . forEach ( function ( name ) {
@@ -233,7 +232,7 @@ export default class ReactFlightWebpackPlugin {
233232 name : name ,
234233 } ;
235234 } ) ;
236- var href = url . pathToFileURL ( ( module as ModuleWithResource ) . resource ) . href ;
235+ const href = pathToFileURL ( ( module as ModuleWithResource ) . resource ) . href ;
237236
238237 if ( href !== undefined ) {
239238 json [ href ] = moduleExports ;
@@ -285,15 +284,15 @@ export default class ReactFlightWebpackPlugin {
285284 return ;
286285 }
287286
288- var clientReferenceSearch = clientReferencePath ;
287+ const clientReferenceSearch = clientReferencePath ;
289288 contextResolver . resolve (
290289 { } ,
291290 context ,
292291 clientReferencePath . directory ,
293292 { } ,
294293 function ( err , resolvedDirectory ) {
295294 if ( err ) return cb ( err ) ;
296- var options = {
295+ const options = {
297296 resource : resolvedDirectory ,
298297 resourceQuery : '' ,
299298 recursive :
@@ -309,10 +308,10 @@ export default class ReactFlightWebpackPlugin {
309308 deps
310309 ) {
311310 if ( err2 ) return cb ( err2 ) ;
312- var clientRefDeps = deps . map ( function ( dep ) {
313- // use userRequest instead of request. request always end with undefined
314- var request = path . join ( resolvedDirectory , dep . userRequest ) ;
315- var clientRefDep = new ClientReferenceDependency ( request ) ;
311+ const clientRefDeps = deps . map ( function ( dep ) {
312+ // use userRequest instead of request. request always end with undefined which is wrong
313+ const request = path . join ( resolvedDirectory , dep . userRequest ) ;
314+ const clientRefDep = new ClientReferenceDependency ( request ) ;
316315 clientRefDep . userRequest = dep . userRequest ;
317316 return clientRefDep ;
318317 } ) ;
@@ -323,9 +322,9 @@ export default class ReactFlightWebpackPlugin {
323322 } ,
324323 function ( err , result ) {
325324 if ( err ) return callback ( err ) ;
326- var flat = [ ] ;
325+ const flat = [ ] ;
327326
328- for ( var i = 0 ; i < result . length ; i ++ ) {
327+ for ( let i = 0 ; i < result . length ; i ++ ) {
329328 flat . push . apply ( flat , result [ i ] ) ;
330329 }
331330
0 commit comments