Merge pull request #33609 from mrtuvn/update-underscore-latest

Update underscore to latest version

Author: andrewbess

app/code/Magento/Customer/view/frontend/web/js/customer-data.js

@@ -120,7 +120,7 @@ define([
                 storage.remove(sectionName);
                 sectionDataIds = $.cookieStorage.get('section_data_ids') || {};
                 _.each(sectionDataIds, function (data, name) {
-                    if (name != sectionName) { //eslint-disable-line eqeqeq
+                    if (name !== sectionName) {
                         newSectionDataIds[name] = data;
                     }
                 });
@@ -266,7 +266,7 @@ define([
 
                 if (typeof sectionData === 'undefined' ||
                     typeof sectionData === 'object' &&
-                    cookieSectionTimestamp != sectionData['data_id'] //eslint-disable-line
+                    cookieSectionTimestamp !== sectionData['data_id']
                 ) {
                     expiredSectionNames.push(sectionName);
                 }

app/code/Magento/Customer/view/frontend/web/js/section-config.js

@@ -32,7 +32,7 @@ define(['underscore'], function (_) {
         /**
          * Returns a list of sections which should be invalidated for given URL.
          * @param {String} url - URL which was requested.
-         * @return {Array} - List of sections to invalidate.
+         * @return {Object} - List of sections to invalidate.
          */
         getAffectedSections: function (url) {
             var route = canonize(url),
@@ -55,8 +55,8 @@ define(['underscore'], function (_) {
 
         /**
          * Filters the list of given sections to the ones defined as client side.
-         * @param {Array} allSections - List of sections to check.
-         * @return {Array} - List of filtered sections.
+         * @param {Object} allSections - List of sections to check.
+         * @return {Object} - List of filtered sections.
          */
         filterClientSideSections: function (allSections) {
             return _.difference(allSections, clientSideSections);

app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js

@@ -5,9 +5,10 @@
 /* eslint-disable no-undef */
 define([
     'jquery',
+    'underscore',
     'Magento_Ui/js/grid/columns/column',
     'Magento_Ui/js/lib/key-codes'
-], function ($, Column, keyCodes) {
+], function ($, _, Column, keyCodes) {
     'use strict';
 
     return Column.extend({

dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/customer-data.test.js

@@ -3,17 +3,17 @@
  * See COPYING.txt for license details.
  */
 
-/* global _ */
 /* eslint max-nested-callbacks: 0 */
 /* jscs:disable jsDoc*/
 
 define([
+    'underscore',
     'squire',
     'jquery',
     'Magento_Customer/js/section-config',
     'Magento_Customer/js/customer-data',
     'jquery/jquery-storageapi'
-], function (Squire, $, sectionConfig, customerData) {
+], function (_, Squire, $, sectionConfig, customerData) {
     'use strict';
 
     var injector = new Squire(),
@@ -98,9 +98,6 @@ define([
     }
 
     describe('Magento_Customer/js/customer-data', function () {
-
-        var _;
-
         beforeAll(function () {
             clearLocalStorage();
         });
@@ -401,7 +398,6 @@ define([
                             }
                         };
                     };
-
                     expect(parameters).toEqual(jasmine.objectContaining({
                         sections: 'section'
                     }));
@@ -410,7 +406,6 @@ define([
                 });
 
                 result = obj.reload(['section'], true);
-
                 expect(result).toEqual(jasmine.objectContaining({
                     responseJSON: {
                         section: {}
@@ -422,7 +417,6 @@ define([
                 var result;
 
                 spyOn(sectionConfig, 'filterClientSideSections').and.returnValue(['cart,customer,messages']);
-
                 $.getJSON = jasmine.createSpy().and.callFake(function (url, parameters) {
                     var deferred = $.Deferred();
 
@@ -448,7 +442,6 @@ define([
                 });
 
                 result = obj.reload(['cart', 'customer', 'messages'], true);
-
                 expect(result).toEqual(jasmine.objectContaining({
                     responseJSON: {
                         cart: {},
@@ -457,7 +450,7 @@ define([
                     }
                 }));
             });
-            //
+
             it('Check it returns all sections when passed wildcard string', function () {
                 var result;
 
@@ -486,7 +479,6 @@ define([
                 });
 
                 result = obj.reload('*', true);
-
                 expect($.getJSON).toHaveBeenCalled();
                 expect(result).toEqual(jasmine.objectContaining({
                     responseJSON: {

lib/web/mage/utils/main.js

@@ -6,7 +6,12 @@ define(function (require) {
     'use strict';
 
     var utils = {},
-        _ = require('underscore');
+        _ = require('underscore'),
+        root = typeof self == 'object' && self.self === self && self ||
+            typeof global == 'object' && global.global === global && global ||
+            Function('return this')() || {};
+
+    root._ = _;
 
     return _.extend(
         utils,