Merge pull request #4331 from magento/sync-14.1.0

* v14.1.0-alpha.1 * PWA-3273:Get Minimum Password Length from configuration (#4319) * PWA-3273:Get Minimum Password Length from configuration * PWA-3273 adding updated testcases * correcting minimum password code * PWA-3341: Customet login (#4322) --------- Co-authored-by: Aanchal Pawar <[email protected]> * alpha1 issue (#4325) * v14.1.0-alpha.3 * v14.1.0-alpha.4 * v14.1.0-beta.1 * v14.1.0 --------- Co-authored-by: devops-pwa-codebuild <[email protected]> Co-authored-by: glo11372 <[email protected]>
magento · Sep 30, 2024 · f2ccb87 · f2ccb87
2 parents f706606 + cda1f94
commit f2ccb87
Show file tree

Hide file tree

Showing 28 changed files with 712 additions and 7,607 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magento/pwa-studio",
-  "version": "14.0.1",
+  "version": "14.1.0",
   "private": true,
   "workspaces": [
     "packages/babel-preset-peregrine",

diff --git a/packages/create-pwa/package.json b/packages/create-pwa/package.json
@@ -30,7 +30,7 @@
   "homepage": "https://github.com/magento/pwa-studio/tree/main/packages/create-pwa#readme",
   "dependencies": {
     "@magento/pwa-buildpack": "~11.5.3",
-    "@magento/venia-concept": "~14.0.1",
+    "@magento/venia-concept": "~14.1.0",
     "chalk": "^2.4.2",
     "change-case": "^3.1.0",
     "compression": "~1.7.4",

diff --git a/packages/extensions/experience-platform-connector/package.json b/packages/extensions/experience-platform-connector/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magento/experience-platform-connector",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "publishConfig": {
     "access": "public"
   },
@@ -18,7 +18,7 @@
   "devDependencies": {},
   "peerDependencies": {
     "@apollo/client": "~3.5.0",
-    "@magento/peregrine": "~14.3.1",
+    "@magento/peregrine": "~14.4.1",
     "@magento/pwa-buildpack": "~11.5.3",
     "react": "~17.0.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.16",
+  "version": "1.0.17",
   "publishConfig": {
     "access": "public"
   },
@@ -14,7 +14,7 @@
   "license": "(OSL-3.0 OR AFL-3.0)",
   "peerDependencies": {
     "@magento/pwa-buildpack": "~11.5.3",
-    "@magento/venia-ui": "~11.4.0",
+    "@magento/venia-ui": "~11.5.0",
     "webpack": "~4.46.0"
   },
   "pwa-studio": {

diff --git a/packages/extensions/venia-sample-eventing/package.json b/packages/extensions/venia-sample-eventing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magento/venia-sample-eventing",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "publishConfig": {
     "access": "public"
   },
@@ -12,7 +12,7 @@
   "repository": "github:magento/pwa-studio",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "peerDependencies": {
-    "@magento/peregrine": "~14.3.1",
+    "@magento/peregrine": "~14.4.1",
     "@magento/pwa-buildpack": "~11.5.3",
     "react": "~17.0.1"
   },

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.16",
+  "version": "0.0.17",
   "publishConfig": {
     "access": "public"
   },
@@ -13,7 +13,7 @@
   "license": "(OSL-3.0 OR AFL-3.0)",
   "peerDependencies": {
     "@magento/pwa-buildpack": "~11.5.3",
-    "@magento/venia-ui": "~11.4.0"
+    "@magento/venia-ui": "~11.5.0"
   },
   "pwa-studio": {
     "targets": {

diff --git a/packages/extensions/venia-sample-payments-checkmo/package.json b/packages/extensions/venia-sample-payments-checkmo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magento/venia-sample-payments-checkmo",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "publishConfig": {
     "access": "public"
   },
@@ -12,9 +12,9 @@
   "repository": "github:magento/pwa-studio",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "peerDependencies": {
-    "@magento/peregrine": "~14.3.1",
+    "@magento/peregrine": "~14.4.1",
     "@magento/pwa-buildpack": "~11.5.3",
-    "@magento/venia-ui": "~11.4.0",
+    "@magento/venia-ui": "~11.5.0",
     "react": "~17.0.1",
     "react-intl": "~5.20.0",
     "react-router-dom": "~5.2.0"

diff --git a/packages/pagebuilder/package.json b/packages/pagebuilder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magento/pagebuilder",
-  "version": "9.3.1",
+  "version": "9.3.2",
   "publishConfig": {
     "access": "public"
   },
@@ -34,9 +34,9 @@
   "homepage": "https://github.com/magento/pwa-studio/tree/main/packages/pagebuilder#readme",
   "dependencies": {},
   "devDependencies": {
-    "@magento/peregrine": "~14.3.1",
+    "@magento/peregrine": "~14.4.1",
     "@magento/pwa-buildpack": "~11.5.3",
-    "@magento/venia-ui": "~11.4.0",
+    "@magento/venia-ui": "~11.5.0",
     "@storybook/react": "~6.3.7",
     "jarallax": "~1.11.1",
     "load-google-maps-api": "~2.0.1",
@@ -50,9 +50,9 @@
   "peerDependencies": {
     "@apollo/client": "~3.5.0",
     "@magento/babel-preset-peregrine": "~1.3.3",
-    "@magento/peregrine": "~14.3.1",
+    "@magento/peregrine": "~14.4.1",
     "@magento/pwa-buildpack": "~11.5.3",
-    "@magento/venia-ui": "~11.4.0",
+    "@magento/venia-ui": "~11.5.0",
     "jarallax": "~1.11.1",
     "load-google-maps-api": "~2.0.1",
     "lodash.escape": "~4.0.1",

diff --git a/packages/peregrine/lib/store/actions/user/asyncActions.js b/packages/peregrine/lib/store/actions/user/asyncActions.js
@@ -63,13 +63,17 @@ export const resetPassword = ({ email }) =>
         dispatch(actions.resetPassword.receive());
     };
 
-export const setToken = (token, customer_token_lifetime = 3600) =>
+export const setToken = (token, customerAccessTokenLifetime = 1) =>
     async function thunk(...args) {
         const [dispatch] = args;
 
         // Store token in local storage.
         // TODO: Get correct token expire time from API
-        storage.setItem('signin_token', token, customer_token_lifetime);
+        storage.setItem(
+            'signin_token',
+            token,
+            customerAccessTokenLifetime * 3600
+        );
 
         // Persist in store
         dispatch(actions.setToken(token));

diff --git a/.../CheckoutPage/OrderConfirmationPage/__tests__/__snapshots__/useCreateAccount.spec.js.snap b/.../CheckoutPage/OrderConfirmationPage/__tests__/__snapshots__/useCreateAccount.spec.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`handle submit event creates an account, dispatches event, signs in, and generates a new cart 1`] = `
+exports[`handle submit event should dispatch create account event 1`] = `
 Object {
   "payload": Object {
     "email": "[email protected]",
@@ -12,42 +12,24 @@ Object {
 }
 `;
 
-exports[`returns the correct shape 1`] = `
+exports[`should return properly 1`] = `
 Object {
   "errors": Map {
-    "createAccountQuery" => undefined,
-    "signInMutation" => undefined,
+    "createAccountQuery" => null,
+    "signInMutation" => null,
   },
   "handleEnterKeyPress": [Function],
   "handleSubmit": [Function],
   "initialValues": Object {
     "customer": Object {
-      "email": "[email protected]",
-      "firstname": "Philip",
-      "lastname": "Fry",
-    },
-  },
-  "isDisabled": false,
-  "recaptchaWidgetProps": Object {},
-}
-`;
-
-exports[`returns the correct shape with no initial values 1`] = `
-Object {
-  "errors": Map {
-    "createAccountQuery" => undefined,
-    "signInMutation" => undefined,
-  },
-  "handleEnterKeyPress": [Function],
-  "handleSubmit": [Function],
-  "initialValues": Object {
-    "customer": Object {
-      "email": undefined,
-      "firstname": undefined,
-      "lastname": undefined,
+      "email": "[email protected]",
+      "firstname": "Gooseton",
+      "lastname": "Jr",
     },
+    "userName": "gooseton",
   },
   "isDisabled": false,
+  "minimumPasswordLength": 8,
   "recaptchaWidgetProps": Object {},
 }
 `;