@@ -13,7 +13,6 @@ var _ = require('lodash')
1313var SourceMapConsumer = require ( 'source-map' ) . SourceMapConsumer
1414var SourceMapGenerator = require ( 'source-map' ) . SourceMapGenerator
1515var globalSourceCache = require ( './source-cache' )
16- var extend = require ( 'util' ) . _extend
1716var coverageMap = require ( './coverage-map' )
1817
1918// Regexes
@@ -29,13 +28,13 @@ function createCoveragePreprocessor (logger, helper, basePath, reporters, covera
2928 // -------
3029
3130 var instrumenterOverrides = { }
32- var instrumenters = { istanbul : istanbul }
31+ var instrumenters = { istanbul : istanbul }
3332 var includeAllSources = false
3433 var useJSExtensionForCoffeeScript = false
3534
3635 if ( coverageReporter ) {
3736 instrumenterOverrides = coverageReporter . instrumenter
38- instrumenters = extend ( { istanbul : istanbul } , coverageReporter . instrumenters )
37+ instrumenters = Object . assign ( { } , { istanbul : istanbul } , coverageReporter . instrumenters )
3938 includeAllSources = coverageReporter . includeAllSources === true
4039 useJSExtensionForCoffeeScript = coverageReporter . useJSExtensionForCoffeeScript === true
4140 }
@@ -84,7 +83,7 @@ function createCoveragePreprocessor (logger, helper, basePath, reporters, covera
8483 var instrumenterLiteral = 'istanbul'
8584
8685 _ . forEach ( instrumenterOverrides , function ( literal , pattern ) {
87- if ( minimatch ( file . originalPath , pattern , { dot : true } ) ) {
86+ if ( minimatch ( file . originalPath , pattern , { dot : true } ) ) {
8887 instrumenterLiteral = String ( literal )
8988 }
9089 } )
@@ -95,7 +94,7 @@ function createCoveragePreprocessor (logger, helper, basePath, reporters, covera
9594
9695 if ( file . sourceMap ) {
9796 log . debug ( 'Enabling source map generation for "%s".' , file . originalPath )
98- codeGenerationOptions = extend ( {
97+ codeGenerationOptions = Object . assign ( { } , {
9998 format : {
10099 compact : ! constructOptions . noCompact
101100 } ,
@@ -105,8 +104,8 @@ function createCoveragePreprocessor (logger, helper, basePath, reporters, covera
105104 } , constructOptions . codeGenerationOptions || { } )
106105 }
107106
108- var options = extend ( { } , constructOptions )
109- options = extend ( options , { codeGenerationOptions : codeGenerationOptions } )
107+ var options = Object . assign ( { } , constructOptions )
108+ options = Object . assign ( { } , options , { codeGenerationOptions : codeGenerationOptions } )
110109
111110 var instrumenter = new InstrumenterConstructor ( options )
112111 instrumenter . instrument ( content , jsPath , function ( err , instrumentedCode ) {
@@ -120,7 +119,7 @@ function createCoveragePreprocessor (logger, helper, basePath, reporters, covera
120119 generator . applySourceMap ( new SourceMapConsumer ( file . sourceMap ) )
121120 file . sourceMap = JSON . parse ( generator . toString ( ) )
122121 instrumentedCode += '\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,'
123- instrumentedCode += new Buffer ( JSON . stringify ( file . sourceMap ) ) . toString ( 'base64' ) + '\n'
122+ instrumentedCode += Buffer . from ( JSON . stringify ( file . sourceMap ) ) . toString ( 'base64' ) + '\n'
124123 }
125124
126125 // remember the actual immediate instrumented JS for given original path
0 commit comments