@salesforce/retail-react-app 8.3.0-preview.1 → 8.4.0-nightly-20260116000329

package/app/utils/routes-utils.test.js

@@ -288,4 +288,181 @@ describe('configureRoutes', function () {
             expect(paths).toEqual(expectedRes)
         })
     })
+
+    describe('fuzzyPathMatching', function () {
+        // Expected patterns based on sites mock:
+        // Sites: uk (alias) / site-1 (id), us (alias) / site-2 (id)
+        // Locales: en-GB, fr (alias), fr-FR, it-IT (site-1), en-US, en-CA (site-2)
+        const sitePattern = 'uk|site-1|us|site-2'
+        const localePattern = 'en-GB|fr|fr-FR|it-IT|en-US|en-CA'
+
+        const fuzzyCases = [
+            {
+                urlConfig: {
+                    site: 'path',
+                    locale: 'path',
+                    showDefaults: true
+                },
+                expectedRes: [
+                    `/:site(${sitePattern})/:locale(${localePattern})/`,
+                    '/',
+                    `/:site(${sitePattern})/:locale(${localePattern})/category/:categoryId`,
+                    '/category/:categoryId'
+                ]
+            },
+            {
+                urlConfig: {
+                    site: 'path',
+                    locale: 'path',
+                    showDefaults: false
+                },
+                expectedRes: [
+                    `/:site(${sitePattern})/:locale(${localePattern})/`,
+                    '/',
+                    `/:site(${sitePattern})/:locale(${localePattern})/category/:categoryId`,
+                    '/category/:categoryId'
+                ]
+            },
+            {
+                urlConfig: {
+                    site: 'query_param',
+                    locale: 'path',
+                    showDefaults: true
+                },
+                expectedRes: [
+                    `/:locale(${localePattern})/`,
+                    '/',
+                    `/:locale(${localePattern})/category/:categoryId`,
+                    '/category/:categoryId'
+                ]
+            },
+            {
+                urlConfig: {
+                    site: 'query_param',
+                    locale: 'path',
+                    showDefaults: false
+                },
+                expectedRes: [
+                    `/:locale(${localePattern})/`,
+                    '/',
+                    `/:locale(${localePattern})/category/:categoryId`,
+                    '/category/:categoryId'
+                ]
+            },
+            {
+                urlConfig: {
+                    site: 'path',
+                    locale: 'query_param',
+                    showDefaults: true
+                },
+                expectedRes: [
+                    `/:site(${sitePattern})/`,
+                    '/',
+                    `/:site(${sitePattern})/category/:categoryId`,
+                    '/category/:categoryId'
+                ]
+            },
+            {
+                urlConfig: {
+                    site: 'path',
+                    locale: 'query_param',
+                    showDefaults: false
+                },
+                expectedRes: [
+                    `/:site(${sitePattern})/`,
+                    '/',
+                    `/:site(${sitePattern})/category/:categoryId`,
+                    '/category/:categoryId'
+                ]
+            },
+            {
+                urlConfig: {
+                    site: 'query_param',
+                    locale: 'query_param',
+                    showDefaults: true
+                },
+                expectedRes: ['/', '/category/:categoryId']
+            },
+            {
+                urlConfig: {
+                    site: 'query_param',
+                    locale: 'query_param',
+                    showDefaults: false
+                },
+                expectedRes: ['/', '/category/:categoryId']
+            },
+            {
+                urlConfig: {
+                    site: 'path',
+                    locale: 'path',
+                    showDefaults: true
+                },
+                expectedRes: [
+                    `/:site(${sitePattern})/:locale(${localePattern})/`,
+                    '/',
+                    '/category/:categoryId'
+                ],
+                ignoredRoutes: ['/category/:categoryId']
+            }
+        ]
+
+        fuzzyCases.forEach(({urlConfig, expectedRes, ignoredRoutes = []}) => {
+            test(`Should return parameterized routes with fuzzyPathMatching based on ${JSON.stringify(
+                urlConfig
+            )} config${
+                ignoredRoutes.length ? ` and ignore routes ${ignoredRoutes.join(',')}` : ''
+            }`, () => {
+                const config = {
+                    app: {
+                        url: urlConfig
+                    }
+                }
+                const configuredRoutes = configureRoutes(routes, config, {
+                    ignoredRoutes,
+                    fuzzyPathMatching: true
+                })
+                const paths = configuredRoutes.map((route) => route.path)
+                expect(paths).toEqual(expectedRes)
+            })
+        })
+
+        test('Should generate significantly fewer routes with fuzzyPathMatching enabled', () => {
+            const config = {
+                app: {
+                    url: {
+                        site: 'path',
+                        locale: 'path',
+                        showDefaults: true
+                    }
+                }
+            }
+
+            const explicitRoutes = configureRoutes(routes, config, {fuzzyPathMatching: false})
+            const fuzzyRoutes = configureRoutes(routes, config, {fuzzyPathMatching: true})
+
+            // Fuzzy matching should produce significantly fewer routes
+            expect(fuzzyRoutes.length).toBeLessThan(explicitRoutes.length)
+            // With 2 input routes, fuzzy should produce 4 (2 parameterized + 2 fallback)
+            expect(fuzzyRoutes).toHaveLength(4)
+        })
+
+        test('Should preserve route properties when using fuzzyPathMatching', () => {
+            const config = {
+                app: {
+                    url: {
+                        site: 'path',
+                        locale: 'path',
+                        showDefaults: true
+                    }
+                }
+            }
+            const configuredRoutes = configureRoutes(routes, config, {fuzzyPathMatching: true})
+
+            // All routes should have the component and exact properties preserved
+            configuredRoutes.forEach((route) => {
+                expect(route.component).toBeDefined()
+                expect(route.exact).toBe(true)
+            })
+        })
+    })
 })

package/config/mocks/default.js

@@ -35,11 +35,15 @@ module.exports = {
         login: {
             passwordless: {
                 enabled: false,
-                callbackURI: 'https://webhook.site/27761b71-50c1-4097-a600-21a3b89a546c'
+                callbackURI: 'https://webhook.site/27761b71-50c1-4097-a600-21a3b89a546c',
+                landingPath: '/passwordless-login-landing'
             },
             social: {
                 enabled: false,
                 idps: ['google', 'apple']
+            },
+            resetPassword: {
+                landingPath: '/reset-password-landing'
             }
         },
         siteAliases: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/retail-react-app",
-  "version": "8.3.0-preview.1",
+  "version": "8.4.0-nightly-20260116000329",
   "license": "See license in LICENSE",
   "author": "cc-pwa-kit@salesforce.com",
   "ccExtensibility": {
@@ -46,10 +46,10 @@
     "@loadable/component": "^5.15.3",
     "@peculiar/webcrypto": "^1.4.2",
     "@salesforce/cc-datacloud-typescript": "1.1.2",
-    "@salesforce/commerce-sdk-react": "4.3.0-preview.1",
-    "@salesforce/pwa-kit-dev": "3.15.0-preview.1",
-    "@salesforce/pwa-kit-react-sdk": "3.15.0-preview.1",
-    "@salesforce/pwa-kit-runtime": "3.15.0-preview.1",
+    "@salesforce/commerce-sdk-react": "4.4.0-nightly-20260116000329",
+    "@salesforce/pwa-kit-dev": "3.16.0-nightly-20260116000329",
+    "@salesforce/pwa-kit-react-sdk": "3.16.0-nightly-20260116000329",
+    "@salesforce/pwa-kit-runtime": "3.16.0-nightly-20260116000329",
     "@tanstack/react-query": "^4.28.0",
     "@tanstack/react-query-devtools": "^4.29.1",
     "@testing-library/dom": "^9.0.1",
@@ -108,5 +108,5 @@
       "maxSize": "363 kB"
     }
   ],
-  "gitHead": "1f4623e3e297937208c62de776518b442ad08ceb"
+  "gitHead": "486db465c8d07569d755a510ac8bb53360e78281"
 }