@@ -37,7 +37,7 @@ function hotLoader(content, context) {
37
37
` ;
38
38
}
39
39
40
- function exec ( loaderContext , code , filename ) {
40
+ function evalModuleCode ( loaderContext , code , filename ) {
41
41
const module = new NativeModule ( filename , loaderContext ) ;
42
42
43
43
module . paths = NativeModule . _nodeModulePaths ( loaderContext . context ) ; // eslint-disable-line no-underscore-dangle
@@ -175,27 +175,27 @@ export function pitch(request) {
175
175
return callback ( new Error ( "Didn't get a result from child compiler" ) ) ;
176
176
}
177
177
178
- let text ;
179
178
let locals ;
180
179
181
180
try {
182
- text = exec ( this , source , request ) ;
183
- locals = text && text . locals ;
184
- if ( ! Array . isArray ( text ) ) {
185
- text = [ [ null , text ] ] ;
181
+ let dependencies ;
182
+ const exports = evalModuleCode ( this , source , request ) ;
183
+ locals = exports && exports . locals ;
184
+ if ( ! Array . isArray ( exports ) ) {
185
+ dependencies = [ [ null , exports ] ] ;
186
186
} else {
187
- text = text . map ( ( line ) => {
188
- const module = findModuleById ( compilation . modules , line [ 0 ] ) ;
187
+ dependencies = exports . map ( ( [ id , content , media , sourceMap ] ) => {
188
+ const module = findModuleById ( compilation . modules , id ) ;
189
189
190
190
return {
191
191
identifier : module . identifier ( ) ,
192
- content : line [ 1 ] ,
193
- media : line [ 2 ] ,
194
- sourceMap : line [ 3 ] ,
192
+ content,
193
+ media,
194
+ sourceMap,
195
195
} ;
196
196
} ) ;
197
197
}
198
- addDependencies ( text ) ;
198
+ addDependencies ( dependencies ) ;
199
199
} catch ( e ) {
200
200
return callback ( e ) ;
201
201
}
0 commit comments