library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove workarounds for the uglify task mishandling banners when used with source maps. (cherry-picked from d0fadbba9f)

Browse Source 
The issue was fixed in grunt-contrib-uglify:
https://github.com/gruntjs/grunt-contrib-uglify/issues/22
This commit is contained in:
Michał Gołębiowski 2013-11-09 23:12:06 +01:00
parent ff951314e3
commit 7c38b0686d
3 changed files with 11 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Gruntfile.js
View File

@ -93,33 +93,22 @@ module.exports = function( grunt ) {
files: [ "<%= jshint.grunt.src %>", "<%= jshint.tests.src %>", "src/**/*.js" ],
tasks: "dev"
},
"pre-uglify": {
all: {
files: {
"dist/jquery.pre-min.js": [ "dist/jquery.js" ]
},
options: {
banner: "\n\n\n\n\n\n\n\n\n\n\n\n" + // banner line size must be preserved
"/*! jQuery v<%= pkg.version %> | " +
"(c) 2005, 2013 jQuery Foundation, Inc. | " +
"jquery.org/license */\n"
}
}
},
uglify: {
all: {
files: {
"dist/jquery.min.js": [ "dist/jquery.pre-min.js" ]
"dist/jquery.min.js": [ "dist/jquery.js" ]
},
options: {
// Keep our hard-coded banner
preserveComments: "some",
preserveComments: false,
sourceMap: "dist/jquery.min.map",
sourceMappingURL: "jquery.min.map",
report: "min",
beautify: {
ascii_only: true
},
banner: "/*! jQuery v<%= pkg.version %> | " +
"(c) 2005, 2013 jQuery Foundation, Inc. | " +
"jquery.org/license */",
compress: {
hoist_funs: false,
loops: false,
@ -127,14 +116,6 @@ module.exports = function( grunt ) {
}
}
}
},
"post-uglify": {
all: {
src: [ "dist/jquery.min.map" ],
options: {
tempFiles: [ "dist/jquery.pre-min.js" ]
}
}
}
});
@ -148,5 +129,5 @@ module.exports = function( grunt ) {
grunt.registerTask( "dev", [ "build:*:*", "jshint", "jscs" ] );
// Default grunt
grunt.registerTask( "default", [ "jsonlint", "dev", "pre-uglify", "uglify", "post-uglify", "dist:*", "compare_size" ] );
grunt.registerTask( "default", [ "jsonlint", "dev", "uglify", "dist:*", "compare_size" ] );
};

46
build/tasks/uglify.js
View File

@ -1,46 +0,0 @@
module.exports = function( grunt ) {
"use strict";
var fs = require( "fs" );
// Work around grunt-contrib-uglify sourceMap issues (jQuery #13776)
grunt.registerMultiTask( "pre-uglify", function() {
var banner = this.options().banner;
this.files.forEach(function( mapping ) {
// Join src
var input = mapping.src.map(function( file ) {
var contents = grunt.file.read( file );
// Strip banners
return contents
// 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 ) {
return match.replace( /[^\n]/gm, "" );
});
}).join( "\n" );
// Write temp file (with optional banner)
grunt.file.write( mapping.dest, ( banner || "" ) + input );
});
});
// 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.
grunt.registerMultiTask( "post-uglify", function() {
this.files.forEach(function( mapping ) {
mapping.src.forEach( function( src ) {
// Refer to the source jquery.js, not the temporary jquery.pre-min.js.
grunt.file.write( src, grunt.file.read( src ).replace( /\.pre-min\./g, "." ) );
});
});
// Remove temporary files.
this.options().tempFiles.forEach(function( fileName ) {
fs.unlink( fileName );
});
});
};

2
package.json
View File

@ -33,7 +33,7 @@
"grunt": "~0.4.1",
"grunt-compare-size": "~0.4.0",
"grunt-contrib-jshint": "~0.7.0",
"grunt-contrib-uglify": "~0.2.4",
"grunt-contrib-uglify": "~0.2.7",
"grunt-contrib-watch": "~0.5.3",
"grunt-git-authors": "~1.2.0",
"grunt-jscs-checker": "~0.2.3",