From: Chris Rebert Date: Sat, 8 Mar 2014 00:05:46 +0000 (-0800) Subject: fix #12959 X-Git-Tag: v3.2.0~415^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51b825d6b3ffb611f07cb64add8013350b222420;p=thirdparty%2Fbootstrap.git fix #12959 --- diff --git a/grunt/shrinkwrap.js b/grunt/shrinkwrap.js index d3292b4987..6701c6d6c8 100644 --- a/grunt/shrinkwrap.js +++ b/grunt/shrinkwrap.js @@ -14,13 +14,26 @@ var NON_CANONICAL_FILE = 'npm-shrinkwrap.json'; var DEST_FILE = 'test-infra/npm-shrinkwrap.canonical.json'; +function cleanup(shrinkwrap) { + // Remove `resolved` property to avoid irrelevant changes + // See https://github.com/npm/npm/issues/3581 + if ((typeof shrinkwrap) === 'string') { + return shrinkwrap; + } + delete shrinkwrap.resolved; + for (var key in shrinkwrap) { + shrinkwrap[key] = cleanup(shrinkwrap[key]); + } + return shrinkwrap; +} + function updateShrinkwrap(grunt) { // Assumption: Non-canonical shrinkwrap already generated by prerequisite Grunt task var shrinkwrapData = grunt.file.readJSON(NON_CANONICAL_FILE); grunt.log.writeln('Deleting ' + NON_CANONICAL_FILE.cyan + '...'); grunt.file.delete(NON_CANONICAL_FILE); // Output as Canonical JSON in correct location - grunt.file.write(DEST_FILE, canonicallyJsonStringify(shrinkwrapData)); + grunt.file.write(DEST_FILE, canonicallyJsonStringify(cleanup(shrinkwrapData))); grunt.log.writeln('File ' + DEST_FILE.cyan + ' updated.'); }