Merge branch 'release/14.2.0'

Author: devops-pwa-codebuild

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/pwa-studio",
-  "version": "14.1.0",
+  "version": "14.2.0-beta5",
   "private": true,
   "workspaces": [
     "packages/babel-preset-peregrine",
@@ -47,6 +47,9 @@
   },
   "dependencies": {
     "caniuse-lite": "~1.0.30001335",
+    "dompurify": "^2.3.8",
+    "path-to-regexp": "^8.2.0",
+    "qs": "^6.13.0",
     "setimmediate": "^1.0.5"
   },
   "devDependencies": {

packages/create-pwa/lib/index.js

@@ -13,13 +13,11 @@ const defaultSampleBackends = require('@magento/pwa-buildpack/sampleBackends.jso
 
 const uniqBy = (array, property) => {
     const map = new Map();
-
     for (const element of array) {
         if (element && element.hasOwnProperty(property)) {
             map.set(element[property], element);
         }
     }
-
     return Array.from(map.values());
 };
 
@@ -32,7 +30,6 @@ const fetchSampleBackends = async () => {
             'https://fvp0esmt8f.execute-api.us-east-1.amazonaws.com/default/getSampleBackends'
         );
         const { sampleBackends } = await res.json();
-
         return sampleBackends.environments;
     } catch {
         return [];
@@ -129,14 +126,7 @@ module.exports = async () => {
             default: 'https://magento2.localhost',
             when: ({ backendUrl }) => !backendUrl
         },
-        {
-            name: 'backendEdition',
-            type: 'list',
-            message:
-                'Edition of the magento store (Adobe Commerce or Magento Open Source)',
-            choices: ['AC', 'EE', 'MOS', 'CE'],
-            default: 'AC'
-        },
+        // Removed the question for backendEdition and set it directly
         {
             name: 'braintreeToken',
             message:
@@ -163,6 +153,7 @@ module.exports = async () => {
         answers = await inquirer.prompt(questions);
 
         answers.backendUrl = answers.backendUrl || answers.customBackendUrl;
+
         const args = questions.reduce(
             (args, q) => {
                 if (q.name === 'customBackendUrl' || q.name === 'directory') {
@@ -184,6 +175,9 @@ module.exports = async () => {
             ['create-project', answers.directory]
         );
 
+        // Set backendEdition directly without asking
+        args.push('--backend-edition', `"AC"`);
+
         const argsString = args.join(' ');
 
         console.log(

packages/create-pwa/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/create-pwa",
-  "version": "2.4.6",
+  "version": "2.5.6-beta5",
   "publishConfig": {
     "access": "public"
   },
@@ -29,8 +29,8 @@
   },
   "homepage": "https://github.com/magento/pwa-studio/tree/main/packages/create-pwa#readme",
   "dependencies": {
-    "@magento/pwa-buildpack": "~11.5.3",
-    "@magento/venia-concept": "~14.1.0",
+    "@magento/pwa-buildpack": "11.5.4-beta5",
+    "@magento/venia-concept": "14.2.0-beta5",
     "chalk": "^2.4.2",
     "change-case": "^3.1.0",
     "compression": "~1.7.4",

packages/extensions/experience-platform-connector/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/experience-platform-connector",
-  "version": "1.0.8",
+  "version": "1.0.9-beta5",
   "publishConfig": {
     "access": "public"
   },
@@ -18,8 +18,8 @@
   "devDependencies": {},
   "peerDependencies": {
     "@apollo/client": "~3.5.0",
-    "@magento/peregrine": "~14.4.1",
-    "@magento/pwa-buildpack": "~11.5.3",
+    "@magento/peregrine": "14.5.1-beta5",
+    "@magento/pwa-buildpack": "11.5.4-beta5",
     "react": "~17.0.1"
   },
   "pwa-studio": {

packages/extensions/upward-security-headers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/upward-security-headers",
-  "version": "1.0.17",
+  "version": "1.1.17-beta5",
   "publishConfig": {
     "access": "public"
   },
@@ -13,8 +13,8 @@
   "author": "Adobe Commerce",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "peerDependencies": {
-    "@magento/pwa-buildpack": "~11.5.3",
-    "@magento/venia-ui": "~11.5.0",
+    "@magento/pwa-buildpack": "11.5.4-beta5",
+    "@magento/venia-ui": "11.6.0-beta5",
     "webpack": "~4.46.0"
   },
   "pwa-studio": {

packages/extensions/upward-security-headers/upward.yml

@@ -36,7 +36,7 @@ veniaSecurityHeaders:
             base-uri 'none';
             child-src 'self';
             font-src 'self' fonts.gstatic.com;
-            frame-src assets.braintreegateway.com *.google.com *.youtube.com *.youtu.be *.vimeo.com
+            rame-src assets.braintreegateway.com *.google.com *.youtube.com *.youtu.be *.vimeo.com
             "
     strict-transport-security:
       inline: max-age=31536000

packages/extensions/venia-sample-backends/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/venia-sample-backends",
-  "version": "0.0.11",
+  "version": "0.0.12-beta5",
   "publishConfig": {
     "access": "public"
   },
@@ -13,7 +13,7 @@
   "repository": "github:magento/pwa-studio",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "peerDependencies": {
-    "@magento/pwa-buildpack": "~11.5.3",
+    "@magento/pwa-buildpack": "11.5.4-beta5",
     "node-fetch": "~2.3.0"
   },
   "pwa-studio": {

packages/extensions/venia-sample-eventing/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/venia-sample-eventing",
-  "version": "0.0.9",
+  "version": "0.0.10-beta5",
   "publishConfig": {
     "access": "public"
   },
@@ -12,8 +12,8 @@
   "repository": "github:magento/pwa-studio",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "peerDependencies": {
-    "@magento/peregrine": "~14.4.1",
-    "@magento/pwa-buildpack": "~11.5.3",
+    "@magento/peregrine": "14.5.1-beta5",
+    "@magento/pwa-buildpack": "11.5.4-beta5",
     "react": "~17.0.1"
   },
   "pwa-studio": {

packages/extensions/venia-sample-language-packs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/venia-sample-language-packs",
-  "version": "0.0.17",
+  "version": "0.0.18-beta5",
   "publishConfig": {
     "access": "public"
   },
@@ -12,8 +12,8 @@
   "repository": "github:magento/pwa-studio",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "peerDependencies": {
-    "@magento/pwa-buildpack": "~11.5.3",
-    "@magento/venia-ui": "~11.5.0"
+    "@magento/pwa-buildpack": "11.5.4-beta5",
+    "@magento/venia-ui": "11.6.0-beta5"
   },
   "pwa-studio": {
     "targets": {

packages/extensions/venia-sample-payments-cashondelivery/README.md

@@ -0,0 +1,10 @@
+# venia-sample-payments-cashondelivery
+
+This package provides the `Cash On Delivery` payment method for Venia.
+
+## Installation
+
+To install this extension, add it as a `devDependency` to your app.
+project:
+
+`yarn add -D @magento/venia-sample-payments-cashondelivery`