Add siteid and locale to demo path

Author: vcua-mobify

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

@@ -10,17 +10,24 @@ module.exports = {
     app: {
         // Customize how your 'site' and 'locale' are displayed in the url.
         url: {
+            {{#if answers.project.demo.enableDemoSettings}}
+            // Determine where the siteRef is located. Valid values include 'path|query_param|none'. Defaults to: 'none'
+            // site: 'path',
+            // Determine where the localeRef is located. Valid values include 'path|query_param|none'. Defaults to: 'none'
+            locale: 'path',
+            {{else}}
             // Determine where the siteRef is located. Valid values include 'path|query_param|none'. Defaults to: 'none'
             // site: 'none',
             // Determine where the localeRef is located. Valid values include 'path|query_param|none'. Defaults to: 'none'
-            locale: 'none'
+            locale: 'none',
+            {{/if}}
             // This boolean value dictates whether or not default site or locale values are shown in the url. Defaults to: false
             // showDefaults: true
         },
         login: {
             passwordless: {
                 // Enables or disables passwordless login for the site. Defaults to: false
-                {{#if answers.project.demo.enablePasswordlessAndSocialLogin}}
+                {{#if answers.project.demo.enableDemoSettings}}
                 enabled: true,
                 {{else}}
                 enabled: false,
@@ -35,7 +42,7 @@ module.exports = {
             },
             social: {
                 // Enables or disables social login for the site. Defaults to: false
-                {{#if answers.project.demo.enablePasswordlessAndSocialLogin}}
+                {{#if answers.project.demo.enableDemoSettings}}
                 enabled: true,
                 {{else}}
                 enabled: false,

packages/pwa-kit-create-app/assets/templates/@salesforce/retail-react-app/config/default.js.hbs

@@ -10,10 +10,17 @@ module.exports = {
     app: {
         // Customize settings for your url
         url: {
+            {{#if answers.project.demo.enableDemoSettings}}
+            // Determine where the siteRef is located. Valid values include 'path|query_param|none'. Defaults to: 'none'
+            // site: 'path',
+            // Determine where the localeRef is located. Valid values include 'path|query_param|none'. Defaults to: 'none'
+            locale: 'path',
+            {{else}}
             // Determine where the siteRef is located. Valid values include 'path|query_param|none'. Defaults to: 'none'
             // site: 'none',
             // Determine where the localeRef is located. Valid values include 'path|query_param|none'. Defaults to: 'none'
             locale: 'none',
+            {{/if}}
             // This boolean value dictates whether default site or locale values are shown in the url. Defaults to: false
             // showDefaults: true,
             // This boolean value dictates whether the plus sign (+) is interpreted as space for query param string. Defaults to: false
@@ -22,7 +29,7 @@ module.exports = {
         login: {
             passwordless: {
                 // Enables or disables passwordless login for the site. Defaults to: false
-                {{#if answers.project.demo.enablePasswordlessAndSocialLogin}}
+                {{#if answers.project.demo.enableDemoSettings}}
                 enabled: true,
                 {{else}}
                 enabled: false,
@@ -37,7 +44,7 @@ module.exports = {
             },
             social: {
                 // Enables or disables social login for the site. Defaults to: false
-                {{#if answers.project.demo.enablePasswordlessAndSocialLogin}}
+                {{#if answers.project.demo.enableDemoSettings}}
                 enabled: true,
                 {{else}}
                 enabled: false,

packages/pwa-kit-create-app/scripts/create-mobify-app.js

@@ -59,10 +59,6 @@ sh.set('-e')
 // will ensure those escaped double quotes are still escaped after processing the template.
 Handlebars.registerHelper('script', (object) => object.replaceAll('"', '\\"'))
 
-Handlebars.registerHelper('ifEquals', function(arg1, arg2, options) {
-    return (arg1 == arg2) ? options.fn(this) : options.inverse(this);
-})
-
 // Validations
 const validPreset = (preset) => {
     return ALL_PRESET_NAMES.includes(preset)
@@ -270,7 +266,7 @@ const PRESETS = [
             ['project.commerce.isSlasPrivate']: false,
             ['project.einstein.clientId']: '1ea06c6e-c936-4324-bcf0-fada93f83bb1',
             ['project.einstein.siteId']: 'aaij-MobileFirst',
-            ['project.demo.enablePasswordlessAndSocialLogin']: false
+            ['project.demo.enableDemoSettings']: false
         },
         assets: ['translations'],
         private: false
@@ -284,7 +280,8 @@ const PRESETS = [
 
             This has social and passwordless login enabled but requires a client secret to run.
         `,
-        shortDescription: 'The Retail app with demo Commerce Cloud instance and a private SLAS client',
+        shortDescription:
+            'The Retail app with demo Commerce Cloud instance and a private SLAS client',
         templateSource: {
             type: TEMPLATE_SOURCE_NPM,
             id: '@salesforce/retail-react-app'
@@ -302,7 +299,7 @@ const PRESETS = [
             ['project.commerce.isSlasPrivate']: true,
             ['project.einstein.clientId']: '1ea06c6e-c936-4324-bcf0-fada93f83bb1',
             ['project.einstein.siteId']: 'aaij-MobileFirst',
-            ['project.demo.enablePasswordlessAndSocialLogin']: true // True only for PWA Kit demo environments!
+            ['project.demo.enableDemoSettings']: true // True only for presets deployed to demo environments like pwa-kit.mobify-storefront.com
         },
         assets: ['translations'],
         private: true
@@ -328,7 +325,7 @@ const PRESETS = [
             ['project.commerce.isSlasPrivate']: false,
             ['project.einstein.clientId']: '1ea06c6e-c936-4324-bcf0-fada93f83bb1',
             ['project.einstein.siteId']: 'aaij-MobileFirst',
-            ['project.demo.enablePasswordlessAndSocialLogin']: false
+            ['project.demo.enableDemoSettings']: false
         },
         assets: ['translations'],
         private: true
@@ -354,7 +351,7 @@ const PRESETS = [
             ['project.commerce.isSlasPrivate']: true,
             ['project.einstein.clientId']: '1ea06c6e-c936-4324-bcf0-fada93f83bb1',
             ['project.einstein.siteId']: 'aaij-MobileFirst',
-            ['project.demo.enablePasswordlessAndSocialLogin']: false
+            ['project.demo.enableDemoSettings']: false
         },
         assets: ['translations'],
         private: true
@@ -380,7 +377,7 @@ const PRESETS = [
             ['project.einstein.clientId']: '1ea06c6e-c936-4324-bcf0-fada93f83bb1',
             ['project.einstein.siteId']: 'aaij-MobileFirst',
             ['project.commerce.isSlasPrivate']: true,
-            ['project.demo.enablePasswordlessAndSocialLogin']: false
+            ['project.demo.enableDemoSettings']: false
         },
         assets: ['translations'],
         private: true
@@ -406,7 +403,7 @@ const PRESETS = [
             ['project.einstein.clientId']: '1ea06c6e-c936-4324-bcf0-fada93f83bb1',
             ['project.einstein.siteId']: 'aaij-MobileFirst',
             ['project.commerce.isSlasPrivate']: true,
-            ['project.demo.enablePasswordlessAndSocialLogin']: false
+            ['project.demo.enableDemoSettings']: false
         },
         assets: ['translations'],
         private: true
@@ -432,7 +429,7 @@ const PRESETS = [
             ['project.einstein.clientId']: '1ea06c6e-c936-4324-bcf0-fada93f83bb1',
             ['project.einstein.siteId']: 'aaij-MobileFirst',
             ['project.commerce.isSlasPrivate']: false,
-            ['project.demo.enablePasswordlessAndSocialLogin']: false
+            ['project.demo.enableDemoSettings']: false
         },
         assets: ['translations'],
         private: true