WIP

Author: vcua-mobify

.github/actions/check_if_latest_release/action.yml

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

.github/workflows/deploy_latest_release.yml

@@ -20,7 +20,49 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
-  deploy-bug-bounty:
+  # Re-enable this when the PR is ready to be merged
+  # deploy-bug-bounty:
+  #   if: env.IS_LATEST_RELEASE == 'true'
+  #   needs: check-latest-release
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v4
+
+  #     - name: Setup node
+  #       id: setup_node
+  #       uses: actions/setup-node@v4
+  #       with:
+  #         node-version: 22
+  #         cache: "npm"
+
+  #     - name: Install Monorepo Dependencies
+  #       run: |-
+  #         # Install node dependencies
+  #         node ./scripts/gtime.js monorepo_install npm ci
+
+  #     - name: Generate Retail App Demo
+  #       uses: ./.github/actions/e2e_generate_app
+  #       with:
+  #         PROJECT_KEY: "retail-react-app-bug-bounty"
+
+  #     - 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 }}
+
+  #     - name: Push Bundle to MRT (Bug Bounty)
+  #       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
+
+  deploy-demo-site:
+    if: env.IS_LATEST_RELEASE == 'true'
     needs: check-latest-release
     runs-on: ubuntu-latest
     steps:
@@ -42,19 +84,19 @@ jobs:
       - name: Generate Retail App Demo
         uses: ./.github/actions/e2e_generate_app
         with:
-          PROJECT_KEY: "retail-react-app-bug-bounty"
+          PROJECT_KEY: "retail-react-app-demo-site"
 
       - 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.MOBIFY_CLIENT_USER }}
+          mobify_api_key: ${{ secrets.MOBIFY_CLIENT_API_KEY }}
 
-      - name: Push Bundle to MRT (Bug Bounty)
+      - name: Push Bundle to MRT (Demo Site)
         uses: "./.github/actions/push_to_mrt"
         with:
-          CWD: "../generated-projects/retail-react-app-bug-bounty"
-          TARGET: testing
-          PROJECT: pwa-kit
+          CWD: "../generated-projects/retail-react-app-demo-site"
+          TARGET: production
+          PROJECT: scaffold-pwa
           MESSAGE: "tag ${{ github.event.release.tag_name }}"
-          FLAGS: --cloud-origin https://cloud-testing.mobify-staging.com -c ~/.mobify --wait
+          FLAGS: --wait

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-private"
   },
   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/scripts/create-mobify-app.js

@@ -270,6 +270,37 @@ const PRESETS = [
         assets: ['translations'],
         private: false
     },
+    {
+        id: 'retail-react-app-demo-private',
+        name: 'Retail React App Demo Private Client',
+        description: `
+            Generates a project using the settings for a special B2C Commerce
+            instance that is used for demo purposes and sets it up with a private SLAS client.
+
+            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',
+        templateSource: {
+            type: TEMPLATE_SOURCE_NPM,
+            id: '@salesforce/retail-react-app'
+        },
+        questions: [...EXTENSIBILITY_QUESTIONS, ...RETAIL_REACT_APP_QUESTIONS],
+        answers: {
+            ['project.extend']: true,
+            ['project.hybrid']: false,
+            ['project.name']: 'demo-storefront',
+            ['project.commerce.instanceUrl']: 'https://zzte-053.dx.commercecloud.salesforce.com',
+            ['project.commerce.clientId']: '',
+            ['project.commerce.siteId']: 'RefArch',
+            ['project.commerce.organizationId']: 'f_ecom_zzte_053',
+            ['project.commerce.shortCode']: 'kv7kzm78',
+            ['project.commerce.isSlasPrivate']: false,
+            ['project.einstein.clientId']: '1ea06c6e-c936-4324-bcf0-fada93f83bb1',
+            ['project.einstein.siteId']: 'aaij-MobileFirst'
+        },
+        assets: ['translations'],
+        private: true
+    },
     {
         id: 'retail-react-app-test-project',
         name: 'Retail React App Test Project',