Merge remote-tracking branch 'origin/2.4-develop' into 2_4_6_Quality_Backlog_v1

Author: glo71317

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

@@ -69,7 +69,6 @@ var config = {
         'jquery/validate': 'jquery/jquery.validate',
         'jquery/file-uploader': 'jquery/fileUploader/jquery.fileuploader',
         'prototype': 'legacy-build.min',
-        'jquery/jquery.cookie': 'js-cookie/cookie-wrapper',
         'jquery/jquery-storageapi': 'js-storage/storage-wrapper',
         'text': 'mage/requirejs/text',
         'domReady': 'requirejs/domReady',

lib/web/jquery/jquery.cookie.js

@@ -0,0 +1,11 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'js-cookie/cookie-wrapper'
+], function () {
+
+});

lib/web/js-storage/js.storage.js

@@ -14,7 +14,7 @@
 (function (factory) {
     var registeredInModuleLoader = false;
     if (typeof define === 'function' && define.amd) {
-        define(['jquery', 'js-cookie/cookie-wrapper'], factory);
+        define(['jquery', 'jquery/jquery.cookie'], factory);
         registeredInModuleLoader = true;
     }
     if (typeof exports === 'object') {