Merge pull request #3099 from magento/dev/merge-branches

Backmerge master to develop
magento · Apr 6, 2021 · d9aa2c2 · d9aa2c2
2 parents 26eaada + 37af9a5
commit d9aa2c2
Show file tree

Hide file tree

Showing 20 changed files with 291 additions and 68 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/magento-compatibility.js b/magento-compatibility.js
@@ -4,6 +4,7 @@
 
 // PWA Studio version -> Magento version.
 module.exports = {
+    '10.0.0': '2.4.2',
     '9.0.1': '2.4.2',
     '9.0.0': '2.4.2',
     '8.0.0': '2.4.0 - 2.4.1',

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magento/pwa-studio",
-  "version": "9.0.1",
+  "version": "10.0.0",
   "private": true,
   "workspaces": [
     "packages/babel-preset-peregrine",

diff --git a/packages/create-pwa/package.json b/packages/create-pwa/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magento/create-pwa",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "publishConfig": {
     "access": "public"
   },
@@ -29,10 +29,11 @@
   },
   "homepage": "https://github.com/magento/pwa-studio/tree/master/packages/create-pwa#readme",
   "dependencies": {
-    "@magento/pwa-buildpack": "~8.0.1",
-    "@magento/venia-concept": "~9.0.1",
+    "@magento/pwa-buildpack": "~9.0.0",
+    "@magento/venia-concept": "~10.0.0",
     "chalk": "^2.4.2",
     "change-case": "^3.1.0",
+    "compression": "~1.7.4",
     "execa": "^1.0.0",
     "git-user-info": "^1.0.1",
     "inquirer": "^6.3.1",

diff --git a/packages/extensions/upward-security-headers/package.json b/packages/extensions/upward-security-headers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magento/upward-security-headers",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "publishConfig": {
     "access": "public"
   },
@@ -13,8 +13,8 @@
   "author": "Magento Commerce",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "peerDependencies": {
-    "@magento/pwa-buildpack": "~8.0.1",
-    "@magento/venia-ui": "~6.0.1",
+    "@magento/pwa-buildpack": "~9.0.0",
+    "@magento/venia-ui": "~7.0.0",
     "webpack": "~4.46.0"
   },
   "pwa-studio": {

diff --git a/packages/extensions/venia-adobe-data-layer/package.json b/packages/extensions/venia-adobe-data-layer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magento/venia-adobe-data-layer",
-  "version": "0.0.1",
+  "version": "1.0.0",
   "publishConfig": {
     "access": "public"
   },
@@ -15,7 +15,7 @@
     "@adobe/adobe-client-data-layer": "~1.1.3"
   },
   "peerDependencies": {
-    "@magento/peregrine": "~9.0.0",
+    "@magento/peregrine": "~10.0.0",
     "react": "~17.0.1"
   },
   "pwa-studio": {

diff --git a/packages/extensions/venia-sample-backends/package.json b/packages/extensions/venia-sample-backends/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magento/venia-sample-backends",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "publishConfig": {
     "access": "public"
   },
@@ -13,7 +13,7 @@
   "repository": "github:magento/pwa-studio",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "peerDependencies": {
-    "@magento/pwa-buildpack": "~8.0.1",
+    "@magento/pwa-buildpack": "~9.0.0",
     "node-fetch": "~2.3.0"
   },
   "pwa-studio": {

diff --git a/packages/extensions/venia-sample-language-packs/package.json b/packages/extensions/venia-sample-language-packs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magento/venia-sample-language-packs",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "publishConfig": {
     "access": "public"
   },
@@ -12,8 +12,8 @@
   "repository": "github:magento/pwa-studio",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "peerDependencies": {
-    "@magento/pwa-buildpack": "~8.0.1",
-    "@magento/venia-ui": "~6.0.1"
+    "@magento/pwa-buildpack": "~9.0.0",
+    "@magento/venia-ui": "~7.0.0"
   },
   "pwa-studio": {
     "targets": {

diff --git a/packages/extensions/venia-sample-payments-checkmo/package.json b/packages/extensions/venia-sample-payments-checkmo/package.json
@@ -12,9 +12,9 @@
   "repository": "github:magento/pwa-studio",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "peerDependencies": {
-    "@magento/peregrine": "~9.0.0",
-    "@magento/pwa-buildpack": "~8.0.1",
-    "@magento/venia-ui": "~6.0.1",
+    "@magento/peregrine": "~10.0.0",
+    "@magento/pwa-buildpack": "~9.0.0",
+    "@magento/venia-ui": "~7.0.0",
     "react": "~17.0.1",
     "react-intl": "~5.7.0",
     "react-router-dom": "~5.1.0"

diff --git a/packages/graphql-cli-validate-magento-pwa-queries/package.json b/packages/graphql-cli-validate-magento-pwa-queries/package.json
@@ -1,6 +1,6 @@
 {
   "name": "graphql-cli-validate-magento-pwa-queries",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/pagebuilder/package.json b/packages/pagebuilder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magento/pagebuilder",
-  "version": "4.0.1",
+  "version": "5.0.0",
   "publishConfig": {
     "access": "public"
   },
@@ -34,9 +34,9 @@
   "homepage": "https://github.com/magento/pwa-studio/tree/master/packages/pagebuilder#readme",
   "dependencies": {},
   "devDependencies": {
-    "@magento/peregrine": "~9.0.0",
-    "@magento/pwa-buildpack": "~8.0.1",
-    "@magento/venia-ui": "~6.0.1",
+    "@magento/peregrine": "~10.0.0",
+    "@magento/pwa-buildpack": "~9.0.0",
+    "@magento/venia-ui": "~7.0.0",
     "@storybook/react": "~6.1.14",
     "jarallax": "~1.11.1",
     "load-google-maps-api": "~2.0.1",
@@ -50,9 +50,9 @@
   "peerDependencies": {
     "@apollo/client": "~3.1.2",
     "@magento/babel-preset-peregrine": "~1.1.0",
-    "@magento/peregrine": "~9.0.0",
-    "@magento/pwa-buildpack": "~8.0.1",
-    "@magento/venia-ui": "~6.0.1",
+    "@magento/peregrine": "~10.0.0",
+    "@magento/pwa-buildpack": "~9.0.0",
+    "@magento/venia-ui": "~7.0.0",
     "jarallax": "~1.11.1",
     "load-google-maps-api": "~2.0.1",
     "lodash.escape": "~4.0.1",

diff --git a/packages/peregrine/lib/talons/AccountMenu/useAccountMenuItems.js b/packages/peregrine/lib/talons/AccountMenu/useAccountMenuItems.js
@@ -20,11 +20,12 @@ export const useAccountMenuItems = props => {
             id: 'accountMenu.orderHistoryLink',
             url: '/order-history'
         },
-        {
-            name: 'Store Credit & Gift Cards',
-            id: 'accountMenu.storeCreditLink',
-            url: ''
-        },
+        // Hide links until features are completed
+        // {
+        //     name: 'Store Credit & Gift Cards',
+        //     id: 'accountMenu.storeCreditLink',
+        //     url: ''
+        // },
         {
             name: 'Favorites Lists',
             id: 'accountMenu.favoritesListsLink',

diff --git a/packages/peregrine/lib/talons/CheckoutPage/BillingAddress/useBillingAddress.js b/packages/peregrine/lib/talons/CheckoutPage/BillingAddress/useBillingAddress.js
@@ -270,12 +270,13 @@ export const useBillingAddress = props => {
                     }
                     setIsBillingAddressSameInCache();
                 } else {
-                    setErrors(formState.errors);
                     throw new Error('Errors in the billing address form');
                 }
             }
         } catch (err) {
-            console.error(err);
+            if (process.env.NODE_ENV !== 'production') {
+                console.error(err);
+            }
             onBillingAddressChangedError();
         }
     }, [
@@ -316,7 +317,9 @@ export const useBillingAddress = props => {
                 throw new Error('Billing address mutation failed');
             }
         } catch (err) {
-            console.error(err);
+            if (process.env.NODE_ENV !== 'production') {
+                console.error(err);
+            }
             onBillingAddressChangedError();
         }
     }, [

diff --git a/packages/peregrine/lib/talons/CheckoutPage/PaymentInformation/useCreditCard.js b/packages/peregrine/lib/talons/CheckoutPage/PaymentInformation/useCreditCard.js
@@ -407,7 +407,9 @@ export const useCreditCard = props => {
                 }
             }
         } catch (err) {
-            console.error(err);
+            if (process.env.NODE_ENV !== 'production') {
+                console.error(err);
+            }
             setStepNumber(0);
             resetShouldSubmit();
             setShouldRequestPaymentNonce(false);
@@ -456,7 +458,9 @@ export const useCreditCard = props => {
                 throw new Error('Billing address mutation failed');
             }
         } catch (err) {
-            console.error(err);
+            if (process.env.NODE_ENV !== 'production') {
+                console.error(err);
+            }
             setStepNumber(0);
             resetShouldSubmit();
             setShouldRequestPaymentNonce(false);
@@ -499,7 +503,9 @@ export const useCreditCard = props => {
                 throw new Error('Credit card nonce save mutation failed.');
             }
         } catch (err) {
-            console.error(err);
+            if (process.env.NODE_ENV !== 'production') {
+                console.error(err);
+            }
             setStepNumber(0);
             resetShouldSubmit();
             setShouldRequestPaymentNonce(false);

diff --git a/packages/peregrine/package.json b/packages/peregrine/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magento/peregrine",
-  "version": "9.0.0",
+  "version": "10.0.0",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/pwa-buildpack/package.json b/packages/pwa-buildpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magento/pwa-buildpack",
-  "version": "8.0.1",
+  "version": "9.0.0",
   "publishConfig": {
     "access": "public"
   },
@@ -27,7 +27,7 @@
   "homepage": "https://github.com/magento/pwa-studio/tree/master/packages/pwa-buildpack#readme",
   "dependencies": {
     "@magento/directive-parser": "~0.1.7",
-    "@magento/upward-js": "~5.0.1",
+    "@magento/upward-js": "~5.1.0",
     "@pmmmwh/react-refresh-webpack-plugin": "~0.4.1",
     "@yarnpkg/lockfile": "~1.1.0",
     "apicache": "~1.4.0",

diff --git a/packages/upward-js/package.json b/packages/upward-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magento/upward-js",
-  "version": "5.0.1",
+  "version": "5.1.0",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/venia-concept/package.json b/packages/venia-concept/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magento/venia-concept",
-  "version": "9.0.1",
+  "version": "10.0.0",
   "publishConfig": {
     "access": "public"
   },
@@ -37,7 +37,7 @@
   },
   "homepage": "https://github.com/magento/pwa-studio/tree/master/packages/venia-concept#readme",
   "dependencies": {
-    "@magento/pwa-buildpack": "~8.0.1"
+    "@magento/pwa-buildpack": "~9.0.0"
   },
   "devDependencies": {
     "@adobe/apollo-link-mutation-queue": "~1.0.2",
@@ -53,11 +53,11 @@
     "@babel/runtime": "~7.4.2",
     "@magento/babel-preset-peregrine": "~1.1.0",
     "@magento/eslint-config": "~1.5.0",
-    "@magento/pagebuilder": "~4.0.1",
-    "@magento/peregrine": "~9.0.0",
-    "@magento/upward-security-headers": "~1.0.2",
-    "@magento/venia-adobe-data-layer": "~0.0.1",
-    "@magento/venia-ui": "~6.0.1",
+    "@magento/pagebuilder": "~5.0.0",
+    "@magento/peregrine": "~10.0.0",
+    "@magento/upward-security-headers": "~1.0.3",
+    "@magento/venia-adobe-data-layer": "~1.0.0",
+    "@magento/venia-ui": "~7.0.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.4.1",
     "@storybook/react": "~6.1.14",
     "@wojtekmaj/enzyme-adapter-react-17": "~0.4.1",
@@ -86,7 +86,7 @@
     "file-loader": "~4.0.0",
     "graphql": "~15.3.0",
     "graphql-cli": "~3.0.11",
-    "graphql-cli-validate-magento-pwa-queries": "~1.3.1",
+    "graphql-cli-validate-magento-pwa-queries": "~1.4.0",
     "html-webpack-plugin": "~3.2.0",
     "informed": "~3.27.0",
     "jarallax": "~1.11.1",

diff --git a/packages/venia-ui/package.json b/packages/venia-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magento/venia-ui",
-  "version": "6.0.1",
+  "version": "7.0.0",
   "publishConfig": {
     "access": "public"
   },
@@ -76,8 +76,8 @@
   "peerDependencies": {
     "@apollo/client": "~3.1.2",
     "@magento/babel-preset-peregrine": "~1.1.0",
-    "@magento/peregrine": "~9.0.0",
-    "@magento/pwa-buildpack": "~8.0.1",
+    "@magento/peregrine": "~10.0.0",
+    "@magento/pwa-buildpack": "~9.0.0",
     "apollo-cache-persist": "~0.1.1",
     "braintree-web-drop-in": "~1.16.0",
     "graphql": "~15.3.0",

diff --git a/pwa-devdocs/package.json b/pwa-devdocs/package.json
@@ -1,7 +1,7 @@
 {
     "name": "pwa-devdocs",
     "private": true,
-    "version": "9.0.1",
+    "version": "10.0.0",
     "description": "A documentation site for Magento PWA",
     "main": "gulpfile.js",
     "dependencies": {