@W-17900760@ Deploy Demo Storefront with SLAS Private Client

.github/actions/check_if_latest_release/action.yml

@@ -17,10 +17,10 @@ runs:
         echo "Release event tag: $RELEASE_EVENT_TAG_NAME"
 
         if [ "$LATEST_TAG_NAME" == "$RELEASE_EVENT_TAG_NAME" ]; then
-          echo "We are releasing the latest tag. Continuing deployment workflow."
-          exit 0
+          echo "We are releasing the latest tag."
+          echo "IS_LATEST_RELEASE=true" >> $GITHUB_ENV
         else
-          echo "We are not releasing the latest tag. Stopping deployment workflow."
-          exit 1
+          echo "We are not releasing the latest tag."
+          echo "IS_LATEST_RELEASE=false" >> $GITHUB_ENV
         fi
       shell: bash

.github/workflows/deploy_latest_release.yml

@@ -3,14 +3,16 @@ on:
   # For testing - to be removed
   push:
     branches:
-      - 'mrt-test-ci-deploy'
+      - 'deploy-demo-env-on-release'
   # Run this workflow when a new Github release is published
   release:
     types: [released]
 
 jobs:
   check-latest-release:
     runs-on: ubuntu-latest
+    outputs:
+      IS_LATEST_RELEASE: ${{ steps.checkRelease.outputs.IS_LATEST_RELEASE }}
     steps:  
       - name: Checkout
         uses: actions/checkout@v4
@@ -19,10 +21,38 @@ jobs:
         uses: ./.github/actions/check_if_latest_release
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Update Github Outputs
+        id: checkRelease
+        run: |-
+          IS_LATEST_RELEASE=$(echo ${{ env.IS_LATEST_RELEASE }})
+          if [ $IS_LATEST_RELEASE != "true" ]; then
+            echo "Deploy is not for the latest release. Stopping deployment"
+          fi
+          echo "IS_LATEST_RELEASE=$IS_LATEST_RELEASE" >> "$GITHUB_OUTPUT"
 
-  deploy-bug-bounty:
+  deploy-sites:
     needs: check-latest-release
     runs-on: ubuntu-latest
+    if: needs.check-latest-release.outputs.IS_LATEST_RELEASE == 'true'
+    strategy:
+      fail-fast: false
+      matrix:
+        environment:
+          - name: bug-bounty
+            project_key: retail-react-app-bug-bounty
+            target: testing
+            project: pwa-kit
+            mobify_user: MOBIFY_STG_CLIENT_USER
+            mobify_api_key: MOBIFY_STG_CLIENT_API_KEY
+            flags: --cloud-origin https://cloud-testing.mobify-staging.com -c ~/.mobify --wait
+          - name: demo-site
+            project_key: retail-react-app-demo-site
+            target: production
+            project: scaffold-pwa
+            mobify_user: MOBIFY_CLIENT_USER
+            mobify_api_key: MOBIFY_CLIENT_API_KEY
+            flags: --wait
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -42,19 +72,30 @@ jobs:
       - name: Generate Retail App Demo
         uses: ./.github/actions/e2e_generate_app
         with:
-          PROJECT_KEY: "retail-react-app-bug-bounty"
+          PROJECT_KEY: ${{ matrix.environment.project_key }}
 
       - name: Create MRT credentials file
         uses: "./.github/actions/create_mrt"
         with:
-          mobify_user: ${{ secrets.MOBIFY_STG_CLIENT_USER }}
-          mobify_api_key: ${{ secrets.MOBIFY_STG_CLIENT_API_KEY }}
+          mobify_user: ${{ secrets[matrix.environment.mobify_user] }}
+          mobify_api_key: ${{ secrets[matrix.environment.mobify_api_key] }}
+
+      - name: Set bundle name
+        run: |-
+          TAG_NAME=$(echo ${{ github.event.release.tag_name }})
+          if [ "$TAG_NAME" ]; then
+            BUNDLE_NAME="tag ${{ github.event.release.tag_name }}"
+          else
+            BUNDLE_NAME="build ${{ github.run_id }} on ${{ github.ref }} (${{ github.sha }})"
+          fi
+          echo "Setting bundle name as $BUNDLE_NAME"
+          echo "BUNDLE_NAME=$BUNDLE_NAME" >> $GITHUB_ENV
 
-      - name: Push Bundle to MRT (Bug Bounty)
+      - name: Push Bundle to MRT (${{matrix.environment.name}})
         uses: "./.github/actions/push_to_mrt"
         with:
-          CWD: "../generated-projects/retail-react-app-bug-bounty"
-          TARGET: testing
-          PROJECT: pwa-kit
-          MESSAGE: "tag ${{ github.event.release.tag_name }}"
-          FLAGS: --cloud-origin https://cloud-testing.mobify-staging.com -c ~/.mobify --wait
+          CWD: "../generated-projects/${{ matrix.environment.project_key }}"
+          TARGET: ${{ matrix.environment.target }}
+          PROJECT: ${{ matrix.environment.project }}
+          MESSAGE: ${{ env.BUNDLE_NAME }})
+          FLAGS: ${{ matrix.environment.flags }}

.github/workflows/test.yml

@@ -101,20 +101,14 @@ jobs:
           mobify_user: ${{ secrets.MOBIFY_CLIENT_USER }}
           mobify_api_key: ${{ secrets.MOBIFY_CLIENT_API_KEY }}
 
+      # TODO - Do we still need this?
       - name: Push Bundle to MRT (Development)
         if: env.IS_NOT_FORK == 'true' && env.IS_MRT_NODE == 'true' && env.DEVELOP == 'true'
         uses: "./.github/actions/push_to_mrt"
         with:
           CWD: "./packages/template-retail-react-app"
           TARGET: staging
 
-      - name: Push Bundle to MRT (Production)
-        if: env.IS_NOT_FORK == 'true' && env.IS_MRT_NODE == 'true' && env.RELEASE == 'true'
-        uses: "./.github/actions/push_to_mrt"
-        with:
-          CWD: "./packages/template-retail-react-app"
-          TARGET: production
-
       - name: Push Bundle to MRT (Commerce SDK React)
         if: env.IS_NOT_FORK == 'true' && env.IS_MRT_NODE == 'true' && env.DEVELOP == 'true'
         uses: "./.github/actions/push_to_mrt"

e2e/config.js

@@ -102,10 +102,12 @@ module.exports = {
     ],
     "retail-app-private-client": [],
     "retail-react-app-bug-bounty": [],
+    "retail-react-app-demo-site": [],
   },
   PRESET: {
     "retail-app-private-client": "retail-react-app-private-slas-client",
     "retail-react-app-bug-bounty": "retail-react-app-bug-bounty",
+    "retail-react-app-demo-site": "retail-react-app-demo-site-internal"
   },
   EXPECTED_GENERATED_ARTIFACTS: {
     "retail-app-demo": [

e2e/scripts/generate-project.js

@@ -63,7 +63,8 @@ program
             'retail-app-ext',
             'retail-app-no-ext',
             'retail-app-private-client',
-            'retail-react-app-bug-bounty'
+            'retail-react-app-bug-bounty',
+            'retail-react-app-demo-site'
         ]
         if (!validKeys.includes(value)) {
             throw new Error('Invalid project key.')

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

@@ -10,17 +10,32 @@ 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: 'none',
+            site: 'path',
             // Determine where the localeRef is located. Valid values include 'path|query_param|none'. Defaults to: 'none'
-            locale: 'none'
+            locale: 'path',
             // This boolean value dictates whether or not default site or locale values are shown in the url. Defaults to: false
-            // showDefaults: true
+            showDefaults: true,
+            {{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',
+            // This boolean value dictates whether or not default site or locale values are shown in the url. Defaults to: false
+            showDefaults: false,
+            {{/if}}
+            // This boolean value dictates whether the plus sign (+) is interpreted as space for query param string. Defaults to: false
+            interpretPlusSignAsSpace: false
         },
         login: {
             passwordless: {
                 // Enables or disables passwordless login for the site. Defaults to: false
+                {{#if answers.project.demo.enableDemoSettings}}
+                enabled: true,
+                {{else}}
                 enabled: false,
+                {{/if}}
                 // The callback URI, which can be an absolute URL (including third-party URIs) or a relative path set up by the developer.
                 // Required in 'callback' mode; if missing, passwordless login defaults to 'sms' mode, which requires Marketing Cloud configuration.
                 // If the env var `PASSWORDLESS_LOGIN_CALLBACK_URI` is set, it will override the config value.
@@ -31,7 +46,11 @@ module.exports = {
             },
             social: {
                 // Enables or disables social login for the site. Defaults to: false
+                {{#if answers.project.demo.enableDemoSettings}}
+                enabled: true,
+                {{else}}
                 enabled: false,
+                {{/if}}
                 // The third-party identity providers supported by your app. The PWA Kit supports Google and Apple by default.
                 // Additional IDPs will also need to be added to the IDP_CONFIG in the SocialLogin component.
                 idps: ['google', 'apple'],
@@ -51,9 +70,17 @@ module.exports = {
         // The default site for your app. This value will be used when a siteRef could not be determined from the url
         defaultSite: '{{answers.project.commerce.siteId}}',
         // Provide aliases for your sites. These will be used in place of your site id when generating paths throughout the application.
+        {{#if answers.project.demo.enableDemoSettings}}
+        siteAliases: {
+            RefArch: 'us',
+            RefArchGlobal: 'global'
+        },
+        {{else}}
         // siteAliases: {
-        //     RefArch: 'us'
+        //    RefArch: 'us',
+        //    RefArchGlobal: 'global'
         // },
+        {{/if}}
         // The sites for your app, which is imported from sites.js
         sites,
         // Commerce api config

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

@@ -10,6 +10,59 @@
 module.exports = [
     {
         id: '{{answers.project.commerce.siteId}}',
+        {{#if answers.project.demo.enableDemoSettings}}
+        l10n: {
+            supportedCurrencies: ['USD', 'GBP', 'EUR', 'CNY', 'JPY'],
+            defaultCurrency: 'USD',
+            defaultLocale: 'en-US',
+            supportedLocales: [
+                {
+                    id: 'en-US',
+                    preferredCurrency: 'USD'
+                },
+                {
+                    id: 'en-GB',
+                    preferredCurrency: 'GBP'
+                },
+                {
+                    id: 'de-DE',
+                    preferredCurrency: 'EUR'
+                },
+                {
+                    id: 'es-MX',
+                    preferredCurrency: 'MXN'
+                },
+                {
+                    id: 'fr-FR',
+                    preferredCurrency: 'EUR'
+                },
+                {
+                    id: 'it-IT',
+                    preferredCurrency: 'EUR'
+                },
+                {
+                    id: 'ja-JP',
+                    preferredCurrency: 'JPY'
+                },
+                {
+                    id: 'ko-KR',
+                    preferredCurrency: 'KRW'
+                },
+                {
+                    id: 'pt-BR',
+                    preferredCurrency: 'BRL'
+                },
+                {
+                    id: 'zh-CN',
+                    preferredCurrency: 'CNY'
+                },
+                {
+                    id: 'zh-TW',
+                    preferredCurrency: 'TWD'
+                }
+            ]
+        }
+        {{else}}
         l10n: {
             supportedCurrencies: ['USD'],
             defaultCurrency: 'USD',
@@ -22,5 +75,6 @@ module.exports = [
                 }
             ]
         }
+        {{/if}}
     }
 ]

packages/pwa-kit-create-app/assets/bootstrap/js/overrides/app/pages/home/index.jsx.hbs

@@ -82,7 +82,14 @@ const Home = () => {
             />
 
             <Hero
+                {{#if answers.project.demo.enableDemoSettings}}
+                title={intl.formatMessage({
+                    defaultMessage: 'The React PWA Starter Store for Retail',
+                    id: 'home.title.react_starter_store'
+                })}
+                {{else}}
                 title={CUSTOM_HOME_TITLE}
+                {{/if}}
                 img=\{{
                     src: getAssetUrl('static/img/hero.png'),
                     alt: 'npx pwa-kit-create-app'

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

@@ -10,19 +10,32 @@ 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: 'none',
+            site: 'path',
             // Determine where the localeRef is located. Valid values include 'path|query_param|none'. Defaults to: 'none'
-            locale: 'none',
+            locale: 'path',
             // This boolean value dictates whether default site or locale values are shown in the url. Defaults to: false
-            // showDefaults: true,
+            showDefaults: true,
+            {{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',
+            // This boolean value dictates whether or not default site or locale values are shown in the url. Defaults to: false
+            showDefaults: false,
+            {{/if}}
             // This boolean value dictates whether the plus sign (+) is interpreted as space for query param string. Defaults to: false
             interpretPlusSignAsSpace: false
         },
         login: {
             passwordless: {
                 // Enables or disables passwordless login for the site. Defaults to: false
+                {{#if answers.project.demo.enableDemoSettings}}
+                enabled: true,
+                {{else}}
                 enabled: false,
+                {{/if}}
                 // The callback URI, which can be an absolute URL (including third-party URIs) or a relative path set up by the developer.
                 // Required in 'callback' mode; if missing, passwordless login defaults to 'sms' mode, which requires Marketing Cloud configuration.
                 // If the env var `PASSWORDLESS_LOGIN_CALLBACK_URI` is set, it will override the config value.
@@ -33,7 +46,11 @@ module.exports = {
             },
             social: {
                 // Enables or disables social login for the site. Defaults to: false
+                {{#if answers.project.demo.enableDemoSettings}}
+                enabled: true,
+                {{else}}
                 enabled: false,
+                {{/if}}
                 // The third-party identity providers supported by your app. The PWA Kit supports Google and Apple by default.
                 // Additional IDPs will also need to be added to the IDP_CONFIG in the SocialLogin component.
                 idps: ['google', 'apple'],
@@ -53,9 +70,17 @@ module.exports = {
         // The default site for your app. This value will be used when a siteRef could not be determined from the url
         defaultSite: '{{answers.project.commerce.siteId}}',
         // Provide aliases for your sites. These will be used in place of your site id when generating paths throughout the application.
+        {{#if answers.project.demo.enableDemoSettings}}
+        siteAliases: {
+            RefArch: 'us',
+            RefArchGlobal: 'global'
+        },
+        {{else}}
         // siteAliases: {
-        //     RefArch: 'us'
+        //    RefArch: 'us',
+        //    RefArchGlobal: 'global'
         // },
+        {{/if}}
         // The sites for your app, which is imported from sites.js
         sites,
         // Commerce api config