Permalink
Browse files

fix #12959

  • Loading branch information...
1 parent 30bbab0 commit 51b825d6b3ffb611f07cb64add8013350b222420 @cvrebert cvrebert committed Mar 8, 2014
Showing with 14 additions and 1 deletion.
  1. +14 −1 grunt/shrinkwrap.js
View
@@ -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.');
}

0 comments on commit 51b825d

Please sign in to comment.