Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync release main 14.1.0 #4331

Merged
merged 7 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@magento/pwa-studio",
"version": "14.0.1",
"version": "14.1.0",
"private": true,
"workspaces": [
"packages/babel-preset-peregrine",
Expand Down
2 changes: 1 addition & 1 deletion packages/create-pwa/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@magento/experience-platform-connector",
"version": "1.0.7",
"version": "1.0.8",
"publishConfig": {
"access": "public"
},
Expand All @@ -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"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/extensions/upward-security-headers/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@magento/upward-security-headers",
"version": "1.0.16",
"version": "1.0.17",
"publishConfig": {
"access": "public"
},
Expand All @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions packages/extensions/venia-sample-eventing/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@magento/venia-sample-eventing",
"version": "0.0.8",
"version": "0.0.9",
"publishConfig": {
"access": "public"
},
Expand All @@ -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"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/extensions/venia-sample-language-packs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@magento/venia-sample-language-packs",
"version": "0.0.16",
"version": "0.0.17",
"publishConfig": {
"access": "public"
},
Expand All @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@magento/venia-sample-payments-checkmo",
"version": "0.0.14",
"version": "0.0.15",
"publishConfig": {
"access": "public"
},
Expand All @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions packages/pagebuilder/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@magento/pagebuilder",
"version": "9.3.1",
"version": "9.3.2",
"publishConfig": {
"access": "public"
},
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down
8 changes: 6 additions & 2 deletions packages/peregrine/lib/store/actions/user/asyncActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
Original file line number Diff line number Diff line change
@@ -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]",
Expand All @@ -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 {},
}
`;
Loading
Loading