CE-32850: Fixed grunt and jasmine for using underscore from node_modules

Author: andrewbess

dev/tests/js/jasmine/spec_runner/index.js

@@ -6,10 +6,7 @@
 'use strict';
 
 var tasks = [],
-    _ = require('underscore'),
-    root = typeof self == 'object' && self.self === self && self ||
-        typeof global == 'object' && global.global === global && global || Function('return this')() || {};
-root._ = _;
+    _ = require('underscore');
 
 function init(grunt, options) {
     var _                   = require('underscore'),

dev/tests/js/jasmine/spec_runner/tasks/jasmine.js

@@ -6,10 +6,7 @@
 'use strict';
 
 var tasks = {},
-    _ = require('underscore'),
-    root = typeof self == 'object' && self.self === self && self ||
-        typeof global == 'object' && global.global === global && global || Function('return this')() || {};
-root._ = _;
+    _ = require('underscore');
 
 function init(config) {
     var grunt  = require('grunt'),

dev/tools/grunt/configs/clean.js

@@ -6,10 +6,7 @@
 'use strict';
 
 var themes = require('../tools/files-router').get('themes'),
-    _      = require('underscore'),
-    root = typeof self == 'object' && self.self === self && self ||
-        typeof global == 'object' && global.global === global && global || Function('return this')() || {};
-root._ = _;
+    _      = require('underscore');
 
 var themeOptions = {};
 

dev/tools/grunt/configs/exec.js

@@ -7,10 +7,7 @@
 
 var combo = require('./combo'),
     themes = require('../tools/files-router').get('themes'),
-    _      = require('underscore'),
-    root = typeof self == 'object' && self.self === self && self ||
-        typeof global == 'object' && global.global === global && global || Function('return this')() || {};
-root._ = _;
+    _      = require('underscore');
 
 var themeOptions = {};
 

dev/tools/grunt/configs/less.js

@@ -7,10 +7,7 @@
 
 var combo  = require('./combo'),
     themes = require('../tools/files-router').get('themes'),
-    _      = require('underscore'),
-    root = typeof self == 'object' && self.self === self && self ||
-        typeof global == 'object' && global.global === global && global || Function('return this')() || {};
-root._ = _;
+    _      = require('underscore');
 
 var themeOptions = {};
 

dev/tools/grunt/configs/watch.js

@@ -7,10 +7,7 @@
 
 var combo  = require('./combo'),
     themes = require('../tools/files-router').get('themes'),
-    _      = require('underscore'),
-    root = typeof self == 'object' && self.self === self && self ||
-        typeof global == 'object' && global.global === global && global || Function('return this')() || {};
-root._ = _;
+    _      = require('underscore');
 
 var themeOptions = {};
 

dev/tools/grunt/tasks/mage-minify.js

@@ -6,10 +6,7 @@ module.exports = function (grunt) {
     'use strict';
 
     var compressor  = require('node-minify'),
-        _           = require('underscore'),
-        root = typeof self == 'object' && self.self === self && self ||
-            typeof global == 'object' && global.global === global && global || Function('return this')() || {};
-    root._ = _;
+        _           = require('underscore');
 
     /**
      * Helper function used to create config object for compressor.

package.json.sample

@@ -37,6 +37,6 @@
     "squirejs": "~0.2.1",
     "strip-json-comments": "~2.0.1",
     "time-grunt": "~1.4.0",
-    "underscore": "~1.8.0"
+    "underscore": "^1.13.1"
   }
 }