SalesforceCommerceCloud
diff --git a/‎.github/actions/e2e_generate_app/action.yml‎
Lines changed: 10 additions & 0 deletions b/‎.github/actions/e2e_generate_app/action.yml‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎.github/actions/generate_app/action.yml‎
Lines changed: 18 additions & 6 deletions b/‎.github/actions/generate_app/action.yml‎
Lines changed: 18 additions & 6 deletions
diff --git a/‎.github/actions/push_to_mrt/action.yml‎
Lines changed: 8 additions & 2 deletions b/‎.github/actions/push_to_mrt/action.yml‎
Lines changed: 8 additions & 2 deletions
diff --git a/‎.github/workflows/agent_checkout_rebase_action.yml‎
Lines changed: 97 additions & 0 deletions b/‎.github/workflows/agent_checkout_rebase_action.yml‎
Lines changed: 97 additions & 0 deletions
diff --git a/‎.github/workflows/bundle-size.yml‎
Lines changed: 35 additions & 0 deletions b/‎.github/workflows/bundle-size.yml‎
Lines changed: 35 additions & 0 deletions
diff --git a/‎.github/workflows/deploy_latest_release.yml‎
Lines changed: 8 additions & 4 deletions b/‎.github/workflows/deploy_latest_release.yml‎
Lines changed: 8 additions & 4 deletions
diff --git a/‎.github/workflows/e2e-pr.yml‎
Lines changed: 2 additions & 1 deletion b/‎.github/workflows/e2e-pr.yml‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎.github/workflows/e2e.yml‎
Lines changed: 6 additions & 3 deletions b/‎.github/workflows/e2e.yml‎
Lines changed: 6 additions & 3 deletions
@@ -10,14 +10,24 @@ inputs:
     required: false
     type: string
 
+outputs:
+  project_path:
+    description: Path to the generated project directory
+    value: ${{ steps.generate_project.outputs.project_path }}
+
 runs:
   using: composite
   steps:
   - name: Generate new project based on project-key
+    id: generate_project
     run: |
       COMMAND="node e2e/scripts/generate-project.js --project-key ${{ inputs.PROJECT_KEY }}"
       if [[ -n "${{ inputs.TEMPLATE_VERSION }}" ]]; then
         COMMAND="$COMMAND --templateVersion ${{ inputs.TEMPLATE_VERSION }}"
       fi
       $COMMAND
+
+      # Return path to the generated project
+      GENERATED_PROJECTS_DIR=$(node -e "console.log(require('./e2e/config.js').GENERATED_PROJECTS_DIR)")
+      echo "project_path=$GENERATED_PROJECTS_DIR/${{ inputs.PROJECT_KEY }}" >> $GITHUB_OUTPUT
     shell: bash
@@ -22,6 +22,11 @@ inputs:
   project_dir:
     description: Project Directory
 
+outputs:
+  project_path:
+    description: Path to the generated project directory
+    value: ${{ steps.generate_project.outputs.project_path }}
+
 runs:
   using: composite
   steps:
@@ -31,20 +36,20 @@ runs:
       run: |
         use_extensibility_input="${{ inputs.use_extensibility }}"
         if [ "use_extensibility_input" = "true" ]; then
-         use_extensibility_value=2
-        else
          use_extensibility_value=1
+        else
+         use_extensibility_value=2
         fi
-        echo "USE_EXTENSIBILITY_VALUE=$use_extensibility_value" >> $GITHUB_ENV 
-        
+        echo "USE_EXTENSIBILITY_VALUE=$use_extensibility_value" >> $GITHUB_ENV
+
         is_private_client_input="${{ inputs.is_private_client }}"
         if [ "$is_private_client_input" = "true" ]; then
          is_private_client_value=1
         else
           is_private_client_value=2
         fi
         echo "IS_PRIVATE_CLIENT_VALUE=$is_private_client_value" >> $GITHUB_ENV
-        
+
         setup_hybrid_input="${{ inputs.setup_hybrid }}"
         if [ "$setup_hybrid_input" = "true" ]; then
           setup_hybrid_value=2
@@ -53,6 +58,8 @@ runs:
         fi
         echo "SETUP_HYBRID_VALUE=$setup_hybrid_value" >> $GITHUB_ENV
 
+    # TODO: update this to use the standard input feature that Ben created recently
+    # TODO: this action does not finish successfully because of a dirty-workspace error, due to creating this generator-responses.json
     - name: Build project generator inputs
       id: build_generator_inputs
       shell: bash
@@ -107,11 +114,16 @@ runs:
       run: |
         cat generator-responses.json
         node e2e/scripts/generate-project.js --project-config "$(jq -c . generator-responses.json)"
+
+        # Return path to the generated project
+        GENERATED_PROJECTS_DIR=$(node -e "console.log(require('./e2e/config.js').GENERATED_PROJECTS_DIR)")
+        echo "project_path=$GENERATED_PROJECTS_DIR/${{ inputs.project_dir }}" >> $GITHUB_OUTPUT
       shell: bash
 
+    # TODO: I think we can safely delete this step. We already install the dependencies in the previous step.
     - name: Build generated project
       id: build_generated_project
-      working-directory: ../generated-projects/${{ inputs.project_dir }}
+      working-directory: ${{ steps.generate_project.outputs.project_path }}
       run: |-
         npm ci
         npm run build
 
@@ -6,20 +6,26 @@ inputs:
   TARGET:
     description: MRT target environment
   FLAGS:
-    description: Push 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 -- -s ${{ inputs.PROJECT }} --message "${{ inputs.MESSAGE }}" --target ${{ inputs.TARGET }} ${{ inputs.FLAGS }}
+          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
@@ -0,0 +1,97 @@
+# .github/workflows/rebase-express-payments.yml
+
+name: 'Auto Rebase adyenExpressPayments'
+
+# This action will trigger on the creation of new preview release tags
+on:
+  push:
+    tags:
+      - '*-preview'
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  rebase:
+    name: Rebase adyenExpressPayments on preview release
+    runs-on: ubuntu-latest
+
+    steps:
+      # Step 1: Check out the repository's code.
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # Fetches all history for all branches and tags
+
+      # Step 2: Set up the Node.js environment to use npm and npx.
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22' # Or your project's specific Node.js version
+          cache: 'npm' # Caches npm dependencies for faster runs
+
+      # Step 3: Configure Git with a user name and email.
+      - name: Set up Git
+        run: |
+          git config --global user.name 'GitHub Actions'
+          git config --global user.email 'actions@github.com'
+
+      # 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
+        run: |
+          find . -name "package-lock.json" -type f -delete
+          # We must commit this change so the rebase can proceed cleanly.
+          # 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 and regenerating after"
+          else
+            echo "No package-lock.json files found to delete."
+          fi
+
+      # 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: |
+          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
+          fi
+
+      # Step 7: Install dependencies after a successful rebase.
+      # The '--yes' flag for lerna is crucial for non-interactive environments.
+      - name: Install Dependencies
+        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 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
+        if: failure()
+        uses: slackapi/slack-github-action@v1.26.0
+        with:
+          # 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 `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 }}'
@@ -0,0 +1,35 @@
+# WARNING! Conditionals are set as variables to minimize repetitive checks.
+# However, this results in the variables being the *string* values "true" or "false".
+# As a result, you must always explicitly check for those strings. For example,
+# ${{ env.DEVELOP }} will ALWAYS evaluate as true; to achieve the expected result
+# you must check ${{ env.DEVELOP == 'true' }}. There's probably a better way to DRY,
+# but this is what we have for now.
+
+name: SalesforceCommerceCloud/pwa-kit/bundle-size
+on:
+  pull_request: # Default: opened, reopened, synchronize (head branch updated)
+  merge_group: # Trigger GA workflow when a pull request is added to a merge queue.
+  push:
+    branches:
+      - develop
+      - 'release-*'
+
+jobs:
+  pwa-kit-bundle-size:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22 # Use latest LTS version for bundle size check
+          cache: npm
+
+      - name: Setup Ubuntu Machine
+        uses: "./.github/actions/setup_ubuntu"
+
+      - name: Run bundlesize test
+        uses: "./.github/actions/bundle_size_test"
+
@@ -13,15 +13,15 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       IS_LATEST_RELEASE: ${{ steps.checkRelease.outputs.IS_LATEST_RELEASE }}
-    steps:  
+    steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Check if latest release
         uses: ./.github/actions/check_if_latest_release
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-      
+
       - name: Update Github Outputs
         id: checkRelease
         run: |-
@@ -45,13 +45,15 @@ jobs:
             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
+            cloud_origin: https://cloud-testing.mobify-staging.com
+            flags: --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
+            cloud_origin: https://cloud.mobify.com
             flags: --wait
     steps:
       - name: Checkout
@@ -70,6 +72,7 @@ jobs:
           node ./scripts/gtime.js monorepo_install npm ci
 
       - name: Generate Retail App Demo
+        id: generate_app
         uses: ./.github/actions/e2e_generate_app
         with:
           PROJECT_KEY: ${{ matrix.environment.project_key }}
@@ -94,8 +97,9 @@ jobs:
       - name: Push Bundle to MRT (${{matrix.environment.name}})
         uses: "./.github/actions/push_to_mrt"
         with:
-          CWD: "../generated-projects/${{ matrix.environment.project_key }}"
+          CWD: ${{ steps.generate_app.outputs.project_path }}
           TARGET: ${{ matrix.environment.target }}
           PROJECT: ${{ matrix.environment.project }}
           MESSAGE: ${{ env.BUNDLE_NAME }})
+          CLOUD_ORIGIN: ${{ matrix.environment.cloud_origin }}
           FLAGS: ${{ matrix.environment.flags }}
@@ -64,6 +64,7 @@ jobs:
                   echo "retail_app_template_version=$version" >> "$GITHUB_ENV"
 
             - name: Generate Retail App Private Client
+              id: generate_app
               if: ${{ env.SKIP_WORKFLOW != 'true' }}
               uses: ./.github/actions/e2e_generate_app
               with:
@@ -89,7 +90,7 @@ jobs:
               if: ${{ env.SKIP_WORKFLOW != 'true' }}
               uses: './.github/actions/push_to_mrt'
               with:
-                  CWD: '../generated-projects/retail-app-no-ext'
+                  CWD: ${{ steps.generate_app.outputs.project_path }}
                   # TODO: Use the MRT target ID from the target lock step above.
                   TARGET: e2e-tests-pwa-kit
                   FLAGS: --wait
 
@@ -114,6 +114,7 @@ jobs:
           echo "retail_app_template_version=$version" >> "$GITHUB_ENV"
 
       - name: Generate Retail App Without Extensibility
+        id: generate_app_no_ext
         uses: ./.github/actions/e2e_generate_app
         with:
           PROJECT_KEY: "retail-app-no-ext"
@@ -134,7 +135,7 @@ jobs:
       - name: Push Bundle to MRT (E2E Test PWA Kit)
         uses: "./.github/actions/push_to_mrt"
         with:
-          CWD: "../generated-projects/retail-app-no-ext"
+          CWD: ${{ steps.generate_app_no_ext.outputs.project_path }}
           TARGET: e2e-tests-pwa-kit
           FLAGS: --wait
 
@@ -231,6 +232,7 @@ jobs:
           echo "retail_app_template_version=$version" >> "$GITHUB_ENV"
 
       - name: Generate Retail App With Extensibility
+        id: generate_app_ext
         uses: ./.github/actions/e2e_generate_app
         with:
           PROJECT_KEY: "retail-app-ext"
@@ -251,7 +253,7 @@ jobs:
       - name: Push Bundle to MRT (E2E Test PWA Kit)
         uses: "./.github/actions/push_to_mrt"
         with:
-          CWD: "../generated-projects/retail-app-ext"
+          CWD: ${{ steps.generate_app_ext.outputs.project_path }}
           TARGET: e2e-tests-pwa-kit
           FLAGS: --wait
 
@@ -346,6 +348,7 @@ jobs:
           echo "retail_app_template_version=$version" >> "$GITHUB_ENV"
 
       - name: Generate Retail App Private Client
+        id: generate_app_private_client
         uses: ./.github/actions/e2e_generate_app
         with:
           PROJECT_KEY: "retail-app-private-client"
@@ -366,7 +369,7 @@ jobs:
       - name: Push Bundle to MRT
         uses: "./.github/actions/push_to_mrt"
         with:
-          CWD: "../generated-projects/retail-app-private-client"
+          CWD: ${{ steps.generate_app_private_client.outputs.project_path }}
           TARGET: e2e-pwa-kit-private
           FLAGS: --wait