diff options
| -rw-r--r-- | Gruntfile.js | 7 | ||||
| -rw-r--r-- | build/tasks/uglify.js | 14 |
2 files changed, 7 insertions, 14 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index bbbdd4005..6bc16a982 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -123,12 +123,9 @@ module.exports = function( grunt ) { }, "post-uglify": { all: { - files: { - "dist/jquery.min.map.tmp": [ "dist/jquery.min.map" ], - "dist/jquery.min.js.tmp": [ "dist/jquery.min.js" ] - }, + src: [ "dist/jquery.min.map" ], options: { - tempFiles: [ "dist/jquery.min.map.tmp", "dist/jquery.min.js.tmp", "dist/jquery.pre-min.js" ] + tempFiles: [ "dist/jquery.pre-min.js" ] } } } diff --git a/build/tasks/uglify.js b/build/tasks/uglify.js index ccbc70888..f8df5e77e 100644 --- a/build/tasks/uglify.js +++ b/build/tasks/uglify.js @@ -18,10 +18,10 @@ module.exports = function( grunt ) { // Remove the main jQuery banner, it'll be replaced by the new banner anyway. .replace( /^\/\*![\W\w]*?\*\/\n?/g, "" ) // Strip other banners preserving line count. - .replace( /^\/\*!(?:.|\n)*?\*\/\n?/gm, function ( match ) { + .replace( /^\/\*!(?:.|\n)*?\*\/\n?/gm, function( match ) { return match.replace( /[^\n]/gm, "" ); }); - }).join("\n"); + }).join( "\n" ); // Write temp file (with optional banner) grunt.file.write( mapping.dest, ( banner || "" ) + input ); @@ -30,16 +30,12 @@ module.exports = function( grunt ) { // Change the map file to point back to jquery.js instead of jquery.pre-min.js. // The problem is caused by the pre-uglify task. - // Also, remove temporary files. grunt.registerMultiTask( "post-uglify", function() { this.files.forEach(function( mapping ) { - var mapFileName = mapping.src[ 0 ]; - - // Rename the file to a temporary name. - fs.renameSync( mapFileName, mapping.dest); - grunt.file.write( mapFileName, grunt.file.read( mapping.dest ) + mapping.src.forEach( function( src ) { // Refer to the source jquery.js, not the temporary jquery.pre-min.js. - .replace( /\.pre-min\./g, "." )); + grunt.file.write( src, grunt.file.read( src ).replace( /\.pre-min\./g, "." ) ); + }); }); // Remove temporary files. |