@salesforce/pwa-kit-create-app 3.12.0-preview.2 → 3.12.0-preview.3

package/assets/bootstrap/js/config/default.js.hbs

@@ -6,7 +6,7 @@
  */
 /* eslint-disable @typescript-eslint/no-var-requires */
 const sites = require('./sites.js')
-const {parseCommerceAgentSettings} = require('./utils.js')
+const {parseSettings} = require('./utils.js')
 
 module.exports = {
     app: {
@@ -23,9 +23,17 @@ module.exports = {
         // Commerce shopping agent configuration for embedded messaging service
         // This enables an agentic shopping experience in the application
         // This property accepts either a JSON string or a plain JavaScript object.
-        // The value is set from the COMMERCE_AGENT_SETTINGS environment variable.
-        // If the COMMERCE_AGENT_SETTINGS environment variable is not set, the feature is disabled.
-        commerceAgent: parseCommerceAgentSettings(process.env.COMMERCE_AGENT_SETTINGS),
+        commerceAgent: parseSettings(process.env.COMMERCE_AGENT_SETTINGS) || {
+            enabled: 'false',
+            askAgentOnSearch: 'false',
+            embeddedServiceName: '',
+            embeddedServiceEndpoint: '',
+            scriptSourceUrl: '',
+            scrt2Url: '',
+            salesforceOrgId: '',
+            commerceOrgId: '',
+            siteId: ''
+        },
         // Customize how your 'site' and 'locale' are displayed in the url.
         url: {
             {{#if answers.project.demo.enableDemoSettings}}

package/assets/bootstrap/js/config/utils.js

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2021, salesforce.com, inc.
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+
+/**
+ * Safely parses settings from either a JSON string or object
+ * @param {string|object} settings - The settings
+ * @returns {object} Parsed settings object
+ */
+function parseSettings(settings) {
+    // If settings is already an object, return it
+    if (typeof settings === 'object' && settings !== null) {
+        return settings
+    }
+
+    // If settings is a string, try to parse it
+    if (typeof settings === 'string') {
+        try {
+            return JSON.parse(settings)
+        } catch (error) {
+            console.warn('Invalid json format:', error.message)
+            return
+        }
+    }
+
+    console.warn('Cannot parse settings from:', settings)
+    return
+}
+
+module.exports = {
+    parseSettings
+}

package/assets/templates/@salesforce/retail-react-app/app/components/_app-config/index.jsx.hbs

@@ -97,7 +97,7 @@ const AppConfig = ({children, locals = {}}) => {
             headers={headers}
             defaultDnt={DEFAULT_DNT_STATE}
             logger={createLogger({packageName: 'commerce-sdk-react'})}
-            passwordlessLoginCallbackURI={passwordlessCallback}
+            passwordlessLoginCallbackURI={passwordlessLoginCallbackURI}
             // Set 'enablePWAKitPrivateClient' to true to use SLAS private client login flows.
             // Make sure to also enable useSLASPrivateClient in ssr.js when enabling this setting.
             {{#if answers.project.commerce.isSlasPrivate}}

package/assets/templates/@salesforce/retail-react-app/config/default.js.hbs

@@ -6,7 +6,7 @@
  */
 /* eslint-disable @typescript-eslint/no-var-requires */
 const sites = require('./sites.js')
-const {parseCommerceAgentSettings} = require('./utils.js')
+const {parseSettings} = require('./utils.js')
 
 module.exports = {
     app: {
@@ -23,9 +23,17 @@ module.exports = {
         // Commerce shopping agent configuration for embedded messaging service
         // This enables an agentic shopping experience in the application
         // This property accepts either a JSON string or a plain JavaScript object.
-        // The value is set from the COMMERCE_AGENT_SETTINGS environment variable.
-        // If the COMMERCE_AGENT_SETTINGS environment variable is not set, the feature is disabled.
-        commerceAgent: parseCommerceAgentSettings(process.env.COMMERCE_AGENT_SETTINGS),
+        commerceAgent: parseSettings(process.env.COMMERCE_AGENT_SETTINGS) || {
+            enabled: 'false',
+            askAgentOnSearch: 'false',
+            embeddedServiceName: '',
+            embeddedServiceEndpoint: '',
+            scriptSourceUrl: '',
+            scrt2Url: '',
+            salesforceOrgId: '',
+            commerceOrgId: '',
+            siteId: ''
+        },
         // Customize settings for your url
         url: {
             {{#if answers.project.demo.enableDemoSettings}}

package/assets/templates/@salesforce/retail-react-app/config/utils.js

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2021, salesforce.com, inc.
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+
+/**
+ * Safely parses settings from either a JSON string or object
+ * @param {string|object} settings - The settings
+ * @returns {object} Parsed settings object
+ */
+function parseSettings(settings) {
+    // If settings is already an object, return it
+    if (typeof settings === 'object' && settings !== null) {
+        return settings
+    }
+
+    // If settings is a string, try to parse it
+    if (typeof settings === 'string') {
+        try {
+            return JSON.parse(settings)
+        } catch (error) {
+            console.warn('Invalid json format:', error.message)
+            return
+        }
+    }
+
+    console.warn('Cannot parse settings from:', settings)
+    return
+}
+
+module.exports = {
+    parseSettings
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/pwa-kit-create-app",
-  "version": "3.12.0-preview.2",
+  "version": "3.12.0-preview.3",
   "description": "Salesforce's project generator tool",
   "homepage": "https://github.com/SalesforceCommerceCloud/pwa-kit/tree/develop/packages/pwa-kit-create-app#readme",
   "bugs": {
@@ -39,13 +39,13 @@
     "tar": "^6.2.1"
   },
   "devDependencies": {
-    "@salesforce/pwa-kit-dev": "3.12.0-preview.2",
-    "internal-lib-build": "3.12.0-preview.2",
+    "@salesforce/pwa-kit-dev": "3.12.0-preview.3",
+    "internal-lib-build": "3.12.0-preview.3",
     "verdaccio": "^5.22.1"
   },
   "engines": {
     "node": "^16.11.0 || ^18.0.0 || ^20.0.0 || ^22.0.0",
     "npm": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0"
   },
-  "gitHead": "c0d7ff4673e54ecb119ca4aff5b919f0064b6539"
+  "gitHead": "36ffe8203fe8661e07571b1e6035ee5a3c9d310f"
 }

package/program.json

@@ -363,7 +363,7 @@
                 "description": "",
                 "templateId": "retail-react-app",
                 "answers": {
-                    "project.extend": true,
+                    "project.extend": false,
                     "project.hybrid": false,
                     "project.name": "retail-react-app",
                     "project.commerce.instanceUrl": "https://zzrf-001.dx.commercecloud.salesforce.com",

package/assets/bootstrap/js/config/utils.js.hbs

@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2021, salesforce.com, inc.
- * All rights reserved.
- * SPDX-License-Identifier: BSD-3-Clause
- * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
- */
-
-/**
- * Safely parses commerce agent settings from either a JSON string or object
- * @param {string|object} settings - The commerce agent settings
- * @returns {object} Parsed commerce agent settings object
- */
-function parseCommerceAgentSettings(settings) {
-    // Default configuration when no settings are provided
-    const defaultConfig = {
-        enabled: 'false',
-        askAgentOnSearch: 'false',
-        embeddedServiceName: '',
-        embeddedServiceEndpoint: '',
-        scriptSourceUrl: '',
-        scrt2Url: '',
-        salesforceOrgId: '',
-        commerceOrgId: '',
-        siteId: ''
-    }
-
-    // If settings is already an object, return it
-    if (typeof settings === 'object' && settings !== null) {
-        return settings
-    }
-
-    // If settings is a string, try to parse it
-    if (typeof settings === 'string') {
-        try {
-            return JSON.parse(settings)
-        } catch (error) {
-            console.warn('Invalid COMMERCE_AGENT_SETTINGS format, using defaults:', error.message)
-            return defaultConfig
-        }
-    }
-
-    // If settings is undefined/null, return defaults
-    return defaultConfig
-}
-
-module.exports = {
-    parseCommerceAgentSettings
-}

package/assets/templates/@salesforce/retail-react-app/config/utils.js.hbs

@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2021, salesforce.com, inc.
- * All rights reserved.
- * SPDX-License-Identifier: BSD-3-Clause
- * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
- */
-
-/**
- * Safely parses commerce agent settings from either a JSON string or object
- * @param {string|object} settings - The commerce agent settings
- * @returns {object} Parsed commerce agent settings object
- */
-function parseCommerceAgentSettings(settings) {
-    // Default configuration when no settings are provided
-    const defaultConfig = {
-        enabled: 'false',
-        askAgentOnSearch: 'false',
-        embeddedServiceName: '',
-        embeddedServiceEndpoint: '',
-        scriptSourceUrl: '',
-        scrt2Url: '',
-        salesforceOrgId: '',
-        commerceOrgId: '',
-        siteId: ''
-    }
-
-    // If settings is already an object, return it
-    if (typeof settings === 'object' && settings !== null) {
-        return settings
-    }
-
-    // If settings is a string, try to parse it
-    if (typeof settings === 'string') {
-        try {
-            return JSON.parse(settings)
-        } catch (error) {
-            console.warn('Invalid COMMERCE_AGENT_SETTINGS format, using defaults:', error.message)
-            return defaultConfig
-        }
-    }
-
-    // If settings is undefined/null, return defaults
-    return defaultConfig
-}
-
-module.exports = {
-    parseCommerceAgentSettings
-}