Skip to content
Permalink
Browse files

Remove workarounds for the uglify task mishandling banners when used …

…with source maps.

The issue was fixed in grunt-contrib-uglify:
gruntjs/grunt-contrib-uglify#22
  • Loading branch information...
mgol committed Nov 9, 2013
1 parent 85d4c01 commit d0fadbba9f1dbe2ee009be6586fbdf3cda4eff98
Showing with 11 additions and 76 deletions.
  1. +10 −29 Gruntfile.js
  2. +0 −46 build/tasks/uglify.js
  3. +1 −1 package.json
@@ -5,7 +5,7 @@ module.exports = function( grunt ) {
var data = {};
try {
data = grunt.file.readJSON( filepath );
} catch(e) {}
} catch ( e ) {}
return data;
}

@@ -17,8 +17,8 @@ module.exports = function( grunt ) {
delete srcHintOptions.onevar;

grunt.initConfig({
pkg: grunt.file.readJSON("package.json"),
dst: readOptionalJSON("dist/.destination.json"),
pkg: grunt.file.readJSON( "package.json" ),
dst: readOptionalJSON( "dist/.destination.json" ),
compare_size: {
files: [ "dist/jquery.js", "dist/jquery.min.js" ],
options: {
@@ -89,54 +89,35 @@ module.exports = function( grunt ) {
tasks: "build/tasks/*.js"
},
testswarm: {
tests: "ajax attributes callbacks core css data deferred dimensions effects event manipulation offset queue selector serialize support traversing Sizzle".split(" ")
tests: "ajax attributes callbacks core css data deferred dimensions effects event manipulation offset queue selector serialize support traversing Sizzle".split( " " )
},
watch: {
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,
unused: false
}
}
}
},
"post-uglify": {
all: {
src: [ "dist/jquery.min.map" ],
options: {
tempFiles: [ "dist/jquery.pre-min.js" ]
}
}
}
});

@@ -150,5 +131,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" ] );
};

This file was deleted.

@@ -32,7 +32,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",

0 comments on commit d0fadbb

Please sign in to comment.
You can’t perform that action at this time.