@W-19330454@ - Release PWA Kit 3.12.0-preview.3 (#3229)

* bump versions and update changelogs

* Add breaking label to multi-ship changelog entry

* snyc to -preview.2

* @W-19442561 - Fix Incorrectly Disabled Continue to Shipping Method Button for Multiship (#3199)

* @W-19443375,@W-19350149 MULTISHIP fix address function mismatch and options promotions (#3203)

* @W-19451314 - Add ShipmentId to Create Shipment Body (#3211)

* @W-19349040 MULTISHIP fix form default delivery option selection (#3217)

* @ W-19450629  feat: remove quantity selector from shipping methods preview cart in multi-ship (#3216)

* remove quantity selector from shipping methods preview cart in multi ship

* update change log

---------

Signed-off-by: sf-henry-semaganda <henry.semaganda@salesforce.com>

* Fix non-extensible template to use correct passwordless login callback uri (#3222)

* Check if monorepo is a dev version before publishing to npm (#3210)

* Check if monorepo is a dev version before publishing to npm

* Check env.IS_DEV_VERSION

* test step

* test

* Apply suggestion

* More test

* test

* test

* test

* use if block

* test

* test

* use quiet mode

* test

* test

* test

* test

* test

* test

* test

* Try this regex that's perhaps more compatible

* Re-enable other steps and clean up verification step

---------

Co-authored-by: Vincent Marta <vmarta@salesforce.com>

* Merge pull request #3204 from SalesforceCommerceCloud/bugfix/pin-testing-library-version

@W-19443536 - [Bugfix] Fix unit test failures in generated projects

* Fix: Don't pass `code_challenge` if its undefined in `getPasswordResetToken` (#3228)

* add fix

* make code challenge optional

* lint

---------

Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com>

* @W-19364221 - Handle Removal of Last Address for Registered (#3231)

* Gracefully handle when some config.app.* properties are missing (@W-19453183@) (#3230)

* Don't assume that config.app.* properties exist

* Don't assume that config.app.* properties exist

* Add todos

* Use the default config for Commerce Agent when necessary

* Debugging

* Move utils file to somewhere more upgradable and extensible

* No longer need these .hbs files

* Sync the corresponding .hbs files

* Fix import path

* Fix require path so it can work inside monorepo

* Refactor to make it easier to get commerce agent config

* Fix module error

Turns out that I can't mix both esm and commonjs ways.

* Sync the eslint comments

* Remove commented out code

* Update CHANGELOG.md

---------

Signed-off-by: Vincent Marta <vmarta@salesforce.com>
Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com>

* @W-19364130 feat: fix shipping costs summary mode pricing (#3240)

* fix shipping costs sumary mode

* update change log

* add clear annotation

* add test coverage

* update basket too

* update

* bump versions to -preview.3

* Merge pull request #3214 from SalesforceCommerceCloud/restore-per-pr-e2e

Restore e2e-PR workflow

* Fix e2e-pr after incorrect merge resolution

* preview.3 not preview-3

---------

Signed-off-by: sf-henry-semaganda <henry.semaganda@salesforce.com>
Signed-off-by: Vincent Marta <vmarta@salesforce.com>
Co-authored-by: shauryemahajanSF <143645277+shauryemahajanSF@users.noreply.github.com>
Co-authored-by: patricksullivansf <100441292+patricksullivansf@users.noreply.github.com>
Co-authored-by: sf-henry-semaganda <henry.semaganda@salesforce.com>
Co-authored-by: Vincent Marta <vmarta@salesforce.com>
Co-authored-by: Jainam Sheth <99490559+shethj@users.noreply.github.com>
Co-authored-by: Joel Uong <88680517+joeluong-sfcc@users.noreply.github.com>

Author: 7 people

.github/actions/count_deps/action.yml

@@ -1,12 +1,16 @@
 name: count_deps
+inputs:
+  project_dir:
+    description: 'Path to the project directory'
+    required: true
 runs:
   using: composite
   steps:
   - name: Count Generated Project Dependencies
     # TODO: Can TOTAL_PACKAGES be exported in a cleaner way?
     run: |-
       MAX_PACKAGES="2260"
-      total=$(./scripts/count-dependencies.js generated-${{ matrix.template }})
+      total=$(./scripts/count-dependencies.js "${{ inputs.project_dir }}")
       echo "TOTAL_PACKAGES=${total}" >> $GITHUB_ENV
 
       if [ "$total" -gt "$MAX_PACKAGES" ]; then

.github/actions/e2e_validate_generated_app/action.yml

@@ -14,10 +14,21 @@ runs:
   steps:
   - name: Validate generated project
     run: |
-      set -e
-      COMMAND="node e2e/scripts/validate-generated-project.js ${{ inputs.PROJECT_KEY }}"
+      set -euo pipefail
+      
+      COMMAND=(node e2e/scripts/validate-generated-project.js "${{ inputs.PROJECT_KEY }}")
+      
       if [[ -n "${{ inputs.TEMPLATE_VERSION }}" ]]; then
-        COMMAND="$COMMAND --templateVersion ${{ inputs.TEMPLATE_VERSION }}"
+        COMMAND+=(--templateVersion "${{ inputs.TEMPLATE_VERSION }}")
       fi
-      $COMMAND
+      
+      echo "Executing command: ${COMMAND[*]}"
+      
+      if ! "${COMMAND[@]}"; then
+        echo "❌ Node.js validation script failed with exit code $?"
+        echo "::error::Validation of generated project failed"
+        exit 1
+      fi
+      
+      echo "✅ Project validation completed successfully"
     shell: bash

.github/workflows/e2e-pr.yml

@@ -76,9 +76,6 @@ jobs:
               if: ${{ env.SKIP_WORKFLOW != 'true' }}
               run: |-
                   jq -r 'to_entries[] | "\(.key)=\(.value // "")"' e2e/mrt-target/mrt-target-details.json >> "$GITHUB_OUTPUT"
-                  # Set the RETAIL_APP_HOME environment variable to the MRT target URL.
-                  # This is used by the e2e tests to run the tests against the MRT target.
-                  echo "RETAIL_APP_HOME=${{ steps.mrt_target_details.outputs.envURL }}" >> "$GITHUB_ENV"
 
               # Engage post-run cleanup via a Node action that has a post hook.
               # - The action defines `runs.post` so its post step runs at the
@@ -178,4 +175,8 @@ jobs:
             - name: Run Playwright tests
               if: ${{ env.SKIP_WORKFLOW != 'true' }}
               run: |
-                  npx playwright test --project=chromium --project=mobile-chrome --project=a11y-mobile --project=a11y-desktop --workers=4
+                  # Set the RETAIL_APP_HOME environment variable to the MRT target URL.
+                  # This is used by the e2e tests to run the tests against the MRT target.
+                  export RETAIL_APP_HOME="https://${{ steps.mrt_target_details.outputs.ssrExternalHostname }}"
+                  echo "RETAIL_APP_HOME environment variable value: $RETAIL_APP_HOME"
+                  npx playwright test --project=chromium --project=mobile-chrome --project=a11y-mobile-slas-private-client --project=a11y-desktop-slas-private-client --workers=4

.github/workflows/e2e.yml

@@ -266,7 +266,7 @@ jobs:
 
       - name: Run a11y test for Node 22 with npm 11
         if: env.IS_MRT_NODE == 'true'
-        run: npm run test:e2e:a11y
+        run: npm run test:e2e:a11y:slas-public-client
 
   notify-slack-pwa-ext:
     needs: [run-generator-retail-app-ext]

.github/workflows/test.yml

@@ -87,8 +87,6 @@ jobs:
       - name: Run unit tests
         uses: "./.github/actions/unit_tests"
 
-
-
       - name: Smoke test scripts
         if: env.IS_DEFAULT_NPM == 'true'
         uses: "./.github/actions/smoke_tests"
@@ -119,8 +117,20 @@ jobs:
         if: env.IS_NOT_FORK == 'true' && env.IS_DEFAULT_NPM == 'true'
         uses: "./.github/actions/check_clean"
 
+      - name: Check if monorepo version is a dev version
+        run: |-
+          version=`jq -r ".version" package.json`
+          echo "The monorepo version is $version"
+          if echo "$version" | grep -Eiq "[0-9]-dev(\.|$)"; then
+            echo "Dev version detected."
+            echo "IS_DEV_VERSION=true" >> "$GITHUB_ENV"
+          else
+            echo "Monorepo is not on a dev version."
+            echo "IS_DEV_VERSION=false" >> "$GITHUB_ENV"
+          fi
+
       - name: Publish to NPM
-        if: env.IS_NOT_FORK == 'true' && env.IS_MRT_NODE == 'true' && env.RELEASE == 'true'
+        if: env.IS_NOT_FORK == 'true' && env.IS_MRT_NODE == 'true' && env.RELEASE == 'true' && env.IS_DEV_VERSION == 'false'
         uses: "./.github/actions/publish_to_npm"
         with:
           NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }}
@@ -188,7 +198,6 @@ jobs:
     runs-on: ubuntu-latest
     env:
       IS_TEMPLATE_FROM_RETAIL_REACT_APP: ${{ matrix.template == 'retail-react-app-test-project' || matrix.template == 'retail-react-app-demo' }}
-      PROJECT_DIR: generated-${{ matrix.template }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -201,31 +210,39 @@ jobs:
       - name: Setup Ubuntu Machine
         uses: "./.github/actions/setup_ubuntu"
 
+      - name: Set project directory with generated projects path
+        run: |
+          GENERATED_PROJECTS_DIR=$(node -e "console.log(require('./e2e/config.js').GENERATED_PROJECTS_DIR)")
+          echo "PATH_TO_PROJECT_DIR=$GENERATED_PROJECTS_DIR/generated-${{ matrix.template }}" >> $GITHUB_ENV
+
+      - name: Create generated-projects directory
+        run: mkdir -p "$(dirname "${{ env.PATH_TO_PROJECT_DIR }}")"
+
       - name: Generate ${{ matrix.template }} project
         run: |-
-          node packages/pwa-kit-create-app/scripts/create-mobify-app-dev.js --outputDir ${{ env.PROJECT_DIR }}
+          node packages/pwa-kit-create-app/scripts/create-mobify-app-dev.js --outputDir "${{ env.PATH_TO_PROJECT_DIR }}"
         env:
           GENERATOR_PRESET: ${{ matrix.template }}
         timeout-minutes: 8
 
-
-
       - name: Run unit tests
         if: env.IS_TEMPLATE_FROM_RETAIL_REACT_APP == 'true'
         uses: "./.github/actions/unit_tests"
         with:
-          cwd: ${{ env.PROJECT_DIR }}
+          cwd: ${{ env.PATH_TO_PROJECT_DIR }}
 
       - name: Run smoke tests
         if: env.IS_TEMPLATE_FROM_RETAIL_REACT_APP == 'true'
         uses: "./.github/actions/smoke_tests"
         with:
-          dir: ${{ env.PROJECT_DIR }}
+          dir: ${{ env.PATH_TO_PROJECT_DIR }}
 
       - name: Count Generated Project Dependencies
         id: count_deps
         if: env.IS_TEMPLATE_FROM_RETAIL_REACT_APP == 'true'
         uses: "./.github/actions/count_deps"
+        with:
+          project_dir: ${{ env.PATH_TO_PROJECT_DIR }}
 
       - name: Store Verdaccio logfile artifact
         uses: actions/upload-artifact@v4
@@ -260,7 +277,7 @@ jobs:
         if: env.IS_NOT_FORK == 'true' && env.DEVELOP == 'true' && matrix.template == 'retail-react-app-test-project'
         uses: "./.github/actions/push_to_mrt"
         with:
-          CWD: ${{ env.PROJECT_DIR }}
+          CWD: ${{ env.PATH_TO_PROJECT_DIR }}
           TARGET: generated-pwa
 
       - name: Send GitHub Action data to Slack workflow (Generated)
@@ -283,7 +300,6 @@ jobs:
     runs-on: windows-latest
     env:
       IS_TEMPLATE_FROM_RETAIL_REACT_APP: ${{ matrix.template == 'retail-react-app-test-project' || matrix.template == 'retail-react-app-demo' }}
-      PROJECT_DIR: generated-${{ matrix.template }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -296,30 +312,40 @@ jobs:
       - name: Setup Windows Machine
         uses: "./.github/actions/setup_windows"
 
+      - name: Set project directory with generated projects path
+        run: |
+          GENERATED_PROJECTS_DIR=$(node -e "console.log(require('./e2e/config.js').GENERATED_PROJECTS_DIR)")
+          echo "PATH_TO_PROJECT_DIR=$GENERATED_PROJECTS_DIR/generated-${{ matrix.template }}" >> $GITHUB_ENV
+        shell: bash
+
+      - name: Create generated-projects directory
+        run: mkdir -p "$(dirname "${{ env.PATH_TO_PROJECT_DIR }}")"
+        shell: bash
+
       - name: Generate ${{ matrix.template }} project
         run: |-
-          node packages/pwa-kit-create-app/scripts/create-mobify-app-dev.js --outputDir ${{ env.PROJECT_DIR }}
+          node packages/pwa-kit-create-app/scripts/create-mobify-app-dev.js --outputDir "${{ env.PATH_TO_PROJECT_DIR }}"
         env:
           GENERATOR_PRESET: ${{ matrix.template }}
         timeout-minutes: 7
 
-
-
       - name: Run unit tests
         if: env.IS_TEMPLATE_FROM_RETAIL_REACT_APP == 'true'
         uses: "./.github/actions/unit_tests"
         with:
-          cwd: ${{ env.PROJECT_DIR }}
+          cwd: ${{ env.PATH_TO_PROJECT_DIR }}
 
       - name: Run smoke tests
         if: env.IS_TEMPLATE_FROM_RETAIL_REACT_APP == 'true'
         uses: "./.github/actions/smoke_tests"
         with:
-          dir: ${{ env.PROJECT_DIR }}
+          dir: ${{ env.PATH_TO_PROJECT_DIR }}
 
       - name: Count Generated Project Dependencies
         if: env.IS_TEMPLATE_FROM_RETAIL_REACT_APP == 'true'
         uses: "./.github/actions/count_deps"
+        with:
+          project_dir: ${{ env.PATH_TO_PROJECT_DIR }}
 
       - name: Store Verdaccio logfile artifact
         uses: actions/upload-artifact@v4

e2e/config.js

@@ -34,7 +34,7 @@ module.exports = {
             },
             {
                 expectedPrompt: /Do you wish to use template extensibility?/i,
-                response: '2\n'
+                response: '1\n'
             },
             {
                 expectedPrompt: /What is the name of your Project?/i,
@@ -72,7 +72,7 @@ module.exports = {
             },
             {
                 expectedPrompt: /Do you wish to use template extensibility?/i,
-                response: '1\n'
+                response: '2\n'
             },
             {
                 expectedPrompt: /What is the name of your Project?/i,