Merge branch 'master' into louis-bompart/add-atomic-product-multi-val…

…ue-text

.github/actions/merge-playwright-reports/action.yml

@@ -15,7 +15,7 @@ runs:
       shell: bash
 
     - name: Upload HTML report
-      uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4
+      uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4
       with:
         name: atomic-playwright-report
         path: packages/atomic/playwright-report

.github/actions/playwright-atomic-hosted-pages/action.yml

@@ -11,7 +11,7 @@ runs:
       run: npx playwright test
       working-directory: packages/atomic-hosted-page
       shell: bash
-    - uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4
+    - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4
       if: always()
       with:
         name: atomic-hosted-page-playwright-report

.github/actions/playwright-atomic/action.yml

@@ -18,7 +18,7 @@ runs:
       run: npx playwright test --shard=${{ inputs.shardIndex }}/${{ inputs.shardTotal }}
       working-directory: packages/atomic
       shell: bash
-    - uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4
+    - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4
       if: always()
       with:
         name: blob-report-${{ matrix.shardIndex }}

.github/actions/publish-pr-review-site/action.yml

@@ -19,12 +19,29 @@ runs:
         token: ${{inputs.token}}
     - name: 'Setup branch'
       run: |
-        if [[ -z $(git ls-remote --heads origin refs/heads/${{github.event.pull_request.number}} | tr -s '[:blank:]') ]]; then
-          git switch -c "${{github.event.pull_request.number}}"
+        BRANCH_NAME="${{ github.event.pull_request.number }}"
+
+        git fetch origin
+
+        # Check if the branch exists on the remote
+        if git show-ref --verify --quiet "refs/remotes/origin/$BRANCH_NAME"; then
+          echo "Branch $BRANCH_NAME exists remotely. Checking out..."
+          
+          # If the branch exists locally, switch to it; otherwise, create a tracking branch
+          if git show-ref --verify --quiet "refs/heads/$BRANCH_NAME"; then
+            git switch "$BRANCH_NAME"
+          else
+            git switch --track "origin/$BRANCH_NAME"
+          fi
+
+          # Reset the branch to match the latest commit from the main branch
+          git reset --hard origin/main
         else
-          git fetch origin "refs/heads/${{github.event.pull_request.number}}"
-          git switch "${{github.event.pull_request.number}}"
-          git reset --hard main
+          echo "Branch $BRANCH_NAME does not exist remotely. Creating a new branch..."
+          
+          # Create a new branch locally and push it to the remote
+          git switch -c "$BRANCH_NAME"
+          git push -u origin "$BRANCH_NAME"
         fi
       working-directory: prs
       shell: bash

.github/workflows/prbot.yml

@@ -117,7 +117,7 @@ jobs:
           app-id: ${{ secrets.GH_APP_ID }}
           private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
           owner: coveo
-          repo: ui-kit-prs
+          repositories: 'ui-kit-prs'
       - uses: ./.github/actions/publish-pr-review-site
         if: ${{ always() && github.event_name == 'pull_request'}}
         with:
@@ -334,6 +334,7 @@ jobs:
       - 'build'
       - 'lint-check'
       - 'unit-test'
+      - 'playwright-atomic'
       - 'playwright-atomic-hosted-page-test'
       - 'e2e-atomic-test'
       - 'e2e-atomic-csp-test'
@@ -368,6 +369,7 @@ jobs:
       - 'build'
       - 'lint-check'
       - 'unit-test'
+      - 'playwright-atomic'
       - 'playwright-atomic-hosted-page-test'
       - 'e2e-atomic-test'
       - 'e2e-atomic-screenshots'

.prettierrc.js

@@ -5,7 +5,10 @@ const decoratorPlugin = JSON.stringify([
 
 /** @type {import('prettier').Config} */
 module.exports = {
-  plugins: ['@trivago/prettier-plugin-sort-imports'],
+  plugins: [
+    '@trivago/prettier-plugin-sort-imports',
+    'prettier-plugin-tailwindcss',
+  ],
   bracketSpacing: false,
   singleQuote: true,
   trailingComma: 'es5',