diff options
author | Michał Gołębiowski <m.goleb@gmail.com> | 2013-09-05 18:23:56 +0200 |
---|---|---|
committer | Michał Gołębiowski <m.goleb@gmail.com> | 2013-09-05 18:23:56 +0200 |
commit | dfaee326e6605dc6d848c4c5022e39069d2cee65 (patch) | |
tree | 8926ffbf85cdd031fee1e6c29654f66fe9c75d29 /build | |
parent | 58a504093c320744b8ab252cc75df966dd8968bc (diff) | |
download | jquery-dfaee326e6605dc6d848c4c5022e39069d2cee65.tar.gz jquery-dfaee326e6605dc6d848c4c5022e39069d2cee65.zip |
Fix #13983. Switch to //# for sourcemap directives.
Diffstat (limited to 'build')
-rw-r--r-- | build/tasks/dist.js | 12 | ||||
-rw-r--r-- | build/tasks/uglify.js | 6 |
2 files changed, 1 insertions, 17 deletions
diff --git a/build/tasks/dist.js b/build/tasks/dist.js index 591078cde..97d882e70 100644 --- a/build/tasks/dist.js +++ b/build/tasks/dist.js @@ -57,18 +57,6 @@ module.exports = function( grunt ) { if ( /\.map$/.test( filename ) ) { text = text.replace( /"dist\//g, "\"" ); fs.writeFileSync( filename, text, "utf-8" ); - - // Use our hard-coded sourceMap directive instead of the autogenerated one (#13274; #13776) - } else if ( /\.min\.js$/.test( filename ) ) { - i = 0; - text = text.replace( /(?:\/\*|)\n?\/\/@\s*sourceMappingURL=.*(\n\*\/|)/g, - function( match ) { - if ( i++ ) { - return ""; - } - return match; - }); - fs.writeFileSync( filename, text, "utf-8" ); } // Optionally copy dist files to other locations diff --git a/build/tasks/uglify.js b/build/tasks/uglify.js index 7c1a01bec..ccbc70888 100644 --- a/build/tasks/uglify.js +++ b/build/tasks/uglify.js @@ -38,12 +38,8 @@ module.exports = function( grunt ) { // Rename the file to a temporary name. fs.renameSync( mapFileName, mapping.dest); grunt.file.write( mapFileName, grunt.file.read( mapping.dest ) - // The uglify task erroneously prepends dist/ to file names. - .replace( /"dist\//g, "\"" ) // Refer to the source jquery.js, not the temporary jquery.pre-min.js. - .replace( /\.pre-min\./g, "." ) - // There's already a pragma at the beginning of the file, remove the one at the end. - .replace( /\/\/@ sourceMappingURL=jquery\.min\.map$/g, "" )); + .replace( /\.pre-min\./g, "." )); }); // Remove temporary files. |