From 4d10cc8648cb0e71c53d96154f6728c88f80383c Mon Sep 17 00:00:00 2001
From: xavijam <xavijam@gmail.com>
Date: Tue, 18 Apr 2017 12:00:30 +0200
Subject: [PATCH] Added versions checker for two different shrinkwraps

---
 Gruntfile.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 324b57f82f..50185e66aa 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -3,7 +3,7 @@ var timer = require("grunt-timer");
 var colors = require('colors');
 var semver = require('semver');
 var jasmineCfg = require('./lib/build/tasks/jasmine.js');
-var duplicatedDependencies = require('./lib/build/tasks/shrinkwrap-duplicated-dependencies.js');
+var shrinkwrapDependencies = require('./lib/build/tasks/shrinkwrap-dependencies.js');
 var webpackTask = null;
 
 var REQUIRED_NODE_VERSION = '6.9.2';
@@ -92,7 +92,20 @@ module.exports = function(grunt) {
       grunt.log.writeln('');
     }
 
-    var duplicatedModules = duplicatedDependencies(require('./npm-shrinkwrap.json'), SHRINKWRAP_MODULES_TO_VALIDATE);
+    var dependenciesWithDifferentVersion = shrinkwrapDependencies.checkDependenciesVersion(
+      require('./npm-shrinkwrap-010.json'),
+      require('./npm-shrinkwrap-69.json'),
+      SHRINKWRAP_MODULES_TO_VALIDATE
+    );
+    if (dependenciesWithDifferentVersion.length > 0) {
+      grunt.log.fail("############### /!\\ CAUTION /!\\ #################");
+      grunt.log.fail("Dependencies with different version in shrinkwraps for node 0.10 and node 6.9.2 found.");
+      grunt.log.fail(JSON.stringify(dependenciesWithDifferentVersion, null, 4));
+      grunt.log.fail("#################################################");
+      process.exit(1);
+    }
+
+    var duplicatedModules = shrinkwrapDependencies.checkDuplicatedDependencies(require('./npm-shrinkwrap.json'), SHRINKWRAP_MODULES_TO_VALIDATE);
     if (duplicatedModules.length > 0) {
       grunt.log.fail("############### /!\\ CAUTION /!\\ #################");
       grunt.log.fail("Duplicated dependencies found in npm-shrinkwrap.json file.");