From f71d7f56e96480d2115bff5542ded04ce6546ec9 Mon Sep 17 00:00:00 2001 From: Timmy Willison Date: Fri, 30 Jan 2015 12:22:25 -0800 Subject: [PATCH] Release: remove sourcemap comment from all copies of minified file Fixes gh-1707 --- Gruntfile.js | 2 +- build/release/cdn.js | 6 ------ build/tasks/sourcemap.js | 13 +++++++++++++ package.json | 3 +-- 4 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 build/tasks/sourcemap.js diff --git a/Gruntfile.js b/Gruntfile.js index 99ae3f093..d1b4a7cb2 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -161,7 +161,7 @@ module.exports = function( grunt ) { grunt.registerTask( "test", [ "test_fast" ] ); // Short list as a high frequency watch task - grunt.registerTask( "dev", [ "build:*:*", "lint", "uglify", "dist:*" ] ); + grunt.registerTask( "dev", [ "build:*:*", "lint", "uglify", "remove_map_comment", "dist:*" ] ); grunt.registerTask( "default", [ "dev", "test_fast", "compare_size" ] ); }; diff --git a/build/release/cdn.js b/build/release/cdn.js index 215241f40..5a45a629d 100644 --- a/build/release/cdn.js +++ b/build/release/cdn.js @@ -48,12 +48,6 @@ function makeReleaseCopies( Release ) { "\"file\":\"" + unpathedFile.replace( /\.min\.map/, ".min.js" ) + "\",\"sources\":[\"" + unpathedFile.replace( /\.min\.map/, ".js" ) + "\"]" ); fs.writeFileSync( releaseFile, text ); - } else if ( /\.min\.js$/.test( releaseFile ) ) { - // Remove the source map comment; it causes way too many problems. - // Keep the map file in case DevTools allow manual association. - text = fs.readFileSync( builtFile, "utf8" ) - .replace( /\/\/# sourceMappingURL=\S+/, "" ); - fs.writeFileSync( releaseFile, text ); } else if ( builtFile !== releaseFile ) { shell.cp( "-f", builtFile, releaseFile ); } diff --git a/build/tasks/sourcemap.js b/build/tasks/sourcemap.js new file mode 100644 index 000000000..5f4d5232f --- /dev/null +++ b/build/tasks/sourcemap.js @@ -0,0 +1,13 @@ +var fs = require( "fs" ); + +module.exports = function( grunt ) { + var minLoc = Object.keys( grunt.config( "uglify.all.files" ) )[ 0 ]; + grunt.registerTask( "remove_map_comment", function() { + // Remove the source map comment; it causes way too many problems. + // The map file is still generated for manual associations + // https://github.com/jquery/jquery/issues/1707 + var text = fs.readFileSync( minLoc, "utf8" ) + .replace( /\/\/# sourceMappingURL=\S+/, "" ); + fs.writeFileSync( minLoc, text ); + }); +}; diff --git a/package.json b/package.json index d1234e901..c80b94a2c 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "grunt-cli": "0.1.13", "grunt-compare-size": "0.4.0", "grunt-contrib-jshint": "0.10.0", - "grunt-contrib-uglify": "0.6.0", + "grunt-contrib-uglify": "0.7.0", "grunt-contrib-watch": "0.6.1", "grunt-git-authors": "2.0.1", "grunt-jscs-checker": "0.8.1", @@ -60,7 +60,6 @@ "Tests", "Build", "Release", - "Core", "Ajax", "Attributes", -- 2.39.5