Skip to content

Commit

Permalink
Merge branch 'main' into bugfix/EMP-2427-Set-filters-from-query-preview
Browse files Browse the repository at this point in the history
  • Loading branch information
annacv committed Oct 26, 2023
2 parents 7acbbac + c071f7e commit 108a463
Show file tree
Hide file tree
Showing 58 changed files with 1,408 additions and 4,240 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ jobs:
uses: ./.github/actions/release-alpha
with:
npm_token: ${{ secrets.NPM_TOKEN_GRANULAR_ACCESS }}
github_token: ${{ secrets.SUPPORT_TOKEN }}
github_token: ${{ secrets.SUPPORT_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/prepare-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: create Pull Request
uses: peter-evans/create-pull-request@v5
with:
token: ${{ secrets.SUPPORT_TOKEN }}
token: ${{ github.token }}
commit-message: "chore(release): prepare stable release"
committer: Interface X <[email protected]>
title: Stable release
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
name: Release a new version
on:
pull_request:
types: [ closed ]
branches: [ main ]
on: [workflow_dispatch]
jobs:
release:
if: github.event.pull_request.merged == true && github.head_ref == 'release'
runs-on: ubuntu-latest
container:
image: cypress/browsers:node-18.16.0-chrome-112.0.5615.121-1-ff-112.0.1-edge-112.0.1722.48-1
Expand Down Expand Up @@ -41,7 +37,7 @@ jobs:
- name: configure npm auth
run: |
npm config set registry="https://registry.npmjs.org/"
npm config set _authToken=${NPM_TOKEN}
npm config set //registry.npmjs.org/:_authToken=${NPM_TOKEN}
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN_GRANULAR_ACCESS }}

Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,9 @@ We are working on many key features to consolidate Interface X, including these
- **[Vectorized Recommendations](https://docs.empathy.co/explore-empathy-platform/features/vector-recommendations-overview.html)**:
These recommendations are relevant product suggestions based on query semantic affinities. They
usually show up as product carousels to amaze shoppers with product discovery inspirations.
[![Release Docs](https://img.shields.io/badge/Released-June%202023-brightgreen)](https://docs.empathy.co/explore-empathy-platform/features/vector-recommendations-overview.html)
- **Filtering Strategies**: Added filtering capabilities to History Queries and Brand
Recommendations
[![Release Docs](https://img.shields.io/badge/Released-October%202023-brightgreen)](https://docs.empathy.co/explore-empathy-platform/experience-search-and-discovery/history-queries.html)
- **Suggestions with filters** that allows to select a query suggestion with a specific filter.
![Release Docs](https://img.shields.io/badge/Discovery-Q3%202023-blue)
- **Result Preview component** to rapidly discover more result attributed without leaving the SERP.
Expand Down
88 changes: 25 additions & 63 deletions packages/deep-merge/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,52 +3,51 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.0.0-alpha.3](https://github.com/empathyco/x/compare/@empathyco/[email protected].2...@empathyco/[email protected].0-alpha.3) (2023-09-18)
## [2.0.1-alpha.0](https://github.com/empathyco/x/compare/@empathyco/[email protected].3...@empathyco/[email protected].1-alpha.0) (2023-10-24)

**Note:** Version bump only for package @empathyco/x-deep-merge





## [2.0.0-alpha.2](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2023-06-27)

**Note:** Version bump only for package @empathyco/x-deep-merge

# Change Log

All notable changes to this project will be documented in this file. See
[Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.0.0](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2023-10-23)

**Note:** Version bump only for package @empathyco/x-deep-merge

## [2.0.0-alpha.1](https://github.com/empathyco/x/compare/@empathyco/[email protected].0...@empathyco/[email protected].1) (2023-06-06)
## [2.0.0-alpha.3](https://github.com/empathyco/x/compare/@empathyco/[email protected].2...@empathyco/[email protected].3) (2023-09-18)

**Note:** Version bump only for package @empathyco/x-deep-merge

## [2.0.0-alpha.2](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2023-06-27)

**Note:** Version bump only for package @empathyco/x-deep-merge

## [2.0.0-alpha.1](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2023-06-06)

**Note:** Version bump only for package @empathyco/x-deep-merge

## [2.0.0-alpha.0](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2023-05-11)


### ⚠ BREAKING CHANGES

* **deps:** minimum node version required is 18.
* **deps:** minimum version required is node v18

EMP-274
- **deps:** minimum node version required is 18.
- **deps:** minimum version required is node v18

### Continuous Integration

* parallelize steps (#1174) ([3013595](https://github.com/empathyco/x/commit/3013595857c8dac33f36b2c0d08e747b0735c6a0))
* restore build workflow (#1194) ([076ee49](https://github.com/empathyco/x/commit/076ee492388ba000ebdfa49d9f4356562c8bef19))

- parallelize steps [(#1174)](https://github.com/empathyco/x/pull/1174)
- restore build workflow [(#1194)](https://github.com/empathyco/x/pull/1194)

### Others

* **deps:** update node to 18 (#1196) ([e0e6b35](https://github.com/empathyco/x/commit/e0e6b35eefb3ef83f22e341f662475b0e6066e94))
* **deps:** update node to v18 (#1175) ([14e64e1](https://github.com/empathyco/x/commit/14e64e11fdf7f3d27d59baf56b027857df9e61e7))


- **deps:** update node to 18 [(#1196)](https://github.com/empathyco/x/pull/1196)
- **deps:** update node to v18 [(#1175)](https://github.com/empathyco/x/pull/1175)

## [1.3.0-alpha.34](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2023-04-12)

Expand All @@ -58,42 +57,32 @@ EMP-274

### Bug Fixes

- **deps:** remove `only-allow` pnpm (#1097)
([b2a63d3](https://github.com/empathyco/x/commit/b2a63d308f20804d55a266189ab5d6242f88f6d8)),
closes [EX-8082](https://searchbroker.atlassian.net/browse/EX-8082)
- **deps:** remove `only-allow` pnpm [(#1097)](https://github.com/empathyco/x/pull/1097)

## [1.3.0-alpha.32](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2023-02-08)

### Continuous Integration

- refactor `lint` command to benefit from `nx parallelisation` (#1051)
([1af1503](https://github.com/empathyco/x/commit/1af1503ff118d6232fdbb27e203037a89b1b52e0)),
closes [EX-7926](https://searchbroker.atlassian.net/browse/EX-7926)
- refactor `lint` command to benefit from `nx parallelisation` [(#1051)](https://github.com/empathyco/x/pull/1051)

## [1.3.0-alpha.31](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2023-02-07)

### Continuous Integration

- migrate from `npm` & `lerna bootstrap` to `pnpm` (#1047)
([aaaba4f](https://github.com/empathyco/x/commit/aaaba4f8a5498c16e17ea6daf9c18a1f49918f70)),
closes [EX-7891](https://searchbroker.atlassian.net/browse/EX-7891)
- migrate from `npm` & `lerna bootstrap` to `pnpm` [(#1047)](https://github.com/empathyco/x/pull/1047)

## [1.3.0-alpha.30](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2023-01-25)

### Build System

- **dependencies:** update `typescript` to `4.9.4` and its dependencies to their latest version
(#993)
([500ab57](https://github.com/empathyco/x/commit/500ab57e4729f5c4dcefaa31ed4a8497ddd349b9)),
closes [EX-7288](https://searchbroker.atlassian.net/browse/EX-7288)
[(#993)](https://github.com/empathyco/x/pull/993)

## [1.3.0-alpha.29](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2023-01-23)

### Styling

- update prettier and format code (#1026)
([a18cc17](https://github.com/empathyco/x/commit/a18cc172b6638962d53192905cd466f12bccacac)),
closes [EX-7877](https://searchbroker.atlassian.net/browse/EX-7877)
- update prettier and format code [(#1026)](https://github.com/empathyco/x/pull/1026)

## [1.3.0-alpha.28](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2023-01-20)

Expand All @@ -104,14 +93,12 @@ EMP-274
### Build System

- **deps:** update dependencies
([491f9c5](https://github.com/empathyco/x/commit/491f9c5a27cf5eaa4dc3f31c97ea514bb8f3515b))

## [1.3.0-alpha.26](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2022-12-19)

### Continuous Integration

- use matrix steps and jest projects (#919)
([dec53f5](https://github.com/empathyco/x/commit/dec53f5da572a4a5f3c8519222c1ed94ed981967))
- use matrix steps and jest projects [(#919)](https://github.com/empathyco/x/pull/919)

## [1.3.0-alpha.25](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2022-11-28)

Expand All @@ -121,8 +108,7 @@ EMP-274

### Continuous Integration

- update `runners` version (#740)
([38f246c](https://github.com/empathyco/x/commit/38f246c306dac40c4afbcdea08336052981ca9b8))
- update `runners` version [(#740)](https://github.com/empathyco/x/pull/740)

## [1.3.0-alpha.23](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2022-09-27)

Expand Down Expand Up @@ -201,8 +187,6 @@ EMP-274
### Code Refactoring

- move `isObject` to `x-utils`
([766c08c](https://github.com/empathyco/x/commit/766c08c60fdc3c0411c29c52e473439f0781fc42)),
closes [EX-5791](https://searchbroker.atlassian.net/browse/EX-5791)

## [1.3.0-alpha.4](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2022-03-31)

Expand All @@ -213,38 +197,28 @@ EMP-274
### Features

- update typescript
([73edca6](https://github.com/empathyco/x/commit/73edca61c1cea39d82a7ab94bc18c8bff94c138c)),
closes [EX-5367](https://searchbroker.atlassian.net/browse/EX-5367)

## [1.3.0-alpha.2](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2022-02-28)

### Build System

- Fix colors.js dependency issue
([2ffcc22](https://github.com/empathyco/x/commit/2ffcc222f5666d7866c8d7cd3a0eec7c0bb1f938)),
closes [EX-5293](https://searchbroker.atlassian.net/browse/EX-5293)

## [1.3.0-alpha.1](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2021-11-29)

### Build System

- update jest dependencies
([f3fee15](https://github.com/empathyco/x/commit/f3fee157d724292f5cbb7166908d48ef2fb4fe8c)),
closes [EX-5027](https://searchbroker.atlassian.net/browse/EX-5027)

## [1.3.0-alpha.0](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2021-10-25)

### Features

- **plugin:** minimise initial duplicated requests using a debounce
([3ad1fd4](https://github.com/empathyco/x/commit/3ad1fd4ec949de1f1484919d0165f9e6eaa3d882)),
closes [EX-4718](https://searchbroker.atlassian.net/browse/EX-4718)

### Styling

- add pre-commit hooks to run eslint and prettier
([3acc741](https://github.com/empathyco/x/commit/3acc7419b6ece4d7f353d0d1240677271a344bae)),
closes [EX-4439](https://searchbroker.atlassian.net/browse/EX-4439)

### [1.2.2-alpha.8](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2021-08-05)

Expand All @@ -259,8 +233,6 @@ EMP-274
### Build System

- Update TypeScript to 4.3.5.Update TSLib to 2.3.5.
([4cebdfc](https://github.com/empathyco/x/commit/4cebdfc11e1520552a687def3eda1bf0c132e031)),
closes [EX-4435](https://searchbroker.atlassian.net/browse/EX-4435)

### [1.2.2-alpha.5](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2021-07-29)

Expand All @@ -271,8 +243,6 @@ EMP-274
### Bug Fixes

- **promoted:** fix name export of PromotedsList component
([e29bc52](https://github.com/empathyco/x/commit/e29bc52d0c82ba85dc013882e5d80674a870de2f)),
closes [EX-4484](https://searchbroker.atlassian.net/browse/EX-4484)

### [1.2.2-alpha.3](https://github.com/empathyco/x/compare/@empathyco/[email protected]...@empathyco/[email protected]) (2021-07-27)

Expand All @@ -286,26 +256,18 @@ EMP-274

### Continuous Integration

- Fix publishing in x-components. Normalize build scripts. (#46)
([c3c2f85](https://github.com/empathyco/x/commit/c3c2f8519c0de1b164074e87e68e77ad1af0d702)),
closes [EX-4413](https://searchbroker.atlassian.net/browse/EX-4413)
- Fix publishing in x-components. Normalize build scripts. [(#46)](https://github.com/empathyco/x/pull/46)

### 1.2.2-alpha.0 (2021-07-14)

### Documentation

- add LICENSE and update package.json
([4006a0f](https://github.com/empathyco/x/commit/4006a0f3fa4beb2c2e2ef59533a170c990791f9f)),
closes [EX-3930](https://searchbroker.atlassian.net/browse/EX-3930)

### Build System

- **eslint:** add `@empathyco/eslint-plugin-x` package
([fbdea4f](https://github.com/empathyco/x/commit/fbdea4fa00b541a72fbcba1d6269b8bd9b992b05)),
closes [EX-4211](https://searchbroker.atlassian.net/browse/EX-4211)

### Styling

- add `@empathyco/eslint-plugin-x` to all packages
([e36dc80](https://github.com/empathyco/x/commit/e36dc8022196df4c977045ca2e9a38be17657b83)),
closes [EX-4273](https://searchbroker.atlassian.net/browse/EX-4273)
4 changes: 2 additions & 2 deletions packages/deep-merge/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@empathyco/x-deep-merge",
"version": "2.0.0-alpha.3",
"version": "2.0.1-alpha.0",
"description": "Utility for deep cloning objects.",
"author": "Empathy Systems Corporation S.L.",
"license": "Apache-2.0",
Expand Down Expand Up @@ -38,7 +38,7 @@
"test-unit": "jest"
},
"dependencies": {
"@empathyco/x-utils": "^1.0.0-alpha.23",
"@empathyco/x-utils": "^1.0.1-alpha.0",
"tslib": "~2.5.0"
},
"devDependencies": {
Expand Down
Loading

0 comments on commit 108a463

Please sign in to comment.