Merge remote-tracking branch 'origin/AC-2627-migrate-jquery-storage-api' into delivery-bunch-w18

Author: andrewbess

app/code/Magento/Checkout/view/frontend/requirejs-config.js

@@ -15,5 +15,10 @@ var config = {
             proceedToCheckout:      'Magento_Checkout/js/proceed-to-checkout',
             catalogAddToCart:       'Magento_Catalog/js/catalog-add-to-cart'
         }
+    },
+    shim: {
+        'Magento_Checkout/js/model/totals' : {
+            deps: ['Magento_Customer/js/customer-data']
+        }
     }
 };

app/code/Magento/Cookie/view/base/requirejs-config.js

@@ -47,8 +47,7 @@ var config = {
             'jquery-ui-modules/widget': 'jquery/ui-modules/widget',
             'jquery-ui-modules/timepicker': 'jquery/timepicker',
             'vimeo': 'vimeo/player',
-            'vimeoWrapper': 'vimeo/vimeo-wrapper',
-            'jquery/jquery.cookie': 'js-cookie/cookie-wrapper'
+            'vimeoWrapper': 'vimeo/vimeo-wrapper'
         }
     },
     shim: {
@@ -69,7 +68,8 @@ var config = {
         'jquery/validate': 'jquery/jquery.validate',
         'jquery/file-uploader': 'jquery/fileUploader/jquery.fileuploader',
         'prototype': 'legacy-build.min',
-        'jquery/jquery-storageapi': 'jquery/jquery.storageapi.min',
+        'jquery/jquery.cookie': 'js-cookie/cookie-wrapper',
+        'jquery/jquery-storageapi': 'js-storage/storage-wrapper',
         'text': 'mage/requirejs/text',
         'domReady': 'requirejs/domReady',
         'spectrum': 'jquery/spectrum/spectrum',

app/code/Magento/Theme/view/base/requirejs-config.js

@@ -9,6 +9,8 @@ define([
 ], function ($, cookie) {
     'use strict';
 
+    window.Cookies = window.Cookies || cookie;
+
     var config = $.cookie = function (key, value, options) {
         if (value !== undefined) {
             options = $.extend({}, config.defaults, options);
@@ -36,7 +38,7 @@ define([
         }
 
         return result;
-    }
+    };
 
     config.defaults = {};