[App Extensibility ⚙️] Merge develop into feature branch WIP

.github/actions/changelog-check/action.yml

@@ -1,9 +1,6 @@
 name: 'Changelog Check'
 description: 'Check if changelog is updated for the changed packages'
 inputs:
-  github_token:
-    description: 'GitHub token'
-    required: true
   pr_number:
     description: 'Pull request number'
     required: true
@@ -16,39 +13,26 @@ runs:
       with:
         fetch-depth: 0  # Fetch full history to access all commits
 
-    - name: Get Base Branch SHA
-      id: get_base_sha
+    - name: Determine Base SHA and Merge Base
+      id: determine_base
       run: |
-        if [ -n "${{ inputs.pr_number }}" ]; then
-          BASE_SHA=$(curl -s -H "Authorization: token ${{ inputs.github_token }}" \
-            "https://api.github.com/repos/${{ github.repository }}/pulls/${{ inputs.pr_number }}" | \
-            jq -r '.base.sha')
+        if [ -n "${{ github.event.pull_request.base.sha }}" ]; then
+          BASE_SHA="${{ github.event.pull_request.base.sha }}"
+          MERGE_BASE=$(git merge-base $BASE_SHA ${{ github.sha }})
+          echo "BASE_SHA=$BASE_SHA" >> $GITHUB_ENV
+          echo "MERGE_BASE=$MERGE_BASE" >> $GITHUB_ENV
         else
-          echo "Not running in a PR context. Skipping changelog check."
-          echo "SKIP_CHANGELOG_CHECK=true" >> $GITHUB_ENV
-        fi
-
-        if [ -z "$BASE_SHA" ] || [ "$BASE_SHA" == "null" ]; then
-          echo "Unable to fetch base SHA or no base SHA available. Skipping changelog check."
+          echo "Not running in a PR context or unable to determine base SHA. Skipping changelog check."
           echo "SKIP_CHANGELOG_CHECK=true" >> $GITHUB_ENV
-        else
-          echo "BASE_SHA=${BASE_SHA}" >> $GITHUB_ENV
         fi
       shell: bash
 
-    - name: Find merge base
-      id: find_merge_base
+    - name: Check if 'skip changelog' label is present
+      id: check_labels
       run: |
-        if [ -n "${{ env.BASE_SHA }}" ] && [ "${{ env.BASE_SHA }}" != "null" ]; then
-            MERGE_BASE=$(git merge-base ${{ env.BASE_SHA }} ${{ github.sha }})
-            if [ -z "$MERGE_BASE" ]; then
-              echo "Unable to find merge base. Skipping changelog check."
-              echo "SKIP_CHANGELOG_CHECK=true" >> $GITHUB_ENV
-            else
-              echo "MERGE_BASE=${MERGE_BASE}" >> $GITHUB_ENV
-            fi
-        else
-          echo "Unable to make the merge base calculation due to missing or null BASE_SHA. Skipping changelog check."
+        SKIP_CHANGELOG_LABEL="${{ contains(github.event.pull_request.labels.*.name, 'skip changelog') }}"
+        if [ "$SKIP_CHANGELOG_LABEL" = "true" ]; then
+          echo "Skip changelog label is present. Skipping changelog check."
           echo "SKIP_CHANGELOG_CHECK=true" >> $GITHUB_ENV
         fi
       shell: bash
@@ -58,20 +42,7 @@ runs:
         echo "Base SHA: ${{ env.BASE_SHA }}"
         echo "Current SHA: ${{ github.sha }}"
         echo "Merge Base: ${{ env.MERGE_BASE }}"
-      shell: bash
-
-    - name: Fetch PR labels and check for skip changelog
-      id: fetch_and_check_labels
-      run: |
-        PR_LABELS=$(curl -s -H "Authorization: token ${{ inputs.github_token }}" \
-          "https://api.github.com/repos/${{ github.repository }}/issues/${{ inputs.pr_number }}/labels" | \
-          jq -r '.[].name | @sh' | tr '\n' ' ')
-        echo "PR_LABELS=${PR_LABELS}" >> $GITHUB_ENV
-
-        if echo "${PR_LABELS}" | grep -q "'skip changelog'"; then
-          echo "Skip changelog label is present. Skipping changelog check."
-          echo "SKIP_CHANGELOG_CHECK=true" >> $GITHUB_ENV
-        fi
+        echo "SKIP_CHANGELOG_CHECK: ${{ env.SKIP_CHANGELOG_CHECK }}"
       shell: bash
 
     - name: Check if changelog is updated
@@ -87,7 +58,7 @@ runs:
         PUBLIC_PACKAGES=("commerce-sdk-react" "pwa-kit-create-app" "pwa-kit-dev" "pwa-kit-react-sdk" "pwa-kit-runtime" "template-retail-react-app")
 
         for PACKAGE in "${PUBLIC_PACKAGES[@]}"; do
-          if echo "$CHANGED_FILES" | grep -i "^packages/$PACKAGE/"; then
+          if echo "$CHANGED_FILES" | grep -iq "^packages/$PACKAGE/"; then
             if ! echo "$CHANGED_FILES" | grep -iq "^packages/$PACKAGE/CHANGELOG.md"; then
               echo "CHANGELOG.md was not updated for package $PACKAGE. Please update the CHANGELOG.md or add 'skip changelog' label to the PR."
               exit 1

.github/actions/create_mrt_target/action.yml

@@ -0,0 +1,108 @@
+name: create_mrt_target
+description: Create MRT Environment
+inputs:
+  project_id:
+    description: "MRT Project ID"
+  target_id:
+    description: "MRT Target ID"
+  proxy_configs:
+    description: "Proxy Configs"
+  mobify_api_key:
+    description: "Mobify user API key"
+
+runs:
+  using: composite
+  steps:
+    - name: Initialize
+      id: initialize
+      shell: bash
+      run: |
+        set -e
+        echo "TARGET_API_BASE_URL=https://cloud.mobify.com/api/projects/${{ inputs.project_id }}/target" >> $GITHUB_ENV
+
+    - name: Get target
+      id: get_target
+      shell: bash
+      run: |-
+        set -e
+        response=$(curl --location --silent --show-error --write-out "HTTPSTATUS:%{http_code}" "$TARGET_API_BASE_URL/${{ inputs.target_id }}" \
+            --header "Authorization: Bearer ${{ inputs.mobify_api_key }}")
+
+        http_status=$(echo $response | tr -d '\n' | sed -e 's/.*HTTPSTATUS://')
+        echo "status=$http_status" >> $GITHUB_OUTPUT
+
+        if [ "$http_status" -eq 404  ]; then
+          echo "MRT environment not found, it will be created in the next step."
+        elif [ "$http_status" -eq 200  ]; then
+          echo "MRT environment already exists."
+        else
+          echo "Error: Unexpected HTTP status: $http_status"
+          exit 1
+        fi
+
+    - name: Create target
+      id: create_target
+      if: ${{ steps.get_target.outputs.status == '404' }}
+      shell: bash
+      run: |-
+        set -e
+        proxy_config_json=$(echo ${{ inputs.proxy_configs }} | jq -r .)
+        response=$(curl --location --silent --show-error --write-out "HTTPSTATUS:%{http_code}" "$TARGET_API_BASE_URL/" \
+          --header "Authorization: Bearer ${{ inputs.mobify_api_key }}" \
+          --header "Content-Type: application/json" \
+          --data "$(jq -n \
+            --arg name "${{ inputs.target_id }}" \
+            --arg slug "${{ inputs.target_id }}" \
+            --argjson ssr_proxy_configs "$proxy_config_json" \
+            '{name: $name, slug: $slug, ssr_proxy_configs: $ssr_proxy_configs}')")
+
+        http_status=$(echo "$response" | sed -n 's/.*HTTPSTATUS://p')
+        response_body=$(echo "$response" | sed -e 's/HTTPSTATUS:.*//g')
+
+        echo "status=$http_status" >> $GITHUB_OUTPUT
+
+        if [ "$http_status" -ne 201 ]; then
+          echo "Request failed with status code $http_status"
+          echo "Response Body: $response_body"
+          exit 1
+        fi
+
+    - name: Wait for target to be active
+      id: wait_for_target
+      if: ${{ steps.create_target.outputs.status == '201' }}
+      shell: bash
+      run: |-
+        set -e
+        max_attempts=30
+        sleep_duration=30
+        attempts=0
+
+        while [ $attempts -lt $max_attempts ]; do
+          response=$(curl --location --silent --show-error --write-out "HTTPSTATUS:%{http_code}" "$TARGET_API_BASE_URL/${{ inputs.target_id }}" \
+            --header "Authorization: Bearer ${{ inputs.mobify_api_key }}")
+
+          http_status=$(echo $response | tr -d '\n' | sed -e 's/.*HTTPSTATUS://')
+          response_body=$(echo $response | sed -e 's/HTTPSTATUS\:.*//g')
+
+          if [ "$http_status" -ne 200 ]; then
+            echo "Request failed with status code $http_status"
+            exit 1
+          fi
+
+          current_state=$(echo $response_body | jq -r '.state')
+
+          if [ "$current_state" == "ACTIVE" ]; then
+            echo "Target is now ACTIVE."
+            exit 0
+          elif [ "$current_state" != "CREATE_IN_PROGRESS" ]; then
+            echo "Unexpected target state: $current_state."
+            exit 1
+          fi
+
+          attempts=$((attempts + 1))
+          echo "Waiting for target to be ACTIVE. Attempt $attempts/$max_attempts."
+          sleep $sleep_duration
+        done
+
+        echo "Target did not become active within the expected time."
+        exit 1

.github/actions/deploy_app/action.yml

@@ -0,0 +1,50 @@
+name: deploy_app
+description: Deploy application to MRT
+inputs:
+  project_id:
+    description: MRT Project ID
+  target_id:
+    description: MRT Target ID
+  project_dir:
+    description: Project Directory
+  mobify_user:
+    description: "Mobify user email"
+  mobify_api_key:
+    description: "Mobify user API key"
+runs:
+  using: composite
+  steps:
+    - name: Create MRT credentials file
+      id: create_mrt_credentials
+      uses: "./.github/actions/create_mrt"
+      with:
+        mobify_user: ${{ inputs.mobify_user }}
+        mobify_api_key: ${{ inputs.mobify_api_key }}
+
+    - name: Read application config
+      id: read_config
+      shell: bash
+      run: |
+        # Read proxy configs from the default config file using Node.js
+        config=$(node -e "console.log(JSON.stringify(require('${{ inputs.project_dir }}/config/default.js')))")
+        # Extract proxyConfigs as a JSON string
+        echo "proxy_configs=$(echo "$config" | jq -c '.ssrParameters.proxyConfigs' | jq @json)" >> $GITHUB_OUTPUT
+
+
+    - name: Create MRT target
+      id: create_mrt_target
+      uses: "./.github/actions/create_mrt_target"
+      with:
+        project_id: ${{ inputs.project_id }}
+        target_id: ${{ inputs.target_id }}
+        proxy_configs: ${{ steps.read_config.outputs.proxy_configs }}
+        mobify_api_key: ${{ inputs.mobify_api_key }}
+
+
+    - name: Push bundle to MRT
+      id: push_bundle
+      uses: "./.github/actions/push_to_mrt"
+      with:
+        CWD: ${{ inputs.project_dir }}
+        TARGET: ${{ inputs.target_id }}
+        FLAGS: --wait

.github/actions/e2e_generate_app/action.yml

@@ -8,5 +8,5 @@ runs:
   using: composite
   steps:
   - name: Generate new project based on project-key
-    run: node e2e/scripts/generate-project.js ${{ inputs.PROJECT_KEY }}
+    run: node e2e/scripts/generate-project.js --project-key ${{ inputs.PROJECT_KEY }}
     shell: bash

.github/actions/generate_app/action.yml

@@ -0,0 +1,118 @@
+name: generate_app
+description: Generate Application
+inputs:
+  use_extensibility:
+    description: Use Extensibility?
+  project_id:
+    description: Project ID
+  instance_url:
+    description: Instance Url
+  org_id:
+    description: Org Id
+  short_code:
+    description: Short Code
+  client_id:
+    description: Client Id
+  site_id:
+    description: Site Id
+  is_private_client:
+    description: Is Private Client?
+  setup_hybrid:
+    description: Setup Phased Headless rollout?
+  project_dir:
+    description: Project Directory
+
+runs:
+  using: composite
+  steps:
+    - name: Parse input values
+      id: parse_input
+      shell: bash
+      run: |
+        use_extensibility_input="${{ inputs.use_extensibility }}"
+        if [ "use_extensibility_input" = "true" ]; then
+         use_extensibility_value=2
+        else
+         use_extensibility_value=1
+        fi
+        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
+        else
+          setup_hybrid_value=1
+        fi
+        echo "SETUP_HYBRID_VALUE=$setup_hybrid_value" >> $GITHUB_ENV
+
+    - name: Build project generator inputs
+      id: build_generator_inputs
+      shell: bash
+      run: |
+        echo '{
+         "projectDir":"${{ inputs.project_dir }}",
+         "responses": [
+            {
+              "expectedPrompt": "Choose a project preset to get started:",
+              "response": "1\n"
+            },
+            {
+              "expectedPrompt": "Do you wish to use template extensibility?",
+              "response": "${{ env.USE_EXTENSIBILITY_VALUE }}\n"
+            },
+            {
+              "expectedPrompt": "What is the name of your Project?",
+              "response": "${{ inputs.project_id }}\n"
+            },
+            {
+              "expectedPrompt": "What is the URL for your Commerce Cloud instance?",
+              "response": "${{ inputs.instance_url }}\n"
+            },
+            {
+              "expectedPrompt": "What is your SLAS Client ID?",
+              "response": "${{ inputs.client_id }}\n"
+            },
+            {
+              "expectedPrompt": "Is your SLAS client private?",
+              "response":"${{ env.IS_PRIVATE_CLIENT_VALUE }}\n"
+            },
+            {
+              "expectedPrompt": "What is your Site ID in Business Manager?",
+              "response": "${{ inputs.site_id }}\n"
+            },
+            {
+              "expectedPrompt": "What is your Commerce API organization ID in Business Manager?",
+              "response": "${{ inputs.org_id }}\n"
+            },
+            {
+              "expectedPrompt": "What is your Commerce API short code in Business Manager?",
+              "response": "${{ inputs.short_code }}\n"
+            },
+            {
+              "expectedPrompt": "Do you wish to set up a phased headless rollout?",
+              "response": "${{ env.SETUP_HYBRID_VALUE }}\n"
+            }
+        ] }' > generator-responses.json
+
+    - name: Generate project
+      id: generate_project
+      run: |
+        cat generator-responses.json
+        node e2e/scripts/generate-project.js --project-config "$(jq -c . generator-responses.json)"
+      shell: bash
+
+    - name: Build generated project
+      id: build_generated_project
+      working-directory: ../generated-projects/${{ inputs.project_dir }}
+      run: |-
+        npm ci
+        npm run build
+      shell: bash