Merge remote-tracking branch 'borg/MC-14957' into pr

Author: Joan He

app/code/Magento/AuthorizenetAcceptjs/etc/config.xml

@@ -7,6 +7,13 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
     <default>
+        <dev>
+            <js>
+                <minify_exclude>
+                    <authorizenet_acceptjs>\.authorize\.net/v1/Accept</authorizenet_acceptjs>
+                </minify_exclude>
+            </js>
+        </dev>
         <payment>
             <authorizenet_acceptjs>
                 <active>0</active>

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

@@ -4,10 +4,16 @@
  */
 
 var config = {
-    map: {
-        '*': {
-            acceptjssandbox: 'https://jstest.authorize.net/v1/Accept.js',
-            acceptjs: 'https://js.authorize.net/v1/Accept.js'
+    shim: {
+        acceptjs: {
+            exports: 'Accept'
+        },
+        acceptjssandbox: {
+            exports: 'Accept'
         }
+    },
+    paths: {
+        acceptjssandbox: 'https://jstest.authorize.net/v1/Accept',
+        acceptjs: 'https://js.authorize.net/v1/Accept'
     }
 };

app/code/Magento/AuthorizenetAcceptjs/view/base/web/js/view/payment/acceptjs-factory.js

@@ -16,7 +16,7 @@ define([
             dependency = 'acceptjssandbox';
         }
 
-        require([dependency], function () {
+        require([dependency], function (accept) {
                 var $body = $('body');
 
                 /*
@@ -26,16 +26,7 @@ define([
                  * Dynamically-loading-Accept-js-E-WC-03-Accept-js-is-not-loaded/td-p/63283
                  */
                 $body.on('handshake.acceptjs', function () {
-                    /*
-                     * Accept.js doesn't return the library when loading
-                     * and requirejs "shim" can't be used because it only works with the "paths" config option
-                     * and we can't use "paths" because require will try to load ".min.js" in production
-                     * and that doesn't work because it doesn't exist
-                     * and we can't add a query string to force a URL because accept.js will reject it
-                     * and we can't include it locally because they check in the script before loading more scripts
-                     * So, we use the global version as "shim" would
-                     */
-                    deferred.resolve(window.Accept);
+                    deferred.resolve(accept);
                     $body.off('handshake.acceptjs');
                 });
             },