Skip to content

Commit

Permalink
No ticket. Simplify the post-uglify task.
Browse files Browse the repository at this point in the history
  • Loading branch information
mgol committed Oct 1, 2013
1 parent 2c0b902 commit 923bfc8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 14 deletions.
7 changes: 2 additions & 5 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
}
}
}
Expand Down
14 changes: 5 additions & 9 deletions build/tasks/uglify.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand All @@ -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.
Expand Down

0 comments on commit 923bfc8

Please sign in to comment.