chore(merge): merge in develop

searchspring · Oct 18, 2023 · fcf9c04 · fcf9c04
2 parents 7f50c46 + 69d596b
commit fcf9c04
Show file tree

Hide file tree

Showing 37 changed files with 276 additions and 147 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.48.0](https://github.com/searchspring/snap/compare/v0.47.0...v0.48.0) (2023-10-11)
+
+### Bug Fixes
+
+- **controller/finder:** altering the beforeFind middleware to ensure redirection is blocked ([936e184](https://github.com/searchspring/snap/commit/936e184ba932fce75b379eeb6e197af0648aac68))
+
+### Features
+
+- add autocomplete settings.redirects.singleResult config ([e620701](https://github.com/searchspring/snap/commit/e620701cb7d528ea4d3fe823bd0104e1bdd73a31))
+- icon component path element array, children support ([c8a6c44](https://github.com/searchspring/snap/commit/c8a6c4411636021f49da85c8eeb3e40528998f14))
+- move until utility function to toolbox ([d9d4eb3](https://github.com/searchspring/snap/commit/d9d4eb3d4994c30850e5829f1e609755112f5b06))
+
 # [0.47.0](https://github.com/searchspring/snap/compare/v0.46.0...v0.47.0) (2023-09-15)
 
 ### Features

diff --git a/docs/INTEGRATION_RECOMMENDATIONS.md b/docs/INTEGRATION_RECOMMENDATIONS.md
@@ -18,7 +18,8 @@ Context variables may be applied to individual recommendation profiles similar t
 | product | current product sku | product detail page | used to identify the current product being viewed |
 | cart | array (or function that returns an array) of current cart skus | all | optional method of setting cart contents |
 | options.siteId | global siteId overwrite | all | optional global siteId overwrite |
-| options.categories | category path | all | optional category identifier to restrict recommendations |
+| options.categories | array of category path strings | all | optional category identifiers used in category trending recommendation profiles |
+| options.brands | array of brand strings | all | optional brand identifiers used in brand trending recommendation profiles |
 | options.branch | template branch overwrite | all | optional branch overwrite for recommendations template (advanced usage) |
 | options.filters | array of filters | all | optional recommendation filters |
 | options.batched | boolean (default: `true`)| all | only applies to recommendation context, optional disable profile from being batched in a single request, can also be set globally [via config](https://github.com/searchspring/snap/tree/main/packages/snap-controller/src/Recommendation) | 

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-	"version": "0.47.0",
+	"version": "0.48.0",
 	"packages": ["packages/*"],
 	"useWorkspaces": true,
 	"npmClient": "npm",

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/snap-client/CHANGELOG.md b/packages/snap-client/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.48.0](https://github.com/searchspring/snap/compare/v0.47.0...v0.48.0) (2023-10-11)
+
+**Note:** Version bump only for package @searchspring/snap-client
+
 # [0.47.0](https://github.com/searchspring/snap/compare/v0.46.0...v0.47.0) (2023-09-15)
 
 ### Features

diff --git a/packages/snap-client/package.json b/packages/snap-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@searchspring/snap-client",
-	"version": "0.47.0",
+	"version": "0.48.0",
 	"description": "Snap Client",
 	"main": "dist/cjs/index.js",
 	"module": "dist/esm/index.js",
@@ -20,7 +20,7 @@
 		"test:watch": "jest --watch"
 	},
 	"dependencies": {
-		"@searchspring/snap-toolbox": "^0.47.0",
+		"@searchspring/snap-toolbox": "^0.48.0",
 		"deepmerge": "4.3.1"
 	},
 	"sideEffects": false,