Merging latest in develop into the feature branch

.github/actions/e2e_acquire_mrt_target/action.yml

@@ -0,0 +1,36 @@
+name: e2e_acquire_mrt_target
+description: Acquire MRT Target from pool of available targets in the MRT staging org.
+inputs:
+    BRANCH:
+        description: 'GitHub branch name from workflow invoking this action'
+        required: false
+    RUN_ID:
+        description: 'GitHub workflow run ID from workflow invoking this action'
+        required: true
+    PR_NUMBER:
+        description: 'GitHub PR number from workflow invoking this action'
+        required: false
+    MAX_RETRIES:
+        description: 'Maximum retry attempts to acquire MRT target'
+        required: false
+        default: '3'
+    RETRY_DELAY:
+        description: 'Delay between retries in milliseconds'
+        required: false
+        default: '10000'
+
+runs:
+    using: composite
+    steps:
+        - name: Acquire MRT Target
+          id: acquire_mrt_target
+          shell: bash
+          run: |-
+              set -e
+              cmd="node e2e/scripts/mrt-target-manager.js acquire --run-id ${{inputs.RUN_ID}} --max-retries ${{inputs.MAX_RETRIES}} --retry-delay ${{inputs.RETRY_DELAY}}"
+              if [ -n "${{inputs.PR_NUMBER}}" ]; then
+                cmd="$cmd --pr-number ${{inputs.PR_NUMBER}}"
+              elif [ -n "${{inputs.BRANCH}}" ]; then
+                cmd="$cmd --branch ${{inputs.BRANCH}}"
+              fi
+              eval $cmd

.github/actions/e2e_release_mrt_target/action.yml

@@ -0,0 +1,20 @@
+name: e2e_release_mrt_target
+description: Release MRT Target back to pool of available targets in the MRT staging org.
+inputs:
+    SLUG:
+        description: 'MRT target slug'
+        required: true
+    MAX_RETRIES:
+        description: 'Maximum retry attempts to release MRT target'
+        required: false
+        default: '3'
+    RETRY_DELAY:
+        description: 'Delay between retries in milliseconds'
+        required: false
+        default: '10000'
+
+runs:
+    using: node20 # Only 'node12', 'node16', 'node20' or 'node24' are supported.
+    main: dist/main.js
+    post: dist/post.js
+    post-if: always()

.github/actions/e2e_release_mrt_target/dist/main.js

@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2025, Salesforce, 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
+ */
+
+/**
+ * @file main.js
+ * @description Arms the post-release cleanup for MRT targets in CI. 
+ *
+ * Intentionally empty. This file just needs to exist. Post step will read INPUT_DETAILS_FILE and perform release.
+ * 
+ * Why:
+ * - GitHub Actions post steps execute even when a job fails or is manually cancelled,
+ *   providing best-effort cleanup of leased resources.
+ * - Keeping the actual release in post.js avoids releasing too early while the job
+ *   is still running and centralizes all teardown logic at job end.
+ *
+ * See also:
+ * - post.js (performs the actual release using the saved inputs)
+ */

.github/actions/e2e_release_mrt_target/dist/post.js

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2025, Salesforce, 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
+ */
+
+/**
+ * @file post.js
+ * @description Performs the actual release of the MRT target back to the pool of available targets in the MRT staging org.
+ * This step is executed even when a job fails or is manually cancelled, providing best-effort cleanup of leased resources.
+ * This step is executed after the main step in the workflow.
+ */
+const fs = require('fs')
+const path = require('path')
+const {spawnSync} = require('child_process')
+const config = require('../../../../e2e/config.js')
+
+;(async () => {
+    try {
+        const workspace = process.env.GITHUB_WORKSPACE || process.cwd()
+        const detailsFile = config.MRT_TARGET_DETAILS_FILE
+        const absDetails = path.resolve(workspace, detailsFile)
+        console.log(`Reading MRT target details from ${absDetails}`)
+        if (!fs.existsSync(absDetails)) {
+            console.log(`No details file at ${absDetails}. Skipping release.`)
+            return
+        }
+
+        const details = JSON.parse(fs.readFileSync(absDetails, 'utf8'))
+        console.log(`Details: ${JSON.stringify(details)}`)
+        const slug = details && details.slug
+        if (!slug) {
+            console.log('No slug found in details file. Skipping release.')
+            return
+        }
+
+        const cli = path.resolve(workspace, 'e2e/scripts/mrt-target-manager.js')
+        console.log(`Releasing MRT target: ${slug}`)
+        const res = spawnSync('node', [cli, 'release', slug], {stdio: 'inherit', cwd: workspace})
+
+        if (res.status !== 0) {
+            console.log(`Release exited with status ${res.status}.`)
+        }
+    } catch (e) {
+        console.log(`Release step error: ${e.message}`)
+    }
+})()

.github/actions/e2e_validate_generated_app/action.yml

@@ -14,6 +14,7 @@ runs:
   steps:
   - name: Validate generated project
     run: |
+      set -e
       COMMAND="node e2e/scripts/validate-generated-project.js ${{ inputs.PROJECT_KEY }}"
       if [[ -n "${{ inputs.TEMPLATE_VERSION }}" ]]; then
         COMMAND="$COMMAND --templateVersion ${{ inputs.TEMPLATE_VERSION }}"

.github/actions/push_to_mrt/action.yml

@@ -1,31 +1,31 @@
 name: push_to_mrt
 inputs:
-  CWD:
-    description: Project directory
-    default: ${{ github.workspace }}
-  TARGET:
-    description: MRT target environment
-  FLAGS:
-    description: The rest of the flags for the push command
-  PROJECT:
-    description: MRT target project
-    default: "scaffold-pwa"
-  MESSAGE:
-    description: Bundle message / name
-    default: "build ${{ github.run_id }} on ${{ github.ref }} (${{ github.sha }})"
-  CLOUD_ORIGIN:
-    description: 'MRT Cloud origin'
-    default: 'https://cloud.mobify.com'
-  CREDENTIALS_FILE_PATH:
-    description: 'Path to the credentials file'
-    default: '~/.mobify'
+    CWD:
+        description: Project directory
+        default: ${{ github.workspace }}
+    TARGET:
+        description: MRT target environment
+    FLAGS:
+        description: The rest of the flags for the push command
+    PROJECT:
+        description: MRT target project
+        default: 'scaffold-pwa'
+    MESSAGE:
+        description: Bundle message / name
+        default: 'build ${{ github.run_id }} on ${{ github.ref }} (${{ github.sha }})'
+    CLOUD_ORIGIN:
+        description: MRT Cloud origin
+        default: 'https://cloud.mobify.com'
+    CREDENTIALS_FILE_PATH:
+        description: 'Path to the credentials file'
+        default: '~/.mobify'
 runs:
-  using: composite
-  steps:
-    - name: Push Bundle to MRT
-      run: |-
-        cd ${{ inputs.CWD }}
-        if [[ ${{ inputs.TARGET }} ]]; then
-          npm run push -- --projectSlug ${{ inputs.PROJECT }} --message "${{ inputs.MESSAGE }}" --target ${{ inputs.TARGET }} --cloud-origin ${{ inputs.CLOUD_ORIGIN }} --credentialsFile ${{ inputs.CREDENTIALS_FILE_PATH }} ${{ inputs.FLAGS }}
-        fi
-      shell: bash
+    using: composite
+    steps:
+        - name: Push Bundle to MRT
+          run: |-
+              cd ${{ inputs.CWD }}
+              if [[ ${{ inputs.TARGET }} ]]; then
+                npm run push -- --projectSlug ${{ inputs.PROJECT }} --message "${{ inputs.MESSAGE }}" --target ${{ inputs.TARGET }} --cloud-origin ${{ inputs.CLOUD_ORIGIN }} --credentialsFile ${{ inputs.CREDENTIALS_FILE_PATH }} ${{ inputs.FLAGS }}
+              fi
+          shell: bash

.github/actions/update_mrt_target/action.yml

@@ -0,0 +1,63 @@
+name: update_mrt_target
+description: Update a MRT target environment. This endpoint automatically re-deploys the current bundle if any of the SSR-related properties are changed.
+inputs:
+    PROJECT_SLUG:
+        description: 'MRT Project slug'
+        required: true
+    TARGET_SLUG:
+        description: 'MRT Target slug'
+        required: true
+    MOBIFY_API_KEY:
+        description: 'Mobify API key'
+        required: true
+    CLOUD_ORIGIN:
+        description: 'MRT Cloud origin'
+        required: false
+        default: 'https://cloud.mobify.com'
+    MRT_TARGET_SETTINGS_FILE_PATH:
+        description: 'Path to .env file containing MRT target environment settings'
+        required: false
+    MRT_TARGET_VARS_FILE_PATH:
+        description: 'Path to .env file containing environment variables to be set on the MRT target environment'
+        required: false
+
+runs:
+    using: composite
+    steps:
+        - name: Update MRT Target Settings
+          id: update_mrt_target_settings
+          if: ${{ inputs.MRT_TARGET_SETTINGS_FILE_PATH != '' }}
+          shell: bash
+          run: |-
+              set -e
+
+              # Build arguments for the Node.js script
+              ARGS=(
+                  "--project-slug" "${{ inputs.PROJECT_SLUG }}"
+                  "--target-slug" "${{ inputs.TARGET_SLUG }}"
+                  "--mobify-api-key" "${{ inputs.MOBIFY_API_KEY }}"
+                  "--cloud-origin" "${{ inputs.CLOUD_ORIGIN }}"
+                  "--env-file" "${{ inputs.MRT_TARGET_SETTINGS_FILE_PATH }}"
+              )
+
+              # Run the Node.js script
+              node e2e/scripts/update-mrt-target.js target "${ARGS[@]}"
+
+        - name: Update MRT Target Environment Variables
+          id: update_mrt_target_env_vars
+          if: ${{ inputs.MRT_TARGET_VARS_FILE_PATH != '' }}
+          shell: bash
+          run: |-
+              set -e
+
+              # Build arguments for the Node.js script
+              ARGS=(
+                  "--project-slug" "${{ inputs.PROJECT_SLUG }}"
+                  "--target-slug" "${{ inputs.TARGET_SLUG }}"
+                  "--mobify-api-key" "${{ inputs.MOBIFY_API_KEY }}"
+                  "--env-file" "${{ inputs.MRT_TARGET_VARS_FILE_PATH }}"
+                  "--cloud-origin" "${{ inputs.CLOUD_ORIGIN }}"
+              )
+
+              # Run the Node.js script
+              node e2e/scripts/update-mrt-target.js env-var "${ARGS[@]}"

.github/workflows/agent_checkout_rebase_action.yml

@@ -1,17 +1,20 @@
 # .github/workflows/rebase-express-payments.yml
 
-name: 'Auto Rebase adyenExpressPaymentsDreamForceTestAlertBranch'
+name: 'Auto Rebase adyenExpressPayments'
 
-# This action will trigger on every push to the develop branch.
+# This action will trigger on the creation of new preview release tags
 on:
   push:
-    branches:
-      - develop
+    tags:
+      - '*-preview'
   workflow_dispatch:
 
+permissions:
+  contents: write
+
 jobs:
   rebase:
-    name: Rebase adyenExpressPaymentsDreamForceTestAlertBranch on develop
+    name: Rebase adyenExpressPayments on preview release
     runs-on: ubuntu-latest
 
     steps:
@@ -34,9 +37,9 @@ jobs:
           git config --global user.name 'GitHub Actions'
           git config --global user.email 'actions@github.com'
 
-      # Step 4: Switch to the adyenExpressPaymentsDreamForceTestAlertBranch branch.
-      - name: Switch to adyenExpressPaymentsDreamForceTestAlertBranch branch
-        run: git checkout adyenExpressPaymentsDreamForceTestAlertBranch 
+      # Step 4: Switch to the adyenExpressPayments branch.
+      - name: Switch to adyenExpressPayments branch
+        run: git checkout adyenExpressPayments 
 
       # Step 5: Delete all package-lock.json files before the rebase.
       - name: Delete package-lock.json files
@@ -46,15 +49,19 @@ jobs:
           # The 'if' statement prevents an error if no lock files were found.
           if [[ -n $(git status -s) ]]; then
             git add .
-            git commit -m "chore: remove package-lock.json files before rebase"
+            git commit -m "chore: remove package-lock.json files before rebase and regenerating after"
           else
             echo "No package-lock.json files found to delete."
           fi
 
-      # Step 6: Attempt to rebase the branch. The job will fail if this step fails.
-      - name: Rebase adyenExpressPaymentsDreamForceTestAlertBranch with develop
+      # Step 6: Attempt to rebase the branch. If this step fails, we abort the rebase and 
+      # return the branch to its original state
+      - name: Rebase adyenExpressPayments with develop
         run: |
-          if ! git rebase origin/develop; then
+          TRIGGERING_TAG="${{ github.ref_name }}"
+          echo "🔄 Rebasing branch 'adyenExpressPayments' onto tag '$TRIGGERING_TAG'"
+
+          if ! git rebase $TRIGGERING_TAG; then
             echo "Rebase failed due to conflicts. Aborting."
             git rebase --abort
             exit 1
@@ -63,11 +70,18 @@ jobs:
       # Step 7: Install dependencies after a successful rebase.
       # The '--yes' flag for lerna is crucial for non-interactive environments.
       - name: Install Dependencies
-        run: npx lerna clean --yes && npm i
+        run: |
+          if ! npx lerna clean --yes && npm i; then
+            echo "Generating package-lock files after rebase failed!"
+            exit 1
+          fi
 
       # Step 8: Push the changes only if all previous steps were successful.
       - name: Push Changes
-        run: git push origin adyenExpressPaymentsDreamForceTestAlertBranch --force-with-lease
+        run: |
+          git add .
+          git commit --amend --no-edit
+          git push origin adyenExpressPayments --force-with-lease
 
       # Step 9: This notification step will run if any of the above steps fail.
       - name: Notify on Failure
@@ -77,8 +91,7 @@ jobs:
           # The channel or user ID to send the notification to.
           channel-id: '${{ secrets.AGENT_CHECKOUT_ALERT_SLACK_CHANNEL_ID }}'
           # A custom message for the Slack notification.
-          slack-message: "🚨 Automatic rebase of `adyenExpressPaymentsDreamForceTestAlertBranch` failed. Manual intervention is required. Link to failed action: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          slack-message: "🚨 Automatic rebase of `adyenExpressPayments` failed. Manual intervention is required. Link to failed action: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
         env:
           # You must store your Slack Bot Token as a secret in your repository settings.
           SLACK_BOT_TOKEN: '${{ secrets.AGENT_CHECKOUT_SLACK_BOT_TOKEN }}'
-          # Forcing a re-index