Skip to content

Commit

Permalink
Merge branch 'CDX-1590' into CDX-1588
Browse files Browse the repository at this point in the history
  • Loading branch information
fpbrault authored Aug 29, 2024
2 parents f3e15b4 + cb2b8f9 commit 5b46262
Show file tree
Hide file tree
Showing 125 changed files with 3,936 additions and 858 deletions.
1 change: 1 addition & 0 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"bloup",
"bpsb",
"btoashim",
"CAPI",
"cfcomment",
"cfpage",
"cfspace",
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/prbot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on:
merge_group:
env:
CYPRESS_VERIFY_TIMEOUT: 60000
concurrency:
group: ci
jobs:
report-size:
if: github.event_name == 'pull_request'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
with:
ref: 'release/v2'
ref: 'release/v3'
- uses: ./.github/actions/setup
- name: Promote NPM package to production
run: npm run promote:npm:latest
Expand All @@ -67,7 +67,7 @@ jobs:
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
with:
ref: 'release/v2'
ref: 'release/v3'
- uses: ./.github/actions/setup
- name: Notify Docs
run: npm run notify:docs
Expand All @@ -84,7 +84,7 @@ jobs:
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
with:
ref: 'release/v2'
ref: 'release/v3'
- uses: ./.github/actions/setup
- uses: ./.github/actions/setup-sfdx
- name: Promote SFDX package to production
Expand Down
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ packages/atomic/src/external-builds/**/*
packages/atomic/src/generated/**
packages/quantic/docs/out/quantic-docs.json
packages/samples/headless-react/build/**/*
packages/samples/angular/src/lang/*.json
packages/samples/angular/src/lang/*.json
packages/samples/vuejs/public/lang/*.json
78 changes: 39 additions & 39 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/atomic-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@
"@angular/platform-browser": "17.3.12",
"@angular/platform-browser-dynamic": "17.3.12",
"@angular/router": "17.3.12",
"@coveo/atomic": "2.77.2",
"@coveo/atomic": "2.78.0",
"rxjs": "7.8.1"
},
"peerDependencies": {
"@coveo/headless": "2.79.0"
"@coveo/headless": "2.80.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "17.3.8",
"@angular/cli": "17.3.8",
"@angular/compiler-cli": "17.3.12",
"@coveo/headless": "2.79.0",
"@coveo/headless": "2.80.0",
"@types/jasmine": "5.1.4",
"@types/node": "20.14.12",
"jasmine-core": "5.2.0",
Expand Down
6 changes: 6 additions & 0 deletions packages/atomic-angular/projects/atomic-angular/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 2.28.0 (2024-08-27)

### Features

- **atomic:** allow user to customize grid card click behavior/links ([#4287](https://github.com/coveo/ui-kit/issues/4287)) ([e5961ca](https://github.com/coveo/ui-kit/commits/e5961ca33490499a2916bb9eb8818d360ff85c18)), closes [#4267](https://github.com/coveo/ui-kit/issues/4267)

## 2.27.1 (2024-08-20)

### Bug Fixes
Expand Down
6 changes: 3 additions & 3 deletions packages/atomic-angular/projects/atomic-angular/package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"name": "@coveo/atomic-angular",
"version": "2.27.2",
"version": "2.28.0",
"license": "Apache-2.0",
"repository": {
"url": "https://github.com/coveo/ui-kit"
},
"peerDependencies": {
"@angular/common": "14 - 17",
"@angular/core": "14 - 17",
"@coveo/headless": "2.79.0"
"@coveo/headless": "2.80.0"
},
"dependencies": {
"@coveo/atomic": "2.77.2",
"@coveo/atomic": "2.78.0",
"tslib": "2.6.3"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ AtomicCommerceFacets,
AtomicCommerceInterface,
AtomicCommerceLoadMoreProducts,
AtomicCommercePager,
AtomicCommerceProductList,
AtomicCommerceProductsPerPage,
AtomicCommerceQuerySummary,
AtomicCommerceRefineModal,
Expand Down Expand Up @@ -128,6 +129,7 @@ AtomicCommerceFacets,
AtomicCommerceInterface,
AtomicCommerceLoadMoreProducts,
AtomicCommercePager,
AtomicCommerceProductList,
AtomicCommerceProductsPerPage,
AtomicCommerceQuerySummary,
AtomicCommerceRefineModal,
Expand Down
Loading

0 comments on commit 5b46262

Please sign in to comment.