From 85767823f1346e375547786dda957f1517d69106 Mon Sep 17 00:00:00 2001
From: Julian Benegas <julianbenegas99@gmail.com>
Date: Wed, 9 Oct 2024 14:23:16 -0300
Subject: [PATCH] Squash merge jb/cleanup-search-params into main

---
 packages/basehub/CHANGELOG.md                              | 6 ++++++
 packages/basehub/package.json                              | 2 +-
 .../src/next/toolbar/client-conditional-renderer.tsx       | 2 ++
 packages/basehub/src/react/pump/server-pump.tsx            | 2 +-
 playground/CHANGELOG.md                                    | 7 +++++++
 playground/package.json                                    | 2 +-
 6 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/packages/basehub/CHANGELOG.md b/packages/basehub/CHANGELOG.md
index 9c04d62..2bdcb62 100644
--- a/packages/basehub/CHANGELOG.md
+++ b/packages/basehub/CHANGELOG.md
@@ -1,5 +1,11 @@
 # basehub
 
+## 7.5.7
+
+### Patch Changes
+
+- cleanup search params on call to revalidateTag
+
 ## 7.5.6
 
 ### Patch Changes
diff --git a/packages/basehub/package.json b/packages/basehub/package.json
index 208215a..94bb592 100644
--- a/packages/basehub/package.json
+++ b/packages/basehub/package.json
@@ -2,7 +2,7 @@
   "name": "basehub",
   "description": "A very fast Headless CMS.",
   "author": "JB <jb@basehub.com>",
-  "version": "7.5.6",
+  "version": "7.5.7",
   "license": "MIT",
   "repository": "basehub-ai/basehub",
   "bugs": "https://github.com/basehub-ai/basehub/issues",
diff --git a/packages/basehub/src/next/toolbar/client-conditional-renderer.tsx b/packages/basehub/src/next/toolbar/client-conditional-renderer.tsx
index 6d6d8a0..b64dc4e 100644
--- a/packages/basehub/src/next/toolbar/client-conditional-renderer.tsx
+++ b/packages/basehub/src/next/toolbar/client-conditional-renderer.tsx
@@ -83,6 +83,8 @@ export const ClientConditionalRenderer = ({
     const url = new URL(window.location.href);
     const tags = url.searchParams.get("bshb-odr-tags");
     if (tags) {
+      url.searchParams.delete("bshb-odr-tags");
+      window.history.replaceState(null, "", url);
       revalidateTags({ tags: tags.split(",") })
         .then(({ success }) => {
           document.documentElement.dataset.basehubOdrStatus = success
diff --git a/packages/basehub/src/react/pump/server-pump.tsx b/packages/basehub/src/react/pump/server-pump.tsx
index 34ca0fa..d56705c 100644
--- a/packages/basehub/src/react/pump/server-pump.tsx
+++ b/packages/basehub/src/react/pump/server-pump.tsx
@@ -208,7 +208,7 @@ export const Pump = async <Queries extends Array<PumpQuery>>({
     );
   }
 
-  return <>{resolvedChildren}</>;
+  return resolvedChildren;
 };
 
 /**
diff --git a/playground/CHANGELOG.md b/playground/CHANGELOG.md
index cb5b770..58941a1 100644
--- a/playground/CHANGELOG.md
+++ b/playground/CHANGELOG.md
@@ -1,5 +1,12 @@
 # playground
 
+## 0.0.149
+
+### Patch Changes
+
+- Updated dependencies
+  - basehub@7.5.7
+
 ## 0.0.148
 
 ### Patch Changes
diff --git a/playground/package.json b/playground/package.json
index f7a9759..cdc4ed6 100644
--- a/playground/package.json
+++ b/playground/package.json
@@ -1,7 +1,7 @@
 {
   "name": "playground",
   "private": true,
-  "version": "0.0.148",
+  "version": "0.0.149",
   "scripts": {
     "dev": "basehub dev & next dev --port 3003",
     "build": "basehub && next build",