Merge branch 'master' into SFINT-5785

coveo · Oct 30, 2024 · 4136cea · 4136cea
2 parents 2ed2b5e + e35d290
commit 4136cea
Show file tree

Hide file tree

Showing 79 changed files with 1,889 additions and 363 deletions.
diff --git a/.github/workflows/prbot.yml b/.github/workflows/prbot.yml
@@ -94,8 +94,8 @@ jobs:
       maximumShards: 24
     outputs:
       testsToRun: ${{ steps.determine-tests.outputs.testsToRun }}
-      shardIndex: ${{ steps.set-matrix.outputs.shardIndex }}
-      shardTotal: ${{ steps.set-matrix.outputs.shardTotal }}
+      shardIndex: ${{ steps.determine-tests.outputs.shardIndex }}
+      shardTotal: ${{ steps.determine-tests.outputs.shardTotal }}
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
         with:
@@ -104,17 +104,16 @@ jobs:
       - run: npm run build
       - name: Identify E2E Test Files to run
         id: determine-tests
-        run: node ./scripts/ci/find-tests.mjs testsToRun
+        run: node ./scripts/ci/determine-tests.mjs testsToRun shardIndex shardTotal
         env:
           projectRoot: ${{ github.workspace }}
-        shell: bash
-      - name: Determine Shard Values
-        id: set-matrix
-        run: node ./scripts/ci/determine-shard.mjs shardIndex shardTotal
-        env:
-          testsToRun: ${{ steps.determine-tests.outputs.testsToRun }}
           maximumShards: ${{ env.maximumShards }}
         shell: bash
+      - name: Log Shard Values for Debugging
+        run: |
+          echo "Shard Index: ${{ steps.determine-tests.outputs.shardIndex }}"
+          echo "Shard Total: ${{ steps.determine-tests.outputs.shardTotal }}"
+        shell: bash
   playwright-atomic:
     name: 'Run Playwright tests for Atomic'
     needs: prepare-playwright-atomic
@@ -123,8 +122,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        shardIndex: ${{fromJson(needs.prepare-playwright-atomic.outputs.shardIndex || '[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24]')}}
-        shardTotal: ${{fromJson(needs.prepare-playwright-atomic.outputs.shardTotal || '[24]')}}
+        shardIndex: ${{ fromJson(needs.prepare-playwright-atomic.outputs.shardIndex) }}
+        shardTotal: ${{ fromJson(needs.prepare-playwright-atomic.outputs.shardTotal) }}
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
       - uses: ./.github/actions/setup

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/atomic-angular/package.json b/packages/atomic-angular/package.json
@@ -20,17 +20,17 @@
     "@angular/platform-browser": "17.3.12",
     "@angular/platform-browser-dynamic": "17.3.12",
     "@angular/router": "17.3.12",
-    "@coveo/atomic": "3.6.2",
+    "@coveo/atomic": "3.7.0",
     "rxjs": "7.8.1"
   },
   "peerDependencies": {
-    "@coveo/headless": "3.4.0"
+    "@coveo/headless": "3.5.0"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "17.3.9",
     "@angular/cli": "17.3.9",
     "@angular/compiler-cli": "17.3.12",
-    "@coveo/headless": "3.4.0",
+    "@coveo/headless": "3.5.0",
     "@types/node": "20.14.12",
     "jasmine-core": "5.2.0",
     "karma": "6.4.3",

diff --git a/packages/atomic-angular/projects/atomic-angular/CHANGELOG.md b/packages/atomic-angular/projects/atomic-angular/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 3.2.0 (2024-10-30)
+
+- feat(atomic): support highlights in atomic-product-description (#4541) ([5c235a8](https://github.com/coveo/ui-kit/commits/5c235a8)), closes [#4541](https://github.com/coveo/ui-kit/issues/4541)
+- fix(atomic-angular): add @Prop decorator to @MapProp props so they are generated in the angular-outp ([dc2faaf](https://github.com/coveo/ui-kit/commits/dc2faaf)), closes [#4548](https://github.com/coveo/ui-kit/issues/4548)
+- chore: promote the v3 branch when publishing on v3 (#4585) ([7b9144d](https://github.com/coveo/ui-kit/commits/7b9144d)), closes [#4585](https://github.com/coveo/ui-kit/issues/4585) [#4584](https://github.com/coveo/ui-kit/issues/4584)
+
 ## 3.1.0 (2024-09-24)
 
 - feat(atomic): add tab support for atomic-generated-answer (#4285) ([744fb61](https://github.com/coveo/ui-kit/commits/744fb61)), closes [#4285](https://github.com/coveo/ui-kit/issues/4285)

diff --git a/packages/atomic-angular/projects/atomic-angular/package.json b/packages/atomic-angular/projects/atomic-angular/package.json
@@ -1,17 +1,17 @@
 {
   "name": "@coveo/atomic-angular",
-  "version": "3.1.10",
+  "version": "3.2.0",
   "license": "Apache-2.0",
   "repository": {
     "url": "https://github.com/coveo/ui-kit"
   },
   "peerDependencies": {
     "@angular/common": "14 - 17",
     "@angular/core": "14 - 17",
-    "@coveo/headless": "3.4.0"
+    "@coveo/headless": "3.5.0"
   },
   "dependencies": {
-    "@coveo/atomic": "3.6.2",
+    "@coveo/atomic": "3.7.0",
     "tslib": "2.6.3"
   },
   "engines": {

diff --git a/...atomic-angular/projects/atomic-angular/src/lib/stencil-generated/atomic-angular.module.ts b/...atomic-angular/projects/atomic-angular/src/lib/stencil-generated/atomic-angular.module.ts
@@ -62,6 +62,7 @@ AtomicPopover,
 AtomicProduct,
 AtomicProductChildren,
 AtomicProductDescription,
+AtomicProductExcerpt,
 AtomicProductFieldCondition,
 AtomicProductImage,
 AtomicProductLink,
@@ -205,6 +206,7 @@ AtomicPopover,
 AtomicProduct,
 AtomicProductChildren,
 AtomicProductDescription,
+AtomicProductExcerpt,
 AtomicProductFieldCondition,
 AtomicProductImage,
 AtomicProductLink,