Skip to content

Commit 62a39a2

Browse files
vcua-mobifyvmartahajinsuha1adamrayayunakim714
authored
@W-17589798@ Bump develop to v3.10.0-dev (#2278)
* Update changelog files * Bump to the preview versions * Bump up preview versions * @W-17589798@ Release preview version 3.9.0-preview.2 (#2264) * Update default.js.hbs and ssr.js.hbs templates to support new login flows (#2263) * update bootstrap default.js.hbs to include login options * update ssr.js templates * Revert/page meta data tags 3.9.x (#2259) * Revert page-meta-data changes * Update CHANGELOG.md * Fix changelog --------- Co-authored-by: Vincent Marta <vmarta@salesforce.com> * Bump to version 3.9.0-preview.2 * Fix lint errors in default.js templates (#2265) * fix lint errors * rerun ci jobs --------- Co-authored-by: Jinsu Ha <91205717+hajinsuha1@users.noreply.github.com> Co-authored-by: Vincent Marta <vmarta@salesforce.com> * @W-17589798@ Release preview version 3.9.0-preview.3 (#2268) * Update default.js.hbs and ssr.js.hbs templates to support new login flows (#2263) * update bootstrap default.js.hbs to include login options * update ssr.js templates * Revert/page meta data tags 3.9.x (#2259) * Revert page-meta-data changes * Update CHANGELOG.md * Fix changelog --------- Co-authored-by: Vincent Marta <vmarta@salesforce.com> * Bump to version 3.9.0-preview.2 * Fix lint errors in default.js templates (#2265) * fix lint errors * rerun ci jobs * Update app config templates (#2267) * lint default.js in templates folder (#2266) Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com> * Bump to version 3.9.0-preview.3 * Update CHANGELOG.md --------- Co-authored-by: Jinsu Ha <91205717+hajinsuha1@users.noreply.github.com> Co-authored-by: Vincent Marta <vmarta@salesforce.com> * @W-17589798@ Release preview version 3.9.0-preview.4 (#2272) * Update default.js.hbs and ssr.js.hbs templates to support new login flows (#2263) * update bootstrap default.js.hbs to include login options * update ssr.js templates * Revert/page meta data tags 3.9.x (#2259) * Revert page-meta-data changes * Update CHANGELOG.md * Fix changelog --------- Co-authored-by: Vincent Marta <vmarta@salesforce.com> * Bump to version 3.9.0-preview.2 * Fix lint errors in default.js templates (#2265) * fix lint errors * rerun ci jobs * Update app config templates (#2267) * lint default.js in templates folder (#2266) Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com> * Bump to version 3.9.0-preview.3 * Update CHANGELOG.md * Fix import error template retail react app (#2270) * revert babel.config.js workaround * move everything out of utils into ssr.js or default.js * update default.js templates * update ssr.js templates * rerun ci jobs * rerun ci jobs * Bump versions --------- Co-authored-by: Adam Raya Navarro <arayanavarro@salesforce.com> * Update CHANGELOG.md --------- Co-authored-by: Jinsu Ha <91205717+hajinsuha1@users.noreply.github.com> Co-authored-by: Vincent Marta <vmarta@salesforce.com> Co-authored-by: Adam Raya Navarro <arayanavarro@salesforce.com> * @W-17589798@ Release preview version 3.9.0-preview.5 (#2274) * Update default.js.hbs and ssr.js.hbs templates to support new login flows (#2263) * update bootstrap default.js.hbs to include login options * update ssr.js templates * Revert/page meta data tags 3.9.x (#2259) * Revert page-meta-data changes * Update CHANGELOG.md * Fix changelog --------- Co-authored-by: Vincent Marta <vmarta@salesforce.com> * Bump to version 3.9.0-preview.2 * Fix lint errors in default.js templates (#2265) * fix lint errors * rerun ci jobs * Update app config templates (#2267) * lint default.js in templates folder (#2266) Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com> * Bump to version 3.9.0-preview.3 * Update CHANGELOG.md * Fix import error template retail react app (#2270) * revert babel.config.js workaround * move everything out of utils into ssr.js or default.js * update default.js templates * update ssr.js templates * rerun ci jobs * rerun ci jobs * Bump versions --------- Co-authored-by: Adam Raya Navarro <arayanavarro@salesforce.com> * Update CHANGELOG.md * Add missing `_app-config` template changes (#2273) * @W-17589798@ Release preview version 3.9.0-preview.4 (#2272) * Update default.js.hbs and ssr.js.hbs templates to support new login flows (#2263) * update bootstrap default.js.hbs to include login options * update ssr.js templates * Revert/page meta data tags 3.9.x (#2259) * Revert page-meta-data changes * Update CHANGELOG.md * Fix changelog --------- Co-authored-by: Vincent Marta <vmarta@salesforce.com> * Bump to version 3.9.0-preview.2 * Fix lint errors in default.js templates (#2265) * fix lint errors * rerun ci jobs * Update app config templates (#2267) * lint default.js in templates folder (#2266) Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com> * Bump to version 3.9.0-preview.3 * Update CHANGELOG.md * Fix import error template retail react app (#2270) * revert babel.config.js workaround * move everything out of utils into ssr.js or default.js * update default.js templates * update ssr.js templates * rerun ci jobs * rerun ci jobs * Bump versions --------- Co-authored-by: Adam Raya Navarro <arayanavarro@salesforce.com> * Update CHANGELOG.md --------- Co-authored-by: Jinsu Ha <91205717+hajinsuha1@users.noreply.github.com> Co-authored-by: Vincent Marta <vmarta@salesforce.com> Co-authored-by: Adam Raya Navarro <arayanavarro@salesforce.com> * add missing app config template changes * update both app config templates --------- Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com> Co-authored-by: Jinsu Ha <91205717+hajinsuha1@users.noreply.github.com> Co-authored-by: Vincent Marta <vmarta@salesforce.com> Co-authored-by: Adam Raya Navarro <arayanavarro@salesforce.com> * Bump version to 3.9.0-preview.5 * Update CHANGELOG.md --------- Co-authored-by: Jinsu Ha <91205717+hajinsuha1@users.noreply.github.com> Co-authored-by: Vincent Marta <vmarta@salesforce.com> Co-authored-by: Adam Raya Navarro <arayanavarro@salesforce.com> Co-authored-by: Yuna Kim <84923642+yunakim714@users.noreply.github.com> * @W-17589798@ PWA Kit v3.9.0, commerce-sdk-react 3.2.0, retail-react-app 6.0.0 Release (#2277) * Update default.js.hbs and ssr.js.hbs templates to support new login flows (#2263) * update bootstrap default.js.hbs to include login options * update ssr.js templates * Revert/page meta data tags 3.9.x (#2259) * Revert page-meta-data changes * Update CHANGELOG.md * Fix changelog --------- Co-authored-by: Vincent Marta <vmarta@salesforce.com> * Bump to version 3.9.0-preview.2 * Fix lint errors in default.js templates (#2265) * fix lint errors * rerun ci jobs * Update app config templates (#2267) * lint default.js in templates folder (#2266) Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com> * Bump to version 3.9.0-preview.3 * Update CHANGELOG.md * Fix import error template retail react app (#2270) * revert babel.config.js workaround * move everything out of utils into ssr.js or default.js * update default.js templates * update ssr.js templates * rerun ci jobs * rerun ci jobs * Bump versions --------- Co-authored-by: Adam Raya Navarro <arayanavarro@salesforce.com> * Update CHANGELOG.md * Add missing `_app-config` template changes (#2273) * @W-17589798@ Release preview version 3.9.0-preview.4 (#2272) * Update default.js.hbs and ssr.js.hbs templates to support new login flows (#2263) * update bootstrap default.js.hbs to include login options * update ssr.js templates * Revert/page meta data tags 3.9.x (#2259) * Revert page-meta-data changes * Update CHANGELOG.md * Fix changelog --------- Co-authored-by: Vincent Marta <vmarta@salesforce.com> * Bump to version 3.9.0-preview.2 * Fix lint errors in default.js templates (#2265) * fix lint errors * rerun ci jobs * Update app config templates (#2267) * lint default.js in templates folder (#2266) Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com> * Bump to version 3.9.0-preview.3 * Update CHANGELOG.md * Fix import error template retail react app (#2270) * revert babel.config.js workaround * move everything out of utils into ssr.js or default.js * update default.js templates * update ssr.js templates * rerun ci jobs * rerun ci jobs * Bump versions --------- Co-authored-by: Adam Raya Navarro <arayanavarro@salesforce.com> * Update CHANGELOG.md --------- Co-authored-by: Jinsu Ha <91205717+hajinsuha1@users.noreply.github.com> Co-authored-by: Vincent Marta <vmarta@salesforce.com> Co-authored-by: Adam Raya Navarro <arayanavarro@salesforce.com> * add missing app config template changes * update both app config templates --------- Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com> Co-authored-by: Jinsu Ha <91205717+hajinsuha1@users.noreply.github.com> Co-authored-by: Vincent Marta <vmarta@salesforce.com> Co-authored-by: Adam Raya Navarro <arayanavarro@salesforce.com> * Bump version to 3.9.0-preview.5 * Update CHANGELOG.md * Bump versions * Update changelogs * Update CHANGELOG.md * Update peer dep in package-lock --------- Co-authored-by: Jinsu Ha <91205717+hajinsuha1@users.noreply.github.com> Co-authored-by: Vincent Marta <vmarta@salesforce.com> Co-authored-by: Adam Raya Navarro <arayanavarro@salesforce.com> Co-authored-by: Yuna Kim <84923642+yunakim714@users.noreply.github.com> * Bump version to 3.10.0-dev --------- Co-authored-by: Vincent Marta <vmarta@salesforce.com> Co-authored-by: Jinsu Ha <91205717+hajinsuha1@users.noreply.github.com> Co-authored-by: Adam Raya Navarro <arayanavarro@salesforce.com> Co-authored-by: Yuna Kim <84923642+yunakim714@users.noreply.github.com>
1 parent 294f6ce commit 62a39a2

File tree

46 files changed

+901
-573
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+901
-573
lines changed

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "3.9.0-dev",
2+
"version": "3.10.0-dev",
33
"packages": [
44
"packages/*"
55
]

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pwa-kit",
3-
"version": "3.9.0-dev",
3+
"version": "3.10.0-dev",
44
"scripts": {
55
"bump-version": "node ./scripts/bump-version/index.js",
66
"bump-version:retail-react-app": "node ./scripts/bump-version/index.js --package=@salesforce/retail-react-app",

packages/commerce-sdk-react/CHANGELOG.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
## v3.2.0-dev (Oct 29, 2024)
1+
## v3.3.0-dev (Feb 18, 2025)
2+
3+
4+
## v3.2.0 (Feb 18, 2025)
5+
26
- Allow cookies for ShopperLogin API [#2190](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2190
37
- Fix refresh token TTL warning from firing when override is not provided [#2114](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2114)
48
- Readme updates for private clients [#2212](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2212)
5-
69
- Update CacheUpdateMatrix for mergeBasket mutation [#2138](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2092)
710
- Clear auth state if session has been invalidated by a password change [#2092](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2092)
811
- DNT interface improvement [#2203](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2203)
912
- Support Node 22 [#2218](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2218)
1013
- Add `authorizeIDP`, `loginIDPUser`, `authorizePasswordless`, `getPasswordLessAccessToken`, `getPasswordResetToken`, and `resetPassword` wrapper functions to support Social Login, Passwordless Login, and Password Reset [#2079] (https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2079)
1114

15+
1216
## v3.1.0 (Oct 28, 2024)
1317

1418
- [Server Affinity] Attach dwsid to SCAPI request headers [#2090](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2090)

packages/commerce-sdk-react/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/commerce-sdk-react/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@salesforce/commerce-sdk-react",
3-
"version": "3.2.0-dev",
3+
"version": "3.3.0-dev",
44
"description": "A library that provides react hooks for fetching data from Commerce Cloud",
55
"homepage": "https://github.com/SalesforceCommerceCloud/pwa-kit/tree/develop/packages/ecom-react-hooks#readme",
66
"bugs": {
@@ -45,7 +45,7 @@
4545
"jwt-decode": "^4.0.0"
4646
},
4747
"devDependencies": {
48-
"@salesforce/pwa-kit-dev": "3.9.0-dev",
48+
"@salesforce/pwa-kit-dev": "3.10.0-dev",
4949
"@tanstack/react-query": "^4.28.0",
5050
"@testing-library/jest-dom": "^5.16.5",
5151
"@testing-library/react": "^14.0.0",
@@ -60,7 +60,7 @@
6060
"@types/react-helmet": "~6.1.6",
6161
"@types/react-router-dom": "~5.3.3",
6262
"cross-env": "^5.2.1",
63-
"internal-lib-build": "3.9.0-dev",
63+
"internal-lib-build": "3.10.0-dev",
6464
"jsonwebtoken": "^9.0.0",
6565
"nock": "^13.3.0",
6666
"nodemon": "^2.0.22",

packages/internal-lib-build/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/internal-lib-build/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "internal-lib-build",
3-
"version": "3.9.0-dev",
3+
"version": "3.10.0-dev",
44
"private": true,
55
"description": "Build tools for *libraries* in the monorepo",
66
"bugs": {
@@ -60,7 +60,7 @@
6060
"shelljs": "^0.8.5"
6161
},
6262
"devDependencies": {
63-
"@salesforce/pwa-kit-dev": "3.9.0-dev",
63+
"@salesforce/pwa-kit-dev": "3.10.0-dev",
6464
"npm-packlist": "^4.0.0",
6565
"typescript": "4.9.5"
6666
},

packages/pwa-kit-create-app/CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1-
## v3.9.0-dev (Oct 29, 2024)
1+
## v3.10.0-dev (Feb 18, 2025)
2+
3+
## v3.9.0 (Feb 18, 2025)
4+
5+
- Update `default.js` and `ssr.js` template to support new passwordless, social, and reset password flows. [#2263] (https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2263)
26
- Support Node 22 [#2218](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2218)
37
- Update `default.js` template to include new login configurations [#2079] (https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2079)
8+
- Handle import error when ssr.js imports from template retail react app [#2270](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2270)
9+
410

511
## v3.8.0 (Oct 28, 2024)
612

packages/pwa-kit-create-app/assets/bootstrap/js/config/default.js.hbs

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,37 @@ module.exports = {
1717
// This boolean value dictates whether or not default site or locale values are shown in the url. Defaults to: false
1818
// showDefaults: true
1919
},
20+
login: {
21+
passwordless: {
22+
// Enables or disables passwordless login for the site. Defaults to: false
23+
enabled: false,
24+
// The callback URI, which can be an absolute URL (including third-party URIs) or a relative path set up by the developer.
25+
// Required in 'callback' mode; if missing, passwordless login defaults to 'sms' mode, which requires Marketing Cloud configuration.
26+
// If the env var `PASSWORDLESS_LOGIN_CALLBACK_URI` is set, it will override the config value.
27+
callbackURI:
28+
process.env.PASSWORDLESS_LOGIN_CALLBACK_URI || '/passwordless-login-callback',
29+
// The landing path for passwordless login
30+
landingPath: '/passwordless-login-landing'
31+
},
32+
social: {
33+
// Enables or disables social login for the site. Defaults to: false
34+
enabled: false,
35+
// The third-party identity providers supported by your app. The PWA Kit supports Google and Apple by default.
36+
// Additional IDPs will also need to be added to the IDP_CONFIG in the SocialLogin component.
37+
idps: ['google', 'apple'],
38+
// The redirect URI used after a successful social login authentication.
39+
// This should be a relative path set up by the developer.
40+
// If the env var `SOCIAL_LOGIN_REDIRECT_URI` is set, it will override the config value.
41+
redirectURI: process.env.SOCIAL_LOGIN_REDIRECT_URI || '/social-callback'
42+
},
43+
resetPassword: {
44+
// The callback URI, which can be an absolute URL (including third-party URIs) or a relative path set up by the developer.
45+
// If the env var `RESET_PASSWORD_CALLBACK_URI` is set, it will override the config value.
46+
callbackURI: process.env.RESET_PASSWORD_CALLBACK_URI || '/reset-password-callback',
47+
// The landing path for reset password
48+
landingPath: '/reset-password-landing'
49+
}
50+
},
2051
// The default site for your app. This value will be used when a siteRef could not be determined from the url
2152
defaultSite: '{{answers.project.commerce.siteId}}',
2253
// Provide aliases for your sites. These will be used in place of your site id when generating paths throughout the application.

0 commit comments

Comments
 (0)