Merge branch 'release/14.2.0' into feature/venia-sample-payments-cash…

…ondelivery-from-latest-develop
magento · Feb 14, 2025 · ae065f5 · ae065f5
2 parents e753288 + e8cd4b2
commit ae065f5
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 193 deletions.
diff --git a/packages/extensions/gomage-plugin-braintree-three-d-secure/Intercepts/brainTreeDropIn.js b/packages/extensions/gomage-plugin-braintree-three-d-secure/Intercepts/brainTreeDropIn.js
diff --git a/packages/extensions/gomage-plugin-braintree-three-d-secure/Model/useBraintreeThreeDSecure.js b/packages/extensions/gomage-plugin-braintree-three-d-secure/Model/useBraintreeThreeDSecure.js
diff --git a/...tensions/gomage-plugin-braintree-three-d-secure/Queries/createBraintreeClientToken.gql.js b/...tensions/gomage-plugin-braintree-three-d-secure/Queries/createBraintreeClientToken.gql.js
diff --git a/packages/extensions/gomage-plugin-braintree-three-d-secure/README.md b/packages/extensions/gomage-plugin-braintree-three-d-secure/README.md
diff --git a/packages/extensions/gomage-plugin-braintree-three-d-secure/index.js b/packages/extensions/gomage-plugin-braintree-three-d-secure/index.js
diff --git a/packages/extensions/gomage-plugin-braintree-three-d-secure/intercept.js b/packages/extensions/gomage-plugin-braintree-three-d-secure/intercept.js
diff --git a/packages/extensions/gomage-plugin-braintree-three-d-secure/package.json b/packages/extensions/gomage-plugin-braintree-three-d-secure/package.json
diff --git a/packages/extensions/upward-security-headers/upward.yml b/packages/extensions/upward-security-headers/upward.yml
@@ -25,7 +25,7 @@ veniaSecurityHeaders:
                 base-uri 'none';
                 child-src 'self';
                 font-src 'self' fonts.gstatic.com;
-                frame-src *.braintreegateway.com *.google.com *.youtube.com *.youtu.be *.vimeo.com *.cardinalcommerce.com
+                frame-src assets.braintreegateway.com *.google.com *.youtube.com *.youtu.be *.vimeo.com
                 "
         default:
           inline: "
@@ -36,7 +36,7 @@ veniaSecurityHeaders:
             base-uri 'none';
             child-src 'self';
             font-src 'self' fonts.gstatic.com;
-            frame-src *.braintreegateway.com *.google.com *.youtube.com *.youtu.be *.vimeo.com *.cardinalcommerce.com
+            rame-src assets.braintreegateway.com *.google.com *.youtube.com *.youtu.be *.vimeo.com
             "
     strict-transport-security:
       inline: max-age=31536000

diff --git a/packages/venia-concept/package.json b/packages/venia-concept/package.json
@@ -52,7 +52,6 @@
     "@babel/plugin-transform-runtime": "~7.4.4",
     "@babel/preset-env": "~7.16.0",
     "@babel/runtime": "~7.15.3",
-    "@gomage/plugin-braintree-three-d-secure": "~3.94.0",
     "@magento/babel-preset-peregrine": "~1.3.3",
     "@magento/eslint-config": "~1.5.0",
     "@magento/pagebuilder": "9.3.3-alpha.6",
@@ -147,9 +146,6 @@
   "pwa-studio": {
     "targets": {
       "intercept": "./local-intercept.js"
-    },
-    "trusted-vendors": [
-      "@gomage"
-    ]
+    }
   }
 }