No ticket. Simplify the post-uglify task. (cherry-picked from 923bfc80dbba00659a2fbad...

diff --git a/Gruntfile.js b/Gruntfile.js
index a4215b55888701046d0e92359653effba083aec0..4be86f29656beb72843ee06caa3981238b997a1c 100644 (file)
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -121,12 +121,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 ccbc708884bad45f7566278ae1ad8724903987c5..f8df5e77ed1b2f3b53cf93992fb966be46dbda2c 100644 (file)
--- 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.