From ba52aaa09f385f180c8515cd56555670abac7962 Mon Sep 17 00:00:00 2001 From: Nidhi Manu Date: Fri, 8 Dec 2023 08:54:50 -0500 Subject: [PATCH 1/4] Prepare v2.4.0 --- THIRD-PARTY-NOTICES | 4 ++-- package-lock.json | 34 +++++++++++++++++----------------- package.json | 4 ++-- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/THIRD-PARTY-NOTICES b/THIRD-PARTY-NOTICES index 287435e..c36fb37 100644 --- a/THIRD-PARTY-NOTICES +++ b/THIRD-PARTY-NOTICES @@ -62,7 +62,7 @@ SOFTWARE. The following NPM package may be included in this product: - - @yext/search-core@2.5.0-beta.3 + - @yext/search-core@2.5.0 This package contains the following license and notice below: @@ -106,7 +106,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. The following NPM package may be included in this product: - - @yext/search-headless@2.5.0-beta.3 + - @yext/search-headless@2.5.0 This package contains the following license and notice below: diff --git a/package-lock.json b/package-lock.json index 75d93c6..58c36cd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "@yext/search-headless-react", - "version": "2.4.0-beta.3", + "version": "2.4.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@yext/search-headless-react", - "version": "2.4.0-beta.3", + "version": "2.4.0", "license": "BSD-3-Clause", "dependencies": { - "@yext/search-headless": "^2.5.0-beta.3", + "@yext/search-headless": "^2.5.0", "use-sync-external-store": "^1.1.0" }, "devDependencies": { @@ -4312,9 +4312,9 @@ } }, "node_modules/@yext/search-core": { - "version": "2.5.0-beta.3", - "resolved": "https://registry.npmjs.org/@yext/search-core/-/search-core-2.5.0-beta.3.tgz", - "integrity": "sha512-CvdNZa8g+FsnQKbEfwa6niYpSvTJJb6U0ikaztYMxC6yGAFDaJxq47fJamwOal0vM0JbvvEZMZy4r++ysD+NtA==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@yext/search-core/-/search-core-2.5.0.tgz", + "integrity": "sha512-fxbrGkV3hNpjCDMAydGTOksGy2vNx59bP874D5QnaFiwxVT75zX+DIWd4yCMiJnctjerqJQdLmFwZy5NWdJTXw==", "dependencies": { "@babel/runtime-corejs3": "^7.12.5", "cross-fetch": "^3.1.5" @@ -4324,12 +4324,12 @@ } }, "node_modules/@yext/search-headless": { - "version": "2.5.0-beta.3", - "resolved": "https://registry.npmjs.org/@yext/search-headless/-/search-headless-2.5.0-beta.3.tgz", - "integrity": "sha512-TXzqMe65mM9mMWVJsfzXlrLr58S2r8CcqL0XyyarkSMqPbI7j9CzdCZyV1avNP1Sx0DJqnA/WNJZ72qXdKoEzw==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@yext/search-headless/-/search-headless-2.5.0.tgz", + "integrity": "sha512-Ii2dDHxaD0sKrmqbmZt3VEWBIk+U2/p7e0LufruoScRUWtOtD1ASh7QBNjR6okGMVqsfdFWrFxQ7x5QRDxLccA==", "dependencies": { "@reduxjs/toolkit": "^1.8.1", - "@yext/search-core": "^2.5.0-beta.3", + "@yext/search-core": "^2.5.0", "js-levenshtein": "^1.1.6", "lodash": "^4.17.21" } @@ -16215,21 +16215,21 @@ } }, "@yext/search-core": { - "version": "2.5.0-beta.3", - "resolved": "https://registry.npmjs.org/@yext/search-core/-/search-core-2.5.0-beta.3.tgz", - "integrity": "sha512-CvdNZa8g+FsnQKbEfwa6niYpSvTJJb6U0ikaztYMxC6yGAFDaJxq47fJamwOal0vM0JbvvEZMZy4r++ysD+NtA==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@yext/search-core/-/search-core-2.5.0.tgz", + "integrity": "sha512-fxbrGkV3hNpjCDMAydGTOksGy2vNx59bP874D5QnaFiwxVT75zX+DIWd4yCMiJnctjerqJQdLmFwZy5NWdJTXw==", "requires": { "@babel/runtime-corejs3": "^7.12.5", "cross-fetch": "^3.1.5" } }, "@yext/search-headless": { - "version": "2.5.0-beta.3", - "resolved": "https://registry.npmjs.org/@yext/search-headless/-/search-headless-2.5.0-beta.3.tgz", - "integrity": "sha512-TXzqMe65mM9mMWVJsfzXlrLr58S2r8CcqL0XyyarkSMqPbI7j9CzdCZyV1avNP1Sx0DJqnA/WNJZ72qXdKoEzw==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@yext/search-headless/-/search-headless-2.5.0.tgz", + "integrity": "sha512-Ii2dDHxaD0sKrmqbmZt3VEWBIk+U2/p7e0LufruoScRUWtOtD1ASh7QBNjR6okGMVqsfdFWrFxQ7x5QRDxLccA==", "requires": { "@reduxjs/toolkit": "^1.8.1", - "@yext/search-core": "^2.5.0-beta.3", + "@yext/search-core": "^2.5.0", "js-levenshtein": "^1.1.6", "lodash": "^4.17.21" } diff --git a/package.json b/package.json index 01fb15e..bf756e6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@yext/search-headless-react", - "version": "2.4.0-beta.3", + "version": "2.4.0", "description": "The official React UI Bindings layer for Search Headless", "main": "./dist/index.js", "module": "./dist/index.mjs", @@ -38,7 +38,7 @@ "generate-notices": "generate-license-file --input package.json --output THIRD-PARTY-NOTICES --overwrite" }, "dependencies": { - "@yext/search-headless": "^2.5.0-beta.3", + "@yext/search-headless": "^2.5.0", "use-sync-external-store": "^1.1.0" }, "devDependencies": { From b96a62941e8969fa18585b60027d110f5110cfe5 Mon Sep 17 00:00:00 2001 From: Nidhi Manu Date: Fri, 8 Dec 2023 11:29:39 -0500 Subject: [PATCH 2/4] Remove node 14 tests and add 18 --- .github/workflows/run-tests.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 4703b1a..af16db6 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -5,6 +5,8 @@ on: [push, pull_request] jobs: call_run_tests: uses: yext/slapshot-reusable-workflows/.github/workflows/run_tests.yml@v1 + with: + node_matrix: '["16.x", "18.x"]' # It's necessary to use v12 of the react-testing-library since v13 was updated to only support react 18 call_run_tests-react-17: @@ -13,7 +15,7 @@ jobs: build_script: | npm i -D react@17 react-dom@17 @types/react@17 @testing-library/react@12 npm run build - node_matrix: '["16.x"]' + node_matrix: '["16.x", "18.x"]' call_run_tests-react-16: uses: yext/slapshot-reusable-workflows/.github/workflows/run_tests.yml@v1 @@ -21,4 +23,4 @@ jobs: build_script: | npm i -D react@16.14 react-dom@16.14 @types/react@16.14 @testing-library/react@12 npm run build - node_matrix: '["16.x"]' + node_matrix: '["16.x", "18.x"]' From 27e46249ab2889624cd0a609f4d67433ed0c1287 Mon Sep 17 00:00:00 2001 From: Nidhi Manu Date: Fri, 8 Dec 2023 11:43:38 -0500 Subject: [PATCH 3/4] Remove unnecessary React --- src/{useSearchState.tsx => useSearchState.ts} | 0 src/useSearchUtilities.ts | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename src/{useSearchState.tsx => useSearchState.ts} (100%) diff --git a/src/useSearchState.tsx b/src/useSearchState.ts similarity index 100% rename from src/useSearchState.tsx rename to src/useSearchState.ts diff --git a/src/useSearchUtilities.ts b/src/useSearchUtilities.ts index 7e1bb65..eb9d51a 100644 --- a/src/useSearchUtilities.ts +++ b/src/useSearchUtilities.ts @@ -1,5 +1,5 @@ import { SearchHeadless } from '@yext/search-headless'; -import React, { useContext } from 'react'; +import { useContext } from 'react'; import { SearchHeadlessContext } from './SearchHeadlessContext'; export type SearchUtilities = SearchHeadless['utilities']; From b0e3e626ed01b42f217ce2cbf7384d1b45049da7 Mon Sep 17 00:00:00 2001 From: Nidhi Manu Date: Fri, 8 Dec 2023 12:16:46 -0500 Subject: [PATCH 4/4] Add node 20 --- .github/workflows/run-tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index af16db6..baf1300 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -6,7 +6,7 @@ jobs: call_run_tests: uses: yext/slapshot-reusable-workflows/.github/workflows/run_tests.yml@v1 with: - node_matrix: '["16.x", "18.x"]' + node_matrix: '["16.x", "18.x", "20.x"]' # It's necessary to use v12 of the react-testing-library since v13 was updated to only support react 18 call_run_tests-react-17: @@ -15,7 +15,7 @@ jobs: build_script: | npm i -D react@17 react-dom@17 @types/react@17 @testing-library/react@12 npm run build - node_matrix: '["16.x", "18.x"]' + node_matrix: '["16.x", "18.x", "20.x"]' call_run_tests-react-16: uses: yext/slapshot-reusable-workflows/.github/workflows/run_tests.yml@v1 @@ -23,4 +23,4 @@ jobs: build_script: | npm i -D react@16.14 react-dom@16.14 @types/react@16.14 @testing-library/react@12 npm run build - node_matrix: '["16.x", "18.x"]' + node_matrix: '["16.x", "18.x", "20.x"]'