Skip to content

Commit

Permalink
Merge branch 'master' into chore/lit-twstyles
Browse files Browse the repository at this point in the history
  • Loading branch information
fpbrault authored Jan 16, 2025
2 parents f7d9ddd + 58a2824 commit 4b1e332
Show file tree
Hide file tree
Showing 17 changed files with 66 additions and 34 deletions.
32 changes: 16 additions & 16 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ui-kit",
"private": true,
"version": "3.0.8",
"version": "3.0.9",
"scripts": {
"postinstall": "husky install && patch-package && npx playwright install",
"reset:install": "git checkout origin/master package-lock.json && npm i",
Expand Down
2 changes: 1 addition & 1 deletion packages/atomic-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@angular/platform-browser": "18.2.13",
"@angular/platform-browser-dynamic": "18.2.13",
"@angular/router": "18.2.13",
"@coveo/atomic": "3.15.0",
"@coveo/atomic": "3.15.1",
"rxjs": "7.8.1"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/atomic-angular/projects/atomic-angular/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coveo/atomic-angular",
"version": "3.3.1",
"version": "3.3.2",
"license": "Apache-2.0",
"repository": {
"url": "https://github.com/coveo/ui-kit"
Expand All @@ -11,7 +11,7 @@
"@coveo/headless": "3.13.2"
},
"dependencies": {
"@coveo/atomic": "3.15.0"
"@coveo/atomic": "3.15.1"
},
"engines": {
"node": "^20.9.0 || ^22.11.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3107,4 +3107,5 @@ export declare interface AtomicTimeframeFacet extends Components.AtomicTimeframe



import type {} from '@coveo/atomic/components';
import type {} from '@coveo/atomic/components';
4 changes: 2 additions & 2 deletions packages/atomic-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@coveo/atomic-react",
"sideEffects": false,
"type": "module",
"version": "3.2.11",
"version": "3.2.12",
"description": "React specific wrapper for the Atomic component library",
"repository": {
"type": "git",
Expand Down Expand Up @@ -30,7 +30,7 @@
"commerce/"
],
"dependencies": {
"@coveo/atomic": "3.15.0",
"@coveo/atomic": "3.15.1",
"@lit/react": "1.0.6",
"lit": "3.2.1"
},
Expand Down
4 changes: 4 additions & 0 deletions packages/atomic/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## <small>3.15.1 (2025-01-15)</small>

- refactor(atomic): split the atomic store into composable parts (#4806) ([de2a920](https://github.com/coveo/ui-kit/commits/de2a920)), closes [#4806](https://github.com/coveo/ui-kit/issues/4806)

## 3.15.0 (2025-01-15)

- chore: relocate dist/components to dist/atomic/components (#4859) ([d854df2](https://github.com/coveo/ui-kit/commits/d854df2)), closes [#4859](https://github.com/coveo/ui-kit/issues/4859)
Expand Down
2 changes: 1 addition & 1 deletion packages/atomic/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@coveo/atomic",
"type": "module",
"version": "3.15.0",
"version": "3.15.1",
"description": "A web-component library for building modern UIs interfacing with the Coveo platform",
"homepage": "https://docs.coveo.com/en/atomic/latest/",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/samples/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@angular/platform-browser": "18.2.13",
"@angular/platform-browser-dynamic": "18.2.13",
"@angular/router": "18.2.13",
"@coveo/atomic-angular": "3.3.1",
"@coveo/atomic-angular": "3.3.2",
"rxjs": "7.8.1",
"zone.js": "0.15.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/samples/atomic-next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"private": true,
"type": "module",
"dependencies": {
"@coveo/atomic": "3.15.0",
"@coveo/atomic-react": "3.2.11",
"@coveo/atomic": "3.15.1",
"@coveo/atomic-react": "3.2.12",
"@coveo/headless": "3.13.2",
"next": "14.2.20",
"react": "18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/samples/atomic-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"build": "nx build"
},
"dependencies": {
"@coveo/atomic-react": "3.2.11",
"@coveo/atomic-react": "3.2.12",
"@coveo/headless": "3.13.2",
"react": "18.3.1",
"react-dom": "18.3.1"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as externalCartAPI from '@/actions/external-cart-api';
import ContextDropdown from '@/components/context-dropdown';
import ProductViewer from '@/components/product-viewer';
import {
RecommendationProvider,
StandaloneProvider,
Expand Down Expand Up @@ -64,7 +65,9 @@ export default async function ProductDescriptionPage({

const resolvedSearchParams = await searchParams;
const price = Number(resolvedSearchParams.price) ?? NaN;
const name = resolvedSearchParams.name ?? params.productId;
const name = Array.isArray(resolvedSearchParams.name)
? params.productId
: (resolvedSearchParams.name ?? params.productId);

return (
<StandaloneProvider
Expand All @@ -74,6 +77,7 @@ export default async function ProductDescriptionPage({
<h2>Product description page</h2>
<ContextDropdown />
<StandaloneSearchBox />
<ProductViewer productId={params.productId} name={name} price={price} />
<p>
{name} ({params.productId}) - ${price}
</p>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
'use client';

import {useProductView} from '@/lib/commerce-engine';
import {useEffect} from 'react';

interface Product {
productId: string;
name: string;
price: number;
}

export default function ProductViewer({productId, name, price}: Product) {
const {methods} = useProductView();
let productViewEventEmitted = false;

useEffect(() => {
if (methods && !productViewEventEmitted) {
methods?.view({productId, name, price});
productViewEventEmitted = true;
}
}, []);

return null;
}
4 changes: 2 additions & 2 deletions packages/samples/iife/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
},
"dependencies": {
"@babel/standalone": "7.26.4",
"@coveo/atomic": "3.15.0",
"@coveo/atomic": "3.15.1",
"@coveo/atomic-hosted-page": "1.0.19",
"@coveo/atomic-react": "3.2.11",
"@coveo/atomic-react": "3.2.12",
"@coveo/headless": "3.13.2",
"react": "18.3.1",
"react-dom": "18.3.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/samples/stencil/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"e2e:watch": "cypress open --browser chrome --e2e"
},
"dependencies": {
"@coveo/atomic": "3.15.0",
"@coveo/atomic": "3.15.1",
"@coveo/bueno": "1.0.7",
"@coveo/headless": "3.13.2",
"@stencil/core": "4.20.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/samples/vuejs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"dependencies": {
"vue": "3.5.13",
"@coveo/atomic": "3.15.0"
"@coveo/atomic": "3.15.1"
},
"devDependencies": {
"@vitejs/plugin-vue": "5.2.1",
Expand Down
3 changes: 1 addition & 2 deletions scripts/deploy/execute-deployment-pipeline.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,4 @@ console.log(execSync(`
--resolve ATOMIC_HOSTED_PAGE_MAJOR_VERSION=${atomicHostedPage.major} \
--resolve ATOMIC_HOSTED_PAGE_MINOR_VERSION=${atomicHostedPage.major}.${atomicHostedPage.minor} \
--resolve ATOMIC_HOSTED_PAGE_PATCH_VERSION=${atomicHostedPage.major}.${atomicHostedPage.minor}.${atomicHostedPage.patch} \
--resolve GITHUB_RUN_ID=${process.env.RUN_ID} \
--changeset ${releaseCommit}`.replaceAll(/\s+/g, ' ').trim()).toString());
--resolve GITHUB_RUN_ID=${process.env.RUN_ID}`.replaceAll(/\s+/g, ' ').trim()).toString());

0 comments on commit 4b1e332

Please sign in to comment.