From 600d6126a92555eae7ab938cc3817faca020c8da Mon Sep 17 00:00:00 2001
From: Aymeric Giraudet <aymeric.giraudet@algolia.com>
Date: Tue, 8 Oct 2024 10:25:54 +0200
Subject: [PATCH 01/37] fix(templating): remove hogan.js (#6378)

BREAKING CHANGE : Hogan.js and raw HTML templates will no longer work. `bindEvent` also removed.

---------

Co-authored-by: Haroen Viaene <hello@haroen.me>
---
 babel.config.js                               |   4 +
 packages/algolia-experiences/src/render.tsx   |   2 +-
 packages/instantsearch.js/package.json        |   2 -
 .../src/__tests__/common-widgets.test.tsx     |   2 +-
 .../Answers/__tests__/Answers-test.tsx        |   6 +-
 .../Breadcrumb/__tests__/Breadcrumb-test.tsx  |   1 -
 .../__tests__/GeoSearchControls-test.tsx      |   9 +-
 .../components/InfiniteHits/InfiniteHits.tsx  |   2 -
 .../__tests__/InfiniteHits-test.tsx           |  48 ++--
 .../__tests__/InfiniteHits.test.tsx           |   1 -
 .../MenuSelect/__tests__/MenuSelect-test.tsx  |   4 +-
 .../__snapshots__/MenuSelect-test.tsx.snap    |  63 ++---
 .../components/Panel/__tests__/Panel-test.tsx |  30 +--
 .../__snapshots__/Panel-test.tsx.snap         |   2 -
 .../QueryRuleCustomData-test.tsx.snap         |   4 +-
 .../RangeInput/__tests__/RangeInput-test.tsx  |   4 +-
 .../__snapshots__/RangeInput-test.tsx.snap    |  84 +++----
 .../__tests__/RefinementList-test.tsx         | 105 ++++-----
 .../RefinementList-test.tsx.snap              |  32 ++-
 .../RefinementListItem-test.tsx.snap          |   2 -
 .../__tests__/RelevantSort-test.tsx           |  10 +-
 .../components/Stats/__tests__/Stats-test.tsx |  19 +-
 .../src/components/Template/Template.tsx      |  83 +------
 .../Template/__tests__/Template-test.tsx      |  91 +------
 .../__snapshots__/Template-test.tsx.snap      |  65 +----
 .../__tests__/VoiceSearch-test.tsx            |  34 ++-
 .../__snapshots__/VoiceSearch-test.tsx.snap   |  17 +-
 .../instantsearch.js/src/lib/InstantSearch.ts |   7 -
 .../src/lib/__tests__/createHelpers.tests.ts  |  71 ------
 .../instantsearch.js/src/lib/createHelpers.ts | 127 ----------
 .../__tests__/prepareTemplateProps.test.ts    |  52 +---
 .../__tests__/renderTemplate.test.ts          | 119 ++--------
 .../lib/templating/prepareTemplateProps.ts    |  63 +----
 .../src/lib/templating/renderTemplate.ts      |  93 ++------
 .../src/lib/utils/render-args.ts              |   2 -
 .../instantsearch.js/src/types/templates.ts   |  47 ++--
 packages/instantsearch.js/src/types/widget.ts |   1 -
 .../widgets/answers/__tests__/answers-test.ts |   2 +-
 .../src/widgets/answers/answers.tsx           |   3 +-
 .../breadcrumb/__tests__/breadcrumb.test.tsx  |   9 +-
 .../src/widgets/breadcrumb/breadcrumb.tsx     |   6 +-
 .../__tests__/clear-refinements.test.tsx      |   9 +-
 .../clear-refinements/clear-refinements.tsx   |   3 +-
 .../frequently-bought-together.test.tsx       |   8 +-
 .../frequently-bought-together.tsx            |   1 -
 .../widgets/geo-search/GeoSearchRenderer.js   |   2 -
 .../__snapshots__/geo-search-test.ts.snap     |  14 --
 .../geo-search/__tests__/geo-search-test.ts   |  42 +++-
 .../geo-search/__tests__/geo-search.test.tsx  |   9 +-
 .../__tests__/hierarchical-menu.test.tsx      |   9 +-
 .../hierarchical-menu/hierarchical-menu.tsx   |   2 -
 .../src/widgets/hits/__tests__/hits.test.tsx  | 197 +---------------
 .../src/widgets/hits/hits.tsx                 |  19 +-
 .../src/widgets/index/__tests__/index-test.ts |   5 -
 .../__tests__/infinite-hits.test.tsx          | 146 +-----------
 .../widgets/infinite-hits/infinite-hits.tsx   |   6 +-
 .../__tests__/looking-similar.test.tsx        |   8 +-
 .../looking-similar/looking-similar.tsx       |   1 -
 .../menu-select/__tests__/menu-select-test.ts | 170 ++++++-------
 .../src/widgets/menu-select/menu-select.tsx   |   7 +-
 .../src/widgets/menu/__tests__/menu.test.tsx  |   9 +-
 .../src/widgets/menu/menu.tsx                 |   2 -
 .../__tests__/numeric-menu.test.tsx           |   9 +-
 .../src/widgets/numeric-menu/numeric-menu.tsx |   6 +-
 .../pagination/__tests__/pagination.test.tsx  |  85 +------
 .../src/widgets/panel/__tests__/panel-test.ts |  17 +-
 .../widgets/panel/__tests__/panel.test.tsx    |   9 +-
 .../__tests__/query-rule-custom-data-test.ts  |   5 +-
 .../__tests__/query-rule-custom-data.test.tsx |   9 +-
 .../__tests__/range-input.test.tsx            |   9 +-
 .../src/widgets/range-input/range-input.tsx   |   6 +-
 .../__tests__/range-slider-test.ts            |   4 +-
 .../__tests__/rating-menu.test.tsx            |   9 +-
 .../src/widgets/rating-menu/rating-menu.tsx   |   2 -
 .../__tests__/refinement-list.test.tsx        |   9 +-
 .../refinement-list/refinement-list.tsx       |   3 -
 .../__tests__/related-products.test.tsx       |   9 +-
 .../related-products/related-products.tsx     |   1 -
 .../__tests__/relevant-sort-test.ts           |   2 +-
 .../__tests__/relevant-sort.test.tsx          | 149 ++++++------
 .../search-box/__tests__/search-box.test.tsx  |   9 +-
 .../src/widgets/search-box/search-box.tsx     |   6 +-
 .../widgets/stats/__tests__/stats.test.tsx    | 205 ++++++++--------
 .../src/widgets/stats/stats.tsx               |   2 -
 .../__tests__/toggle-refinement.test.tsx      |   9 +-
 .../toggle-refinement/toggle-refinement.tsx   |   2 -
 .../__tests__/trending-items.test.tsx         |   9 +-
 .../widgets/trending-items/trending-items.tsx |   1 -
 .../__tests__/voice-search.test.tsx           | 223 +++++++++---------
 .../instantsearch.js/stories/hits.stories.ts  | 100 --------
 .../stories/infinite-hits.stories.ts          |   6 +-
 .../stories/query-rule-custom-data.stories.ts |  31 ---
 .../test/createInstantSearch.ts               |   1 -
 .../instantsearch.js/test/createWidget.ts     |   2 -
 .../src/hooks/__tests__/useConnector.test.tsx |   1 -
 .../src/hooks/useConnector.ts                 |   1 -
 .../components/__tests__/Index-integration.js |   1 -
 .../__tests__/createServerRootMixin.test.js   |   1 -
 .../src/util/createServerRootMixin.js         |   1 -
 yarn.lock                                     |  35 +--
 100 files changed, 730 insertions(+), 2256 deletions(-)
 delete mode 100644 packages/instantsearch.js/src/lib/__tests__/createHelpers.tests.ts
 delete mode 100644 packages/instantsearch.js/src/lib/createHelpers.ts

diff --git a/babel.config.js b/babel.config.js
index 750b6bb718..0fc8ca7957 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -87,6 +87,10 @@ module.exports = (api) => {
 
             // false positive (spread)
             'Object.getOwnPropertyDescriptors',
+
+            // @TODO: see when we remove IE11 support
+            'Object.fromEntries',
+            'Object.entries',
           ];
           if (defaultShouldInject && !exclude.includes(name)) {
             throw new Error(
diff --git a/packages/algolia-experiences/src/render.tsx b/packages/algolia-experiences/src/render.tsx
index 166f10e505..3aef09f1f3 100644
--- a/packages/algolia-experiences/src/render.tsx
+++ b/packages/algolia-experiences/src/render.tsx
@@ -293,7 +293,7 @@ function blockToWidget(child: Block, container: HTMLElement): Widget[] {
     return [
       panel<typeof widgets['ais.refinementList']>({
         templates: {
-          header,
+          header: () => header,
           collapseButtonText: ({ collapsed }) => (
             // @TODO: put this style in a stylesheet
             <span style="cursor: pointer">{collapsed ? '+' : '-'}</span>
diff --git a/packages/instantsearch.js/package.json b/packages/instantsearch.js/package.json
index d2cdb0102b..0db0b764a6 100644
--- a/packages/instantsearch.js/package.json
+++ b/packages/instantsearch.js/package.json
@@ -29,10 +29,8 @@
     "@algolia/events": "^4.0.1",
     "@types/dom-speech-recognition": "^0.0.1",
     "@types/google.maps": "^3.55.12",
-    "@types/hogan.js": "^3.0.0",
     "@types/qs": "^6.5.3",
     "algoliasearch-helper": "3.24.1",
-    "hogan.js": "^3.0.2",
     "htm": "^3.0.0",
     "instantsearch-ui-components": "0.11.1",
     "preact": "^10.10.0",
diff --git a/packages/instantsearch.js/src/__tests__/common-widgets.test.tsx b/packages/instantsearch.js/src/__tests__/common-widgets.test.tsx
index 983279477c..c006253c01 100644
--- a/packages/instantsearch.js/src/__tests__/common-widgets.test.tsx
+++ b/packages/instantsearch.js/src/__tests__/common-widgets.test.tsx
@@ -418,7 +418,7 @@ const testSetups: TestSetupsMap<TestSuites> = {
           container: document.body.appendChild(document.createElement('div')),
           ...widgetParams,
           templates: {
-            labelText: label,
+            labelText: label ? () => label : undefined,
           },
         }),
       ])
diff --git a/packages/instantsearch.js/src/components/Answers/__tests__/Answers-test.tsx b/packages/instantsearch.js/src/components/Answers/__tests__/Answers-test.tsx
index 2e1ebab362..ab0c552658 100644
--- a/packages/instantsearch.js/src/components/Answers/__tests__/Answers-test.tsx
+++ b/packages/instantsearch.js/src/components/Answers/__tests__/Answers-test.tsx
@@ -23,9 +23,9 @@ const defaultProps: AnswersProps = {
   },
   templateProps: {
     templates: {
-      header: 'header',
-      loader: 'loader',
-      item: 'item',
+      header: () => 'header',
+      loader: () => 'loader',
+      item: () => 'item',
     },
   },
 };
diff --git a/packages/instantsearch.js/src/components/Breadcrumb/__tests__/Breadcrumb-test.tsx b/packages/instantsearch.js/src/components/Breadcrumb/__tests__/Breadcrumb-test.tsx
index bf162d0220..860f9faeee 100644
--- a/packages/instantsearch.js/src/components/Breadcrumb/__tests__/Breadcrumb-test.tsx
+++ b/packages/instantsearch.js/src/components/Breadcrumb/__tests__/Breadcrumb-test.tsx
@@ -28,7 +28,6 @@ const defaultProps: BreadcrumbProps = {
   templateProps: prepareTemplateProps({
     defaultTemplates,
     templates: {},
-    templatesConfig: {},
   }),
 };
 
diff --git a/packages/instantsearch.js/src/components/GeoSearchControls/__tests__/GeoSearchControls-test.tsx b/packages/instantsearch.js/src/components/GeoSearchControls/__tests__/GeoSearchControls-test.tsx
index 4ccea94745..b66484d323 100644
--- a/packages/instantsearch.js/src/components/GeoSearchControls/__tests__/GeoSearchControls-test.tsx
+++ b/packages/instantsearch.js/src/components/GeoSearchControls/__tests__/GeoSearchControls-test.tsx
@@ -24,13 +24,12 @@ describe('GeoSearchControls', () => {
 
   const templateProps = prepareTemplateProps({
     defaultTemplates: {
-      toggle: 'toggle',
-      redo: 'redo',
-      reset: 'reset',
-      HTMLMarker: '',
+      toggle: () => 'toggle',
+      redo: () => 'redo',
+      reset: () => 'reset',
+      HTMLMarker: () => '',
     },
     templates: {},
-    templatesConfig: {},
   });
 
   const defaultProps = {
diff --git a/packages/instantsearch.js/src/components/InfiniteHits/InfiniteHits.tsx b/packages/instantsearch.js/src/components/InfiniteHits/InfiniteHits.tsx
index e3c32f2368..cbf1b1cd97 100644
--- a/packages/instantsearch.js/src/components/InfiniteHits/InfiniteHits.tsx
+++ b/packages/instantsearch.js/src/components/InfiniteHits/InfiniteHits.tsx
@@ -81,7 +81,6 @@ const InfiniteHits = ({
   results,
   hits,
   insights,
-  bindEvent,
   sendEvent,
   hasShowPrevious,
   showPrevious,
@@ -188,7 +187,6 @@ const InfiniteHits = ({
                 return index;
               },
             }}
-            bindEvent={bindEvent}
             sendEvent={sendEvent}
           />
         ))}
diff --git a/packages/instantsearch.js/src/components/InfiniteHits/__tests__/InfiniteHits-test.tsx b/packages/instantsearch.js/src/components/InfiniteHits/__tests__/InfiniteHits-test.tsx
index 9533800f97..ab4fdbf878 100644
--- a/packages/instantsearch.js/src/components/InfiniteHits/__tests__/InfiniteHits-test.tsx
+++ b/packages/instantsearch.js/src/components/InfiniteHits/__tests__/InfiniteHits-test.tsx
@@ -61,10 +61,10 @@ describe('InfiniteHits', () => {
         isLastPage: false,
         templateProps: {
           templates: {
-            empty: 'empty',
-            showPreviousText: 'showPreviousText',
-            showMoreText: 'showMoreText',
-            item: 'item',
+            empty: () => 'empty',
+            showPreviousText: () => 'showPreviousText',
+            showMoreText: () => 'showMoreText',
+            item: () => 'item',
           },
         },
         cssClasses,
@@ -101,10 +101,10 @@ describe('InfiniteHits', () => {
         isLastPage: true,
         templateProps: {
           templates: {
-            empty: 'empty',
-            showPreviousText: 'showPreviousText',
-            showMoreText: 'showMoreText',
-            item: 'item',
+            empty: () => 'empty',
+            showPreviousText: () => 'showPreviousText',
+            showMoreText: () => 'showMoreText',
+            item: () => 'item',
           },
         },
         cssClasses,
@@ -130,10 +130,10 @@ describe('InfiniteHits', () => {
         isLastPage: false,
         templateProps: {
           templates: {
-            empty: 'empty',
-            showPreviousText: 'showPreviousText',
-            showMoreText: 'showMoreText',
-            item: 'item',
+            empty: () => 'empty',
+            showPreviousText: () => 'showPreviousText',
+            showMoreText: () => 'showMoreText',
+            item: () => 'item',
           },
         },
         cssClasses,
@@ -159,10 +159,10 @@ describe('InfiniteHits', () => {
         isLastPage: true,
         templateProps: {
           templates: {
-            empty: 'empty',
-            showPreviousText: 'showPreviousText',
-            showMoreText: 'showMoreText',
-            item: 'item',
+            empty: () => 'empty',
+            showPreviousText: () => 'showPreviousText',
+            showMoreText: () => 'showMoreText',
+            item: () => 'item',
           },
         },
         cssClasses,
@@ -199,10 +199,10 @@ describe('InfiniteHits', () => {
         isLastPage: false,
         templateProps: {
           templates: {
-            empty: 'empty',
-            showPreviousText: 'showPreviousText',
-            showMoreText: 'showMoreText',
-            item: 'item',
+            empty: () => 'empty',
+            showPreviousText: () => 'showPreviousText',
+            showMoreText: () => 'showMoreText',
+            item: () => 'item',
           },
         },
         cssClasses,
@@ -244,10 +244,10 @@ describe('InfiniteHits', () => {
         isLastPage: true,
         templateProps: {
           templates: {
-            empty: 'empty',
-            showPreviousText: 'showPreviousText',
-            showMoreText: 'showMoreText',
-            item: 'item',
+            empty: () => 'empty',
+            showPreviousText: () => 'showPreviousText',
+            showMoreText: () => 'showMoreText',
+            item: () => 'item',
           },
         },
         cssClasses,
diff --git a/packages/instantsearch.js/src/components/InfiniteHits/__tests__/InfiniteHits.test.tsx b/packages/instantsearch.js/src/components/InfiniteHits/__tests__/InfiniteHits.test.tsx
index 456c5618d5..c1eee9299f 100644
--- a/packages/instantsearch.js/src/components/InfiniteHits/__tests__/InfiniteHits.test.tsx
+++ b/packages/instantsearch.js/src/components/InfiniteHits/__tests__/InfiniteHits.test.tsx
@@ -82,7 +82,6 @@ describe('InfiniteHits', () => {
             return '';
           },
         },
-        templatesConfig: {},
         templates: {},
       }),
       ...props,
diff --git a/packages/instantsearch.js/src/components/MenuSelect/__tests__/MenuSelect-test.tsx b/packages/instantsearch.js/src/components/MenuSelect/__tests__/MenuSelect-test.tsx
index 023ce403cf..3dec61ebe8 100644
--- a/packages/instantsearch.js/src/components/MenuSelect/__tests__/MenuSelect-test.tsx
+++ b/packages/instantsearch.js/src/components/MenuSelect/__tests__/MenuSelect-test.tsx
@@ -55,8 +55,8 @@ describe('MenuSelect', () => {
       refine: () => {},
       templateProps: {
         templates: {
-          item: '{{label}}',
-          defaultOption: 'defaultOption',
+          item: ({ label }: { label: string }) => label,
+          defaultOption: () => 'defaultOption',
         },
       },
       cssClasses,
diff --git a/packages/instantsearch.js/src/components/MenuSelect/__tests__/__snapshots__/MenuSelect-test.tsx.snap b/packages/instantsearch.js/src/components/MenuSelect/__tests__/__snapshots__/MenuSelect-test.tsx.snap
index 363ef2f038..457df9ac2e 100644
--- a/packages/instantsearch.js/src/components/MenuSelect/__tests__/__snapshots__/MenuSelect-test.tsx.snap
+++ b/packages/instantsearch.js/src/components/MenuSelect/__tests__/__snapshots__/MenuSelect-test.tsx.snap
@@ -11,31 +11,22 @@ exports[`MenuSelect should render <MenuSelect /> with custom templates 1`] = `
   >
     <option
       className="option"
-      dangerouslySetInnerHTML={
-        {
-          "__html": "defaultOption",
-        }
-      }
       value=""
-    />
+    >
+      defaultOption
+    </option>
     <option
       className="option"
-      dangerouslySetInnerHTML={
-        {
-          "__html": "foo",
-        }
-      }
       value="foo"
-    />
+    >
+      foo
+    </option>
     <option
       className="option"
-      dangerouslySetInnerHTML={
-        {
-          "__html": "bar",
-        }
-      }
       value="bar"
-    />
+    >
+      bar
+    </option>
   </select>
 </div>
 `;
@@ -51,31 +42,22 @@ exports[`MenuSelect should render <MenuSelect /> with items 1`] = `
   >
     <option
       className="option"
-      dangerouslySetInnerHTML={
-        {
-          "__html": "See all",
-        }
-      }
       value=""
-    />
+    >
+      See all
+    </option>
     <option
       className="option"
-      dangerouslySetInnerHTML={
-        {
-          "__html": "foo (0)",
-        }
-      }
       value="foo"
-    />
+    >
+      foo (0)
+    </option>
     <option
       className="option"
-      dangerouslySetInnerHTML={
-        {
-          "__html": "bar (0)",
-        }
-      }
       value="bar"
-    />
+    >
+      bar (0)
+    </option>
   </select>
 </div>
 `;
@@ -91,13 +73,10 @@ exports[`MenuSelect should render <MenuSelect /> with no items 1`] = `
   >
     <option
       className="option"
-      dangerouslySetInnerHTML={
-        {
-          "__html": "See all",
-        }
-      }
       value=""
-    />
+    >
+      See all
+    </option>
   </select>
 </div>
 `;
diff --git a/packages/instantsearch.js/src/components/Panel/__tests__/Panel-test.tsx b/packages/instantsearch.js/src/components/Panel/__tests__/Panel-test.tsx
index f9ab84a63e..4a20dac126 100644
--- a/packages/instantsearch.js/src/components/Panel/__tests__/Panel-test.tsx
+++ b/packages/instantsearch.js/src/components/Panel/__tests__/Panel-test.tsx
@@ -29,11 +29,7 @@ const getDefaultProps = () => ({
   collapsible: false,
   isCollapsed: false,
   data: createRenderOptions(),
-  templates: {
-    header: '',
-    footer: '',
-    collapseButtonText: '',
-  },
+  templates: {},
 });
 
 describe('Panel', () => {
@@ -79,9 +75,9 @@ describe('Panel', () => {
       const props = {
         ...getDefaultProps(),
         templates: {
-          header: 'Header',
-          footer: 'Footer',
-          collapseButtonText: 'Toggle',
+          header: () => 'Header',
+          footer: () => 'Footer',
+          collapseButtonText: () => 'Toggle',
         },
       };
 
@@ -128,9 +124,9 @@ describe('Panel', () => {
         ...getDefaultProps(),
         hidden: true,
         templates: {
-          header: 'Header',
-          footer: 'Footer',
-          collapseButtonText: 'Toggle',
+          header: () => 'Header',
+          footer: () => 'Footer',
+          collapseButtonText: () => 'Toggle',
         },
       };
 
@@ -171,8 +167,8 @@ describe('Panel', () => {
       const props: PanelProps<any> = {
         ...getDefaultProps(),
         templates: {
-          header: 'Header',
-          footer: 'Footer',
+          header: () => 'Header',
+          footer: () => 'Footer',
           collapseButtonText: ({ collapsed }) => (collapsed ? 'More' : 'Less'),
         },
         collapsible: true,
@@ -217,8 +213,8 @@ describe('Panel', () => {
         collapsible: true,
         isCollapsed: true,
         templates: {
-          header: 'Header',
-          footer: 'Footer',
+          header: () => 'Header',
+          footer: () => 'Footer',
           collapseButtonText: ({ collapsed }) => (collapsed ? 'More' : 'Less'),
         },
       };
@@ -262,8 +258,8 @@ describe('Panel', () => {
         collapsible: true,
         isCollapsed: false,
         templates: {
-          header: 'Header',
-          footer: 'Footer',
+          header: () => 'Header',
+          footer: () => 'Footer',
           collapseButtonText: ({ collapsed }) => (collapsed ? 'More' : 'Less'),
         },
       };
diff --git a/packages/instantsearch.js/src/components/Panel/__tests__/__snapshots__/Panel-test.tsx.snap b/packages/instantsearch.js/src/components/Panel/__tests__/__snapshots__/Panel-test.tsx.snap
index 89f6901fc2..5caf2335fa 100644
--- a/packages/instantsearch.js/src/components/Panel/__tests__/__snapshots__/Panel-test.tsx.snap
+++ b/packages/instantsearch.js/src/components/Panel/__tests__/__snapshots__/Panel-test.tsx.snap
@@ -73,13 +73,11 @@ exports[`Panel default should render component with default props 1`] = `
   <div
     class="root"
   >
-    
     <div
       class="body"
     >
       <div />
     </div>
-    
   </div>
 </div>
 `;
diff --git a/packages/instantsearch.js/src/components/QueryRuleCustomData/__tests__/__snapshots__/QueryRuleCustomData-test.tsx.snap b/packages/instantsearch.js/src/components/QueryRuleCustomData/__tests__/__snapshots__/QueryRuleCustomData-test.tsx.snap
index e0addb0561..84e9d7e422 100644
--- a/packages/instantsearch.js/src/components/QueryRuleCustomData/__tests__/__snapshots__/QueryRuleCustomData-test.tsx.snap
+++ b/packages/instantsearch.js/src/components/QueryRuleCustomData/__tests__/__snapshots__/QueryRuleCustomData-test.tsx.snap
@@ -4,7 +4,9 @@ exports[`QueryRuleCustomData renders with empty items 1`] = `
 <div>
   <div
     class="root"
-  />
+  >
+    
+  </div>
 </div>
 `;
 
diff --git a/packages/instantsearch.js/src/components/RangeInput/__tests__/RangeInput-test.tsx b/packages/instantsearch.js/src/components/RangeInput/__tests__/RangeInput-test.tsx
index 98c79f6f97..a264cbfcf6 100644
--- a/packages/instantsearch.js/src/components/RangeInput/__tests__/RangeInput-test.tsx
+++ b/packages/instantsearch.js/src/components/RangeInput/__tests__/RangeInput-test.tsx
@@ -30,8 +30,8 @@ describe('RangeInput', () => {
     },
     templateProps: {
       templates: {
-        separatorText: 'to',
-        submitText: 'Go',
+        separatorText: () => 'to',
+        submitText: () => 'Go',
       },
     },
     refine: () => {},
diff --git a/packages/instantsearch.js/src/components/RangeInput/__tests__/__snapshots__/RangeInput-test.tsx.snap b/packages/instantsearch.js/src/components/RangeInput/__tests__/__snapshots__/RangeInput-test.tsx.snap
index 9c39a43b3e..d0e6b4cfee 100644
--- a/packages/instantsearch.js/src/components/RangeInput/__tests__/__snapshots__/RangeInput-test.tsx.snap
+++ b/packages/instantsearch.js/src/components/RangeInput/__tests__/__snapshots__/RangeInput-test.tsx.snap
@@ -34,12 +34,10 @@ exports[`RangeInput expect to render 1`] = `
       templateKey="separatorText"
       templates={
         {
-          "separatorText": "to",
-          "submitText": "Go",
+          "separatorText": [Function],
+          "submitText": [Function],
         }
       }
-      templatesConfig={{}}
-      useCustomCompileOptions={{}}
     />
     <label
       className="label"
@@ -69,12 +67,10 @@ exports[`RangeInput expect to render 1`] = `
       templateKey="submitText"
       templates={
         {
-          "separatorText": "to",
-          "submitText": "Go",
+          "separatorText": [Function],
+          "submitText": [Function],
         }
       }
-      templatesConfig={{}}
-      useCustomCompileOptions={{}}
     />
   </form>
 </div>
@@ -114,12 +110,10 @@ exports[`RangeInput expect to render with disabled state 1`] = `
       templateKey="separatorText"
       templates={
         {
-          "separatorText": "to",
-          "submitText": "Go",
+          "separatorText": [Function],
+          "submitText": [Function],
         }
       }
-      templatesConfig={{}}
-      useCustomCompileOptions={{}}
     />
     <label
       className="label"
@@ -149,12 +143,10 @@ exports[`RangeInput expect to render with disabled state 1`] = `
       templateKey="submitText"
       templates={
         {
-          "separatorText": "to",
-          "submitText": "Go",
+          "separatorText": [Function],
+          "submitText": [Function],
         }
       }
-      templatesConfig={{}}
-      useCustomCompileOptions={{}}
     />
   </form>
 </div>
@@ -194,12 +186,10 @@ exports[`RangeInput expect to render with values 1`] = `
       templateKey="separatorText"
       templates={
         {
-          "separatorText": "to",
-          "submitText": "Go",
+          "separatorText": [Function],
+          "submitText": [Function],
         }
       }
-      templatesConfig={{}}
-      useCustomCompileOptions={{}}
     />
     <label
       className="label"
@@ -229,12 +219,10 @@ exports[`RangeInput expect to render with values 1`] = `
       templateKey="submitText"
       templates={
         {
-          "separatorText": "to",
-          "submitText": "Go",
+          "separatorText": [Function],
+          "submitText": [Function],
         }
       }
-      templatesConfig={{}}
-      useCustomCompileOptions={{}}
     />
   </form>
 </div>
@@ -274,12 +262,10 @@ exports[`RangeInput willReceiveProps expect to update the empty state from given
       templateKey="separatorText"
       templates={
         {
-          "separatorText": "to",
-          "submitText": "Go",
+          "separatorText": [Function],
+          "submitText": [Function],
         }
       }
-      templatesConfig={{}}
-      useCustomCompileOptions={{}}
     />
     <label
       className="label"
@@ -309,12 +295,10 @@ exports[`RangeInput willReceiveProps expect to update the empty state from given
       templateKey="submitText"
       templates={
         {
-          "separatorText": "to",
-          "submitText": "Go",
+          "separatorText": [Function],
+          "submitText": [Function],
         }
       }
-      templatesConfig={{}}
-      useCustomCompileOptions={{}}
     />
   </form>
 </div>
@@ -354,12 +338,10 @@ exports[`RangeInput willReceiveProps expect to update the empty state from given
       templateKey="separatorText"
       templates={
         {
-          "separatorText": "to",
-          "submitText": "Go",
+          "separatorText": [Function],
+          "submitText": [Function],
         }
       }
-      templatesConfig={{}}
-      useCustomCompileOptions={{}}
     />
     <label
       className="label"
@@ -389,12 +371,10 @@ exports[`RangeInput willReceiveProps expect to update the empty state from given
       templateKey="submitText"
       templates={
         {
-          "separatorText": "to",
-          "submitText": "Go",
+          "separatorText": [Function],
+          "submitText": [Function],
         }
       }
-      templatesConfig={{}}
-      useCustomCompileOptions={{}}
     />
   </form>
 </div>
@@ -434,12 +414,10 @@ exports[`RangeInput willReceiveProps expect to update the state from given props
       templateKey="separatorText"
       templates={
         {
-          "separatorText": "to",
-          "submitText": "Go",
+          "separatorText": [Function],
+          "submitText": [Function],
         }
       }
-      templatesConfig={{}}
-      useCustomCompileOptions={{}}
     />
     <label
       className="label"
@@ -469,12 +447,10 @@ exports[`RangeInput willReceiveProps expect to update the state from given props
       templateKey="submitText"
       templates={
         {
-          "separatorText": "to",
-          "submitText": "Go",
+          "separatorText": [Function],
+          "submitText": [Function],
         }
       }
-      templatesConfig={{}}
-      useCustomCompileOptions={{}}
     />
   </form>
 </div>
@@ -514,12 +490,10 @@ exports[`RangeInput willReceiveProps expect to update the state from given props
       templateKey="separatorText"
       templates={
         {
-          "separatorText": "to",
-          "submitText": "Go",
+          "separatorText": [Function],
+          "submitText": [Function],
         }
       }
-      templatesConfig={{}}
-      useCustomCompileOptions={{}}
     />
     <label
       className="label"
@@ -549,12 +523,10 @@ exports[`RangeInput willReceiveProps expect to update the state from given props
       templateKey="submitText"
       templates={
         {
-          "separatorText": "to",
-          "submitText": "Go",
+          "separatorText": [Function],
+          "submitText": [Function],
         }
       }
-      templatesConfig={{}}
-      useCustomCompileOptions={{}}
     />
   </form>
 </div>
diff --git a/packages/instantsearch.js/src/components/RefinementList/__tests__/RefinementList-test.tsx b/packages/instantsearch.js/src/components/RefinementList/__tests__/RefinementList-test.tsx
index ec46893370..d1b21f9030 100644
--- a/packages/instantsearch.js/src/components/RefinementList/__tests__/RefinementList-test.tsx
+++ b/packages/instantsearch.js/src/components/RefinementList/__tests__/RefinementList-test.tsx
@@ -9,6 +9,7 @@ import { h } from 'preact';
 import defaultTemplates from '../../../widgets/refinement-list/defaultTemplates';
 import RefinementList from '../RefinementList';
 
+import type { TemplateParams } from '../../../types';
 import type {
   RefinementListItemData,
   RefinementListTemplates,
@@ -18,29 +19,24 @@ import type { RefinementListProps } from '../RefinementList';
 const defaultProps = {
   createURL: () => '#',
   templateProps: {
-    templatesConfig: {},
     templates: {
-      item({ value, count, isRefined }: RefinementListItemData) {
-        return `
-  <label>
-    <input
-      type="checkbox"
-      value="${value}"
-      ${isRefined ? 'checked' : ''}
-    />
-    <span data-testid="value">${value}</span>
-    <span data-testid="count">${count}</span>
-  </label>
-  `;
+      item(
+        { value, count, isRefined }: RefinementListItemData,
+        { html }: TemplateParams
+      ) {
+        return html`
+          <label>
+            <input type="checkbox" value=${value} checked=${isRefined} />
+            <span data-testid="value">${value}</span>
+            <span data-testid="count">${count}</span>
+          </label>
+        `;
       },
-      showMoreText() {
-        return `
-  <button data-testid="show-more">Show more</button>
-    `;
+      showMoreText(_: any, { html }: TemplateParams) {
+        return html`<button data-testid="show-more">Show more</button> `;
       },
-      searchableNoResults: 'No results',
+      searchableNoResults: () => 'No results',
     },
-    useCustomCompileOptions: {},
   },
   toggleRefinement: () => {},
   cssClasses: {
@@ -155,10 +151,11 @@ describe('RefinementList', () => {
       };
 
       const { container } = render(<RefinementList {...props} />);
+
       const [firstItem, secondItem] = container.querySelectorAll('input');
 
-      expect(firstItem).not.toHaveAttribute('checked');
-      expect(secondItem).toHaveAttribute('checked');
+      expect(firstItem).not.toBeChecked();
+      expect(secondItem).toBeChecked();
     });
 
     it('should escape the items in the default template to prevent XSS', () => {
@@ -181,9 +178,7 @@ describe('RefinementList', () => {
           },
         ],
         templateProps: {
-          templatesConfig: {},
           templates: defaultTemplates,
-          useCustomCompileOptions: {},
         },
         cssClasses: {
           ...defaultProps.cssClasses,
@@ -221,9 +216,7 @@ describe('RefinementList', () => {
           },
         ],
         templateProps: {
-          templatesConfig: {},
           templates: defaultTemplates,
-          useCustomCompileOptions: {},
         },
         cssClasses: {
           ...defaultProps.cssClasses,
@@ -422,7 +415,7 @@ describe('RefinementList', () => {
     it('without facets', () => {
       const templates = {
         item: (item: RefinementListItemData) => item.value,
-        showMoreText: '',
+        showMoreText: () => '',
       };
       type TestTemplates = typeof templates;
 
@@ -433,9 +426,7 @@ describe('RefinementList', () => {
         cssClasses,
         className: 'customClassName',
         templateProps: {
-          templatesConfig: {},
           templates,
-          useCustomCompileOptions: {},
         },
         toggleRefinement: () => {},
       };
@@ -448,7 +439,7 @@ describe('RefinementList', () => {
       const templates: Partial<RefinementListTemplates> = {
         item: (item) => item.value,
         searchableNoResults: (x) => JSON.stringify(x),
-        showMoreText: '',
+        showMoreText: () => '',
       };
       type TestTemplates = typeof templates;
 
@@ -462,18 +453,14 @@ describe('RefinementList', () => {
         searchPlaceholder: 'Search',
         searchFacetValues: (x) => x,
         templateProps: {
-          templatesConfig: {},
           templates,
-          useCustomCompileOptions: {},
         },
         searchBoxTemplateProps: {
-          templatesConfig: {},
           templates: {
-            reset: 'reset',
-            submit: 'submit',
-            loadingIndicator: 'loadingIndicator',
+            reset: () => 'reset',
+            submit: () => 'submit',
+            loadingIndicator: () => 'loadingIndicator',
           },
-          useCustomCompileOptions: {},
         },
         toggleRefinement: () => {},
       };
@@ -485,7 +472,7 @@ describe('RefinementList', () => {
     it('with facets', () => {
       const templates = {
         item: (item: RefinementListItemData) => item.value,
-        showMoreText: '',
+        showMoreText: () => '',
       };
       type TestTemplates = typeof templates;
 
@@ -508,9 +495,7 @@ describe('RefinementList', () => {
         cssClasses,
         className: 'customClassName',
         templateProps: {
-          templatesConfig: {},
           templates,
-          useCustomCompileOptions: {},
         },
         toggleRefinement: () => {},
         createURL: () => '',
@@ -549,9 +534,7 @@ describe('RefinementList', () => {
         isShowingMore: false,
         canToggleShowMore: true,
         templateProps: {
-          templatesConfig: {},
           templates,
-          useCustomCompileOptions: {},
         },
         toggleRefinement: () => {},
         createURL: () => '',
@@ -590,9 +573,7 @@ describe('RefinementList', () => {
         isShowingMore: false,
         canToggleShowMore: false,
         templateProps: {
-          templatesConfig: {},
           templates,
-          useCustomCompileOptions: {},
         },
         toggleRefinement: () => {},
         createURL: () => '',
@@ -605,7 +586,7 @@ describe('RefinementList', () => {
     it('with facets from search', () => {
       const templates = {
         item: (item: RefinementListItemData) => item.value,
-        showMoreText: '',
+        showMoreText: () => '',
       };
       type TestTemplates = typeof templates;
 
@@ -631,18 +612,14 @@ describe('RefinementList', () => {
         searchPlaceholder: 'Search',
         searchFacetValues: (x) => x,
         templateProps: {
-          templatesConfig: {},
           templates,
-          useCustomCompileOptions: {},
         },
         searchBoxTemplateProps: {
-          templatesConfig: {},
           templates: {
-            reset: 'reset',
-            submit: 'submit',
-            loadingIndicator: 'loadingIndicator',
+            reset: () => 'reset',
+            submit: () => 'submit',
+            loadingIndicator: () => 'loadingIndicator',
           },
-          useCustomCompileOptions: {},
         },
         toggleRefinement: () => {},
         createURL: () => '',
@@ -656,13 +633,13 @@ describe('RefinementList', () => {
       const toggleRefinement = jest.fn();
 
       const templates = {
-        item: (item: RefinementListItemData) => `
-              <label>
-                <input type="radio" checked="${item.isRefined}" />
-                ${item.value}
-              </label>
-            `,
-        showMoreText: '',
+        item: (item: RefinementListItemData, { html }: TemplateParams) => html`
+          <label>
+            <input type="radio" checked="${item.isRefined}" />
+            ${item.value}
+          </label>
+        `,
+        showMoreText: () => '',
       };
       type TestTemplates = typeof templates;
 
@@ -677,18 +654,20 @@ describe('RefinementList', () => {
           item: 'item',
         },
         templateProps: {
-          templatesConfig: {},
           templates,
-          useCustomCompileOptions: {},
         },
         toggleRefinement,
         createURL: () => '',
       };
 
-      const { container } = render(<RefinementList {...props} />);
-      const checkedItem = container.querySelector('.item [checked="true"]');
+      const { getByRole } = render(<RefinementList {...props} />);
+      const checkedItem = getByRole('radio', {
+        name: /bar/i,
+      });
+
+      expect(checkedItem).toBeChecked();
 
-      fireEvent.click(checkedItem!);
+      fireEvent.click(checkedItem);
 
       expect(toggleRefinement).toHaveBeenCalledTimes(0);
     });
diff --git a/packages/instantsearch.js/src/components/RefinementList/__tests__/__snapshots__/RefinementList-test.tsx.snap b/packages/instantsearch.js/src/components/RefinementList/__tests__/__snapshots__/RefinementList-test.tsx.snap
index 9585194451..2e67deb861 100644
--- a/packages/instantsearch.js/src/components/RefinementList/__tests__/__snapshots__/RefinementList-test.tsx.snap
+++ b/packages/instantsearch.js/src/components/RefinementList/__tests__/__snapshots__/RefinementList-test.tsx.snap
@@ -11,12 +11,16 @@ exports[`RefinementList rendering with facets 1`] = `
       <li
         class="item"
       >
-        <div />
+        <div>
+          
+        </div>
       </li>
       <li
         class="item selectedItem"
       >
-        <div />
+        <div>
+          
+        </div>
       </li>
     </ul>
   </div>
@@ -34,12 +38,16 @@ exports[`RefinementList rendering with facets and disabled show more 1`] = `
       <li
         class="item"
       >
-        <div />
+        <div>
+          
+        </div>
       </li>
       <li
         class="item selectedItem"
       >
-        <div />
+        <div>
+          
+        </div>
       </li>
     </ul>
     <button
@@ -63,12 +71,16 @@ exports[`RefinementList rendering with facets and show more 1`] = `
       <li
         class="item"
       >
-        <div />
+        <div>
+          
+        </div>
       </li>
       <li
         class="item selectedItem"
       >
-        <div />
+        <div>
+          
+        </div>
       </li>
     </ul>
     <button
@@ -138,12 +150,16 @@ exports[`RefinementList rendering with facets from search 1`] = `
       <li
         class="item"
       >
-        <div />
+        <div>
+          
+        </div>
       </li>
       <li
         class="item selectedItem"
       >
-        <div />
+        <div>
+          
+        </div>
       </li>
     </ul>
   </div>
diff --git a/packages/instantsearch.js/src/components/RefinementList/__tests__/__snapshots__/RefinementListItem-test.tsx.snap b/packages/instantsearch.js/src/components/RefinementList/__tests__/__snapshots__/RefinementListItem-test.tsx.snap
index ce9ed4b92d..243ce9ba1a 100644
--- a/packages/instantsearch.js/src/components/RefinementList/__tests__/__snapshots__/RefinementListItem-test.tsx.snap
+++ b/packages/instantsearch.js/src/components/RefinementList/__tests__/__snapshots__/RefinementListItem-test.tsx.snap
@@ -15,8 +15,6 @@ exports[`RefinementListItem renders an item 1`] = `
     template="props"
     templateKey="item key"
     templates={{}}
-    templatesConfig={{}}
-    useCustomCompileOptions={{}}
   />
   <div />
 </li>
diff --git a/packages/instantsearch.js/src/components/RelevantSort/__tests__/RelevantSort-test.tsx b/packages/instantsearch.js/src/components/RelevantSort/__tests__/RelevantSort-test.tsx
index e7c30dabec..42ba2e91c2 100644
--- a/packages/instantsearch.js/src/components/RelevantSort/__tests__/RelevantSort-test.tsx
+++ b/packages/instantsearch.js/src/components/RelevantSort/__tests__/RelevantSort-test.tsx
@@ -17,7 +17,7 @@ const cssClasses = {
 };
 
 const templates: RelevantSortComponentTemplates = {
-  text: '',
+  text: () => '',
   button: ({ isRelevantSorted }) => {
     return isRelevantSorted ? 'See all results' : 'See relevant results';
   },
@@ -54,7 +54,9 @@ describe('RelevantSort', () => {
         >
           <div
             class="text"
-          />
+          >
+            
+          </div>
           <button
             class="button"
             type="button"
@@ -100,7 +102,9 @@ describe('RelevantSort', () => {
         >
           <div
             class="text"
-          />
+          >
+            
+          </div>
           <button
             class="button"
             type="button"
diff --git a/packages/instantsearch.js/src/components/Stats/__tests__/Stats-test.tsx b/packages/instantsearch.js/src/components/Stats/__tests__/Stats-test.tsx
index 70a4043b91..31a1e15c1d 100644
--- a/packages/instantsearch.js/src/components/Stats/__tests__/Stats-test.tsx
+++ b/packages/instantsearch.js/src/components/Stats/__tests__/Stats-test.tsx
@@ -7,7 +7,6 @@ import { mount } from '@instantsearch/testutils/enzyme';
 import { render } from '@testing-library/preact';
 import { h } from 'preact';
 
-import createHelpers from '../../../lib/createHelpers';
 import defaultTemplates from '../../../widgets/stats/defaultTemplates';
 import Stats from '../Stats';
 
@@ -36,12 +35,9 @@ describe('Stats', () => {
       >
         <span
           className="text"
-          dangerouslySetInnerHTML={
-            {
-              "__html": "1,234 results found in 42ms",
-            }
-          }
-        />
+        >
+          1,234 results found in 42ms
+        </span>
       </div>
     `);
   });
@@ -70,9 +66,6 @@ describe('Stats', () => {
         {...getProps({ nbSortedHits: 150, areHitsSorted: true })}
         templateProps={{
           templates: defaultTemplates,
-          templatesConfig: {
-            helpers: createHelpers({}),
-          },
         }}
       />
     );
@@ -91,9 +84,6 @@ describe('Stats', () => {
         {...getProps({ nbSortedHits: 1, areHitsSorted: true })}
         templateProps={{
           templates: defaultTemplates,
-          templatesConfig: {
-            helpers: createHelpers({}),
-          },
         }}
       />
     );
@@ -112,9 +102,6 @@ describe('Stats', () => {
         {...getProps({ areHitsSorted: true })}
         templateProps={{
           templates: defaultTemplates,
-          templatesConfig: {
-            helpers: createHelpers({}),
-          },
         }}
       />
     );
diff --git a/packages/instantsearch.js/src/components/Template/Template.tsx b/packages/instantsearch.js/src/components/Template/Template.tsx
index 7e542846ec..3833b344ed 100644
--- a/packages/instantsearch.js/src/components/Template/Template.tsx
+++ b/packages/instantsearch.js/src/components/Template/Template.tsx
@@ -1,54 +1,19 @@
 /** @jsx h */
 
-import { h, Component, Fragment, createRef } from 'preact';
+import { h, Component, Fragment } from 'preact';
 
 import { renderTemplate } from '../../lib/templating';
-import { warning, isEqual } from '../../lib/utils';
+import { isEqual } from '../../lib/utils';
 
 import type { PreparedTemplateProps } from '../../lib/templating';
-import type { BindEventForHits, SendEventForHits } from '../../lib/utils';
+import type { SendEventForHits } from '../../lib/utils';
 import type { Templates } from '../../types';
 import type { JSX } from 'preact';
 
-class RawHtml extends Component<{ content: string }> {
-  ref = createRef();
-  nodes: ChildNode[] = [];
-
-  componentDidMount() {
-    const fragment = new DocumentFragment();
-    const root = document.createElement('div');
-    root.innerHTML = this.props.content;
-    this.nodes = [...root.childNodes];
-    this.nodes.forEach((node) => fragment.appendChild(node));
-    this.ref.current.replaceWith(fragment);
-  }
-
-  componentWillUnmount() {
-    this.nodes.forEach((node) => {
-      if (node instanceof Element) {
-        node.outerHTML = '';
-        return;
-      }
-      node.nodeValue = '';
-    });
-    // if there is one TextNode first and one TextNode last, the
-    // last one's nodeValue will be assigned to the first.
-    if (this.nodes[0].nodeValue) {
-      this.nodes[0].nodeValue = '';
-    }
-  }
-
-  render() {
-    return <div ref={this.ref} />;
-  }
-}
-
 const defaultProps = {
   data: {},
   rootTagName: 'div',
-  useCustomCompileOptions: {},
   templates: {},
-  templatesConfig: {},
 };
 
 export type TemplateProps = {
@@ -56,7 +21,6 @@ export type TemplateProps = {
   rootProps?: Record<string, any>;
   rootTagName: keyof JSX.IntrinsicElements | 'fragment';
   templateKey: string;
-  bindEvent?: BindEventForHits;
   sendEvent?: SendEventForHits;
 } & PreparedTemplateProps<Templates> &
   Readonly<typeof defaultProps>;
@@ -74,38 +38,13 @@ class Template extends Component<TemplateProps> {
   }
 
   public render() {
-    if (__DEV__) {
-      const nonFunctionTemplates = Object.keys(this.props.templates).filter(
-        (key) => typeof this.props.templates[key] !== 'function'
-      );
-      warning(
-        nonFunctionTemplates.length === 0,
-        `Hogan.js and string-based templates are deprecated and will not be supported in InstantSearch.js 5.x.
-
-You can replace them with function-form templates and use either the provided \`html\` function or JSX templates.
-
-String-based templates: ${nonFunctionTemplates.join(', ')}.
-
-See: https://www.algolia.com/doc/guides/building-search-ui/upgrade-guides/js/#upgrade-templates`
-      );
-    }
-
     const RootTagName =
       this.props.rootTagName === 'fragment' ? Fragment : this.props.rootTagName;
 
-    const useCustomCompileOptions =
-      this.props.useCustomCompileOptions[this.props.templateKey];
-    const compileOptions = useCustomCompileOptions
-      ? this.props.templatesConfig.compileOptions
-      : {};
-
     const content = renderTemplate({
       templates: this.props.templates,
       templateKey: this.props.templateKey,
-      compileOptions,
-      helpers: this.props.templatesConfig.helpers,
       data: this.props.data,
-      bindEvent: this.props.bindEvent,
       sendEvent: this.props.sendEvent,
     });
 
@@ -115,21 +54,7 @@ See: https://www.algolia.com/doc/guides/building-search-ui/upgrade-guides/js/#up
       return null;
     }
 
-    if (typeof content === 'object') {
-      return <RootTagName {...this.props.rootProps}>{content}</RootTagName>;
-    }
-
-    // This is to handle Hogan templates with Fragment as rootTagName
-    if (RootTagName === Fragment) {
-      return <RawHtml content={content} key={Math.random()} />;
-    }
-
-    return (
-      <RootTagName
-        {...this.props.rootProps}
-        dangerouslySetInnerHTML={{ __html: content }}
-      />
-    );
+    return <RootTagName {...this.props.rootProps}>{content}</RootTagName>;
   }
 }
 
diff --git a/packages/instantsearch.js/src/components/Template/__tests__/Template-test.tsx b/packages/instantsearch.js/src/components/Template/__tests__/Template-test.tsx
index 5b66867999..47122c9343 100644
--- a/packages/instantsearch.js/src/components/Template/__tests__/Template-test.tsx
+++ b/packages/instantsearch.js/src/components/Template/__tests__/Template-test.tsx
@@ -13,12 +13,10 @@ import Template from '../Template';
 import type { TemplateProps } from '../Template';
 
 function getProps({
-  templates = { test: '' },
+  templates = { test: () => '' },
   data = {},
   templateKey = 'test',
   rootProps = {},
-  useCustomCompileOptions = {},
-  templatesConfig = { helpers: {}, compileOptions: {} },
   ...props
 }: Partial<TemplateProps>) {
   return {
@@ -27,8 +25,6 @@ function getProps({
     data,
     templateKey,
     rootProps,
-    useCustomCompileOptions,
-    templatesConfig,
   };
 }
 
@@ -37,18 +33,6 @@ describe('Template', () => {
     warning.cache = {};
   });
 
-  it('can configure compilation options', () => {
-    const props = getProps({
-      templates: { test: 'it configures compilation <%options%>' },
-      data: { options: 'delimiters' },
-      useCustomCompileOptions: { test: true },
-      templatesConfig: { helpers: {}, compileOptions: { delimiters: '<% %>' } },
-    });
-    const wrapper = mount(<Template {...props} />);
-
-    expect(wrapper).toMatchSnapshot();
-  });
-
   it('can configure custom rootTagName', () => {
     const props = getProps({ rootTagName: 'span' });
     const wrapper = mount(<Template {...props} />);
@@ -56,23 +40,6 @@ describe('Template', () => {
     expect(wrapper).toMatchSnapshot();
   });
 
-  it('can have Fragment as rootTagName with string template', () => {
-    const props = getProps({
-      rootTagName: 'fragment',
-      templates: { test: 'Hello <span>{{name}}</span> !' },
-      data: { name: 'world' },
-    });
-    const wrapper = render(<Template {...props} />);
-
-    expect(wrapper.container).toMatchSnapshot();
-
-    props.data = { name: 'world2' };
-
-    wrapper.rerender(<Template {...props} />);
-
-    expect(wrapper.container).toMatchSnapshot();
-  });
-
   it('can have Fragment as rootTagName with Preact template', () => {
     const props = getProps({
       rootTagName: 'fragment',
@@ -83,37 +50,6 @@ describe('Template', () => {
     expect(wrapper.container).toMatchSnapshot();
   });
 
-  it('can have Fragment as rootTagName with simple string', () => {
-    const props = getProps({
-      rootTagName: 'fragment',
-      templates: { test: 'test' },
-    });
-    const wrapper = render(<Template {...props} />);
-
-    expect(wrapper.container).toMatchSnapshot();
-  });
-
-  it('remounts RawHtml component when using Fragment with a string template', () => {
-    const props = getProps({
-      rootTagName: 'fragment',
-      templates: { test: 'test' },
-    });
-    const wrapper = render(
-      <div>
-        <Template {...props} />
-      </div>
-    );
-    wrapper.rerender(
-      <div>
-        <div>Hello</div>
-        {/* It won't rerender if props don't change in testing-library */}
-        <Template {...props} data={{ a: 'a' }} />
-      </div>
-    );
-
-    expect(wrapper.container).toMatchSnapshot();
-  });
-
   it('forward rootProps to the first node', () => {
     function onClick() {}
 
@@ -125,29 +61,6 @@ describe('Template', () => {
     expect(wrapper).toMatchSnapshot();
   });
 
-  it('warns when using string-based templates', () => {
-    expect(() =>
-      render(
-        <Template
-          {...getProps({ templates: { test: 'test', test2: () => 'test' } })}
-        />
-      )
-    )
-      .toWarnDev(`[InstantSearch.js]: Hogan.js and string-based templates are deprecated and will not be supported in InstantSearch.js 5.x.
-
-You can replace them with function-form templates and use either the provided \`html\` function or JSX templates.
-
-String-based templates: test.
-
-See: https://www.algolia.com/doc/guides/building-search-ui/upgrade-guides/js/#upgrade-templates`);
-  });
-
-  it('does not warn when using exclusively function-based templates', () => {
-    expect(() =>
-      render(<Template {...getProps({ templates: { test: () => 'test' } })} />)
-    ).not.toWarnDev();
-  });
-
   describe('shouldComponentUpdate', () => {
     it('does not call render when no change in data', () => {
       const props = getProps({
@@ -185,7 +98,7 @@ See: https://www.algolia.com/doc/guides/building-search-ui/upgrade-guides/js/#up
       wrapper.setProps({
         templateKey: 'newTemplateKey',
         templates: {
-          newTemplateKey: '',
+          newTemplateKey: () => '',
         },
       });
 
diff --git a/packages/instantsearch.js/src/components/Template/__tests__/__snapshots__/Template-test.tsx.snap b/packages/instantsearch.js/src/components/Template/__tests__/__snapshots__/Template-test.tsx.snap
index 603f9df727..d79fd1c3c6 100644
--- a/packages/instantsearch.js/src/components/Template/__tests__/__snapshots__/Template-test.tsx.snap
+++ b/packages/instantsearch.js/src/components/Template/__tests__/__snapshots__/Template-test.tsx.snap
@@ -1,24 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Template can configure compilation options 1`] = `
-<div
-  dangerouslySetInnerHTML={
-    {
-      "__html": "it configures compilation delimiters",
-    }
-  }
-/>
-`;
-
-exports[`Template can configure custom rootTagName 1`] = `
-<span
-  dangerouslySetInnerHTML={
-    {
-      "__html": "",
-    }
-  }
-/>
-`;
+exports[`Template can configure custom rootTagName 1`] = `<span />`;
 
 exports[`Template can have Fragment as rootTagName with Preact template 1`] = `
 <div>
@@ -28,54 +10,9 @@ exports[`Template can have Fragment as rootTagName with Preact template 1`] = `
 </div>
 `;
 
-exports[`Template can have Fragment as rootTagName with simple string 1`] = `
-<div>
-  test
-</div>
-`;
-
-exports[`Template can have Fragment as rootTagName with string template 1`] = `
-<div>
-  Hello 
-  <span>
-    world
-  </span>
-   !
-</div>
-`;
-
-exports[`Template can have Fragment as rootTagName with string template 2`] = `
-<div>
-  
-  
-  Hello 
-  <span>
-    world2
-  </span>
-   !
-</div>
-`;
-
 exports[`Template forward rootProps to the first node 1`] = `
 <div
   className="className"
-  dangerouslySetInnerHTML={
-    {
-      "__html": "",
-    }
-  }
   onClick={[Function]}
 />
 `;
-
-exports[`Template remounts RawHtml component when using Fragment with a string template 1`] = `
-<div>
-  <div>
-    
-    <div>
-      Hello
-    </div>
-    test
-  </div>
-</div>
-`;
diff --git a/packages/instantsearch.js/src/components/VoiceSearch/__tests__/VoiceSearch-test.tsx b/packages/instantsearch.js/src/components/VoiceSearch/__tests__/VoiceSearch-test.tsx
index d14c32fbae..b8a9be2eb4 100644
--- a/packages/instantsearch.js/src/components/VoiceSearch/__tests__/VoiceSearch-test.tsx
+++ b/packages/instantsearch.js/src/components/VoiceSearch/__tests__/VoiceSearch-test.tsx
@@ -25,8 +25,8 @@ const defaultProps: VoiceSearchProps = {
     transcript: '',
   },
   templates: {
-    buttonText: 'button',
-    status: 'status',
+    buttonText: () => 'button',
+    status: () => 'status',
   },
 };
 
@@ -72,7 +72,7 @@ describe('VoiceSearch', () => {
         isListening: true,
         templates: {
           buttonText: ({ isListening }) => (isListening ? 'Stop' : 'Start'),
-          status: ``,
+          status: () => ``,
         },
       };
 
@@ -88,7 +88,7 @@ describe('VoiceSearch', () => {
         isListening: false,
         templates: {
           buttonText: ({ isListening }) => (isListening ? 'Stop' : 'Start'),
-          status: ``,
+          status: () => ``,
         },
       };
 
@@ -109,14 +109,24 @@ describe('VoiceSearch', () => {
           errorCode: undefined,
         },
         templates: {
-          buttonText: ``,
-          status: `
-            <p>status: {{status}}</p>
-            <p>errorCode: {{errorCode}}</p>
-            <p>isListening: {{isListening}}</p>
-            <p>transcript: {{transcript}}</p>
-            <p>isSpeechFinal: {{isSpeechFinal}}</p>
-            <p>isBrowserSupported: {{isBrowserSupported}}</p>
+          buttonText: () => ``,
+          status: (
+            {
+              status,
+              errorCode,
+              isListening,
+              transcript,
+              isSpeechFinal,
+              isBrowserSupported,
+            },
+            { html }
+          ) => html`
+            <p>status: ${status}</p>
+            <p>errorCode: ${errorCode}</p>
+            <p>isListening: ${isListening}</p>
+            <p>transcript: ${transcript}</p>
+            <p>isSpeechFinal: ${isSpeechFinal}</p>
+            <p>isBrowserSupported: ${isBrowserSupported}</p>
           `,
         },
       };
diff --git a/packages/instantsearch.js/src/components/VoiceSearch/__tests__/__snapshots__/VoiceSearch-test.tsx.snap b/packages/instantsearch.js/src/components/VoiceSearch/__tests__/__snapshots__/VoiceSearch-test.tsx.snap
index 0ee10b22c6..965f19efeb 100644
--- a/packages/instantsearch.js/src/components/VoiceSearch/__tests__/__snapshots__/VoiceSearch-test.tsx.snap
+++ b/packages/instantsearch.js/src/components/VoiceSearch/__tests__/__snapshots__/VoiceSearch-test.tsx.snap
@@ -5,27 +5,24 @@ exports[`VoiceSearch Rendering with custom template for status 1`] = `
   class="status"
 >
   <p>
-    status: recognizing
+    status: 
+    recognizing
   </p>
-   
   <p>
     errorCode: 
   </p>
-   
   <p>
-    isListening: true
+    isListening: 
   </p>
-   
   <p>
-    transcript: Hello
+    transcript: 
+    Hello
   </p>
-   
   <p>
-    isSpeechFinal: false
+    isSpeechFinal: 
   </p>
-   
   <p>
-    isBrowserSupported: true
+    isBrowserSupported: 
   </p>
 </div>
 `;
diff --git a/packages/instantsearch.js/src/lib/InstantSearch.ts b/packages/instantsearch.js/src/lib/InstantSearch.ts
index d9b9dd61d5..66b6ae1f61 100644
--- a/packages/instantsearch.js/src/lib/InstantSearch.ts
+++ b/packages/instantsearch.js/src/lib/InstantSearch.ts
@@ -9,7 +9,6 @@ import {
 import { createRouterMiddleware } from '../middlewares/createRouterMiddleware';
 import index from '../widgets/index/index';
 
-import createHelpers from './createHelpers';
 import {
   createDocumentationMessageGenerator,
   createDocumentationLink,
@@ -223,7 +222,6 @@ class InstantSearch<
   public mainHelper: AlgoliaSearchHelper | null;
   public mainIndex: IndexWidget;
   public started: boolean;
-  public templatesConfig: Record<string, unknown>;
   public renderState: RenderState = {};
   public _stalledSearchDelay: number;
   public _searchStalledTimer: any;
@@ -273,7 +271,6 @@ Use \`InstantSearch.status === "stalled"\` instead.`
     const {
       indexName = '',
       compositionID,
-      numberLocale,
       initialUiState = {} as TUiState,
       routing = null,
       insights = undefined,
@@ -362,10 +359,6 @@ See documentation: ${createDocumentationLink({
     this.onStateChange = onStateChange;
 
     this.started = false;
-    this.templatesConfig = {
-      helpers: createHelpers({ numberLocale }),
-      compileOptions: {},
-    };
 
     this._stalledSearchDelay = stalledSearchDelay;
     this._searchStalledTimer = null;
diff --git a/packages/instantsearch.js/src/lib/__tests__/createHelpers.tests.ts b/packages/instantsearch.js/src/lib/__tests__/createHelpers.tests.ts
deleted file mode 100644
index b235592f6e..0000000000
--- a/packages/instantsearch.js/src/lib/__tests__/createHelpers.tests.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * @jest-environment jsdom
- */
-
-import { insights } from '../../helpers';
-import createHelpers from '../createHelpers';
-import { renderTemplate } from '../templating';
-
-describe('insights hogan helper', () => {
-  const helpers = createHelpers({ numberLocale: 'en-US' });
-  it('should produce the same output as the insights function', () => {
-    const warn = jest.spyOn(global.console, 'warn');
-    warn.mockImplementation(() => {});
-
-    const output = renderTemplate({
-      templateKey: 'item',
-      templates: {
-        item: `
-        <button {{#helpers.insights}}{
-          "method": "clickedObjectIDsAfterSearch",
-          "payload": {"eventName": "Add to cart"}
-        }{{/helpers.insights}}>Add to cart</button>
-        `,
-      },
-      helpers,
-      data: {
-        objectID: 'xxx',
-      },
-    }) as string;
-
-    const expected = `<button ${insights('clickedObjectIDsAfterSearch', {
-      objectIDs: ['xxx'],
-      eventName: 'Add to cart',
-    })}>Add to cart</button>
-    `;
-
-    expect(output.trim()).toEqual(expected.trim());
-
-    expect(warn).toHaveBeenLastCalledWith(
-      `[InstantSearch.js]: \`insights\` function has been deprecated. It is still supported in 4.x releases, but not further. It is replaced by the \`insights\` middleware.
-
-For more information, visit https://www.algolia.com/doc/guides/getting-insights-and-analytics/search-analytics/click-through-and-conversions/how-to/send-click-and-conversion-events-with-instantsearch/js/`
-    );
-
-    warn.mockReset();
-    warn.mockRestore();
-  });
-
-  it('should throw an error if the provided string cannot be JSON parsed', () => {
-    expect(() =>
-      renderTemplate({
-        templateKey: 'item',
-        templates: {
-          item: `
-        <button {{#helpers.insights}}{
-            invalid json
-        }{{/helpers.insights}}>Add to cart</button>
-        `,
-        },
-        helpers,
-        data: {
-          objectID: 'xxx',
-        },
-      })
-    ).toThrowErrorMatchingInlineSnapshot(`
-"
-The insights helper expects a JSON object of the format:
-{ \\"method\\": \\"method-name\\", \\"payload\\": { \\"eventName\\": \\"name of the event\\" } }"
-`);
-  });
-});
diff --git a/packages/instantsearch.js/src/lib/createHelpers.ts b/packages/instantsearch.js/src/lib/createHelpers.ts
deleted file mode 100644
index cebbe5a3a0..0000000000
--- a/packages/instantsearch.js/src/lib/createHelpers.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import {
-  highlight,
-  reverseHighlight,
-  snippet,
-  reverseSnippet,
-  insights,
-} from '../helpers';
-
-import { formatNumber } from './formatNumber';
-
-import type {
-  HighlightOptions,
-  ReverseHighlightOptions,
-  SnippetOptions,
-  ReverseSnippetOptions,
-} from '../helpers';
-import type {
-  Hit,
-  HoganHelpers,
-  InsightsClientMethod,
-  InsightsClientPayload,
-} from '../types';
-
-type DefaultHoganHelpers = HoganHelpers<
-  | 'formatNumber'
-  | 'highlight'
-  | 'reverseHighlight'
-  | 'snippet'
-  | 'reverseSnippet'
-  | 'insights'
->;
-
-export default function hoganHelpers({
-  numberLocale,
-}: {
-  numberLocale?: string;
-}): DefaultHoganHelpers {
-  return {
-    formatNumber(value, render) {
-      return formatNumber(Number(render(value)), numberLocale);
-    },
-    highlight(options, render) {
-      try {
-        const highlightOptions: Omit<HighlightOptions, 'hit'> =
-          JSON.parse(options);
-
-        return render(
-          highlight({
-            ...highlightOptions,
-            hit: this,
-          })
-        );
-      } catch (error) {
-        throw new Error(`
-The highlight helper expects a JSON object of the format:
-{ "attribute": "name", "highlightedTagName": "mark" }`);
-      }
-    },
-    reverseHighlight(options, render) {
-      try {
-        const reverseHighlightOptions: Omit<ReverseHighlightOptions, 'hit'> =
-          JSON.parse(options);
-
-        return render(
-          reverseHighlight({
-            ...reverseHighlightOptions,
-            hit: this,
-          })
-        );
-      } catch (error) {
-        throw new Error(`
-  The reverseHighlight helper expects a JSON object of the format:
-  { "attribute": "name", "highlightedTagName": "mark" }`);
-      }
-    },
-    snippet(options, render) {
-      try {
-        const snippetOptions: Omit<SnippetOptions, 'hit'> = JSON.parse(options);
-
-        return render(
-          snippet({
-            ...snippetOptions,
-            hit: this,
-          })
-        );
-      } catch (error) {
-        throw new Error(`
-The snippet helper expects a JSON object of the format:
-{ "attribute": "name", "highlightedTagName": "mark" }`);
-      }
-    },
-    reverseSnippet(options, render) {
-      try {
-        const reverseSnippetOptions: Omit<ReverseSnippetOptions, 'hit'> =
-          JSON.parse(options);
-
-        return render(
-          reverseSnippet({
-            ...reverseSnippetOptions,
-            hit: this,
-          })
-        );
-      } catch (error) {
-        throw new Error(`
-  The reverseSnippet helper expects a JSON object of the format:
-  { "attribute": "name", "highlightedTagName": "mark" }`);
-      }
-    },
-    insights(this: Hit, options, render) {
-      try {
-        type InsightsHelperOptions = {
-          method: InsightsClientMethod;
-          payload: Partial<InsightsClientPayload>;
-        };
-        const { method, payload }: InsightsHelperOptions = JSON.parse(options);
-
-        return render(
-          insights(method, { objectIDs: [this.objectID], ...payload })
-        );
-      } catch (error) {
-        throw new Error(`
-The insights helper expects a JSON object of the format:
-{ "method": "method-name", "payload": { "eventName": "name of the event" } }`);
-      }
-    },
-  };
-}
diff --git a/packages/instantsearch.js/src/lib/templating/__tests__/prepareTemplateProps.test.ts b/packages/instantsearch.js/src/lib/templating/__tests__/prepareTemplateProps.test.ts
index 146fbe4c01..4e96b2a6bb 100644
--- a/packages/instantsearch.js/src/lib/templating/__tests__/prepareTemplateProps.test.ts
+++ b/packages/instantsearch.js/src/lib/templating/__tests__/prepareTemplateProps.test.ts
@@ -2,66 +2,24 @@ import { prepareTemplateProps } from '../prepareTemplateProps';
 
 describe('prepareTemplateProps', () => {
   const defaultTemplates = {
-    foo: 'toto',
-    bar: 'tata',
+    foo: () => 'toto',
+    bar: () => 'tata',
   };
-  const templatesConfig = {};
 
-  it('should return the default templates and set useCustomCompileOptions to false when using the defaults', () => {
-    const defaultsPrepared = prepareTemplateProps({
-      defaultTemplates,
-      templates: undefined,
-      templatesConfig,
-    });
-
-    expect(defaultsPrepared.useCustomCompileOptions).toEqual({
-      foo: false,
-      bar: false,
-    });
-    expect(defaultsPrepared.templates).toEqual(defaultTemplates);
-    expect(defaultsPrepared.templatesConfig).toBe(templatesConfig);
-  });
-
-  it('should return the missing default templates and set useCustomCompileOptions for the custom template', () => {
-    const templates = { foo: 'baz' };
-    const defaultsPrepared = prepareTemplateProps({
-      defaultTemplates,
-      templates,
-      templatesConfig,
-    });
-
-    expect(defaultsPrepared.useCustomCompileOptions).toEqual({
-      foo: true,
-      bar: false,
-    });
-    expect(defaultsPrepared.templates).toEqual({
-      ...defaultTemplates,
-      ...templates,
-    });
-    expect(defaultsPrepared.templatesConfig).toBe(templatesConfig);
-  });
-
-  it('should add also the templates that are not in the defaults', () => {
+  it('should override the default templates with the user provided templates', () => {
     const templates = {
-      foo: 'something else',
-      baz: 'Of course!',
+      foo: () => 'something else',
+      baz: () => 'Of course!',
     };
 
     const preparedProps = prepareTemplateProps({
       defaultTemplates,
       templates,
-      templatesConfig,
     });
 
-    expect(preparedProps.useCustomCompileOptions).toEqual({
-      foo: true,
-      bar: false,
-      baz: true,
-    });
     expect(preparedProps.templates).toEqual({
       ...defaultTemplates,
       ...templates,
     });
-    expect(preparedProps.templatesConfig).toBe(templatesConfig);
   });
 });
diff --git a/packages/instantsearch.js/src/lib/templating/__tests__/renderTemplate.test.ts b/packages/instantsearch.js/src/lib/templating/__tests__/renderTemplate.test.ts
index 7931e975a1..59a559d3c5 100644
--- a/packages/instantsearch.js/src/lib/templating/__tests__/renderTemplate.test.ts
+++ b/packages/instantsearch.js/src/lib/templating/__tests__/renderTemplate.test.ts
@@ -1,12 +1,14 @@
 import { renderTemplate } from '../renderTemplate';
 
-import type { HoganHelpers } from '../../../types';
+import type { Template } from '../../../types';
 
 describe('renderTemplate', () => {
-  it('expect to process templates as string', () => {
+  it('expect to process templates as function', () => {
     const templateKey = 'test';
-    const templates = { test: 'it works with {{type}}' };
-    const data = { type: 'strings' };
+    const data = { type: 'functions' };
+    const templates: { [key: string]: Template<typeof data> } = {
+      test: (d) => `it works with ${d.type}`,
+    };
 
     const actual = renderTemplate({
       templateKey,
@@ -14,16 +16,16 @@ describe('renderTemplate', () => {
       data,
     });
 
-    const expectation = 'it works with strings';
+    const expectation = 'it works with functions';
 
     expect(actual).toBe(expectation);
   });
 
-  it('expect to process templates as function', () => {
+  it('expect to process templates as html function', () => {
     const templateKey = 'test';
     const data = { type: 'functions' };
-    const templates = {
-      test: (d: typeof data) => `it works with ${d.type}`,
+    const templates: { [key: string]: Template<typeof data> } = {
+      test: (d, { html }) => html`<p>it works with ${d.type}</p>`,
     };
 
     const actual = renderTemplate({
@@ -32,49 +34,28 @@ describe('renderTemplate', () => {
       data,
     });
 
-    const expectation = 'it works with functions';
-
-    expect(actual).toBe(expectation);
+    expect(actual).toEqual(expect.objectContaining({ type: 'p' }));
   });
 
-  it('expect to use custom compiler options', () => {
+  it('expect to process templates as string', () => {
     const templateKey = 'test';
-    const templates = { test: 'it works with <%options%>' };
-    const data = { options: 'custom delimiter' };
-    const compileOptions = { delimiters: '<% %>' };
+    const data = { type: 'functions' };
+    const templates = {
+      test: 'it works with simple strings',
+    };
 
     const actual = renderTemplate({
       templateKey,
       templates,
       data,
-      compileOptions,
     });
 
-    const expectation = 'it works with custom delimiter';
+    const expectation = 'it works with simple strings';
 
     expect(actual).toBe(expectation);
   });
 
-  it('expect to compress templates', () => {
-    expect(
-      renderTemplate({
-        templateKey: 'message',
-        templates: {
-          message: ` <h1> hello</h1>
-        <p>message</p> `,
-        },
-      })
-    ).toMatchInlineSnapshot(`
-      <h1>
-        hello
-      </h1>
-      <p>
-        message
-      </p>
-    `);
-  });
-
-  it('expect to throw when the template is not a function or a string', () => {
+  it('expect to throw when the template is not a function', () => {
     const actual0 = () =>
       renderTemplate({
         templateKey: 'test',
@@ -95,70 +76,12 @@ describe('renderTemplate', () => {
         templates: { test: 10 },
       });
 
-    const expectation0 = `Template must be 'string' or 'function', was 'undefined' (key: test)`;
-    const expectation1 = `Template must be 'string' or 'function', was 'object' (key: test)`;
-    const expectation2 = `Template must be 'string' or 'function', was 'number' (key: test)`;
+    const expectation0 = `Template must be 'function', was 'undefined' (key: test)`;
+    const expectation1 = `Template must be 'function', was 'object' (key: test)`;
+    const expectation2 = `Template must be 'function', was 'number' (key: test)`;
 
     expect(() => actual0()).toThrow(expectation0);
     expect(() => actual1()).toThrow(expectation1);
     expect(() => actual2()).toThrow(expectation2);
   });
-
-  describe('with helpers', () => {
-    it('expect to call the relevant function', () => {
-      const templateKey = 'test';
-      const templates = {
-        test: '{{#helpers.emphasis}}{{feature}}{{/helpers.emphasis}}',
-      };
-
-      const data = {
-        feature: 'helpers',
-      };
-
-      const helpers: HoganHelpers<'emphasis'> = {
-        emphasis: (text, render) => `<em>${render(text)}</em>`,
-      };
-
-      const actual = renderTemplate({
-        templateKey,
-        templates,
-        data,
-        helpers,
-      });
-
-      const expectation = '<em>helpers</em>';
-
-      expect(actual).toBe(expectation);
-    });
-
-    it('expect to set the context (`this`) to the template `data`', () => {
-      const templateKey = 'test';
-      const templates = {
-        test: '{{#helpers.emphasis}}{{feature}}{{/helpers.emphasis}}',
-      };
-
-      const data = {
-        feature: 'helpers',
-      };
-
-      const helpers = {
-        emphasis() {
-          // context will be different when using arrow function (lexical scope used)
-          expect(this).toBe(data);
-          return 'irrelevant return';
-        },
-      };
-
-      const actual = renderTemplate({
-        templateKey,
-        templates,
-        data,
-        helpers,
-      });
-
-      const expectation = 'irrelevant return';
-
-      expect(actual).toBe(expectation);
-    });
-  });
 });
diff --git a/packages/instantsearch.js/src/lib/templating/prepareTemplateProps.ts b/packages/instantsearch.js/src/lib/templating/prepareTemplateProps.ts
index 3eab971dc9..b652606b9c 100644
--- a/packages/instantsearch.js/src/lib/templating/prepareTemplateProps.ts
+++ b/packages/instantsearch.js/src/lib/templating/prepareTemplateProps.ts
@@ -1,75 +1,22 @@
-import { uniq } from '../utils/uniq';
-
-import type { HoganHelpers, Templates } from '../../types';
-import type { HoganOptions } from 'hogan.js';
-
-type TemplatesConfig = {
-  helpers?: HoganHelpers;
-  compileOptions?: HoganOptions;
-};
+import type { Templates } from '../../types';
 
 export type PreparedTemplateProps<TTemplates extends Templates> = {
-  templatesConfig: TemplatesConfig;
   templates: TTemplates;
-  useCustomCompileOptions: {
-    [TKey in keyof Partial<TTemplates>]: boolean;
-  };
 };
 
-function prepareTemplates<TTemplates extends Templates>(
-  // can not use = {} here, since the template could have different constraints
-  defaultTemplates?: TTemplates,
-  templates: Partial<TTemplates> = {}
-) {
-  const allKeys = uniq([
-    ...Object.keys(defaultTemplates || {}),
-    ...Object.keys(templates),
-  ]);
-
-  return allKeys.reduce(
-    (config, key: keyof TTemplates) => {
-      const defaultTemplate = defaultTemplates
-        ? defaultTemplates[key]
-        : undefined;
-      const customTemplate = templates[key];
-      const isCustomTemplate =
-        customTemplate !== undefined && customTemplate !== defaultTemplate;
-
-      config.templates[key] = isCustomTemplate
-        ? customTemplate
-        : defaultTemplate!;
-
-      config.useCustomCompileOptions[key] = isCustomTemplate;
-
-      return config;
-    },
-    {
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      templates: {} as TTemplates,
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      useCustomCompileOptions: {} as {
-        [TKey in keyof TTemplates]: boolean;
-      },
-    }
-  );
-}
-
 /**
  * Prepares an object to be passed to the Template widget
  */
 export function prepareTemplateProps<TTemplates extends Templates>({
   defaultTemplates,
   templates,
-  templatesConfig,
 }: {
   defaultTemplates: TTemplates;
   templates?: Partial<TTemplates>;
-  templatesConfig: TemplatesConfig;
 }): PreparedTemplateProps<TTemplates> {
-  const preparedTemplates = prepareTemplates(defaultTemplates, templates);
+  const filteredTemplates = Object.fromEntries(
+    Object.entries(templates || {}).filter(([, value]) => Boolean(value))
+  );
 
-  return {
-    templatesConfig,
-    ...preparedTemplates,
-  };
+  return { templates: { ...defaultTemplates, ...filteredTemplates } };
 }
diff --git a/packages/instantsearch.js/src/lib/templating/renderTemplate.ts b/packages/instantsearch.js/src/lib/templating/renderTemplate.ts
index 7053bfaa64..e730d86e4c 100644
--- a/packages/instantsearch.js/src/lib/templating/renderTemplate.ts
+++ b/packages/instantsearch.js/src/lib/templating/renderTemplate.ts
@@ -1,4 +1,3 @@
-import hogan from 'hogan.js';
 import { html } from 'htm/preact';
 
 import {
@@ -7,99 +6,41 @@ import {
   ReverseSnippet,
   Snippet,
 } from '../../helpers/components';
+import { warning } from '../utils';
 
-import type { Templates, HoganHelpers, TemplateParams } from '../../types';
-import type {
-  BindEventForHits,
-  SendEventForHits,
-} from '../utils/createSendEventForHits';
-import type { HoganOptions, Template } from 'hogan.js';
-
-type TransformedHoganHelpers = {
-  [helper: string]: () => (text: string) => string;
-};
-
-// We add all our template helper methods to the template as lambdas. Note
-// that lambdas in Mustache are supposed to accept a second argument of
-// `render` to get the rendered value, not the literal `{{value}}`. But
-// this is currently broken (see https://github.com/twitter/hogan.js/issues/222).
-function transformHelpersToHogan(
-  helpers: HoganHelpers = {},
-  compileOptions?: HoganOptions,
-  data?: Record<string, any>
-) {
-  return Object.keys(helpers).reduce<TransformedHoganHelpers>(
-    (acc, helperKey) => ({
-      ...acc,
-      [helperKey]() {
-        return (text) => {
-          const render = (value: string) =>
-            (hogan.compile(value, compileOptions) as Template).render(this);
-
-          return helpers[helperKey].call(data, text, render);
-        };
-      },
-    }),
-    {}
-  );
-}
+import type { Templates } from '../../types';
+import type { SendEventForHits } from '../utils/createSendEventForHits';
 
 export function renderTemplate({
   templates,
   templateKey,
-  compileOptions,
-  helpers,
   data,
-  bindEvent,
   sendEvent,
 }: {
   templates: Templates;
   templateKey: string;
-  compileOptions?: HoganOptions;
-  helpers?: HoganHelpers;
   data?: Record<string, any>;
-  bindEvent?: BindEventForHits;
   sendEvent?: SendEventForHits;
 }) {
   const template = templates[templateKey];
 
-  if (typeof template !== 'string' && typeof template !== 'function') {
-    throw new Error(
-      `Template must be 'string' or 'function', was '${typeof template}' (key: ${templateKey})`
+  if (typeof template === 'string') {
+    warning(
+      template.indexOf('<') === -1,
+      `Template '${templateKey}' is a string, it will be rendered as text, not as html`
     );
+    return template;
   }
 
-  if (typeof template === 'function') {
-    // @MAJOR no longer pass bindEvent when string templates are removed
-    const params = (bindEvent || {}) as TemplateParams;
-
-    params.html = html;
-    (params as any).sendEvent = sendEvent;
-    params.components = {
-      Highlight,
-      ReverseHighlight,
-      Snippet,
-      ReverseSnippet,
-    };
-
-    // @MAJOR remove the `as any` when string templates are removed
-    // needed because not every template receives sendEvent
-    return template(data, params as any);
+  if (typeof template !== 'function') {
+    throw new Error(
+      `Template must be 'function', was '${typeof template}' (key: ${templateKey})`
+    );
   }
 
-  const transformedHelpers = transformHelpersToHogan(
-    helpers,
-    compileOptions,
-    data
-  );
-
-  return (hogan.compile(template, compileOptions) as Template)
-    .render({
-      ...data,
-      helpers: transformedHelpers,
-    })
-    .replace(/[ \n\r\t\f\xA0]+/g, (spaces) =>
-      spaces.replace(/(^|\xA0+)[^\xA0]+/g, '$1 ')
-    )
-    .trim();
+  return template(data, {
+    html,
+    components: { Highlight, ReverseHighlight, Snippet, ReverseSnippet },
+    sendEvent: sendEvent!,
+  });
 }
diff --git a/packages/instantsearch.js/src/lib/utils/render-args.ts b/packages/instantsearch.js/src/lib/utils/render-args.ts
index 3eaabbcda7..4b5a2a2f16 100644
--- a/packages/instantsearch.js/src/lib/utils/render-args.ts
+++ b/packages/instantsearch.js/src/lib/utils/render-args.ts
@@ -13,7 +13,6 @@ export function createInitArgs(
     instantSearchInstance,
     state: helper.state,
     renderState: instantSearchInstance.renderState,
-    templatesConfig: instantSearchInstance.templatesConfig,
     createURL: parent.createURL,
     scopedResults: [],
     searchMetadata: {
@@ -40,7 +39,6 @@ export function createRenderArgs(
     scopedResults: parent.getScopedResults(),
     state: results && '_state' in results ? results._state : helper.state,
     renderState: instantSearchInstance.renderState,
-    templatesConfig: instantSearchInstance.templatesConfig,
     createURL: parent.createURL,
     searchMetadata: {
       isSearchStalled: instantSearchInstance.status === 'stalled',
diff --git a/packages/instantsearch.js/src/types/templates.ts b/packages/instantsearch.js/src/types/templates.ts
index 4f38fbd77c..bf1ca934fd 100644
--- a/packages/instantsearch.js/src/types/templates.ts
+++ b/packages/instantsearch.js/src/types/templates.ts
@@ -4,20 +4,14 @@ import type {
   ReverseSnippet,
   Snippet,
 } from '../helpers/components';
-import type {
-  BuiltInBindEventForHits,
-  CustomBindEventForHits,
-  SendEventForHits,
-} from '../lib/utils';
+import type { SendEventForHits } from '../lib/utils';
 import type { html } from 'htm/preact';
 import type { VNode } from 'preact';
 
-export type Template<TTemplateData = void> =
-  | string
-  | ((
-      data: TTemplateData,
-      params: TemplateParams
-    ) => VNode | VNode[] | string | null);
+export type Template<TTemplateData = void> = (
+  data: TTemplateData,
+  params: TemplateParams
+) => VNode | VNode[] | string | null;
 
 export type TemplateParams = {
   html: typeof html;
@@ -30,30 +24,19 @@ export type TemplateParams = {
   sendEvent?: SendEventForHits;
 };
 
-interface TemplateWithBindEventParams extends TemplateParams {
-  /** @deprecated use sendEvent instead */
-  (
-    ...args: Parameters<BuiltInBindEventForHits>
-  ): ReturnType<BuiltInBindEventForHits>;
-  /** @deprecated use sendEvent instead */
-  (
-    ...args: Parameters<CustomBindEventForHits>
-  ): ReturnType<CustomBindEventForHits>;
+interface TemplateWithSendEventParams extends TemplateParams {
   sendEvent: SendEventForHits;
 }
 
-export type TemplateWithBindEvent<TTemplateData = void> =
-  | string
-  | ((
-      data: TTemplateData,
-      params: TemplateWithBindEventParams
-    ) => VNode | VNode[] | string);
+export type TemplateWithSendEvent<TTemplateData = void> = (
+  data: TTemplateData,
+  params: TemplateWithSendEventParams
+) => VNode | VNode[] | string;
 
 export type Templates = {
-  [key: string]: Template<any> | TemplateWithBindEvent<any> | undefined;
+  [key: string]:
+    | Template<any>
+    | TemplateWithSendEvent<any>
+    | string
+    | undefined;
 };
-
-export type HoganHelpers<TKeys extends string = string> = Record<
-  TKeys,
-  (text: string, render: (value: string) => string) => string
->;
diff --git a/packages/instantsearch.js/src/types/widget.ts b/packages/instantsearch.js/src/types/widget.ts
index 0714853dec..c83162bde7 100644
--- a/packages/instantsearch.js/src/types/widget.ts
+++ b/packages/instantsearch.js/src/types/widget.ts
@@ -20,7 +20,6 @@ export type ScopedResult = {
 type SharedRenderOptions = {
   instantSearchInstance: InstantSearch;
   parent: IndexWidget;
-  templatesConfig: Record<string, unknown>;
   scopedResults: ScopedResult[];
   state: SearchParameters;
   renderState: IndexRenderState;
diff --git a/packages/instantsearch.js/src/widgets/answers/__tests__/answers-test.ts b/packages/instantsearch.js/src/widgets/answers/__tests__/answers-test.ts
index cdd1cf7994..6818c7b791 100644
--- a/packages/instantsearch.js/src/widgets/answers/__tests__/answers-test.ts
+++ b/packages/instantsearch.js/src/widgets/answers/__tests__/answers-test.ts
@@ -136,7 +136,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/answers/js/
             item: 'item',
           },
           templates: {
-            loader: 'loading...',
+            loader: () => 'loading...',
             item: (hit) => `title: ${hit.title}`,
           },
         }),
diff --git a/packages/instantsearch.js/src/widgets/answers/answers.tsx b/packages/instantsearch.js/src/widgets/answers/answers.tsx
index b78aab27c1..35ab9efabd 100644
--- a/packages/instantsearch.js/src/widgets/answers/answers.tsx
+++ b/packages/instantsearch.js/src/widgets/answers/answers.tsx
@@ -44,11 +44,10 @@ const renderer =
     };
     templates: AnswersTemplates;
   }): Renderer<AnswersRenderState, Partial<AnswersWidgetParams>> =>
-  ({ hits, isLoading, instantSearchInstance }, isFirstRendering) => {
+  ({ hits, isLoading }, isFirstRendering) => {
     if (isFirstRendering) {
       renderState.templateProps = prepareTemplateProps({
         defaultTemplates,
-        templatesConfig: instantSearchInstance.templatesConfig,
         templates,
       });
       return;
diff --git a/packages/instantsearch.js/src/widgets/breadcrumb/__tests__/breadcrumb.test.tsx b/packages/instantsearch.js/src/widgets/breadcrumb/__tests__/breadcrumb.test.tsx
index 5e77e6ab21..8795f89a93 100644
--- a/packages/instantsearch.js/src/widgets/breadcrumb/__tests__/breadcrumb.test.tsx
+++ b/packages/instantsearch.js/src/widgets/breadcrumb/__tests__/breadcrumb.test.tsx
@@ -75,14 +75,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/breadcrumb/
         breadcrumb({ container, attributes }),
       ]);
 
-      // @MAJOR Once Hogan.js and string-based templates are removed,
-      // `search.start()` can be moved to the test body and the following
-      // assertion can go away.
-      expect(async () => {
-        search.start();
-
-        await wait(0);
-      }).not.toWarnDev();
+      search.start();
 
       await wait(0);
 
diff --git a/packages/instantsearch.js/src/widgets/breadcrumb/breadcrumb.tsx b/packages/instantsearch.js/src/widgets/breadcrumb/breadcrumb.tsx
index 8f0b2f69c1..f7fa016ad0 100644
--- a/packages/instantsearch.js/src/widgets/breadcrumb/breadcrumb.tsx
+++ b/packages/instantsearch.js/src/widgets/breadcrumb/breadcrumb.tsx
@@ -43,14 +43,10 @@ const renderer =
     };
     templates: BreadcrumbTemplates;
   }): Renderer<BreadcrumbRenderState, Partial<BreadcrumbWidgetParams>> =>
-  (
-    { canRefine, createURL, instantSearchInstance, items, refine },
-    isFirstRendering
-  ) => {
+  ({ canRefine, createURL, items, refine }, isFirstRendering) => {
     if (isFirstRendering) {
       renderState.templateProps = prepareTemplateProps({
         defaultTemplates,
-        templatesConfig: instantSearchInstance.templatesConfig,
         templates,
       });
 
diff --git a/packages/instantsearch.js/src/widgets/clear-refinements/__tests__/clear-refinements.test.tsx b/packages/instantsearch.js/src/widgets/clear-refinements/__tests__/clear-refinements.test.tsx
index f10e6fcf0c..bfd10d671a 100644
--- a/packages/instantsearch.js/src/widgets/clear-refinements/__tests__/clear-refinements.test.tsx
+++ b/packages/instantsearch.js/src/widgets/clear-refinements/__tests__/clear-refinements.test.tsx
@@ -96,14 +96,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/clear-refin
         clearRefinements({ container }),
       ]);
 
-      // @MAJOR Once Hogan.js and string-based templates are removed,
-      // `search.start()` can be moved to the test body and the following
-      // assertion can go away.
-      expect(async () => {
-        search.start();
-
-        await wait(0);
-      }).not.toWarnDev();
+      search.start();
 
       await wait(0);
 
diff --git a/packages/instantsearch.js/src/widgets/clear-refinements/clear-refinements.tsx b/packages/instantsearch.js/src/widgets/clear-refinements/clear-refinements.tsx
index 0f4e471076..1e4ab9d53a 100644
--- a/packages/instantsearch.js/src/widgets/clear-refinements/clear-refinements.tsx
+++ b/packages/instantsearch.js/src/widgets/clear-refinements/clear-refinements.tsx
@@ -48,11 +48,10 @@ const renderer =
     ClearRefinementsRenderState,
     Partial<ClearRefinementsWidgetParams>
   > =>
-  ({ refine, canRefine, instantSearchInstance }, isFirstRendering) => {
+  ({ refine, canRefine }, isFirstRendering) => {
     if (isFirstRendering) {
       renderState.templateProps = prepareTemplateProps({
         defaultTemplates,
-        templatesConfig: instantSearchInstance.templatesConfig,
         templates,
       });
       return;
diff --git a/packages/instantsearch.js/src/widgets/frequently-bought-together/__tests__/frequently-bought-together.test.tsx b/packages/instantsearch.js/src/widgets/frequently-bought-together/__tests__/frequently-bought-together.test.tsx
index e742ec303c..78eff80a5f 100644
--- a/packages/instantsearch.js/src/widgets/frequently-bought-together/__tests__/frequently-bought-together.test.tsx
+++ b/packages/instantsearch.js/src/widgets/frequently-bought-together/__tests__/frequently-bought-together.test.tsx
@@ -107,13 +107,7 @@ describe('frequentlyBoughtTogether', () => {
 
       search.addWidgets([widget]);
 
-      // @MAJOR Once Hogan.js and string-based templates are removed,
-      // `search.start()` can be moved to the test body and the following
-      // assertion can go away.
-      expect(async () => {
-        search.start();
-        await wait(0);
-      }).not.toWarnDev();
+      search.start();
 
       await wait(0);
 
diff --git a/packages/instantsearch.js/src/widgets/frequently-bought-together/frequently-bought-together.tsx b/packages/instantsearch.js/src/widgets/frequently-bought-together/frequently-bought-together.tsx
index 1183d7087a..7fecae817a 100644
--- a/packages/instantsearch.js/src/widgets/frequently-bought-together/frequently-bought-together.tsx
+++ b/packages/instantsearch.js/src/widgets/frequently-bought-together/frequently-bought-together.tsx
@@ -65,7 +65,6 @@ const renderer =
         defaultTemplates: {} as unknown as Required<
           FrequentlyBoughtTogetherTemplates<THit>
         >,
-        templatesConfig: instantSearchInstance.templatesConfig,
         templates,
       });
       return;
diff --git a/packages/instantsearch.js/src/widgets/geo-search/GeoSearchRenderer.js b/packages/instantsearch.js/src/widgets/geo-search/GeoSearchRenderer.js
index 6c9b561730..7e8b98a689 100644
--- a/packages/instantsearch.js/src/widgets/geo-search/GeoSearchRenderer.js
+++ b/packages/instantsearch.js/src/widgets/geo-search/GeoSearchRenderer.js
@@ -54,7 +54,6 @@ const renderer = (
     hasMapMoveSinceLastRefine,
     isRefinedWithMap,
     widgetParams,
-    instantSearchInstance,
   },
   isFirstRendering
 ) => {
@@ -136,7 +135,6 @@ const renderer = (
     );
 
     renderState.templateProps = prepareTemplateProps({
-      templatesConfig: instantSearchInstance.templatesConfig,
       templates,
     });
 
diff --git a/packages/instantsearch.js/src/widgets/geo-search/__tests__/__snapshots__/geo-search-test.ts.snap b/packages/instantsearch.js/src/widgets/geo-search/__tests__/__snapshots__/geo-search-test.ts.snap
index 492ed94a54..1de8720982 100644
--- a/packages/instantsearch.js/src/widgets/geo-search/__tests__/__snapshots__/geo-search-test.ts.snap
+++ b/packages/instantsearch.js/src/widgets/geo-search/__tests__/__snapshots__/geo-search-test.ts.snap
@@ -39,13 +39,6 @@ exports[`GeoSearch expect to render 2`] = `
       "reset": [Function],
       "toggle": [Function],
     },
-    "templatesConfig": undefined,
-    "useCustomCompileOptions": {
-      "HTMLMarker": true,
-      "redo": true,
-      "reset": true,
-      "toggle": true,
-    },
   },
 }
 `;
@@ -89,13 +82,6 @@ exports[`GeoSearch expect to render with custom classNames 2`] = `
       "reset": [Function],
       "toggle": [Function],
     },
-    "templatesConfig": undefined,
-    "useCustomCompileOptions": {
-      "HTMLMarker": true,
-      "redo": true,
-      "reset": true,
-      "toggle": true,
-    },
   },
 }
 `;
diff --git a/packages/instantsearch.js/src/widgets/geo-search/__tests__/geo-search-test.ts b/packages/instantsearch.js/src/widgets/geo-search/__tests__/geo-search-test.ts
index bb114fbf2d..4b88db7fb3 100644
--- a/packages/instantsearch.js/src/widgets/geo-search/__tests__/geo-search-test.ts
+++ b/packages/instantsearch.js/src/widgets/geo-search/__tests__/geo-search-test.ts
@@ -121,8 +121,7 @@ describe('GeoSearch', () => {
   });
 
   const createContainer = () => document.createElement('div');
-  const createFakeInstantSearch = () =>
-    createInstantSearch({ templatesConfig: undefined });
+  const createFakeInstantSearch = () => createInstantSearch();
   const createFakeHelper = () =>
     algoliasearchHelper(createSearchClient(), 'indexName');
 
@@ -259,11 +258,12 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
     const helper = createFakeHelper();
     const googleReference = createFakeGoogleReference();
 
+    const toggleTemplate = () => 'Search when the map moves';
     const widget = geoSearch({
       googleReference,
       container,
       templates: {
-        toggle: 'Search when the map move',
+        toggle: toggleTemplate,
       },
     });
 
@@ -292,7 +292,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
     expect((firstRender[0] as any).props.templateProps.templates).toEqual({
       HTMLMarker: expect.any(Function),
       reset: expect.any(Function),
-      toggle: 'Search when the map move',
+      toggle: toggleTemplate,
       redo: expect.any(Function),
     });
   });
@@ -1072,7 +1072,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
           }),
         },
         templates: {
-          HTMLMarker: '<p>{{objectID}}</p>',
+          HTMLMarker: ({ objectID }, { html }) => html`<p>${objectID}</p>`,
         },
       });
 
@@ -1106,21 +1106,30 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
           expect.objectContaining({
             __id: '123',
             title: 'ID: 123',
-            template: '<p>123</p>',
+            template: expect.objectContaining({
+              props: expect.objectContaining({ children: '123' }),
+              type: 'p',
+            }),
           }),
         ],
         [
           expect.objectContaining({
             __id: '456',
             title: 'ID: 456',
-            template: '<p>456</p>',
+            template: expect.objectContaining({
+              props: expect.objectContaining({ children: '456' }),
+              type: 'p',
+            }),
           }),
         ],
         [
           expect.objectContaining({
             __id: '789',
             title: 'ID: 789',
-            template: '<p>789</p>',
+            template: expect.objectContaining({
+              props: expect.objectContaining({ children: '789' }),
+              type: 'p',
+            }),
           }),
         ],
       ]);
@@ -1141,7 +1150,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         googleReference,
         container,
         templates: {
-          HTMLMarker: '<p>{{objectID}}</p>',
+          HTMLMarker: ({ objectID }, { html }) => html`<p>${objectID}</p>`,
         },
       });
 
@@ -1174,19 +1183,28 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         [
           expect.objectContaining({
             __id: '123',
-            template: '<p>123</p>',
+            template: expect.objectContaining({
+              props: expect.objectContaining({ children: '123' }),
+              type: 'p',
+            }),
           }),
         ],
         [
           expect.objectContaining({
             __id: '456',
-            template: '<p>456</p>',
+            template: expect.objectContaining({
+              props: expect.objectContaining({ children: '456' }),
+              type: 'p',
+            }),
           }),
         ],
         [
           expect.objectContaining({
             __id: '789',
-            template: '<p>789</p>',
+            template: expect.objectContaining({
+              props: expect.objectContaining({ children: '789' }),
+              type: 'p',
+            }),
           }),
         ],
       ]);
diff --git a/packages/instantsearch.js/src/widgets/geo-search/__tests__/geo-search.test.tsx b/packages/instantsearch.js/src/widgets/geo-search/__tests__/geo-search.test.tsx
index a8b53f9981..5d6d451fb4 100644
--- a/packages/instantsearch.js/src/widgets/geo-search/__tests__/geo-search.test.tsx
+++ b/packages/instantsearch.js/src/widgets/geo-search/__tests__/geo-search.test.tsx
@@ -34,14 +34,7 @@ describe('geoSearch', () => {
         }),
       ]);
 
-      // @MAJOR Once Hogan.js and string-based templates are removed,
-      // `search.start()` can be moved to the test body and the following
-      // assertion can go away.
-      expect(async () => {
-        search.start();
-
-        await wait(0);
-      }).not.toWarnDev();
+      search.start();
 
       await wait(0);
 
diff --git a/packages/instantsearch.js/src/widgets/hierarchical-menu/__tests__/hierarchical-menu.test.tsx b/packages/instantsearch.js/src/widgets/hierarchical-menu/__tests__/hierarchical-menu.test.tsx
index 2ed9fc0169..5aa57d4589 100644
--- a/packages/instantsearch.js/src/widgets/hierarchical-menu/__tests__/hierarchical-menu.test.tsx
+++ b/packages/instantsearch.js/src/widgets/hierarchical-menu/__tests__/hierarchical-menu.test.tsx
@@ -125,14 +125,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hierarchica
         }),
       ]);
 
-      // @MAJOR Once Hogan.js and string-based templates are removed,
-      // `search.start()` can be moved to the test body and the following
-      // assertion can go away.
-      expect(async () => {
-        search.start();
-
-        await wait(0);
-      }).not.toWarnDev();
+      search.start();
 
       await wait(0);
 
diff --git a/packages/instantsearch.js/src/widgets/hierarchical-menu/hierarchical-menu.tsx b/packages/instantsearch.js/src/widgets/hierarchical-menu/hierarchical-menu.tsx
index 98bc09027f..7a39da8eda 100644
--- a/packages/instantsearch.js/src/widgets/hierarchical-menu/hierarchical-menu.tsx
+++ b/packages/instantsearch.js/src/widgets/hierarchical-menu/hierarchical-menu.tsx
@@ -206,7 +206,6 @@ const renderer =
       createURL,
       items,
       refine,
-      instantSearchInstance,
       isShowingMore,
       toggleShowMore,
       canToggleShowMore,
@@ -217,7 +216,6 @@ const renderer =
     if (isFirstRendering) {
       renderState.templateProps = prepareTemplateProps({
         defaultTemplates,
-        templatesConfig: instantSearchInstance.templatesConfig,
         templates,
       });
       return;
diff --git a/packages/instantsearch.js/src/widgets/hits/__tests__/hits.test.tsx b/packages/instantsearch.js/src/widgets/hits/__tests__/hits.test.tsx
index b057b12ad0..33abb7c996 100644
--- a/packages/instantsearch.js/src/widgets/hits/__tests__/hits.test.tsx
+++ b/packages/instantsearch.js/src/widgets/hits/__tests__/hits.test.tsx
@@ -14,7 +14,6 @@ import { Fragment, h } from 'preact';
 
 import instantsearch from '../../../index.es';
 import { createInsightsMiddleware } from '../../../middlewares';
-import configure from '../../configure/configure';
 import searchBox from '../../search-box/search-box';
 import hits from '../hits';
 
@@ -202,17 +201,10 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/"
         hits({ container }),
       ]);
 
-      // @MAJOR Once Hogan.js and string-based templates are removed,
-      // `search.start()` can be moved to the test body and the following
-      // assertion can go away.
-      expect(async () => {
-        search.start();
-        // prevent warning from insights view event because insightsClient isn't yet loaded
-        // @ts-ignore
-        search.helper!.state.userToken = 'userToken';
-
-        await wait(0);
-      }).not.toWarnDev();
+      search.start();
+      // prevent warning from insights view event because insightsClient isn't yet loaded
+      // @ts-ignore
+      search.helper!.state.userToken = 'userToken';
 
       await wait(0);
 
@@ -1146,187 +1138,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/"
       });
     });
 
-    test('sends `click` event with `bindEvent`', async () => {
-      const container = document.createElement('div');
-      const { insights, onEvent } = createInsightsMiddlewareWithOnEvent();
-
-      const search = instantsearch({
-        indexName: 'indexName',
-        searchClient: createMockedSearchClient(),
-      });
-
-      search.use(insights);
-
-      search.addWidgets([
-        hits({
-          container,
-          templates: {
-            item: (item, bindEvent) => `
-              <button type='button' ${bindEvent('click', item, 'Item Clicked')}>
-                ${item.name}
-              </button>
-            `,
-          },
-        }),
-      ]);
-      search.start();
-      await wait(0);
-
-      // view event by render
-      expect(onEvent).toHaveBeenCalledTimes(1);
-      onEvent.mockClear();
-
-      fireEvent.click(getByText(container, 'Name 1'));
-      // The custom one only
-      expect(onEvent).toHaveBeenCalledTimes(1);
-      expect(onEvent.mock.calls[0][0]).toEqual({
-        eventType: 'click',
-        hits: [
-          {
-            __hitIndex: 0,
-            __position: 1,
-            objectID: '1',
-            name: 'Name 1',
-          },
-        ],
-        insightsMethod: 'clickedObjectIDsAfterSearch',
-        payload: {
-          eventName: 'Item Clicked',
-          index: 'indexName',
-          objectIDs: ['1'],
-          positions: [1],
-        },
-        widgetType: 'ais.hits',
-      });
-    });
-
-    test('sends `conversion` event with `bindEvent`', async () => {
-      const container = document.createElement('div');
-      const { insights, onEvent } = createInsightsMiddlewareWithOnEvent();
-
-      const search = instantsearch({
-        indexName: 'indexName',
-        searchClient: createMockedSearchClient(),
-      });
-
-      search.use(insights);
-
-      search.addWidgets([
-        hits({
-          container,
-          templates: {
-            item: (item, bindEvent) => `
-              <button type='button' ${bindEvent(
-                'conversion',
-                item,
-                'Product Ordered'
-              )}>
-                ${item.name}
-              </button>
-            `,
-          },
-        }),
-      ]);
-      search.start();
-      await wait(0);
-
-      // view event by render
-      expect(onEvent).toHaveBeenCalledTimes(1);
-      onEvent.mockClear();
-
-      fireEvent.click(getByText(container, 'Name 2'));
-
-      // The custom one + default click
-      expect(onEvent).toHaveBeenCalledTimes(2);
-      expect(onEvent.mock.calls[0][0]).toEqual({
-        eventType: 'conversion',
-        hits: [
-          {
-            __hitIndex: 1,
-            __position: 2,
-            objectID: '2',
-            name: 'Name 2',
-          },
-        ],
-        insightsMethod: 'convertedObjectIDsAfterSearch',
-        payload: {
-          eventName: 'Product Ordered',
-          index: 'indexName',
-          objectIDs: ['2'],
-        },
-        widgetType: 'ais.hits',
-      });
-      expect(onEvent.mock.calls[1][0]).toEqual({
-        eventType: 'click',
-        eventModifier: 'internal',
-        hits: [
-          {
-            __position: 2,
-            objectID: '2',
-            name: 'Name 2',
-          },
-        ],
-        insightsMethod: 'clickedObjectIDsAfterSearch',
-        payload: {
-          eventName: 'Hit Clicked',
-          index: 'indexName',
-          objectIDs: ['2'],
-          positions: [2],
-        },
-        widgetType: 'ais.hits',
-      });
-    });
-
-    describe('old insights methods', () => {
-      it('sends event', async () => {
-        const aa = jest.fn();
-        const hitsPerPage = 2;
-        const search = instantsearch({
-          indexName: 'indexName',
-          searchClient: createMockedSearchClient({
-            hitsPerPage,
-            clickAnalytics: true,
-          }),
-          insightsClient: aa,
-        });
-
-        const container = document.createElement('div');
-
-        search.addWidgets([configure({ hitsPerPage })]);
-
-        search.addWidgets([
-          hits({
-            container,
-            templates: {
-              item: (item) => `
-                <button type='button' ${instantsearch.insights(
-                  'clickedObjectIDsAfterSearch',
-                  {
-                    objectIDs: [item.objectID],
-                    eventName: 'Add to cart',
-                  }
-                )}>
-                  ${item.name}
-                </button>
-              `,
-            },
-          }),
-        ]);
-        search.start();
-        await wait(0);
-
-        fireEvent.click(getByText(container, 'Name 1'));
-        expect(aa).toHaveBeenCalledTimes(1);
-        expect(aa).toHaveBeenCalledWith('clickedObjectIDsAfterSearch', {
-          eventName: 'Add to cart',
-          index: 'indexName',
-          objectIDs: ['1'],
-          positions: [1],
-          queryID: 'test-query-id',
-        });
-      });
-    });
-
     type CustomHit = { name: string };
 
     function createMockedSearchClient(
diff --git a/packages/instantsearch.js/src/widgets/hits/hits.tsx b/packages/instantsearch.js/src/widgets/hits/hits.tsx
index 44f83018cf..9e1ab88d7f 100644
--- a/packages/instantsearch.js/src/widgets/hits/hits.tsx
+++ b/packages/instantsearch.js/src/widgets/hits/hits.tsx
@@ -24,11 +24,11 @@ import type {
 import type { PreparedTemplateProps } from '../../lib/templating';
 import type {
   Template,
-  TemplateWithBindEvent,
   Hit,
   WidgetFactory,
   Renderer,
   BaseHit,
+  TemplateWithSendEvent,
 } from '../../types';
 import type { SearchResults } from 'algoliasearch-helper';
 import type {
@@ -54,22 +54,10 @@ const renderer =
     };
     templates: HitsTemplates<THit>;
   }): Renderer<HitsRenderState, Partial<HitsWidgetParams>> =>
-  (
-    {
-      items,
-      results,
-      instantSearchInstance,
-      insights,
-      bindEvent,
-      sendEvent,
-      banner,
-    },
-    isFirstRendering
-  ) => {
+  ({ items, results, insights, sendEvent, banner }, isFirstRendering) => {
     if (isFirstRendering) {
       renderState.templateProps = prepareTemplateProps<HitsTemplates<THit>>({
         defaultTemplates,
-        templatesConfig: instantSearchInstance.templatesConfig,
         templates,
       });
       return;
@@ -124,7 +112,6 @@ const renderer =
             return index;
           },
         }}
-        bindEvent={bindEvent}
         sendEvent={sendEvent}
       />
     );
@@ -170,7 +157,7 @@ export type HitsTemplates<THit extends NonNullable<object> = BaseHit> =
      *
      * @default ''
      */
-    item: TemplateWithBindEvent<
+    item: TemplateWithSendEvent<
       Hit<THit> & {
         /** @deprecated the index in the hits array, use __position instead, which is the absolute position */
         __hitIndex: number;
diff --git a/packages/instantsearch.js/src/widgets/index/__tests__/index-test.ts b/packages/instantsearch.js/src/widgets/index/__tests__/index-test.ts
index 29fe4d1bee..82d51987e7 100644
--- a/packages/instantsearch.js/src/widgets/index/__tests__/index-test.ts
+++ b/packages/instantsearch.js/src/widgets/index/__tests__/index-test.ts
@@ -342,7 +342,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
             helper: instance.getHelper(),
             state: instance.getHelper()!.state,
             renderState: expect.any(Object),
-            templatesConfig: instantSearchInstance.templatesConfig,
             createURL: expect.any(Function),
             scopedResults: [],
             status: instantSearchInstance.status,
@@ -402,7 +401,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
             helper: instance.getHelper(),
             state: instance.getHelper()!.state,
             renderState: expect.any(Object),
-            templatesConfig: instantSearchInstance.templatesConfig,
             createURL: expect.any(Function),
             scopedResults: [],
             status: instantSearchInstance.status,
@@ -1571,7 +1569,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
           helper: instance.getHelper(),
           state: instance.getHelper()!.state,
           renderState: expect.any(Object),
-          templatesConfig: instantSearchInstance.templatesConfig,
           createURL: expect.any(Function),
           scopedResults: [],
           status: instantSearchInstance.status,
@@ -2639,7 +2636,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
           parent: expect.anything(),
           instantSearchInstance,
           renderState: {},
-          templatesConfig: instantSearchInstance.templatesConfig,
           createURL: expect.any(Function),
           scopedResults: [],
           status: instantSearchInstance.status,
@@ -2769,7 +2765,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
           state: expect.any(algoliasearchHelper.SearchParameters),
           renderState: expect.any(Object),
           helper: instance.getHelper(),
-          templatesConfig: instantSearchInstance.templatesConfig,
           createURL: expect.any(Function),
           status: instantSearchInstance.status,
           searchMetadata: {
diff --git a/packages/instantsearch.js/src/widgets/infinite-hits/__tests__/infinite-hits.test.tsx b/packages/instantsearch.js/src/widgets/infinite-hits/__tests__/infinite-hits.test.tsx
index 16086075cf..6fcf749518 100644
--- a/packages/instantsearch.js/src/widgets/infinite-hits/__tests__/infinite-hits.test.tsx
+++ b/packages/instantsearch.js/src/widgets/infinite-hits/__tests__/infinite-hits.test.tsx
@@ -188,17 +188,10 @@ describe('infiniteHits', () => {
         infiniteHits({ container, showPrevious: true }),
       ]);
 
-      // @MAJOR Once Hogan.js and string-based templates are removed,
-      // `search.start()` can be moved to the test body and the following
-      // assertion can go away.
-      expect(async () => {
-        search.start();
-        // prevent warning from insights view event because insightsClient isn't yet loaded
-        // @ts-ignore
-        search.helper!.state.userToken = 'userToken';
-
-        await wait(0);
-      }).not.toWarnDev();
+      search.start();
+      // prevent warning from insights view event because insightsClient isn't yet loaded
+      // @ts-ignore
+      search.helper!.state.userToken = 'userToken';
 
       await wait(0);
 
@@ -1151,137 +1144,6 @@ describe('infiniteHits', () => {
       });
     });
 
-    test('sends `click` event with `bindEvent`', async () => {
-      const container = document.createElement('div');
-      const { insights, onEvent } = createInsightsMiddlewareWithOnEvent();
-
-      const search = instantsearch({
-        indexName: 'indexName',
-        searchClient: createMockedSearchClient(),
-      });
-
-      search.use(insights);
-
-      search.addWidgets([
-        infiniteHits({
-          container,
-          templates: {
-            item: (item, bindEvent) => `
-              <button type='button' ${bindEvent('click', item, 'Item Clicked')}>
-                ${item.name}
-              </button>
-            `,
-          },
-        }),
-      ]);
-      search.start();
-      await wait(0);
-
-      // view event by render
-      expect(onEvent).toHaveBeenCalledTimes(1);
-      onEvent.mockClear();
-
-      fireEvent.click(getByText(container, 'Name 1'));
-      // The custom one only
-      expect(onEvent).toHaveBeenCalledTimes(1);
-      expect(onEvent.mock.calls[0][0]).toEqual({
-        eventType: 'click',
-        hits: [
-          {
-            __hitIndex: 0,
-            __position: 1,
-            objectID: '1',
-            name: 'Name 1',
-          },
-        ],
-        insightsMethod: 'clickedObjectIDsAfterSearch',
-        payload: {
-          eventName: 'Item Clicked',
-          index: 'indexName',
-          objectIDs: ['1'],
-          positions: [1],
-        },
-        widgetType: 'ais.infiniteHits',
-      });
-    });
-
-    test('sends `conversion` event with `bindEvent`', async () => {
-      const container = document.createElement('div');
-      const { insights, onEvent } = createInsightsMiddlewareWithOnEvent();
-
-      const search = instantsearch({
-        indexName: 'indexName',
-        searchClient: createMockedSearchClient(),
-      });
-
-      search.use(insights);
-
-      search.addWidgets([
-        infiniteHits({
-          container,
-          templates: {
-            item: (item, bindEvent) => `
-              <button type='button' ${bindEvent(
-                'conversion',
-                item,
-                'Product Ordered'
-              )}>
-                ${item.name}
-              </button>
-            `,
-          },
-        }),
-      ]);
-      search.start();
-      await wait(0);
-
-      // view event by render
-      expect(onEvent).toHaveBeenCalledTimes(1);
-      onEvent.mockClear();
-
-      fireEvent.click(getByText(container, 'Name 2'));
-
-      // The custom one + default click
-      expect(onEvent).toHaveBeenCalledTimes(2);
-      expect(onEvent.mock.calls[0][0]).toEqual({
-        eventType: 'conversion',
-        hits: [
-          {
-            __hitIndex: 1,
-            __position: 2,
-            objectID: '2',
-            name: 'Name 2',
-          },
-        ],
-        insightsMethod: 'convertedObjectIDsAfterSearch',
-        payload: {
-          eventName: 'Product Ordered',
-          index: 'indexName',
-          objectIDs: ['2'],
-        },
-        widgetType: 'ais.infiniteHits',
-      });
-      expect(onEvent.mock.calls[1][0]).toEqual({
-        eventType: 'click',
-        eventModifier: 'internal',
-        hits: [
-          {
-            __position: 2,
-            objectID: '2',
-            name: 'Name 2',
-          },
-        ],
-        insightsMethod: 'clickedObjectIDsAfterSearch',
-        payload: {
-          eventName: 'Hit Clicked',
-          index: 'indexName',
-          objectIDs: ['2'],
-          positions: [2],
-        },
-        widgetType: 'ais.infiniteHits',
-      });
-    });
-
     type CustomHit = { name: string };
 
     function createMockedSearchClient(
diff --git a/packages/instantsearch.js/src/widgets/infinite-hits/infinite-hits.tsx b/packages/instantsearch.js/src/widgets/infinite-hits/infinite-hits.tsx
index bfe920619c..dccea1316e 100644
--- a/packages/instantsearch.js/src/widgets/infinite-hits/infinite-hits.tsx
+++ b/packages/instantsearch.js/src/widgets/infinite-hits/infinite-hits.tsx
@@ -29,11 +29,11 @@ import type { PreparedTemplateProps } from '../../lib/templating';
 import type {
   WidgetFactory,
   Template,
-  TemplateWithBindEvent,
   InsightsClient,
   Renderer,
   BaseHit,
   Hit,
+  TemplateWithSendEvent,
 } from '../../types';
 import type { SearchResults } from 'algoliasearch-helper';
 
@@ -119,7 +119,7 @@ export type InfiniteHitsTemplates<THit extends NonNullable<object> = BaseHit> =
     /**
      * The template to use for each result.
      */
-    item: TemplateWithBindEvent<
+    item: TemplateWithSendEvent<
       Hit<THit> & {
         /** @deprecated the index in the hits array, use __position instead, which is the absolute position */
         __hitIndex: number;
@@ -191,7 +191,6 @@ const renderer =
       showPrevious,
       isFirstPage,
       isLastPage,
-      instantSearchInstance,
       insights,
       bindEvent,
       sendEvent,
@@ -203,7 +202,6 @@ const renderer =
       renderState.templateProps =
         prepareTemplateProps<InfiniteHitsComponentTemplates>({
           defaultTemplates,
-          templatesConfig: instantSearchInstance.templatesConfig,
           templates: templates as InfiniteHitsComponentTemplates,
         });
       return;
diff --git a/packages/instantsearch.js/src/widgets/looking-similar/__tests__/looking-similar.test.tsx b/packages/instantsearch.js/src/widgets/looking-similar/__tests__/looking-similar.test.tsx
index 9c7261f73b..c16d906466 100644
--- a/packages/instantsearch.js/src/widgets/looking-similar/__tests__/looking-similar.test.tsx
+++ b/packages/instantsearch.js/src/widgets/looking-similar/__tests__/looking-similar.test.tsx
@@ -108,13 +108,7 @@ describe('lookingSimilar', () => {
 
       search.addWidgets([widget]);
 
-      // @MAJOR Once Hogan.js and string-based templates are removed,
-      // `search.start()` can be moved to the test body and the following
-      // assertion can go away.
-      expect(async () => {
-        search.start();
-        await wait(0);
-      }).not.toWarnDev();
+      search.start();
 
       await wait(0);
 
diff --git a/packages/instantsearch.js/src/widgets/looking-similar/looking-similar.tsx b/packages/instantsearch.js/src/widgets/looking-similar/looking-similar.tsx
index 323522a7e6..fb231d1764 100644
--- a/packages/instantsearch.js/src/widgets/looking-similar/looking-similar.tsx
+++ b/packages/instantsearch.js/src/widgets/looking-similar/looking-similar.tsx
@@ -64,7 +64,6 @@ function createRenderer<THit extends NonNullable<object> = BaseHit>({
         defaultTemplates: {} as unknown as Required<
           LookingSimilarTemplates<THit>
         >,
-        templatesConfig: instantSearchInstance.templatesConfig,
         templates,
       });
       return;
diff --git a/packages/instantsearch.js/src/widgets/menu-select/__tests__/menu-select-test.ts b/packages/instantsearch.js/src/widgets/menu-select/__tests__/menu-select-test.ts
index 096365dd66..56552c8c8f 100644
--- a/packages/instantsearch.js/src/widgets/menu-select/__tests__/menu-select-test.ts
+++ b/packages/instantsearch.js/src/widgets/menu-select/__tests__/menu-select-test.ts
@@ -86,55 +86,40 @@ describe('menuSelect', () => {
       const firstRender = render.mock.calls[0][0] as VNode;
 
       expect(firstRender.props).toMatchInlineSnapshot(`
-  {
-    "cssClasses": {
-      "noRefinementRoot": "ais-MenuSelect--noRefinement",
-      "option": "ais-MenuSelect-option",
-      "root": "ais-MenuSelect",
-      "select": "ais-MenuSelect-select",
-    },
-    "items": [
-      {
-        "count": 2,
-        "data": null,
-        "exhaustive": true,
-        "isRefined": false,
-        "label": "bar",
-        "value": "bar",
-      },
-      {
-        "count": 1,
-        "data": null,
-        "exhaustive": true,
-        "isRefined": false,
-        "label": "foo",
-        "value": "foo",
-      },
-    ],
-    "refine": [Function],
-    "templateProps": {
-      "templates": {
-        "defaultOption": [Function],
-        "item": [Function],
-      },
-      "templatesConfig": {
-        "compileOptions": {},
-        "helpers": {
-          "formatNumber": [Function],
-          "highlight": [Function],
-          "insights": [Function],
-          "reverseHighlight": [Function],
-          "reverseSnippet": [Function],
-          "snippet": [Function],
-        },
-      },
-      "useCustomCompileOptions": {
-        "defaultOption": false,
-        "item": false,
-      },
-    },
-  }
-  `);
+        {
+          "cssClasses": {
+            "noRefinementRoot": "ais-MenuSelect--noRefinement",
+            "option": "ais-MenuSelect-option",
+            "root": "ais-MenuSelect",
+            "select": "ais-MenuSelect-select",
+          },
+          "items": [
+            {
+              "count": 2,
+              "data": null,
+              "exhaustive": true,
+              "isRefined": false,
+              "label": "bar",
+              "value": "bar",
+            },
+            {
+              "count": 1,
+              "data": null,
+              "exhaustive": true,
+              "isRefined": false,
+              "label": "foo",
+              "value": "foo",
+            },
+          ],
+          "refine": [Function],
+          "templateProps": {
+            "templates": {
+              "defaultOption": [Function],
+              "item": [Function],
+            },
+          },
+        }
+      `);
     });
 
     it('renders transformed items correctly', async () => {
@@ -159,57 +144,42 @@ describe('menuSelect', () => {
       const firstRender = render.mock.calls[0][0] as VNode;
 
       expect(firstRender.props).toMatchInlineSnapshot(`
-  {
-    "cssClasses": {
-      "noRefinementRoot": "ais-MenuSelect--noRefinement",
-      "option": "ais-MenuSelect-option",
-      "root": "ais-MenuSelect",
-      "select": "ais-MenuSelect-select",
-    },
-    "items": [
-      {
-        "count": 2,
-        "data": null,
-        "exhaustive": true,
-        "isRefined": false,
-        "label": "bar",
-        "transformed": true,
-        "value": "bar",
-      },
-      {
-        "count": 1,
-        "data": null,
-        "exhaustive": true,
-        "isRefined": false,
-        "label": "foo",
-        "transformed": true,
-        "value": "foo",
-      },
-    ],
-    "refine": [Function],
-    "templateProps": {
-      "templates": {
-        "defaultOption": [Function],
-        "item": [Function],
-      },
-      "templatesConfig": {
-        "compileOptions": {},
-        "helpers": {
-          "formatNumber": [Function],
-          "highlight": [Function],
-          "insights": [Function],
-          "reverseHighlight": [Function],
-          "reverseSnippet": [Function],
-          "snippet": [Function],
-        },
-      },
-      "useCustomCompileOptions": {
-        "defaultOption": false,
-        "item": false,
-      },
-    },
-  }
-  `);
+        {
+          "cssClasses": {
+            "noRefinementRoot": "ais-MenuSelect--noRefinement",
+            "option": "ais-MenuSelect-option",
+            "root": "ais-MenuSelect",
+            "select": "ais-MenuSelect-select",
+          },
+          "items": [
+            {
+              "count": 2,
+              "data": null,
+              "exhaustive": true,
+              "isRefined": false,
+              "label": "bar",
+              "transformed": true,
+              "value": "bar",
+            },
+            {
+              "count": 1,
+              "data": null,
+              "exhaustive": true,
+              "isRefined": false,
+              "label": "foo",
+              "transformed": true,
+              "value": "foo",
+            },
+          ],
+          "refine": [Function],
+          "templateProps": {
+            "templates": {
+              "defaultOption": [Function],
+              "item": [Function],
+            },
+          },
+        }
+      `);
     });
   });
 
diff --git a/packages/instantsearch.js/src/widgets/menu-select/menu-select.tsx b/packages/instantsearch.js/src/widgets/menu-select/menu-select.tsx
index 39ad6a37e0..ccc08c30f3 100644
--- a/packages/instantsearch.js/src/widgets/menu-select/menu-select.tsx
+++ b/packages/instantsearch.js/src/widgets/menu-select/menu-select.tsx
@@ -94,17 +94,12 @@ const renderer =
     templates: MenuSelectTemplates;
   }) =>
   (
-    {
-      refine,
-      items,
-      instantSearchInstance,
-    }: MenuRenderState & RendererOptions<MenuConnectorParams>,
+    { refine, items }: MenuRenderState & RendererOptions<MenuConnectorParams>,
     isFirstRendering: boolean
   ) => {
     if (isFirstRendering) {
       renderState.templateProps = prepareTemplateProps({
         defaultTemplates,
-        templatesConfig: instantSearchInstance.templatesConfig,
         templates,
       });
       return;
diff --git a/packages/instantsearch.js/src/widgets/menu/__tests__/menu.test.tsx b/packages/instantsearch.js/src/widgets/menu/__tests__/menu.test.tsx
index 4288043080..5e098fc201 100644
--- a/packages/instantsearch.js/src/widgets/menu/__tests__/menu.test.tsx
+++ b/packages/instantsearch.js/src/widgets/menu/__tests__/menu.test.tsx
@@ -58,14 +58,7 @@ describe('menu', () => {
         }),
       ]);
 
-      // @MAJOR Once Hogan.js and string-based templates are removed,
-      // `search.start()` can be moved to the test body and the following
-      // assertion can go away.
-      expect(async () => {
-        search.start();
-
-        await wait(0);
-      }).not.toWarnDev();
+      search.start();
 
       await wait(0);
 
diff --git a/packages/instantsearch.js/src/widgets/menu/menu.tsx b/packages/instantsearch.js/src/widgets/menu/menu.tsx
index 3c1103d564..a7444d448e 100644
--- a/packages/instantsearch.js/src/widgets/menu/menu.tsx
+++ b/packages/instantsearch.js/src/widgets/menu/menu.tsx
@@ -133,7 +133,6 @@ const renderer =
       refine,
       items,
       createURL,
-      instantSearchInstance,
       isShowingMore,
       toggleShowMore,
       canToggleShowMore,
@@ -143,7 +142,6 @@ const renderer =
     if (isFirstRendering) {
       renderState.templateProps = prepareTemplateProps({
         defaultTemplates,
-        templatesConfig: instantSearchInstance.templatesConfig,
         templates,
       });
       return;
diff --git a/packages/instantsearch.js/src/widgets/numeric-menu/__tests__/numeric-menu.test.tsx b/packages/instantsearch.js/src/widgets/numeric-menu/__tests__/numeric-menu.test.tsx
index 9bad73f0df..887eee98ca 100644
--- a/packages/instantsearch.js/src/widgets/numeric-menu/__tests__/numeric-menu.test.tsx
+++ b/packages/instantsearch.js/src/widgets/numeric-menu/__tests__/numeric-menu.test.tsx
@@ -122,14 +122,7 @@ describe('numericMenu', () => {
         }),
       ]);
 
-      // @MAJOR Once Hogan.js and string-based templates are removed,
-      // `search.start()` can be moved to the test body and the following
-      // assertion can go away.
-      expect(async () => {
-        search.start();
-
-        await wait(0);
-      }).not.toWarnDev();
+      search.start();
 
       await wait(0);
 
diff --git a/packages/instantsearch.js/src/widgets/numeric-menu/numeric-menu.tsx b/packages/instantsearch.js/src/widgets/numeric-menu/numeric-menu.tsx
index d9a7fcd8ea..8ef97fea07 100644
--- a/packages/instantsearch.js/src/widgets/numeric-menu/numeric-menu.tsx
+++ b/packages/instantsearch.js/src/widgets/numeric-menu/numeric-menu.tsx
@@ -46,14 +46,10 @@ const renderer =
     };
     templates: NumericMenuTemplates;
   }): Renderer<NumericMenuRenderState, Partial<NumericMenuWidgetParams>> =>
-  (
-    { createURL, instantSearchInstance, refine, items },
-    isFirstRendering: boolean
-  ) => {
+  ({ createURL, refine, items }, isFirstRendering: boolean) => {
     if (isFirstRendering) {
       renderState.templateProps = prepareTemplateProps({
         defaultTemplates,
-        templatesConfig: instantSearchInstance.templatesConfig,
         templates,
       });
       return;
diff --git a/packages/instantsearch.js/src/widgets/pagination/__tests__/pagination.test.tsx b/packages/instantsearch.js/src/widgets/pagination/__tests__/pagination.test.tsx
index 0821d726e2..ecfd36f38c 100644
--- a/packages/instantsearch.js/src/widgets/pagination/__tests__/pagination.test.tsx
+++ b/packages/instantsearch.js/src/widgets/pagination/__tests__/pagination.test.tsx
@@ -2,20 +2,13 @@
  * @jest-environment jsdom
  */
 
-import {
-  createSearchClient,
-  createMultiSearchResponse,
-  createSingleSearchResponse,
-} from '@instantsearch/mocks';
+import { createSearchClient } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
 import { findByLabelText, findByRole } from '@testing-library/dom';
 
 import instantsearch from '../../../index.es';
-import configure from '../../configure/configure';
 import pagination from '../pagination';
 
-import type { SearchResponse } from '../../../../src/types';
-
 beforeEach(() => {
   document.body.innerHTML = '';
 });
@@ -125,80 +118,4 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/pagination/
       expect(pageLink).toHaveClass('LINK');
     });
   });
-
-  describe('templates', () => {
-    test('does not warn with default templates', async () => {
-      const container = document.createElement('div');
-      const searchClient = createMockedSearchClient();
-
-      const search = instantsearch({
-        indexName: 'indexName',
-        searchClient,
-      });
-
-      search.addWidgets([
-        configure({ hitsPerPage: 1 }),
-        pagination({ container }),
-      ]);
-
-      // @MAJOR Once Hogan.js and string-based templates are removed,
-      // `search.start()` can be moved to the test body and the following
-      // assertion can go away.
-      expect(async () => {
-        search.start();
-
-        await wait(0);
-      }).not.toWarnDev();
-
-      await wait(0);
-    });
-
-    type CustomHit = { name: string; description: string };
-
-    function createMockedSearchClient(
-      subset: Partial<SearchResponse<CustomHit>> = {}
-    ) {
-      return createSearchClient({
-        search: jest.fn((requests) => {
-          return Promise.resolve(
-            createMultiSearchResponse(
-              ...requests.map((request) => {
-                return createSingleSearchResponse<any>({
-                  index: request.indexName,
-                  query: request.params?.query,
-                  hits: [
-                    {
-                      objectID: '1',
-                      name: 'Apple iPhone smartphone',
-                      description: 'A smartphone by Apple.',
-                      _highlightResult: {
-                        name: {
-                          value: `Apple iPhone <mark>smartphone</mark>`,
-                          matchLevel: 'full' as const,
-                          matchedWords: ['smartphone'],
-                        },
-                      },
-                      _snippetResult: {
-                        name: {
-                          value: `Apple iPhone <mark>smartphone</mark>`,
-                          matchLevel: 'full' as const,
-                        },
-                        description: {
-                          value: `A <mark>smartphone</mark> by Apple.`,
-                          matchLevel: 'full' as const,
-                        },
-                      },
-                    },
-                  ],
-                  page: 0,
-                  nbPages: 3,
-                  ...subset,
-                });
-              })
-            )
-          );
-        }),
-      });
-    }
-  });
 });
diff --git a/packages/instantsearch.js/src/widgets/panel/__tests__/panel-test.ts b/packages/instantsearch.js/src/widgets/panel/__tests__/panel-test.ts
index 86709e8a70..c7f996114a 100644
--- a/packages/instantsearch.js/src/widgets/panel/__tests__/panel-test.ts
+++ b/packages/instantsearch.js/src/widgets/panel/__tests__/panel-test.ts
@@ -40,7 +40,7 @@ describe('Usage', () => {
   test('with templates does not throw', () => {
     expect(() => {
       panel({
-        templates: { header: 'header' },
+        templates: { header: () => 'header' },
       });
     }).not.toThrow();
   });
@@ -137,9 +137,10 @@ describe('Templates', () => {
   });
 
   test('with header template', () => {
+    const headerTemplate = () => 'Custom header';
     const widgetWithPanel = panel({
       templates: {
-        header: 'Custom header',
+        header: headerTemplate,
       },
     })(widgetFactory);
 
@@ -154,13 +155,14 @@ describe('Templates', () => {
     >;
     const { templates } = firstRender.props as PanelProps<typeof widgetFactory>;
 
-    expect(templates.header).toBe('Custom header');
+    expect(templates.header).toBe(headerTemplate);
   });
 
   test('with footer template', () => {
+    const footerTemplate = () => 'Custom footer';
     const widgetWithPanel = panel({
       templates: {
-        footer: 'Custom footer',
+        footer: footerTemplate,
       },
     })(widgetFactory);
 
@@ -175,13 +177,14 @@ describe('Templates', () => {
     >;
     const { templates } = firstRender.props as PanelProps<typeof widgetFactory>;
 
-    expect(templates.footer).toBe('Custom footer');
+    expect(templates.footer).toBe(footerTemplate);
   });
 
   test('with collapseButtonText template', () => {
+    const collapseButtonTextTemplate = () => 'Custom collapseButtonText';
     const widgetWithPanel = panel({
       templates: {
-        collapseButtonText: 'Custom collapseButtonText',
+        collapseButtonText: collapseButtonTextTemplate,
       },
     })(widgetFactory);
 
@@ -196,7 +199,7 @@ describe('Templates', () => {
     >;
     const { templates } = firstRender.props as PanelProps<typeof widgetFactory>;
 
-    expect(templates.collapseButtonText).toBe('Custom collapseButtonText');
+    expect(templates.collapseButtonText).toBe(collapseButtonTextTemplate);
   });
 });
 
diff --git a/packages/instantsearch.js/src/widgets/panel/__tests__/panel.test.tsx b/packages/instantsearch.js/src/widgets/panel/__tests__/panel.test.tsx
index 65cedb6548..cc5af41098 100644
--- a/packages/instantsearch.js/src/widgets/panel/__tests__/panel.test.tsx
+++ b/packages/instantsearch.js/src/widgets/panel/__tests__/panel.test.tsx
@@ -36,14 +36,7 @@ describe('panel', () => {
         }),
       ]);
 
-      // @MAJOR Once Hogan.js and string-based templates are removed,
-      // `search.start()` can be moved to the test body and the following
-      // assertion can go away.
-      expect(async () => {
-        search.start();
-
-        await wait(0);
-      }).not.toWarnDev();
+      search.start();
 
       await wait(0);
 
diff --git a/packages/instantsearch.js/src/widgets/query-rule-custom-data/__tests__/query-rule-custom-data-test.ts b/packages/instantsearch.js/src/widgets/query-rule-custom-data/__tests__/query-rule-custom-data-test.ts
index 3d707f45bd..1caed4e218 100644
--- a/packages/instantsearch.js/src/widgets/query-rule-custom-data/__tests__/query-rule-custom-data-test.ts
+++ b/packages/instantsearch.js/src/widgets/query-rule-custom-data/__tests__/query-rule-custom-data-test.ts
@@ -165,10 +165,11 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/query-rule-
 
       test('applies custom template', () => {
         const helper = createFakeHelper();
+        const defaultTemplate = () => 'default';
         const widget = queryRuleCustomData({
           container: document.createElement('div'),
           templates: {
-            default: 'default',
+            default: defaultTemplate,
           },
         });
 
@@ -184,7 +185,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/query-rule-
         const { templates } = firstRender.props as QueryRuleCustomDataProps;
 
         expect(templates).toEqual({
-          default: 'default',
+          default: defaultTemplate,
         });
       });
     });
diff --git a/packages/instantsearch.js/src/widgets/query-rule-custom-data/__tests__/query-rule-custom-data.test.tsx b/packages/instantsearch.js/src/widgets/query-rule-custom-data/__tests__/query-rule-custom-data.test.tsx
index 7c52531aa4..93239abf2c 100644
--- a/packages/instantsearch.js/src/widgets/query-rule-custom-data/__tests__/query-rule-custom-data.test.tsx
+++ b/packages/instantsearch.js/src/widgets/query-rule-custom-data/__tests__/query-rule-custom-data.test.tsx
@@ -27,14 +27,7 @@ describe('queryRuleCustomData', () => {
 
       search.addWidgets([queryRuleCustomData({ container })]);
 
-      // @MAJOR Once Hogan.js and string-based templates are removed,
-      // `search.start()` can be moved to the test body and the following
-      // assertion can go away.
-      expect(async () => {
-        search.start();
-
-        await wait(0);
-      }).not.toWarnDev();
+      search.start();
 
       await wait(0);
 
diff --git a/packages/instantsearch.js/src/widgets/range-input/__tests__/range-input.test.tsx b/packages/instantsearch.js/src/widgets/range-input/__tests__/range-input.test.tsx
index 75b7429c9e..de452a8485 100644
--- a/packages/instantsearch.js/src/widgets/range-input/__tests__/range-input.test.tsx
+++ b/packages/instantsearch.js/src/widgets/range-input/__tests__/range-input.test.tsx
@@ -94,14 +94,7 @@ describe('rangeInput', () => {
 
       search.addWidgets([rangeInput({ container, attribute: 'price' })]);
 
-      // @MAJOR Once Hogan.js and string-based templates are removed,
-      // `search.start()` can be moved to the test body and the following
-      // assertion can go away.
-      expect(async () => {
-        search.start();
-
-        await wait(0);
-      }).not.toWarnDev();
+      search.start();
 
       await wait(0);
 
diff --git a/packages/instantsearch.js/src/widgets/range-input/range-input.tsx b/packages/instantsearch.js/src/widgets/range-input/range-input.tsx
index a95dd17708..477322b4c7 100644
--- a/packages/instantsearch.js/src/widgets/range-input/range-input.tsx
+++ b/packages/instantsearch.js/src/widgets/range-input/range-input.tsx
@@ -134,14 +134,10 @@ const renderer =
     };
     templates: RangeInputTemplates;
   }): Renderer<RangeRenderState, Partial<RangeInputWidgetParams>> =>
-  (
-    { refine, range, start, widgetParams, instantSearchInstance },
-    isFirstRendering
-  ) => {
+  ({ refine, range, start, widgetParams }, isFirstRendering) => {
     if (isFirstRendering) {
       renderState.templateProps = prepareTemplateProps({
         defaultTemplates,
-        templatesConfig: instantSearchInstance.templatesConfig,
         templates,
       });
       return;
diff --git a/packages/instantsearch.js/src/widgets/range-slider/__tests__/range-slider-test.ts b/packages/instantsearch.js/src/widgets/range-slider/__tests__/range-slider-test.ts
index ef7f8551d5..679c87743d 100644
--- a/packages/instantsearch.js/src/widgets/range-slider/__tests__/range-slider-test.ts
+++ b/packages/instantsearch.js/src/widgets/range-slider/__tests__/range-slider-test.ts
@@ -105,9 +105,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-slide
       helper = algoliasearchHelper(createSearchClient(), 'indexName', {
         disjunctiveFacets: [attribute],
       });
-      instantSearchInstance = createInstantSearch({
-        templatesConfig: undefined,
-      });
+      instantSearchInstance = createInstantSearch();
     });
 
     it('should render without results', () => {
diff --git a/packages/instantsearch.js/src/widgets/rating-menu/__tests__/rating-menu.test.tsx b/packages/instantsearch.js/src/widgets/rating-menu/__tests__/rating-menu.test.tsx
index 9d7021f65e..029c45d70a 100644
--- a/packages/instantsearch.js/src/widgets/rating-menu/__tests__/rating-menu.test.tsx
+++ b/packages/instantsearch.js/src/widgets/rating-menu/__tests__/rating-menu.test.tsx
@@ -202,14 +202,7 @@ describe('ratingMenu', () => {
 
       search.addWidgets([ratingMenu({ container, attribute: 'price' })]);
 
-      // @MAJOR Once Hogan.js and string-based templates are removed,
-      // `search.start()` can be moved to the test body and the following
-      // assertion can go away.
-      expect(async () => {
-        search.start();
-
-        await wait(0);
-      }).not.toWarnDev();
+      search.start();
 
       await wait(0);
 
diff --git a/packages/instantsearch.js/src/widgets/rating-menu/rating-menu.tsx b/packages/instantsearch.js/src/widgets/rating-menu/rating-menu.tsx
index 8d18e2c96e..12c4131c35 100644
--- a/packages/instantsearch.js/src/widgets/rating-menu/rating-menu.tsx
+++ b/packages/instantsearch.js/src/widgets/rating-menu/rating-menu.tsx
@@ -146,14 +146,12 @@ const renderer =
       refine,
       items,
       createURL,
-      instantSearchInstance,
     }: RatingMenuRenderState & RendererOptions<RatingMenuConnectorParams>,
     isFirstRendering: boolean
   ) => {
     if (isFirstRendering) {
       renderState.templateProps = prepareTemplateProps({
         defaultTemplates,
-        templatesConfig: instantSearchInstance.templatesConfig,
         templates,
       });
 
diff --git a/packages/instantsearch.js/src/widgets/refinement-list/__tests__/refinement-list.test.tsx b/packages/instantsearch.js/src/widgets/refinement-list/__tests__/refinement-list.test.tsx
index 5c18995abd..6f0a7dc0ed 100644
--- a/packages/instantsearch.js/src/widgets/refinement-list/__tests__/refinement-list.test.tsx
+++ b/packages/instantsearch.js/src/widgets/refinement-list/__tests__/refinement-list.test.tsx
@@ -349,14 +349,7 @@ describe('refinementList', () => {
         }),
       ]);
 
-      // @MAJOR Once Hogan.js and string-based templates are removed,
-      // `search.start()` can be moved to the test body and the following
-      // assertion can go away.
-      expect(async () => {
-        search.start();
-
-        await wait(0);
-      }).not.toWarnDev();
+      search.start();
 
       await wait(0);
 
diff --git a/packages/instantsearch.js/src/widgets/refinement-list/refinement-list.tsx b/packages/instantsearch.js/src/widgets/refinement-list/refinement-list.tsx
index edd83b232b..8c204c273d 100644
--- a/packages/instantsearch.js/src/widgets/refinement-list/refinement-list.tsx
+++ b/packages/instantsearch.js/src/widgets/refinement-list/refinement-list.tsx
@@ -240,7 +240,6 @@ const renderer =
       createURL,
       searchForItems,
       isFromSearch,
-      instantSearchInstance,
       toggleShowMore,
       isShowingMore,
       hasExhaustiveItems,
@@ -251,12 +250,10 @@ const renderer =
     if (isFirstRendering) {
       renderState.templateProps = prepareTemplateProps({
         defaultTemplates,
-        templatesConfig: instantSearchInstance.templatesConfig,
         templates,
       });
       renderState.searchBoxTemplateProps = prepareTemplateProps({
         defaultTemplates: searchBoxDefaultTemplates,
-        templatesConfig: instantSearchInstance.templatesConfig,
         templates: searchBoxTemplates,
       });
       return;
diff --git a/packages/instantsearch.js/src/widgets/related-products/__tests__/related-products.test.tsx b/packages/instantsearch.js/src/widgets/related-products/__tests__/related-products.test.tsx
index cdc26a15da..1ff5a5316a 100644
--- a/packages/instantsearch.js/src/widgets/related-products/__tests__/related-products.test.tsx
+++ b/packages/instantsearch.js/src/widgets/related-products/__tests__/related-products.test.tsx
@@ -108,14 +108,7 @@ describe('relatedProducts', () => {
 
       search.addWidgets([relatedProductsWidget]);
 
-      // @MAJOR Once Hogan.js and string-based templates are removed,
-      // `search.start()` can be moved to the test body and the following
-      // assertion can go away.
-      expect(async () => {
-        search.start();
-
-        await wait(0);
-      }).not.toWarnDev();
+      search.start();
 
       await wait(0);
 
diff --git a/packages/instantsearch.js/src/widgets/related-products/related-products.tsx b/packages/instantsearch.js/src/widgets/related-products/related-products.tsx
index 1c82171632..1734b08f6e 100644
--- a/packages/instantsearch.js/src/widgets/related-products/related-products.tsx
+++ b/packages/instantsearch.js/src/widgets/related-products/related-products.tsx
@@ -67,7 +67,6 @@ function createRenderer<THit extends NonNullable<object> = BaseHit>({
         defaultTemplates: {} as unknown as Required<
           RelatedProductsTemplates<THit>
         >,
-        templatesConfig: instantSearchInstance.templatesConfig,
         templates,
       });
 
diff --git a/packages/instantsearch.js/src/widgets/relevant-sort/__tests__/relevant-sort-test.ts b/packages/instantsearch.js/src/widgets/relevant-sort/__tests__/relevant-sort-test.ts
index 3c18f35b20..51eb9cbb36 100644
--- a/packages/instantsearch.js/src/widgets/relevant-sort/__tests__/relevant-sort-test.ts
+++ b/packages/instantsearch.js/src/widgets/relevant-sort/__tests__/relevant-sort-test.ts
@@ -26,7 +26,7 @@ jest.mock('preact', () => {
 });
 
 const templates: RelevantSortTemplates = {
-  text: '',
+  text: () => '',
   button: ({ isRelevantSorted }) => {
     return isRelevantSorted ? 'See all results' : 'See relevant results';
   },
diff --git a/packages/instantsearch.js/src/widgets/relevant-sort/__tests__/relevant-sort.test.tsx b/packages/instantsearch.js/src/widgets/relevant-sort/__tests__/relevant-sort.test.tsx
index ffc4315ba3..18f4db1cdf 100644
--- a/packages/instantsearch.js/src/widgets/relevant-sort/__tests__/relevant-sort.test.tsx
+++ b/packages/instantsearch.js/src/widgets/relevant-sort/__tests__/relevant-sort.test.tsx
@@ -27,36 +27,31 @@ describe('relevantSort', () => {
 
       search.addWidgets([relevantSort({ container })]);
 
-      // @MAJOR Once Hogan.js and string-based templates are removed,
-      // `search.start()` can be moved to the test body and the following
-      // assertion can go away.
-      expect(async () => {
-        search.start();
-
-        await wait(0);
-      }).not.toWarnDev();
+      search.start();
 
       await wait(0);
 
       expect(container).toMatchInlineSnapshot(`
-<div>
-  <div
-    class="ais-RelevantSort"
-  >
-    <div
-      class="ais-RelevantSort-text"
-    />
-    <button
-      class="ais-RelevantSort-button"
-      type="button"
-    >
-      <span>
-        See all results
-      </span>
-    </button>
-  </div>
-</div>
-`);
+        <div>
+          <div
+            class="ais-RelevantSort"
+          >
+            <div
+              class="ais-RelevantSort-text"
+            >
+              
+            </div>
+            <button
+              class="ais-RelevantSort-button"
+              type="button"
+            >
+              <span>
+                See all results
+              </span>
+            </button>
+          </div>
+        </div>
+      `);
     });
 
     test('renders with templates using `html`', async () => {
@@ -93,31 +88,31 @@ describe('relevantSort', () => {
       await wait(0);
 
       expect(container).toMatchInlineSnapshot(`
-<div>
-  <div
-    class="ais-RelevantSort"
-  >
-    <div
-      class="ais-RelevantSort-text"
-    >
-      <p>
-        Click the button to
-        see all results.
-      </p>
-    </div>
-    <button
-      class="ais-RelevantSort-button"
-      type="button"
-    >
-      <span>
-        <span>
-          See all results
-        </span>
-      </span>
-    </button>
-  </div>
-</div>
-`);
+        <div>
+          <div
+            class="ais-RelevantSort"
+          >
+            <div
+              class="ais-RelevantSort-text"
+            >
+              <p>
+                Click the button to
+                see all results.
+              </p>
+            </div>
+            <button
+              class="ais-RelevantSort-button"
+              type="button"
+            >
+              <span>
+                <span>
+                  See all results
+                </span>
+              </span>
+            </button>
+          </div>
+        </div>
+      `);
     });
 
     test('renders with templates using JSX', async () => {
@@ -158,32 +153,32 @@ describe('relevantSort', () => {
       await wait(0);
 
       expect(container).toMatchInlineSnapshot(`
-<div>
-  <div
-    class="ais-RelevantSort"
-  >
-    <div
-      class="ais-RelevantSort-text"
-    >
-      <p>
-        Click the button to
-         
-        see all results.
-      </p>
-    </div>
-    <button
-      class="ais-RelevantSort-button"
-      type="button"
-    >
-      <span>
-        <span>
-          See all results
-        </span>
-      </span>
-    </button>
-  </div>
-</div>
-`);
+        <div>
+          <div
+            class="ais-RelevantSort"
+          >
+            <div
+              class="ais-RelevantSort-text"
+            >
+              <p>
+                Click the button to
+                 
+                see all results.
+              </p>
+            </div>
+            <button
+              class="ais-RelevantSort-button"
+              type="button"
+            >
+              <span>
+                <span>
+                  See all results
+                </span>
+              </span>
+            </button>
+          </div>
+        </div>
+      `);
     });
 
     function createMockedSearchClient() {
diff --git a/packages/instantsearch.js/src/widgets/search-box/__tests__/search-box.test.tsx b/packages/instantsearch.js/src/widgets/search-box/__tests__/search-box.test.tsx
index 200f841eb5..f7611f8be6 100644
--- a/packages/instantsearch.js/src/widgets/search-box/__tests__/search-box.test.tsx
+++ b/packages/instantsearch.js/src/widgets/search-box/__tests__/search-box.test.tsx
@@ -90,14 +90,7 @@ describe('searchBox', () => {
 
       search.addWidgets([searchBox({ container })]);
 
-      // @MAJOR Once Hogan.js and string-based templates are removed,
-      // `search.start()` can be moved to the test body and the following
-      // assertion can go away.
-      expect(async () => {
-        search.start();
-
-        await wait(0);
-      }).not.toWarnDev();
+      search.start();
 
       await wait(0);
 
diff --git a/packages/instantsearch.js/src/widgets/search-box/search-box.tsx b/packages/instantsearch.js/src/widgets/search-box/search-box.tsx
index 186d5d67d3..4d13db48a8 100644
--- a/packages/instantsearch.js/src/widgets/search-box/search-box.tsx
+++ b/packages/instantsearch.js/src/widgets/search-box/search-box.tsx
@@ -29,15 +29,15 @@ const suit = component('SearchBox');
 
 export type SearchBoxTemplates = Partial<{
   /**
-   * Template used for displaying the submit button. Can accept a function or a Hogan string.
+   * Template used for displaying the submit button.
    */
   submit: Template<{ cssClasses: SearchBoxComponentCSSClasses }>;
   /**
-   * Template used for displaying the reset button. Can accept a function or a Hogan string.
+   * Template used for displaying the reset button.
    */
   reset: Template<{ cssClasses: SearchBoxComponentCSSClasses }>;
   /**
-   * Template used for displaying the loading indicator. Can accept a function or a Hogan string.
+   * Template used for displaying the loading indicator.
    */
   loadingIndicator: Template<{ cssClasses: SearchBoxComponentCSSClasses }>;
 }>;
diff --git a/packages/instantsearch.js/src/widgets/stats/__tests__/stats.test.tsx b/packages/instantsearch.js/src/widgets/stats/__tests__/stats.test.tsx
index db2cfd2d27..7f523ac36c 100644
--- a/packages/instantsearch.js/src/widgets/stats/__tests__/stats.test.tsx
+++ b/packages/instantsearch.js/src/widgets/stats/__tests__/stats.test.tsx
@@ -77,30 +77,23 @@ describe('stats', () => {
         stats({ container }),
       ]);
 
-      // @MAJOR Once Hogan.js and string-based templates are removed,
-      // `search.start()` can be moved to the test body and the following
-      // assertion can go away.
-      expect(async () => {
-        search.start();
-
-        await wait(0);
-      }).not.toWarnDev();
+      search.start();
 
       await wait(0);
 
       expect(container).toMatchInlineSnapshot(`
-<div>
-  <div
-    class="ais-Stats"
-  >
-    <span
-      class="ais-Stats-text"
-    >
-      2 results found in 0ms
-    </span>
-  </div>
-</div>
-`);
+        <div>
+          <div
+            class="ais-Stats"
+          >
+            <span
+              class="ais-Stats-text"
+            >
+              2 results found in 0ms
+            </span>
+          </div>
+        </div>
+      `);
 
       fireEvent.input(within(searchBoxContainer).getByRole('searchbox'), {
         target: { value: 'query with no results' },
@@ -109,18 +102,18 @@ describe('stats', () => {
       await wait(0);
 
       expect(container).toMatchInlineSnapshot(`
-<div>
-  <div
-    class="ais-Stats"
-  >
-    <span
-      class="ais-Stats-text"
-    >
-      No results found in 0ms
-    </span>
-  </div>
-</div>
-`);
+        <div>
+          <div
+            class="ais-Stats"
+          >
+            <span
+              class="ais-Stats-text"
+            >
+              No results found in 0ms
+            </span>
+          </div>
+        </div>
+      `);
     });
 
     test('renders with templates using `html`', async () => {
@@ -158,29 +151,29 @@ describe('stats', () => {
       await wait(0);
 
       expect(container).toMatchInlineSnapshot(`
-<div>
-  <div
-    class="ais-Stats"
-  >
-    <span
-      class="ais-Stats-text"
-    >
-      <span>
-        <strong>
-          
-        </strong>
-         returned 
-        2
-        result
-        s
-         found in
-        0
-        ms
-      </span>
-    </span>
-  </div>
-</div>
-`);
+        <div>
+          <div
+            class="ais-Stats"
+          >
+            <span
+              class="ais-Stats-text"
+            >
+              <span>
+                <strong>
+                  
+                </strong>
+                 returned 
+                2
+                result
+                s
+                 found in
+                0
+                ms
+              </span>
+            </span>
+          </div>
+        </div>
+      `);
 
       fireEvent.input(within(searchBoxContainer).getByRole('searchbox'), {
         target: { value: 'query with no results' },
@@ -189,20 +182,20 @@ describe('stats', () => {
       await wait(0);
 
       expect(container).toMatchInlineSnapshot(`
-<div>
-  <div
-    class="ais-Stats"
-  >
-    <span
-      class="ais-Stats-text"
-    >
-      <span>
-        No results
-      </span>
-    </span>
-  </div>
-</div>
-`);
+        <div>
+          <div
+            class="ais-Stats"
+          >
+            <span
+              class="ais-Stats-text"
+            >
+              <span>
+                No results
+              </span>
+            </span>
+          </div>
+        </div>
+      `);
     });
 
     test('renders with templates using JSX', async () => {
@@ -242,29 +235,29 @@ describe('stats', () => {
       await wait(0);
 
       expect(container).toMatchInlineSnapshot(`
-<div>
-  <div
-    class="ais-Stats"
-  >
-    <span
-      class="ais-Stats-text"
-    >
-      <span>
-        <strong>
-          
-        </strong>
-         returned 
-        2
-        result
-        s
-         found in
-        0
-        ms
-      </span>
-    </span>
-  </div>
-</div>
-`);
+        <div>
+          <div
+            class="ais-Stats"
+          >
+            <span
+              class="ais-Stats-text"
+            >
+              <span>
+                <strong>
+                  
+                </strong>
+                 returned 
+                2
+                result
+                s
+                 found in
+                0
+                ms
+              </span>
+            </span>
+          </div>
+        </div>
+      `);
 
       fireEvent.input(within(searchBoxContainer).getByRole('searchbox'), {
         target: { value: 'query with no results' },
@@ -273,20 +266,20 @@ describe('stats', () => {
       await wait(0);
 
       expect(container).toMatchInlineSnapshot(`
-<div>
-  <div
-    class="ais-Stats"
-  >
-    <span
-      class="ais-Stats-text"
-    >
-      <span>
-        No results
-      </span>
-    </span>
-  </div>
-</div>
-`);
+        <div>
+          <div
+            class="ais-Stats"
+          >
+            <span
+              class="ais-Stats-text"
+            >
+              <span>
+                No results
+              </span>
+            </span>
+          </div>
+        </div>
+      `);
     });
 
     type CustomHit = { name: string; description: string };
diff --git a/packages/instantsearch.js/src/widgets/stats/stats.tsx b/packages/instantsearch.js/src/widgets/stats/stats.tsx
index 9978bf8ccd..2c69e88242 100644
--- a/packages/instantsearch.js/src/widgets/stats/stats.tsx
+++ b/packages/instantsearch.js/src/widgets/stats/stats.tsx
@@ -158,14 +158,12 @@ const renderer =
       page,
       processingTimeMS,
       query,
-      instantSearchInstance,
     },
     isFirstRendering
   ) => {
     if (isFirstRendering) {
       renderState.templateProps = prepareTemplateProps({
         defaultTemplates,
-        templatesConfig: instantSearchInstance.templatesConfig,
         templates,
       });
 
diff --git a/packages/instantsearch.js/src/widgets/toggle-refinement/__tests__/toggle-refinement.test.tsx b/packages/instantsearch.js/src/widgets/toggle-refinement/__tests__/toggle-refinement.test.tsx
index 33b59b1dc9..231fa675ca 100644
--- a/packages/instantsearch.js/src/widgets/toggle-refinement/__tests__/toggle-refinement.test.tsx
+++ b/packages/instantsearch.js/src/widgets/toggle-refinement/__tests__/toggle-refinement.test.tsx
@@ -91,14 +91,7 @@ describe('toggleRefinement', () => {
         }),
       ]);
 
-      // @MAJOR Once Hogan.js and string-based templates are removed,
-      // `search.start()` can be moved to the test body and the following
-      // assertion can go away.
-      expect(async () => {
-        search.start();
-
-        await wait(0);
-      }).not.toWarnDev();
+      search.start();
 
       await wait(0);
 
diff --git a/packages/instantsearch.js/src/widgets/toggle-refinement/toggle-refinement.tsx b/packages/instantsearch.js/src/widgets/toggle-refinement/toggle-refinement.tsx
index 1a4f7f3e93..846378bb2e 100644
--- a/packages/instantsearch.js/src/widgets/toggle-refinement/toggle-refinement.tsx
+++ b/packages/instantsearch.js/src/widgets/toggle-refinement/toggle-refinement.tsx
@@ -49,7 +49,6 @@ const renderer =
     {
       value,
       refine,
-      instantSearchInstance,
     }: ToggleRefinementRenderState &
       RendererOptions<ToggleRefinementConnectorParams>,
     isFirstRendering: boolean
@@ -57,7 +56,6 @@ const renderer =
     if (isFirstRendering) {
       renderState.templateProps = prepareTemplateProps({
         defaultTemplates,
-        templatesConfig: instantSearchInstance.templatesConfig,
         templates,
       });
 
diff --git a/packages/instantsearch.js/src/widgets/trending-items/__tests__/trending-items.test.tsx b/packages/instantsearch.js/src/widgets/trending-items/__tests__/trending-items.test.tsx
index 1a373824e7..4e752a61c2 100644
--- a/packages/instantsearch.js/src/widgets/trending-items/__tests__/trending-items.test.tsx
+++ b/packages/instantsearch.js/src/widgets/trending-items/__tests__/trending-items.test.tsx
@@ -104,14 +104,7 @@ describe('trendingItems', () => {
 
       search.addWidgets([trendingItemsWidget]);
 
-      // @MAJOR Once Hogan.js and string-based templates are removed,
-      // `search.start()` can be moved to the test body and the following
-      // assertion can go away.
-      expect(async () => {
-        search.start();
-
-        await wait(0);
-      }).not.toWarnDev();
+      search.start();
 
       await wait(0);
 
diff --git a/packages/instantsearch.js/src/widgets/trending-items/trending-items.tsx b/packages/instantsearch.js/src/widgets/trending-items/trending-items.tsx
index e6df0cac86..9d033a9fab 100644
--- a/packages/instantsearch.js/src/widgets/trending-items/trending-items.tsx
+++ b/packages/instantsearch.js/src/widgets/trending-items/trending-items.tsx
@@ -67,7 +67,6 @@ function createRenderer<THit extends NonNullable<object> = BaseHit>({
         defaultTemplates: {} as unknown as Required<
           TrendingItemsTemplates<THit>
         >,
-        templatesConfig: instantSearchInstance.templatesConfig,
         templates,
       });
 
diff --git a/packages/instantsearch.js/src/widgets/voice-search/__tests__/voice-search.test.tsx b/packages/instantsearch.js/src/widgets/voice-search/__tests__/voice-search.test.tsx
index f40d539f77..e490de05a9 100644
--- a/packages/instantsearch.js/src/widgets/voice-search/__tests__/voice-search.test.tsx
+++ b/packages/instantsearch.js/src/widgets/voice-search/__tests__/voice-search.test.tsx
@@ -23,69 +23,62 @@ describe('voiceSearch', () => {
 
       search.addWidgets([voiceSearch({ container })]);
 
-      // @MAJOR Once Hogan.js and string-based templates are removed,
-      // `search.start()` can be moved to the test body and the following
-      // assertion can go away.
-      expect(async () => {
-        search.start();
-
-        await wait(0);
-      }).not.toWarnDev();
+      search.start();
 
       await wait(0);
 
       expect(container).toMatchInlineSnapshot(`
-<div>
-  <div
-    class="ais-VoiceSearch"
-  >
-    <button
-      class="ais-VoiceSearch-button"
-      disabled=""
-      title="Search by voice (not supported on this browser)"
-      type="button"
-    >
-      <svg
-        fill="none"
-        height="16"
-        stroke="currentColor"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-        stroke-width="2"
-        viewBox="0 0 24 24"
-        width="16"
-      >
-        <path
-          d="M12 1a3 3 0 0 0-3 3v8a3 3 0 0 0 6 0V4a3 3 0 0 0-3-3z"
-          fill="none"
-        />
-        <path
-          d="M19 10v2a7 7 0 0 1-14 0v-2"
-        />
-        <line
-          x1="12"
-          x2="12"
-          y1="19"
-          y2="23"
-        />
-        <line
-          x1="8"
-          x2="16"
-          y1="23"
-          y2="23"
-        />
-      </svg>
-    </button>
-    <div
-      class="ais-VoiceSearch-status"
-    >
-      <p>
-        
-      </p>
-    </div>
-  </div>
-</div>
-`);
+        <div>
+          <div
+            class="ais-VoiceSearch"
+          >
+            <button
+              class="ais-VoiceSearch-button"
+              disabled=""
+              title="Search by voice (not supported on this browser)"
+              type="button"
+            >
+              <svg
+                fill="none"
+                height="16"
+                stroke="currentColor"
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                stroke-width="2"
+                viewBox="0 0 24 24"
+                width="16"
+              >
+                <path
+                  d="M12 1a3 3 0 0 0-3 3v8a3 3 0 0 0 6 0V4a3 3 0 0 0-3-3z"
+                  fill="none"
+                />
+                <path
+                  d="M19 10v2a7 7 0 0 1-14 0v-2"
+                />
+                <line
+                  x1="12"
+                  x2="12"
+                  y1="19"
+                  y2="23"
+                />
+                <line
+                  x1="8"
+                  x2="16"
+                  y1="23"
+                  y2="23"
+                />
+              </svg>
+            </button>
+            <div
+              class="ais-VoiceSearch-status"
+            >
+              <p>
+                
+              </p>
+            </div>
+          </div>
+        </div>
+      `);
     });
 
     test('renders with templates using `html`', async () => {
@@ -117,34 +110,34 @@ describe('voiceSearch', () => {
       await wait(0);
 
       expect(container).toMatchInlineSnapshot(`
-<div>
-  <div
-    class="ais-VoiceSearch"
-  >
-    <button
-      class="ais-VoiceSearch-button"
-      disabled=""
-      title="Search by voice (not supported on this browser)"
-      type="button"
-    >
-      <span>
-        Start
-      </span>
-    </button>
-    <div
-      class="ais-VoiceSearch-status"
-    >
-      <div
-        class="NOT-LISTENING"
-      >
-        <span>
-          initial
-        </span>
-      </div>
-    </div>
-  </div>
-</div>
-`);
+        <div>
+          <div
+            class="ais-VoiceSearch"
+          >
+            <button
+              class="ais-VoiceSearch-button"
+              disabled=""
+              title="Search by voice (not supported on this browser)"
+              type="button"
+            >
+              <span>
+                Start
+              </span>
+            </button>
+            <div
+              class="ais-VoiceSearch-status"
+            >
+              <div
+                class="NOT-LISTENING"
+              >
+                <span>
+                  initial
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
+      `);
     });
 
     test('renders with templates using JSX', async () => {
@@ -176,34 +169,34 @@ describe('voiceSearch', () => {
       await wait(0);
 
       expect(container).toMatchInlineSnapshot(`
-<div>
-  <div
-    class="ais-VoiceSearch"
-  >
-    <button
-      class="ais-VoiceSearch-button"
-      disabled=""
-      title="Search by voice (not supported on this browser)"
-      type="button"
-    >
-      <span>
-        Start
-      </span>
-    </button>
-    <div
-      class="ais-VoiceSearch-status"
-    >
-      <div
-        class="NOT-LISTENING"
-      >
-        <span>
-          initial
-        </span>
-      </div>
-    </div>
-  </div>
-</div>
-`);
+        <div>
+          <div
+            class="ais-VoiceSearch"
+          >
+            <button
+              class="ais-VoiceSearch-button"
+              disabled=""
+              title="Search by voice (not supported on this browser)"
+              type="button"
+            >
+              <span>
+                Start
+              </span>
+            </button>
+            <div
+              class="ais-VoiceSearch-status"
+            >
+              <div
+                class="NOT-LISTENING"
+              >
+                <span>
+                  initial
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
+      `);
     });
   });
 });
diff --git a/packages/instantsearch.js/stories/hits.stories.ts b/packages/instantsearch.js/stories/hits.stories.ts
index d54b63d353..9b325bdf87 100644
--- a/packages/instantsearch.js/stories/hits.stories.ts
+++ b/packages/instantsearch.js/stories/hits.stories.ts
@@ -50,19 +50,6 @@ storiesOf('Results/Hits', module)
       ]);
     })
   )
-  .add(
-    'with highlight helper',
-    withHits(({ search, container, instantsearch }) => {
-      search.addWidgets([
-        instantsearch.widgets.hits({
-          container,
-          templates: {
-            item: '{{#helpers.highlight}}{ "attribute": "name" }{{/helpers.highlight}}',
-          },
-        }),
-      ]);
-    })
-  )
   .add(
     'with reverseHighlight function',
     withHits(({ search, container, instantsearch }) => {
@@ -81,19 +68,6 @@ storiesOf('Results/Hits', module)
       ]);
     })
   )
-  .add(
-    'with reverseHighlight helper',
-    withHits(({ search, container, instantsearch }) => {
-      search.addWidgets([
-        instantsearch.widgets.hits({
-          container,
-          templates: {
-            item: '{{#helpers.reverseHighlight}}{ "attribute": "name" }{{/helpers.reverseHighlight}}',
-          },
-        }),
-      ]);
-    })
-  )
   .add(
     'with snippet function',
     withHits(({ search, container, instantsearch }) => {
@@ -128,27 +102,6 @@ storiesOf('Results/Hits', module)
       ]);
     })
   )
-  .add(
-    'with snippet helper',
-    withHits(({ search, container, instantsearch }) => {
-      search.addWidgets([
-        instantsearch.widgets.configure({
-          attributesToSnippet: ['name', 'description'],
-        }),
-      ]);
-
-      search.addWidgets([
-        instantsearch.widgets.hits({
-          container,
-          templates: {
-            item: `
-              <h4>{{#helpers.snippet}}{ "attribute": "name", "highlightedTagName": "mark" }{{/helpers.snippet}}</h4>
-              <p>{{#helpers.snippet}}{ "attribute": "description", "highlightedTagName": "mark" }{{/helpers.snippet}}</p>`,
-          },
-        }),
-      ]);
-    })
-  )
   .add(
     'with reverseSnippet function',
     withHits(({ search, container, instantsearch }) => {
@@ -179,27 +132,6 @@ storiesOf('Results/Hits', module)
       ]);
     })
   )
-  .add(
-    'with reverseSnippet helper',
-    withHits(({ search, container, instantsearch }) => {
-      search.addWidgets([
-        instantsearch.widgets.configure({
-          attributesToSnippet: ['name', 'description'],
-        }),
-      ]);
-
-      search.addWidgets([
-        instantsearch.widgets.hits({
-          container,
-          templates: {
-            item: `
-              <h4>{{#helpers.reverseSnippet}}{ "attribute": "name", "highlightedTagName": "mark" }{{/helpers.reverseSnippet}}</h4>
-              <p>{{#helpers.reverseSnippet}}{ "attribute": "description", "highlightedTagName": "mark" }{{/helpers.reverseSnippet}}</p>`,
-          },
-        }),
-      ]);
-    })
-  )
   .add(
     'with insights function',
     withHits(
@@ -231,36 +163,4 @@ storiesOf('Results/Hits', module)
         insightsClient: fakeInsightsClient,
       }
     )
-  )
-  .add(
-    'with insights helper',
-    withHits(
-      ({ search, container, instantsearch }) => {
-        search.addWidgets([
-          instantsearch.widgets.configure({
-            attributesToSnippet: ['name', 'description'],
-            clickAnalytics: true,
-          }),
-        ]);
-
-        search.addWidgets([
-          instantsearch.widgets.hits({
-            container,
-            templates: {
-              item: `
-              <h4>{{name}}</h4>
-              <button {{#helpers.insights}} {
-               "method": "clickedObjectIDsAfterSearch",
-               "payload": { "eventName": "Add to cart" }
-              } {{/helpers.insights}}>
-                Add to cart
-              </button>`,
-            },
-          }),
-        ]);
-      },
-      {
-        insightsClient: fakeInsightsClient,
-      }
-    )
   );
diff --git a/packages/instantsearch.js/stories/infinite-hits.stories.ts b/packages/instantsearch.js/stories/infinite-hits.stories.ts
index a2d9e92137..0ced6146cc 100644
--- a/packages/instantsearch.js/stories/infinite-hits.stories.ts
+++ b/packages/instantsearch.js/stories/infinite-hits.stories.ts
@@ -33,7 +33,7 @@ storiesOf('Results/InfiniteHits', module)
           container,
           templates: {
             item: ({ name }) => name,
-            showMoreText: 'Load more',
+            showMoreText: () => 'Load more',
           },
         }),
       ]);
@@ -46,7 +46,7 @@ storiesOf('Results/InfiniteHits', module)
         instantsearch.widgets.infiniteHits({
           container,
           templates: {
-            item: '{{name}}',
+            item: ({ name }) => name,
           },
           transformItems: (items) =>
             items.map((item) => ({
@@ -103,7 +103,7 @@ storiesOf('Results/InfiniteHits', module)
             container,
             showPrevious: true,
             templates: {
-              item: '{{name}}',
+              item: ({ name }) => name,
             },
           }),
         ]);
diff --git a/packages/instantsearch.js/stories/query-rule-custom-data.stories.ts b/packages/instantsearch.js/stories/query-rule-custom-data.stories.ts
index e6ab22cfb4..54928da726 100644
--- a/packages/instantsearch.js/stories/query-rule-custom-data.stories.ts
+++ b/packages/instantsearch.js/stories/query-rule-custom-data.stories.ts
@@ -54,37 +54,6 @@ storiesOf('Metadata/QueryRuleCustomData', module)
       ]);
     }, searchOptions)
   )
-  .add(
-    'with Hogan',
-    withHits(({ search, container, instantsearch }) => {
-      const widgetContainer = document.createElement('div');
-      const description = document.createElement('p');
-      description.innerHTML = 'Type <q>music</q> and a banner will appear.';
-
-      container.appendChild(description);
-      container.appendChild(widgetContainer);
-
-      search.addWidgets([
-        instantsearch.widgets.queryRuleCustomData({
-          container: widgetContainer,
-          templates: {
-            default: `
-            {{#items}}
-              {{#banner}}
-                <section>
-                  <h2>{{title}}</h2>
-
-                  <a href="{{link}}">
-                    <img src="{{banner}}" alt="{{title}}">
-                  </a>
-                </section>
-              {{/banner}}
-            {{/items}}`,
-          },
-        }),
-      ]);
-    }, searchOptions)
-  )
   .add(
     'with default and single banner',
     withHits(({ search, container, instantsearch }) => {
diff --git a/packages/instantsearch.js/test/createInstantSearch.ts b/packages/instantsearch.js/test/createInstantSearch.ts
index 89bcce40ab..d8f76b7bf3 100644
--- a/packages/instantsearch.js/test/createInstantSearch.ts
+++ b/packages/instantsearch.js/test/createInstantSearch.ts
@@ -31,7 +31,6 @@ export const createInstantSearch = (
     },
     refresh: jest.fn(),
     helper: mainHelper, // @TODO: use the Helper from the index once the RoutingManger uses the index
-    templatesConfig: {},
     insightsClient: null,
     middleware: [],
     renderState: {},
diff --git a/packages/instantsearch.js/test/createWidget.ts b/packages/instantsearch.js/test/createWidget.ts
index e3f5cf05f6..c526d18e52 100644
--- a/packages/instantsearch.js/test/createWidget.ts
+++ b/packages/instantsearch.js/test/createWidget.ts
@@ -22,7 +22,6 @@ export const createInitOptions = (
     instantSearchInstance,
     parent: instantSearchInstance.mainIndex,
     uiState: instantSearchInstance._initialUiState,
-    templatesConfig: instantSearchInstance.templatesConfig,
     helper,
     state: helper.state,
     renderState: instantSearchInstance.renderState,
@@ -64,7 +63,6 @@ export const createRenderOptions = (
   return {
     instantSearchInstance,
     parent: instantSearchInstance.mainIndex,
-    templatesConfig: instantSearchInstance.templatesConfig,
     helper,
     state: helper.state,
     renderState: instantSearchInstance.renderState,
diff --git a/packages/react-instantsearch-core/src/hooks/__tests__/useConnector.test.tsx b/packages/react-instantsearch-core/src/hooks/__tests__/useConnector.test.tsx
index 36dc9b7a3c..23b0df3246 100644
--- a/packages/react-instantsearch-core/src/hooks/__tests__/useConnector.test.tsx
+++ b/packages/react-instantsearch-core/src/hooks/__tests__/useConnector.test.tsx
@@ -385,7 +385,6 @@ describe('useConnector', () => {
       ],
       state: helperState,
       renderState: searchContext.current!.renderState,
-      templatesConfig: searchContext.current!.templatesConfig,
       createURL: indexContext.current!.createURL,
       searchMetadata: {
         isSearchStalled: false,
diff --git a/packages/react-instantsearch-core/src/hooks/useConnector.ts b/packages/react-instantsearch-core/src/hooks/useConnector.ts
index e8205f2040..55b05e1d8a 100644
--- a/packages/react-instantsearch-core/src/hooks/useConnector.ts
+++ b/packages/react-instantsearch-core/src/hooks/useConnector.ts
@@ -129,7 +129,6 @@ export function useConnector<
         scopedResults,
         state: helper.state,
         renderState: search.renderState,
-        templatesConfig: search.templatesConfig,
         createURL: parentIndex.createURL,
         searchMetadata: {
           isSearchStalled: search.status === 'stalled',
diff --git a/packages/vue-instantsearch/src/components/__tests__/Index-integration.js b/packages/vue-instantsearch/src/components/__tests__/Index-integration.js
index 094e98403a..a789063357 100644
--- a/packages/vue-instantsearch/src/components/__tests__/Index-integration.js
+++ b/packages/vue-instantsearch/src/components/__tests__/Index-integration.js
@@ -102,7 +102,6 @@ it('child widgets render with right data', () => {
       instantSearchInstance: search,
       parent: indexWidget,
       state: expect.any(Object),
-      templatesConfig: expect.any(Object),
       uiState: {},
     })
   );
diff --git a/packages/vue-instantsearch/src/util/__tests__/createServerRootMixin.test.js b/packages/vue-instantsearch/src/util/__tests__/createServerRootMixin.test.js
index 8c6674780f..9f28b39372 100644
--- a/packages/vue-instantsearch/src/util/__tests__/createServerRootMixin.test.js
+++ b/packages/vue-instantsearch/src/util/__tests__/createServerRootMixin.test.js
@@ -1152,7 +1152,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/instantsear
             "isSearchStalled": false,
           },
           "state": Anything,
-          "templatesConfig": {},
         }
       `
       );
diff --git a/packages/vue-instantsearch/src/util/createServerRootMixin.js b/packages/vue-instantsearch/src/util/createServerRootMixin.js
index 7ba64be2bc..79e1b4547c 100644
--- a/packages/vue-instantsearch/src/util/createServerRootMixin.js
+++ b/packages/vue-instantsearch/src/util/createServerRootMixin.js
@@ -166,7 +166,6 @@ function augmentInstantSearch(instantSearchOptions, cloneComponent) {
       scopedResults: parent.getScopedResults(),
       parent,
       state,
-      templatesConfig: {},
       createURL: parent.createURL,
       instantSearchInstance: search,
       searchMetadata: {
diff --git a/yarn.lock b/yarn.lock
index 98ab1a0b63..fba226d2c9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6370,10 +6370,10 @@
   resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.3.tgz#856c99cdc1551d22c22b18b5402719affec9839a"
   integrity sha512-cS5owqtwzLN5kY+l+KgKdRJ/Cee8tlmQoGQuIE9tWnSmS3JMKzmxo2HIAk2wODMifGwO20d62xZQLYz+RLfXmw==
 
-"@types/hogan.js@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@types/hogan.js/-/hogan.js-3.0.1.tgz#64c54407b30da359763e14877f5702b8ae85d61c"
-  integrity sha512-D03i/2OY7kGyMq9wdQ7oD8roE49z/ZCZThe/nbahtvuqCNZY9T2MfedOWyeBdbEpY2W8Gnh/dyJLdFtUCOkYbg==
+"@types/html-escaper@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/html-escaper/-/html-escaper-3.0.0.tgz#97d7df443c0fc86e3abdd0971f4814a58e3ca762"
+  integrity sha512-OcJcvP3Yk8mjYwf/IdXZtTE1tb/u0WF0qa29ER07ZHCYUBZXSN29Z1mBS+/96+kNMGTFUAbSz9X+pHmHpZrTCw==
 
 "@types/html-minifier-terser@^5.0.0":
   version "5.1.2"
@@ -16895,14 +16895,6 @@ hmac-drbg@^1.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-hogan.js@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/hogan.js/-/hogan.js-3.0.2.tgz#4cd9e1abd4294146e7679e41d7898732b02c7bfd"
-  integrity sha1-TNnhq9QpQUbnZ55B14mHMrAse/0=
-  dependencies:
-    mkdirp "0.3.0"
-    nopt "1.0.10"
-
 hoist-non-react-statics@^3.3.0:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
@@ -22205,11 +22197,6 @@ mkdirp2@^1.0.4:
   resolved "https://registry.yarnpkg.com/mkdirp2/-/mkdirp2-1.0.5.tgz#68bbe61defefafce4b48948608ec0bac942512c2"
   integrity sha512-xOE9xbICroUDmG1ye2h4bZ8WBie9EGmACaco8K8cx6RlkJJrxGIqjGqztAI+NMhexXBcdGbSEzI6N3EJPevxZw==
 
-mkdirp@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
-  integrity sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=
-
 mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.6, mkdirp@~0.5.1:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
@@ -22777,13 +22764,6 @@ nomnom@~1.6.2:
     colors "0.5.x"
     underscore "~1.4.4"
 
-nopt@1.0.10, nopt@~1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
-  integrity sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=
-  dependencies:
-    abbrev "1"
-
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
@@ -22806,6 +22786,13 @@ nopt@^6.0.0:
   dependencies:
     abbrev "^1.0.0"
 
+nopt@~1.0.10:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
+  integrity sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=
+  dependencies:
+    abbrev "1"
+
 normalize-css-color@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/normalize-css-color/-/normalize-css-color-1.0.2.tgz#02991e97cccec6623fe573afbbf0de6a1f3e9f8d"

From ae64a27c067459c0369c738d19383f818f6c60c2 Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Fri, 18 Oct 2024 13:00:21 +0200
Subject: [PATCH 02/37] fix(widgets): remove analytics widget (#6398)

* fix(widgets): remove analytics widget

The analytics widget has long been deprecated, and is removed with the insights middleware as alternative. You can use the `onEvent` hook to use a different service.

BREAKING CHANGE: the analytics widget no longer exists

* !fixup stories
---
 .../src/types/render-state.ts                 |   4 +-
 packages/instantsearch.js/src/types/widget.ts |   2 -
 .../src/widgets/__tests__/index.test.ts       |   6 -
 .../analytics/__tests__/analytics-test.ts     |  28 --
 .../src/widgets/analytics/analytics.ts        | 295 ------------------
 .../instantsearch.js/src/widgets/index.ts     |   1 -
 .../stories/analytics.stories.ts              |  25 --
 7 files changed, 1 insertion(+), 360 deletions(-)
 delete mode 100644 packages/instantsearch.js/src/widgets/analytics/__tests__/analytics-test.ts
 delete mode 100644 packages/instantsearch.js/src/widgets/analytics/analytics.ts
 delete mode 100644 packages/instantsearch.js/stories/analytics.stories.ts

diff --git a/packages/instantsearch.js/src/types/render-state.ts b/packages/instantsearch.js/src/types/render-state.ts
index 4064993dee..9cf9fdd7b4 100644
--- a/packages/instantsearch.js/src/types/render-state.ts
+++ b/packages/instantsearch.js/src/types/render-state.ts
@@ -23,7 +23,6 @@ import type { SortByWidgetDescription } from '../connectors/sort-by/connectSortB
 import type { StatsWidgetDescription } from '../connectors/stats/connectStats';
 import type { ToggleRefinementWidgetDescription } from '../connectors/toggle-refinement/connectToggleRefinement';
 import type { VoiceSearchWidgetDescription } from '../connectors/voice-search/connectVoiceSearch';
-import type { AnalyticsWidgetDescription } from '../widgets/analytics/analytics';
 import type { PlacesWidgetDescription } from '../widgets/places/places';
 
 type ConnectorRenderStates = AnswersWidgetDescription['indexRenderState'] &
@@ -52,8 +51,7 @@ type ConnectorRenderStates = AnswersWidgetDescription['indexRenderState'] &
   ToggleRefinementWidgetDescription['indexRenderState'] &
   VoiceSearchWidgetDescription['indexRenderState'];
 
-type WidgetRenderStates = AnalyticsWidgetDescription['indexRenderState'] &
-  PlacesWidgetDescription['indexRenderState'];
+type WidgetRenderStates = PlacesWidgetDescription['indexRenderState'];
 
 export type IndexRenderState = Partial<
   ConnectorRenderStates & WidgetRenderStates
diff --git a/packages/instantsearch.js/src/types/widget.ts b/packages/instantsearch.js/src/types/widget.ts
index c83162bde7..af19f54ba3 100644
--- a/packages/instantsearch.js/src/types/widget.ts
+++ b/packages/instantsearch.js/src/types/widget.ts
@@ -56,7 +56,6 @@ export type DisposeOptions = {
 
 // @MAJOR: Remove these exported types if we don't need them
 export type BuiltinTypes =
-  | 'ais.analytics'
   | 'ais.answers'
   | 'ais.autocomplete'
   | 'ais.breadcrumb'
@@ -95,7 +94,6 @@ export type BuiltinTypes =
   | 'ais.voiceSearch';
 
 export type BuiltinWidgetTypes =
-  | 'ais.analytics'
   | 'ais.answers'
   | 'ais.autocomplete'
   | 'ais.breadcrumb'
diff --git a/packages/instantsearch.js/src/widgets/__tests__/index.test.ts b/packages/instantsearch.js/src/widgets/__tests__/index.test.ts
index 9b1375e01b..a0503bc1af 100644
--- a/packages/instantsearch.js/src/widgets/__tests__/index.test.ts
+++ b/packages/instantsearch.js/src/widgets/__tests__/index.test.ts
@@ -100,12 +100,6 @@ function initiateAllWidgets(): Array<[WidgetNames, Widget | IndexWidget]> {
           items: [{ label: 'x', value: 'x' }],
         });
       }
-      case 'analytics': {
-        const analytics = widget as Widgets['analytics'];
-        return analytics({
-          pushFunction() {},
-        });
-      }
       case 'queryRuleContext': {
         const queryRuleContext = widget as Widgets['queryRuleContext'];
         return queryRuleContext({
diff --git a/packages/instantsearch.js/src/widgets/analytics/__tests__/analytics-test.ts b/packages/instantsearch.js/src/widgets/analytics/__tests__/analytics-test.ts
deleted file mode 100644
index cad30f0900..0000000000
--- a/packages/instantsearch.js/src/widgets/analytics/__tests__/analytics-test.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import analytics from '../analytics';
-
-describe('Usage', () => {
-  it('throws without `pushFunction`', () => {
-    expect(() => {
-      analytics({
-        // @ts-expect-error
-        pushFunction: undefined,
-      });
-    }).toThrowErrorMatchingInlineSnapshot(`
-"The \`pushFunction\` option is required.
-
-See documentation: https://www.algolia.com/doc/api-reference/widgets/analytics/js/"
-`);
-  });
-
-  it('shows deprecation warning message.', () => {
-    expect(() => {
-      analytics({
-        pushFunction: () => {},
-      });
-    }).toWarnDev(
-      `[InstantSearch.js]: \`analytics\` widget has been deprecated. It is still supported in 4.x releases, but not further. It is replaced by the \`insights\` middleware.
-
-For the migration, visit https://www.algolia.com/doc/guides/building-search-ui/upgrade-guides/js/#analytics-widget`
-    );
-  });
-});
diff --git a/packages/instantsearch.js/src/widgets/analytics/analytics.ts b/packages/instantsearch.js/src/widgets/analytics/analytics.ts
deleted file mode 100644
index 2299ae3ad7..0000000000
--- a/packages/instantsearch.js/src/widgets/analytics/analytics.ts
+++ /dev/null
@@ -1,295 +0,0 @@
-import { createDocumentationMessageGenerator, warning } from '../../lib/utils';
-
-import type { WidgetFactory, WidgetRenderState } from '../../types';
-import type { SearchParameters, SearchResults } from 'algoliasearch-helper';
-
-export type AnalyticsWidgetParamsPushFunction = (
-  /**
-   * Contains the search parameters, serialized as a query string.
-   */
-  formattedParameters: string,
-
-  /**
-   * Contains the whole search state.
-   */
-  state: SearchParameters,
-
-  /**
-   * The last received results.
-   */
-  results: SearchResults
-) => void;
-
-export type AnalyticsWidgetParams = {
-  /**
-   * A function that is called every time the query or refinements changes. You
-   * need to add the logic to push the data to your analytics platform.
-   */
-  pushFunction: AnalyticsWidgetParamsPushFunction;
-
-  /**
-   * The number of milliseconds between the last search keystroke and calling `pushFunction`.
-   *
-   * @default 3000
-   */
-  delay?: number;
-
-  /**
-   * Triggers `pushFunction` after click on page or redirecting the page. This is useful if
-   * you want the pushFunction to be called for the last actions before the user leaves the
-   * current page, even if the delay wasn’t reached.
-   *
-   * @default false
-   */
-  triggerOnUIInteraction?: boolean;
-
-  /**
-   * Triggers `pushFunction` when InstantSearch is initialized. This means
-   * the `pushFunction` might be called even though the user didn’t perfom
-   * any search-related action.
-   *
-   * @default true
-   */
-  pushInitialSearch?: boolean;
-
-  /**
-   * Triggers `pushFunction` when the page changes, either through the UI or programmatically.
-   *
-   * @default false
-   */
-  pushPagination?: boolean;
-};
-
-const withUsage = createDocumentationMessageGenerator({ name: 'analytics' });
-
-export type AnalyticsWidgetDescription = {
-  $$type: 'ais.analytics';
-  $$widgetType: 'ais.analytics';
-  renderState: Record<string, unknown>;
-  indexRenderState: {
-    analytics: WidgetRenderState<
-      Record<string, unknown>,
-      AnalyticsWidgetParams
-    >;
-  };
-};
-
-export type AnalyticsWidget = WidgetFactory<
-  AnalyticsWidgetDescription,
-  AnalyticsWidgetParams,
-  AnalyticsWidgetParams
->;
-
-// @major this widget will be removed from the next major version.
-const analytics: AnalyticsWidget = function analytics(widgetParams) {
-  const {
-    pushFunction,
-    delay = 3000,
-    triggerOnUIInteraction = false,
-    pushInitialSearch = true,
-    pushPagination = false,
-  } = widgetParams || {};
-
-  if (!pushFunction) {
-    throw new Error(withUsage('The `pushFunction` option is required.'));
-  }
-
-  warning(
-    false,
-    `\`analytics\` widget has been deprecated. It is still supported in 4.x releases, but not further. It is replaced by the \`insights\` middleware.
-
-For the migration, visit https://www.algolia.com/doc/guides/building-search-ui/upgrade-guides/js/#analytics-widget`
-  );
-
-  type AnalyticsState = {
-    results: SearchResults;
-    state: SearchParameters;
-  } | null;
-
-  let cachedState: AnalyticsState = null;
-
-  type RefinementParameters = {
-    [key: string]: string[];
-  };
-
-  const serializeRefinements = function (
-    parameters: RefinementParameters
-  ): string {
-    const refinements: string[] = [];
-
-    // eslint-disable-next-line no-restricted-syntax
-    for (const parameter in parameters) {
-      if (parameters.hasOwnProperty(parameter)) {
-        const values = parameters[parameter].join('+');
-        refinements.push(
-          `${encodeURIComponent(parameter)}=${encodeURIComponent(
-            parameter
-          )}_${encodeURIComponent(values)}`
-        );
-      }
-    }
-
-    return refinements.join('&');
-  };
-
-  const serializeNumericRefinements = function (
-    numericRefinements: SearchParameters['numericRefinements']
-  ): string {
-    const refinements: string[] = [];
-
-    // eslint-disable-next-line no-restricted-syntax
-    for (const attribute in numericRefinements) {
-      if (numericRefinements.hasOwnProperty(attribute)) {
-        const filter = numericRefinements[attribute];
-
-        if (filter.hasOwnProperty('>=') && filter.hasOwnProperty('<=')) {
-          if (
-            filter['>='] &&
-            filter['>='][0] === filter['<='] &&
-            filter['<='][0]
-          ) {
-            refinements.push(`${attribute}=${attribute}_${filter['>=']}`);
-          } else {
-            refinements.push(
-              `${attribute}=${attribute}_${filter['>=']}to${filter['<=']}`
-            );
-          }
-        } else if (filter.hasOwnProperty('>=')) {
-          refinements.push(`${attribute}=${attribute}_from${filter['>=']}`);
-        } else if (filter.hasOwnProperty('<=')) {
-          refinements.push(`${attribute}=${attribute}_to${filter['<=']}`);
-        } else if (filter.hasOwnProperty('=')) {
-          const equals: string[] = [];
-
-          // eslint-disable-next-line no-restricted-syntax
-          for (const equal in filter['=']) {
-            // eslint-disable-next-line max-depth
-            if (filter['='].hasOwnProperty(equal)) {
-              // @ts-ignore somehow 'equal' is a string, even though it's a number?
-              equals.push(filter['='][equal]);
-            }
-          }
-
-          refinements.push(`${attribute}=${attribute}_${equals.join('-')}`);
-        }
-      }
-    }
-
-    return refinements.join('&');
-  };
-
-  let lastSentData = '';
-
-  const sendAnalytics = function (analyticsState: AnalyticsState | null): void {
-    if (analyticsState === null) {
-      return;
-    }
-
-    const serializedParams: string[] = [];
-
-    const serializedRefinements = serializeRefinements({
-      ...analyticsState.state.disjunctiveFacetsRefinements,
-      ...analyticsState.state.facetsRefinements,
-      ...analyticsState.state.hierarchicalFacetsRefinements,
-    });
-
-    const serializedNumericRefinements = serializeNumericRefinements(
-      analyticsState.state.numericRefinements
-    );
-
-    if (serializedRefinements !== '') {
-      serializedParams.push(serializedRefinements);
-    }
-
-    if (serializedNumericRefinements !== '') {
-      serializedParams.push(serializedNumericRefinements);
-    }
-
-    const stringifiedParams = serializedParams.join('&');
-
-    let dataToSend = `Query: ${
-      analyticsState.state.query || ''
-    }, ${stringifiedParams}`;
-    if (pushPagination === true) {
-      dataToSend += `, Page: ${analyticsState.state.page || 0}`;
-    }
-
-    if (lastSentData !== dataToSend) {
-      pushFunction(
-        stringifiedParams,
-        analyticsState.state,
-        analyticsState.results
-      );
-
-      lastSentData = dataToSend;
-    }
-  };
-
-  let pushTimeout: number;
-  let isInitialSearch = true;
-
-  if (pushInitialSearch === true) {
-    isInitialSearch = false;
-  }
-
-  const onClick = (): void => {
-    sendAnalytics(cachedState);
-  };
-
-  const onUnload = (): void => {
-    sendAnalytics(cachedState);
-  };
-
-  return {
-    $$type: 'ais.analytics',
-    $$widgetType: 'ais.analytics',
-
-    init() {
-      if (triggerOnUIInteraction === true) {
-        document.addEventListener('click', onClick);
-        window.addEventListener('beforeunload', onUnload);
-      }
-    },
-
-    render({ results, state }) {
-      if (!results) {
-        return;
-      }
-      if (isInitialSearch === true) {
-        isInitialSearch = false;
-
-        return;
-      }
-
-      cachedState = { results, state };
-
-      if (pushTimeout) {
-        clearTimeout(pushTimeout);
-      }
-
-      pushTimeout = window.setTimeout(() => sendAnalytics(cachedState), delay);
-    },
-
-    dispose() {
-      if (triggerOnUIInteraction === true) {
-        document.removeEventListener('click', onClick);
-        window.removeEventListener('beforeunload', onUnload);
-      }
-    },
-
-    getRenderState(renderState, renderOptions) {
-      return {
-        ...renderState,
-        analytics: this.getWidgetRenderState(renderOptions),
-      };
-    },
-
-    getWidgetRenderState() {
-      return {
-        widgetParams,
-      };
-    },
-  };
-};
-
-export default analytics;
diff --git a/packages/instantsearch.js/src/widgets/index.ts b/packages/instantsearch.js/src/widgets/index.ts
index 6fd492c520..63e980f10b 100644
--- a/packages/instantsearch.js/src/widgets/index.ts
+++ b/packages/instantsearch.js/src/widgets/index.ts
@@ -23,7 +23,6 @@ export const EXPERIMENTAL_dynamicWidgets = deprecate(
 );
 export { dynamicWidgets };
 
-export { default as analytics } from './analytics/analytics';
 export { default as breadcrumb } from './breadcrumb/breadcrumb';
 export { default as clearRefinements } from './clear-refinements/clear-refinements';
 export { default as configure } from './configure/configure';
diff --git a/packages/instantsearch.js/stories/analytics.stories.ts b/packages/instantsearch.js/stories/analytics.stories.ts
deleted file mode 100644
index 97ee328954..0000000000
--- a/packages/instantsearch.js/stories/analytics.stories.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { action } from '@storybook/addon-actions';
-import { storiesOf } from '@storybook/html';
-
-import { withHits } from '../.storybook/decorators';
-
-storiesOf('Metadata/Analytics', module).add(
-  'default',
-  withHits(({ search, container, instantsearch }) => {
-    const description = document.createElement('p');
-    description.innerText = 'Search for something, look into Action Logger';
-    container.appendChild(description);
-
-    search.addWidgets([
-      instantsearch.widgets.analytics({
-        pushFunction(formattedParameters, state, results) {
-          action('pushFunction[formattedParameters]')(formattedParameters);
-          action('pushFunction[state]')(state);
-          action('pushFunction[results]')(results);
-        },
-        triggerOnUIInteraction: true,
-        pushInitialSearch: false,
-      }),
-    ]);
-  })
-);

From 6318218e91716c21f66fc319a20f2395b23e9883 Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Fri, 18 Oct 2024 16:16:31 +0200
Subject: [PATCH 03/37] fix(widgets): remove places widget (#6397)

The places widget has long been deprecated, and is removed without replacement as no places service exists anymore.

As a userland solution if you're using the places widget, copy the removed `places.ts` file inside your own project and import it locally.

BREAKING CHANGE: the places widget no longer exists
---
 package.json                                  |   2 -
 .../.storybook/static/storybook.css           |   6 -
 packages/instantsearch.js/package.json        |   1 -
 .../src/lib/__tests__/InstantSearch-test.tsx  |   5 -
 .../src/lib/utils/checkIndexUiState.ts        |   4 -
 .../src/types/render-state.ts                 |   7 +-
 .../instantsearch.js/src/types/ui-state.ts    |   5 +-
 packages/instantsearch.js/src/types/widget.ts |   2 -
 .../src/widgets/__tests__/index.test.ts       |  10 -
 .../instantsearch.js/src/widgets/index.ts     |   1 -
 .../widgets/places/__tests__/places-test.ts   | 496 ------------------
 .../src/widgets/places/places.ts              | 181 -------
 .../downgrade-algoliasearch-dependency.js     |   3 -
 scripts/legacy/downgrade-algoliasearch-v4.js  |   6 -
 yarn.lock                                     |  29 +-
 15 files changed, 3 insertions(+), 755 deletions(-)
 delete mode 100644 packages/instantsearch.js/src/widgets/places/__tests__/places-test.ts
 delete mode 100644 packages/instantsearch.js/src/widgets/places/places.ts

diff --git a/package.json b/package.json
index 8d5e563f7f..16ae882efa 100644
--- a/package.json
+++ b/package.json
@@ -122,7 +122,6 @@
     "jsdom-global": "3.0.2",
     "lerna": "6.0.3",
     "patch-package": "6.2.2",
-    "places.js": "1.17.1",
     "prettier": "^2.4.1",
     "prop-types": "15.6.2",
     "react": "19.0.0",
@@ -143,7 +142,6 @@
     "typescript": "5.5.2"
   },
   "resolutions": {
-    "places.js/algoliasearch": "5.1.1",
     "brotli-size": "4.0.0",
     "webpack": "4.47.0",
     "babel-loader": "8.2.2"
diff --git a/packages/instantsearch.js/.storybook/static/storybook.css b/packages/instantsearch.js/.storybook/static/storybook.css
index 24e3e22d45..fa3c024471 100644
--- a/packages/instantsearch.js/.storybook/static/storybook.css
+++ b/packages/instantsearch.js/.storybook/static/storybook.css
@@ -161,12 +161,6 @@ body {
   margin: 0 auto;
 }
 
-.algolia-places {
-  display: block !important;
-  width: 100%;
-  margin: 0 auto;
-}
-
 .my-custom-marker {
   position: relative;
   background-color: white;
diff --git a/packages/instantsearch.js/package.json b/packages/instantsearch.js/package.json
index 0db0b764a6..1daec029c9 100644
--- a/packages/instantsearch.js/package.json
+++ b/packages/instantsearch.js/package.json
@@ -60,7 +60,6 @@
     "@storybook/html": "5.3.9",
     "@types/scriptjs": "0.0.2",
     "algoliasearch": "5.1.1",
-    "places.js": "1.17.1",
     "scriptjs": "2.5.9",
     "webpack": "4.47.0"
   }
diff --git a/packages/instantsearch.js/src/lib/__tests__/InstantSearch-test.tsx b/packages/instantsearch.js/src/lib/__tests__/InstantSearch-test.tsx
index 4fd47c84ad..be72d07335 100644
--- a/packages/instantsearch.js/src/lib/__tests__/InstantSearch-test.tsx
+++ b/packages/instantsearch.js/src/lib/__tests__/InstantSearch-test.tsx
@@ -3133,10 +3133,6 @@ describe('initialUiState', () => {
           menu: {
             category: 'Hardware',
           },
-          places: {
-            query: 'Paris',
-            position: '1,1',
-          },
           // This is a UI parameter that is not supported by default but that
           // can be added when using custom widgets. Having it in `initialUiState`
           // makes sure that it doesn't throw if it happens.
@@ -3167,7 +3163,6 @@ To fully reflect the state, some widgets need to be added to the index "indexNam
 - \`hierarchicalMenu\` needs one of these widgets: "hierarchicalMenu"
 - \`range\` needs one of these widgets: "rangeInput", "rangeSlider"
 - \`menu\` needs one of these widgets: "menu", "menuSelect"
-- \`places\` needs one of these widgets: "places"
 
 If you do not wish to display widgets but still want to support their search parameters, you can mount "virtual widgets" that don't render anything:
 
diff --git a/packages/instantsearch.js/src/lib/utils/checkIndexUiState.ts b/packages/instantsearch.js/src/lib/utils/checkIndexUiState.ts
index a9c468731d..3e57b2ea33 100644
--- a/packages/instantsearch.js/src/lib/utils/checkIndexUiState.ts
+++ b/packages/instantsearch.js/src/lib/utils/checkIndexUiState.ts
@@ -91,10 +91,6 @@ const stateToWidgetsMap: StateToWidgets = {
     connectors: ['connectConfigure'],
     widgets: ['ais.configure'],
   },
-  places: {
-    connectors: [],
-    widgets: ['ais.places'],
-  },
 };
 
 type CheckIndexUiStateParams = {
diff --git a/packages/instantsearch.js/src/types/render-state.ts b/packages/instantsearch.js/src/types/render-state.ts
index 9cf9fdd7b4..f68d99be66 100644
--- a/packages/instantsearch.js/src/types/render-state.ts
+++ b/packages/instantsearch.js/src/types/render-state.ts
@@ -23,7 +23,6 @@ import type { SortByWidgetDescription } from '../connectors/sort-by/connectSortB
 import type { StatsWidgetDescription } from '../connectors/stats/connectStats';
 import type { ToggleRefinementWidgetDescription } from '../connectors/toggle-refinement/connectToggleRefinement';
 import type { VoiceSearchWidgetDescription } from '../connectors/voice-search/connectVoiceSearch';
-import type { PlacesWidgetDescription } from '../widgets/places/places';
 
 type ConnectorRenderStates = AnswersWidgetDescription['indexRenderState'] &
   AutocompleteWidgetDescription['indexRenderState'] &
@@ -51,11 +50,7 @@ type ConnectorRenderStates = AnswersWidgetDescription['indexRenderState'] &
   ToggleRefinementWidgetDescription['indexRenderState'] &
   VoiceSearchWidgetDescription['indexRenderState'];
 
-type WidgetRenderStates = PlacesWidgetDescription['indexRenderState'];
-
-export type IndexRenderState = Partial<
-  ConnectorRenderStates & WidgetRenderStates
->;
+export type IndexRenderState = Partial<ConnectorRenderStates>;
 
 export type RenderState = {
   [indexId: string]: IndexRenderState;
diff --git a/packages/instantsearch.js/src/types/ui-state.ts b/packages/instantsearch.js/src/types/ui-state.ts
index 13f0d029ea..cae6aa048a 100644
--- a/packages/instantsearch.js/src/types/ui-state.ts
+++ b/packages/instantsearch.js/src/types/ui-state.ts
@@ -15,7 +15,6 @@ import type { SearchBoxWidgetDescription } from '../connectors/search-box/connec
 import type { SortByWidgetDescription } from '../connectors/sort-by/connectSortBy';
 import type { ToggleRefinementWidgetDescription } from '../connectors/toggle-refinement/connectToggleRefinement';
 import type { VoiceSearchWidgetDescription } from '../connectors/voice-search/connectVoiceSearch';
-import type { PlacesWidgetDescription } from '../widgets/places/places';
 
 type ConnectorUiStates = AutocompleteWidgetDescription['indexUiState'] &
   ConfigureWidgetDescription['indexUiState'] &
@@ -35,9 +34,7 @@ type ConnectorUiStates = AutocompleteWidgetDescription['indexUiState'] &
   ToggleRefinementWidgetDescription['indexUiState'] &
   VoiceSearchWidgetDescription['indexUiState'];
 
-type WidgetUiStates = PlacesWidgetDescription['indexUiState'];
-
-export type IndexUiState = Partial<ConnectorUiStates & WidgetUiStates>;
+export type IndexUiState = Partial<ConnectorUiStates>;
 
 export type UiState = {
   [indexId: string]: IndexUiState;
diff --git a/packages/instantsearch.js/src/types/widget.ts b/packages/instantsearch.js/src/types/widget.ts
index af19f54ba3..41c627f343 100644
--- a/packages/instantsearch.js/src/types/widget.ts
+++ b/packages/instantsearch.js/src/types/widget.ts
@@ -75,7 +75,6 @@ export type BuiltinTypes =
   | 'ais.menu'
   | 'ais.numericMenu'
   | 'ais.pagination'
-  | 'ais.places'
   | 'ais.poweredBy'
   | 'ais.queryRules'
   // @TODO: remove individual types for rangeSlider & rangeInput once updating checkIndexUiState
@@ -114,7 +113,6 @@ export type BuiltinWidgetTypes =
   | 'ais.menuSelect'
   | 'ais.numericMenu'
   | 'ais.pagination'
-  | 'ais.places'
   | 'ais.poweredBy'
   | 'ais.queryRuleCustomData'
   | 'ais.queryRuleContext'
diff --git a/packages/instantsearch.js/src/widgets/__tests__/index.test.ts b/packages/instantsearch.js/src/widgets/__tests__/index.test.ts
index a0503bc1af..7e82d544bd 100644
--- a/packages/instantsearch.js/src/widgets/__tests__/index.test.ts
+++ b/packages/instantsearch.js/src/widgets/__tests__/index.test.ts
@@ -6,7 +6,6 @@ import * as widgets from '..';
 
 import type { UnknownWidgetFactory, Widget } from '../../types';
 import type { IndexWidget } from '../index/index';
-import type { PlacesInstance } from 'places.js';
 
 /**
  * Checklist when adding a new widget
@@ -110,15 +109,6 @@ function initiateAllWidgets(): Array<[WidgetNames, Widget | IndexWidget]> {
           },
         });
       }
-      case 'places': {
-        const places = widget as Widgets['places'];
-        // @ts-expect-error
-        const placesInstance: PlacesInstance = {};
-        return places({
-          container: document.createElement('input'),
-          placesReference: () => placesInstance,
-        });
-      }
       case 'panel': {
         const panel = widget as Widgets['panel'];
         return panel()(widgets.hierarchicalMenu)({
diff --git a/packages/instantsearch.js/src/widgets/index.ts b/packages/instantsearch.js/src/widgets/index.ts
index 63e980f10b..c9796d8c99 100644
--- a/packages/instantsearch.js/src/widgets/index.ts
+++ b/packages/instantsearch.js/src/widgets/index.ts
@@ -39,7 +39,6 @@ export { default as menuSelect } from './menu-select/menu-select';
 export { default as numericMenu } from './numeric-menu/numeric-menu';
 export { default as pagination } from './pagination/pagination';
 export { default as panel } from './panel/panel';
-export { default as places } from './places/places';
 export { default as poweredBy } from './powered-by/powered-by';
 export { default as queryRuleContext } from './query-rule-context/query-rule-context';
 export { default as queryRuleCustomData } from './query-rule-custom-data/query-rule-custom-data';
diff --git a/packages/instantsearch.js/src/widgets/places/__tests__/places-test.ts b/packages/instantsearch.js/src/widgets/places/__tests__/places-test.ts
deleted file mode 100644
index ec1762ebbf..0000000000
--- a/packages/instantsearch.js/src/widgets/places/__tests__/places-test.ts
+++ /dev/null
@@ -1,496 +0,0 @@
-/**
- * @jest-environment jsdom
- */
-
-import { createSearchClient } from '@instantsearch/mocks';
-import algoliasearchHelper, { SearchParameters } from 'algoliasearch-helper';
-import algoliaPlaces from 'places.js';
-
-import { createInitOptions } from '../../../../test/createWidget';
-import places from '../places';
-
-import type { SearchClient } from '../../../types';
-
-jest.mock('places.js', () => {
-  const module = jest.fn(() => {
-    const instance = {
-      on: jest.fn(),
-      setVal: jest.fn(),
-      close: jest.fn(),
-    };
-    (module as any).__instance = instance;
-
-    return instance;
-  });
-
-  return module;
-});
-
-const createFakeHelper = (
-  searchClient: SearchClient,
-  searchParameters: Partial<SearchParameters> = {}
-) => {
-  const helper = algoliasearchHelper(
-    searchClient,
-    'indexName',
-    searchParameters
-  );
-
-  helper.search = jest.fn();
-
-  return helper;
-};
-
-describe('places', () => {
-  const container = document.createElement('input');
-  const defaultOptions = {
-    placesReference: algoliaPlaces,
-    container,
-  };
-
-  describe('Usage', () => {
-    test('creates a places instance', () => {
-      const searchClient = createSearchClient();
-      const helper = createFakeHelper(searchClient);
-      const widget = places({
-        ...defaultOptions,
-        defaultPosition: ['1', '1'],
-      });
-
-      widget.init!(createInitOptions({ helper }));
-
-      expect(algoliaPlaces).toHaveBeenCalledTimes(1);
-      expect(algoliaPlaces).toHaveBeenCalledWith({ container });
-    });
-
-    test('throws without parameters', () => {
-      // @ts-expect-error
-      expect(() => places()).toThrowErrorMatchingInlineSnapshot(
-        `"The \`placesReference\` option requires a valid Places.js reference."`
-      );
-    });
-  });
-
-  describe('Lifecycle', () => {
-    describe('init', () => {
-      test('does not call `setQueryParameter` during the init step', () => {
-        // Using `setQueryParameter` to change a filter value during the init step
-        // has unintented consequences such as resetting the pagination to 0.
-        const searchClient = createSearchClient();
-        const helper = createFakeHelper(searchClient);
-        const widget = places(defaultOptions);
-
-        helper.setQueryParameter = jest.fn();
-        widget.init!(createInitOptions({ helper }));
-
-        expect(helper.setQueryParameter).toHaveBeenCalledTimes(0);
-      });
-
-      test('configures `aroundLatLng` on change event', () => {
-        const searchClient = createSearchClient();
-        const helper = createFakeHelper(searchClient);
-        const widget = places({
-          ...defaultOptions,
-        });
-
-        widget.init!(createInitOptions({ helper }));
-
-        const [changeEventName, changeEventListener] = (algoliaPlaces as any)
-          .__instance.on.mock.calls[0];
-
-        expect(changeEventName).toEqual('change');
-
-        changeEventListener({
-          suggestion: {
-            latlng: {
-              lat: '123',
-              lng: '456',
-            },
-          },
-        });
-
-        expect(helper.search).toHaveBeenCalledTimes(1);
-        expect(helper.state).toEqual(
-          new SearchParameters({
-            index: 'indexName',
-            aroundLatLng: '123,456',
-            aroundLatLngViaIP: false,
-            insideBoundingBox: undefined,
-          })
-        );
-      });
-
-      test('configures `aroundLatLng` with `defaultPosition` on clear event', () => {
-        const searchClient = createSearchClient();
-        const helper = createFakeHelper(searchClient, {
-          aroundLatLngViaIP: true,
-        });
-        const widget = places({
-          ...defaultOptions,
-          defaultPosition: ['2', '2'],
-        });
-
-        widget.init!(createInitOptions({ helper }));
-
-        const [clearEventName, clearEventListener] = (algoliaPlaces as any)
-          .__instance.on.mock.calls[1];
-
-        expect(clearEventName).toEqual('clear');
-
-        clearEventListener();
-
-        expect(helper.search).toHaveBeenCalledTimes(1);
-        expect(helper.state).toEqual(
-          new SearchParameters({
-            index: 'indexName',
-            aroundLatLngViaIP: false,
-            aroundLatLng: '2,2',
-            insideBoundingBox: undefined,
-          })
-        );
-      });
-
-      test('restores `aroundLatLngViaIP` without `defaultPosition` on clear event', () => {
-        const searchClient = createSearchClient();
-        const helper = createFakeHelper(searchClient, {
-          aroundLatLngViaIP: true,
-        });
-        const widget = places({
-          ...defaultOptions,
-        });
-
-        widget.init!(createInitOptions({ helper }));
-        // Trigger the initialization of `aroundLatLngViaIP`.
-        widget.getWidgetSearchParameters(helper.state, { uiState: {} });
-
-        expect(helper.state.aroundLatLngViaIP).toBe(true);
-
-        const [changeEventName, changeEventListener] = (algoliaPlaces as any)
-          .__instance.on.mock.calls[0];
-
-        expect(changeEventName).toEqual('change');
-
-        changeEventListener({
-          suggestion: {
-            latlng: {
-              lat: '123',
-              lng: '456',
-            },
-          },
-        });
-
-        expect(helper.search).toHaveBeenCalledTimes(1);
-        expect(helper.state.aroundLatLngViaIP).toBe(false);
-
-        const [clearEventName, clearEventListener] = (algoliaPlaces as any)
-          .__instance.on.mock.calls[1];
-
-        expect(clearEventName).toEqual('clear');
-
-        clearEventListener();
-
-        expect(helper.search).toHaveBeenCalledTimes(2);
-        expect(helper.state.aroundLatLngViaIP).toBe(true);
-      });
-    });
-
-    describe('getWidgetSearchParameters', () => {
-      test('returns default search parameters with default UI state', () => {
-        const searchClient = createSearchClient();
-        const helper = createFakeHelper(searchClient);
-        const widget = places({
-          ...defaultOptions,
-        });
-
-        widget.init!(createInitOptions({ helper }));
-
-        const nextSearchParameters = widget.getWidgetSearchParameters(
-          helper.state,
-          {
-            uiState: {},
-          }
-        );
-
-        expect(nextSearchParameters).toEqual(
-          new SearchParameters({
-            index: 'indexName',
-            aroundLatLngViaIP: false,
-          })
-        );
-      });
-
-      test('returns the search parameters with values from the UI state', () => {
-        const searchClient = createSearchClient();
-        const helper = createFakeHelper(searchClient);
-        const widget = places({
-          ...defaultOptions,
-        });
-
-        widget.init!(createInitOptions({ helper }));
-
-        const nextSearchParameters = widget.getWidgetSearchParameters(
-          helper.state,
-          {
-            uiState: {
-              places: {
-                query: 'Paris, Île-de-France, France',
-                position: '48.8546,2.3477',
-              },
-            },
-          }
-        );
-
-        expect(nextSearchParameters).toEqual(
-          new SearchParameters({
-            index: 'indexName',
-            aroundLatLng: '48.8546,2.3477',
-            aroundLatLngViaIP: false,
-          })
-        );
-      });
-
-      test('returns the search parameters with values from the UI state if using `defaultPosition`', () => {
-        const searchClient = createSearchClient();
-        const helper = createFakeHelper(searchClient);
-        const widget = places({
-          ...defaultOptions,
-          defaultPosition: ['1', '1'],
-        });
-
-        widget.init!(createInitOptions({ helper }));
-
-        const nextSearchParameters = widget.getWidgetSearchParameters(
-          helper.state,
-          {
-            uiState: {
-              places: {
-                query: 'Paris, Île-de-France, France',
-                position: '48.8546,2.3477',
-              },
-            },
-          }
-        );
-
-        expect(nextSearchParameters).toEqual(
-          new SearchParameters({
-            index: 'indexName',
-            aroundLatLng: '48.8546,2.3477',
-            aroundLatLngViaIP: false,
-          })
-        );
-      });
-
-      test('returns the search parameters with `defaultPosition` when empty UI state', () => {
-        const searchClient = createSearchClient();
-        const helper = createFakeHelper(searchClient);
-        const widget = places({
-          ...defaultOptions,
-          defaultPosition: ['1', '1'],
-        });
-
-        widget.init!(createInitOptions({ helper }));
-
-        const nextSearchParameters = widget.getWidgetSearchParameters(
-          helper.state,
-          {
-            uiState: {},
-          }
-        );
-
-        expect(nextSearchParameters).toEqual(
-          new SearchParameters({
-            index: 'indexName',
-            aroundLatLng: '1,1',
-            aroundLatLngViaIP: false,
-          })
-        );
-      });
-
-      test('restores `aroundLatLngViaIP` on clear event', () => {
-        const searchClient = createSearchClient();
-        const helper = createFakeHelper(searchClient);
-        const widget = places({
-          ...defaultOptions,
-        });
-
-        const previousSearchParameters = new SearchParameters({
-          aroundLatLngViaIP: true,
-        });
-
-        const uiState = {
-          places: {
-            query: 'Paris',
-            position: '123,123',
-          },
-        };
-
-        widget.getWidgetSearchParameters(previousSearchParameters, {
-          uiState,
-        });
-
-        widget.init!(createInitOptions({ helper }));
-
-        expect(helper.state.aroundLatLngViaIP).toBeUndefined();
-
-        const [, clearEventListener] = (algoliaPlaces as any).__instance.on.mock
-          .calls[1];
-
-        clearEventListener();
-
-        expect(helper.search).toHaveBeenCalledTimes(1);
-        expect(helper.state.aroundLatLngViaIP).toBe(true);
-      });
-
-      test('should close the dropdown', () => {
-        const searchClient = createSearchClient();
-        const helper = createFakeHelper(searchClient);
-        const widget = places({
-          ...defaultOptions,
-        });
-
-        widget.init!(createInitOptions({ helper }));
-
-        expect((algoliaPlaces as any).__instance.close).toHaveBeenCalledTimes(
-          0
-        );
-
-        widget.getWidgetSearchParameters(helper.state, {
-          uiState: {
-            places: {
-              query: 'Paris, Île-de-France, France',
-              position: '48.8546,2.3477',
-            },
-          },
-        });
-
-        expect((algoliaPlaces as any).__instance.close).toHaveBeenCalledTimes(
-          1
-        );
-      });
-    });
-
-    describe('getWidgetUiState', () => {
-      test('returns the default state empty', () => {
-        const searchClient = createSearchClient();
-        const helper = createFakeHelper(searchClient);
-        const widget = places({
-          ...defaultOptions,
-        });
-
-        const previousUiState = {};
-        const nextUiState = widget.getWidgetUiState(previousUiState, {
-          helper,
-          searchParameters: helper.state,
-        });
-
-        expect(nextUiState).toEqual({});
-      });
-
-      test('returns the state with `position` when using `defaultPosition`', () => {
-        const searchClient = createSearchClient();
-        const helper = createFakeHelper(searchClient);
-        const widget = places({
-          ...defaultOptions,
-          defaultPosition: ['2', '2'],
-        });
-
-        const previousUiState = {};
-        const nextUiState = widget.getWidgetUiState(previousUiState, {
-          helper,
-          searchParameters: helper.state,
-        });
-
-        expect(nextUiState).toEqual({});
-      });
-
-      test('returns an exhaustive state on `change`', () => {
-        const searchClient = createSearchClient();
-        const helper = createFakeHelper(searchClient);
-        const widget = places({
-          ...defaultOptions,
-        });
-
-        widget.init!(createInitOptions({ helper }));
-
-        const [changeEventName, changeEventListener] = (algoliaPlaces as any)
-          .__instance.on.mock.calls[0];
-
-        expect(changeEventName).toEqual('change');
-
-        changeEventListener({
-          suggestion: {
-            value: 'Paris',
-            latlng: {
-              lat: '123',
-              lng: '456',
-            },
-          },
-        });
-
-        const previousUiState = {};
-        const nextUiState = widget.getWidgetUiState(previousUiState, {
-          helper,
-          searchParameters: helper.state,
-        });
-
-        expect(nextUiState).toEqual({
-          places: {
-            query: 'Paris',
-            position: '123,456',
-          },
-        });
-      });
-
-      test('returns an empty state on `clear`', () => {
-        const searchClient = createSearchClient();
-        const helper = createFakeHelper(searchClient);
-        const widget = places({
-          ...defaultOptions,
-        });
-
-        widget.init!(createInitOptions({ helper }));
-
-        const [clearEventName, clearEventListener] = (algoliaPlaces as any)
-          .__instance.on.mock.calls[1];
-
-        expect(clearEventName).toEqual('clear');
-
-        clearEventListener();
-
-        const previousUiState = {};
-        const nextUiState = widget.getWidgetUiState(previousUiState, {
-          helper,
-          searchParameters: helper.state,
-        });
-
-        expect(nextUiState).toEqual({});
-      });
-
-      test('returns an empty state on `clear` with `defaultPosition`', () => {
-        const searchClient = createSearchClient();
-        const helper = createFakeHelper(searchClient);
-        const widget = places({
-          ...defaultOptions,
-          defaultPosition: ['2', '2'],
-        });
-
-        widget.init!(createInitOptions({ helper }));
-
-        const [clearEventName, clearEventListener] = (algoliaPlaces as any)
-          .__instance.on.mock.calls[1];
-
-        expect(clearEventName).toEqual('clear');
-
-        clearEventListener();
-
-        const previousUiState = {};
-        const nextUiState = widget.getWidgetUiState(previousUiState, {
-          helper,
-          searchParameters: helper.state,
-        });
-
-        expect(nextUiState).toEqual({});
-      });
-    });
-  });
-});
diff --git a/packages/instantsearch.js/src/widgets/places/places.ts b/packages/instantsearch.js/src/widgets/places/places.ts
deleted file mode 100644
index e7fb5d5311..0000000000
--- a/packages/instantsearch.js/src/widgets/places/places.ts
+++ /dev/null
@@ -1,181 +0,0 @@
-import { deprecate } from '../../lib/utils';
-
-import type { WidgetFactory, WidgetRenderState } from '../../types';
-/* Places.js is an optional dependency, no error should be reported if the package is missing */
-/** @ts-ignore */
-import type * as Places from 'places.js';
-
-// using the type like this requires only one ts-ignore
-type StaticOptions = Places.StaticOptions;
-type ChangeEvent = Places.ChangeEvent;
-type PlacesInstance = Places.PlacesInstance;
-type ReconfigurableOptions = Places.ReconfigurableOptions;
-
-export type PlacesWidgetParams = {
-  /**
-   * The Algolia Places reference to use.
-   *
-   * @see https://github.com/algolia/places
-   */
-  placesReference: (
-    options: StaticOptions & ReconfigurableOptions
-  ) => PlacesInstance;
-  /**
-   * The default position when the input is empty.
-   */
-  defaultPosition?: string[];
-} & StaticOptions;
-
-type PlacesWidgetState = {
-  query: string;
-  initialLatLngViaIP: boolean | undefined;
-  isInitialLatLngViaIPSet: boolean;
-};
-
-export type PlacesWidgetDescription = {
-  $$type: 'ais.places';
-  $$widgetType: 'ais.places';
-  renderState: Record<string, unknown>;
-  indexRenderState: {
-    places: WidgetRenderState<Record<string, unknown>, PlacesWidgetParams>;
-  };
-  indexUiState: {
-    places: {
-      query: string;
-      position: string;
-    };
-  };
-};
-
-export type PlacesWidget = WidgetFactory<
-  PlacesWidgetDescription,
-  PlacesWidgetParams,
-  PlacesWidgetParams
->;
-
-/**
- * This widget sets the geolocation value for the search based on the selected
- * result in the Algolia Places autocomplete.
- * @deprecated the places service is no longer offered, and this widget will be removed in InstantSearch.js v5
- */
-const placesWidget: PlacesWidget = (widgetParams) => {
-  const {
-    placesReference,
-    defaultPosition = [],
-    ...placesOptions
-  } = widgetParams || {};
-
-  if (typeof placesReference !== 'function') {
-    throw new Error(
-      'The `placesReference` option requires a valid Places.js reference.'
-    );
-  }
-
-  const placesAutocomplete = placesReference(placesOptions);
-
-  const state: PlacesWidgetState = {
-    query: '',
-    initialLatLngViaIP: undefined,
-    isInitialLatLngViaIPSet: false,
-  };
-
-  return {
-    $$type: 'ais.places',
-    $$widgetType: 'ais.places',
-
-    init({ helper }) {
-      placesAutocomplete.on('change', (eventOptions: ChangeEvent) => {
-        const {
-          suggestion: {
-            value,
-            latlng: { lat, lng },
-          },
-        } = eventOptions;
-
-        state.query = value;
-
-        helper
-          .setQueryParameter('insideBoundingBox', undefined)
-          .setQueryParameter('aroundLatLngViaIP', false)
-          .setQueryParameter('aroundLatLng', `${lat},${lng}`)
-          .search();
-      });
-
-      placesAutocomplete.on('clear', () => {
-        state.query = '';
-
-        helper.setQueryParameter('insideBoundingBox', undefined);
-
-        if (defaultPosition.length > 1) {
-          helper
-            .setQueryParameter('aroundLatLngViaIP', false)
-            .setQueryParameter('aroundLatLng', defaultPosition.join(','));
-        } else {
-          helper
-            .setQueryParameter('aroundLatLngViaIP', state.initialLatLngViaIP)
-            .setQueryParameter('aroundLatLng', undefined);
-        }
-
-        helper.search();
-      });
-    },
-
-    getWidgetUiState(uiState, { searchParameters }) {
-      const position =
-        searchParameters.aroundLatLng || defaultPosition.join(',');
-      const hasPositionSet = position !== defaultPosition.join(',');
-
-      if (!hasPositionSet && !state.query) {
-        const { places, ...uiStateWithoutPlaces } = uiState;
-
-        return uiStateWithoutPlaces;
-      }
-
-      return {
-        ...uiState,
-        places: {
-          query: state.query,
-          position,
-        },
-      };
-    },
-
-    getWidgetSearchParameters(searchParameters, { uiState }) {
-      const { query = '', position = defaultPosition.join(',') } =
-        uiState.places || {};
-
-      state.query = query;
-
-      if (!state.isInitialLatLngViaIPSet) {
-        state.isInitialLatLngViaIPSet = true;
-        state.initialLatLngViaIP = searchParameters.aroundLatLngViaIP;
-      }
-
-      placesAutocomplete.setVal(query);
-      placesAutocomplete.close();
-
-      return searchParameters
-        .setQueryParameter('insideBoundingBox', undefined)
-        .setQueryParameter('aroundLatLngViaIP', false)
-        .setQueryParameter('aroundLatLng', position || undefined);
-    },
-
-    getRenderState(renderState, renderOptions) {
-      return {
-        ...renderState,
-        places: this.getWidgetRenderState(renderOptions),
-      };
-    },
-
-    getWidgetRenderState() {
-      return {
-        widgetParams,
-      };
-    },
-  };
-};
-
-export default deprecate(
-  placesWidget,
-  'The places widget is deprecated and will be removed in InstantSearch.js 5.0.'
-);
diff --git a/scripts/legacy/downgrade-algoliasearch-dependency.js b/scripts/legacy/downgrade-algoliasearch-dependency.js
index ac608d4007..c36a22b954 100755
--- a/scripts/legacy/downgrade-algoliasearch-dependency.js
+++ b/scripts/legacy/downgrade-algoliasearch-dependency.js
@@ -36,9 +36,6 @@ shell.sed(
   packageJsonPaths
 );
 
-// remove resolution
-shell.sed('-i', /"places.js\/algoliasearch": "5.*"(,?)/, '', packageJsonPaths);
-
 // replace import in examples
 shell.sed(
   '-i',
diff --git a/scripts/legacy/downgrade-algoliasearch-v4.js b/scripts/legacy/downgrade-algoliasearch-v4.js
index f2b77cc89e..b4c37e305d 100755
--- a/scripts/legacy/downgrade-algoliasearch-v4.js
+++ b/scripts/legacy/downgrade-algoliasearch-v4.js
@@ -43,12 +43,6 @@ shell.sed(
   '"@algolia/client-common": "4.23.2"$1',
   packageJsonPaths
 );
-shell.sed(
-  '-i',
-  /"places.js\/algoliasearch": "5.*"(,?)/,
-  '"places.js/algoliasearch": "4.23.2"$1',
-  packageJsonPaths
-);
 
 // replace import in examples
 shell.sed(
diff --git a/yarn.lock b/yarn.lock
index fba226d2c9..d12510fca4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8080,7 +8080,7 @@ algoliasearch-helper@3.14.0:
     semver "^5.1.0"
     tunnel-agent "^0.6.0"
 
-"algoliasearch-v5@npm:algoliasearch@5.1.1", algoliasearch@5.1.1, algoliasearch@^3.35.1:
+"algoliasearch-v5@npm:algoliasearch@5.1.1", algoliasearch@5.1.1:
   name algoliasearch-v5
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-5.1.1.tgz#48ac9f0501e746ac1544cbef7192d7efe36b39dd"
@@ -8771,13 +8771,6 @@ atob@^2.1.2:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autocomplete.js@^0.37.0:
-  version "0.37.0"
-  resolved "https://registry.yarnpkg.com/autocomplete.js/-/autocomplete.js-0.37.0.tgz#bcfbfd7bcabe90e90fad4c2b1aaa931379a10c38"
-  integrity sha512-MxYfNb89sl7IRhNdEJv6z8dSfA7lVeU7Dk6m/+/ih0/tPLsbxIM7uPVsnWEUh4j7dFqJktlM7hCeU7jmx6VC8A==
-  dependencies:
-    immediate "^3.2.3"
-
 autoprefixer@10.4.13:
   version "10.4.13"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.13.tgz#b5136b59930209a321e9fa3dca2e7c4d223e83a8"
@@ -17468,11 +17461,6 @@ image-size@^1.0.0:
   dependencies:
     queue "6.0.2"
 
-immediate@^3.2.3:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.3.0.tgz#1aef225517836bcdf7f2a2de2600c79ff0269266"
-  integrity sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q==
-
 immer@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/immer/-/immer-1.10.0.tgz#bad67605ba9c810275d91e1c2a47d4582e98286d"
@@ -17746,11 +17734,6 @@ inquirer@^8.2.4:
     through "^2.3.6"
     wrap-ansi "^7.0.0"
 
-insert-css@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/insert-css/-/insert-css-2.0.0.tgz#eb5d1097b7542f4c79ea3060d3aee07d053880f4"
-  integrity sha1-610Ql7dUL0x56jBg067gfQU4gPQ=
-
 insert-module-globals@^7.0.0:
   version "7.2.1"
   resolved "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-7.2.1.tgz#d5e33185181a4e1f33b15f7bf100ee91890d5cb3"
@@ -24323,16 +24306,6 @@ pkg-up@3.1.0, pkg-up@^3.1.0:
   dependencies:
     find-up "^3.0.0"
 
-places.js@1.17.1:
-  version "1.17.1"
-  resolved "https://registry.yarnpkg.com/places.js/-/places.js-1.17.1.tgz#fc6ef07f5ee87ec332820d7d03ac4c894a8ff764"
-  integrity sha512-TzDw893Uo3121vmEg0oV5L0HVbxcHUyanaSmnwcMs0Zll1F83/06lNJRcMiiuwNQWIik6xY3BeDDZzpaMaOILA==
-  dependencies:
-    algoliasearch "^3.35.1"
-    autocomplete.js "^0.37.0"
-    events "^3.0.0"
-    insert-css "^2.0.0"
-
 plist@^3.0.1, plist@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz#a62df837e3aed2bb3b735899d510c4f186019cbe"

From a0aee9974684ec99cb9c3158ef69e50fe1a20808 Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Fri, 18 Oct 2024 16:17:44 +0200
Subject: [PATCH 04/37] fix(widgets): remove answers widget (#6399)

The answers widget has long been deprecated, and is removed without replacement as no answers service exists anymore.

As a userland solution if you're using the answers widget, copy the removed answers files inside your own project and import it locally.

BREAKING CHANGE: the answers widget no longer exists
BREAKING CHANGE: the findAnswers in the helper no longer exists
---
 packages/algoliasearch-helper/index.d.ts      |  16 -
 .../src/algoliasearch.helper.js               |  49 --
 .../spec/algoliasearch.helper/findAnswers.js  | 102 ----
 .../types/algoliasearch.d.ts                  |  19 -
 .../.storybook/static/answers.css             | 132 -----
 .../src/components/Answers/Answers.tsx        |  79 ---
 .../Answers/__tests__/Answers-test.tsx        | 130 -----
 .../answers/__tests__/connectAnswers-test.ts  | 452 ------------------
 .../src/connectors/answers/connectAnswers.ts  | 267 -----------
 .../instantsearch.js/src/connectors/index.ts  |   7 -
 .../src/types/render-state.ts                 |   4 +-
 packages/instantsearch.js/src/types/widget.ts |   2 -
 .../src/widgets/__tests__/index.test.ts       |   4 -
 .../widgets/answers/__tests__/answers-test.ts | 170 -------
 .../src/widgets/answers/answers.tsx           | 201 --------
 .../src/widgets/answers/defaultTemplates.ts   |  15 -
 .../instantsearch.js/src/widgets/index.ts     |   7 -
 .../stories/answers.stories.ts                | 121 -----
 specs/src/pages/widgets/answers.md            |  58 ---
 19 files changed, 1 insertion(+), 1834 deletions(-)
 delete mode 100644 packages/algoliasearch-helper/test/spec/algoliasearch.helper/findAnswers.js
 delete mode 100644 packages/instantsearch.js/.storybook/static/answers.css
 delete mode 100644 packages/instantsearch.js/src/components/Answers/Answers.tsx
 delete mode 100644 packages/instantsearch.js/src/components/Answers/__tests__/Answers-test.tsx
 delete mode 100644 packages/instantsearch.js/src/connectors/answers/__tests__/connectAnswers-test.ts
 delete mode 100644 packages/instantsearch.js/src/connectors/answers/connectAnswers.ts
 delete mode 100644 packages/instantsearch.js/src/widgets/answers/__tests__/answers-test.ts
 delete mode 100644 packages/instantsearch.js/src/widgets/answers/answers.tsx
 delete mode 100644 packages/instantsearch.js/src/widgets/answers/defaultTemplates.ts
 delete mode 100644 packages/instantsearch.js/stories/answers.stories.ts
 delete mode 100644 specs/src/pages/widgets/answers.md

diff --git a/packages/algoliasearch-helper/index.d.ts b/packages/algoliasearch-helper/index.d.ts
index c999bd8956..0b96519966 100644
--- a/packages/algoliasearch-helper/index.d.ts
+++ b/packages/algoliasearch-helper/index.d.ts
@@ -2,7 +2,6 @@ import EventEmitter from '@algolia/events';
 
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import type {
-  FindAnswersResponse,
   FrequentlyBoughtTogetherQuery,
   HighlightResult,
   LookingSimilarQuery,
@@ -163,21 +162,6 @@ declare namespace algoliasearchHelper {
       ) => void
     ): void;
 
-    /**
-     * Start the search for answers with the parameters set in the state.
-     * This method returns a promise.
-     * @param {Object} options - the options for answers API call
-     * @param {string[]} options.attributesForPrediction - Attributes to use for predictions. If empty, `searchableAttributes` is used instead.
-     * @param {string[]} options.queryLanguages - The languages in the query. Currently only supports ['en'].
-     * @param {number} options.nbHits - Maximum number of answers to retrieve from the Answers Engine. Cannot be greater than 1000.
-     * @deprecated answers is deprecated and will be replaced with new initiatives
-     */
-    findAnswers<TObject>(options: {
-      attributesForPrediction: string[];
-      queryLanguages: string[];
-      nbHits: number;
-    }): Promise<FindAnswersResponse<TObject>>;
-
     /**
      * Search for facet values based on an query and the name of a faceted attribute. This
      * triggers a search and will return a promise. On top of using the query, it also sends
diff --git a/packages/algoliasearch-helper/src/algoliasearch.helper.js b/packages/algoliasearch-helper/src/algoliasearch.helper.js
index 0ca5c73289..9861644060 100644
--- a/packages/algoliasearch-helper/src/algoliasearch.helper.js
+++ b/packages/algoliasearch-helper/src/algoliasearch.helper.js
@@ -5,9 +5,7 @@ var EventEmitter = require('@algolia/events');
 var DerivedHelper = require('./DerivedHelper');
 var escapeFacetValue = require('./functions/escapeFacetValue').escapeFacetValue;
 var inherits = require('./functions/inherits');
-var merge = require('./functions/merge');
 var objectHasKeys = require('./functions/objectHasKeys');
-var omit = require('./functions/omit');
 var RecommendParameters = require('./RecommendParameters');
 var RecommendResults = require('./RecommendResults');
 var requestBuilder = require('./requestBuilder');
@@ -288,53 +286,6 @@ AlgoliaSearchHelper.prototype.searchOnce = function (options, cb) {
   );
 };
 
-/**
- * Start the search for answers with the parameters set in the state.
- * This method returns a promise.
- * @param {Object} options - the options for answers API call
- * @param {string[]} options.attributesForPrediction - Attributes to use for predictions. If empty, `searchableAttributes` is used instead.
- * @param {string[]} options.queryLanguages - The languages in the query. Currently only supports ['en'].
- * @param {number} options.nbHits - Maximum number of answers to retrieve from the Answers Engine. Cannot be greater than 1000.
- *
- * @return {promise} the answer results
- * @deprecated answers is deprecated and will be replaced with new initiatives
- */
-AlgoliaSearchHelper.prototype.findAnswers = function (options) {
-  // eslint-disable-next-line no-console
-  console.warn('[algoliasearch-helper] answers is no longer supported');
-  var state = this.state;
-  var derivedHelper = this.derivedHelpers[0];
-  if (!derivedHelper) {
-    return Promise.resolve([]);
-  }
-  var derivedState = derivedHelper.getModifiedState(state);
-  var data = merge(
-    {
-      attributesForPrediction: options.attributesForPrediction,
-      nbHits: options.nbHits,
-    },
-    {
-      params: omit(requestBuilder._getHitsSearchParams(derivedState), [
-        'attributesToSnippet',
-        'hitsPerPage',
-        'restrictSearchableAttributes',
-        'snippetEllipsisText',
-      ]),
-    }
-  );
-
-  var errorMessage =
-    'search for answers was called, but this client does not have a function client.initIndex(index).findAnswers';
-  if (typeof this.client.initIndex !== 'function') {
-    throw new Error(errorMessage);
-  }
-  var index = this.client.initIndex(derivedState.index);
-  if (typeof index.findAnswers !== 'function') {
-    throw new Error(errorMessage);
-  }
-  return index.findAnswers(derivedState.query, options.queryLanguages, data);
-};
-
 /**
  * Structure of each result when using
  * [`searchForFacetValues()`](reference.html#AlgoliaSearchHelper#searchForFacetValues)
diff --git a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/findAnswers.js b/packages/algoliasearch-helper/test/spec/algoliasearch.helper/findAnswers.js
deleted file mode 100644
index fe5d20fc0a..0000000000
--- a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/findAnswers.js
+++ /dev/null
@@ -1,102 +0,0 @@
-'use strict';
-
-var algoliasearchHelper = require('../../../index');
-
-function makeFakeFindAnswersResponse() {
-  return {
-    exhaustiveFacetsCount: true,
-    facetHits: [],
-    processingTimeMS: 3,
-  };
-}
-
-function setupTestEnvironment(helperOptions) {
-  var findAnswers = jest.fn(function () {
-    return Promise.resolve([makeFakeFindAnswersResponse()]);
-  });
-
-  var fakeClient = {
-    initIndex: function () {
-      return {
-        findAnswers: findAnswers,
-      };
-    },
-  };
-
-  var helper = algoliasearchHelper(fakeClient, 'index', helperOptions);
-
-  return {
-    findAnswers: findAnswers,
-    helper: helper,
-  };
-}
-
-test('returns an empty array with no derived helper', function () {
-  var env = setupTestEnvironment();
-  var helper = env.helper;
-  var findAnswers = env.findAnswers;
-
-  return helper
-    .findAnswers({
-      attributesForPrediction: ['description'],
-      queryLanguages: ['en'],
-      nbHits: 1,
-    })
-    .then(function (result) {
-      expect(findAnswers).toHaveBeenCalledTimes(0);
-      expect(result).toEqual([]);
-    });
-});
-
-test('returns a correct result with one derivation', function () {
-  var env = setupTestEnvironment();
-  var helper = env.helper;
-  var findAnswers = env.findAnswers;
-
-  helper.derive(function (state) {
-    return state;
-  });
-
-  return helper
-    .findAnswers({
-      attributesForPrediction: ['description'],
-      queryLanguages: ['en'],
-      nbHits: 1,
-    })
-    .then(function (result) {
-      expect(findAnswers).toHaveBeenCalledTimes(1);
-      expect(result).toEqual([makeFakeFindAnswersResponse()]);
-    });
-});
-
-test('runs findAnswers with facets', function () {
-  var env = setupTestEnvironment({ facets: ['facet1'] });
-  var helper = env.helper;
-  var findAnswers = env.findAnswers;
-  helper.addFacetRefinement('facet1', 'facetValue');
-
-  helper.derive(function (state) {
-    return state;
-  });
-
-  helper.setQuery('hello');
-
-  return helper
-    .findAnswers({
-      attributesForPrediction: ['description'],
-      queryLanguages: ['en'],
-      nbHits: 1,
-    })
-    .then(function () {
-      expect(findAnswers).toHaveBeenCalledTimes(1);
-      expect(findAnswers).toHaveBeenCalledWith('hello', ['en'], {
-        attributesForPrediction: ['description'],
-        nbHits: 1,
-        params: {
-          facetFilters: ['facet1:facetValue'],
-          facets: ['facet1'],
-          query: 'hello',
-        },
-      });
-    });
-});
diff --git a/packages/algoliasearch-helper/types/algoliasearch.d.ts b/packages/algoliasearch-helper/types/algoliasearch.d.ts
index 01b7972c0e..3ad8e12e6f 100644
--- a/packages/algoliasearch-helper/types/algoliasearch.d.ts
+++ b/packages/algoliasearch-helper/types/algoliasearch.d.ts
@@ -280,25 +280,6 @@ export type SearchForFacetValuesResponse = PickForClient<{
   v5: AlgoliaSearch.SearchForFacetValuesResponse;
 }>;
 
-export type FindAnswersOptions = PickForClient<{
-  v3: any; // answers only exists in v4
-  // @ts-ignore
-  v4: ClientSearch.FindAnswersOptions;
-  v5: any; // answers only exists in v4
-}>;
-export type FindAnswersResponse<T> = PickForClient<{
-  v3: any; // answers only exists in v4
-  // @ts-ignore
-  v4: ClientSearch.FindAnswersResponse<T>;
-  v5: any; // answers only exists in v4
-}>;
-export type FindAnswers = PickForClient<{
-  v3: any; // answers only exists in v4
-  // @ts-ignore
-  v4: ReturnType<DefaultSearchClient['initIndex']>['findAnswers'];
-  v5: any; // answers only exists in v4
-}>;
-
 export type SupportedLanguage = PickForClient<{
   v3: string;
   v4: string;
diff --git a/packages/instantsearch.js/.storybook/static/answers.css b/packages/instantsearch.js/.storybook/static/answers.css
deleted file mode 100644
index 31663e3fb2..0000000000
--- a/packages/instantsearch.js/.storybook/static/answers.css
+++ /dev/null
@@ -1,132 +0,0 @@
-.my-Answers .ais-Answers-loader {
-  display: none;
-}
-
-.my-Answers .ais-Answers-list {
-  list-style: none;
-  margin: 0;
-  padding: 0;
-}
-
-.my-Answers .ais-Answers-item {
-  height: 10rem;
-  border: 1px solid #ddd;
-  border-radius: 0.5rem;
-}
-
-.my-Answers .title {
-  padding: 0;
-  margin: 1rem;
-  font-size: 1.2rem;
-  color: #333;
-  line-height: 1.4rem;
-}
-
-.my-Answers .separator {
-  border-top: 1px solid #ddd;
-}
-
-.my-Answers .description {
-  margin: 1rem;
-  padding: 0;
-  color: #333;
-  line-height: 1.4rem;
-}
-
-.my-Answers .description em {
-  background-color: #ffc168;
-}
-
-.one-line {
-  display: -webkit-box;
-  -webkit-line-clamp: 1;
-  -webkit-box-orient: vertical;
-  overflow: hidden;
-}
-
-.three-lines {
-  display: -webkit-box;
-  -webkit-line-clamp: 3;
-  -webkit-box-orient: vertical;
-  overflow: hidden;
-}
-
-/* skeleton loader from https://codepen.io/jordanmsykes/pen/RgPqgV - begin */
-@keyframes placeHolderShimmer {
-  0% {
-    -webkit-transform: translateZ(0);
-    transform: translateZ(0);
-    background-position: -468px 0;
-  }
-  to {
-    -webkit-transform: translateZ(0);
-    transform: translateZ(0);
-    background-position: 468px 0;
-  }
-}
-
-.card-skeleton {
-  margin-left: 1rem;
-  margin-right: 1rem;
-  width: calc(100% - 2rem);
-  height: 10rem;
-  transition: all 0.3s ease-in-out;
-  -webkit-backface-visibility: hidden;
-  background: #fff;
-  z-index: 10;
-  opacity: 1;
-}
-
-.card-skeleton.hidden {
-  transition: all 0.3s ease-in-out;
-  opacity: 0;
-  height: 0;
-  padding: 0;
-}
-
-.card-skeleton-img {
-  width: 100%;
-  height: 120px;
-  background: #e6e6e6;
-  display: block;
-}
-
-.animated-background {
-  will-change: transform;
-  animation: placeHolderShimmer 1s linear infinite forwards;
-  -webkit-backface-visibility: hidden;
-  background: #e6e6e6;
-  background: linear-gradient(90deg, #eee 8%, #ddd 18%, #eee 33%);
-  background-size: 800px 104px;
-  height: 100%;
-  position: relative;
-}
-
-.skel-mask-container {
-  position: relative;
-}
-
-.skel-mask {
-  background: #fff;
-  position: absolute;
-  z-index: 200;
-}
-
-.skel-mask-1 {
-  width: 100%;
-  height: 15px;
-  top: 0;
-}
-
-.skel-mask-2 {
-  width: 100%;
-  height: 25px;
-  top: 45px;
-}
-
-.skel-mask-3 {
-  width: 100%;
-  height: 15px;
-  top: 145px;
-}
-/* skeleton loader - end */
diff --git a/packages/instantsearch.js/src/components/Answers/Answers.tsx b/packages/instantsearch.js/src/components/Answers/Answers.tsx
deleted file mode 100644
index 3e74ccf476..0000000000
--- a/packages/instantsearch.js/src/components/Answers/Answers.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-/** @jsx h */
-
-import { cx } from 'instantsearch-ui-components';
-import { h } from 'preact';
-
-import { warning } from '../../lib/utils';
-import Template from '../Template/Template';
-
-import type { ComponentCSSClasses, Hit } from '../../types';
-import type {
-  AnswersCSSClasses,
-  AnswersTemplates,
-} from '../../widgets/answers/answers';
-
-export type AnswersComponentCSSClasses = ComponentCSSClasses<AnswersCSSClasses>;
-
-export type AnswersComponentTemplates = Required<AnswersTemplates>;
-
-export type AnswersProps = {
-  hits: Hit[];
-  isLoading: boolean;
-  cssClasses: AnswersComponentCSSClasses;
-  templateProps: {
-    [key: string]: any;
-    templates: AnswersComponentTemplates;
-  };
-};
-
-const Answers = ({
-  hits,
-  isLoading,
-  cssClasses,
-  templateProps,
-}: AnswersProps) => (
-  <div
-    className={cx(cssClasses.root, hits.length === 0 && cssClasses.emptyRoot)}
-  >
-    <Template
-      {...templateProps}
-      templateKey="header"
-      rootProps={{ className: cssClasses.header }}
-      data={{
-        hits,
-        isLoading,
-      }}
-    />
-    {isLoading ? (
-      <Template
-        {...templateProps}
-        templateKey="loader"
-        rootProps={{ className: cssClasses.loader }}
-      />
-    ) : (
-      <ul className={cssClasses.list}>
-        {hits.map((hit, index) => (
-          <Template
-            {...templateProps}
-            templateKey="item"
-            rootTagName="li"
-            rootProps={{ className: cssClasses.item }}
-            key={hit.objectID}
-            data={{
-              ...hit,
-              get __hitIndex() {
-                warning(
-                  false,
-                  'The `__hitIndex` property is deprecated. Use the absolute `__position` instead.'
-                );
-                return index;
-              },
-            }}
-          />
-        ))}
-      </ul>
-    )}
-  </div>
-);
-
-export default Answers;
diff --git a/packages/instantsearch.js/src/components/Answers/__tests__/Answers-test.tsx b/packages/instantsearch.js/src/components/Answers/__tests__/Answers-test.tsx
deleted file mode 100644
index ab0c552658..0000000000
--- a/packages/instantsearch.js/src/components/Answers/__tests__/Answers-test.tsx
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * @jest-environment jsdom
- */
-/** @jsx h */
-
-import { render } from '@testing-library/preact';
-import { h } from 'preact';
-
-import Answers from '../Answers';
-
-import type { AnswersProps } from '../Answers';
-
-const defaultProps: AnswersProps = {
-  hits: [],
-  isLoading: false,
-  cssClasses: {
-    root: 'root',
-    header: 'header',
-    emptyRoot: 'empty',
-    loader: 'loader',
-    list: 'list',
-    item: 'item',
-  },
-  templateProps: {
-    templates: {
-      header: () => 'header',
-      loader: () => 'loader',
-      item: () => 'item',
-    },
-  },
-};
-
-describe('Answers', () => {
-  describe('Rendering', () => {
-    it('renders without anything', () => {
-      const { container } = render(<Answers {...defaultProps} />);
-      expect(container.querySelector('.root')).toHaveClass('empty');
-      expect(container).toMatchInlineSnapshot(`
-        <div>
-          <div
-            class="root empty"
-          >
-            <div
-              class="header"
-            >
-              header
-            </div>
-            <ul
-              class="list"
-            />
-          </div>
-        </div>
-      `);
-    });
-
-    it('renders the loader', () => {
-      const { container } = render(
-        <Answers {...defaultProps} isLoading={true} />
-      );
-      expect(container).toMatchInlineSnapshot(`
-<div>
-  <div
-    class="root empty"
-  >
-    <div
-      class="header"
-    >
-      header
-    </div>
-    <div
-      class="loader"
-    >
-      loader
-    </div>
-  </div>
-</div>
-`);
-    });
-
-    it('renders the header with data', () => {
-      const props: AnswersProps = {
-        ...defaultProps,
-        templateProps: {
-          templates: {
-            ...defaultProps.templateProps.templates,
-            header: ({ hits, isLoading }) => {
-              return `${hits.length} answer(s) ${
-                isLoading ? 'loading' : 'loaded'
-              }`;
-            },
-          },
-        },
-      };
-      const { container } = render(
-        <Answers
-          {...props}
-          isLoading={false}
-          hits={[{ objectID: '1', __position: 1 }]}
-        />
-      );
-      expect(container.querySelector('.header')).toHaveTextContent(
-        '1 answer(s) loaded'
-      );
-    });
-
-    it('renders the answers', () => {
-      const props: AnswersProps = {
-        ...defaultProps,
-        templateProps: {
-          templates: {
-            ...defaultProps.templateProps.templates,
-            item: (hit) => {
-              return `answer: ${hit.title}`;
-            },
-          },
-        },
-      };
-      const { container } = render(
-        <Answers
-          {...props}
-          isLoading={false}
-          hits={[{ objectID: '1', title: 'hello!', __position: 1 }]}
-        />
-      );
-      expect(container.querySelector('.list')).toHaveTextContent(
-        'answer: hello!'
-      );
-    });
-  });
-});
diff --git a/packages/instantsearch.js/src/connectors/answers/__tests__/connectAnswers-test.ts b/packages/instantsearch.js/src/connectors/answers/__tests__/connectAnswers-test.ts
deleted file mode 100644
index 39acb76020..0000000000
--- a/packages/instantsearch.js/src/connectors/answers/__tests__/connectAnswers-test.ts
+++ /dev/null
@@ -1,452 +0,0 @@
-import {
-  createSearchClient,
-  createSingleSearchResponse,
-} from '@instantsearch/mocks';
-import { wait } from '@instantsearch/testutils/wait';
-import algoliasearchHelper, { SearchResults } from 'algoliasearch-helper';
-
-import { createInstantSearch } from '../../../../test/createInstantSearch';
-import {
-  createInitOptions,
-  createRenderOptions,
-} from '../../../../test/createWidget';
-import connectAnswers from '../connectAnswers';
-
-const defaultRenderDebounceTime = 10;
-const defaultSearchDebounceTime = 10;
-const waitForDebounceTime =
-  defaultRenderDebounceTime + defaultSearchDebounceTime + 80;
-
-describe('connectAnswers', () => {
-  describe('Usage', () => {
-    it('throws without render function', () => {
-      expect(() => {
-        // @ts-expect-error: test connectAnswers with invalid parameters
-        connectAnswers()({});
-      }).toThrowErrorMatchingInlineSnapshot(`
-"The render function is not valid (received type Undefined).
-
-See documentation: https://www.algolia.com/doc/api-reference/widgets/answers/js/#connector"
-`);
-    });
-
-    it('throws without `queryLanguages`', () => {
-      expect(() => {
-        // @ts-expect-error: test connectAnswers with invalid parameters
-        connectAnswers(() => {})({});
-      }).toThrowErrorMatchingInlineSnapshot(`
-"The \`queryLanguages\` expects an array of strings.
-
-See documentation: https://www.algolia.com/doc/api-reference/widgets/answers/js/#connector"
-`);
-    });
-  });
-
-  const setupTestEnvironment = ({
-    hits,
-    attributesForPrediction = ['description'],
-    renderDebounceTime = defaultRenderDebounceTime,
-    searchDebounceTime = defaultSearchDebounceTime,
-  }: {
-    hits: any[];
-    attributesForPrediction?: string[];
-    renderDebounceTime?: number;
-    searchDebounceTime?: number;
-  }) => {
-    const renderFn = jest.fn();
-    const unmountFn = jest.fn();
-    const client = createSearchClient({
-      // @ts-ignore-next-line
-      initIndex() {
-        return {
-          findAnswers: () => Promise.resolve({ hits }),
-        };
-      },
-    });
-    const instantSearchInstance = createInstantSearch({ client });
-    const makeWidget = connectAnswers(renderFn, unmountFn);
-    const widget = makeWidget({
-      queryLanguages: ['en'],
-      attributesForPrediction,
-      renderDebounceTime,
-      searchDebounceTime,
-    });
-
-    const helper = algoliasearchHelper(client, '', {});
-
-    return {
-      renderFn,
-      unmountFn,
-      instantSearchInstance,
-      widget,
-      helper,
-    };
-  };
-
-  it('is a widget', () => {
-    const render = jest.fn();
-    const unmount = jest.fn();
-
-    const makeWidget = connectAnswers(render, unmount);
-    const widget = makeWidget({
-      queryLanguages: ['en'],
-      attributesForPrediction: ['description'],
-    });
-
-    expect(widget).toEqual(
-      expect.objectContaining({
-        $$type: 'ais.answers',
-        init: expect.any(Function),
-        render: expect.any(Function),
-        dispose: expect.any(Function),
-        getRenderState: expect.any(Function),
-        getWidgetRenderState: expect.any(Function),
-        getWidgetSearchParameters: expect.any(Function),
-      })
-    );
-  });
-
-  it('Renders during init and render', () => {
-    const { renderFn, widget, instantSearchInstance, helper } =
-      setupTestEnvironment({ hits: [] });
-
-    expect(renderFn).toHaveBeenCalledTimes(0);
-
-    widget.init!(
-      createInitOptions({
-        instantSearchInstance,
-        state: helper.state,
-        helper,
-      })
-    );
-
-    expect(renderFn).toHaveBeenCalledTimes(1);
-    expect(renderFn).toHaveBeenLastCalledWith(
-      expect.objectContaining({
-        instantSearchInstance,
-        hits: [],
-        isLoading: false,
-        widgetParams: {
-          queryLanguages: ['en'],
-          attributesForPrediction: ['description'],
-          renderDebounceTime: 10,
-          searchDebounceTime: 10,
-        },
-      }),
-      true
-    );
-
-    widget.render!(
-      createRenderOptions({
-        results: new SearchResults(helper.state, [
-          createSingleSearchResponse({ hits: [] }),
-        ]),
-        state: helper.state,
-        instantSearchInstance,
-        helper,
-      })
-    );
-
-    expect(renderFn).toHaveBeenCalledTimes(2);
-    expect(renderFn).toHaveBeenLastCalledWith(
-      expect.objectContaining({
-        instantSearchInstance,
-        hits: [],
-        isLoading: false,
-        widgetParams: {
-          queryLanguages: ['en'],
-          attributesForPrediction: ['description'],
-          renderDebounceTime: 10,
-          searchDebounceTime: 10,
-        },
-      }),
-      false
-    );
-  });
-
-  it('renders empty hits when query is not given', () => {
-    const { renderFn, widget, helper, instantSearchInstance } =
-      setupTestEnvironment({ hits: [] });
-
-    widget.init!(
-      createInitOptions({
-        instantSearchInstance,
-        state: helper.state,
-        helper,
-      })
-    );
-
-    helper.state.query = '';
-
-    widget.render!(
-      createRenderOptions({
-        results: new SearchResults(helper.state, [
-          createSingleSearchResponse({ hits: [] }),
-        ]),
-        state: helper.state,
-        instantSearchInstance,
-        helper,
-      })
-    );
-
-    expect(renderFn).toHaveBeenNthCalledWith(
-      2,
-      expect.objectContaining({
-        instantSearchInstance,
-        hits: [],
-        isLoading: false,
-        widgetParams: {
-          queryLanguages: ['en'],
-          attributesForPrediction: ['description'],
-          renderDebounceTime: 10,
-          searchDebounceTime: 10,
-        },
-      }),
-      false
-    );
-  });
-
-  it('renders loader and results when query is given', async () => {
-    const hits = [{ title: '', objectID: 'a' }];
-    const { renderFn, instantSearchInstance, widget, helper } =
-      setupTestEnvironment({
-        hits,
-      });
-
-    widget.init!(
-      createInitOptions({
-        instantSearchInstance,
-        state: helper.state,
-        helper,
-      })
-    );
-
-    helper.state.query = 'a';
-    widget.render!(
-      createRenderOptions({
-        state: helper.state,
-        instantSearchInstance,
-        helper,
-      })
-    );
-
-    // render with isLoading and no hit
-    expect(renderFn).toHaveBeenCalledTimes(2);
-    expect(renderFn).toHaveBeenNthCalledWith(
-      2,
-      expect.objectContaining({
-        hits: [],
-        isLoading: true,
-      }),
-      false
-    );
-
-    await wait(waitForDebounceTime);
-
-    // render with hits
-    const expectedHits = [{ title: '', objectID: 'a', __position: 1 }];
-    expect(renderFn).toHaveBeenCalledTimes(3);
-    expect(renderFn).toHaveBeenNthCalledWith(
-      3,
-      expect.objectContaining({
-        hits: expectedHits,
-        isLoading: false,
-      }),
-      false
-    );
-  });
-
-  it('debounces renders', async () => {
-    const hits = [{ title: '', objectID: 'a' }];
-    const { renderFn, instantSearchInstance, widget, helper } =
-      setupTestEnvironment({
-        hits,
-      });
-
-    widget.init!(
-      createInitOptions({
-        instantSearchInstance,
-        state: helper.state,
-        helper,
-      })
-    );
-
-    helper.state.query = 'a';
-    widget.render!(
-      createRenderOptions({
-        state: helper.state,
-        instantSearchInstance,
-        helper,
-      })
-    );
-
-    // render with isLoading and no hit
-    expect(renderFn).toHaveBeenCalledTimes(2);
-    expect(renderFn).toHaveBeenNthCalledWith(
-      2,
-      expect.objectContaining({
-        hits: [],
-        isLoading: true,
-      }),
-      false
-    );
-
-    // another query
-    helper.state.query = 'ab';
-    widget.render!(
-      createRenderOptions({
-        state: helper.state,
-        instantSearchInstance,
-        helper,
-      })
-    );
-
-    // no debounce for rendering loader
-    expect(renderFn).toHaveBeenCalledTimes(3);
-
-    await wait(waitForDebounceTime);
-
-    const expectedHits = [{ title: '', objectID: 'a', __position: 1 }];
-    expect(renderFn).toHaveBeenCalledTimes(4);
-    expect(renderFn).toHaveBeenNthCalledWith(
-      4,
-      expect.objectContaining({
-        hits: expectedHits,
-        isLoading: false,
-      }),
-      false
-    );
-
-    await wait(waitForDebounceTime);
-
-    // but no more rendering
-    expect(renderFn).toHaveBeenCalledTimes(4);
-  });
-
-  describe('getRenderState', () => {
-    it('returns the render state', () => {
-      const { instantSearchInstance, widget, helper } = setupTestEnvironment({
-        hits: [],
-      });
-
-      expect(
-        widget.getRenderState(
-          {},
-          createInitOptions({
-            instantSearchInstance,
-            state: helper.state,
-            helper,
-          })
-        )
-      ).toEqual({
-        answers: {
-          hits: [],
-          isLoading: false,
-          widgetParams: {
-            queryLanguages: ['en'],
-            attributesForPrediction: ['description'],
-            renderDebounceTime: 10,
-            searchDebounceTime: 10,
-          },
-        },
-      });
-
-      widget.init!(
-        createInitOptions({
-          instantSearchInstance,
-          state: helper.state,
-          helper,
-        })
-      );
-
-      expect(
-        widget.getRenderState(
-          {},
-          createInitOptions({
-            instantSearchInstance,
-            state: helper.state,
-            helper,
-          })
-        )
-      ).toEqual({
-        answers: {
-          hits: [],
-          isLoading: false,
-          widgetParams: {
-            queryLanguages: ['en'],
-            attributesForPrediction: ['description'],
-            renderDebounceTime: 10,
-            searchDebounceTime: 10,
-          },
-        },
-      });
-    });
-  });
-
-  describe('getWidgetRenderState', () => {
-    it('returns the widget render state', async () => {
-      const { instantSearchInstance, widget, helper } = setupTestEnvironment({
-        hits: [{ title: '', objectID: 'a' }],
-      });
-
-      widget.init!(
-        createInitOptions({
-          instantSearchInstance,
-          state: helper.state,
-          helper,
-        })
-      );
-
-      helper.state.query = 'a';
-      widget.render!(
-        createRenderOptions({
-          instantSearchInstance,
-          state: helper.state,
-          helper,
-        })
-      );
-
-      // render the loading state
-      expect(
-        widget.getWidgetRenderState(
-          createRenderOptions({
-            instantSearchInstance,
-            state: helper.state,
-            helper,
-          })
-        )
-      ).toEqual({
-        hits: [],
-        isLoading: true,
-        widgetParams: {
-          queryLanguages: ['en'],
-          attributesForPrediction: ['description'],
-          renderDebounceTime: 10,
-          searchDebounceTime: 10,
-        },
-      });
-
-      await wait(waitForDebounceTime);
-
-      const expectedHits = [{ title: '', objectID: 'a', __position: 1 }];
-      expect(
-        widget.getWidgetRenderState(
-          createRenderOptions({
-            instantSearchInstance,
-            state: helper.state,
-            helper,
-          })
-        )
-      ).toEqual({
-        hits: expectedHits,
-        isLoading: false,
-        widgetParams: {
-          queryLanguages: ['en'],
-          attributesForPrediction: ['description'],
-          renderDebounceTime: 10,
-          searchDebounceTime: 10,
-        },
-      });
-    });
-  });
-});
diff --git a/packages/instantsearch.js/src/connectors/answers/connectAnswers.ts b/packages/instantsearch.js/src/connectors/answers/connectAnswers.ts
deleted file mode 100644
index 47bdadef0b..0000000000
--- a/packages/instantsearch.js/src/connectors/answers/connectAnswers.ts
+++ /dev/null
@@ -1,267 +0,0 @@
-import {
-  checkRendering,
-  createDocumentationMessageGenerator,
-  createConcurrentSafePromise,
-  addQueryID,
-  debounce,
-  addAbsolutePosition,
-  noop,
-  escapeHits,
-} from '../../lib/utils';
-
-import type { DebouncedFunction } from '../../lib/utils';
-import type {
-  Connector,
-  Hit,
-  FindAnswersOptions,
-  FindAnswersResponse,
-  WidgetRenderState,
-  FindAnswers,
-} from '../../types';
-
-type IndexWithAnswers = {
-  readonly findAnswers: any;
-};
-
-function hasFindAnswersMethod(
-  answersIndex: IndexWithAnswers | any
-): answersIndex is IndexWithAnswers {
-  return typeof (answersIndex as IndexWithAnswers).findAnswers === 'function';
-}
-
-const withUsage = createDocumentationMessageGenerator({
-  name: 'answers',
-  connector: true,
-});
-
-export type AnswersRenderState = {
-  /**
-   * The matched hits from Algolia API.
-   */
-  hits: Hit[];
-
-  /**
-   * Whether it's still loading the results from the Answers API.
-   */
-  isLoading: boolean;
-};
-
-export type AnswersConnectorParams = {
-  /**
-   * Attributes to use for predictions.
-   * If empty, we use all `searchableAttributes` to find answers.
-   * All your `attributesForPrediction` must be part of your `searchableAttributes`.
-   */
-  attributesForPrediction?: string[];
-
-  /**
-   * The languages in the query. Currently only supports `en`.
-   */
-  queryLanguages: ['en'];
-
-  /**
-   * Maximum number of answers to retrieve from the Answers Engine.
-   * Cannot be greater than 1000.
-   * @default 1
-   */
-  nbHits?: number;
-
-  /**
-   * Debounce time in milliseconds to debounce render
-   * @default 100
-   */
-  renderDebounceTime?: number;
-
-  /**
-   * Debounce time in milliseconds to debounce search
-   * @default 100
-   */
-  searchDebounceTime?: number;
-
-  /**
-   * Whether to escape HTML tags from hits string values.
-   *
-   * @default true
-   */
-  escapeHTML?: boolean;
-
-  /**
-   * Extra parameters to pass to findAnswers method.
-   * @default {}
-   */
-  extraParameters?: FindAnswersOptions;
-};
-
-export type AnswersWidgetDescription = {
-  $$type: 'ais.answers';
-  renderState: AnswersRenderState;
-  indexRenderState: {
-    answers: WidgetRenderState<AnswersRenderState, AnswersConnectorParams>;
-  };
-};
-
-export type AnswersConnector = Connector<
-  AnswersWidgetDescription,
-  AnswersConnectorParams
->;
-
-/**
- * @deprecated the answers service is no longer offered, and this widget will be removed in InstantSearch.js v5
- */
-const connectAnswers: AnswersConnector = function connectAnswers(
-  renderFn,
-  unmountFn = noop
-) {
-  checkRendering(renderFn, withUsage());
-
-  return (widgetParams) => {
-    const {
-      queryLanguages,
-      attributesForPrediction,
-      nbHits = 1,
-      renderDebounceTime = 100,
-      searchDebounceTime = 100,
-      // @MAJOR: this can default to false
-      escapeHTML = true,
-      extraParameters = {},
-    } = widgetParams || {};
-
-    // @ts-expect-error checking for the wrong value
-    if (!queryLanguages || queryLanguages.length === 0) {
-      throw new Error(
-        withUsage('The `queryLanguages` expects an array of strings.')
-      );
-    }
-
-    const runConcurrentSafePromise =
-      createConcurrentSafePromise<FindAnswersResponse<Hit>>();
-
-    let lastHits: FindAnswersResponse<Hit>['hits'] = [];
-    let isLoading = false;
-    const debouncedRender = debounce(renderFn, renderDebounceTime);
-
-    let debouncedRefine: DebouncedFunction<FindAnswers>;
-
-    return {
-      $$type: 'ais.answers',
-
-      init(initOptions) {
-        const { state, instantSearchInstance } = initOptions;
-        if (typeof instantSearchInstance.client.initIndex !== 'function') {
-          throw new Error(withUsage('`algoliasearch` <5 required.'));
-        }
-        const answersIndex = (instantSearchInstance.client.initIndex as any)(
-          state.index
-        );
-        if (!hasFindAnswersMethod(answersIndex)) {
-          throw new Error(withUsage('`algoliasearch` >= 4.8.0 required.'));
-        }
-        debouncedRefine = debounce(
-          answersIndex.findAnswers as unknown as FindAnswers,
-          searchDebounceTime
-        );
-
-        renderFn(
-          {
-            ...this.getWidgetRenderState(initOptions),
-            instantSearchInstance: initOptions.instantSearchInstance,
-          },
-          true
-        );
-      },
-
-      render(renderOptions) {
-        const query = renderOptions.state.query;
-        if (!query) {
-          // renders nothing with empty query
-          lastHits = [];
-          isLoading = false;
-          renderFn(
-            {
-              ...this.getWidgetRenderState(renderOptions),
-              instantSearchInstance: renderOptions.instantSearchInstance,
-            },
-            false
-          );
-          return;
-        }
-
-        // render the loader
-        lastHits = [];
-        isLoading = true;
-        renderFn(
-          {
-            ...this.getWidgetRenderState(renderOptions),
-            instantSearchInstance: renderOptions.instantSearchInstance,
-          },
-          false
-        );
-
-        // call /answers API
-        runConcurrentSafePromise(
-          debouncedRefine(query, queryLanguages, {
-            ...extraParameters,
-            nbHits,
-            attributesForPrediction,
-          }) as unknown as Promise<FindAnswersResponse<Hit>>
-        ).then((result) => {
-          if (!result) {
-            // It's undefined when it's debounced.
-            return;
-          }
-
-          if (escapeHTML && result.hits.length > 0) {
-            result.hits = escapeHits(result.hits);
-          }
-
-          const hitsWithAbsolutePosition = addAbsolutePosition(
-            result.hits,
-            0,
-            nbHits
-          );
-
-          const hitsWithAbsolutePositionAndQueryID = addQueryID(
-            hitsWithAbsolutePosition,
-            result.queryID
-          );
-
-          lastHits = hitsWithAbsolutePositionAndQueryID;
-          isLoading = false;
-          debouncedRender(
-            {
-              ...this.getWidgetRenderState(renderOptions),
-              instantSearchInstance: renderOptions.instantSearchInstance,
-            },
-            false
-          );
-        });
-      },
-
-      getRenderState(renderState, renderOptions) {
-        return {
-          ...renderState,
-          answers: this.getWidgetRenderState(renderOptions),
-        };
-      },
-
-      getWidgetRenderState() {
-        return {
-          hits: lastHits,
-          isLoading,
-          widgetParams,
-        };
-      },
-
-      dispose({ state }) {
-        unmountFn();
-        return state;
-      },
-
-      getWidgetSearchParameters(state) {
-        return state;
-      },
-    };
-  };
-};
-
-export default connectAnswers;
diff --git a/packages/instantsearch.js/src/connectors/index.ts b/packages/instantsearch.js/src/connectors/index.ts
index f14dcde625..466aa0f8c3 100644
--- a/packages/instantsearch.js/src/connectors/index.ts
+++ b/packages/instantsearch.js/src/connectors/index.ts
@@ -1,15 +1,8 @@
 import { deprecate } from '../lib/utils';
 
-import connectAnswers from './answers/connectAnswers';
 import connectConfigureRelatedItems from './configure-related-items/connectConfigureRelatedItems';
 import connectDynamicWidgets from './dynamic-widgets/connectDynamicWidgets';
 
-/** @deprecated answers is no longer supported */
-export const EXPERIMENTAL_connectAnswers = deprecate(
-  connectAnswers,
-  'answers is no longer supported'
-);
-
 /** @deprecated use connectRelatedItems instead */
 export const EXPERIMENTAL_connectConfigureRelatedItems = deprecate(
   connectConfigureRelatedItems,
diff --git a/packages/instantsearch.js/src/types/render-state.ts b/packages/instantsearch.js/src/types/render-state.ts
index f68d99be66..e1e5ae7889 100644
--- a/packages/instantsearch.js/src/types/render-state.ts
+++ b/packages/instantsearch.js/src/types/render-state.ts
@@ -1,4 +1,3 @@
-import type { AnswersWidgetDescription } from '../connectors/answers/connectAnswers';
 import type { AutocompleteWidgetDescription } from '../connectors/autocomplete/connectAutocomplete';
 import type { BreadcrumbWidgetDescription } from '../connectors/breadcrumb/connectBreadcrumb';
 import type { ClearRefinementsWidgetDescription } from '../connectors/clear-refinements/connectClearRefinements';
@@ -24,8 +23,7 @@ import type { StatsWidgetDescription } from '../connectors/stats/connectStats';
 import type { ToggleRefinementWidgetDescription } from '../connectors/toggle-refinement/connectToggleRefinement';
 import type { VoiceSearchWidgetDescription } from '../connectors/voice-search/connectVoiceSearch';
 
-type ConnectorRenderStates = AnswersWidgetDescription['indexRenderState'] &
-  AutocompleteWidgetDescription['indexRenderState'] &
+type ConnectorRenderStates = AutocompleteWidgetDescription['indexRenderState'] &
   BreadcrumbWidgetDescription['indexRenderState'] &
   ClearRefinementsWidgetDescription['indexRenderState'] &
   ConfigureWidgetDescription['indexRenderState'] &
diff --git a/packages/instantsearch.js/src/types/widget.ts b/packages/instantsearch.js/src/types/widget.ts
index 41c627f343..6aa911114b 100644
--- a/packages/instantsearch.js/src/types/widget.ts
+++ b/packages/instantsearch.js/src/types/widget.ts
@@ -56,7 +56,6 @@ export type DisposeOptions = {
 
 // @MAJOR: Remove these exported types if we don't need them
 export type BuiltinTypes =
-  | 'ais.answers'
   | 'ais.autocomplete'
   | 'ais.breadcrumb'
   | 'ais.clearRefinements'
@@ -93,7 +92,6 @@ export type BuiltinTypes =
   | 'ais.voiceSearch';
 
 export type BuiltinWidgetTypes =
-  | 'ais.answers'
   | 'ais.autocomplete'
   | 'ais.breadcrumb'
   | 'ais.clearRefinements'
diff --git a/packages/instantsearch.js/src/widgets/__tests__/index.test.ts b/packages/instantsearch.js/src/widgets/__tests__/index.test.ts
index 7e82d544bd..2192840fa9 100644
--- a/packages/instantsearch.js/src/widgets/__tests__/index.test.ts
+++ b/packages/instantsearch.js/src/widgets/__tests__/index.test.ts
@@ -127,10 +127,6 @@ function initiateAllWidgets(): Array<[WidgetNames, Widget | IndexWidget]> {
           widgets: [],
         });
       }
-      case 'EXPERIMENTAL_answers': {
-        const EXPERIMENTAL_answers = widget as Widgets['EXPERIMENTAL_answers'];
-        return EXPERIMENTAL_answers({ container, queryLanguages: ['en'] });
-      }
       case 'frequentlyBoughtTogether':
       case 'relatedProducts':
       case 'lookingSimilar': {
diff --git a/packages/instantsearch.js/src/widgets/answers/__tests__/answers-test.ts b/packages/instantsearch.js/src/widgets/answers/__tests__/answers-test.ts
deleted file mode 100644
index 6818c7b791..0000000000
--- a/packages/instantsearch.js/src/widgets/answers/__tests__/answers-test.ts
+++ /dev/null
@@ -1,170 +0,0 @@
-/**
- * @jest-environment jsdom
- */
-/** @jsx h */
-
-import { createSearchClient } from '@instantsearch/mocks';
-import { wait } from '@instantsearch/testutils/wait';
-import { fireEvent } from '@testing-library/preact';
-import algoliasearchHelper from 'algoliasearch-helper';
-
-import { createInitOptions } from '../../../../test/createWidget';
-import instantsearch from '../../../index.es';
-import searchBox from '../../search-box/search-box';
-import answers from '../answers';
-
-describe('answers', () => {
-  describe('Usage', () => {
-    it('throws without `container`', () => {
-      expect(() => {
-        // @ts-expect-error
-        answers({});
-      }).toThrowErrorMatchingInlineSnapshot(`
-"The \`container\` option is required.
-
-See documentation: https://www.algolia.com/doc/api-reference/widgets/answers/js/"
-`);
-    });
-
-    it('throws without `queryLanguages`', () => {
-      const container = document.createElement('div');
-      expect(() => {
-        // @ts-expect-error
-        answers({ container });
-      }).toThrowErrorMatchingInlineSnapshot(`
-"The \`queryLanguages\` expects an array of strings.
-
-See documentation: https://www.algolia.com/doc/api-reference/widgets/answers/js/#connector"
-`);
-    });
-
-    it('throws when searchClient does not support findAnswers', () => {
-      const container = document.createElement('div');
-      const searchClient = createSearchClient({
-        // @ts-ignore-next-line
-        initIndex() {
-          return {};
-        },
-      });
-      const helper = algoliasearchHelper(searchClient, '', {});
-      const search = instantsearch({
-        indexName: 'instant_search',
-        searchClient,
-      });
-      search.helper = helper;
-      const widget = answers({
-        container,
-        queryLanguages: ['en'],
-        attributesForPrediction: ['description'],
-      });
-      expect(() => {
-        widget.init!(
-          createInitOptions({
-            state: helper.state,
-            helper,
-            instantSearchInstance: search,
-          })
-        );
-      }).toThrowErrorMatchingInlineSnapshot(`
-"\`algoliasearch\` >= 4.8.0 required.
-
-See documentation: https://www.algolia.com/doc/api-reference/widgets/answers/js/#connector"
-`);
-    });
-  });
-
-  describe('render', () => {
-    it('renders with empty state', async () => {
-      const container = document.createElement('div');
-      const search = instantsearch({
-        indexName: 'instant_search',
-        searchClient: createSearchClient({
-          // @ts-ignore-next-line
-          initIndex() {
-            return {
-              findAnswers: () => Promise.resolve({ hits: [] }),
-            };
-          },
-        }),
-      });
-      search.addWidgets([
-        answers({
-          container,
-          queryLanguages: ['en'],
-          attributesForPrediction: ['description'],
-        }),
-      ]);
-      search.start();
-      await wait(0);
-      expect(container.innerHTML).toMatchInlineSnapshot(`
-        <div class="ais-Answers ais-Answers--empty">
-          <div class="ais-Answers-header">
-          </div>
-          <ul class="ais-Answers-list">
-          </ul>
-        </div>
-      `);
-    });
-
-    it('renders the answers', async () => {
-      const answersContainer = document.createElement('div');
-      const searchBoxContainer = document.createElement('div');
-      const search = instantsearch({
-        indexName: 'instant_search',
-        searchClient: createSearchClient({
-          // @ts-ignore-next-line
-          initIndex() {
-            return {
-              findAnswers: () => {
-                return Promise.resolve({ hits: [{ title: 'Hello' }] });
-              },
-            };
-          },
-        }),
-      });
-      search.addWidgets([
-        answers({
-          container: answersContainer,
-          queryLanguages: ['en'],
-          attributesForPrediction: ['description'],
-          renderDebounceTime: 10,
-          searchDebounceTime: 10,
-          cssClasses: {
-            root: 'root',
-            loader: 'loader',
-            emptyRoot: 'empty',
-            item: 'item',
-          },
-          templates: {
-            loader: () => 'loading...',
-            item: (hit) => `title: ${hit.title}`,
-          },
-        }),
-        searchBox({
-          container: searchBoxContainer,
-        }),
-      ]);
-      search.start();
-      await wait(0);
-
-      fireEvent.input(searchBoxContainer.querySelector('input')!, {
-        target: { value: 'a' },
-      });
-
-      await wait(0);
-      expect(answersContainer.querySelector('.loader')!.innerHTML).toEqual(
-        'loading...'
-      );
-      expect(answersContainer.querySelector('.root')).toHaveClass('empty');
-
-      await wait(100);
-
-      // debounced render
-      expect(answersContainer.querySelector('.root')).not.toHaveClass('empty');
-      expect(answersContainer.querySelectorAll('.item').length).toEqual(1);
-      expect(answersContainer.querySelector('.item')!.innerHTML).toEqual(
-        'title: Hello'
-      );
-    });
-  });
-});
diff --git a/packages/instantsearch.js/src/widgets/answers/answers.tsx b/packages/instantsearch.js/src/widgets/answers/answers.tsx
deleted file mode 100644
index 35ab9efabd..0000000000
--- a/packages/instantsearch.js/src/widgets/answers/answers.tsx
+++ /dev/null
@@ -1,201 +0,0 @@
-/** @jsx h */
-
-import { cx } from 'instantsearch-ui-components';
-import { h, render } from 'preact';
-
-import Answers from '../../components/Answers/Answers';
-import connectAnswers from '../../connectors/answers/connectAnswers';
-import { component } from '../../lib/suit';
-import { prepareTemplateProps } from '../../lib/templating';
-import {
-  createDocumentationMessageGenerator,
-  deprecate,
-  getContainerNode,
-} from '../../lib/utils';
-
-import defaultTemplates from './defaultTemplates';
-
-import type {
-  AnswersComponentCSSClasses,
-  AnswersComponentTemplates,
-} from '../../components/Answers/Answers';
-import type {
-  AnswersRenderState,
-  AnswersConnectorParams,
-  AnswersWidgetDescription,
-} from '../../connectors/answers/connectAnswers';
-import type { PreparedTemplateProps } from '../../lib/templating';
-import type { WidgetFactory, Template, Hit, Renderer } from '../../types';
-
-const withUsage = createDocumentationMessageGenerator({ name: 'answers' });
-const suit = component('Answers');
-
-const renderer =
-  ({
-    containerNode,
-    cssClasses,
-    renderState,
-    templates,
-  }: {
-    containerNode: HTMLElement;
-    cssClasses: AnswersComponentCSSClasses;
-    renderState: {
-      templateProps?: PreparedTemplateProps<AnswersComponentTemplates>;
-    };
-    templates: AnswersTemplates;
-  }): Renderer<AnswersRenderState, Partial<AnswersWidgetParams>> =>
-  ({ hits, isLoading }, isFirstRendering) => {
-    if (isFirstRendering) {
-      renderState.templateProps = prepareTemplateProps({
-        defaultTemplates,
-        templates,
-      });
-      return;
-    }
-
-    render(
-      <Answers
-        cssClasses={cssClasses}
-        hits={hits}
-        isLoading={isLoading}
-        templateProps={renderState.templateProps!}
-      />,
-      containerNode
-    );
-  };
-
-export type AnswersTemplates = Partial<{
-  /**
-   * Template to use for the header. This template will receive an object containing `hits` and `isLoading`.
-   */
-  header: Template<{
-    hits: Hit[];
-    isLoading: boolean;
-  }>;
-
-  /**
-   * Template to use for the loader.
-   */
-  loader: Template;
-
-  /**
-   * Template to use for each result. This template will receive an object containing a single record.
-   */
-  item: Template<Hit>;
-}>;
-
-export type AnswersCSSClasses = Partial<{
-  /**
-   * CSS class to add to the root element of the widget.
-   */
-  root: string | string[];
-
-  /**
-   * CSS class to add to the wrapping element when no results.
-   */
-  emptyRoot: string | string[];
-
-  /**
-   * CSS classes to add to the header.
-   */
-  header: string | string[];
-
-  /**
-   * CSS classes to add to the loader.
-   */
-  loader: string | string[];
-
-  /**
-   * CSS class to add to the list of results.
-   */
-  list: string | string[];
-
-  /**
-   * CSS class to add to each result.
-   */
-  item: string | string[];
-}>;
-
-export type AnswersWidgetParams = {
-  /**
-   * CSS Selector or HTMLElement to insert the widget.
-   */
-  container: string | HTMLElement;
-
-  /**
-   * The templates to use for the widget.
-   */
-  templates?: AnswersTemplates;
-
-  /**
-   * The CSS classes to override.
-   */
-  cssClasses?: AnswersCSSClasses;
-};
-
-export type AnswersWidget = WidgetFactory<
-  AnswersWidgetDescription & { $$widgetType: 'ais.answers' },
-  AnswersConnectorParams,
-  AnswersWidgetParams
->;
-
-/**
- * @deprecated the answers service is no longer offered, and this widget will be removed in InstantSearch.js v5
- */
-const answersWidget: AnswersWidget = (widgetParams) => {
-  const {
-    container,
-    attributesForPrediction,
-    queryLanguages,
-    nbHits,
-    searchDebounceTime,
-    renderDebounceTime,
-    escapeHTML,
-    extraParameters,
-    templates = {},
-    cssClasses: userCssClasses = {},
-  } = widgetParams || {};
-
-  if (!container) {
-    throw new Error(withUsage('The `container` option is required.'));
-  }
-
-  const containerNode = getContainerNode(container);
-  const cssClasses = {
-    root: cx(suit(), userCssClasses.root),
-    emptyRoot: cx(suit({ modifierName: 'empty' }), userCssClasses.emptyRoot),
-    header: cx(suit({ descendantName: 'header' }), userCssClasses.header),
-    loader: cx(suit({ descendantName: 'loader' }), userCssClasses.loader),
-    list: cx(suit({ descendantName: 'list' }), userCssClasses.list),
-    item: cx(suit({ descendantName: 'item' }), userCssClasses.item),
-  };
-
-  const specializedRenderer = renderer({
-    containerNode,
-    cssClasses,
-    templates,
-    renderState: {},
-  });
-
-  const makeWidget = connectAnswers(specializedRenderer, () =>
-    render(null, containerNode)
-  );
-
-  return {
-    ...makeWidget({
-      attributesForPrediction,
-      queryLanguages,
-      nbHits,
-      searchDebounceTime,
-      renderDebounceTime,
-      escapeHTML,
-      extraParameters,
-    }),
-    $$widgetType: 'ais.answers',
-  };
-};
-
-export default deprecate(
-  answersWidget,
-  'The answers widget is deprecated and will be removed in InstantSearch.js 5.0'
-);
diff --git a/packages/instantsearch.js/src/widgets/answers/defaultTemplates.ts b/packages/instantsearch.js/src/widgets/answers/defaultTemplates.ts
deleted file mode 100644
index 1dd2586a9a..0000000000
--- a/packages/instantsearch.js/src/widgets/answers/defaultTemplates.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import type { AnswersComponentTemplates } from '../../components/Answers/Answers';
-
-const defaultTemplates: AnswersComponentTemplates = {
-  header() {
-    return '';
-  },
-  loader() {
-    return '';
-  },
-  item(item) {
-    return JSON.stringify(item);
-  },
-};
-
-export default defaultTemplates;
diff --git a/packages/instantsearch.js/src/widgets/index.ts b/packages/instantsearch.js/src/widgets/index.ts
index c9796d8c99..4703a77132 100644
--- a/packages/instantsearch.js/src/widgets/index.ts
+++ b/packages/instantsearch.js/src/widgets/index.ts
@@ -1,15 +1,8 @@
 import { deprecate } from '../lib/utils';
 
-import answers from './answers/answers';
 import configureRelatedItems from './configure-related-items/configure-related-items';
 import dynamicWidgets from './dynamic-widgets/dynamic-widgets';
 
-/** @deprecated answers is no longer supported */
-export const EXPERIMENTAL_answers = deprecate(
-  answers,
-  'answers is no longer supported'
-);
-
 /** @deprecated use relatedItems instead */
 export const EXPERIMENTAL_configureRelatedItems = deprecate(
   configureRelatedItems,
diff --git a/packages/instantsearch.js/stories/answers.stories.ts b/packages/instantsearch.js/stories/answers.stories.ts
deleted file mode 100644
index 78c10b610d..0000000000
--- a/packages/instantsearch.js/stories/answers.stories.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import { storiesOf } from '@storybook/html';
-
-import { withHits } from '../.storybook/decorators';
-import '../.storybook/static/answers.css';
-
-const searchOptions = {
-  appId: 'CKOEQ4XGMU',
-  apiKey: '6560d3886292a5aec86d63b9a2cba447',
-  indexName: 'ted',
-};
-
-storiesOf('Results/Answers', module)
-  .add(
-    'default',
-    withHits(({ search, container, instantsearch }) => {
-      const p = document.createElement('p');
-      p.innerText = `Try to search for "sarah jones"`;
-      const answersContainer = document.createElement('div');
-      container.appendChild(p);
-      container.appendChild(answersContainer);
-
-      search.addWidgets([
-        instantsearch.widgets.EXPERIMENTAL_answers({
-          container: answersContainer,
-          queryLanguages: ['en'],
-          attributesForPrediction: ['description'],
-          templates: {
-            item: (hit, { html }) => html`<p>${hit._answer.extract}</p>`,
-          },
-        }),
-      ]);
-    }, searchOptions)
-  )
-  .add(
-    'with header',
-    withHits(({ search, container, instantsearch }) => {
-      const p = document.createElement('p');
-      p.innerText = `Try to search for "sarah jones"`;
-      const answersContainer = document.createElement('div');
-      container.appendChild(p);
-      container.appendChild(answersContainer);
-
-      search.addWidgets([
-        instantsearch.widgets.EXPERIMENTAL_answers({
-          container: answersContainer,
-          queryLanguages: ['en'],
-          attributesForPrediction: ['description'],
-          templates: {
-            header: ({ hits }) => {
-              return hits.length === 0 ? '' : `<p>Answers</p>`;
-            },
-            item: (hit, { html }) => html`<p>${hit._answer.extract}</p>`,
-          },
-        }),
-      ]);
-    }, searchOptions)
-  )
-  .add(
-    'with loader',
-    withHits(({ search, container, instantsearch }) => {
-      const p = document.createElement('p');
-      p.innerText = `Try to search for "sarah jones"`;
-      const answersContainer = document.createElement('div');
-      container.appendChild(p);
-      container.appendChild(answersContainer);
-
-      search.addWidgets([
-        instantsearch.widgets.EXPERIMENTAL_answers({
-          container: answersContainer,
-          queryLanguages: ['en'],
-          attributesForPrediction: ['description'],
-          templates: {
-            header: ({ hits }, { html }) => {
-              return hits.length === 0 ? '' : html`<p>Answers</p>`;
-            },
-            loader: () => `loading...`,
-            item: (hit, { html }) => html`<p>${hit._answer.extract}</p>`,
-          },
-        }),
-      ]);
-    }, searchOptions)
-  )
-  .add(
-    'full example',
-    withHits(({ search, container, instantsearch }) => {
-      const p = document.createElement('p');
-      p.innerText = `Try to search for "sarah jones"`;
-      const answersContainer = document.createElement('div');
-      container.appendChild(p);
-      container.appendChild(answersContainer);
-
-      search.addWidgets([
-        instantsearch.widgets.EXPERIMENTAL_answers({
-          container: answersContainer,
-          queryLanguages: ['en'],
-          attributesForPrediction: ['description'],
-          cssClasses: {
-            root: 'my-Answers',
-          },
-          templates: {
-            loader: (_, { html }) => html`
-              <div class="card-skeleton">
-                <div class="animated-background">
-                  <div class="skel-mask-container">
-                    <div class="skel-mask skel-mask-1"></div>
-                    <div class="skel-mask skel-mask-2"></div>
-                    <div class="skel-mask skel-mask-3"></div>
-                  </div>
-                </div>
-              </div>
-            `,
-            item: (hit, { html }) => html`
-              <p class="title one-line">${hit.title}</p>
-              <div class="separator"></div>
-              <p class="description three-lines">${hit._answer.extract}</p>
-            `,
-          },
-        }),
-      ]);
-    }, searchOptions)
-  );
diff --git a/specs/src/pages/widgets/answers.md b/specs/src/pages/widgets/answers.md
deleted file mode 100644
index efe968d052..0000000000
--- a/specs/src/pages/widgets/answers.md
+++ /dev/null
@@ -1,58 +0,0 @@
----
-layout: ../../layouts/WidgetLayout.astro
-title: Answers
-type: widget
-html: |
-  <div class="ais-Answers">
-    <div class="ais-Answers-header">Algolia Answers</div>
-    <ul class="ais-Answers-list">
-      <li class="ais-Answers-item">Author Sam Martin shares photos of ...</li>
-      <li class="ais-Answers-item">Beau Lotto's color games puzzle your vision, but they also spotlight what you can't normally see...</li>
-    </ul>
-  </div>
-alt1: empty
-althtml1: |
-  <div class="ais-Answers ais-Answers--empty">
-    <div class="ais-Answers-header">Algolia Answers</div>
-    <ul class="ais-Answers-list"></ul>
-  </div>
-alt2: loading
-althtml2: |
-  <div class="ais-Answers ais-Answers--empty">
-    <div class="ais-Answers-header">Algolia Answers</div>
-    <div class="ais-Answers-loader">loading...</div>
-  </div>
-classes:
-  - name: .ais-Answers
-    description: the root div of the widget
-  - name: .ais-Answers--empty
-    description: the root div of the widget with no items
-  - name: .ais-Answers-header
-    description: the header
-  - name: .ais-Answers-loader
-    description: the loader when it's loading
-  - name: .ais-Answers-list
-    description: the list of Answers result
-  - name: .ais-Answers-item
-    description: the list item
-options:
-  - name: queryLanguages
-    description: The languages in the query. Currently only supports `en`.
-  - name: attributesForPrediction
-    description: |
-      Attributes to use for prediction.
-      If empty, we use all `searchableAttributes` to find answers.
-      All your `attributesForPrediction` must be part of your `searchableAttributes`.
-    default: "['*']"
-  - name: nbHits
-    description: |
-      Maximum number of answers to retrieve from the Answers Engine.
-      Cannot be greater than 1000.
-    default: 1
-  - name: debounceTime
-    description: Debounce time in milliseconds before querying the answers API
-    default: 200
-  - name: escapeHTML
-    description: Whether to escape HTML tags from hits string values.
-    default: true
----

From 86b6558b170b2ea2b61dcd34c2c4adb5ab8bd5c6 Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Fri, 18 Oct 2024 16:17:59 +0200
Subject: [PATCH 05/37] fix(instantsearch): remove EXPERIMENTAL_use (#6401)

Instead you can use `use` to add a middleware

BREAKING CHANGE: EXPERIMENTAL_use function is replaced with use function
---
 .../instantsearch.js/src/lib/InstantSearch.ts | 10 --------
 .../src/lib/__tests__/InstantSearch-test.tsx  | 23 -------------------
 .../test/createInstantSearch.ts               |  1 -
 3 files changed, 34 deletions(-)

diff --git a/packages/instantsearch.js/src/lib/InstantSearch.ts b/packages/instantsearch.js/src/lib/InstantSearch.ts
index 66b6ae1f61..0ddb0cfe8a 100644
--- a/packages/instantsearch.js/src/lib/InstantSearch.ts
+++ b/packages/instantsearch.js/src/lib/InstantSearch.ts
@@ -452,16 +452,6 @@ See documentation: ${createDocumentationLink({
     return this;
   }
 
-  // @major we shipped with EXPERIMENTAL_use, but have changed that to just `use` now
-  public EXPERIMENTAL_use(...middleware: Middleware[]): this {
-    warning(
-      false,
-      'The middleware API is now considered stable, so we recommend replacing `EXPERIMENTAL_use` with `use` before upgrading to the next major version.'
-    );
-
-    return this.use(...middleware);
-  }
-
   /**
    * Adds a widget to the search instance.
    * A widget can be added either before or after InstantSearch has started.
diff --git a/packages/instantsearch.js/src/lib/__tests__/InstantSearch-test.tsx b/packages/instantsearch.js/src/lib/__tests__/InstantSearch-test.tsx
index be72d07335..3ff76da93e 100644
--- a/packages/instantsearch.js/src/lib/__tests__/InstantSearch-test.tsx
+++ b/packages/instantsearch.js/src/lib/__tests__/InstantSearch-test.tsx
@@ -294,29 +294,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/instantsear
 `);
   });
 
-  it('warns dev with EXPERIMENTAL_use', () => {
-    const searchClient = createSearchClient({
-      addAlgoliaAgent: jest.fn(),
-    });
-
-    const search = new InstantSearch({
-      indexName: 'indexName',
-      searchClient,
-    });
-
-    const middleware = () => ({
-      onStateChange: () => {},
-      subscribe: () => {},
-      unsubscribe: () => {},
-    });
-
-    expect(() => {
-      search.EXPERIMENTAL_use(middleware);
-    }).toWarnDev(
-      '[InstantSearch.js]: The middleware API is now considered stable, so we recommend replacing `EXPERIMENTAL_use` with `use` before upgrading to the next major version.'
-    );
-  });
-
   it('does not warn dev with use', () => {
     const searchClient = createSearchClient({
       addAlgoliaAgent: jest.fn(),
diff --git a/packages/instantsearch.js/test/createInstantSearch.ts b/packages/instantsearch.js/test/createInstantSearch.ts
index d8f76b7bf3..fdf4841649 100644
--- a/packages/instantsearch.js/test/createInstantSearch.ts
+++ b/packages/instantsearch.js/test/createInstantSearch.ts
@@ -59,7 +59,6 @@ export const createInstantSearch = (
     removeWidget: jest.fn(),
     removeWidgets: jest.fn(),
     use: jest.fn(),
-    EXPERIMENTAL_use: jest.fn(),
     unuse: jest.fn(),
     // methods from EventEmitter
     addListener: jest.fn(),

From d056fbe3ed3552e785e26fc66e269e570f310cbb Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Mon, 21 Oct 2024 11:54:47 +0200
Subject: [PATCH 06/37] fix(methods): remove deprecated helper methods (#6402)

* fix(methods): remove addDisjunctiveRefine

BREAKING CHANGE: addDisjunctiveRefine is replaced with addDisjunctiveFacetRefinement

* fix(methods): remove removeDisjunctiveRefine

BREAKING CHANGE: removeDisjunctiveRefine is replaced with removeDisjunctiveFacetRefinement

* fix(methods): remove addRefine

BREAKING CHANGE: addRefine is replaced with addFacetRefinement

* fix(methods): remove addExclude

BREAKING CHANGE: addExclude is replaced with addFacetExclusion

* fix(methods): remove removeRefine

BREAKING CHANGE: removeRefine is replaced with removeFacetRefinement

* fix(methods): remove removeExclude

BREAKING CHANGE: removeExclude is replaced with removeFacetExclusion

* fix(methods): remove toggleExclude

BREAKING CHANGE: toggleExclude is replaced with toggleFacetExclusion

* fix(methods): remove toggleRefine

BREAKING CHANGE: toggleRefine is replaced with toggleFacetRefinement

* fix(methods): remove toggleRefinement

BREAKING CHANGE: toggleRefinement is replaced with toggleFacetRefinement

* fix(methods): remove isExcluded, isDisjunctiveRefined, hasTag, isTagRefined

These methods are available from the SearchParameters / helper.state instead

BREAKING CHANGE: replace helper.isExcluded with helper.state.isExcludeRefined
BREAKING CHANGE: replace helper.isDisjunctiveRefined with helper.state.isDisjunctiveFacetRefined
BREAKING CHANGE: replace helper.hasTag with helper.state.isTagRefined
BREAKING CHANGE: replace helper.isTagRefined with helper.state.isTagRefined

* fix(methods): remove setCurrentPage

BREAKING CHANGE: setCurrentPage is replaced with setPage

* fix(methods): remove getCurrentPage

BREAKING CHANGE: getCurrentPage is replaced with getPage

* fix(methods): remove getFacetByName

BREAKING CHANGE: getFacetByName (on search results) is replaced by calling results.xxxfacets.find(f => f.name === name) yourself (where xxxfacets is facets, disjunctiveFacets or hierarchicalFacets depending on your use case)

* fix(methods): remove containsRefinement

BREAKING CHANGE: containsRefinement is removed. Instead check the length of the arguments directly.
---
 packages/algoliasearch-helper/README.md       |   4 +-
 .../documentation-src/content/reference.md    |   4 -
 packages/algoliasearch-helper/index.d.ts      |  66 ------
 .../src/SearchParameters/index.js             |  16 +-
 .../src/SearchResults/index.js                |  18 --
 .../src/algoliasearch.helper.js               | 190 +-----------------
 .../test/integration-spec/helper.filters.js   |   8 +-
 .../test/spec/SearchResults/getFacet.js       |  18 --
 .../test/spec/algoliasearch.helper/clears.js  |  14 +-
 .../spec/algoliasearch.helper/distinct.js     |  16 +-
 .../test/spec/algoliasearch.helper/events.js  |  36 ++--
 .../spec/algoliasearch.helper/excludes.js     |  50 +++--
 .../spec/algoliasearch.helper/facetFilters.js |  10 +-
 .../incorrectFacetDefinition.js               |  14 +-
 .../test/spec/algoliasearch.helper/pages.js   |  16 +-
 .../hierarchical-facets/attributes-order.js   |  12 +-
 .../spec/hierarchical-facets/breadcrumb.js    |   2 +-
 .../hierarchical-facets/custom-prefix-path.js |   2 +-
 .../hierarchical-facets/custom-separator.js   |   2 +-
 .../do-not-show-parent-level.js               |   2 +-
 .../hierarchical-facets/getFacetValues.js     |   2 +-
 .../test/spec/hierarchical-facets/no-trim.js  |   6 +-
 .../objects-with-multiple-categories.js       |   2 +-
 .../spec/hierarchical-facets/one-level.js     |   2 +-
 .../spec/hierarchical-facets/pagination.js    |  12 +-
 .../parent-toggleRefine.js                    |  38 ++--
 .../hierarchical-facets/refined-no-result.js  |   8 +-
 .../hierarchical-facets/show-parent-level.js  |   2 +-
 .../spec/hierarchical-facets/simple-usage.js  |  22 +-
 .../test/spec/hierarchical-facets/sort-by.js  |   2 +-
 .../spec/hierarchical-facets/two-facets.js    |   4 +-
 .../spec/hierarchical-facets/unknown-facet.js |   2 +-
 .../with-a-disjunctive-facet.js               |   4 +-
 .../test/spec/refinements.js                  |  98 ++++-----
 .../algoliasearch-helper/test/spec/search.js  |  16 +-
 35 files changed, 214 insertions(+), 506 deletions(-)
 delete mode 100644 packages/algoliasearch-helper/test/spec/SearchResults/getFacet.js

diff --git a/packages/algoliasearch-helper/README.md b/packages/algoliasearch-helper/README.md
index 4e35999d8e..a1e90730ed 100644
--- a/packages/algoliasearch-helper/README.md
+++ b/packages/algoliasearch-helper/README.md
@@ -111,9 +111,9 @@ angular.module('searchApp', ['ngSanitize', 'algoliasearch'])
       $scope.content = event.results;
     });
   });
-  $scope.toggleRefine = function($event, facet, value) {
+  $scope.toggleFacetRefinement = function($event, facet, value) {
     $event.preventDefault();
-    $scope.helper.toggleRefine(facet, value).search();
+    $scope.helper.toggleFacetRefinement(facet, value).search();
   };
   $scope.$watch('q', function(q) {
     $scope.helper.setQuery(q).search();
diff --git a/packages/algoliasearch-helper/documentation-src/content/reference.md b/packages/algoliasearch-helper/documentation-src/content/reference.md
index 861316106e..795908b4fd 100644
--- a/packages/algoliasearch-helper/documentation-src/content/reference.md
+++ b/packages/algoliasearch-helper/documentation-src/content/reference.md
@@ -385,8 +385,6 @@ The facet exclusions are not a type of facets by themselves, they are conjunctiv
 
 {{> jsdoc jsdoc/helper/hasRefinements}}
 
-{{> jsdoc jsdoc/helper/isExcluded}}
-
 ### Numeric filters
 
 The numeric filters don't require any configuration. However they require that the attribute is stored as a number in Algolia.
@@ -409,8 +407,6 @@ The tag filters don't require any configuration. However, they require to be sto
 
 {{> jsdoc jsdoc/helper/toggleTag}}
 
-{{> jsdoc jsdoc/helper/hasTag}}
-
 {{> jsdoc jsdoc/helper/getTags}}
 
 ### State management
diff --git a/packages/algoliasearch-helper/index.d.ts b/packages/algoliasearch-helper/index.d.ts
index 0b96519966..04de5f9893 100644
--- a/packages/algoliasearch-helper/index.d.ts
+++ b/packages/algoliasearch-helper/index.d.ts
@@ -263,10 +263,6 @@ declare namespace algoliasearchHelper {
     setIndex(name: string): this;
 
     addDisjunctiveFacetRefinement(facet: string, value: string): this;
-    /**
-     * @deprecated since version 2.4.0, see {@link AlgoliaSearchHelper#addDisjunctiveFacetRefinement}
-     */
-    addDisjunctiveRefine(facet: string, value: string): this;
     addHierarchicalFacetRefinement(facet: string, path: string): this;
     addNumericRefinement(
       facet: string,
@@ -274,15 +270,7 @@ declare namespace algoliasearchHelper {
       value?: number | number[]
     ): this;
     addFacetRefinement(facet: string, value: string): this;
-    /**
-     * @deprecated since version 2.4.0, see {@link AlgoliaSearchHelper#addFacetRefinement}
-     */
-    addRefine: AlgoliaSearchHelper['addFacetRefinement'];
     addFacetExclusion(facet: string, value: string): this;
-    /**
-     * @deprecated since version 2.4.0, see {@link AlgoliaSearchHelper#addFacetExclusion}
-     */
-    addExclude: AlgoliaSearchHelper['addFacetExclusion'];
     addTag(tag: string): this;
     addFrequentlyBoughtTogether(
       params: RecommendParametersWithId<FrequentlyBoughtTogetherQuery>
@@ -305,21 +293,9 @@ declare namespace algoliasearchHelper {
       value?: number | number[]
     ): this;
     removeDisjunctiveFacetRefinement(facet: string, value?: string): this;
-    /**
-     * @deprecated since version 2.4.0, see {@link AlgoliaSearchHelper#removeDisjunctiveFacetRefinement}
-     */
-    removeDisjunctiveRefine(facet: string, value?: string): this;
     removeHierarchicalFacetRefinement(facet: string): this;
     removeFacetRefinement(facet: string, value?: string): this;
-    /**
-     * @deprecated since version 2.4.0, see {@link AlgoliaSearchHelper#removeFacetRefinement}
-     */
-    removeRefine(facet: string, value: string): this;
     removeFacetExclusion(facet: string, value: string): this;
-    /**
-     * @deprecated since version 2.4.0, see {@link AlgoliaSearchHelper#removeFacetExclusion}
-     */
-    removeExclude(facet: string, value: string): this;
     removeTag(value: string): this;
     removeFrequentlyBoughtTogether(id: number): this;
     removeRelatedProducts(id: number): this;
@@ -327,27 +303,11 @@ declare namespace algoliasearchHelper {
     removeTrendingFacets(id: number): this;
     removeLookingSimilar(id: number): this;
     toggleFacetExclusion(facet: string, value: string): this;
-    /**
-     * @deprecated since version 2.4.0, see {@link AlgoliaSearchHelper#toggleFacetExclusion}
-     */
-    toggleExclude(facet: string, value: string): this;
     toggleFacetRefinement(facet: string, value: string): this;
-    /**
-     * @deprecated since version 2.19.0, see {@link AlgoliaSearchHelper#toggleFacetRefinement}
-     */
-    toggleRefinement(facet: string, value: string): this;
-    /**
-     * @deprecated since version 2.4.0, see {@link AlgoliaSearchHelper#toggleFacetRefinement}
-     */
-    toggleRefine(facet: string, value: string): this;
     toggleTag(tag: string): this;
     nextPage(): this;
     previousPage(): this;
     setPage(page: number): this;
-    /**
-     * @deprecated
-     */
-    setCurrentPage(page: number): this;
     setQueryParameter<SearchParameter extends keyof PlainSearchParameters>(
       parameter: SearchParameter,
       value: PlainSearchParameters[SearchParameter]
@@ -364,30 +324,12 @@ declare namespace algoliasearchHelper {
 
     overrideStateWithoutTriggeringChangeEvent: AlgoliaSearchHelper['setState'];
     hasRefinements(facet: string): boolean;
-    isExcluded: SearchParameters['isExcludeRefined'];
-    /**
-     * @deprecated since 2.4.0, see {@link AlgoliaSearchHelper#hasRefinements}
-     */
-    isDisjunctiveRefined: SearchParameters['isDisjunctiveFacetRefined'];
-    hasTag: SearchParameters['isTagRefined'];
-    /**
-     * @deprecated since 2.4.0, see {@link AlgoliaSearchHelper#hasTag}
-     */
-    isTagRefined: SearchParameters['isTagRefined'];
     getIndex(): string;
-    /**
-     * @deprecated
-     */
-    getCurrentPage(): number;
     getPage(): number;
     getTags(): string[];
     getRefinements(facetName: string): any[];
     getNumericRefinement: SearchParameters['getNumericRefinement'];
     getHierarchicalFacetBreadcrumb: SearchParameters['getHierarchicalFacetBreadcrumb'];
-    /**
-     * @deprecated
-     */
-    containsRefinement(...any: any[]): any;
     clearCache(): this;
     setClient(client: SearchClient | CompositionClient): this;
     getClient(): SearchClient | CompositionClient;
@@ -1414,14 +1356,6 @@ declare namespace algoliasearchHelper {
       options?: SearchResultsOptions
     );
 
-    /**
-     * Get a facet object with its name
-     * @deprecated
-     * @param name name of the faceted attribute
-     * @return  the facet object
-     */
-    getFacetByName(name: string): SearchResults.Facet;
-
     /**
      * Get a the list of values for a given facet attribute. Those values are sorted
      * refinement first, descending count (bigger value on top), and name ascending
diff --git a/packages/algoliasearch-helper/src/SearchParameters/index.js b/packages/algoliasearch-helper/src/SearchParameters/index.js
index 4ff71f3443..472b2ae4e7 100644
--- a/packages/algoliasearch-helper/src/SearchParameters/index.js
+++ b/packages/algoliasearch-helper/src/SearchParameters/index.js
@@ -1049,18 +1049,6 @@ SearchParameters.prototype = {
 
     return this.setQueryParameters(modification);
   },
-  /**
-   * Generic toggle refinement method to use with facet, disjunctive facets
-   * and hierarchical facets
-   * @param  {string} facet the facet to refine
-   * @param  {string} value the associated value
-   * @return {SearchParameters} new instance
-   * @throws will throw an error if the facet is not declared in the settings of the helper
-   * @deprecated since version 2.19.0, see {@link SearchParameters#toggleFacetRefinement}
-   */
-  toggleRefinement: function toggleRefinement(facet, value) {
-    return this.toggleFacetRefinement(facet, value);
-  },
   /**
    * Generic toggle refinement method to use with facet, disjunctive facets
    * and hierarchical facets
@@ -1190,11 +1178,11 @@ SearchParameters.prototype = {
       this.hierarchicalFacetsRefinements[facet] !== undefined &&
       this.hierarchicalFacetsRefinements[facet].length > 0 &&
       // remove current refinement:
-      // refinement was 'beer > IPA', call is toggleRefine('beer > IPA'), refinement should be `beer`
+      // refinement was 'beer > IPA', call is toggleFacetRefinement('beer > IPA'), refinement should be `beer`
       (this.hierarchicalFacetsRefinements[facet][0] === value ||
         // remove a parent refinement of the current refinement:
         //  - refinement was 'beer > IPA > Flying dog'
-        //  - call is toggleRefine('beer > IPA')
+        //  - call is toggleFacetRefinement('beer > IPA')
         //  - refinement should be `beer`
         this.hierarchicalFacetsRefinements[facet][0].indexOf(
           value + separator
diff --git a/packages/algoliasearch-helper/src/SearchResults/index.js b/packages/algoliasearch-helper/src/SearchResults/index.js
index 6689126a74..d1b1b5711b 100644
--- a/packages/algoliasearch-helper/src/SearchResults/index.js
+++ b/packages/algoliasearch-helper/src/SearchResults/index.js
@@ -662,24 +662,6 @@ function SearchResults(state, results, options) {
   this._state = state;
 }
 
-/**
- * Get a facet object with its name
- * @deprecated
- * @param {string} name name of the faceted attribute
- * @return {SearchResults.Facet} the facet object
- */
-SearchResults.prototype.getFacetByName = function (name) {
-  function predicate(facet) {
-    return facet.name === name;
-  }
-
-  return (
-    find(this.facets, predicate) ||
-    find(this.disjunctiveFacets, predicate) ||
-    find(this.hierarchicalFacets, predicate)
-  );
-};
-
 /**
  * Get the facet values of a specified attribute from a SearchResults object.
  * @private
diff --git a/packages/algoliasearch-helper/src/algoliasearch.helper.js b/packages/algoliasearch-helper/src/algoliasearch.helper.js
index 9861644060..e041474e5e 100644
--- a/packages/algoliasearch-helper/src/algoliasearch.helper.js
+++ b/packages/algoliasearch-helper/src/algoliasearch.helper.js
@@ -577,14 +577,6 @@ AlgoliaSearchHelper.prototype.addDisjunctiveFacetRefinement = function (
   return this;
 };
 
-// eslint-disable-next-line valid-jsdoc
-/**
- * @deprecated since version 2.4.0, see {@link AlgoliaSearchHelper#addDisjunctiveFacetRefinement}
- */
-AlgoliaSearchHelper.prototype.addDisjunctiveRefine = function () {
-  return this.addDisjunctiveFacetRefinement.apply(this, arguments);
-};
-
 /**
  * Adds a refinement on a hierarchical facet. It will throw
  * an exception if the facet is not defined or if the facet
@@ -657,14 +649,6 @@ AlgoliaSearchHelper.prototype.addFacetRefinement = function (facet, value) {
   return this;
 };
 
-// eslint-disable-next-line valid-jsdoc
-/**
- * @deprecated since version 2.4.0, see {@link AlgoliaSearchHelper#addFacetRefinement}
- */
-AlgoliaSearchHelper.prototype.addRefine = function () {
-  return this.addFacetRefinement.apply(this, arguments);
-};
-
 /**
  * Adds a an exclusion filter to a faceted attribute with the `value` provided. If the
  * filter is already set, it doesn't change the filters.
@@ -685,14 +669,6 @@ AlgoliaSearchHelper.prototype.addFacetExclusion = function (facet, value) {
   return this;
 };
 
-// eslint-disable-next-line valid-jsdoc
-/**
- * @deprecated since version 2.4.0, see {@link AlgoliaSearchHelper#addFacetExclusion}
- */
-AlgoliaSearchHelper.prototype.addExclude = function () {
-  return this.addFacetExclusion.apply(this, arguments);
-};
-
 /**
  * Adds a tag filter with the `tag` provided. If the
  * filter is already set, it doesn't change the filters.
@@ -853,14 +829,6 @@ AlgoliaSearchHelper.prototype.removeDisjunctiveFacetRefinement = function (
   return this;
 };
 
-// eslint-disable-next-line valid-jsdoc
-/**
- * @deprecated since version 2.4.0, see {@link AlgoliaSearchHelper#removeDisjunctiveFacetRefinement}
- */
-AlgoliaSearchHelper.prototype.removeDisjunctiveRefine = function () {
-  return this.removeDisjunctiveFacetRefinement.apply(this, arguments);
-};
-
 /**
  * Removes the refinement set on a hierarchical facet.
  * @param {string} facet the facet name
@@ -903,14 +871,6 @@ AlgoliaSearchHelper.prototype.removeFacetRefinement = function (facet, value) {
   return this;
 };
 
-// eslint-disable-next-line valid-jsdoc
-/**
- * @deprecated since version 2.4.0, see {@link AlgoliaSearchHelper#removeFacetRefinement}
- */
-AlgoliaSearchHelper.prototype.removeRefine = function () {
-  return this.removeFacetRefinement.apply(this, arguments);
-};
-
 /**
  * Removes an exclusion filter to a faceted attribute with the `value` provided. If the
  * filter is not set, it doesn't change the filters.
@@ -934,14 +894,6 @@ AlgoliaSearchHelper.prototype.removeFacetExclusion = function (facet, value) {
   return this;
 };
 
-// eslint-disable-next-line valid-jsdoc
-/**
- * @deprecated since version 2.4.0, see {@link AlgoliaSearchHelper#removeFacetExclusion}
- */
-AlgoliaSearchHelper.prototype.removeExclude = function () {
-  return this.removeFacetExclusion.apply(this, arguments);
-};
-
 /**
  * Removes a tag filter with the `tag` provided. If the
  * filter is not set, it doesn't change the filters.
@@ -1061,33 +1013,6 @@ AlgoliaSearchHelper.prototype.toggleFacetExclusion = function (facet, value) {
   return this;
 };
 
-// eslint-disable-next-line valid-jsdoc
-/**
- * @deprecated since version 2.4.0, see {@link AlgoliaSearchHelper#toggleFacetExclusion}
- */
-AlgoliaSearchHelper.prototype.toggleExclude = function () {
-  return this.toggleFacetExclusion.apply(this, arguments);
-};
-
-/**
- * Adds or removes a filter to a faceted attribute with the `value` provided. If
- * the value is set then it removes it, otherwise it adds the filter.
- *
- * This method can be used for conjunctive, disjunctive and hierarchical filters.
- *
- * This method resets the current page to 0.
- * @param  {string} facet the facet to refine
- * @param  {string} value the associated value
- * @return {AlgoliaSearchHelper} Method is chainable, it returns itself
- * @throws Error will throw an error if the facet is not declared in the settings of the helper
- * @fires change
- * @chainable
- * @deprecated since version 2.19.0, see {@link AlgoliaSearchHelper#toggleFacetRefinement}
- */
-AlgoliaSearchHelper.prototype.toggleRefinement = function (facet, value) {
-  return this.toggleFacetRefinement(facet, value);
-};
-
 /**
  * Adds or removes a filter to a faceted attribute with the `value` provided. If
  * the value is set then it removes it, otherwise it adds the filter.
@@ -1111,14 +1036,6 @@ AlgoliaSearchHelper.prototype.toggleFacetRefinement = function (facet, value) {
   return this;
 };
 
-// eslint-disable-next-line valid-jsdoc
-/**
- * @deprecated since version 2.4.0, see {@link AlgoliaSearchHelper#toggleFacetRefinement}
- */
-AlgoliaSearchHelper.prototype.toggleRefine = function () {
-  return this.toggleFacetRefinement.apply(this, arguments);
-};
-
 /**
  * Adds or removes a tag filter with the `value` provided. If
  * the value is set then it removes it, otherwise it adds the filter.
@@ -1167,13 +1084,14 @@ AlgoliaSearchHelper.prototype.previousPage = function () {
 };
 
 /**
- * @private
- * @param {number} page The page number
+ * Updates the current page.
+ * @function
+ * @param  {number} page The page number
  * @return {AlgoliaSearchHelper} Method is chainable, it returns itself
- * @chainable
  * @fires change
+ * @chainable
  */
-function setCurrentPage(page) {
+AlgoliaSearchHelper.prototype.setPage = function setPage(page) {
   if (page < 0) throw new Error('Page requested below 0.');
 
   this._change({
@@ -1182,27 +1100,7 @@ function setCurrentPage(page) {
   });
 
   return this;
-}
-
-/**
- * Change the current page
- * @deprecated
- * @param  {number} page The page number
- * @return {AlgoliaSearchHelper} Method is chainable, it returns itself
- * @fires change
- * @chainable
- */
-AlgoliaSearchHelper.prototype.setCurrentPage = setCurrentPage;
-
-/**
- * Updates the current page.
- * @function
- * @param  {number} page The page number
- * @return {AlgoliaSearchHelper} Method is chainable, it returns itself
- * @fires change
- * @chainable
- */
-AlgoliaSearchHelper.prototype.setPage = setCurrentPage;
+};
 
 /**
  * Updates the name of the index that will be targeted by the query.
@@ -1329,54 +1227,6 @@ AlgoliaSearchHelper.prototype.hasRefinements = function (attribute) {
   return false;
 };
 
-/**
- * Check if a value is excluded for a specific faceted attribute. If the value
- * is omitted then the function checks if there is any excluding refinements.
- *
- * @param  {string}  facet name of the attribute for used for faceting
- * @param  {string}  [value] optional value. If passed will test that this value
- * is filtering the given facet.
- * @return {boolean} true if refined
- * @example
- * helper.isExcludeRefined('color'); // false
- * helper.isExcludeRefined('color', 'blue') // false
- * helper.isExcludeRefined('color', 'red') // false
- *
- * helper.addFacetExclusion('color', 'red');
- *
- * helper.isExcludeRefined('color'); // true
- * helper.isExcludeRefined('color', 'blue') // false
- * helper.isExcludeRefined('color', 'red') // true
- */
-AlgoliaSearchHelper.prototype.isExcluded = function (facet, value) {
-  return this.state.isExcludeRefined(facet, value);
-};
-
-// eslint-disable-next-line valid-jsdoc
-/**
- * @deprecated since 2.4.0, see {@link AlgoliaSearchHelper#hasRefinements}
- */
-AlgoliaSearchHelper.prototype.isDisjunctiveRefined = function (facet, value) {
-  return this.state.isDisjunctiveFacetRefined(facet, value);
-};
-
-/**
- * Check if the string is a currently filtering tag.
- * @param {string} tag tag to check
- * @return {boolean} true if the tag is currently refined
- */
-AlgoliaSearchHelper.prototype.hasTag = function (tag) {
-  return this.state.isTagRefined(tag);
-};
-
-// eslint-disable-next-line valid-jsdoc
-/**
- * @deprecated since 2.4.0, see {@link AlgoliaSearchHelper#hasTag}
- */
-AlgoliaSearchHelper.prototype.isTagRefined = function () {
-  return this.hasTagRefinements.apply(this, arguments);
-};
-
 /**
  * Get the name of the currently used index.
  * @return {string} name of the index
@@ -1388,22 +1238,14 @@ AlgoliaSearchHelper.prototype.getIndex = function () {
   return this.state.index;
 };
 
-function getCurrentPage() {
-  return this.state.page;
-}
-
-/**
- * Get the currently selected page
- * @deprecated
- * @return {number} the current page
- */
-AlgoliaSearchHelper.prototype.getCurrentPage = getCurrentPage;
 /**
  * Get the currently selected page
  * @function
  * @return {number} the current page
  */
-AlgoliaSearchHelper.prototype.getPage = getCurrentPage;
+AlgoliaSearchHelper.prototype.getPage = function () {
+  return this.state.page;
+};
 
 /**
  * Get all the tags currently set to filters the results.
@@ -1951,20 +1793,6 @@ AlgoliaSearchHelper.prototype._dispatchRecommendError = function (
   if (this._currentNbRecommendQueries === 0) this.emit('recommendQueueEmpty');
 };
 
-AlgoliaSearchHelper.prototype.containsRefinement = function (
-  query,
-  facetFilters,
-  numericFilters,
-  tagFilters
-) {
-  return (
-    query ||
-    facetFilters.length !== 0 ||
-    numericFilters.length !== 0 ||
-    tagFilters.length !== 0
-  );
-};
-
 /**
  * Test if there are some disjunctive refinements on the facet
  * @private
diff --git a/packages/algoliasearch-helper/test/integration-spec/helper.filters.js b/packages/algoliasearch-helper/test/integration-spec/helper.filters.js
index a83dff7fc2..9d85f1cc4f 100644
--- a/packages/algoliasearch-helper/test/integration-spec/helper.filters.js
+++ b/packages/algoliasearch-helper/test/integration-spec/helper.filters.js
@@ -49,7 +49,7 @@ test('[INT][FILTERS] Should retrieve different values for multi facetted records
         f3: 1,
       });
 
-      helper.addRefine('facet', 'f2').search();
+      helper.addFacetRefinement('facet', 'f2').search();
     }
 
     if (calls === 2) {
@@ -59,14 +59,14 @@ test('[INT][FILTERS] Should retrieve different values for multi facetted records
         f2: 1,
       });
 
-      helper.toggleRefine('facet', 'f3').search();
+      helper.toggleFacetRefinement('facet', 'f3').search();
     }
 
     if (calls === 3) {
       expect(results.hits.length).toBe(0);
       expect(results.facets[0]).toBe(undefined);
 
-      helper.removeRefine('facet', 'f2').search();
+      helper.removeFacetRefinement('facet', 'f2').search();
     }
 
     if (calls === 4) {
@@ -86,5 +86,5 @@ test('[INT][FILTERS] Should retrieve different values for multi facetted records
     }
   });
 
-  helper.addRefine('facet', 'f1').search();
+  helper.addFacetRefinement('facet', 'f1').search();
 });
diff --git a/packages/algoliasearch-helper/test/spec/SearchResults/getFacet.js b/packages/algoliasearch-helper/test/spec/SearchResults/getFacet.js
deleted file mode 100644
index 7672523f70..0000000000
--- a/packages/algoliasearch-helper/test/spec/SearchResults/getFacet.js
+++ /dev/null
@@ -1,18 +0,0 @@
-'use strict';
-
-var SearchResults = require('../../../src/SearchResults');
-
-test('getFacetByName should return a given facet be it disjunctive or conjunctive', function () {
-  var data = require('../../datasets/SearchParameters/search.dataset')();
-
-  var result = new SearchResults(data.searchParams, data.response.results);
-
-  var cityFacet = result.getFacetByName('city');
-
-  expect(cityFacet.name).toBe('city');
-  expect(cityFacet.data).toEqual({
-    'New York': 1,
-    Paris: 3,
-    'San Francisco': 1,
-  });
-});
diff --git a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/clears.js b/packages/algoliasearch-helper/test/spec/algoliasearch.helper/clears.js
index 2a8cac6626..e2cf0d84fb 100644
--- a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/clears.js
+++ b/packages/algoliasearch-helper/test/spec/algoliasearch.helper/clears.js
@@ -19,12 +19,12 @@ function fixture() {
   });
 
   return helper
-    .toggleRefine('facet1', '0')
-    .toggleRefine('facet2', '0')
-    .toggleRefine('disjunctiveFacet1', '0')
-    .toggleRefine('disjunctiveFacet2', '0')
-    .toggleExclude('excluded1', '0')
-    .toggleExclude('excluded2', '0')
+    .toggleFacetRefinement('facet1', '0')
+    .toggleFacetRefinement('facet2', '0')
+    .toggleFacetRefinement('disjunctiveFacet1', '0')
+    .toggleFacetRefinement('disjunctiveFacet2', '0')
+    .toggleFacetExclusion('excluded1', '0')
+    .toggleFacetExclusion('excluded2', '0')
     .addHierarchicalFacetRefinement('hierarchy1', '0')
     .addHierarchicalFacetRefinement('hierarchy2', '0')
     .addNumericRefinement('numeric1', '>=', '0')
@@ -79,7 +79,7 @@ test('Clearing the same field from multiple elements should remove it everywhere
 
   helper
     .addNumericRefinement('facet1', '>=', '10')
-    .toggleExclude('facet1', 'value');
+    .toggleFacetExclusion('facet1', 'value');
 
   expect(helper.state.facetsRefinements.facet1).toEqual(['0']);
   expect(helper.state.numericRefinements.facet1).toEqual({ '>=': [10] });
diff --git a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/distinct.js b/packages/algoliasearch-helper/test/spec/algoliasearch.helper/distinct.js
index 5830c25869..f27466a934 100644
--- a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/distinct.js
+++ b/packages/algoliasearch-helper/test/spec/algoliasearch.helper/distinct.js
@@ -31,7 +31,7 @@ test('Distinct not set', function () {
   });
 
   helper.setState(state0);
-  helper.addDisjunctiveRefine('facet', 'value');
+  helper.addDisjunctiveFacetRefinement('facet', 'value');
   disjunctiveFacetSearchParam = requestBuilder._getDisjunctiveFacetSearchParams(
     helper.state
   );
@@ -43,7 +43,7 @@ test('Distinct not set', function () {
   });
 
   helper.setState(state0);
-  helper.addRefine('facetConj', 'value');
+  helper.addFacetRefinement('facetConj', 'value');
   disjunctiveFacetSearchParam = requestBuilder._getDisjunctiveFacetSearchParams(
     helper.state
   );
@@ -93,7 +93,7 @@ test('Distinct set to true', function () {
   expect(facetSearchParam.distinct).toBe(true);
 
   helper.setState(state0);
-  helper.addDisjunctiveRefine('facet', 'value');
+  helper.addDisjunctiveFacetRefinement('facet', 'value');
   disjunctiveFacetSearchParam = requestBuilder._getDisjunctiveFacetSearchParams(
     helper.state
   );
@@ -102,7 +102,7 @@ test('Distinct set to true', function () {
   expect(facetSearchParam.distinct).toBe(true);
 
   helper.setState(state0);
-  helper.addRefine('facetConj', 'value');
+  helper.addFacetRefinement('facetConj', 'value');
   disjunctiveFacetSearchParam = requestBuilder._getDisjunctiveFacetSearchParams(
     helper.state
   );
@@ -146,7 +146,7 @@ test('Distinct to false', function () {
   expect(facetSearchParam.distinct).toBe(false);
 
   helper.setState(state0);
-  helper.addDisjunctiveRefine('facet', 'value');
+  helper.addDisjunctiveFacetRefinement('facet', 'value');
   disjunctiveFacetSearchParam = requestBuilder._getDisjunctiveFacetSearchParams(
     helper.state
   );
@@ -155,7 +155,7 @@ test('Distinct to false', function () {
   expect(facetSearchParam.distinct).toBe(false);
 
   helper.setState(state0);
-  helper.addRefine('facetConj', 'value');
+  helper.addFacetRefinement('facetConj', 'value');
   disjunctiveFacetSearchParam = requestBuilder._getDisjunctiveFacetSearchParams(
     helper.state
   );
@@ -199,7 +199,7 @@ test('Distinct as a number', function () {
   expect(facetSearchParam.distinct).toBe(distinctValue);
 
   helper.setState(state0);
-  helper.addDisjunctiveRefine('facet', 'value');
+  helper.addDisjunctiveFacetRefinement('facet', 'value');
   disjunctiveFacetSearchParam = requestBuilder._getDisjunctiveFacetSearchParams(
     helper.state
   );
@@ -208,7 +208,7 @@ test('Distinct as a number', function () {
   expect(facetSearchParam.distinct).toBe(distinctValue);
 
   helper.setState(state0);
-  helper.addRefine('facetConj', 'value');
+  helper.addFacetRefinement('facetConj', 'value');
   disjunctiveFacetSearchParam = requestBuilder._getDisjunctiveFacetSearchParams(
     helper.state
   );
diff --git a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/events.js b/packages/algoliasearch-helper/test/spec/algoliasearch.helper/events.js
index 737410a1db..db8eada81a 100644
--- a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/events.js
+++ b/packages/algoliasearch-helper/test/spec/algoliasearch.helper/events.js
@@ -108,27 +108,27 @@ test('Change events should be emitted as soon as the state change, but search sh
   expect(changeEventCount).toBe(2);
   expect(fakeClient.search).toHaveBeenCalledTimes(0);
 
-  helper.addDisjunctiveRefine('city', 'Paris');
+  helper.addDisjunctiveFacetRefinement('city', 'Paris');
   expect(changeEventCount).toBe(3);
   expect(fakeClient.search).toHaveBeenCalledTimes(0);
 
-  helper.removeDisjunctiveRefine('city', 'Paris');
+  helper.removeDisjunctiveFacetRefinement('city', 'Paris');
   expect(changeEventCount).toBe(4);
   expect(fakeClient.search).toHaveBeenCalledTimes(0);
 
-  helper.addExclude('tower', 'Empire State Building');
+  helper.addFacetExclusion('tower', 'Empire State Building');
   expect(changeEventCount).toBe(5);
   expect(fakeClient.search).toHaveBeenCalledTimes(0);
 
-  helper.removeExclude('tower', 'Empire State Building');
+  helper.removeFacetExclusion('tower', 'Empire State Building');
   expect(changeEventCount).toBe(6);
   expect(fakeClient.search).toHaveBeenCalledTimes(0);
 
-  helper.addRefine('tower', 'Empire State Building');
+  helper.addFacetRefinement('tower', 'Empire State Building');
   expect(changeEventCount).toBe(7);
   expect(fakeClient.search).toHaveBeenCalledTimes(0);
 
-  helper.removeRefine('tower', 'Empire State Building');
+  helper.removeFacetRefinement('tower', 'Empire State Building');
   expect(changeEventCount).toBe(8);
   expect(fakeClient.search).toHaveBeenCalledTimes(0);
 
@@ -167,15 +167,15 @@ test('Change events should only be emitted for meaningful changes', function ()
   expect(changeEventCount).toBe(0);
   expect(fakeClient.search).toHaveBeenCalledTimes(0);
 
-  helper.addDisjunctiveRefine('city', 'Paris');
+  helper.addDisjunctiveFacetRefinement('city', 'Paris');
   expect(changeEventCount).toBe(0);
   expect(fakeClient.search).toHaveBeenCalledTimes(0);
 
-  helper.addExclude('tower', 'Empire State Building');
+  helper.addFacetExclusion('tower', 'Empire State Building');
   expect(changeEventCount).toBe(0);
   expect(fakeClient.search).toHaveBeenCalledTimes(0);
 
-  helper.addRefine('tower', 'Empire State Building');
+  helper.addFacetRefinement('tower', 'Empire State Building');
   expect(changeEventCount).toBe(0);
   expect(fakeClient.search).toHaveBeenCalledTimes(0);
 
@@ -192,15 +192,15 @@ test('Change events should only be emitted for meaningful changes', function ()
   expect(changeEventCount).toBe(1);
   expect(fakeClient.search).toHaveBeenCalledTimes(0);
 
-  helper.removeDisjunctiveRefine('city', 'Paris');
+  helper.removeDisjunctiveFacetRefinement('city', 'Paris');
   expect(changeEventCount).toBe(1);
   expect(fakeClient.search).toHaveBeenCalledTimes(0);
 
-  helper.removeExclude('tower', 'Empire State Building');
+  helper.removeFacetExclusion('tower', 'Empire State Building');
   expect(changeEventCount).toBe(1);
   expect(fakeClient.search).toHaveBeenCalledTimes(0);
 
-  helper.removeRefine('tower', 'Empire State Building');
+  helper.removeFacetRefinement('tower', 'Empire State Building');
   expect(changeEventCount).toBe(1);
   expect(fakeClient.search).toHaveBeenCalledTimes(0);
 
@@ -227,27 +227,27 @@ test('search event should be emitted once when the search is triggered and befor
   expect(searched).toHaveBeenCalledTimes(0);
   expect(fakeClient.search).toHaveBeenCalledTimes(0);
 
-  helper.addDisjunctiveRefine('city', 'Paris');
+  helper.addDisjunctiveFacetRefinement('city', 'Paris');
   expect(searched).toHaveBeenCalledTimes(0);
   expect(fakeClient.search).toHaveBeenCalledTimes(0);
 
-  helper.removeDisjunctiveRefine('city', 'Paris');
+  helper.removeDisjunctiveFacetRefinement('city', 'Paris');
   expect(searched).toHaveBeenCalledTimes(0);
   expect(fakeClient.search).toHaveBeenCalledTimes(0);
 
-  helper.addExclude('tower', 'Empire State Building');
+  helper.addFacetExclusion('tower', 'Empire State Building');
   expect(searched).toHaveBeenCalledTimes(0);
   expect(fakeClient.search).toHaveBeenCalledTimes(0);
 
-  helper.removeExclude('tower', 'Empire State Building');
+  helper.removeFacetExclusion('tower', 'Empire State Building');
   expect(searched).toHaveBeenCalledTimes(0);
   expect(fakeClient.search).toHaveBeenCalledTimes(0);
 
-  helper.addRefine('tower', 'Empire State Building');
+  helper.addFacetRefinement('tower', 'Empire State Building');
   expect(searched).toHaveBeenCalledTimes(0);
   expect(fakeClient.search).toHaveBeenCalledTimes(0);
 
-  helper.removeRefine('tower', 'Empire State Building');
+  helper.removeFacetRefinement('tower', 'Empire State Building');
   expect(searched).toHaveBeenCalledTimes(0);
   expect(fakeClient.search).toHaveBeenCalledTimes(0);
 
diff --git a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/excludes.js b/packages/algoliasearch-helper/test/spec/algoliasearch.helper/excludes.js
index f80c1f8f7e..1eef17aece 100644
--- a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/excludes.js
+++ b/packages/algoliasearch-helper/test/spec/algoliasearch.helper/excludes.js
@@ -4,7 +4,7 @@ var algoliasearchHelper = require('../../../index');
 
 var fakeClient = {};
 
-test('addExclude should add an exclusion', function () {
+test('addFacetExclusion should add an exclusion', function () {
   var helper = algoliasearchHelper(fakeClient, null, {
     facets: ['facet'],
   });
@@ -15,14 +15,14 @@ test('addExclude should add an exclusion', function () {
   var facetValueToExclude = 'brand';
 
   expect(helper.state.facetsExcludes[facetName]).toBeFalsy();
-  helper.addExclude(facetName, facetValueToExclude);
+  helper.addFacetExclusion(facetName, facetValueToExclude);
   expect(helper.state.facetsExcludes[facetName]).toBeTruthy();
   expect(
     helper.state.facetsExcludes[facetName][0] === facetValueToExclude
   ).toBeTruthy();
 });
 
-test('removeExclude should remove an exclusion', function (done) {
+test('removeFacetExclusion should remove an exclusion', function (done) {
   var helper = algoliasearchHelper(fakeClient, null, {
     facets: ['facet'],
   });
@@ -32,13 +32,13 @@ test('removeExclude should remove an exclusion', function (done) {
   var facetName = 'facet';
   var facetValueToExclude = 'brand';
 
-  helper.addExclude(facetName, facetValueToExclude);
+  helper.addFacetExclusion(facetName, facetValueToExclude);
   expect(helper.state.facetsExcludes[facetName].length === 1).toBeTruthy();
-  helper.removeExclude(facetName, facetValueToExclude);
+  helper.removeFacetExclusion(facetName, facetValueToExclude);
   expect(helper.state.facetsExcludes[facetName]).toEqual([]);
 
   try {
-    helper.removeExclude(facetName, facetValueToExclude);
+    helper.removeFacetExclusion(facetName, facetValueToExclude);
   } catch (e) {
     done.fail('Removing unset exclusions should be ok...');
   }
@@ -55,13 +55,21 @@ test('isExcluded should allow to omit the value', function () {
     facets: [facetName],
   });
 
-  expect(helper.isExcluded(facetName, facetValueToExclude)).toBeFalsy();
-  expect(helper.isExcluded(facetName, facetValueNotExcluded)).toBeFalsy();
-  expect(helper.isExcluded(facetName)).toBeFalsy();
-  helper.addExclude(facetName, facetValueToExclude);
-  expect(helper.isExcluded(facetName, facetValueToExclude)).toBeTruthy();
-  expect(helper.isExcluded(facetName, facetValueNotExcluded)).toBeFalsy();
-  expect(helper.isExcluded(facetName)).toBeTruthy();
+  expect(
+    helper.state.isExcludeRefined(facetName, facetValueToExclude)
+  ).toBeFalsy();
+  expect(
+    helper.state.isExcludeRefined(facetName, facetValueNotExcluded)
+  ).toBeFalsy();
+  expect(helper.state.isExcludeRefined(facetName)).toBeFalsy();
+  helper.addFacetExclusion(facetName, facetValueToExclude);
+  expect(
+    helper.state.isExcludeRefined(facetName, facetValueToExclude)
+  ).toBeTruthy();
+  expect(
+    helper.state.isExcludeRefined(facetName, facetValueNotExcluded)
+  ).toBeFalsy();
+  expect(helper.state.isExcludeRefined(facetName)).toBeTruthy();
 });
 
 test('isExcluded should report exclusion correctly', function () {
@@ -74,9 +82,15 @@ test('isExcluded should report exclusion correctly', function () {
   var facetName = 'facet';
   var facetValueToExclude = 'brand';
 
-  expect(helper.isExcluded(facetName, facetValueToExclude)).toBeFalsy();
-  helper.addExclude(facetName, facetValueToExclude);
-  expect(helper.isExcluded(facetName, facetValueToExclude)).toBeTruthy();
-  helper.removeExclude(facetName, facetValueToExclude);
-  expect(helper.isExcluded(facetName, facetValueToExclude)).toBeFalsy();
+  expect(
+    helper.state.isExcludeRefined(facetName, facetValueToExclude)
+  ).toBeFalsy();
+  helper.addFacetExclusion(facetName, facetValueToExclude);
+  expect(
+    helper.state.isExcludeRefined(facetName, facetValueToExclude)
+  ).toBeTruthy();
+  helper.removeFacetExclusion(facetName, facetValueToExclude);
+  expect(
+    helper.state.isExcludeRefined(facetName, facetValueToExclude)
+  ).toBeFalsy();
 });
diff --git a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/facetFilters.js b/packages/algoliasearch-helper/test/spec/algoliasearch.helper/facetFilters.js
index 2382aeeae4..a934a5542a 100644
--- a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/facetFilters.js
+++ b/packages/algoliasearch-helper/test/spec/algoliasearch.helper/facetFilters.js
@@ -11,27 +11,27 @@ test('The filters should contain the different filters for a single conjunctive
     facets: [facetName],
   });
 
-  helper.addRefine(facetName, 'value1');
+  helper.addFacetRefinement(facetName, 'value1');
   expect(requestBuilder._getFacetFilters(helper.state)).toEqual([
     facetName + ':value1',
   ]);
-  helper.addRefine(facetName, 'value2');
+  helper.addFacetRefinement(facetName, 'value2');
   expect(requestBuilder._getFacetFilters(helper.state)).toEqual([
     facetName + ':value1',
     facetName + ':value2',
   ]);
-  helper.toggleRefine(facetName, 'value3');
+  helper.toggleFacetRefinement(facetName, 'value3');
   expect(requestBuilder._getFacetFilters(helper.state)).toEqual([
     facetName + ':value1',
     facetName + ':value2',
     facetName + ':value3',
   ]);
-  helper.removeRefine(facetName, 'value3');
+  helper.removeFacetRefinement(facetName, 'value3');
   expect(requestBuilder._getFacetFilters(helper.state)).toEqual([
     facetName + ':value1',
     facetName + ':value2',
   ]);
-  helper.addRefine(facetName, 'value1');
+  helper.addFacetRefinement(facetName, 'value1');
   expect(requestBuilder._getFacetFilters(helper.state)).toEqual([
     facetName + ':value1',
     facetName + ':value2',
diff --git a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/incorrectFacetDefinition.js b/packages/algoliasearch-helper/test/spec/algoliasearch.helper/incorrectFacetDefinition.js
index a325087d37..ff82bca928 100644
--- a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/incorrectFacetDefinition.js
+++ b/packages/algoliasearch-helper/test/spec/algoliasearch.helper/incorrectFacetDefinition.js
@@ -7,22 +7,24 @@ var fakeClient = {};
 test('Conjunctive facet should be declared to be refined', function () {
   var h = algoliasearchHelper(fakeClient, '', {});
 
-  expect(h.addRefine.bind(h, 'undeclaredFacet', 'value')).toThrow();
-  expect(h.removeRefine.bind(h, 'undeclaredFacet', 'value')).toThrow();
+  expect(h.addFacetRefinement.bind(h, 'undeclaredFacet', 'value')).toThrow();
+  expect(h.removeFacetRefinement.bind(h, 'undeclaredFacet', 'value')).toThrow();
 });
 
 test('Conjunctive facet should be declared to be excluded', function () {
   var h = algoliasearchHelper(fakeClient, '', {});
 
-  expect(h.addExclude.bind(h, 'undeclaredFacet', 'value')).toThrow();
-  expect(h.removeExclude.bind(h, 'undeclaredFacet', 'value')).toThrow();
+  expect(h.addFacetExclusion.bind(h, 'undeclaredFacet', 'value')).toThrow();
+  expect(h.removeFacetExclusion.bind(h, 'undeclaredFacet', 'value')).toThrow();
 });
 
 test('Conjuctive facet should be declared to be refine', function () {
   var h = algoliasearchHelper(fakeClient, '', {});
 
-  expect(h.addDisjunctiveRefine.bind(h, 'undeclaredFacet', 'value')).toThrow();
   expect(
-    h.removeDisjunctiveRefine.bind(h, 'undeclaredFacet', 'value')
+    h.addDisjunctiveFacetRefinement.bind(h, 'undeclaredFacet', 'value')
+  ).toThrow();
+  expect(
+    h.removeDisjunctiveFacetRefinement.bind(h, 'undeclaredFacet', 'value')
   ).toThrow();
 });
diff --git a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/pages.js b/packages/algoliasearch-helper/test/spec/algoliasearch.helper/pages.js
index 6a14952bd1..d79b83f685 100644
--- a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/pages.js
+++ b/packages/algoliasearch-helper/test/spec/algoliasearch.helper/pages.js
@@ -60,17 +60,17 @@ test('pages should be reset if the mutation might change the number of pages', f
     ['addNumericRefinement', 'facet', '>', '2'],
     ['removeNumericRefinement', 'facet', '>'],
 
-    ['addExclude', 'facet1', 'val2'],
-    ['removeExclude', 'facet1', 'val2'],
+    ['addFacetExclusion', 'facet1', 'val2'],
+    ['removeFacetExclusion', 'facet1', 'val2'],
 
-    ['addRefine', 'f2', 'val'],
-    ['removeRefine', 'f2', 'val'],
+    ['addFacetRefinement', 'f2', 'val'],
+    ['removeFacetRefinement', 'f2', 'val'],
 
-    ['addDisjunctiveRefine', 'f1', 'val'],
-    ['removeDisjunctiveRefine', 'f1', 'val'],
+    ['addDisjunctiveFacetRefinement', 'f1', 'val'],
+    ['removeDisjunctiveFacetRefinement', 'f1', 'val'],
 
-    ['toggleRefine', 'f1', 'v1'],
-    ['toggleExclude', 'facet1', '55'],
+    ['toggleFacetRefinement', 'f1', 'v1'],
+    ['toggleFacetExclusion', 'facet1', '55'],
   ].forEach(function ([fn, ...args]) {
     helper.setPage(10);
 
diff --git a/packages/algoliasearch-helper/test/spec/hierarchical-facets/attributes-order.js b/packages/algoliasearch-helper/test/spec/hierarchical-facets/attributes-order.js
index 37f0c85a4d..024594088c 100644
--- a/packages/algoliasearch-helper/test/spec/hierarchical-facets/attributes-order.js
+++ b/packages/algoliasearch-helper/test/spec/hierarchical-facets/attributes-order.js
@@ -8,9 +8,9 @@ test('hierarchical facets: attributes order', function (done) {
 
   var algoliasearchHelper = require('../../../');
 
-  var appId = 'hierarchical-toggleRefine-appId';
-  var apiKey = 'hierarchical-toggleRefine-apiKey';
-  var indexName = 'hierarchical-toggleRefine-indexName';
+  var appId = 'hierarchical-toggleFacetRefinement-appId';
+  var apiKey = 'hierarchical-toggleFacetRefinement-apiKey';
+  var indexName = 'hierarchical-toggleFacetRefinement-indexName';
 
   var client = algoliasearch(appId, apiKey);
   var helper = algoliasearchHelper(client, indexName, {
@@ -123,9 +123,9 @@ test('hierarchical facets: attributes order', function (done) {
 
   helper.once('result', function (event) {
     expect(event.results.hierarchicalFacets).toEqual(expectedHelperResponse);
-    expect(event.results.getFacetByName('categories')).toEqual(
-      expectedHelperResponse[0]
-    );
+    expect(
+      event.results.hierarchicalFacets.find((f) => f.name === 'categories')
+    ).toEqual(expectedHelperResponse[0]);
 
     done();
   });
diff --git a/packages/algoliasearch-helper/test/spec/hierarchical-facets/breadcrumb.js b/packages/algoliasearch-helper/test/spec/hierarchical-facets/breadcrumb.js
index 3c27339845..fb64764a19 100644
--- a/packages/algoliasearch-helper/test/spec/hierarchical-facets/breadcrumb.js
+++ b/packages/algoliasearch-helper/test/spec/hierarchical-facets/breadcrumb.js
@@ -25,7 +25,7 @@ test('hierarchical facets: using getHierarchicalFacetBreadcrumb()', function ()
     ],
   });
 
-  helper.toggleRefine('categories', 'beers > IPA > Flying dog');
+  helper.toggleFacetRefinement('categories', 'beers > IPA > Flying dog');
 
   expect(helper.getHierarchicalFacetBreadcrumb('categories')).toEqual([
     'beers',
diff --git a/packages/algoliasearch-helper/test/spec/hierarchical-facets/custom-prefix-path.js b/packages/algoliasearch-helper/test/spec/hierarchical-facets/custom-prefix-path.js
index 5da483e52a..8ce6d91eb6 100644
--- a/packages/algoliasearch-helper/test/spec/hierarchical-facets/custom-prefix-path.js
+++ b/packages/algoliasearch-helper/test/spec/hierarchical-facets/custom-prefix-path.js
@@ -22,7 +22,7 @@ test('hierarchical facets: custom prefix path', function (done) {
     ],
   });
 
-  helper.toggleRefine('categories', 'beers | Belgian');
+  helper.toggleFacetRefinement('categories', 'beers | Belgian');
 
   var algoliaResponse = {
     results: [
diff --git a/packages/algoliasearch-helper/test/spec/hierarchical-facets/custom-separator.js b/packages/algoliasearch-helper/test/spec/hierarchical-facets/custom-separator.js
index d1328e0a6c..7bfd262492 100644
--- a/packages/algoliasearch-helper/test/spec/hierarchical-facets/custom-separator.js
+++ b/packages/algoliasearch-helper/test/spec/hierarchical-facets/custom-separator.js
@@ -21,7 +21,7 @@ test('hierarchical facets: custom separator', function (done) {
     ],
   });
 
-  helper.toggleRefine('categories', 'beers | IPA');
+  helper.toggleFacetRefinement('categories', 'beers | IPA');
 
   var algoliaResponse = {
     results: [
diff --git a/packages/algoliasearch-helper/test/spec/hierarchical-facets/do-not-show-parent-level.js b/packages/algoliasearch-helper/test/spec/hierarchical-facets/do-not-show-parent-level.js
index dcde21476e..54532a62cd 100644
--- a/packages/algoliasearch-helper/test/spec/hierarchical-facets/do-not-show-parent-level.js
+++ b/packages/algoliasearch-helper/test/spec/hierarchical-facets/do-not-show-parent-level.js
@@ -22,7 +22,7 @@ test('hierarchical facets: do not show parent level', function (done) {
     ],
   });
 
-  helper.toggleRefine('categories', 'beers | IPA');
+  helper.toggleFacetRefinement('categories', 'beers | IPA');
 
   var algoliaResponse = {
     results: [
diff --git a/packages/algoliasearch-helper/test/spec/hierarchical-facets/getFacetValues.js b/packages/algoliasearch-helper/test/spec/hierarchical-facets/getFacetValues.js
index cb23122036..0c8c99339b 100644
--- a/packages/algoliasearch-helper/test/spec/hierarchical-facets/getFacetValues.js
+++ b/packages/algoliasearch-helper/test/spec/hierarchical-facets/getFacetValues.js
@@ -17,7 +17,7 @@ test('hierarchical facets: getFacetValues', function () {
     ],
   });
 
-  helper.toggleRefine('categories', 'beers | IPA').setQuery('a');
+  helper.toggleFacetRefinement('categories', 'beers | IPA').setQuery('a');
 
   var algoliaResponse = {
     results: [
diff --git a/packages/algoliasearch-helper/test/spec/hierarchical-facets/no-trim.js b/packages/algoliasearch-helper/test/spec/hierarchical-facets/no-trim.js
index deeda58932..9e6418cb68 100644
--- a/packages/algoliasearch-helper/test/spec/hierarchical-facets/no-trim.js
+++ b/packages/algoliasearch-helper/test/spec/hierarchical-facets/no-trim.js
@@ -21,9 +21,9 @@ test('hierarchical facets: do not trim facetFilters values', function (done) {
     ],
   });
 
-  helper.toggleRefine('categories', '  beers > IPA   ');
-  helper.toggleRefine('categories', '  beers > IPA   ');
-  helper.toggleRefine('categories', '  beers > IPA   ');
+  helper.toggleFacetRefinement('categories', '  beers > IPA   ');
+  helper.toggleFacetRefinement('categories', '  beers > IPA   ');
+  helper.toggleFacetRefinement('categories', '  beers > IPA   ');
 
   var algoliaResponse = {
     results: [
diff --git a/packages/algoliasearch-helper/test/spec/hierarchical-facets/objects-with-multiple-categories.js b/packages/algoliasearch-helper/test/spec/hierarchical-facets/objects-with-multiple-categories.js
index e65f107756..4e6a5f5cc1 100644
--- a/packages/algoliasearch-helper/test/spec/hierarchical-facets/objects-with-multiple-categories.js
+++ b/packages/algoliasearch-helper/test/spec/hierarchical-facets/objects-with-multiple-categories.js
@@ -20,7 +20,7 @@ test('hierarchical facets: objects with multiple categories', function (done) {
     ],
   });
 
-  helper.toggleRefine('categories', 'beers > IPA');
+  helper.toggleFacetRefinement('categories', 'beers > IPA');
 
   var algoliaResponse = {
     results: [
diff --git a/packages/algoliasearch-helper/test/spec/hierarchical-facets/one-level.js b/packages/algoliasearch-helper/test/spec/hierarchical-facets/one-level.js
index 38557be453..3e8a30d9d5 100644
--- a/packages/algoliasearch-helper/test/spec/hierarchical-facets/one-level.js
+++ b/packages/algoliasearch-helper/test/spec/hierarchical-facets/one-level.js
@@ -20,7 +20,7 @@ test('hierarchical facets: only one level deep', function (done) {
     ],
   });
 
-  helper.toggleRefine('categories', 'beers');
+  helper.toggleFacetRefinement('categories', 'beers');
 
   var algoliaResponse = {
     results: [
diff --git a/packages/algoliasearch-helper/test/spec/hierarchical-facets/pagination.js b/packages/algoliasearch-helper/test/spec/hierarchical-facets/pagination.js
index 724cecfbd2..a614e5af32 100644
--- a/packages/algoliasearch-helper/test/spec/hierarchical-facets/pagination.js
+++ b/packages/algoliasearch-helper/test/spec/hierarchical-facets/pagination.js
@@ -6,9 +6,9 @@ test('hierarchical facets: pagination', function (done) {
 
   var algoliasearchHelper = require('../../../');
 
-  var appId = 'hierarchical-toggleRefine-appId';
-  var apiKey = 'hierarchical-toggleRefine-apiKey';
-  var indexName = 'hierarchical-toggleRefine-indexName';
+  var appId = 'hierarchical-toggleFacetRefinement-appId';
+  var apiKey = 'hierarchical-toggleFacetRefinement-apiKey';
+  var indexName = 'hierarchical-toggleFacetRefinement-indexName';
 
   var client = algoliasearch(appId, apiKey);
   var helper = algoliasearchHelper(client, indexName, {
@@ -25,7 +25,7 @@ test('hierarchical facets: pagination', function (done) {
     ],
   });
 
-  helper.toggleRefine('categories', 'beers > IPA > Flying dog');
+  helper.toggleFacetRefinement('categories', 'beers > IPA > Flying dog');
 
   var algoliaResponse = {
     results: [
@@ -85,8 +85,8 @@ test('hierarchical facets: pagination', function (done) {
   });
 
   helper.setQuery('');
-  helper.setCurrentPage(1);
-  helper.toggleRefine('categories', 'beers > IPA > Flying dog');
+  helper.setPage(1);
+  helper.toggleFacetRefinement('categories', 'beers > IPA > Flying dog');
   helper.search();
 
   helper.once('result', function () {
diff --git a/packages/algoliasearch-helper/test/spec/hierarchical-facets/parent-toggleRefine.js b/packages/algoliasearch-helper/test/spec/hierarchical-facets/parent-toggleRefine.js
index ccdfc1c890..4fa035a481 100644
--- a/packages/algoliasearch-helper/test/spec/hierarchical-facets/parent-toggleRefine.js
+++ b/packages/algoliasearch-helper/test/spec/hierarchical-facets/parent-toggleRefine.js
@@ -1,14 +1,14 @@
 'use strict';
 
-test('hierarchical facets: toggleRefine behavior', function () {
+test('hierarchical facets: toggleFacetRefinement behavior', function () {
   var algoliasearch = require('algoliasearch');
   algoliasearch = algoliasearch.algoliasearch || algoliasearch;
 
   var algoliasearchHelper = require('../../../');
 
-  var appId = 'hierarchical-toggleRefine-appId';
-  var apiKey = 'hierarchical-toggleRefine-apiKey';
-  var indexName = 'hierarchical-toggleRefine-indexName';
+  var appId = 'hierarchical-toggleFacetRefinement-appId';
+  var apiKey = 'hierarchical-toggleFacetRefinement-apiKey';
+  var indexName = 'hierarchical-toggleFacetRefinement-indexName';
 
   var client = algoliasearch(appId, apiKey);
   var helper = algoliasearchHelper(client, indexName, {
@@ -30,13 +30,13 @@ test('hierarchical facets: toggleRefine behavior', function () {
   });
 
   // select `Flying dog`
-  helper.toggleRefine('categories', 'beers > IPA > Flying dog');
+  helper.toggleFacetRefinement('categories', 'beers > IPA > Flying dog');
 
   // unselect `beers`
-  helper.toggleRefine('categories', 'beers');
+  helper.toggleFacetRefinement('categories', 'beers');
 
   // select `beers`
-  helper.toggleRefine('categories', 'beers');
+  helper.toggleFacetRefinement('categories', 'beers');
   // we should be on `beers`
 
   helper.setQuery('a').search();
@@ -51,15 +51,15 @@ test('hierarchical facets: toggleRefine behavior', function () {
   expect(hitsQuery.params.facetFilters).toEqual([['categories.lvl0:beers']]);
 });
 
-test('hierarchical facets: toggleRefine behavior when root level', function () {
+test('hierarchical facets: toggleFacetRefinement behavior when root level', function () {
   var algoliasearch = require('algoliasearch');
   algoliasearch = algoliasearch.algoliasearch || algoliasearch;
 
   var algoliasearchHelper = require('../../../');
 
-  var appId = 'hierarchical-toggleRefine-appId';
-  var apiKey = 'hierarchical-toggleRefine-apiKey';
-  var indexName = 'hierarchical-toggleRefine-indexName';
+  var appId = 'hierarchical-toggleFacetRefinement-appId';
+  var apiKey = 'hierarchical-toggleFacetRefinement-apiKey';
+  var indexName = 'hierarchical-toggleFacetRefinement-indexName';
 
   var client = algoliasearch(appId, apiKey);
   var helper = algoliasearchHelper(client, indexName, {
@@ -80,8 +80,8 @@ test('hierarchical facets: toggleRefine behavior when root level', function () {
     return new Promise(function () {});
   });
 
-  helper.toggleRefine('categories', 'beers > IPA > Flying dog');
-  helper.toggleRefine('categories', 'beers');
+  helper.toggleFacetRefinement('categories', 'beers > IPA > Flying dog');
+  helper.toggleFacetRefinement('categories', 'beers');
   // we should be on ``
 
   helper.setQuery('a').search();
@@ -93,15 +93,15 @@ test('hierarchical facets: toggleRefine behavior when root level', function () {
   expect(hitsQuery.params.facetFilters).toBe(undefined);
 });
 
-test('hierarchical facets: toggleRefine behavior when different root level', function () {
+test('hierarchical facets: toggleFacetRefinement behavior when different root level', function () {
   var algoliasearch = require('algoliasearch');
   algoliasearch = algoliasearch.algoliasearch || algoliasearch;
 
   var algoliasearchHelper = require('../../../');
 
-  var appId = 'hierarchical-toggleRefine-appId';
-  var apiKey = 'hierarchical-toggleRefine-apiKey';
-  var indexName = 'hierarchical-toggleRefine-indexName';
+  var appId = 'hierarchical-toggleFacetRefinement-appId';
+  var apiKey = 'hierarchical-toggleFacetRefinement-apiKey';
+  var indexName = 'hierarchical-toggleFacetRefinement-indexName';
 
   var client = algoliasearch(appId, apiKey);
   var helper = algoliasearchHelper(client, indexName, {
@@ -122,8 +122,8 @@ test('hierarchical facets: toggleRefine behavior when different root level', fun
     return new Promise(function () {});
   });
 
-  helper.toggleRefine('categories', 'beers > IPA > Flying dog');
-  helper.toggleRefine('categories', 'fruits');
+  helper.toggleFacetRefinement('categories', 'beers > IPA > Flying dog');
+  helper.toggleFacetRefinement('categories', 'fruits');
   // we should be on `fruits`
 
   helper.setQuery('a').search();
diff --git a/packages/algoliasearch-helper/test/spec/hierarchical-facets/refined-no-result.js b/packages/algoliasearch-helper/test/spec/hierarchical-facets/refined-no-result.js
index 9147ee1d47..1e037bed67 100644
--- a/packages/algoliasearch-helper/test/spec/hierarchical-facets/refined-no-result.js
+++ b/packages/algoliasearch-helper/test/spec/hierarchical-facets/refined-no-result.js
@@ -6,9 +6,9 @@ test('hierarchical facets: no results', function (done) {
 
   var algoliasearchHelper = require('../../../');
 
-  var appId = 'hierarchical-toggleRefine-appId';
-  var apiKey = 'hierarchical-toggleRefine-apiKey';
-  var indexName = 'hierarchical-toggleRefine-indexName';
+  var appId = 'hierarchical-toggleFacetRefinement-appId';
+  var apiKey = 'hierarchical-toggleFacetRefinement-apiKey';
+  var indexName = 'hierarchical-toggleFacetRefinement-indexName';
 
   var client = algoliasearch(appId, apiKey);
   var helper = algoliasearchHelper(client, indexName, {
@@ -25,7 +25,7 @@ test('hierarchical facets: no results', function (done) {
     ],
   });
 
-  helper.toggleRefine('categories', 'beers > IPA > Flying dog');
+  helper.toggleFacetRefinement('categories', 'beers > IPA > Flying dog');
 
   var algoliaResponse = {
     results: [
diff --git a/packages/algoliasearch-helper/test/spec/hierarchical-facets/show-parent-level.js b/packages/algoliasearch-helper/test/spec/hierarchical-facets/show-parent-level.js
index 6723174451..010dd5ae33 100644
--- a/packages/algoliasearch-helper/test/spec/hierarchical-facets/show-parent-level.js
+++ b/packages/algoliasearch-helper/test/spec/hierarchical-facets/show-parent-level.js
@@ -22,7 +22,7 @@ test('hierarchical facets: show parent level', function (done) {
     ],
   });
 
-  helper.toggleRefine('categories', 'beers | IPA');
+  helper.toggleFacetRefinement('categories', 'beers | IPA');
 
   var algoliaResponse = {
     results: [
diff --git a/packages/algoliasearch-helper/test/spec/hierarchical-facets/simple-usage.js b/packages/algoliasearch-helper/test/spec/hierarchical-facets/simple-usage.js
index 5261f74791..54230e4437 100644
--- a/packages/algoliasearch-helper/test/spec/hierarchical-facets/simple-usage.js
+++ b/packages/algoliasearch-helper/test/spec/hierarchical-facets/simple-usage.js
@@ -4,9 +4,9 @@ describe('hierarchical facets: simple usage', function () {
   var algoliasearch = require('algoliasearch');
   algoliasearch = algoliasearch.algoliasearch || algoliasearch;
   var algoliasearchHelper = require('../../../');
-  var appId = 'hierarchical-toggleRefine-appId';
-  var apiKey = 'hierarchical-toggleRefine-apiKey';
-  var indexName = 'hierarchical-toggleRefine-indexName';
+  var appId = 'hierarchical-toggleFacetRefinement-appId';
+  var apiKey = 'hierarchical-toggleFacetRefinement-apiKey';
+  var indexName = 'hierarchical-toggleFacetRefinement-indexName';
 
   var algoliaResponse = {
     results: [
@@ -101,7 +101,7 @@ describe('hierarchical facets: simple usage', function () {
       ],
     });
 
-    helper.toggleRefine('categories', 'beers > IPA > Flying dog');
+    helper.toggleFacetRefinement('categories', 'beers > IPA > Flying dog');
 
     var expectedHelperResponse = [
       {
@@ -234,9 +234,9 @@ describe('hierarchical facets: simple usage', function () {
       ]);
 
       expect(event.results.hierarchicalFacets).toEqual(expectedHelperResponse);
-      expect(event.results.getFacetByName('categories')).toEqual(
-        expectedHelperResponse[0]
-      );
+      expect(
+        event.results.hierarchicalFacets.find((f) => f.name === 'categories')
+      ).toEqual(expectedHelperResponse[0]);
 
       // we do not yet support multiple values for hierarchicalFacetsRefinements
       // but at some point we may want to open multiple leafs of a hierarchical menu
@@ -270,7 +270,7 @@ describe('hierarchical facets: simple usage', function () {
       }
     );
 
-    helper.toggleRefine('categories', 'beers > IPA > Flying dog');
+    helper.toggleFacetRefinement('categories', 'beers > IPA > Flying dog');
 
     var expectedHelperResponse = [
       {
@@ -403,9 +403,9 @@ describe('hierarchical facets: simple usage', function () {
       ]);
 
       expect(event.results.hierarchicalFacets).toEqual(expectedHelperResponse);
-      expect(event.results.getFacetByName('categories')).toEqual(
-        expectedHelperResponse[0]
-      );
+      expect(
+        event.results.hierarchicalFacets.find((f) => f.name === 'categories')
+      ).toEqual(expectedHelperResponse[0]);
 
       // we do not yet support multiple values for hierarchicalFacetsRefinements
       // but at some point we may want to open multiple leafs of a hierarchical menu
diff --git a/packages/algoliasearch-helper/test/spec/hierarchical-facets/sort-by.js b/packages/algoliasearch-helper/test/spec/hierarchical-facets/sort-by.js
index b04462f26a..079d149f4e 100644
--- a/packages/algoliasearch-helper/test/spec/hierarchical-facets/sort-by.js
+++ b/packages/algoliasearch-helper/test/spec/hierarchical-facets/sort-by.js
@@ -26,7 +26,7 @@ test('hierarchical facets: using sortBy', function (done) {
     ],
   });
 
-  helper.toggleRefine('categories', 'beers > IPA > Flying dog');
+  helper.toggleFacetRefinement('categories', 'beers > IPA > Flying dog');
 
   var algoliaResponse = {
     results: [
diff --git a/packages/algoliasearch-helper/test/spec/hierarchical-facets/two-facets.js b/packages/algoliasearch-helper/test/spec/hierarchical-facets/two-facets.js
index b1a9bdf681..41009ea28b 100644
--- a/packages/algoliasearch-helper/test/spec/hierarchical-facets/two-facets.js
+++ b/packages/algoliasearch-helper/test/spec/hierarchical-facets/two-facets.js
@@ -24,8 +24,8 @@ test('hierarchical facets: two hierarchical facets', function (done) {
     ],
   });
 
-  helper.toggleRefine('beers', 'IPA');
-  helper.toggleRefine('fruits', 'oranges');
+  helper.toggleFacetRefinement('beers', 'IPA');
+  helper.toggleFacetRefinement('fruits', 'oranges');
 
   var algoliaResponse = {
     results: [
diff --git a/packages/algoliasearch-helper/test/spec/hierarchical-facets/unknown-facet.js b/packages/algoliasearch-helper/test/spec/hierarchical-facets/unknown-facet.js
index 87d82d86c5..472ecc914a 100644
--- a/packages/algoliasearch-helper/test/spec/hierarchical-facets/unknown-facet.js
+++ b/packages/algoliasearch-helper/test/spec/hierarchical-facets/unknown-facet.js
@@ -20,6 +20,6 @@ test('hierarchical facets: throw on unknown facet', function () {
   });
 
   expect(function () {
-    helper.toggleRefine('unknownFacet', 'beers');
+    helper.toggleFacetRefinement('unknownFacet', 'beers');
   }).toThrow();
 });
diff --git a/packages/algoliasearch-helper/test/spec/hierarchical-facets/with-a-disjunctive-facet.js b/packages/algoliasearch-helper/test/spec/hierarchical-facets/with-a-disjunctive-facet.js
index d024beed04..55afb99de6 100644
--- a/packages/algoliasearch-helper/test/spec/hierarchical-facets/with-a-disjunctive-facet.js
+++ b/packages/algoliasearch-helper/test/spec/hierarchical-facets/with-a-disjunctive-facet.js
@@ -21,8 +21,8 @@ test('hierarchical facets: combined with a disjunctive facet', function () {
     ],
   });
 
-  helper.toggleRefine('categories', 'beers > IPA');
-  helper.toggleRefine('colors', 'blue');
+  helper.toggleFacetRefinement('categories', 'beers > IPA');
+  helper.toggleFacetRefinement('colors', 'blue');
 
   client.search = jest.fn(function () {
     return new Promise(function () {});
diff --git a/packages/algoliasearch-helper/test/spec/refinements.js b/packages/algoliasearch-helper/test/spec/refinements.js
index e61ebdea3f..cd2b6d7936 100644
--- a/packages/algoliasearch-helper/test/spec/refinements.js
+++ b/packages/algoliasearch-helper/test/spec/refinements.js
@@ -13,12 +13,12 @@ test('Adding refinements should add an entry to the refinements attribute', func
   });
 
   expect(Object.keys(helper.state.facetsRefinements).length).toBe(0);
-  helper.addRefine(facetName, facetValue);
+  helper.addFacetRefinement(facetName, facetValue);
   expect(Object.keys(helper.state.facetsRefinements).length).toBe(1);
   expect(helper.state.facetsRefinements.facet1).toEqual([facetValue]);
-  helper.addRefine(facetName, facetValue);
+  helper.addFacetRefinement(facetName, facetValue);
   expect(Object.keys(helper.state.facetsRefinements).length).toBe(1);
-  helper.removeRefine(facetName, facetValue);
+  helper.removeFacetRefinement(facetName, facetValue);
   expect(Object.keys(helper.state.facetsRefinements).length).toBe(1);
   expect(helper.state.facetsRefinements[facetName]).toEqual([]);
 });
@@ -31,11 +31,11 @@ test('Adding several refinements for a single attribute should be handled', func
   });
 
   expect(Object.keys(helper.state.facetsRefinements).length).toBe(0);
-  helper.addRefine(facetName, 'value1');
+  helper.addFacetRefinement(facetName, 'value1');
   expect(Object.keys(helper.state.facetsRefinements[facetName]).length).toBe(1);
-  helper.addRefine(facetName, 'value2');
+  helper.addFacetRefinement(facetName, 'value2');
   expect(Object.keys(helper.state.facetsRefinements[facetName]).length).toBe(2);
-  helper.addRefine(facetName, 'value1');
+  helper.addFacetRefinement(facetName, 'value1');
   expect(Object.keys(helper.state.facetsRefinements[facetName]).length).toBe(2);
 });
 
@@ -47,20 +47,20 @@ test('Toggling several refinements for a single attribute should be handled', fu
   });
 
   expect(Object.keys(helper.state.facetsRefinements).length).toBe(0);
-  helper.toggleRefine(facetName, 'value1');
+  helper.toggleFacetRefinement(facetName, 'value1');
   expect(Object.keys(helper.state.facetsRefinements[facetName]).length).toBe(1);
-  helper.toggleRefine(facetName, 'value2');
+  helper.toggleFacetRefinement(facetName, 'value2');
   expect(Object.keys(helper.state.facetsRefinements[facetName]).length).toBe(2);
-  helper.toggleRefine(facetName, 'value1');
+  helper.toggleFacetRefinement(facetName, 'value1');
   expect(Object.keys(helper.state.facetsRefinements[facetName]).length).toBe(1);
   expect(helper.state.facetsRefinements[facetName]).toEqual(['value2']);
 });
 
-test('Using toggleRefine on a non specified facet should throw an exception', function () {
+test('Using toggleFacetRefinement on a non specified facet should throw an exception', function () {
   var helper = algoliasearchHelper(emptyClient, null, {});
 
   expect(function () {
-    helper.toggleRefine('unknown', 'value');
+    helper.toggleFacetRefinement('unknown', 'value');
   }).toThrow();
 });
 
@@ -72,11 +72,11 @@ test('Removing several refinements for a single attribute should be handled', fu
   });
 
   expect(Object.keys(helper.state.facetsRefinements).length).toBe(0);
-  helper.addRefine(facetName, 'value1');
-  helper.addRefine(facetName, 'value2');
-  helper.addRefine(facetName, 'value3');
+  helper.addFacetRefinement(facetName, 'value1');
+  helper.addFacetRefinement(facetName, 'value2');
+  helper.addFacetRefinement(facetName, 'value3');
   expect(Object.keys(helper.state.facetsRefinements[facetName]).length).toBe(3);
-  helper.removeRefine(facetName, 'value2');
+  helper.removeFacetRefinement(facetName, 'value2');
   expect(Object.keys(helper.state.facetsRefinements[facetName]).length).toBe(2);
   expect(helper.state.facetsRefinements[facetName]).toEqual([
     'value1',
@@ -84,24 +84,6 @@ test('Removing several refinements for a single attribute should be handled', fu
   ]);
 });
 
-test('isDisjunctiveRefined', function () {
-  var facet = 'MyFacet';
-
-  var helper = algoliasearchHelper(emptyClient, null, {
-    disjunctiveFacets: [facet],
-  });
-
-  var value = 'MyValue';
-
-  expect(helper.isDisjunctiveRefined(facet, value)).toBe(false);
-
-  helper.addDisjunctiveRefine(facet, value);
-  expect(helper.isDisjunctiveRefined(facet, value)).toBe(true);
-
-  helper.removeDisjunctiveRefine(facet, value);
-  expect(helper.isDisjunctiveRefined(facet, value)).toBe(false);
-});
-
 test('hasRefinements(facet) should return true if the facet is refined.', function () {
   var helper = algoliasearchHelper(emptyClient, null, {
     facets: ['facet1'],
@@ -109,7 +91,7 @@ test('hasRefinements(facet) should return true if the facet is refined.', functi
 
   expect(helper.hasRefinements('facet1')).toBe(false);
 
-  helper.addRefine('facet1', 'boom');
+  helper.addFacetRefinement('facet1', 'boom');
 
   expect(helper.hasRefinements('facet1')).toBe(true);
 
@@ -125,15 +107,15 @@ test('getRefinements should return all the refinements for a given facet', funct
   });
 
   helper
-    .addRefine('facet1', 'val1')
-    .addRefine('facet1', 'val2')
-    .addExclude('facet1', 'val-1')
-    .toggleRefine('facet1', 'val3');
+    .addFacetRefinement('facet1', 'val1')
+    .addFacetRefinement('facet1', 'val2')
+    .addFacetExclusion('facet1', 'val-1')
+    .toggleFacetRefinement('facet1', 'val3');
 
   helper
-    .addDisjunctiveRefine('facet2', 'val4')
-    .addDisjunctiveRefine('facet2', 'val5')
-    .toggleRefine('facet2', 'val6');
+    .addDisjunctiveFacetRefinement('facet2', 'val4')
+    .addDisjunctiveFacetRefinement('facet2', 'val5')
+    .toggleFacetRefinement('facet2', 'val6');
 
   helper
     .addNumericRefinement('sales', '>', '3')
@@ -174,17 +156,17 @@ test('[Conjunctive] Facets should be resilient to user attempt to use numbers',
     disjunctiveFacets: ['facet2'],
   });
 
-  helper.addRefine('facet1', 42);
+  helper.addFacetRefinement('facet1', 42);
   expect(helper.hasRefinements('facet1', 42)).toBe(true);
   expect(helper.hasRefinements('facet1', '42')).toBe(true);
 
   var stateWithFacet1and42 = helper.state;
 
-  helper.removeRefine('facet1', '42');
+  helper.removeFacetRefinement('facet1', '42');
   expect(helper.hasRefinements('facet1', '42')).toBe(false);
 
   helper.setState(stateWithFacet1and42);
-  helper.removeRefine('facet1', 42);
+  helper.removeFacetRefinement('facet1', 42);
   expect(helper.hasRefinements('facet1', 42)).toBe(false);
 });
 
@@ -194,18 +176,18 @@ test('[Exclude] Facets should be resilient to user attempt to use numbers', func
     disjunctiveFacets: ['facet2'],
   });
 
-  helper.addExclude('facet1', 42);
-  expect(helper.isExcluded('facet1', 42)).toBe(true);
-  expect(helper.isExcluded('facet1', '42')).toBe(true);
+  helper.addFacetExclusion('facet1', 42);
+  expect(helper.state.isExcludeRefined('facet1', 42)).toBe(true);
+  expect(helper.state.isExcludeRefined('facet1', '42')).toBe(true);
 
   var stateWithFacet1Without42 = helper.state;
 
-  helper.removeExclude('facet1', '42');
-  expect(helper.isExcluded('facet1', '42')).toBe(false);
+  helper.removeFacetExclusion('facet1', '42');
+  expect(helper.state.isExcludeRefined('facet1', '42')).toBe(false);
 
   helper.setState(stateWithFacet1Without42);
-  helper.removeExclude('facet1', 42);
-  expect(helper.isExcluded('facet1', 42)).toBe(false);
+  helper.removeFacetExclusion('facet1', 42);
+  expect(helper.state.isExcludeRefined('facet1', 42)).toBe(false);
 });
 
 test('[Disjunctive] Facets should be resilient to user attempt to use numbers', function () {
@@ -214,16 +196,16 @@ test('[Disjunctive] Facets should be resilient to user attempt to use numbers',
     disjunctiveFacets: ['facet2'],
   });
 
-  helper.addDisjunctiveRefine('facet2', 42);
-  expect(helper.isDisjunctiveRefined('facet2', 42)).toBe(true);
-  expect(helper.isDisjunctiveRefined('facet2', '42')).toBe(true);
+  helper.addDisjunctiveFacetRefinement('facet2', 42);
+  expect(helper.state.isDisjunctiveFacetRefined('facet2', 42)).toBe(true);
+  expect(helper.state.isDisjunctiveFacetRefined('facet2', '42')).toBe(true);
 
   var stateWithFacet2and42 = helper.state;
 
-  helper.removeDisjunctiveRefine('facet2', '42');
-  expect(helper.isDisjunctiveRefined('facet2', '42')).toBe(false);
+  helper.removeDisjunctiveFacetRefinement('facet2', '42');
+  expect(helper.state.isDisjunctiveFacetRefined('facet2', '42')).toBe(false);
   helper.setState(stateWithFacet2and42);
 
-  helper.removeDisjunctiveRefine('facet2', 42);
-  expect(helper.isDisjunctiveRefined('facet2', 42)).toBe(false);
+  helper.removeDisjunctiveFacetRefinement('facet2', 42);
+  expect(helper.state.isDisjunctiveFacetRefined('facet2', 42)).toBe(false);
 });
diff --git a/packages/algoliasearch-helper/test/spec/search.js b/packages/algoliasearch-helper/test/spec/search.js
index 535f0df87a..e701b01551 100644
--- a/packages/algoliasearch-helper/test/spec/search.js
+++ b/packages/algoliasearch-helper/test/spec/search.js
@@ -15,8 +15,8 @@ test('Search should call the algolia client according to the number of refinemen
     disjunctiveFacets: ['city'],
   });
 
-  helper.addDisjunctiveRefine('city', 'Paris', true);
-  helper.addDisjunctiveRefine('city', 'New York', true);
+  helper.addDisjunctiveFacetRefinement('city', 'Paris', true);
+  helper.addDisjunctiveFacetRefinement('city', 'New York', true);
 
   helper.on('result', function (event) {
     var results = event.results;
@@ -127,12 +127,12 @@ test('no mutating methods should trigger a search', function () {
 
   helper.setQuery('');
   helper.clearRefinements();
-  helper.addDisjunctiveRefine('city', 'Paris');
-  helper.removeDisjunctiveRefine('city', 'Paris');
-  helper.addExclude('tower', 'Empire State Building');
-  helper.removeExclude('tower', 'Empire State Building');
-  helper.addRefine('tower', 'Empire State Building');
-  helper.removeRefine('tower', 'Empire State Building');
+  helper.addDisjunctiveFacetRefinement('city', 'Paris');
+  helper.removeDisjunctiveFacetRefinement('city', 'Paris');
+  helper.addFacetExclusion('tower', 'Empire State Building');
+  helper.removeFacetExclusion('tower', 'Empire State Building');
+  helper.addFacetRefinement('tower', 'Empire State Building');
+  helper.removeFacetRefinement('tower', 'Empire State Building');
 
   expect(client.search).toHaveBeenCalledTimes(0);
 

From b4ec6775fccce1c8972fdd896d7d4a9b740da8ae Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Wed, 23 Oct 2024 10:34:23 +0200
Subject: [PATCH 07/37] fix(widgets): remove experimental widgets (#6400)

The widgets (and connectors) EXPERIMENTAL_dynamicWidgets, EXPERIMENTAL_configureRelatedItems are removed, and replaced with their non-experimental version.

If you want to keep using the experimental behaviour of configure related items, you can copy the files from here into your project and continue using them.

BREAKING CHANGE: experimental configure related items is replace with related products
BREAKING CHANGE: experimental dynamic widgets is replaced with dynamic widgets
---
 ...onnectConfigureRelatedItems-test-bridge.ts |  39 ---
 .../connectConfigureRelatedItems-test.ts      | 287 ------------------
 .../connectConfigureRelatedItems.ts           | 163 ----------
 .../instantsearch.js/src/connectors/index.ts  |  20 +-
 packages/instantsearch.js/src/types/widget.ts |   2 -
 .../src/widgets/__tests__/index.test.ts       |  15 +-
 .../__tests__/configure-related-items-test.ts |  31 --
 .../configure-related-items.ts                |  32 --
 .../instantsearch.js/src/widgets/index.ts     |  19 +-
 .../configure-related-items.stories.ts        | 165 ----------
 .../vue-instantsearch/src/__tests__/index.js  |  19 +-
 .../src/components/ConfigureRelatedItems.js   |  44 ---
 .../components/ExperimentalDynamicWidgets.js  |  11 -
 .../__tests__/ConfigureRelatedItems.js        |  36 ---
 .../__tests__/ExperimentalDynamicWidgets.js   |  49 ---
 packages/vue-instantsearch/src/widgets.js     |   2 -
 .../stories/ConfigureRelatedItems.stories.js  | 104 -------
 17 files changed, 9 insertions(+), 1029 deletions(-)
 delete mode 100644 packages/instantsearch.js/src/connectors/configure-related-items/__tests__/connectConfigureRelatedItems-test-bridge.ts
 delete mode 100644 packages/instantsearch.js/src/connectors/configure-related-items/__tests__/connectConfigureRelatedItems-test.ts
 delete mode 100644 packages/instantsearch.js/src/connectors/configure-related-items/connectConfigureRelatedItems.ts
 delete mode 100644 packages/instantsearch.js/src/widgets/configure-related-items/__tests__/configure-related-items-test.ts
 delete mode 100644 packages/instantsearch.js/src/widgets/configure-related-items/configure-related-items.ts
 delete mode 100644 packages/instantsearch.js/stories/configure-related-items.stories.ts
 delete mode 100644 packages/vue-instantsearch/src/components/ConfigureRelatedItems.js
 delete mode 100644 packages/vue-instantsearch/src/components/ExperimentalDynamicWidgets.js
 delete mode 100644 packages/vue-instantsearch/src/components/__tests__/ConfigureRelatedItems.js
 delete mode 100644 packages/vue-instantsearch/src/components/__tests__/ExperimentalDynamicWidgets.js
 delete mode 100644 packages/vue-instantsearch/stories/ConfigureRelatedItems.stories.js

diff --git a/packages/instantsearch.js/src/connectors/configure-related-items/__tests__/connectConfigureRelatedItems-test-bridge.ts b/packages/instantsearch.js/src/connectors/configure-related-items/__tests__/connectConfigureRelatedItems-test-bridge.ts
deleted file mode 100644
index 8e0c0af87d..0000000000
--- a/packages/instantsearch.js/src/connectors/configure-related-items/__tests__/connectConfigureRelatedItems-test-bridge.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { castToJestMock } from '@instantsearch/testutils/castToJestMock';
-
-import connectConfigure from '../../configure/connectConfigure';
-import connectConfigureRelatedItems from '../connectConfigureRelatedItems';
-
-jest.mock('../../configure/connectConfigure');
-
-// This test ensures that the `connectConfigureRelatedItems` calls
-// `connectConfigure` to compute the search parameters.
-describe('connectConfigureRelatedItems - bridge', () => {
-  test('forwards the options to connectConfigure', () => {
-    const makeWidget = jest.fn();
-    castToJestMock(connectConfigure).mockImplementationOnce(() => makeWidget);
-
-    const renderer = jest.fn();
-    const unmounter = jest.fn();
-    const configureRelatedItems = connectConfigureRelatedItems(
-      renderer,
-      unmounter
-    );
-
-    configureRelatedItems({
-      hit: { objectID: '1' },
-      matchingPatterns: {},
-    });
-
-    expect(connectConfigure).toHaveBeenCalledTimes(1);
-    expect(connectConfigure).toHaveBeenCalledWith(renderer, unmounter);
-
-    expect(makeWidget).toHaveBeenCalledTimes(1);
-    expect(makeWidget).toHaveBeenCalledWith({
-      searchParameters: expect.objectContaining({
-        facetFilters: ['objectID:-1'],
-        optionalFilters: [],
-        sumOrFiltersScores: true,
-      }),
-    });
-  });
-});
diff --git a/packages/instantsearch.js/src/connectors/configure-related-items/__tests__/connectConfigureRelatedItems-test.ts b/packages/instantsearch.js/src/connectors/configure-related-items/__tests__/connectConfigureRelatedItems-test.ts
deleted file mode 100644
index 4d9cba88c2..0000000000
--- a/packages/instantsearch.js/src/connectors/configure-related-items/__tests__/connectConfigureRelatedItems-test.ts
+++ /dev/null
@@ -1,287 +0,0 @@
-import { createSearchClient } from '@instantsearch/mocks';
-import { wait } from '@instantsearch/testutils/wait';
-
-import instantsearch from '../../..';
-import { noop } from '../../../lib/utils';
-import connectConfigureRelatedItems from '../connectConfigureRelatedItems';
-
-import type { AlgoliaHit } from '../../../types';
-
-const hit: AlgoliaHit = {
-  objectID: '1',
-  name: 'Amazon - Fire TV Stick with Alexa Voice Remote - Black',
-  description:
-    'Enjoy smart access to videos, games and apps with this Amazon Fire TV stick.',
-  brand: 'Amazon',
-  categories: ['TV & Home Theater', 'Streaming Media Players'],
-  hierarchicalCategories: {
-    lvl0: 'TV & Home Theater',
-    lvl1: 'TV & Home Theater > Streaming Media Players',
-  },
-  price: 39.99,
-  free_shipping: false,
-  rating: 4,
-  _snippetResult: {
-    description: {
-      value:
-        'Enjoy smart access to videos, games and apps with this Amazon Fire TV stick. Its […]',
-      matchLevel: 'none',
-    },
-  },
-  _highlightResult: {
-    description: {
-      value:
-        'Enjoy smart access to videos, games and apps with this Amazon Fire TV stick. Its […]',
-      matchLevel: 'none',
-      matchedWords: [],
-    },
-  },
-};
-
-describe('connectConfigureRelatedItems', () => {
-  describe('usage', () => {
-    test('throws without hit option', () => {
-      const configureRelatedItems = connectConfigureRelatedItems(noop);
-
-      expect(() => {
-        // @ts-expect-error missing options
-        configureRelatedItems();
-      }).toThrowErrorMatchingInlineSnapshot(`
-"The \`hit\` option is required.
-
-See documentation: https://www.algolia.com/doc/api-reference/widgets/configure-related-items/js/#connector"
-`);
-    });
-
-    test('throws without matchingPatterns option', () => {
-      const configureRelatedItems = connectConfigureRelatedItems(noop);
-
-      expect(() => {
-        // @ts-expect-error missing options
-        configureRelatedItems({
-          hit,
-        });
-      }).toThrowErrorMatchingInlineSnapshot(`
-"The \`matchingPatterns\` option is required.
-
-See documentation: https://www.algolia.com/doc/api-reference/widgets/configure-related-items/js/#connector"
-`);
-    });
-
-    test('does not throw on correct usage', () => {
-      const configureRelatedItems = connectConfigureRelatedItems(noop);
-
-      expect(() => {
-        configureRelatedItems({
-          hit,
-          matchingPatterns: {},
-        });
-      }).not.toThrow();
-    });
-
-    test('is a widget', () => {
-      const configureRelatedItems = connectConfigureRelatedItems(noop);
-      const widget = configureRelatedItems({
-        hit,
-        matchingPatterns: {},
-      });
-
-      expect(widget).toEqual(
-        expect.objectContaining({
-          $$type: 'ais.configureRelatedItems',
-          init: expect.any(Function),
-          render: expect.any(Function),
-          dispose: expect.any(Function),
-          getWidgetSearchParameters: expect.any(Function),
-          getWidgetUiState: expect.any(Function),
-        })
-      );
-    });
-  });
-
-  describe('options', () => {
-    test('sets the optionalFilters search parameter based on matchingPatterns', async () => {
-      const searchClient = createSearchClient();
-      const search = instantsearch({
-        indexName: 'indexName',
-        searchClient,
-      });
-      const configureRelatedItems = connectConfigureRelatedItems(noop);
-
-      search.addWidgets([
-        configureRelatedItems({
-          hit,
-          matchingPatterns: {
-            brand: { score: 3 },
-            categories: { score: 2 },
-          },
-        }),
-      ]);
-      search.start();
-
-      await wait(0);
-
-      expect(searchClient.search).toHaveBeenCalledTimes(1);
-      expect(searchClient.search).toHaveBeenCalledWith([
-        {
-          indexName: 'indexName',
-          params: {
-            facetFilters: ['objectID:-1'],
-            sumOrFiltersScores: true,
-            optionalFilters: [
-              'brand:Amazon<score=3>',
-              [
-                'categories:TV & Home Theater<score=2>',
-                'categories:Streaming Media Players<score=2>',
-              ],
-            ],
-          },
-        },
-      ]);
-    });
-
-    test('sets the optionalFilters search parameter based on matchingPatterns with nested attributes', async () => {
-      const searchClient = createSearchClient();
-      const search = instantsearch({
-        indexName: 'indexName',
-        searchClient,
-      });
-      const configureRelatedItems = connectConfigureRelatedItems(noop);
-
-      search.addWidgets([
-        configureRelatedItems({
-          hit,
-          matchingPatterns: {
-            brand: { score: 3 },
-            'hierarchicalCategories.lvl0': { score: 2 },
-          },
-        }),
-      ]);
-      search.start();
-
-      await wait(0);
-
-      expect(searchClient.search).toHaveBeenCalledTimes(1);
-      expect(searchClient.search).toHaveBeenCalledWith([
-        {
-          indexName: 'indexName',
-          params: {
-            facetFilters: ['objectID:-1'],
-            sumOrFiltersScores: true,
-            optionalFilters: [
-              'brand:Amazon<score=3>',
-              'hierarchicalCategories.lvl0:TV & Home Theater<score=2>',
-            ],
-          },
-        },
-      ]);
-    });
-
-    test('sets transformed search parameters based on transformSearchParameters', async () => {
-      const searchClient = createSearchClient();
-      const search = instantsearch({
-        indexName: 'indexName',
-        searchClient,
-      });
-      const configureRelatedItems = connectConfigureRelatedItems(noop);
-
-      search.addWidgets([
-        configureRelatedItems({
-          hit,
-          matchingPatterns: {
-            brand: { score: 3 },
-            categories: { score: 2 },
-          },
-          transformSearchParameters(searchParameters) {
-            return {
-              ...searchParameters,
-              optionalWords: hit.name.split(' '),
-            };
-          },
-        }),
-      ]);
-      search.start();
-
-      await wait(0);
-
-      expect(searchClient.search).toHaveBeenCalledTimes(1);
-      expect(searchClient.search).toHaveBeenCalledWith([
-        {
-          indexName: 'indexName',
-          params: {
-            facetFilters: ['objectID:-1'],
-            sumOrFiltersScores: true,
-            optionalFilters: [
-              'brand:Amazon<score=3>',
-              [
-                'categories:TV & Home Theater<score=2>',
-                'categories:Streaming Media Players<score=2>',
-              ],
-            ],
-            optionalWords: [
-              'Amazon',
-              '-',
-              'Fire',
-              'TV',
-              'Stick',
-              'with',
-              'Alexa',
-              'Voice',
-              'Remote',
-              '-',
-              'Black',
-            ],
-          },
-        },
-      ]);
-    });
-
-    test('filter out and warns for incorrect optionalFilters value type', async () => {
-      const searchClient = createSearchClient();
-      const search = instantsearch({
-        indexName: 'indexName',
-        searchClient,
-      });
-      const configureRelatedItems = connectConfigureRelatedItems(noop);
-
-      expect(() => {
-        search.addWidgets([
-          configureRelatedItems({
-            hit,
-            matchingPatterns: {
-              rating: { score: 1 }, // `rating` is a number, which is not supported by the `optionalFilters` API
-              brand: { score: 3 },
-              categories: { score: 1 },
-            },
-          }),
-        ]);
-      })
-        .toWarnDev(`[InstantSearch.js]: The \`matchingPatterns\` option returned a value of type Number for the "rating" key. This value was not sent to Algolia because \`optionalFilters\` only supports strings and array of strings.
-
-You can remove the "rating" key from the \`matchingPatterns\` option.
-
-See https://www.algolia.com/doc/api-reference/api-parameters/optionalFilters/`);
-      search.start();
-
-      await wait(0);
-
-      expect(searchClient.search).toHaveBeenCalledTimes(1);
-      expect(searchClient.search).toHaveBeenCalledWith([
-        {
-          indexName: 'indexName',
-          params: {
-            facetFilters: ['objectID:-1'],
-            sumOrFiltersScores: true,
-            optionalFilters: [
-              'brand:Amazon<score=3>',
-              [
-                'categories:TV & Home Theater<score=1>',
-                'categories:Streaming Media Players<score=1>',
-              ],
-            ],
-          },
-        },
-      ]);
-    });
-  });
-});
diff --git a/packages/instantsearch.js/src/connectors/configure-related-items/connectConfigureRelatedItems.ts b/packages/instantsearch.js/src/connectors/configure-related-items/connectConfigureRelatedItems.ts
deleted file mode 100644
index e4bb2ac958..0000000000
--- a/packages/instantsearch.js/src/connectors/configure-related-items/connectConfigureRelatedItems.ts
+++ /dev/null
@@ -1,163 +0,0 @@
-import algoliasearchHelper from 'algoliasearch-helper';
-
-import {
-  createDocumentationMessageGenerator,
-  getObjectType,
-  warning,
-  getPropertyByPath,
-} from '../../lib/utils';
-import connectConfigure from '../configure/connectConfigure';
-
-import type { AlgoliaHit, Connector } from '../../types';
-import type { ConfigureWidgetDescription } from '../configure/connectConfigure';
-import type {
-  SearchParameters,
-  PlainSearchParameters,
-} from 'algoliasearch-helper';
-
-export type MatchingPatterns = {
-  [attribute: string]: {
-    /**
-     * The score of the optional filter.
-     *
-     * @see https://www.algolia.com/doc/guides/managing-results/rules/merchandising-and-promoting/in-depth/optional-filters/
-     */
-    score: number;
-  };
-};
-
-export type TransformSearchParameters = (
-  searchParameters: SearchParameters
-) => PlainSearchParameters;
-
-export type ConfigureRelatedItemsConnectorParams = {
-  /**
-   * The reference hit to extract the filters from.
-   */
-  hit: AlgoliaHit;
-  /**
-   * The schema to create the optional filters.
-   * Each key represents an attribute from the hit.
-   */
-  matchingPatterns: MatchingPatterns;
-  /**
-   * Function to transform the generated search parameters.
-   */
-  transformSearchParameters?: TransformSearchParameters;
-};
-
-const withUsage = createDocumentationMessageGenerator({
-  name: 'configure-related-items',
-  connector: true,
-});
-
-function createOptionalFilter({
-  attributeName,
-  attributeValue,
-  attributeScore,
-}: {
-  attributeName: string;
-  attributeValue: string;
-  attributeScore: number;
-}) {
-  return `${attributeName}:${attributeValue}<score=${attributeScore || 1}>`;
-}
-
-export type ConfigureRelatedItemsWidgetDescription = {
-  $$type: 'ais.configureRelatedItems';
-} & Omit<ConfigureWidgetDescription, '$$type'>;
-
-export type ConfigureRelatedItemsConnector = Connector<
-  ConfigureRelatedItemsWidgetDescription,
-  ConfigureRelatedItemsConnectorParams
->;
-
-const connectConfigureRelatedItems: ConfigureRelatedItemsConnector =
-  function connectConfigureRelatedItems(renderFn, unmountFn) {
-    return (widgetParams) => {
-      const {
-        hit,
-        matchingPatterns,
-        transformSearchParameters = ((x) => x) as TransformSearchParameters,
-      } = widgetParams || {};
-
-      if (!hit) {
-        throw new Error(withUsage('The `hit` option is required.'));
-      }
-
-      if (!matchingPatterns) {
-        throw new Error(
-          withUsage('The `matchingPatterns` option is required.')
-        );
-      }
-
-      const optionalFilters = Object.keys(matchingPatterns).reduce<
-        Array<string | string[]>
-      >((acc, attributeName) => {
-        const attribute = matchingPatterns[attributeName];
-        const attributeValue = getPropertyByPath(hit, attributeName);
-        const attributeScore = attribute.score;
-
-        if (Array.isArray(attributeValue)) {
-          return [
-            ...acc,
-            attributeValue.map((attributeSubValue) => {
-              return createOptionalFilter({
-                attributeName,
-                attributeValue: attributeSubValue,
-                attributeScore,
-              });
-            }),
-          ];
-        }
-
-        if (typeof attributeValue === 'string') {
-          return [
-            ...acc,
-            createOptionalFilter({
-              attributeName,
-              attributeValue,
-              attributeScore,
-            }),
-          ];
-        }
-
-        warning(
-          false,
-          `
-The \`matchingPatterns\` option returned a value of type ${getObjectType(
-            attributeValue
-          )} for the "${attributeName}" key. This value was not sent to Algolia because \`optionalFilters\` only supports strings and array of strings.
-
-You can remove the "${attributeName}" key from the \`matchingPatterns\` option.
-
-See https://www.algolia.com/doc/api-reference/api-parameters/optionalFilters/
-            `
-        );
-
-        return acc;
-      }, []);
-
-      const searchParameters: PlainSearchParameters = {
-        ...transformSearchParameters(
-          new algoliasearchHelper.SearchParameters({
-            sumOrFiltersScores: true,
-            facetFilters: [`objectID:-${hit.objectID}`],
-            optionalFilters,
-          })
-        ),
-      };
-
-      const makeWidget = connectConfigure(renderFn, unmountFn);
-
-      return {
-        // required, since widget parameters differ between these connectors
-        // and we don't want to have the parameters of configure here
-        ...makeWidget({ searchParameters } as any),
-        $$type: 'ais.configureRelatedItems',
-      };
-    };
-  };
-
-/** @deprecated use connectRelatedItems instead */
-export default connectConfigureRelatedItems;
diff --git a/packages/instantsearch.js/src/connectors/index.ts b/packages/instantsearch.js/src/connectors/index.ts
index 466aa0f8c3..23e689e115 100644
--- a/packages/instantsearch.js/src/connectors/index.ts
+++ b/packages/instantsearch.js/src/connectors/index.ts
@@ -1,22 +1,4 @@
-import { deprecate } from '../lib/utils';
-
-import connectConfigureRelatedItems from './configure-related-items/connectConfigureRelatedItems';
-import connectDynamicWidgets from './dynamic-widgets/connectDynamicWidgets';
-
-/** @deprecated use connectRelatedItems instead */
-export const EXPERIMENTAL_connectConfigureRelatedItems = deprecate(
-  connectConfigureRelatedItems,
-  'EXPERIMENTAL_connectConfigureRelatedItems is deprecated and will be removed in a next minor version of InstantSearch. Please use connectRelatedItems instead.'
-);
-
-/** @deprecated use connectDynamicWidgets */
-export const EXPERIMENTAL_connectDynamicWidgets = deprecate(
-  connectDynamicWidgets,
-  'use connectDynamicWidgets'
-);
-
-export { connectDynamicWidgets };
-
+export { default as connectDynamicWidgets } from './dynamic-widgets/connectDynamicWidgets';
 export { default as connectClearRefinements } from './clear-refinements/connectClearRefinements';
 export { default as connectCurrentRefinements } from './current-refinements/connectCurrentRefinements';
 export { default as connectHierarchicalMenu } from './hierarchical-menu/connectHierarchicalMenu';
diff --git a/packages/instantsearch.js/src/types/widget.ts b/packages/instantsearch.js/src/types/widget.ts
index 6aa911114b..531803549e 100644
--- a/packages/instantsearch.js/src/types/widget.ts
+++ b/packages/instantsearch.js/src/types/widget.ts
@@ -60,7 +60,6 @@ export type BuiltinTypes =
   | 'ais.breadcrumb'
   | 'ais.clearRefinements'
   | 'ais.configure'
-  | 'ais.configureRelatedItems'
   | 'ais.currentRefinements'
   | 'ais.dynamicWidgets'
   | 'ais.frequentlyBoughtTogether'
@@ -96,7 +95,6 @@ export type BuiltinWidgetTypes =
   | 'ais.breadcrumb'
   | 'ais.clearRefinements'
   | 'ais.configure'
-  | 'ais.configureRelatedItems'
   | 'ais.currentRefinements'
   | 'ais.dynamicWidgets'
   | 'ais.frequentlyBoughtTogether'
diff --git a/packages/instantsearch.js/src/widgets/__tests__/index.test.ts b/packages/instantsearch.js/src/widgets/__tests__/index.test.ts
index 2192840fa9..3683f64f42 100644
--- a/packages/instantsearch.js/src/widgets/__tests__/index.test.ts
+++ b/packages/instantsearch.js/src/widgets/__tests__/index.test.ts
@@ -44,14 +44,6 @@ function initiateAllWidgets(): Array<[WidgetNames, Widget | IndexWidget]> {
         const index = widget as Widgets['index'];
         return index({ indexName: 'index' });
       }
-      case 'EXPERIMENTAL_configureRelatedItems': {
-        const EXPERIMENTAL_configureRelatedItems =
-          widget as Widgets['EXPERIMENTAL_configureRelatedItems'];
-        return EXPERIMENTAL_configureRelatedItems({
-          hit: { objectID: 'x' },
-          matchingPatterns: {},
-        });
-      }
       case 'geoSearch': {
         const geoSearch = widget as Widgets['geoSearch'];
         return geoSearch({
@@ -116,10 +108,9 @@ function initiateAllWidgets(): Array<[WidgetNames, Widget | IndexWidget]> {
           attributes: ['attr1', 'attr2'],
         });
       }
-      case 'dynamicWidgets':
-      case 'EXPERIMENTAL_dynamicWidgets': {
-        const EXPERIMENTAL_dynamicWidgets = widget as Widgets['dynamicWidgets'];
-        return EXPERIMENTAL_dynamicWidgets({
+      case 'dynamicWidgets': {
+        const dynamicWidgets = widget as Widgets['dynamicWidgets'];
+        return dynamicWidgets({
           transformItems(items) {
             return items;
           },
diff --git a/packages/instantsearch.js/src/widgets/configure-related-items/__tests__/configure-related-items-test.ts b/packages/instantsearch.js/src/widgets/configure-related-items/__tests__/configure-related-items-test.ts
deleted file mode 100644
index b7aa525099..0000000000
--- a/packages/instantsearch.js/src/widgets/configure-related-items/__tests__/configure-related-items-test.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { castToJestMock } from '@instantsearch/testutils/castToJestMock';
-
-import connectConfigureRelatedItems from '../../../connectors/configure-related-items/connectConfigureRelatedItems';
-import configureRelatedItems from '../configure-related-items';
-
-import type { ConfigureRelatedItemsConnectorParams } from '../../../connectors/configure-related-items/connectConfigureRelatedItems';
-
-jest.mock(
-  '../../../connectors/configure-related-items/connectConfigureRelatedItems'
-);
-
-describe('configureRelatedItems', () => {
-  test('forwards the options to the connector', () => {
-    const makeWidget = jest.fn();
-    castToJestMock(connectConfigureRelatedItems).mockImplementationOnce(
-      () => makeWidget
-    );
-
-    const widgetParams: ConfigureRelatedItemsConnectorParams = {
-      hit: { objectID: '1' },
-      matchingPatterns: {},
-      transformSearchParameters: (x) => x,
-    };
-
-    configureRelatedItems(widgetParams);
-
-    expect(connectConfigureRelatedItems).toHaveBeenCalledTimes(1);
-    expect(makeWidget).toHaveBeenCalledTimes(1);
-    expect(makeWidget).toHaveBeenCalledWith(widgetParams);
-  });
-});
diff --git a/packages/instantsearch.js/src/widgets/configure-related-items/configure-related-items.ts b/packages/instantsearch.js/src/widgets/configure-related-items/configure-related-items.ts
deleted file mode 100644
index 4b007d304d..0000000000
--- a/packages/instantsearch.js/src/widgets/configure-related-items/configure-related-items.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import connectConfigureRelatedItems from '../../connectors/configure-related-items/connectConfigureRelatedItems';
-import { noop } from '../../lib/utils';
-
-import type {
-  ConfigureRelatedItemsConnectorParams,
-  ConfigureRelatedItemsWidgetDescription,
-} from '../../connectors/configure-related-items/connectConfigureRelatedItems';
-import type { WidgetFactory } from '../../types';
-import type { PlainSearchParameters } from 'algoliasearch-helper';
-
-export type ConfigureRelatedItemsWidget = WidgetFactory<
-  ConfigureRelatedItemsWidgetDescription & {
-    $$widgetType: 'ais.configureRelatedItems';
-  },
-  ConfigureRelatedItemsConnectorParams,
-  ConfigureRelatedItemsWidgetParams
->;
-
-export type ConfigureRelatedItemsWidgetParams = PlainSearchParameters;
-
-const configureRelatedItems: ConfigureRelatedItemsWidget =
-  function configureRelatedItems(widgetParams) {
-    const makeWidget = connectConfigureRelatedItems(noop);
-
-    return {
-      ...makeWidget(widgetParams),
-      $$widgetType: 'ais.configureRelatedItems',
-    };
-  };
-
-/** @deprecated use relatedItems instead */
-export default configureRelatedItems;
diff --git a/packages/instantsearch.js/src/widgets/index.ts b/packages/instantsearch.js/src/widgets/index.ts
index 4703a77132..6233de7043 100644
--- a/packages/instantsearch.js/src/widgets/index.ts
+++ b/packages/instantsearch.js/src/widgets/index.ts
@@ -1,21 +1,4 @@
-import { deprecate } from '../lib/utils';
-
-import configureRelatedItems from './configure-related-items/configure-related-items';
-import dynamicWidgets from './dynamic-widgets/dynamic-widgets';
-
-/** @deprecated use relatedItems instead */
-export const EXPERIMENTAL_configureRelatedItems = deprecate(
-  configureRelatedItems,
-  'EXPERIMENTAL_configureRelatedItems is deprecated and will be removed in a next minor version of InstantSearch. Please use relatedItems instead.'
-);
-
-/** @deprecated use dynamicWidgets */
-export const EXPERIMENTAL_dynamicWidgets = deprecate(
-  dynamicWidgets,
-  'use dynamicWidgets'
-);
-export { dynamicWidgets };
-
+export { default as dynamicWidgets } from './dynamic-widgets/dynamic-widgets';
 export { default as breadcrumb } from './breadcrumb/breadcrumb';
 export { default as clearRefinements } from './clear-refinements/clear-refinements';
 export { default as configure } from './configure/configure';
diff --git a/packages/instantsearch.js/stories/configure-related-items.stories.ts b/packages/instantsearch.js/stories/configure-related-items.stories.ts
deleted file mode 100644
index 625e333a28..0000000000
--- a/packages/instantsearch.js/stories/configure-related-items.stories.ts
+++ /dev/null
@@ -1,165 +0,0 @@
-import { storiesOf } from '@storybook/html';
-
-import { withHits } from '../.storybook/decorators';
-
-import type { AlgoliaHit } from '../src/types';
-import type { HitsWidgetParams } from '../src/widgets/hits/hits';
-
-storiesOf('Basics/ConfigureRelatedItems', module).add(
-  'default',
-  withHits(({ search, container, instantsearch }) => {
-    const productContainer = document.createElement('div');
-    const itemsContainer = document.createElement('div');
-    const previousPageContainer = document.createElement('div');
-    const nextPageContainer = document.createElement('div');
-    const relatedContainer = document.createElement('div');
-    relatedContainer.classList.add('related-items');
-
-    container.appendChild(productContainer);
-    relatedContainer.append(
-      previousPageContainer,
-      itemsContainer,
-      nextPageContainer
-    );
-    container.appendChild(relatedContainer);
-
-    const pagination = instantsearch.connectors.connectPagination<{
-      previousPageContainer: HTMLElement;
-      nextPageContainer: HTMLElement;
-    }>(
-      ({
-        currentRefinement,
-        refine,
-        isFirstPage,
-        isLastPage,
-        nbPages,
-        widgetParams,
-      }) => {
-        widgetParams.previousPageContainer.innerHTML = '';
-        widgetParams.nextPageContainer.innerHTML = '';
-
-        if (nbPages === 0) {
-          return;
-        }
-
-        const previousButton = document.createElement('button');
-        previousButton.classList.add('ais-RelatedHits-button');
-        previousButton.textContent = '←';
-        previousButton.disabled = isFirstPage;
-        previousButton.addEventListener('click', () => {
-          refine(Math.max(0, currentRefinement - 1));
-        });
-
-        const nextButton = document.createElement('button');
-        nextButton.classList.add('ais-RelatedHits-button');
-        nextButton.textContent = '→';
-        nextButton.disabled = isLastPage;
-        nextButton.addEventListener('click', () => {
-          refine(Math.min(currentRefinement + 1, nbPages));
-        });
-
-        widgetParams.previousPageContainer.appendChild(previousButton);
-        widgetParams.nextPageContainer.appendChild(nextButton);
-      }
-    );
-
-    const state: { referenceHit: AlgoliaHit | null } = {
-      referenceHit: null,
-    };
-
-    const relatedHits = instantsearch.connectors.connectHits<HitsWidgetParams>(
-      ({ hits: items, widgetParams, instantSearchInstance }) => {
-        const [hit] = items;
-
-        if (!hit || state.referenceHit) {
-          return;
-        }
-
-        state.referenceHit = hit;
-
-        if (items.length === 0) {
-          (widgetParams.container as HTMLElement).innerHTML = '';
-        }
-
-        instantSearchInstance.addWidgets([
-          instantsearch.widgets
-            .index({
-              indexName: instantSearchInstance.mainIndex.getIndexName(),
-            })
-            .addWidgets([
-              instantsearch.widgets.configure({
-                hitsPerPage: 4,
-              }),
-              instantsearch.widgets.EXPERIMENTAL_configureRelatedItems({
-                hit,
-                matchingPatterns: {
-                  brand: { score: 3 },
-                  type: { score: 10 },
-                  categories: { score: 2 },
-                },
-              }),
-              pagination({
-                previousPageContainer,
-                nextPageContainer,
-                totalPages: 3,
-              }),
-              instantsearch.widgets.hits({
-                container: widgetParams.container,
-                templates: {
-                  item: (item, { html }) => html`
-                    <li class="ais-RelatedHits-item">
-                      <div class="ais-RelatedHits-item-image">
-                        <img src="${item.image}" alt="${item.name}" />
-                      </div>
-
-                      <div class="ais-RelatedHits-item-title">
-                        <h4>${item.name}</h4>
-                      </div>
-                    </li>
-                  `,
-                  empty: () => '',
-                },
-              }),
-            ]),
-        ]);
-      }
-    );
-
-    search.addWidgets([
-      instantsearch.widgets.configure({
-        hitsPerPage: 1,
-      }),
-      instantsearch.widgets.hits({
-        container: productContainer,
-        templates: {
-          item: (hit, { html, components }) => html`
-            <div
-              class="hits-image"
-              style="background-image: url(${hit.image})"
-            ></div>
-            <article>
-              <header>
-                <strong>
-                  ${components.Highlight({ attribute: 'name', hit })})}
-                </strong>
-              </header>
-              <p>${components.Snippet({ attribute: 'description', hit })})}</p>
-              <footer>
-                <p>
-                  <strong>${hit.price}$</strong>
-                </p>
-              </footer>
-            </article>
-          `,
-          empty: () => '',
-        },
-        cssClasses: {
-          item: 'hits-item',
-        },
-      }),
-      relatedHits({
-        container: itemsContainer,
-      }),
-    ]);
-  })
-);
diff --git a/packages/vue-instantsearch/src/__tests__/index.js b/packages/vue-instantsearch/src/__tests__/index.js
index d833f5b642..2c9ab777ed 100644
--- a/packages/vue-instantsearch/src/__tests__/index.js
+++ b/packages/vue-instantsearch/src/__tests__/index.js
@@ -15,7 +15,7 @@ import {
 } from '../util/vue-compat';
 import { AisInstantSearch } from '../widgets';
 
-const renderlessComponents = ['AisExperimentalConfigureRelatedItems'];
+const renderlessComponents = [];
 const nonWidgetComponents = [
   'AisInstantSearch',
   'AisInstantSearchSsr',
@@ -60,9 +60,6 @@ function getAllComponents() {
       const props = {};
       if (name === 'AisHierarchicalMenu' || name === 'AisBreadcrumb') {
         props.attributes = ['attr'];
-      } else if (name === 'AisExperimentalConfigureRelatedItems') {
-        props.hit = {};
-        props.matchingPatterns = {};
       } else if (name === 'AisToggleRefinement') {
         props.attribute = 'attr';
         props.label = 'label';
@@ -141,8 +138,6 @@ describe('DOM component', () => {
       expect(installedName).toBe(name);
       if (name === 'AisInstantSearchSsr') {
         expect(suitClass).toBe(`ais-InstantSearch`);
-      } else if (name === 'AisExperimentalDynamicWidgets') {
-        expect(suitClass).toBe(`ais-DynamicWidgets`);
       } else {
         expect(suitClass).toBe(`ais-${name.substr(3)}`);
       }
@@ -156,14 +151,8 @@ describe('installed widget', () => {
       ({ name }) => nonWidgetComponents.includes(name) === false
     )
   )('sets widgetType $name', ({ name, widget }) => {
-    if (name === 'AisExperimentalDynamicWidgets') {
-      expect(widget.$$widgetType).toBe('ais.dynamicWidgets');
-    } else if (name === 'AisExperimentalConfigureRelatedItems') {
-      expect(widget.$$widgetType).toBe('ais.configureRelatedItems');
-    } else {
-      expect(widget.$$widgetType).toBe(
-        `ais.${name[3].toLowerCase()}${name.substr(4)}`
-      );
-    }
+    expect(widget.$$widgetType).toBe(
+      `ais.${name[3].toLowerCase()}${name.substr(4)}`
+    );
   });
 });
diff --git a/packages/vue-instantsearch/src/components/ConfigureRelatedItems.js b/packages/vue-instantsearch/src/components/ConfigureRelatedItems.js
deleted file mode 100644
index e734a25b54..0000000000
--- a/packages/vue-instantsearch/src/components/ConfigureRelatedItems.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import { EXPERIMENTAL_connectConfigureRelatedItems } from 'instantsearch.js/es/connectors';
-
-import { createWidgetMixin } from '../mixins/widget';
-
-export default {
-  inheritAttrs: false,
-  name: 'AisExperimentalConfigureRelatedItems',
-  mixins: [
-    createWidgetMixin(
-      {
-        connector: EXPERIMENTAL_connectConfigureRelatedItems,
-      },
-      {
-        $$widgetType: 'ais.configureRelatedItems',
-      }
-    ),
-  ],
-  props: {
-    hit: {
-      type: Object,
-      required: true,
-    },
-    matchingPatterns: {
-      type: Object,
-      required: true,
-    },
-    transformSearchParameters: {
-      type: Function,
-      required: false,
-    },
-  },
-  computed: {
-    widgetParams() {
-      return {
-        hit: this.hit,
-        matchingPatterns: this.matchingPatterns,
-        transformSearchParameters: this.transformSearchParameters,
-      };
-    },
-  },
-  render() {
-    return null;
-  },
-};
diff --git a/packages/vue-instantsearch/src/components/ExperimentalDynamicWidgets.js b/packages/vue-instantsearch/src/components/ExperimentalDynamicWidgets.js
deleted file mode 100644
index 87879c9684..0000000000
--- a/packages/vue-instantsearch/src/components/ExperimentalDynamicWidgets.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { warn } from '../util/warn';
-
-import AisDynamicWidgets from './DynamicWidgets';
-
-// @MAJOR remove this file
-export default Object.assign({}, AisDynamicWidgets, {
-  name: 'AisExperimentalDynamicWidgets',
-  mounted() {
-    warn('Use AisDynamicWidgets instead of AisExperimentalDynamicWidgets.');
-  },
-});
diff --git a/packages/vue-instantsearch/src/components/__tests__/ConfigureRelatedItems.js b/packages/vue-instantsearch/src/components/__tests__/ConfigureRelatedItems.js
deleted file mode 100644
index b3896fff0f..0000000000
--- a/packages/vue-instantsearch/src/components/__tests__/ConfigureRelatedItems.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * @jest-environment jsdom
- */
-
-import { mount } from '../../../test/utils';
-import ConfigureRelatedItems from '../ConfigureRelatedItems';
-import '../../../test/utils/sortedHtmlSerializer';
-
-jest.mock('../../mixins/widget');
-
-it('accepts options from props', () => {
-  const props = {
-    hit: { objectID: '1' },
-    matchingPatterns: {},
-    transformSearchParameters: (x) => x,
-  };
-
-  const wrapper = mount(ConfigureRelatedItems, {
-    propsData: props,
-  });
-
-  expect(wrapper.vm.widgetParams).toEqual(props);
-});
-
-it('renders nothing', () => {
-  const props = {
-    hit: { objectID: '1' },
-    matchingPatterns: {},
-  };
-
-  const wrapper = mount(ConfigureRelatedItems, {
-    propsData: props,
-  });
-
-  expect(wrapper).vueToHaveEmptyHTML();
-});
diff --git a/packages/vue-instantsearch/src/components/__tests__/ExperimentalDynamicWidgets.js b/packages/vue-instantsearch/src/components/__tests__/ExperimentalDynamicWidgets.js
deleted file mode 100644
index 5724ee2f6e..0000000000
--- a/packages/vue-instantsearch/src/components/__tests__/ExperimentalDynamicWidgets.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * @jest-environment jsdom
- */
-
-import { mount } from '../../../test/utils';
-import { __setState } from '../../mixins/widget';
-import { warn } from '../../util/warn';
-import DynamicWidgets from '../DynamicWidgets';
-import ExperimentalDynamicWidgets from '../ExperimentalDynamicWidgets';
-import '../../../test/utils/sortedHtmlSerializer';
-
-jest.mock('../../mixins/widget');
-jest.mock('../../util/warn', () => ({ warn: jest.fn() }));
-
-it('warns on mount', () => {
-  __setState(null);
-
-  mount({
-    template: '<ExperimentalDynamicWidgets />',
-    components: {
-      ExperimentalDynamicWidgets,
-    },
-  });
-  expect(warn).toHaveBeenCalledTimes(1);
-  expect(warn.mock.calls[0][0]).toMatchInlineSnapshot(
-    `"Use AisDynamicWidgets instead of AisExperimentalDynamicWidgets."`
-  );
-});
-
-it('behaves the same as DynamicWidgets', () => {
-  Object.keys(ExperimentalDynamicWidgets).forEach((key) => {
-    if (key === 'name') {
-      // name is different
-      // eslint-disable-next-line jest/no-conditional-expect
-      expect(ExperimentalDynamicWidgets[key]).toBe(
-        'AisExperimentalDynamicWidgets'
-      );
-    } else if (key === 'mounted') {
-      // mounted has the warning
-      // eslint-disable-next-line jest/no-conditional-expect
-      expect(ExperimentalDynamicWidgets[key]).toEqual(expect.any(Function));
-    } else if (key[0] === '_') {
-      // private Vue behavior, not tested
-    } else {
-      // eslint-disable-next-line jest/no-conditional-expect
-      expect(ExperimentalDynamicWidgets[key]).toEqual(DynamicWidgets[key]);
-    }
-  });
-});
diff --git a/packages/vue-instantsearch/src/widgets.js b/packages/vue-instantsearch/src/widgets.js
index 1a04225e07..1866ab045f 100644
--- a/packages/vue-instantsearch/src/widgets.js
+++ b/packages/vue-instantsearch/src/widgets.js
@@ -2,7 +2,6 @@ export { default as AisAutocomplete } from './components/Autocomplete.vue';
 export { default as AisBreadcrumb } from './components/Breadcrumb.vue';
 export { default as AisClearRefinements } from './components/ClearRefinements.vue';
 export { default as AisConfigure } from './components/Configure';
-export { default as AisExperimentalConfigureRelatedItems } from './components/ConfigureRelatedItems';
 export { default as AisCurrentRefinements } from './components/CurrentRefinements.vue';
 export { default as AisHierarchicalMenu } from './components/HierarchicalMenu.vue';
 export { default as AisHighlight } from './components/Highlight.vue';
@@ -32,4 +31,3 @@ export { default as AisToggleRefinement } from './components/ToggleRefinement.vu
 export { default as AisVoiceSearch } from './components/VoiceSearch.vue';
 export { default as AisRelevantSort } from './components/RelevantSort.vue';
 export { default as AisDynamicWidgets } from './components/DynamicWidgets';
-export { default as AisExperimentalDynamicWidgets } from './components/ExperimentalDynamicWidgets';
diff --git a/packages/vue-instantsearch/stories/ConfigureRelatedItems.stories.js b/packages/vue-instantsearch/stories/ConfigureRelatedItems.stories.js
deleted file mode 100644
index 662c730de2..0000000000
--- a/packages/vue-instantsearch/stories/ConfigureRelatedItems.stories.js
+++ /dev/null
@@ -1,104 +0,0 @@
-import { storiesOf } from '@storybook/vue';
-import { liteClient as algoliasearch } from 'algoliasearch/lite';
-
-storiesOf('ais-configure-related-items', module).add('default', () => ({
-  template: `
-  <div>
-    <ais-instant-search :search-client="searchClient" index-name="instant_search">
-      <ais-index index-name="instant_search">
-        <ais-configure :hitsPerPage="1"/>
-        <ais-search-box />
-
-        <ais-hits>
-          <template v-slot:item="{ item }">
-            <div :ref="setReferenceHit(item)">
-              <div
-                class="playground-hits-image"
-                :style="{ backgroundImage: 'url(' + item.image + ')' }"
-              />
-              <div class="playground-hits-desc">
-                <p>
-                  <ais-highlight attribute="name" :hit="item" />
-                </p>
-                <p>Rating: {{ item.rating }}✭</p>
-                <p>Price: {{ item.price }}$</p>
-              </div>
-            </div>
-          </template>
-        </ais-hits>
-      </ais-index>
-
-      <ais-index index-name="instant_search" v-if="hit">
-        <h2>Related items</h2>
-
-        <ais-configure :hitsPerPage="4"/>
-        <ais-experimental-configure-related-items :hit="hit" :matchingPatterns="matchingPatterns" />
-
-        <div class="related-items">
-          <ais-pagination>
-            <template v-slot="{ currentRefinement, isFirstPage, refine }">
-              <div>
-                <button
-                  class="ais-RelatedHits-button"
-                  :disabled="isFirstPage"
-                  @click="refine(currentRefinement - 1)"
-                >
-                  ←
-                </button>
-              </div>
-            </template>
-          </ais-pagination>
-
-          <ais-hits>
-            <template v-slot:item="{ item }">
-              <div class="ais-RelatedHits-item-image">
-                <img :src="item.image" alt="item.name" />
-              </div>
-              <div class="ais-RelatedHits-item-title">
-                <h4>
-                  <ais-highlight attribute="name" :hit="item" />
-                </h4>
-              </div>
-            </template>
-          </ais-hits>
-
-          <ais-pagination>
-            <template v-slot="{ currentRefinement, isLastPage, refine }">
-              <div>
-                <button
-                  class="ais-RelatedHits-button"
-                  :disabled="isLastPage"
-                  @click="refine(currentRefinement + 1)"
-                >
-                  →
-                </button>
-              </div>
-            </template>
-          </ais-pagination>
-        </div>
-      </ais-index>
-    </ais-instant-search>
-  </div>
-  `,
-  data() {
-    return {
-      searchClient: algoliasearch(
-        'latency',
-        '6be0576ff61c053d5f9a3225e2a90f76'
-      ),
-      hit: null,
-      matchingPatterns: {
-        brand: { score: 3 },
-        type: { score: 10 },
-        categories: { score: 2 },
-      },
-    };
-  },
-  methods: {
-    setReferenceHit(item) {
-      if (!this.hit || this.hit.objectID !== item.objectID) {
-        this.hit = item;
-      }
-    },
-  },
-}));

From 90aa7d76d21ffc743d3fdccce36478cf6b12d3d6 Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Wed, 23 Oct 2024 13:06:16 +0200
Subject: [PATCH 08/37] chore(codemods): remove codemods from instantsearch.js
 package (#6396)

They are already in place in the instantsearch-codemods package

BREAKING CHANGE: use codemods from `instantsearch-codemods` instead of instantsearch.js
---
 packages/instantsearch.js/package.json        |  3 +-
 .../scripts/transforms/README.md              | 19 ------------
 .../addWidget-to-addWidgets/global.input.js   |  6 ----
 .../addWidget-to-addWidgets/global.output.js  |  6 ----
 .../addWidget-to-addWidgets/imported.input.js |  6 ----
 .../imported.output.js                        |  6 ----
 .../addWidget-to-addWidgets/mixed.input.js    | 15 ----------
 .../addWidget-to-addWidgets/mixed.output.js   | 15 ----------
 .../addWidget-to-addWidgets/remove.input.js   | 11 -------
 .../addWidget-to-addWidgets/remove.output.js  | 11 -------
 .../__tests__/addWidget-to-addWidgets.test.js | 30 -------------------
 .../transforms/addWidget-to-addWidgets.js     |  9 ------
 12 files changed, 1 insertion(+), 136 deletions(-)
 delete mode 100644 packages/instantsearch.js/scripts/transforms/README.md
 delete mode 100644 packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/global.input.js
 delete mode 100644 packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/global.output.js
 delete mode 100644 packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/imported.input.js
 delete mode 100644 packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/imported.output.js
 delete mode 100644 packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/mixed.input.js
 delete mode 100644 packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/mixed.output.js
 delete mode 100644 packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/remove.input.js
 delete mode 100644 packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/remove.output.js
 delete mode 100644 packages/instantsearch.js/scripts/transforms/__tests__/addWidget-to-addWidgets.test.js
 delete mode 100644 packages/instantsearch.js/scripts/transforms/addWidget-to-addWidgets.js

diff --git a/packages/instantsearch.js/package.json b/packages/instantsearch.js/package.json
index 1daec029c9..0ca46b6a85 100644
--- a/packages/instantsearch.js/package.json
+++ b/packages/instantsearch.js/package.json
@@ -22,8 +22,7 @@
   "files": [
     "dist",
     "cjs",
-    "es",
-    "scripts/transforms"
+    "es"
   ],
   "dependencies": {
     "@algolia/events": "^4.0.1",
diff --git a/packages/instantsearch.js/scripts/transforms/README.md b/packages/instantsearch.js/scripts/transforms/README.md
deleted file mode 100644
index 5655ea34a0..0000000000
--- a/packages/instantsearch.js/scripts/transforms/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## Codemods
-
-These codemods (code transformers) can be ran with [jscodeshift]((https://github.com/facebook/jscodeshift).
-
-### `addWidget-to-addWidgets`
-
-This will replace calls of `addWidget(widget)` to `addWidgets([widget])`, as well as `removeWidget(widget) to `removeWidgets([widget])`.
-
-```
-npx @codeshift/cli --packages 'instantsearch-codemods#addWidget-to-addWidgets' <path>
-```
-
-### Notes
-
-If you are using Prettier or ESLint, make sure to run its autofixing after this transformation, since code can be formatted differently after it has been transformed. For example, in our repository, the Prettier command would be:
-
-```
-yarn prettier --write '{examples,stories,.storybook}/**/*.{js,ts,tsx}'
-```
diff --git a/packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/global.input.js b/packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/global.input.js
deleted file mode 100644
index 9add634666..0000000000
--- a/packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/global.input.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* global instantsearch */
-
-const search = instantsearch();
-
-search.addWidget(instantsearch.widgets.hits({}));
-search.addWidget(instantsearch.widgets.hits({}));
diff --git a/packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/global.output.js b/packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/global.output.js
deleted file mode 100644
index 31406e4312..0000000000
--- a/packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/global.output.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* global instantsearch */
-
-const search = instantsearch();
-
-search.addWidgets([instantsearch.widgets.hits({})]);
-search.addWidgets([instantsearch.widgets.hits({})]);
diff --git a/packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/imported.input.js b/packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/imported.input.js
deleted file mode 100644
index fadfd4f772..0000000000
--- a/packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/imported.input.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import instantsearch from 'instantsearch.js';
-
-const search = instantsearch();
-
-search.addWidget(instantsearch.widgets.hits({}));
-search.addWidget(instantsearch.widgets.hits({}));
diff --git a/packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/imported.output.js b/packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/imported.output.js
deleted file mode 100644
index b027e035af..0000000000
--- a/packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/imported.output.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import instantsearch from 'instantsearch.js';
-
-const search = instantsearch();
-
-search.addWidgets([instantsearch.widgets.hits({})]);
-search.addWidgets([instantsearch.widgets.hits({})]);
diff --git a/packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/mixed.input.js b/packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/mixed.input.js
deleted file mode 100644
index 185ef745d3..0000000000
--- a/packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/mixed.input.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/* global instantsearch */
-
-const search = instantsearch();
-
-function someRandomFunction() {}
-
-search.addWidget(instantsearch.widgets.hits({}));
-
-someRandomFunction();
-
-search.addWidget(instantsearch.widgets.hits({}));
-
-search.addWidgets([instantsearch.widgets.hits({})]);
-
-search.addWidget(instantsearch.widgets.hits({}));
diff --git a/packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/mixed.output.js b/packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/mixed.output.js
deleted file mode 100644
index 96bdb572a5..0000000000
--- a/packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/mixed.output.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/* global instantsearch */
-
-const search = instantsearch();
-
-function someRandomFunction() {}
-
-search.addWidgets([instantsearch.widgets.hits({})]);
-
-someRandomFunction();
-
-search.addWidgets([instantsearch.widgets.hits({})]);
-
-search.addWidgets([instantsearch.widgets.hits({})]);
-
-search.addWidgets([instantsearch.widgets.hits({})]);
diff --git a/packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/remove.input.js b/packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/remove.input.js
deleted file mode 100644
index b34dd9c313..0000000000
--- a/packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/remove.input.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/* global instantsearch */
-
-const search = instantsearch();
-
-const hits = instantsearch.widgets.hits({});
-
-search.addWidget(hits);
-
-search.removeWidget(hits);
-
-search.addWidget(hits);
diff --git a/packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/remove.output.js b/packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/remove.output.js
deleted file mode 100644
index 7ab3407fde..0000000000
--- a/packages/instantsearch.js/scripts/transforms/__testfixtures__/addWidget-to-addWidgets/remove.output.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/* global instantsearch */
-
-const search = instantsearch();
-
-const hits = instantsearch.widgets.hits({});
-
-search.addWidgets([hits]);
-
-search.removeWidgets([hits]);
-
-search.addWidgets([hits]);
diff --git a/packages/instantsearch.js/scripts/transforms/__tests__/addWidget-to-addWidgets.test.js b/packages/instantsearch.js/scripts/transforms/__tests__/addWidget-to-addWidgets.test.js
deleted file mode 100644
index 51ac0b849c..0000000000
--- a/packages/instantsearch.js/scripts/transforms/__tests__/addWidget-to-addWidgets.test.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/* eslint-disable import/no-commonjs */
-const defineTest = require('jscodeshift/dist/testUtils').defineTest;
-
-defineTest(
-  __dirname,
-  'addWidget-to-addWidgets',
-  null,
-  'addWidget-to-addWidgets/global'
-);
-
-defineTest(
-  __dirname,
-  'addWidget-to-addWidgets',
-  null,
-  'addWidget-to-addWidgets/imported'
-);
-
-defineTest(
-  __dirname,
-  'addWidget-to-addWidgets',
-  null,
-  'addWidget-to-addWidgets/mixed'
-);
-
-defineTest(
-  __dirname,
-  'addWidget-to-addWidgets',
-  null,
-  'addWidget-to-addWidgets/remove'
-);
diff --git a/packages/instantsearch.js/scripts/transforms/addWidget-to-addWidgets.js b/packages/instantsearch.js/scripts/transforms/addWidget-to-addWidgets.js
deleted file mode 100644
index ad8b285531..0000000000
--- a/packages/instantsearch.js/scripts/transforms/addWidget-to-addWidgets.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/* eslint-disable no-console, import/no-commonjs */
-
-// @MAJOR: remove this file and only keep only the `instantsearch-codemods` one
-// also ensure this is removed from package.json
-console.warn(
-  "This file is deprecated. Please use `npx @codeshift/cli --packages 'instantsearch-codemods#addWidget-to-addWidgets' <path>` instead."
-);
-
-module.exports = require('instantsearch-codemods/src/addWidget-to-addWidgets');

From 6fe1fcb4fe4e3b471d1612f0c0abda538be6f326 Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Thu, 24 Oct 2024 08:44:34 +0200
Subject: [PATCH 09/37] fix(helpers): remove deprecated helpers (#6403)

BREAKING CHANGE: remove instantsearch.highlight, instantsearch.reverseHighlight, instantsearch.snippet, instantsearch.reverseSnippet. Instead use the `components` available from a template
BREAKING CHANGE: remove instantsearch.insights, instead use sendEvent
BREAKING CHANGE: remove instantsearch.getInsightsAnonymousUserToken
---
 examples/js/media/src/widgets/Articles.ts     |   4 +-
 .../src/__tests__/index-es-test.ts            |   9 +-
 .../src/__tests__/index-test.ts               |   7 +-
 .../components/InfiniteHits/InfiniteHits.tsx  |  19 +-
 .../__tests__/connectHitsWithInsights-test.ts | 111 -----
 .../hits/connectHitsWithInsights.ts           |  21 -
 .../instantsearch.js/src/connectors/index.ts  |   2 -
 .../connectInfiniteHitsWithInsights-test.ts   | 131 -----
 .../connectInfiniteHitsWithInsights.ts        |  24 -
 .../src/helpers/__tests__/highlight-test.ts   | 178 -------
 .../src/helpers/__tests__/insights-test.ts    | 162 ------
 .../__tests__/reverseHighlight-test.ts        | 277 -----------
 .../helpers/__tests__/reverseSnippet-test.ts  | 274 ----------
 .../src/helpers/__tests__/snippet-test.ts     | 183 -------
 .../get-insights-anonymous-user-token.ts      |  39 --
 .../instantsearch.js/src/helpers/highlight.ts |  66 ---
 .../instantsearch.js/src/helpers/index.ts     |  13 -
 .../instantsearch.js/src/helpers/insights.ts  |  70 ---
 .../src/helpers/reverseHighlight.ts           |  77 ---
 .../src/helpers/reverseSnippet.ts             |  77 ---
 .../instantsearch.js/src/helpers/snippet.ts   |  66 ---
 packages/instantsearch.js/src/index.es.ts     |  55 --
 packages/instantsearch.js/src/index.ts        |  21 -
 .../src/lib/insights/__tests__/client-test.js |  38 --
 .../__tests__/insights-client-test.ts         | 434 ----------------
 .../__tests__/insights-listener-test.tsx      | 468 ------------------
 .../src/lib/insights/client.ts                | 135 -----
 .../src/lib/insights/index.ts                 |   5 -
 .../src/lib/insights/listener.tsx             |  99 ----
 .../getInsightsAnonymousUserToken-test.ts}    |  16 +-
 .../utils/getInsightsAnonymousUserToken.ts    |  24 +
 .../instantsearch.js/src/lib/utils/index.ts   |  10 +-
 .../middlewares/createInsightsMiddleware.ts   |   7 +-
 .../src/widgets/hits/hits.tsx                 |  19 +-
 .../widgets/infinite-hits/infinite-hits.tsx   |   6 +-
 .../instantsearch.js/stories/hits.stories.ts  |  24 +-
 .../test/module/is-cjs-module.cjs             |   2 -
 .../test/module/is-es-module.mjs              |   2 -
 .../vue-instantsearch/src/components/Hits.js  |   6 +-
 .../src/components/InfiniteHits.vue           |   6 +-
 .../src/components/__tests__/Hits.js          |  59 ---
 .../src/components/__tests__/InfiniteHits.js  |  62 ---
 42 files changed, 66 insertions(+), 3242 deletions(-)
 delete mode 100644 packages/instantsearch.js/src/connectors/hits/__tests__/connectHitsWithInsights-test.ts
 delete mode 100644 packages/instantsearch.js/src/connectors/hits/connectHitsWithInsights.ts
 delete mode 100644 packages/instantsearch.js/src/connectors/infinite-hits/__tests__/connectInfiniteHitsWithInsights-test.ts
 delete mode 100644 packages/instantsearch.js/src/connectors/infinite-hits/connectInfiniteHitsWithInsights.ts
 delete mode 100644 packages/instantsearch.js/src/helpers/__tests__/highlight-test.ts
 delete mode 100644 packages/instantsearch.js/src/helpers/__tests__/insights-test.ts
 delete mode 100644 packages/instantsearch.js/src/helpers/__tests__/reverseHighlight-test.ts
 delete mode 100644 packages/instantsearch.js/src/helpers/__tests__/reverseSnippet-test.ts
 delete mode 100644 packages/instantsearch.js/src/helpers/__tests__/snippet-test.ts
 delete mode 100644 packages/instantsearch.js/src/helpers/get-insights-anonymous-user-token.ts
 delete mode 100644 packages/instantsearch.js/src/helpers/highlight.ts
 delete mode 100644 packages/instantsearch.js/src/helpers/index.ts
 delete mode 100644 packages/instantsearch.js/src/helpers/insights.ts
 delete mode 100644 packages/instantsearch.js/src/helpers/reverseHighlight.ts
 delete mode 100644 packages/instantsearch.js/src/helpers/reverseSnippet.ts
 delete mode 100644 packages/instantsearch.js/src/helpers/snippet.ts
 delete mode 100644 packages/instantsearch.js/src/lib/insights/__tests__/client-test.js
 delete mode 100644 packages/instantsearch.js/src/lib/insights/__tests__/insights-client-test.ts
 delete mode 100644 packages/instantsearch.js/src/lib/insights/__tests__/insights-listener-test.tsx
 delete mode 100644 packages/instantsearch.js/src/lib/insights/client.ts
 delete mode 100644 packages/instantsearch.js/src/lib/insights/index.ts
 delete mode 100644 packages/instantsearch.js/src/lib/insights/listener.tsx
 rename packages/instantsearch.js/src/{helpers/__tests__/get-insights-anonymous-user-token-test.ts => lib/utils/__tests__/getInsightsAnonymousUserToken-test.ts} (67%)
 create mode 100644 packages/instantsearch.js/src/lib/utils/getInsightsAnonymousUserToken.ts

diff --git a/examples/js/media/src/widgets/Articles.ts b/examples/js/media/src/widgets/Articles.ts
index ce2f4c90dd..fdc0ec88e6 100644
--- a/examples/js/media/src/widgets/Articles.ts
+++ b/examples/js/media/src/widgets/Articles.ts
@@ -1,10 +1,10 @@
 import { formatDistanceToNow } from 'date-fns';
 import { html, render } from 'htm/preact';
-import { Hit } from 'instantsearch.js';
+import { Hit as AlgoliaHit } from 'instantsearch.js';
 import { connectInfiniteHits } from 'instantsearch.js/es/connectors';
 import { Snippet, Highlight } from 'instantsearch.js/es/helpers/components';
 
-type Result = Hit<{
+type Result = AlgoliaHit<{
   slug: string;
   primary_category: {
     slug: string;
diff --git a/packages/instantsearch.js/src/__tests__/index-es-test.ts b/packages/instantsearch.js/src/__tests__/index-es-test.ts
index aa210f7213..cefda57206 100644
--- a/packages/instantsearch.js/src/__tests__/index-es-test.ts
+++ b/packages/instantsearch.js/src/__tests__/index-es-test.ts
@@ -40,17 +40,10 @@ describe('instantsearch()', () => {
     `);
   });
 
-  it('includes the helper functions', () => {
+  it("includes what's expected", () => {
     expect(Object.keys(instantsearch)).toMatchInlineSnapshot(`
       [
         "version",
-        "createInfiniteHitsSessionStorageCache",
-        "highlight",
-        "reverseHighlight",
-        "snippet",
-        "reverseSnippet",
-        "insights",
-        "getInsightsAnonymousUserToken",
       ]
     `);
   });
diff --git a/packages/instantsearch.js/src/__tests__/index-test.ts b/packages/instantsearch.js/src/__tests__/index-test.ts
index 019391c834..bbb8fea8b5 100644
--- a/packages/instantsearch.js/src/__tests__/index-test.ts
+++ b/packages/instantsearch.js/src/__tests__/index-test.ts
@@ -19,7 +19,7 @@ describe('instantsearch()', () => {
     });
   });
 
-  it('includes the API and the helper functions', () => {
+  it('includes the API', () => {
     expect(Object.keys(instantsearch)).toMatchInlineSnapshot(`
       [
         "version",
@@ -30,11 +30,6 @@ describe('instantsearch()', () => {
         "stateMappings",
         "templates",
         "createInfiniteHitsSessionStorageCache",
-        "highlight",
-        "reverseHighlight",
-        "snippet",
-        "reverseSnippet",
-        "insights",
       ]
     `);
   });
diff --git a/packages/instantsearch.js/src/components/InfiniteHits/InfiniteHits.tsx b/packages/instantsearch.js/src/components/InfiniteHits/InfiniteHits.tsx
index cbf1b1cd97..be10f7cf30 100644
--- a/packages/instantsearch.js/src/components/InfiniteHits/InfiniteHits.tsx
+++ b/packages/instantsearch.js/src/components/InfiniteHits/InfiniteHits.tsx
@@ -3,7 +3,6 @@
 import { cx } from 'instantsearch-ui-components';
 import { h } from 'preact';
 
-import { createInsightsEventHandler } from '../../lib/insights/listener';
 import { warning } from '../../lib/utils';
 import Template from '../Template/Template';
 
@@ -80,7 +79,7 @@ const DefaultBanner = ({
 const InfiniteHits = ({
   results,
   hits,
-  insights,
+
   sendEvent,
   hasShowPrevious,
   showPrevious,
@@ -91,17 +90,9 @@ const InfiniteHits = ({
   templateProps,
   banner,
 }: InfiniteHitsProps) => {
-  const handleInsightsClick = createInsightsEventHandler({
-    insights,
-    sendEvent,
-  });
-
   if (results.hits.length === 0) {
     return (
-      <div
-        className={cx(cssClasses.root, cssClasses.emptyRoot)}
-        onClick={handleInsightsClick}
-      >
+      <div className={cx(cssClasses.root, cssClasses.emptyRoot)}>
         {banner &&
           (templateProps.templates.banner ? (
             <Template
@@ -167,12 +158,10 @@ const InfiniteHits = ({
             rootTagName="li"
             rootProps={{
               className: cssClasses.item,
-              onClick: (event: MouseEvent) => {
-                handleInsightsClick(event);
+              onClick: () => {
                 sendEvent('click:internal', hit, 'Hit Clicked');
               },
-              onAuxClick: (event: MouseEvent) => {
-                handleInsightsClick(event);
+              onAuxClick: () => {
                 sendEvent('click:internal', hit, 'Hit Clicked');
               },
             }}
diff --git a/packages/instantsearch.js/src/connectors/hits/__tests__/connectHitsWithInsights-test.ts b/packages/instantsearch.js/src/connectors/hits/__tests__/connectHitsWithInsights-test.ts
deleted file mode 100644
index 483a191bb3..0000000000
--- a/packages/instantsearch.js/src/connectors/hits/__tests__/connectHitsWithInsights-test.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import {
-  createSearchClient,
-  createSingleSearchResponse,
-} from '@instantsearch/mocks';
-import algoliasearchHelper, { SearchResults } from 'algoliasearch-helper';
-
-import { createInstantSearch } from '../../../../test/createInstantSearch';
-import {
-  createDisposeOptions,
-  createInitOptions,
-  createRenderOptions,
-} from '../../../../test/createWidget';
-import connectHitsWithInsights from '../connectHitsWithInsights';
-
-import type { Hit } from '../../../types';
-
-jest.mock('../../../lib/utils/hits-absolute-position', () => ({
-  addAbsolutePosition: (hits: Hit[]) => hits,
-}));
-
-describe('connectHitsWithInsights', () => {
-  it('should expose `insights` props', () => {
-    const instantSearchInstance = createInstantSearch({
-      insightsClient() {},
-    });
-
-    const rendering = jest.fn();
-    const makeWidget = connectHitsWithInsights(rendering, jest.fn());
-    const widget = makeWidget({});
-
-    const helper = algoliasearchHelper(createSearchClient(), '', {});
-    helper.search = jest.fn();
-
-    widget.init(
-      createInitOptions({
-        instantSearchInstance,
-        state: helper.state,
-        helper,
-      })
-    );
-
-    const firstRenderingOptions = rendering.mock.calls[0][0];
-    expect(firstRenderingOptions.insights).toBeUndefined();
-
-    const hits = [
-      { fake: 'data', objectID: '1' },
-      { sample: 'infos', objectID: '2' },
-    ];
-    const results = new SearchResults(helper.state, [
-      createSingleSearchResponse({ hits }),
-    ]);
-
-    widget.render(
-      createRenderOptions({
-        instantSearchInstance,
-        state: helper.state,
-        results,
-        helper,
-      })
-    );
-
-    const secondRenderingOptions = rendering.mock.calls[1][0];
-    expect(secondRenderingOptions.insights).toBeInstanceOf(Function);
-  });
-
-  it('should preserve props exposed by connectHits', () => {
-    const rendering = jest.fn();
-    const makeWidget = connectHitsWithInsights(rendering, jest.fn());
-    const widget = makeWidget({});
-
-    const helper = algoliasearchHelper(createSearchClient(), '', {});
-    helper.search = jest.fn();
-
-    widget.init(
-      createInitOptions({
-        state: helper.state,
-        helper,
-      })
-    );
-
-    const hits = [
-      { fake: 'data', objectID: '1' },
-      { sample: 'infos', objectID: '2' },
-    ];
-    const results = new SearchResults(helper.state, [
-      createSingleSearchResponse({ hits }),
-    ]);
-
-    widget.render(
-      createRenderOptions({
-        state: helper.state,
-        results,
-        helper,
-      })
-    );
-
-    const secondRenderingOptions = rendering.mock.calls[1][0];
-    expect(secondRenderingOptions.hits).toEqual(expect.objectContaining(hits));
-    expect(secondRenderingOptions.results).toEqual(results);
-  });
-
-  it('does not throw without the unmount function', () => {
-    const rendering = () => {};
-    const makeWidget = connectHitsWithInsights(rendering);
-    const widget = makeWidget({});
-    const helper = algoliasearchHelper(createSearchClient(), '', {});
-    expect(() => {
-      widget.dispose(createDisposeOptions({ helper, state: helper.state }));
-    }).not.toThrow();
-  });
-});
diff --git a/packages/instantsearch.js/src/connectors/hits/connectHitsWithInsights.ts b/packages/instantsearch.js/src/connectors/hits/connectHitsWithInsights.ts
deleted file mode 100644
index d2a256478a..0000000000
--- a/packages/instantsearch.js/src/connectors/hits/connectHitsWithInsights.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { withInsights } from '../../lib/insights';
-
-import connectHits from './connectHits';
-
-import type { Connector } from '../../types';
-import type { HitsConnectorParams, HitsWidgetDescription } from './connectHits';
-
-/**
- * Due to https://github.com/microsoft/web-build-tools/issues/1050, we need
- * Connector<...> imported in this file, even though it is only used implicitly.
- * This _uses_ Connector<...> so it is not accidentally removed by someone.
- */
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-declare type ImportWorkaround = Connector<
-  HitsWidgetDescription,
-  HitsConnectorParams
->;
-
-const connectHitsWithInsights = withInsights(connectHits);
-
-export default connectHitsWithInsights;
diff --git a/packages/instantsearch.js/src/connectors/index.ts b/packages/instantsearch.js/src/connectors/index.ts
index 23e689e115..d31ac83b40 100644
--- a/packages/instantsearch.js/src/connectors/index.ts
+++ b/packages/instantsearch.js/src/connectors/index.ts
@@ -3,10 +3,8 @@ export { default as connectClearRefinements } from './clear-refinements/connectC
 export { default as connectCurrentRefinements } from './current-refinements/connectCurrentRefinements';
 export { default as connectHierarchicalMenu } from './hierarchical-menu/connectHierarchicalMenu';
 export { default as connectHits } from './hits/connectHits';
-export { default as connectHitsWithInsights } from './hits/connectHitsWithInsights';
 export { default as connectHitsPerPage } from './hits-per-page/connectHitsPerPage';
 export { default as connectInfiniteHits } from './infinite-hits/connectInfiniteHits';
-export { default as connectInfiniteHitsWithInsights } from './infinite-hits/connectInfiniteHitsWithInsights';
 export { default as connectMenu } from './menu/connectMenu';
 export { default as connectNumericMenu } from './numeric-menu/connectNumericMenu';
 export { default as connectPagination } from './pagination/connectPagination';
diff --git a/packages/instantsearch.js/src/connectors/infinite-hits/__tests__/connectInfiniteHitsWithInsights-test.ts b/packages/instantsearch.js/src/connectors/infinite-hits/__tests__/connectInfiniteHitsWithInsights-test.ts
deleted file mode 100644
index 9940e03eca..0000000000
--- a/packages/instantsearch.js/src/connectors/infinite-hits/__tests__/connectInfiniteHitsWithInsights-test.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-import {
-  createSearchClient,
-  createSingleSearchResponse,
-} from '@instantsearch/mocks';
-import algoliasearchHelper, { SearchResults } from 'algoliasearch-helper';
-
-import { createInstantSearch } from '../../../../test/createInstantSearch';
-import {
-  createDisposeOptions,
-  createInitOptions,
-  createRenderOptions,
-} from '../../../../test/createWidget';
-import connectInfiniteHitsWithInsights from '../connectInfiniteHitsWithInsights';
-
-import type {
-  InstantSearch,
-  InitOptions,
-  RenderOptions,
-  Hit,
-} from '../../../types';
-
-jest.mock('../../../lib/utils/hits-absolute-position', () => ({
-  addAbsolutePosition: (hits: Hit[]) => hits,
-}));
-
-describe('connectInfiniteHitsWithInsights', () => {
-  const createInstantSearchWithInsights = (): InstantSearch =>
-    createInstantSearch({
-      insightsClient() {},
-    });
-
-  const createInitOptionsWithInsights = (
-    args: Partial<InitOptions>
-  ): InitOptions =>
-    createInitOptions({
-      instantSearchInstance: createInstantSearchWithInsights(),
-      ...args,
-    });
-
-  const createRenderOptionsWithInsights = (
-    args: Partial<RenderOptions>
-  ): RenderOptions =>
-    createRenderOptions({
-      instantSearchInstance: createInstantSearchWithInsights(),
-      ...args,
-    });
-
-  it('should expose `insights` props', () => {
-    const rendering = jest.fn();
-    const makeWidget = connectInfiniteHitsWithInsights(rendering, jest.fn());
-    const widget = makeWidget({});
-
-    const helper = algoliasearchHelper(createSearchClient(), '', {});
-    helper.search = jest.fn();
-
-    widget.init(
-      createInitOptionsWithInsights({
-        state: helper.state,
-        helper,
-      })
-    );
-
-    const firstRenderingOptions = rendering.mock.calls[0][0];
-    expect(firstRenderingOptions.insights).toBeUndefined();
-
-    const hits = [
-      { fake: 'data', objectID: '1' },
-      { sample: 'infos', objectID: '2' },
-    ];
-    const results = new SearchResults(helper.state, [
-      createSingleSearchResponse({ hits }),
-    ]);
-
-    widget.render(
-      createRenderOptionsWithInsights({
-        state: helper.state,
-        results,
-        helper,
-      })
-    );
-
-    const secondRenderingOptions = rendering.mock.calls[1][0];
-    expect(secondRenderingOptions.insights).toBeInstanceOf(Function);
-  });
-
-  it('should preserve props exposed by connectInfiniteHits', () => {
-    const rendering = jest.fn();
-    const makeWidget = connectInfiniteHitsWithInsights(rendering, jest.fn());
-    const widget = makeWidget({});
-
-    const helper = algoliasearchHelper(createSearchClient(), '', {});
-    helper.search = jest.fn();
-
-    widget.init(
-      createInitOptionsWithInsights({
-        state: helper.state,
-        helper,
-      })
-    );
-
-    const hits = [
-      { fake: 'data', objectID: '1' },
-      { sample: 'infos', objectID: '2' },
-    ];
-    const results = new SearchResults(helper.state, [
-      createSingleSearchResponse({ hits }),
-    ]);
-
-    widget.render(
-      createRenderOptionsWithInsights({
-        state: helper.state,
-        results,
-        helper,
-      })
-    );
-
-    const secondRenderingOptions = rendering.mock.calls[1][0];
-    expect(secondRenderingOptions.hits).toEqual(expect.objectContaining(hits));
-    expect(secondRenderingOptions.results).toEqual(results);
-  });
-
-  it('does not throw without the unmount function', () => {
-    const rendering = () => {};
-    const makeWidget = connectInfiniteHitsWithInsights(rendering);
-    const helper = algoliasearchHelper(createSearchClient(), '', {});
-    const widget = makeWidget({});
-    expect(() =>
-      widget.dispose(createDisposeOptions({ helper, state: helper.state }))
-    ).not.toThrow();
-  });
-});
diff --git a/packages/instantsearch.js/src/connectors/infinite-hits/connectInfiniteHitsWithInsights.ts b/packages/instantsearch.js/src/connectors/infinite-hits/connectInfiniteHitsWithInsights.ts
deleted file mode 100644
index be199ef1f5..0000000000
--- a/packages/instantsearch.js/src/connectors/infinite-hits/connectInfiniteHitsWithInsights.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { withInsights } from '../../lib/insights';
-
-import connectInfiniteHits from './connectInfiniteHits';
-
-import type { Connector } from '../../types';
-import type {
-  InfiniteHitsWidgetDescription,
-  InfiniteHitsConnectorParams,
-} from './connectInfiniteHits';
-
-/**
- * Due to https://github.com/microsoft/web-build-tools/issues/1050, we need
- * Connector<...> imported in this file, even though it is only used implicitly.
- * This _uses_ Connector<...> so it is not accidentally removed by someone.
- */
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-declare type ImportWorkaround = Connector<
-  InfiniteHitsWidgetDescription,
-  InfiniteHitsConnectorParams
->;
-
-const connectInfiniteHitsWithInsights = withInsights(connectInfiniteHits);
-
-export default connectInfiniteHitsWithInsights;
diff --git a/packages/instantsearch.js/src/helpers/__tests__/highlight-test.ts b/packages/instantsearch.js/src/helpers/__tests__/highlight-test.ts
deleted file mode 100644
index 099f0c4922..0000000000
--- a/packages/instantsearch.js/src/helpers/__tests__/highlight-test.ts
+++ /dev/null
@@ -1,178 +0,0 @@
-import highlight from '../highlight';
-
-const NONE = 'none' as const;
-const FULL = 'full' as const;
-
-const hit = {
-  name: 'Amazon - Fire TV Stick with Alexa Voice Remote - Black',
-  description:
-    'Enjoy smart access to videos, games and apps with this Amazon Fire TV stick. Its Alexa voice remote lets you deliver hands-free commands when you want to watch television or engage with other applications. With a quad-core processor, 1GB internal memory and 8GB of storage, this portable Amazon Fire TV stick works fast for buffer-free streaming.',
-  brand: 'Amazon',
-  categories: ['TV & Home Theater', 'Streaming Media Players'],
-  hierarchicalCategories: {
-    lvl0: 'TV & Home Theater',
-    lvl1: 'TV & Home Theater > Streaming Media Players',
-  },
-  type: 'Streaming media plyr',
-  price: 39.99,
-  price_range: '1 - 50',
-  image: 'https://cdn-demo.algolia.com/bestbuy-0118/5477500_sb.jpg',
-  url: 'https://api.bestbuy.com/click/-/5477500/pdp',
-  free_shipping: false,
-  rating: 4,
-  popularity: 21469,
-  objectID: '5477500',
-  _highlightResult: {
-    name: {
-      value:
-        '<mark>Amazon</mark> - Fire TV Stick with Alexa Voice Remote - Black',
-      matchLevel: FULL,
-      fullyHighlighted: false,
-      matchedWords: ['amazon'],
-    },
-    description: {
-      value:
-        'Enjoy smart access to videos, games and apps with this <mark>Amazon</mark> Fire TV stick. Its Alexa voice remote lets you deliver hands-free commands when you want to watch television or engage with other applications. With a quad-core processor, 1GB internal memory and 8GB of storage, this portable <mark>Amazon</mark> Fire TV stick works fast for buffer-free streaming.',
-      matchLevel: FULL,
-      fullyHighlighted: false,
-      matchedWords: ['amazon'],
-    },
-    brand: {
-      value: '<mark>Amazon</mark>',
-      matchLevel: FULL,
-      fullyHighlighted: true,
-      matchedWords: ['amazon'],
-    },
-    categories: [
-      {
-        value: 'TV & Home Theater',
-        matchLevel: NONE,
-        matchedWords: [],
-      },
-      {
-        value: 'Streaming Media Players',
-        matchLevel: NONE,
-        matchedWords: [],
-      },
-    ],
-    type: {
-      value: 'Streaming media plyr',
-      matchLevel: NONE,
-      matchedWords: [],
-    },
-    meta: {
-      name: {
-        value: 'Nested <mark>Amazon</mark> name',
-        matchLevel: NONE,
-        matchedWords: ['Amazon'],
-      },
-    },
-  },
-};
-
-describe('highlight', () => {
-  test('with default tag name', () => {
-    expect(
-      highlight({
-        attribute: 'name',
-        hit,
-      })
-    ).toMatchInlineSnapshot(
-      `"<mark class=\\"ais-Highlight-highlighted\\">Amazon</mark> - Fire TV Stick with Alexa Voice Remote - Black"`
-    );
-  });
-
-  test('with custom tag name', () => {
-    expect(
-      highlight({
-        attribute: 'description',
-        highlightedTagName: 'em',
-        hit,
-      })
-    ).toMatchInlineSnapshot(
-      `"Enjoy smart access to videos, games and apps with this <em class=\\"ais-Highlight-highlighted\\">Amazon</em> Fire TV stick. Its Alexa voice remote lets you deliver hands-free commands when you want to watch television or engage with other applications. With a quad-core processor, 1GB internal memory and 8GB of storage, this portable <em class=\\"ais-Highlight-highlighted\\">Amazon</em> Fire TV stick works fast for buffer-free streaming."`
-    );
-  });
-
-  test('with custom highlighted class name', () => {
-    expect(
-      highlight({
-        attribute: 'description',
-        cssClasses: { highlighted: '__highlighted class' },
-        hit,
-      })
-    ).toMatchInlineSnapshot(
-      `"Enjoy smart access to videos, games and apps with this <mark class=\\"ais-Highlight-highlighted __highlighted class\\">Amazon</mark> Fire TV stick. Its Alexa voice remote lets you deliver hands-free commands when you want to watch television or engage with other applications. With a quad-core processor, 1GB internal memory and 8GB of storage, this portable <mark class=\\"ais-Highlight-highlighted __highlighted class\\">Amazon</mark> Fire TV stick works fast for buffer-free streaming."`
-    );
-  });
-
-  test('with unknown attribute returns an empty string', () => {
-    expect(
-      highlight({
-        attribute: 'wrong-attribute',
-        hit,
-      })
-    ).toMatchInlineSnapshot(`""`);
-  });
-
-  test('with nested attribute', () => {
-    expect(
-      highlight({
-        attribute: 'meta.name',
-        hit,
-      })
-    ).toMatchInlineSnapshot(
-      `"Nested <mark class=\\"ais-Highlight-highlighted\\">Amazon</mark> name"`
-    );
-  });
-
-  test('with nested attribute as array', () => {
-    expect(
-      highlight({
-        attribute: ['meta', 'name'],
-        hit,
-      })
-    ).toMatchInlineSnapshot(
-      `"Nested <mark class=\\"ais-Highlight-highlighted\\">Amazon</mark> name"`
-    );
-  });
-
-  test('with array attribute as array', () => {
-    expect(
-      highlight({
-        attribute: ['categories', '1'],
-        hit,
-      })
-    ).toMatchInlineSnapshot(`"Streaming Media Players"`);
-  });
-
-  test('warns if attribute does not exist', () => {
-    const trigger = () => {
-      highlight({
-        attribute: 'does.not.exist',
-        hit,
-      });
-    };
-
-    expect(trigger)
-      .toWarnDev(`[InstantSearch.js]: Could not enable highlight for "does.not.exist", will display an empty string.
-Please check whether this attribute exists and is either searchable or specified in \`attributesToHighlight\`.
-
-See: https://alg.li/highlighting`);
-  });
-
-  test('warns if attribute does not have highlighting', () => {
-    const trigger = () => {
-      highlight({
-        attribute: 'link',
-        hit,
-      });
-    };
-
-    expect(trigger)
-      .toWarnDev(`[InstantSearch.js]: Could not enable highlight for "link", will display an empty string.
-Please check whether this attribute exists and is either searchable or specified in \`attributesToHighlight\`.
-
-See: https://alg.li/highlighting`);
-  });
-});
diff --git a/packages/instantsearch.js/src/helpers/__tests__/insights-test.ts b/packages/instantsearch.js/src/helpers/__tests__/insights-test.ts
deleted file mode 100644
index ad4e187141..0000000000
--- a/packages/instantsearch.js/src/helpers/__tests__/insights-test.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-/**
- * @jest-environment jsdom
- */
-
-import { warning, serializePayload } from '../../lib/utils';
-import insights, { writeDataAttributes, readDataAttributes } from '../insights';
-
-const makeDomElement = (html: string): HTMLElement => {
-  const div = document.createElement('div');
-  div.innerHTML = html;
-  return (div.firstElementChild as HTMLElement) || div;
-};
-
-describe('insights', () => {
-  test('default behaviour', () => {
-    expect(
-      insights('clickedObjectIDsAfterSearch', {
-        objectIDs: ['3'],
-        eventName: 'Add to Cart',
-      })
-    ).toMatchInlineSnapshot(
-      `"data-insights-method=\\"clickedObjectIDsAfterSearch\\" data-insights-payload=\\"JTdCJTIyb2JqZWN0SURzJTIyJTNBJTVCJTIyMyUyMiU1RCUyQyUyMmV2ZW50TmFtZSUyMiUzQSUyMkFkZCUyMHRvJTIwQ2FydCUyMiU3RA==\\""`
-    );
-  });
-
-  it('shows a deprecation warning', () => {
-    warning.cache = {};
-
-    expect(() => {
-      insights('clickedObjectIDsAfterSearch', {
-        objectIDs: ['3'],
-        eventName: 'Add to Cart',
-      });
-    }).toWarnDev(
-      `[InstantSearch.js]: \`insights\` function has been deprecated. It is still supported in 4.x releases, but not further. It is replaced by the \`insights\` middleware.
-
-For more information, visit https://www.algolia.com/doc/guides/getting-insights-and-analytics/search-analytics/click-through-and-conversions/how-to/send-click-and-conversion-events-with-instantsearch/js/`
-    );
-  });
-});
-
-describe('writeDataAttributes', () => {
-  it('should output a string containing data-insights-* attributes', () => {
-    expect(
-      writeDataAttributes({
-        method: 'clickedObjectIDsAfterSearch',
-        payload: {
-          objectIDs: ['3'],
-          eventName: 'Add to Cart',
-        },
-      })
-    ).toMatchInlineSnapshot(
-      `"data-insights-method=\\"clickedObjectIDsAfterSearch\\" data-insights-payload=\\"JTdCJTIyb2JqZWN0SURzJTIyJTNBJTVCJTIyMyUyMiU1RCUyQyUyMmV2ZW50TmFtZSUyMiUzQSUyMkFkZCUyMHRvJTIwQ2FydCUyMiU3RA==\\""`
-    );
-  });
-  it('should reject undefined payloads', () => {
-    expect(() =>
-      // @ts-expect-error
-      writeDataAttributes({
-        method: 'clickedObjectIDsAfterSearch',
-      })
-    ).toThrowErrorMatchingInlineSnapshot(
-      `"The insights helper expects the payload to be an object."`
-    );
-  });
-  it('should reject non object payloads', () => {
-    expect(() =>
-      writeDataAttributes({
-        method: 'clickedObjectIDsAfterSearch',
-        // @ts-expect-error
-        payload: 2,
-      })
-    ).toThrowErrorMatchingInlineSnapshot(
-      `"The insights helper expects the payload to be an object."`
-    );
-  });
-  it('should reject non JSON serializable payloads', () => {
-    const circularObject: any = { a: {} };
-    circularObject.a.circle = circularObject;
-    expect(() =>
-      writeDataAttributes({
-        method: 'clickedObjectIDsAfterSearch',
-        payload: circularObject,
-      })
-    ).toThrowErrorMatchingInlineSnapshot(
-      `"Could not JSON serialize the payload object."`
-    );
-  });
-});
-
-describe('readDataAttributes', () => {
-  describe('on handwritten data-insights-* attributes', () => {
-    let domElement: HTMLElement;
-
-    beforeEach(() => {
-      const payload = serializePayload({
-        objectIDs: ['3'],
-        eventName: 'Add to Cart',
-      });
-      domElement = makeDomElement(
-        `<button
-        data-insights-method="clickedObjectIDsAfterSearch"
-        data-insights-payload="${payload}"
-        > Add to Cart </button>`
-      );
-    });
-
-    it('should extract the method name', () => {
-      expect(readDataAttributes(domElement).method).toEqual(
-        'clickedObjectIDsAfterSearch'
-      );
-    });
-
-    it('should extract the payload and parse it as a json object', () => {
-      expect(readDataAttributes(domElement).payload).toEqual({
-        objectIDs: ['3'],
-        eventName: 'Add to Cart',
-      });
-    });
-
-    it('should reject invalid payload', () => {
-      domElement = makeDomElement(
-        `<button
-        data-insights-method="clickedObjectIDsAfterSearch"
-        data-insights-payload='xxx'
-        > Add to Cart </button>`
-      );
-      expect(() =>
-        readDataAttributes(domElement)
-      ).toThrowErrorMatchingInlineSnapshot(
-        `"The insights helper was unable to parse \`data-insights-payload\`."`
-      );
-    });
-  });
-
-  describe('on data-insights-* attributes generated with insights helper', () => {
-    let domElement: HTMLElement;
-
-    beforeEach(() => {
-      domElement = makeDomElement(
-        `<button
-          ${insights('clickedObjectIDsAfterSearch', {
-            objectIDs: ['3'],
-            eventName: 'Add to Cart',
-          })}> Add to Cart </button>`
-      );
-    });
-
-    it('should extract the method name', () => {
-      expect(readDataAttributes(domElement).method).toEqual(
-        'clickedObjectIDsAfterSearch'
-      );
-    });
-
-    it('should extract the payload and parse it as a json object', () => {
-      expect(readDataAttributes(domElement).payload).toEqual({
-        objectIDs: ['3'],
-        eventName: 'Add to Cart',
-      });
-    });
-  });
-});
diff --git a/packages/instantsearch.js/src/helpers/__tests__/reverseHighlight-test.ts b/packages/instantsearch.js/src/helpers/__tests__/reverseHighlight-test.ts
deleted file mode 100644
index b1bb4e1f11..0000000000
--- a/packages/instantsearch.js/src/helpers/__tests__/reverseHighlight-test.ts
+++ /dev/null
@@ -1,277 +0,0 @@
-import reverseHighlight from '../reverseHighlight';
-
-const NONE = 'none' as const;
-const FULL = 'full' as const;
-
-const hit = {
-  name: 'Amazon - Fire TV Stick with Alexa Voice Remote - Black',
-  description:
-    'Enjoy smart access to videos, games and apps with this Amazon Fire TV stick. Its Alexa voice remote lets you deliver hands-free commands when you want to watch television or engage with other applications. With a quad-core processor, 1GB internal memory and 8GB of storage, this portable Amazon Fire TV stick works fast for buffer-free streaming.',
-  brand: 'Amazon',
-  categories: ['TV & Home Theater', 'Streaming Media Players'],
-  hierarchicalCategories: {
-    lvl0: 'TV & Home Theater',
-    lvl1: 'TV & Home Theater > Streaming Media Players',
-  },
-  type: 'Streaming - (media plyr)',
-  price: 39.99,
-  price_range: '1 - 50',
-  image: 'https://cdn-demo.algolia.com/bestbuy-0118/5477500_sb.jpg',
-  url: 'https://api.bestbuy.com/click/-/5477500/pdp',
-  free_shipping: false,
-  rating: 4,
-  popularity: 21469,
-  objectID: '5477500',
-  _highlightResult: {
-    name: {
-      value:
-        '<mark>Amazon</mark> - Fire TV Stick with Alexa Voice Remote - Black',
-      matchLevel: FULL,
-      fullyHighlighted: false,
-      matchedWords: ['amazon'],
-    },
-    description: {
-      value:
-        'Enjoy smart access to videos, games and apps with this <mark>Amazon</mark> Fire TV stick. Its Alexa voice remote lets you deliver hands-free commands when you want to watch television or engage with other applications. With a quad-core <mark>processor</mark>, <mark>1GB</mark> internal memory and 8GB of storage, this portable <mark>Amazon</mark> Fire TV stick works fast for buffer-free streaming.',
-      matchLevel: FULL,
-      fullyHighlighted: false,
-      matchedWords: ['amazon', 'processor', '1GB'],
-    },
-    brand: {
-      value: '<mark>Amazon</mark>',
-      matchLevel: FULL,
-      fullyHighlighted: true,
-      matchedWords: ['amazon'],
-    },
-    categories: [
-      {
-        value: 'TV & Home Theater',
-        matchLevel: NONE,
-        matchedWords: [],
-      },
-      {
-        value: 'Streaming Media Players',
-        matchLevel: NONE,
-        matchedWords: [],
-      },
-    ],
-    type: {
-      value: '<mark>Streaming</mark> - (<mark>media</mark> plyr)',
-      matchLevel: FULL,
-      fullyHighlighted: false,
-      matchedWords: ['streaming', 'media'],
-    },
-    typeMissingSibling: {
-      value: 'Streaming - (<mark>media</mark> plyr)',
-      matchLevel: FULL,
-      fullyHighlighted: false,
-      matchedWords: ['media'],
-    },
-    typeFullMatch: {
-      value: '<mark>Streaming</mark> - (<mark>media</mark> <mark>plyr</mark>)',
-      matchLevel: FULL,
-      fullyHighlighted: false,
-      matchedWords: ['streaming', 'media', 'plyr'],
-    },
-    meta: {
-      name: {
-        value: 'Nested <mark>Amazon</mark> name',
-        matchLevel: NONE,
-        matchedWords: ['Amazon'],
-      },
-    },
-  },
-};
-
-describe('reverseHighlight', () => {
-  test('with default tag name', () => {
-    expect(
-      reverseHighlight({
-        attribute: 'name',
-        hit,
-      })
-    ).toMatchInlineSnapshot(
-      `"Amazon<mark class=\\"ais-ReverseHighlight-highlighted\\"> - Fire TV Stick with Alexa Voice Remote - Black</mark>"`
-    );
-  });
-
-  test('with full match', () => {
-    expect(
-      reverseHighlight({
-        attribute: 'typeFullMatch',
-        hit,
-      })
-    ).toMatchInlineSnapshot(`"Streaming - (media plyr)"`);
-  });
-
-  test('with custom tag name', () => {
-    expect(
-      reverseHighlight({
-        attribute: 'description',
-        highlightedTagName: 'em',
-        hit,
-      })
-    ).toMatchInlineSnapshot(`
-      <em class="ais-ReverseHighlight-highlighted">
-        Enjoy smart access to videos, games and apps with this
-      </em>
-      Amazon
-      <em class="ais-ReverseHighlight-highlighted">
-        Fire TV stick. Its Alexa voice remote lets you deliver hands-free commands when you want to watch television or engage with other applications. With a quad-core
-      </em>
-      processor, 1GB
-      <em class="ais-ReverseHighlight-highlighted">
-        internal memory and 8GB of storage, this portable
-      </em>
-      Amazon
-      <em class="ais-ReverseHighlight-highlighted">
-        Fire TV stick works fast for buffer-free streaming.
-      </em>
-    `);
-  });
-
-  test('with custom highlighted class name', () => {
-    expect(
-      reverseHighlight({
-        attribute: 'description',
-        cssClasses: { highlighted: '__highlighted class' },
-        hit,
-      })
-    ).toMatchInlineSnapshot(`
-      <mark class="ais-ReverseHighlight-highlighted __highlighted class">
-        Enjoy smart access to videos, games and apps with this
-      </mark>
-      Amazon
-      <mark class="ais-ReverseHighlight-highlighted __highlighted class">
-        Fire TV stick. Its Alexa voice remote lets you deliver hands-free commands when you want to watch television or engage with other applications. With a quad-core
-      </mark>
-      processor, 1GB
-      <mark class="ais-ReverseHighlight-highlighted __highlighted class">
-        internal memory and 8GB of storage, this portable
-      </mark>
-      Amazon
-      <mark class="ais-ReverseHighlight-highlighted __highlighted class">
-        Fire TV stick works fast for buffer-free streaming.
-      </mark>
-    `);
-  });
-
-  test('with unknown attribute returns an empty string', () => {
-    expect(
-      reverseHighlight({
-        attribute: 'wrong-attribute',
-        hit,
-      })
-    ).toMatchInlineSnapshot(`""`);
-  });
-
-  test('with nested attribute', () => {
-    expect(
-      reverseHighlight({
-        attribute: 'meta.name',
-        hit,
-      })
-    ).toMatchInlineSnapshot(`
-      <mark class="ais-ReverseHighlight-highlighted">
-        Nested
-      </mark>
-      Amazon
-      <mark class="ais-ReverseHighlight-highlighted">
-        name
-      </mark>
-    `);
-  });
-
-  test('with nested attribute as array', () => {
-    expect(
-      reverseHighlight({
-        attribute: ['meta', 'name'],
-        hit,
-      })
-    ).toMatchInlineSnapshot(`
-      <mark class="ais-ReverseHighlight-highlighted">
-        Nested
-      </mark>
-      Amazon
-      <mark class="ais-ReverseHighlight-highlighted">
-        name
-      </mark>
-    `);
-  });
-
-  test('with array attribute', () => {
-    expect(
-      reverseHighlight({
-        attribute: 'categories.1',
-        hit,
-      })
-    ).toMatchInlineSnapshot(`"Streaming Media Players"`);
-  });
-
-  test('with array attribute as array', () => {
-    expect(
-      reverseHighlight({
-        attribute: ['categories', '1'],
-        hit,
-      })
-    ).toMatchInlineSnapshot(`"Streaming Media Players"`);
-  });
-
-  test('with non-alphanumeric character with alphanumeric siblings matching highlight', () => {
-    expect(
-      reverseHighlight({
-        attribute: 'type',
-        hit,
-      })
-    ).toMatchInlineSnapshot(
-      `"Streaming - (media<mark class=\\"ais-ReverseHighlight-highlighted\\"> plyr)</mark>"`
-    );
-  });
-
-  test('with non-alphanumeric character with different alphanumeric siblings highlight', () => {
-    expect(
-      reverseHighlight({
-        attribute: 'typeMissingSibling',
-        hit,
-      })
-    ).toMatchInlineSnapshot(`
-      <mark class="ais-ReverseHighlight-highlighted">
-        Streaming - (
-      </mark>
-      media
-      <mark class="ais-ReverseHighlight-highlighted">
-        plyr)
-      </mark>
-    `);
-  });
-
-  test('warns if attribute does not exist', () => {
-    const trigger = () => {
-      reverseHighlight({
-        attribute: 'does.not.exist',
-        hit,
-      });
-    };
-
-    expect(trigger)
-      .toWarnDev(`[InstantSearch.js]: Could not enable reverse highlight for "does.not.exist", will display an empty string.
-Please check whether this attribute exists and is either searchable or specified in \`attributesToHighlight\`.
-
-See: https://alg.li/highlighting`);
-  });
-
-  test('warns if attribute does not have highlighting', () => {
-    const trigger = () => {
-      reverseHighlight({
-        attribute: 'link',
-        hit,
-      });
-    };
-
-    expect(trigger)
-      .toWarnDev(`[InstantSearch.js]: Could not enable reverse highlight for "link", will display an empty string.
-Please check whether this attribute exists and is either searchable or specified in \`attributesToHighlight\`.
-
-See: https://alg.li/highlighting`);
-  });
-});
diff --git a/packages/instantsearch.js/src/helpers/__tests__/reverseSnippet-test.ts b/packages/instantsearch.js/src/helpers/__tests__/reverseSnippet-test.ts
deleted file mode 100644
index cce3cd2eae..0000000000
--- a/packages/instantsearch.js/src/helpers/__tests__/reverseSnippet-test.ts
+++ /dev/null
@@ -1,274 +0,0 @@
-import reverseSnippet from '../reverseSnippet';
-
-const NONE = 'none' as const;
-const FULL = 'full' as const;
-
-const hit = {
-  name: 'Amazon - Fire TV Stick with Alexa Voice Remote - Black',
-  description:
-    'Enjoy smart access to videos, games and apps with this Amazon Fire TV stick. Its Alexa voice remote lets you deliver hands-free commands when you want to watch television or engage with other applications. With a quad-core processor, 1GB internal memory and 8GB of storage, this portable Amazon Fire TV stick works fast for buffer-free streaming.',
-  brand: 'Amazon',
-  categories: ['TV & Home Theater', 'Streaming Media Players'],
-  hierarchicalCategories: {
-    lvl0: 'TV & Home Theater',
-    lvl1: 'TV & Home Theater > Streaming Media Players',
-  },
-  type: 'Streaming media plyr',
-  price: 39.99,
-  price_range: '1 - 50',
-  image: 'https://cdn-demo.algolia.com/bestbuy-0118/5477500_sb.jpg',
-  url: 'https://api.bestbuy.com/click/-/5477500/pdp',
-  free_shipping: false,
-  rating: 4,
-  popularity: 21469,
-  objectID: '5477500',
-  _snippetResult: {
-    name: {
-      value:
-        '<mark>Amazon</mark> - Fire TV Stick with Alexa Voice Remote - Black',
-      matchLevel: FULL,
-      fullyHighlighted: false,
-      matchedWords: ['amazon'],
-    },
-    description: {
-      value:
-        'Enjoy smart access to videos, games and apps with this <mark>Amazon</mark> Fire TV stick. Its Alexa voice remote lets you deliver hands-free commands when you want to watch television or engage with other applications. With a quad-core <mark>processor</mark>, <mark>1GB</mark> internal memory and 8GB of storage, this portable <mark>Amazon</mark> Fire TV stick works fast for buffer-free streaming.',
-      matchLevel: FULL,
-      fullyHighlighted: false,
-      matchedWords: ['amazon', 'procesor', '1GB'],
-    },
-    brand: {
-      value: '<mark>Amazon</mark>',
-      matchLevel: FULL,
-      fullyHighlighted: true,
-      matchedWords: ['amazon'],
-    },
-    categories: [
-      {
-        value: 'TV & Home Theater',
-        matchLevel: NONE,
-      },
-      {
-        value: 'Streaming Media Players',
-        matchLevel: NONE,
-      },
-    ],
-    type: {
-      value: '<mark>Streaming</mark> - (<mark>media</mark> plyr)',
-      matchLevel: FULL,
-      fullyHighlighted: false,
-      matchedWords: ['streaming', 'media'],
-    },
-    typeMissingSibling: {
-      value: 'Streaming - (<mark>media</mark> plyr)',
-      matchLevel: FULL,
-      fullyHighlighted: false,
-      matchedWords: ['media'],
-    },
-    typeFullMatch: {
-      value: '<mark>Streaming</mark> - (<mark>media</mark> <mark>plyr</mark>)',
-      matchLevel: FULL,
-      fullyHighlighted: false,
-      matchedWords: ['streaming', 'media', 'plyr'],
-    },
-    meta: {
-      name: {
-        value: 'Nested <mark>Amazon</mark> name',
-        matchLevel: FULL,
-      },
-    },
-  },
-};
-
-describe('reverseSnippet', () => {
-  test('with default tag name', () => {
-    expect(
-      reverseSnippet({
-        attribute: 'name',
-        hit,
-      })
-    ).toMatchInlineSnapshot(
-      `"Amazon<mark class=\\"ais-ReverseSnippet-highlighted\\"> - Fire TV Stick with Alexa Voice Remote - Black</mark>"`
-    );
-  });
-
-  test('with full match', () => {
-    expect(
-      reverseSnippet({
-        attribute: 'typeFullMatch',
-        hit,
-      })
-    ).toMatchInlineSnapshot(`"Streaming - (media plyr)"`);
-  });
-
-  test('with custom tag name', () => {
-    expect(
-      reverseSnippet({
-        attribute: 'description',
-        highlightedTagName: 'em',
-        hit,
-      })
-    ).toMatchInlineSnapshot(`
-      <em class="ais-ReverseSnippet-highlighted">
-        Enjoy smart access to videos, games and apps with this
-      </em>
-      Amazon
-      <em class="ais-ReverseSnippet-highlighted">
-        Fire TV stick. Its Alexa voice remote lets you deliver hands-free commands when you want to watch television or engage with other applications. With a quad-core
-      </em>
-      processor, 1GB
-      <em class="ais-ReverseSnippet-highlighted">
-        internal memory and 8GB of storage, this portable
-      </em>
-      Amazon
-      <em class="ais-ReverseSnippet-highlighted">
-        Fire TV stick works fast for buffer-free streaming.
-      </em>
-    `);
-  });
-
-  test('with custom highlighted class name', () => {
-    expect(
-      reverseSnippet({
-        attribute: 'description',
-        cssClasses: { highlighted: '__highlighted' },
-        hit,
-      })
-    ).toMatchInlineSnapshot(`
-      <mark class="ais-ReverseSnippet-highlighted __highlighted">
-        Enjoy smart access to videos, games and apps with this
-      </mark>
-      Amazon
-      <mark class="ais-ReverseSnippet-highlighted __highlighted">
-        Fire TV stick. Its Alexa voice remote lets you deliver hands-free commands when you want to watch television or engage with other applications. With a quad-core
-      </mark>
-      processor, 1GB
-      <mark class="ais-ReverseSnippet-highlighted __highlighted">
-        internal memory and 8GB of storage, this portable
-      </mark>
-      Amazon
-      <mark class="ais-ReverseSnippet-highlighted __highlighted">
-        Fire TV stick works fast for buffer-free streaming.
-      </mark>
-    `);
-  });
-
-  test('with unknown attribute returns an empty string', () => {
-    expect(
-      reverseSnippet({
-        attribute: 'wrong-attribute',
-        hit,
-      })
-    ).toMatchInlineSnapshot(`""`);
-  });
-
-  test('with nested attribute', () => {
-    expect(
-      reverseSnippet({
-        attribute: 'meta.name',
-        hit,
-      })
-    ).toMatchInlineSnapshot(`
-      <mark class="ais-ReverseSnippet-highlighted">
-        Nested
-      </mark>
-      Amazon
-      <mark class="ais-ReverseSnippet-highlighted">
-        name
-      </mark>
-    `);
-  });
-
-  test('with nested attribute as array', () => {
-    expect(
-      reverseSnippet({
-        attribute: ['meta', 'name'],
-        hit,
-      })
-    ).toMatchInlineSnapshot(`
-      <mark class="ais-ReverseSnippet-highlighted">
-        Nested
-      </mark>
-      Amazon
-      <mark class="ais-ReverseSnippet-highlighted">
-        name
-      </mark>
-    `);
-  });
-
-  test('with array attribute', () => {
-    expect(
-      reverseSnippet({
-        attribute: 'categories.1',
-        hit,
-      })
-    ).toMatchInlineSnapshot(`"Streaming Media Players"`);
-  });
-
-  test('with array attribute as array', () => {
-    expect(
-      reverseSnippet({
-        attribute: ['categories', '1'],
-        hit,
-      })
-    ).toMatchInlineSnapshot(`"Streaming Media Players"`);
-  });
-
-  test('with non-alphanumeric character with alphanumeric siblings matching highlight', () => {
-    expect(
-      reverseSnippet({
-        attribute: 'type',
-        hit,
-      })
-    ).toMatchInlineSnapshot(
-      `"Streaming - (media<mark class=\\"ais-ReverseSnippet-highlighted\\"> plyr)</mark>"`
-    );
-  });
-
-  test('with non-alphanumeric character with different alphanumeric siblings highlight', () => {
-    expect(
-      reverseSnippet({
-        attribute: 'typeMissingSibling',
-        hit,
-      })
-    ).toMatchInlineSnapshot(`
-      <mark class="ais-ReverseSnippet-highlighted">
-        Streaming - (
-      </mark>
-      media
-      <mark class="ais-ReverseSnippet-highlighted">
-        plyr)
-      </mark>
-    `);
-  });
-
-  test('warns if attribute does not exist', () => {
-    const trigger = () => {
-      reverseSnippet({
-        attribute: 'does.not.exist',
-        hit,
-      });
-    };
-
-    expect(trigger)
-      .toWarnDev(`[InstantSearch.js]: Could not enable reverse snippet for "does.not.exist", will display an empty string.
-Please check whether this attribute exists and is specified in \`attributesToSnippet\`.
-
-See: https://alg.li/highlighting`);
-  });
-
-  test('warns if attribute does not have snippeting', () => {
-    const trigger = () => {
-      reverseSnippet({
-        attribute: 'link',
-        hit,
-      });
-    };
-
-    expect(trigger)
-      .toWarnDev(`[InstantSearch.js]: Could not enable reverse snippet for "link", will display an empty string.
-Please check whether this attribute exists and is specified in \`attributesToSnippet\`.
-
-See: https://alg.li/highlighting`);
-  });
-});
diff --git a/packages/instantsearch.js/src/helpers/__tests__/snippet-test.ts b/packages/instantsearch.js/src/helpers/__tests__/snippet-test.ts
deleted file mode 100644
index de2a8cf060..0000000000
--- a/packages/instantsearch.js/src/helpers/__tests__/snippet-test.ts
+++ /dev/null
@@ -1,183 +0,0 @@
-import snippet from '../snippet';
-
-const NONE = 'none' as const;
-const FULL = 'full' as const;
-
-const hit = {
-  name: 'Amazon - Fire TV Stick with Alexa Voice Remote - Black',
-  description:
-    'Enjoy smart access to videos, games and apps with this Amazon Fire TV stick. Its Alexa voice remote lets you deliver hands-free commands when you want to watch television or engage with other applications. With a quad-core processor, 1GB internal memory and 8GB of storage, this portable Amazon Fire TV stick works fast for buffer-free streaming.',
-  brand: 'Amazon',
-  categories: ['TV & Home Theater', 'Streaming Media Players'],
-  hierarchicalCategories: {
-    lvl0: 'TV & Home Theater',
-    lvl1: 'TV & Home Theater > Streaming Media Players',
-  },
-  type: 'Streaming media plyr',
-  price: 39.99,
-  price_range: '1 - 50',
-  image: 'https://cdn-demo.algolia.com/bestbuy-0118/5477500_sb.jpg',
-  url: 'https://api.bestbuy.com/click/-/5477500/pdp',
-  free_shipping: false,
-  rating: 4,
-  popularity: 21469,
-  objectID: '5477500',
-  _snippetResult: {
-    name: {
-      value:
-        '<mark>Amazon</mark> - Fire TV Stick with Alexa Voice Remote - Black',
-      matchLevel: FULL,
-      fullyHighlighted: false,
-      matchedWords: ['amazon'],
-    },
-    description: {
-      value:
-        'Enjoy smart access to videos, games and apps with this <mark>Amazon</mark> Fire TV stick. Its Alexa voice remote lets you deliver hands-free commands when you want to watch television or engage with other applications. With a quad-core processor, 1GB internal memory and 8GB of storage, this portable <mark>Amazon</mark> Fire TV stick works fast for buffer-free streaming.',
-      matchLevel: FULL,
-      fullyHighlighted: false,
-      matchedWords: ['amazon'],
-    },
-    brand: {
-      value: '<mark>Amazon</mark>',
-      matchLevel: FULL,
-      fullyHighlighted: true,
-      matchedWords: ['amazon'],
-    },
-    categories: [
-      {
-        value: 'TV & Home Theater',
-        matchLevel: NONE,
-      },
-      {
-        value: 'Streaming Media Players',
-        matchLevel: NONE,
-      },
-    ],
-    type: {
-      value: 'Streaming media plyr',
-      matchLevel: NONE,
-    },
-    meta: {
-      name: {
-        value: 'Nested <mark>Amazon</mark> name',
-        matchLevel: FULL,
-      },
-    },
-  },
-};
-
-describe('snippet', () => {
-  test('with default tag name', () => {
-    expect(
-      snippet({
-        attribute: 'name',
-        hit,
-      })
-    ).toMatchInlineSnapshot(
-      `"<mark class=\\"ais-Snippet-highlighted\\">Amazon</mark> - Fire TV Stick with Alexa Voice Remote - Black"`
-    );
-  });
-
-  test('with custom tag name', () => {
-    expect(
-      snippet({
-        attribute: 'description',
-        highlightedTagName: 'em',
-        hit,
-      })
-    ).toMatchInlineSnapshot(
-      `"Enjoy smart access to videos, games and apps with this <em class=\\"ais-Snippet-highlighted\\">Amazon</em> Fire TV stick. Its Alexa voice remote lets you deliver hands-free commands when you want to watch television or engage with other applications. With a quad-core processor, 1GB internal memory and 8GB of storage, this portable <em class=\\"ais-Snippet-highlighted\\">Amazon</em> Fire TV stick works fast for buffer-free streaming."`
-    );
-  });
-
-  test('with custom highlighted class name', () => {
-    expect(
-      snippet({
-        attribute: 'description',
-        cssClasses: { highlighted: '__highlighted' },
-        hit,
-      })
-    ).toMatchInlineSnapshot(
-      `"Enjoy smart access to videos, games and apps with this <mark class=\\"ais-Snippet-highlighted __highlighted\\">Amazon</mark> Fire TV stick. Its Alexa voice remote lets you deliver hands-free commands when you want to watch television or engage with other applications. With a quad-core processor, 1GB internal memory and 8GB of storage, this portable <mark class=\\"ais-Snippet-highlighted __highlighted\\">Amazon</mark> Fire TV stick works fast for buffer-free streaming."`
-    );
-  });
-
-  test('with unknown attribute returns an empty string', () => {
-    expect(
-      snippet({
-        attribute: 'wrong-attribute',
-        hit,
-      })
-    ).toMatchInlineSnapshot(`""`);
-  });
-
-  test('with nested attribute', () => {
-    expect(
-      snippet({
-        attribute: 'meta.name',
-        hit,
-      })
-    ).toMatchInlineSnapshot(
-      `"Nested <mark class=\\"ais-Snippet-highlighted\\">Amazon</mark> name"`
-    );
-  });
-
-  test('with nested attribute as array', () => {
-    expect(
-      snippet({
-        attribute: ['meta', 'name'],
-        hit,
-      })
-    ).toMatchInlineSnapshot(
-      `"Nested <mark class=\\"ais-Snippet-highlighted\\">Amazon</mark> name"`
-    );
-  });
-
-  test('with array attribute', () => {
-    expect(
-      snippet({
-        attribute: 'categories.1',
-        hit,
-      })
-    ).toMatchInlineSnapshot(`"Streaming Media Players"`);
-  });
-
-  test('with array attribute as array', () => {
-    expect(
-      snippet({
-        attribute: ['categories', '1'],
-        hit,
-      })
-    ).toMatchInlineSnapshot(`"Streaming Media Players"`);
-  });
-
-  test('warns if attribute does not exist', () => {
-    const trigger = () => {
-      snippet({
-        attribute: 'does.not.exist',
-        hit,
-      });
-    };
-
-    expect(trigger)
-      .toWarnDev(`[InstantSearch.js]: Could not enable snippet for "does.not.exist", will display an empty string.
-Please check whether this attribute exists and is specified in \`attributesToSnippet\`.
-
-See: https://alg.li/highlighting`);
-  });
-
-  test('warns if attribute does not have snippeting', () => {
-    const trigger = () => {
-      snippet({
-        attribute: 'link',
-        hit,
-      });
-    };
-
-    expect(trigger)
-      .toWarnDev(`[InstantSearch.js]: Could not enable snippet for "link", will display an empty string.
-Please check whether this attribute exists and is specified in \`attributesToSnippet\`.
-
-See: https://alg.li/highlighting`);
-  });
-});
diff --git a/packages/instantsearch.js/src/helpers/get-insights-anonymous-user-token.ts b/packages/instantsearch.js/src/helpers/get-insights-anonymous-user-token.ts
deleted file mode 100644
index 9e698a0e51..0000000000
--- a/packages/instantsearch.js/src/helpers/get-insights-anonymous-user-token.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { warning } from '../lib/utils';
-
-export const ANONYMOUS_TOKEN_COOKIE_KEY = '_ALGOLIA';
-
-function getCookie(name: string): string | undefined {
-  if (typeof document !== 'object' || typeof document.cookie !== 'string') {
-    return undefined;
-  }
-
-  const prefix = `${name}=`;
-  const cookies = document.cookie.split(';');
-  for (let i = 0; i < cookies.length; i++) {
-    let cookie = cookies[i];
-    while (cookie.charAt(0) === ' ') {
-      cookie = cookie.substring(1);
-    }
-    if (cookie.indexOf(prefix) === 0) {
-      return cookie.substring(prefix.length, cookie.length);
-    }
-  }
-  return undefined;
-}
-
-export function getInsightsAnonymousUserTokenInternal(): string | undefined {
-  return getCookie(ANONYMOUS_TOKEN_COOKIE_KEY);
-}
-
-/**
- * @deprecated This function will be still supported in 4.x releases, but not further. It is replaced by the `insights` middleware. For more information, visit https://www.algolia.com/doc/guides/getting-insights-and-analytics/search-analytics/click-through-and-conversions/how-to/send-click-and-conversion-events-with-instantsearch/js/
- */
-export default function getInsightsAnonymousUserToken(): string | undefined {
-  warning(
-    false,
-    `\`getInsightsAnonymousUserToken\` function has been deprecated. It is still supported in 4.x releases, but not further. It is replaced by the \`insights\` middleware.
-
-For more information, visit https://www.algolia.com/doc/guides/getting-insights-and-analytics/search-analytics/click-through-and-conversions/how-to/send-click-and-conversion-events-with-instantsearch/js/`
-  );
-  return getInsightsAnonymousUserTokenInternal();
-}
diff --git a/packages/instantsearch.js/src/helpers/highlight.ts b/packages/instantsearch.js/src/helpers/highlight.ts
deleted file mode 100644
index 825af6ab21..0000000000
--- a/packages/instantsearch.js/src/helpers/highlight.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { component } from '../lib/suit';
-import { getPropertyByPath, TAG_REPLACEMENT, warning } from '../lib/utils';
-
-import type { Hit } from '../types';
-
-export type HighlightOptions = {
-  // @MAJOR string should no longer be allowed to be a path, only array can be a path
-  attribute: string | string[];
-  highlightedTagName?: string;
-  hit: Partial<Hit>;
-  cssClasses?: Partial<{
-    highlighted: string;
-  }>;
-};
-
-const suit = component('Highlight');
-
-/**
- * @deprecated use html tagged templates and the Highlight component instead
- */
-export default function highlight({
-  attribute,
-  highlightedTagName = 'mark',
-  hit,
-  cssClasses = {},
-}: HighlightOptions): string {
-  warning(
-    false,
-    `\`instantsearch.highlight\` function has been deprecated. It is still supported in 4.x releases, but not further. It is replaced by the \`Highlight\` component.
-
-For more information, visit https://www.algolia.com/doc/guides/building-search-ui/upgrade-guides/js/?client=html+tagged+templates#upgrade-templates`
-  );
-
-  const highlightAttributeResult = getPropertyByPath(
-    hit._highlightResult,
-    attribute
-  );
-
-  // @MAJOR fallback to attribute value if highlight is not found
-  warning(
-    highlightAttributeResult,
-    `Could not enable highlight for "${attribute}", will display an empty string.
-Please check whether this attribute exists and is either searchable or specified in \`attributesToHighlight\`.
-
-See: https://alg.li/highlighting
-`
-  );
-
-  const { value: attributeValue = '' } = highlightAttributeResult || {};
-
-  // cx is not used, since it would be bundled as a dependency for Vue
-  const className =
-    suit({
-      descendantName: 'highlighted',
-    }) + (cssClasses.highlighted ? ` ${cssClasses.highlighted}` : '');
-
-  return attributeValue
-    .replace(
-      new RegExp(TAG_REPLACEMENT.highlightPreTag, 'g'),
-      `<${highlightedTagName} class="${className}">`
-    )
-    .replace(
-      new RegExp(TAG_REPLACEMENT.highlightPostTag, 'g'),
-      `</${highlightedTagName}>`
-    );
-}
diff --git a/packages/instantsearch.js/src/helpers/index.ts b/packages/instantsearch.js/src/helpers/index.ts
deleted file mode 100644
index efa2a06e29..0000000000
--- a/packages/instantsearch.js/src/helpers/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export * from './highlight';
-export * from './reverseHighlight';
-export * from './snippet';
-export * from './reverseSnippet';
-export { default as reverseHighlight } from './reverseHighlight';
-export { default as reverseSnippet } from './reverseSnippet';
-export { default as highlight } from './highlight';
-export { default as snippet } from './snippet';
-export { default as insights } from './insights';
-export {
-  default as getInsightsAnonymousUserToken,
-  getInsightsAnonymousUserTokenInternal,
-} from './get-insights-anonymous-user-token';
diff --git a/packages/instantsearch.js/src/helpers/insights.ts b/packages/instantsearch.js/src/helpers/insights.ts
deleted file mode 100644
index cd7eb04e39..0000000000
--- a/packages/instantsearch.js/src/helpers/insights.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { warning, serializePayload, deserializePayload } from '../lib/utils';
-
-import type { InsightsClientMethod, InsightsClientPayload } from '../types';
-
-/** @deprecated use bindEvent instead */
-export function readDataAttributes(domElement: HTMLElement): {
-  method: InsightsClientMethod;
-  payload: Partial<InsightsClientPayload>;
-} {
-  const method = domElement.getAttribute(
-    'data-insights-method'
-  ) as InsightsClientMethod;
-
-  const serializedPayload = domElement.getAttribute('data-insights-payload');
-
-  if (typeof serializedPayload !== 'string') {
-    throw new Error(
-      'The insights helper expects `data-insights-payload` to be a base64-encoded JSON string.'
-    );
-  }
-
-  try {
-    const payload =
-      deserializePayload<Partial<InsightsClientPayload>>(serializedPayload);
-    return { method, payload };
-  } catch (error) {
-    throw new Error(
-      'The insights helper was unable to parse `data-insights-payload`.'
-    );
-  }
-}
-
-/** @deprecated use bindEvent instead */
-export function writeDataAttributes({
-  method,
-  payload,
-}: {
-  method: InsightsClientMethod;
-  payload: Partial<InsightsClientPayload>;
-}): string {
-  if (typeof payload !== 'object') {
-    throw new Error(`The insights helper expects the payload to be an object.`);
-  }
-
-  let serializedPayload: string;
-
-  try {
-    serializedPayload = serializePayload(payload);
-  } catch (error) {
-    throw new Error(`Could not JSON serialize the payload object.`);
-  }
-
-  return `data-insights-method="${method}" data-insights-payload="${serializedPayload}"`;
-}
-
-/**
- * @deprecated This function will be still supported in 4.x releases, but not further. It is replaced by the `insights` middleware. For more information, visit https://www.algolia.com/doc/guides/getting-insights-and-analytics/search-analytics/click-through-and-conversions/how-to/send-click-and-conversion-events-with-instantsearch/js/
- */
-export default function insights(
-  method: InsightsClientMethod,
-  payload: Partial<InsightsClientPayload>
-): string {
-  warning(
-    false,
-    `\`insights\` function has been deprecated. It is still supported in 4.x releases, but not further. It is replaced by the \`insights\` middleware.
-
-For more information, visit https://www.algolia.com/doc/guides/getting-insights-and-analytics/search-analytics/click-through-and-conversions/how-to/send-click-and-conversion-events-with-instantsearch/js/`
-  );
-  return writeDataAttributes({ method, payload });
-}
diff --git a/packages/instantsearch.js/src/helpers/reverseHighlight.ts b/packages/instantsearch.js/src/helpers/reverseHighlight.ts
deleted file mode 100644
index 371151c10e..0000000000
--- a/packages/instantsearch.js/src/helpers/reverseHighlight.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { component } from '../lib/suit';
-import {
-  TAG_REPLACEMENT,
-  getPropertyByPath,
-  getHighlightedParts,
-  reverseHighlightedParts,
-  concatHighlightedParts,
-  warning,
-} from '../lib/utils';
-
-import type { Hit } from '../types';
-
-export type ReverseHighlightOptions = {
-  // @MAJOR string should no longer be allowed to be a path, only array can be a path
-  attribute: string | string[];
-  highlightedTagName?: string;
-  hit: Partial<Hit>;
-  cssClasses?: Partial<{
-    highlighted: string;
-  }>;
-};
-
-const suit = component('ReverseHighlight');
-
-/**
- * @deprecated use html tagged templates and the ReverseHighlight component instead
- */
-export default function reverseHighlight({
-  attribute,
-  highlightedTagName = 'mark',
-  hit,
-  cssClasses = {},
-}: ReverseHighlightOptions): string {
-  warning(
-    false,
-    `\`instantsearch.reverseHighlight\` function has been deprecated. It is still supported in 4.x releases, but not further. It is replaced by the \`ReverseHighlight\` component.
-
-For more information, visit https://www.algolia.com/doc/guides/building-search-ui/upgrade-guides/js/?client=html+tagged+templates#upgrade-templates`
-  );
-
-  const highlightAttributeResult = getPropertyByPath(
-    hit._highlightResult,
-    attribute
-  );
-
-  // @MAJOR fallback to attribute value if highlight is not found
-  warning(
-    highlightAttributeResult,
-    `Could not enable reverse highlight for "${attribute}", will display an empty string.
-Please check whether this attribute exists and is either searchable or specified in \`attributesToHighlight\`.
-
-See: https://alg.li/highlighting
-`
-  );
-
-  const { value: attributeValue = '' } = highlightAttributeResult || {};
-
-  // cx is not used, since it would be bundled as a dependency for Vue
-  const className =
-    suit({
-      descendantName: 'highlighted',
-    }) + (cssClasses.highlighted ? ` ${cssClasses.highlighted}` : '');
-
-  const reverseHighlightedValue = concatHighlightedParts(
-    reverseHighlightedParts(getHighlightedParts(attributeValue))
-  );
-
-  return reverseHighlightedValue
-    .replace(
-      new RegExp(TAG_REPLACEMENT.highlightPreTag, 'g'),
-      `<${highlightedTagName} class="${className}">`
-    )
-    .replace(
-      new RegExp(TAG_REPLACEMENT.highlightPostTag, 'g'),
-      `</${highlightedTagName}>`
-    );
-}
diff --git a/packages/instantsearch.js/src/helpers/reverseSnippet.ts b/packages/instantsearch.js/src/helpers/reverseSnippet.ts
deleted file mode 100644
index d2d420b95f..0000000000
--- a/packages/instantsearch.js/src/helpers/reverseSnippet.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { component } from '../lib/suit';
-import {
-  TAG_REPLACEMENT,
-  getPropertyByPath,
-  getHighlightedParts,
-  reverseHighlightedParts,
-  concatHighlightedParts,
-  warning,
-} from '../lib/utils';
-
-import type { Hit } from '../types';
-
-export type ReverseSnippetOptions = {
-  // @MAJOR string should no longer be allowed to be a path, only array can be a path
-  attribute: string | string[];
-  highlightedTagName?: string;
-  hit: Partial<Hit>;
-  cssClasses?: Partial<{
-    highlighted: string;
-  }>;
-};
-
-const suit = component('ReverseSnippet');
-
-/**
- * @deprecated use html tagged templates and the ReverseSnippet component instead
- */
-export default function reverseSnippet({
-  attribute,
-  highlightedTagName = 'mark',
-  hit,
-  cssClasses = {},
-}: ReverseSnippetOptions): string {
-  warning(
-    false,
-    `\`instantsearch.reverseSnippet\` function has been deprecated. It is still supported in 4.x releases, but not further. It is replaced by the \`ReverseSnippet\` component.
-
-For more information, visit https://www.algolia.com/doc/guides/building-search-ui/upgrade-guides/js/?client=html+tagged+templates#upgrade-templates`
-  );
-
-  const snippetAttributeResult = getPropertyByPath(
-    hit._snippetResult,
-    attribute
-  );
-
-  // @MAJOR fallback to attribute value if snippet is not found
-  warning(
-    snippetAttributeResult,
-    `Could not enable reverse snippet for "${attribute}", will display an empty string.
-Please check whether this attribute exists and is specified in \`attributesToSnippet\`.
-
-See: https://alg.li/highlighting
-`
-  );
-
-  const { value: attributeValue = '' } = snippetAttributeResult || {};
-
-  // cx is not used, since it would be bundled as a dependency for Vue
-  const className =
-    suit({
-      descendantName: 'highlighted',
-    }) + (cssClasses.highlighted ? ` ${cssClasses.highlighted}` : '');
-
-  const reverseHighlightedValue = concatHighlightedParts(
-    reverseHighlightedParts(getHighlightedParts(attributeValue))
-  );
-
-  return reverseHighlightedValue
-    .replace(
-      new RegExp(TAG_REPLACEMENT.highlightPreTag, 'g'),
-      `<${highlightedTagName} class="${className}">`
-    )
-    .replace(
-      new RegExp(TAG_REPLACEMENT.highlightPostTag, 'g'),
-      `</${highlightedTagName}>`
-    );
-}
diff --git a/packages/instantsearch.js/src/helpers/snippet.ts b/packages/instantsearch.js/src/helpers/snippet.ts
deleted file mode 100644
index 055165252a..0000000000
--- a/packages/instantsearch.js/src/helpers/snippet.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { component } from '../lib/suit';
-import { TAG_REPLACEMENT, getPropertyByPath, warning } from '../lib/utils';
-
-import type { Hit } from '../types';
-
-export type SnippetOptions = {
-  // @MAJOR string should no longer be allowed to be a path, only array can be a path
-  attribute: string | string[];
-  highlightedTagName?: string;
-  hit: Partial<Hit>;
-  cssClasses?: {
-    highlighted?: string;
-  };
-};
-
-const suit = component('Snippet');
-
-/**
- * @deprecated use html tagged templates and the Snippet component instead
- */
-export default function snippet({
-  attribute,
-  highlightedTagName = 'mark',
-  hit,
-  cssClasses = {},
-}: SnippetOptions): string {
-  warning(
-    false,
-    `\`instantsearch.snippet\` function has been deprecated. It is still supported in 4.x releases, but not further. It is replaced by the \`Snippet\` component.
-
-For more information, visit https://www.algolia.com/doc/guides/building-search-ui/upgrade-guides/js/?client=html+tagged+templates#upgrade-templates`
-  );
-
-  const snippetAttributeResult = getPropertyByPath(
-    hit._snippetResult,
-    attribute
-  );
-
-  // @MAJOR fallback to attribute value if snippet is not found
-  warning(
-    snippetAttributeResult,
-    `Could not enable snippet for "${attribute}", will display an empty string.
-Please check whether this attribute exists and is specified in \`attributesToSnippet\`.
-
-See: https://alg.li/highlighting
-`
-  );
-
-  const { value: attributeValue = '' } = snippetAttributeResult || {};
-
-  // cx is not used, since it would be bundled as a dependency for Vue
-  const className =
-    suit({
-      descendantName: 'highlighted',
-    }) + (cssClasses.highlighted ? ` ${cssClasses.highlighted}` : '');
-
-  return attributeValue
-    .replace(
-      new RegExp(TAG_REPLACEMENT.highlightPreTag, 'g'),
-      `<${highlightedTagName} class="${className}">`
-    )
-    .replace(
-      new RegExp(TAG_REPLACEMENT.highlightPostTag, 'g'),
-      `</${highlightedTagName}>`
-    );
-}
diff --git a/packages/instantsearch.js/src/index.es.ts b/packages/instantsearch.js/src/index.es.ts
index 85fd8ccaad..e81b32637b 100644
--- a/packages/instantsearch.js/src/index.es.ts
+++ b/packages/instantsearch.js/src/index.es.ts
@@ -1,14 +1,4 @@
-import {
-  snippet,
-  reverseSnippet,
-  highlight,
-  reverseHighlight,
-  insights,
-  getInsightsAnonymousUserToken,
-} from './helpers';
-import { createInfiniteHitsSessionStorageCache } from './lib/infiniteHitsCache';
 import InstantSearch from './lib/InstantSearch';
-import { deprecate } from './lib/utils';
 import version from './lib/version';
 
 import type { InstantSearchOptions } from './lib/InstantSearch';
@@ -19,28 +9,6 @@ type InstantSearchModule = {
     options: InstantSearchOptions<Expand<UiState & TUiState>, TRouteState>
   ): InstantSearch<Expand<UiState & TUiState>, TRouteState>;
   version: string;
-
-  // @major remove these in favour of the exports
-  /** @deprecated import { createInfiniteHitsSessionStorageCache } from 'instantsearch.js/es/lib/infiniteHitsCache' */
-  createInfiniteHitsSessionStorageCache: typeof createInfiniteHitsSessionStorageCache;
-  /** @deprecated import { highlight } from 'instantsearch.js/es/helpers' */
-  highlight: typeof highlight;
-  /** @deprecated import { reverseHighlight } from 'instantsearch.js/es/helpers' */
-  reverseHighlight: typeof reverseHighlight;
-  /** @deprecated import { snippet } from 'instantsearch.js/es/helpers' */
-  snippet: typeof snippet;
-  /** @deprecated import { reverseSnippet } from 'instantsearch.js/es/helpers' */
-  reverseSnippet: typeof reverseSnippet;
-  /**
-   * @deprecated use createInsightsMiddleware
-   * @link https://www.algolia.com/doc/api-reference/widgets/insights/js/
-   */
-  insights: typeof insights;
-  /**
-   * @deprecated use createInsightsMiddleware
-   * @link https://www.algolia.com/doc/api-reference/widgets/insights/js/
-   */
-  getInsightsAnonymousUserToken: typeof getInsightsAnonymousUserToken;
 };
 
 /**
@@ -63,29 +31,6 @@ const instantsearch: InstantSearchModule = (options) =>
 
 instantsearch.version = version;
 
-instantsearch.createInfiniteHitsSessionStorageCache = deprecate(
-  createInfiniteHitsSessionStorageCache,
-  "import { createInfiniteHitsSessionStorageCache } from 'instantsearch.js/es/lib/infiniteHitsCache'"
-);
-instantsearch.highlight = deprecate(
-  highlight,
-  "import { highlight } from 'instantsearch.js/es/helpers'"
-);
-instantsearch.reverseHighlight = deprecate(
-  reverseHighlight,
-  "import { reverseHighlight } from 'instantsearch.js/es/helpers'"
-);
-instantsearch.snippet = deprecate(
-  snippet,
-  "import { snippet } from 'instantsearch.js/es/helpers'"
-);
-instantsearch.reverseSnippet = deprecate(
-  reverseSnippet,
-  "import { reverseSnippet } from 'instantsearch.js/es/helpers'"
-);
-instantsearch.insights = insights;
-instantsearch.getInsightsAnonymousUserToken = getInsightsAnonymousUserToken;
-
 Object.defineProperty(instantsearch, 'widgets', {
   get() {
     throw new ReferenceError(
diff --git a/packages/instantsearch.js/src/index.ts b/packages/instantsearch.js/src/index.ts
index b99879f2e1..f85fa58b3a 100644
--- a/packages/instantsearch.js/src/index.ts
+++ b/packages/instantsearch.js/src/index.ts
@@ -1,5 +1,4 @@
 import * as connectors from './connectors/index';
-import * as helpers from './helpers/index';
 import { createInfiniteHitsSessionStorageCache } from './lib/infiniteHitsCache/index';
 import InstantSearch from './lib/InstantSearch';
 import * as routers from './lib/routers/index';
@@ -27,21 +26,6 @@ type InstantSearchModule = {
   templates: typeof templates;
 
   createInfiniteHitsSessionStorageCache: typeof createInfiniteHitsSessionStorageCache;
-
-  /** @deprecated use html tagged templates and the Highlight component instead */
-  highlight: typeof helpers.highlight;
-  /** @deprecated use html tagged templates and the ReverseHighlight component instead */
-  reverseHighlight: typeof helpers.reverseHighlight;
-  /** @deprecated use html tagged templates and the Snippet component instead */
-  snippet: typeof helpers.snippet;
-  /** @deprecated use html tagged templates and the ReverseSnippet component instead */
-  reverseSnippet: typeof helpers.reverseSnippet;
-
-  /**
-   * @deprecated use createInsightsMiddleware
-   * @link https://www.algolia.com/doc/api-reference/widgets/insights/js/
-   */
-  insights: typeof helpers.insights;
 };
 
 /**
@@ -74,10 +58,5 @@ instantsearch.templates = templates;
 
 instantsearch.createInfiniteHitsSessionStorageCache =
   createInfiniteHitsSessionStorageCache;
-instantsearch.highlight = helpers.highlight;
-instantsearch.reverseHighlight = helpers.reverseHighlight;
-instantsearch.snippet = helpers.snippet;
-instantsearch.reverseSnippet = helpers.reverseSnippet;
-instantsearch.insights = helpers.insights;
 
 export default instantsearch;
diff --git a/packages/instantsearch.js/src/lib/insights/__tests__/client-test.js b/packages/instantsearch.js/src/lib/insights/__tests__/client-test.js
deleted file mode 100644
index 7167b340f2..0000000000
--- a/packages/instantsearch.js/src/lib/insights/__tests__/client-test.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { warning } from '../../utils';
-import withInsights from '../client';
-
-describe('withInsights', () => {
-  it('shows a deprecation warning', () => {
-    warning.cache = {};
-
-    const renderer = ({ insights }) => {
-      insights('convertedObjectIDsAfterSearch', {
-        objectIDs: ['1'],
-        eventName: 'Add to basket',
-      });
-    };
-    const connector = (renderFn) => () => ({
-      init() {
-        renderFn({
-          results: {},
-          hits: [
-            { objectID: '1', __queryID: 'theQueryID', __position: 9 },
-            { objectID: '2', __queryID: 'theQueryID', __position: 10 },
-            { objectID: '3', __queryID: 'theQueryID', __position: 11 },
-            { objectID: '4', __queryID: 'theQueryID', __position: 12 },
-          ],
-          instantSearchInstance: { insightsClient: () => {} },
-        });
-      },
-    });
-    const makeWidget = withInsights(connector)(renderer);
-    const widget = makeWidget();
-    expect(() => {
-      widget.init();
-    }).toWarnDev(
-      `[InstantSearch.js]: \`insights\` function has been deprecated. It is still supported in 4.x releases, but not further. It is replaced by the \`insights\` middleware.
-
-For more information, visit https://www.algolia.com/doc/guides/getting-insights-and-analytics/search-analytics/click-through-and-conversions/how-to/send-click-and-conversion-events-with-instantsearch/js/`
-    );
-  });
-});
diff --git a/packages/instantsearch.js/src/lib/insights/__tests__/insights-client-test.ts b/packages/instantsearch.js/src/lib/insights/__tests__/insights-client-test.ts
deleted file mode 100644
index bddce6db68..0000000000
--- a/packages/instantsearch.js/src/lib/insights/__tests__/insights-client-test.ts
+++ /dev/null
@@ -1,434 +0,0 @@
-import { createSingleSearchResponse } from '@instantsearch/mocks';
-import { SearchParameters, SearchResults } from 'algoliasearch-helper';
-
-import { withInsights, inferInsightsPayload } from '../';
-import { createInstantSearch } from '../../../../test/createInstantSearch';
-
-import type { InstantSearch, Widget } from '../../../types';
-
-const connectHits =
-  (renderFn: any, unmountFn: any) =>
-  (widgetParams = {}): Widget => ({
-    $$type: 'ais.hits',
-    init() {},
-    render({ results, instantSearchInstance }) {
-      const hits = results?.hits;
-      renderFn({ hits, results, instantSearchInstance, widgetParams }, false);
-    },
-    dispose() {
-      unmountFn();
-    },
-  });
-
-const createWidgetWithInsights = ({
-  renderFn,
-  instantSearchInstance,
-  results,
-}: {
-  renderFn: any;
-  instantSearchInstance: InstantSearch;
-  results: SearchResults;
-}): Widget => {
-  const connectHitsWithInsights = withInsights(connectHits as any);
-  const widget = connectHitsWithInsights(renderFn, jest.fn())({});
-  widget.render({ results, instantSearchInstance } as any);
-  return widget;
-};
-
-describe('withInsights', () => {
-  describe('when applied on connectHits', () => {
-    it('should call the passed renderFn', () => {
-      const renderFn = jest.fn();
-      const instantSearchInstance = createInstantSearch({
-        insightsClient: jest.fn(),
-      });
-      const results = new SearchResults(new SearchParameters(), [
-        createSingleSearchResponse({
-          index: 'theIndex',
-          hits: [
-            { objectID: '1', __queryID: 'theQueryID', __position: 9 },
-            { objectID: '2', __queryID: 'theQueryID', __position: 10 },
-            { objectID: '3', __queryID: 'theQueryID', __position: 11 },
-            { objectID: '4', __queryID: 'theQueryID', __position: 12 },
-          ],
-        }),
-      ]);
-      createWidgetWithInsights({ renderFn, instantSearchInstance, results });
-
-      expect(renderFn).toHaveBeenCalledTimes(1);
-    });
-
-    it('should not remove any renderProps passed by connectHits', () => {
-      const renderFn = jest.fn();
-      const instantSearchInstance = createInstantSearch({
-        insightsClient: jest.fn(),
-      });
-      const results = new SearchResults(new SearchParameters(), [
-        createSingleSearchResponse({
-          index: 'theIndex',
-          hits: [
-            { objectID: '1', __queryID: 'theQueryID', __position: 9 },
-            { objectID: '2', __queryID: 'theQueryID', __position: 10 },
-            { objectID: '3', __queryID: 'theQueryID', __position: 11 },
-            { objectID: '4', __queryID: 'theQueryID', __position: 12 },
-          ],
-        }),
-      ]);
-      createWidgetWithInsights({ renderFn, instantSearchInstance, results });
-
-      const [renderProps] = renderFn.mock.calls[0];
-      expect(renderProps).toEqual(
-        expect.objectContaining({
-          instantSearchInstance,
-          results,
-          widgetParams: {},
-        })
-      );
-    });
-
-    it('should expose the insights client wrapper to renderOptions if passed to instantSearchInstance', () => {
-      const renderFn = jest.fn();
-      const instantSearchInstance = createInstantSearch({
-        insightsClient: jest.fn(),
-      });
-      const results = new SearchResults(new SearchParameters(), [
-        createSingleSearchResponse({
-          index: 'theIndex',
-          hits: [
-            { objectID: '1', __queryID: 'theQueryID', __position: 9 },
-            { objectID: '2', __queryID: 'theQueryID', __position: 10 },
-            { objectID: '3', __queryID: 'theQueryID', __position: 11 },
-            { objectID: '4', __queryID: 'theQueryID', __position: 12 },
-          ],
-        }),
-      ]);
-      createWidgetWithInsights({ renderFn, instantSearchInstance, results });
-
-      const [renderProps] = renderFn.mock.calls[0];
-      expect(renderProps).toHaveProperty('insights');
-      expect(renderProps.insights).toBeInstanceOf(Function);
-    });
-    it('should expose the insights client wrapper even when insightsClient was not provided', () => {
-      const renderFn = jest.fn();
-      const instantSearchInstance = createInstantSearch({
-        insightsClient: null,
-      });
-      const results = new SearchResults(new SearchParameters(), [
-        createSingleSearchResponse({
-          index: 'theIndex',
-          hits: [
-            { objectID: '1', __queryID: 'theQueryID', __position: 9 },
-            { objectID: '2', __queryID: 'theQueryID', __position: 10 },
-            { objectID: '3', __queryID: 'theQueryID', __position: 11 },
-            { objectID: '4', __queryID: 'theQueryID', __position: 12 },
-          ],
-        }),
-      ]);
-      createWidgetWithInsights({ renderFn, instantSearchInstance, results });
-
-      const [renderProps] = renderFn.mock.calls[0];
-      expect(renderProps).toHaveProperty('insights');
-      expect(renderProps.insights).toBeInstanceOf(Function);
-    });
-    it('should expose the insights client wrapper that throws when insightsClient was not provided', () => {
-      const renderFn = jest.fn();
-      const instantSearchInstance = createInstantSearch({
-        insightsClient: null,
-      });
-      const results = new SearchResults(new SearchParameters(), [
-        createSingleSearchResponse({
-          index: 'theIndex',
-          hits: [
-            { objectID: '1', __queryID: 'theQueryID', __position: 9 },
-            { objectID: '2', __queryID: 'theQueryID', __position: 10 },
-            { objectID: '3', __queryID: 'theQueryID', __position: 11 },
-            { objectID: '4', __queryID: 'theQueryID', __position: 12 },
-          ],
-        }),
-      ]);
-      createWidgetWithInsights({ renderFn, instantSearchInstance, results });
-
-      const [renderProps] = renderFn.mock.calls[0];
-      expect(() => {
-        renderProps.insights('clickedObjectIDsAfterSearch', {
-          eventName: 'add to favorites',
-          objectIDs: ['1'],
-        });
-      }).toThrowErrorMatchingInlineSnapshot(`
-"The \`insightsClient\` option has not been provided to \`instantsearch\`.
-
-See documentation: https://www.algolia.com/doc/api-reference/widgets/instantsearch/js/"
-`);
-    });
-  });
-
-  describe('exposed insights client wrapper', () => {
-    it('should call the insights client under the hood', () => {
-      const renderFn = jest.fn();
-      const instantSearchInstance = createInstantSearch({
-        insightsClient: jest.fn(),
-      });
-      const results = new SearchResults(new SearchParameters(), [
-        createSingleSearchResponse({
-          index: 'theIndex',
-          hits: [
-            { objectID: '1', __queryID: 'theQueryID', __position: 9 },
-            { objectID: '2', __queryID: 'theQueryID', __position: 10 },
-            { objectID: '3', __queryID: 'theQueryID', __position: 11 },
-            { objectID: '4', __queryID: 'theQueryID', __position: 12 },
-          ],
-        }),
-      ]);
-      createWidgetWithInsights({ renderFn, instantSearchInstance, results });
-
-      const [renderProps] = renderFn.mock.calls[0];
-      renderProps.insights('clickedObjectIDsAfterSearch', {
-        objectIDs: ['3'],
-        eventName: 'Add to basket',
-      });
-      expect(instantSearchInstance.insightsClient).toHaveBeenCalledTimes(1);
-    });
-
-    it('should pass it the correct parameters', () => {
-      const renderFn = jest.fn();
-      const instantSearchInstance = createInstantSearch({
-        insightsClient: jest.fn(),
-      });
-      const results = new SearchResults(new SearchParameters(), [
-        createSingleSearchResponse({
-          index: 'theIndex',
-          hits: [
-            { objectID: '1', __queryID: 'theQueryID', __position: 9 },
-            { objectID: '2', __queryID: 'theQueryID', __position: 10 },
-            { objectID: '3', __queryID: 'theQueryID', __position: 11 },
-            { objectID: '4', __queryID: 'theQueryID', __position: 12 },
-          ],
-        }),
-      ]);
-      createWidgetWithInsights({ renderFn, instantSearchInstance, results });
-
-      const [renderProps] = renderFn.mock.calls[0];
-      renderProps.insights('clickedObjectIDsAfterSearch', {
-        objectIDs: ['3'],
-        eventName: 'Add to basket',
-      });
-      expect(instantSearchInstance.insightsClient).toHaveBeenCalledTimes(1);
-      expect(instantSearchInstance.insightsClient).toHaveBeenCalledWith(
-        'clickedObjectIDsAfterSearch',
-        {
-          eventName: 'Add to basket',
-          index: 'theIndex',
-          queryID: 'theQueryID',
-          objectIDs: ['3'],
-          positions: [11],
-        }
-      );
-    });
-
-    it('should not infer or pass the positions if method is `convertedObjectIDsAfterSearch`', () => {
-      const renderFn = jest.fn();
-      const instantSearchInstance = createInstantSearch({
-        insightsClient: jest.fn(),
-      });
-      const results = new SearchResults(new SearchParameters(), [
-        createSingleSearchResponse({
-          index: 'theIndex',
-          hits: [
-            { objectID: '1', __queryID: 'theQueryID', __position: 9 },
-            { objectID: '2', __queryID: 'theQueryID', __position: 10 },
-            { objectID: '3', __queryID: 'theQueryID', __position: 11 },
-            { objectID: '4', __queryID: 'theQueryID', __position: 12 },
-          ],
-        }),
-      ]);
-      createWidgetWithInsights({ renderFn, instantSearchInstance, results });
-
-      const [renderProps] = renderFn.mock.calls[0];
-      renderProps.insights('convertedObjectIDsAfterSearch', {
-        objectIDs: ['1'],
-        eventName: 'Add to basket',
-      });
-      expect(instantSearchInstance.insightsClient).toHaveBeenCalledTimes(1);
-      expect(instantSearchInstance.insightsClient).toHaveBeenCalledWith(
-        'convertedObjectIDsAfterSearch',
-        {
-          eventName: 'Add to basket',
-          index: 'theIndex',
-          queryID: 'theQueryID',
-          objectIDs: ['1'],
-        }
-      );
-    });
-
-    it('should reject non-existing objectIDs', () => {
-      const renderFn = jest.fn();
-      const instantSearchInstance = createInstantSearch({
-        insightsClient: jest.fn(),
-      });
-      const results = new SearchResults(new SearchParameters(), [
-        createSingleSearchResponse({
-          index: 'theIndex',
-          hits: [
-            { objectID: '1', __queryID: 'theQueryID', __position: 9 },
-            { objectID: '2', __queryID: 'theQueryID', __position: 10 },
-            { objectID: '3', __queryID: 'theQueryID', __position: 11 },
-            { objectID: '4', __queryID: 'theQueryID', __position: 12 },
-          ],
-        }),
-      ]);
-      createWidgetWithInsights({ renderFn, instantSearchInstance, results });
-
-      const [renderProps] = renderFn.mock.calls[0];
-      expect(() => {
-        renderProps.insights('clickedObjectIDsAfterSearch', {
-          objectIDs: ['xxxxxx'],
-          eventName: 'Add to basket',
-        });
-      }).toThrowErrorMatchingInlineSnapshot(
-        `"Could not find objectID \\"xxxxxx\\" passed to \`clickedObjectIDsAfterSearch\` in the returned hits. This is necessary to infer the absolute position and the query ID."`
-      );
-    });
-
-    it('should reject if objectIDs provided have different queryIDs', () => {
-      const renderFn = jest.fn();
-      const instantSearchInstance = createInstantSearch({
-        insightsClient: jest.fn(),
-      });
-      const results = new SearchResults(new SearchParameters(), [
-        createSingleSearchResponse({
-          index: 'theIndex',
-          hits: [
-            { objectID: '1', __position: 1, __queryID: 'theQueryID_1' },
-            { objectID: '2', __position: 2, __queryID: 'theQueryID_2' },
-          ],
-        }),
-      ]);
-      createWidgetWithInsights({ renderFn, instantSearchInstance, results });
-
-      const [renderProps] = renderFn.mock.calls[0];
-      expect(() => {
-        renderProps.insights('clickedObjectIDsAfterSearch', {
-          objectIDs: ['1', '2'],
-          eventName: 'Add to basket',
-        });
-      }).toThrowErrorMatchingInlineSnapshot(
-        `"Insights currently allows a single \`queryID\`. The \`objectIDs\` provided map to multiple \`queryID\`s."`
-      );
-    });
-
-    it('should reject if no queryID found (clickAnalytics was not set to true)', () => {
-      const renderFn = jest.fn();
-      const instantSearchInstance = createInstantSearch({
-        insightsClient: jest.fn(),
-      });
-      const results = new SearchResults(new SearchParameters(), [
-        createSingleSearchResponse({
-          index: 'theIndex',
-          hits: [
-            { objectID: '1', __position: 1 },
-            { objectID: '2', __position: 2 },
-          ],
-        }),
-      ]);
-      createWidgetWithInsights({ renderFn, instantSearchInstance, results });
-
-      const [renderProps] = renderFn.mock.calls[0];
-      expect(() => {
-        renderProps.insights('clickedObjectIDsAfterSearch', {
-          objectIDs: ['1', '2'],
-          eventName: 'Add to basket',
-        });
-      }).toThrowErrorMatchingInlineSnapshot(`
-"Could not infer \`queryID\`. Ensure InstantSearch \`clickAnalytics: true\` was added with the Configure widget.
-
-See: https://alg.li/lNiZZ7"
-`);
-    });
-
-    it('should reject unknown method name', () => {
-      const renderFn = jest.fn();
-      const instantSearchInstance = createInstantSearch({
-        insightsClient: jest.fn(),
-      });
-      const results = new SearchResults(new SearchParameters(), [
-        createSingleSearchResponse({
-          index: 'theIndex',
-          hits: [
-            { objectID: '1', __queryID: 'theQueryID', __position: 9 },
-            { objectID: '2', __queryID: 'theQueryID', __position: 10 },
-            { objectID: '3', __queryID: 'theQueryID', __position: 11 },
-            { objectID: '4', __queryID: 'theQueryID', __position: 12 },
-          ],
-        }),
-      ]);
-      createWidgetWithInsights({ renderFn, instantSearchInstance, results });
-
-      const [renderProps] = renderFn.mock.calls[0];
-      expect(() => {
-        renderProps.insights('unknown_method', {
-          objectIDs: ['3'],
-          eventName: 'Add to basket',
-        });
-      }).toThrowErrorMatchingInlineSnapshot(
-        `"Unsupported method passed to insights: \\"unknown_method\\"."`
-      );
-    });
-  });
-});
-
-describe('inferInsightsPayload', () => {
-  const hits = [
-    { objectID: '1', __queryID: 'theQueryID', __position: 9 },
-    { objectID: '2', __queryID: 'theQueryID', __position: 10 },
-    { objectID: '3', __queryID: 'theQueryID', __position: 11 },
-    { objectID: '4', __queryID: 'theQueryID', __position: 12 },
-  ];
-  const results = new SearchResults(new SearchParameters(), [
-    createSingleSearchResponse({
-      index: 'theIndex',
-      hits,
-    }),
-  ]);
-
-  describe('payload inferring', () => {
-    it('should infer queryID from results', () => {
-      const payload = inferInsightsPayload({
-        method: 'clickedObjectIDsAfterSearch',
-        results,
-        hits,
-        objectIDs: ['3'],
-      });
-      expect(payload.queryID).toEqual('theQueryID');
-    });
-
-    it('should infer index name from results', () => {
-      const payload = inferInsightsPayload({
-        method: 'clickedObjectIDsAfterSearch',
-        results,
-        hits,
-        objectIDs: ['3'],
-      });
-      expect(payload.index).toEqual(results.index);
-    });
-
-    it('should inject passed objectIDs', () => {
-      const payload = inferInsightsPayload({
-        method: 'clickedObjectIDsAfterSearch',
-        results,
-        hits,
-        objectIDs: ['3', '4'],
-      });
-      expect(payload.objectIDs).toEqual(['3', '4']);
-    });
-
-    it('should compute and inject hit positions', () => {
-      const payload = inferInsightsPayload({
-        method: 'clickedObjectIDsAfterSearch',
-        results,
-        hits,
-        objectIDs: ['3', '4'],
-      });
-      expect(payload.positions).toEqual([11, 12]);
-    });
-  });
-});
diff --git a/packages/instantsearch.js/src/lib/insights/__tests__/insights-listener-test.tsx b/packages/instantsearch.js/src/lib/insights/__tests__/insights-listener-test.tsx
deleted file mode 100644
index d6682cba28..0000000000
--- a/packages/instantsearch.js/src/lib/insights/__tests__/insights-listener-test.tsx
+++ /dev/null
@@ -1,468 +0,0 @@
-/**
- * @jest-environment jsdom
- */
-/** @jsx h */
-
-import { render, fireEvent } from '@testing-library/preact';
-import { h } from 'preact';
-
-import { createInstantSearch } from '../../../../test/createInstantSearch';
-import {
-  _buildEventPayloadsForHits,
-  serializePayload,
-} from '../../../lib/utils';
-import withInsightsListener, { createInsightsEventHandler } from '../listener';
-
-import type { InsightsEventHandlerOptions } from '../listener';
-
-describe('createInsightsEventHandler', () => {
-  describe('instantsearch.insights', () => {
-    it('should capture clicks performed on inner elements with data-insights-method defined', () => {
-      const payload = serializePayload({
-        objectIDs: ['1'],
-        eventName: 'Add to Cart',
-      });
-
-      const Hits = (props: InsightsEventHandlerOptions) => (
-        <div onClick={createInsightsEventHandler(props)}>
-          <button
-            data-insights-method="clickedObjectIDsAfterSearch"
-            data-insights-payload={payload}
-          >
-            Add to Cart
-          </button>
-        </div>
-      );
-
-      const props = {
-        insights: jest.fn(),
-        sendEvent: jest.fn(),
-      };
-
-      const { container } = render(
-        <Hits insights={props.insights} sendEvent={props.sendEvent} />
-      );
-      const button = container.querySelector('button') as HTMLButtonElement;
-
-      fireEvent.click(button);
-
-      expect(props.insights).toHaveBeenCalledTimes(1);
-      expect(props.insights).toHaveBeenCalledWith(
-        'clickedObjectIDsAfterSearch',
-        {
-          eventName: 'Add to Cart',
-          objectIDs: ['1'],
-        }
-      );
-    });
-
-    it('should capture clicks performed on inner elements whose parents have data-insights-method defined', () => {
-      const payload = serializePayload({
-        objectIDs: ['1'],
-        eventName: 'Product Clicked',
-      });
-
-      const Hits = (props: InsightsEventHandlerOptions) => (
-        <div onClick={createInsightsEventHandler(props)}>
-          <a
-            data-insights-method="clickedObjectIDsAfterSearch"
-            data-insights-payload={payload}
-          >
-            <h1> Product 1 </h1>
-          </a>
-        </div>
-      );
-
-      const props = {
-        insights: jest.fn(),
-        sendEvent: jest.fn(),
-      };
-
-      const { container } = render(
-        <Hits insights={props.insights} sendEvent={props.sendEvent} />
-      );
-      const innerChild = container.querySelector('h1') as HTMLElement;
-
-      fireEvent.click(innerChild);
-
-      expect(props.insights).toHaveBeenCalledTimes(1);
-      expect(props.insights).toHaveBeenCalledWith(
-        'clickedObjectIDsAfterSearch',
-        {
-          eventName: 'Product Clicked',
-          objectIDs: ['1'],
-        }
-      );
-    });
-
-    it('should not capture clicks performed on inner elements with no data-insights-method defined', () => {
-      const payload = serializePayload({
-        objectIDs: ['1'],
-        eventName: 'Add to Cart',
-      });
-
-      const Hits = (props: InsightsEventHandlerOptions) => (
-        <div onClick={createInsightsEventHandler(props)}>
-          <button data-insights-payload={payload}>Add to Cart</button>
-        </div>
-      );
-
-      const props = {
-        insights: jest.fn(),
-        sendEvent: jest.fn(),
-      };
-
-      const { container } = render(
-        <Hits insights={props.insights} sendEvent={props.sendEvent} />
-      );
-      const button = container.querySelector('button') as HTMLButtonElement;
-
-      fireEvent.click(button);
-
-      expect(props.insights).toHaveBeenCalledTimes(0);
-    });
-  });
-
-  describe('sendEvent', () => {
-    it('should capture clicks performed on inner elements with data-insights-event defined', () => {
-      const payload = serializePayload(
-        _buildEventPayloadsForHits({
-          widgetType: 'ais.hits',
-          getIndex: () => 'instant_search',
-          instantSearchInstance: createInstantSearch(),
-          methodName: 'bindEvent',
-          args: ['click', { objectID: '1', __position: 1 }, 'Hit Clicked'],
-        })
-      );
-
-      const Hits = (props: InsightsEventHandlerOptions) => (
-        <div onClick={createInsightsEventHandler(props)}>
-          <button data-insights-event={payload}>Add to Cart</button>
-        </div>
-      );
-
-      const props = {
-        insights: jest.fn(),
-        sendEvent: jest.fn(),
-      };
-
-      const { container } = render(
-        <Hits insights={props.insights} sendEvent={props.sendEvent} />
-      );
-      const button = container.querySelector('button') as HTMLButtonElement;
-
-      fireEvent.click(button);
-
-      expect(props.sendEvent).toHaveBeenCalledTimes(1);
-      expect(props.sendEvent).toHaveBeenCalledWith({
-        eventType: 'click',
-        hits: [{ objectID: '1', __position: 1 }],
-        insightsMethod: 'clickedObjectIDsAfterSearch',
-        payload: {
-          eventName: 'Hit Clicked',
-          index: 'instant_search',
-          objectIDs: ['1'],
-          positions: [1],
-        },
-        widgetType: 'ais.hits',
-      });
-    });
-
-    it('should capture clicks performed on inner elements whose parents have data-insights-event defined', () => {
-      const payload = serializePayload(
-        _buildEventPayloadsForHits({
-          widgetType: 'ais.hits',
-          getIndex: () => 'instant_search',
-          instantSearchInstance: createInstantSearch(),
-          methodName: 'bindEvent',
-          args: ['click', { objectID: '1', __position: 1 }, 'Hit Clicked'],
-        })
-      );
-
-      const Hits = (props: InsightsEventHandlerOptions) => (
-        <div onClick={createInsightsEventHandler(props)}>
-          <button data-insights-event={payload}>
-            <h1>Add to Cart</h1>
-          </button>
-        </div>
-      );
-
-      const props = {
-        insights: jest.fn(),
-        sendEvent: jest.fn(),
-      };
-
-      const { container } = render(
-        <Hits insights={props.insights} sendEvent={props.sendEvent} />
-      );
-      const heading = container.querySelector('h1') as HTMLHeadingElement;
-
-      fireEvent.click(heading);
-
-      expect(props.sendEvent).toHaveBeenCalledTimes(1);
-      expect(props.sendEvent).toHaveBeenCalledWith({
-        eventType: 'click',
-        hits: [{ objectID: '1', __position: 1 }],
-        insightsMethod: 'clickedObjectIDsAfterSearch',
-        payload: {
-          eventName: 'Hit Clicked',
-          index: 'instant_search',
-          objectIDs: ['1'],
-          positions: [1],
-        },
-        widgetType: 'ais.hits',
-      });
-    });
-
-    it('should not capture clicks performed on inner elements with no data-insights-event defined', () => {
-      const Hits = (props: InsightsEventHandlerOptions) => (
-        <div onClick={createInsightsEventHandler(props)}>
-          <button>Add to Cart</button>
-        </div>
-      );
-
-      const props = {
-        insights: jest.fn(),
-        sendEvent: jest.fn(),
-      };
-
-      const { container } = render(
-        <Hits insights={props.insights} sendEvent={props.sendEvent} />
-      );
-      const button = container.querySelector('button') as HTMLButtonElement;
-
-      fireEvent.click(button);
-
-      expect(props.sendEvent).not.toHaveBeenCalled();
-    });
-  });
-
-  describe('combined', () => {
-    it('should capture clicks performed on inner elements with both data-insights-method and data-insights-event defined', () => {
-      const legacyPayload = serializePayload({
-        objectIDs: ['1'],
-        eventName: 'Product Clicked',
-      });
-      const modernPayload = serializePayload(
-        _buildEventPayloadsForHits({
-          widgetType: 'ais.hits',
-          getIndex: () => 'instant_search',
-          instantSearchInstance: createInstantSearch(),
-          methodName: 'bindEvent',
-          args: ['click', { objectID: '1', __position: 1 }, 'Product Clicked'],
-        })
-      );
-
-      const Hits = (props: InsightsEventHandlerOptions) => (
-        <div onClick={createInsightsEventHandler(props)}>
-          <button
-            data-insights-method="clickedObjectIDsAfterSearch"
-            data-insights-payload={legacyPayload}
-            data-insights-event={modernPayload}
-          >
-            <h1>Add to Cart</h1>
-          </button>
-        </div>
-      );
-
-      const props = {
-        insights: jest.fn(),
-        sendEvent: jest.fn(),
-      };
-
-      const { container } = render(
-        <Hits insights={props.insights} sendEvent={props.sendEvent} />
-      );
-      const heading = container.querySelector('h1') as HTMLHeadingElement;
-
-      fireEvent.click(heading);
-
-      expect(props.insights).toHaveBeenCalledTimes(1);
-      expect(props.insights).toHaveBeenCalledWith(
-        'clickedObjectIDsAfterSearch',
-        {
-          eventName: 'Product Clicked',
-          objectIDs: ['1'],
-        }
-      );
-
-      expect(props.sendEvent).toHaveBeenCalledTimes(1);
-      expect(props.sendEvent).toHaveBeenCalledWith({
-        eventType: 'click',
-        hits: [{ objectID: '1', __position: 1 }],
-        insightsMethod: 'clickedObjectIDsAfterSearch',
-        payload: {
-          eventName: 'Product Clicked',
-          index: 'instant_search',
-          objectIDs: ['1'],
-          positions: [1],
-        },
-        widgetType: 'ais.hits',
-      });
-    });
-  });
-});
-
-describe('withInsightsListener', () => {
-  it('should capture clicks performed on inner elements with data-insights-method defined', () => {
-    const payload = serializePayload({
-      objectIDs: ['1'],
-      eventName: 'Add to Cart',
-    });
-
-    const Hits = () => (
-      <div>
-        <button
-          data-insights-method="clickedObjectIDsAfterSearch"
-          data-insights-payload={payload}
-        >
-          Add to Cart
-        </button>
-      </div>
-    );
-
-    const insights = jest.fn();
-
-    const hits = [
-      { objectID: '1' },
-      { objectID: '2' },
-      { objectID: '3' },
-      { objectID: '4' },
-      { objectID: '5' },
-    ];
-
-    const results = {
-      index: 'theIndex',
-      queryID: 'theQueryID',
-      hitsPerPage: 2,
-      page: 1,
-    };
-
-    const instantSearchInstance = {
-      insightsClient: jest.fn(),
-    };
-    const HitsWithInsightsListener: any = withInsightsListener(Hits);
-    const { container } = render(
-      <HitsWithInsightsListener
-        hits={hits}
-        results={results}
-        instantSearchInstance={instantSearchInstance}
-        insights={insights}
-      />
-    );
-    const button = container.querySelector('button') as HTMLButtonElement;
-
-    fireEvent.click(button);
-
-    expect(insights).toHaveBeenCalledTimes(1);
-    expect(insights).toHaveBeenCalledWith('clickedObjectIDsAfterSearch', {
-      eventName: 'Add to Cart',
-      objectIDs: ['1'],
-    });
-  });
-
-  it('should capture clicks performed on inner elements whose parents have data-insights-method defined', () => {
-    const payload = serializePayload({
-      objectIDs: ['1'],
-      eventName: 'Product Clicked',
-    });
-
-    const Hits = () => (
-      <div>
-        <a
-          data-insights-method="clickedObjectIDsAfterSearch"
-          data-insights-payload={payload}
-        >
-          <h1> Product 1 </h1>
-        </a>
-      </div>
-    );
-
-    const insights = jest.fn();
-
-    const hits = [
-      { objectID: '1' },
-      { objectID: '2' },
-      { objectID: '3' },
-      { objectID: '4' },
-      { objectID: '5' },
-    ];
-
-    const results = {
-      index: 'theIndex',
-      queryID: 'theQueryID',
-      hitsPerPage: 2,
-      page: 1,
-    };
-
-    const instantSearchInstance = {
-      insightsClient: jest.fn(),
-    };
-    const HitsWithInsightsListener: any = withInsightsListener(Hits);
-    const { container } = render(
-      <HitsWithInsightsListener
-        hits={hits}
-        results={results}
-        instantSearchInstance={instantSearchInstance}
-        insights={insights}
-      />
-    );
-    const innerChild = container.querySelector('h1') as HTMLElement;
-
-    fireEvent.click(innerChild);
-
-    expect(insights).toHaveBeenCalledTimes(1);
-    expect(insights).toHaveBeenCalledWith('clickedObjectIDsAfterSearch', {
-      eventName: 'Product Clicked',
-      objectIDs: ['1'],
-    });
-  });
-
-  it('should not capture clicks performed on inner elements with no data-insights-method defined', () => {
-    const payload = serializePayload({
-      objectIDs: ['1'],
-      eventName: 'Add to Cart',
-    });
-
-    const Hits = () => (
-      <div>
-        <button data-insights-payload={payload}>Add to Cart</button>
-      </div>
-    );
-
-    const insights = jest.fn();
-
-    const hits = [
-      { objectID: '1' },
-      { objectID: '2' },
-      { objectID: '3' },
-      { objectID: '4' },
-      { objectID: '5' },
-    ];
-
-    const results = {
-      index: 'theIndex',
-      queryID: 'theQueryID',
-      hitsPerPage: 2,
-      page: 1,
-    };
-
-    const instantSearchInstance = {
-      insightsClient: jest.fn(),
-    };
-    const HitsWithInsightsListener: any = withInsightsListener(Hits);
-    const { container } = render(
-      <HitsWithInsightsListener
-        hits={hits}
-        results={results}
-        instantSearchInstance={instantSearchInstance}
-        insights={insights}
-      />
-    );
-    const button = container.querySelector('button') as HTMLButtonElement;
-
-    fireEvent.click(button);
-
-    expect(insights).toHaveBeenCalledTimes(0);
-  });
-});
diff --git a/packages/instantsearch.js/src/lib/insights/client.ts b/packages/instantsearch.js/src/lib/insights/client.ts
deleted file mode 100644
index 99bd1f73e1..0000000000
--- a/packages/instantsearch.js/src/lib/insights/client.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-import {
-  uniq,
-  find,
-  createDocumentationMessageGenerator,
-  warning,
-} from '../utils';
-
-import type {
-  Hit,
-  InsightsClient,
-  InsightsClientMethod,
-  InsightsClientPayload,
-  Connector,
-} from '../../types';
-import type { SearchResults } from 'algoliasearch-helper';
-
-const getSelectedHits = (hits: Hit[], selectedObjectIDs: string[]): Hit[] => {
-  return selectedObjectIDs.map((objectID) => {
-    const hit = find(hits, (h) => h.objectID === objectID);
-    if (typeof hit === 'undefined') {
-      throw new Error(
-        `Could not find objectID "${objectID}" passed to \`clickedObjectIDsAfterSearch\` in the returned hits. This is necessary to infer the absolute position and the query ID.`
-      );
-    }
-    return hit;
-  });
-};
-
-const getQueryID = (selectedHits: Hit[]): string => {
-  const queryIDs = uniq(selectedHits.map((hit) => hit.__queryID));
-  if (queryIDs.length > 1) {
-    throw new Error(
-      'Insights currently allows a single `queryID`. The `objectIDs` provided map to multiple `queryID`s.'
-    );
-  }
-  const queryID = queryIDs[0];
-  if (typeof queryID !== 'string') {
-    throw new Error(
-      `Could not infer \`queryID\`. Ensure InstantSearch \`clickAnalytics: true\` was added with the Configure widget.
-
-See: https://alg.li/lNiZZ7`
-    );
-  }
-  return queryID;
-};
-
-const getPositions = (selectedHits: Hit[]): number[] =>
-  selectedHits.map((hit) => hit.__position);
-
-export const inferPayload = ({
-  method,
-  results,
-  hits,
-  objectIDs,
-}: {
-  method: InsightsClientMethod;
-  results: SearchResults;
-  hits: Hit[];
-  objectIDs: string[];
-}): Omit<InsightsClientPayload, 'eventName'> => {
-  const { index } = results;
-  const selectedHits = getSelectedHits(hits, objectIDs);
-  const queryID = getQueryID(selectedHits);
-
-  switch (method) {
-    case 'clickedObjectIDsAfterSearch': {
-      const positions = getPositions(selectedHits);
-      return { index, queryID, objectIDs, positions };
-    }
-
-    case 'convertedObjectIDsAfterSearch':
-      return { index, queryID, objectIDs };
-
-    default:
-      throw new Error(`Unsupported method passed to insights: "${method}".`);
-  }
-};
-
-const wrapInsightsClient =
-  (
-    aa: InsightsClient | null,
-    results: SearchResults,
-    hits: Hit[]
-  ): InsightsClient =>
-  (method, ...payloads) => {
-    const [payload] = payloads;
-    warning(
-      false,
-      `\`insights\` function has been deprecated. It is still supported in 4.x releases, but not further. It is replaced by the \`insights\` middleware.
-
-For more information, visit https://www.algolia.com/doc/guides/getting-insights-and-analytics/search-analytics/click-through-and-conversions/how-to/send-click-and-conversion-events-with-instantsearch/js/`
-    );
-    if (!aa) {
-      const withInstantSearchUsage = createDocumentationMessageGenerator({
-        name: 'instantsearch',
-      });
-      throw new Error(
-        withInstantSearchUsage(
-          'The `insightsClient` option has not been provided to `instantsearch`.'
-        )
-      );
-    }
-    if (!Array.isArray(payload.objectIDs)) {
-      throw new TypeError('Expected `objectIDs` to be an array.');
-    }
-    const inferredPayload = inferPayload({
-      method,
-      results,
-      hits,
-      objectIDs: payload.objectIDs,
-    });
-    aa(method, { ...inferredPayload, ...payload });
-  };
-
-/**
- * @deprecated This function will be still supported in 4.x releases, but not further. It is replaced by the `insights` middleware. For more information, visit https://www.algolia.com/doc/guides/getting-insights-and-analytics/search-analytics/click-through-and-conversions/how-to/send-click-and-conversion-events-with-instantsearch/js/
- * It passes `insights` to `HitsWithInsightsListener` and `InfiniteHitsWithInsightsListener`.
- */
-export default function withInsights<TConnector extends Connector<any, any>>(
-  connector: TConnector
-): TConnector {
-  return ((renderFn, unmountFn) =>
-    connector((renderOptions, isFirstRender) => {
-      const { results, hits, instantSearchInstance } = renderOptions;
-      if (results && hits && instantSearchInstance) {
-        const insights = wrapInsightsClient(
-          instantSearchInstance.insightsClient,
-          results,
-          hits
-        );
-        return renderFn({ ...renderOptions, insights }, isFirstRender);
-      }
-      return renderFn(renderOptions, isFirstRender);
-    }, unmountFn)) as TConnector;
-}
diff --git a/packages/instantsearch.js/src/lib/insights/index.ts b/packages/instantsearch.js/src/lib/insights/index.ts
deleted file mode 100644
index 40373ffb89..0000000000
--- a/packages/instantsearch.js/src/lib/insights/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export {
-  default as withInsights,
-  inferPayload as inferInsightsPayload,
-} from './client';
-export { default as withInsightsListener } from './listener';
diff --git a/packages/instantsearch.js/src/lib/insights/listener.tsx b/packages/instantsearch.js/src/lib/insights/listener.tsx
deleted file mode 100644
index 6c47992604..0000000000
--- a/packages/instantsearch.js/src/lib/insights/listener.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-/** @jsx h */
-
-import { h } from 'preact';
-
-import { readDataAttributes } from '../../helpers/insights';
-import { deserializePayload, warning } from '../utils';
-
-import type { InsightsEvent } from '../../middlewares/createInsightsMiddleware';
-import type { InsightsClient } from '../../types';
-
-export type InsightsEventHandlerOptions = {
-  insights?: InsightsClient;
-  sendEvent: (event: InsightsEvent) => void;
-};
-
-export const createInsightsEventHandler =
-  ({ insights, sendEvent }: InsightsEventHandlerOptions) =>
-  (event: MouseEvent): void => {
-    // new way, e.g. bindEvent("click", hit, "Hit clicked")
-    const insightsThroughSendEvent = findInsightsTarget(
-      event.target as HTMLElement | null,
-      event.currentTarget as HTMLElement | null,
-      (element) => element.hasAttribute('data-insights-event')
-    );
-
-    if (insightsThroughSendEvent) {
-      const payload = parseInsightsEvent(insightsThroughSendEvent);
-
-      payload.forEach((single) => sendEvent(single));
-    }
-
-    // old way, e.g. instantsearch.insights("clickedObjectIDsAfterSearch", { .. })
-    const insightsThroughFunction = findInsightsTarget(
-      event.target as HTMLElement | null,
-      event.currentTarget as HTMLElement | null,
-      (element) =>
-        element.hasAttribute('data-insights-method') &&
-        element.hasAttribute('data-insights-payload')
-    );
-    if (insightsThroughFunction) {
-      const { method, payload } = readDataAttributes(insightsThroughFunction);
-      insights!(method, payload);
-    }
-  };
-
-function findInsightsTarget(
-  startElement: HTMLElement | null,
-  endElement: HTMLElement | null,
-  validator: (element: HTMLElement) => boolean
-): HTMLElement | null {
-  let element: HTMLElement | null = startElement;
-  while (element && !validator(element)) {
-    if (element === endElement) {
-      return null;
-    }
-    element = element.parentElement;
-  }
-  return element;
-}
-
-function parseInsightsEvent(element: HTMLElement): InsightsEvent[] {
-  const serializedPayload = element.getAttribute('data-insights-event');
-
-  if (typeof serializedPayload !== 'string') {
-    throw new Error(
-      'The insights middleware expects `data-insights-event` to be a base64-encoded JSON string.'
-    );
-  }
-
-  try {
-    return deserializePayload(serializedPayload);
-  } catch (error) {
-    throw new Error(
-      'The insights middleware was unable to parse `data-insights-event`.'
-    );
-  }
-}
-
-/**
- * @deprecated use `sendEvent` directly instead
- */
-export default function withInsightsListener(BaseComponent: any) {
-  warning(
-    false,
-    'The `withInsightsListener` function is deprecated and will be removed in the next major version. Please use `sendEvent` directly instead.'
-  );
-
-  return function WithInsightsListener(
-    props: { [key: string]: any } & InsightsEventHandlerOptions
-  ) {
-    const handleClick = createInsightsEventHandler(props);
-
-    return (
-      <div onClick={handleClick}>
-        <BaseComponent {...props} />
-      </div>
-    );
-  };
-}
diff --git a/packages/instantsearch.js/src/helpers/__tests__/get-insights-anonymous-user-token-test.ts b/packages/instantsearch.js/src/lib/utils/__tests__/getInsightsAnonymousUserToken-test.ts
similarity index 67%
rename from packages/instantsearch.js/src/helpers/__tests__/get-insights-anonymous-user-token-test.ts
rename to packages/instantsearch.js/src/lib/utils/__tests__/getInsightsAnonymousUserToken-test.ts
index aca787ced1..2488a7a8b9 100644
--- a/packages/instantsearch.js/src/helpers/__tests__/get-insights-anonymous-user-token-test.ts
+++ b/packages/instantsearch.js/src/lib/utils/__tests__/getInsightsAnonymousUserToken-test.ts
@@ -2,10 +2,10 @@
  * @jest-environment jsdom
  */
 
-import { warning } from '../../lib/utils';
-import getInsightsAnonymousUserToken, {
+import {
+  getInsightsAnonymousUserToken,
   ANONYMOUS_TOKEN_COOKIE_KEY,
-} from '../get-insights-anonymous-user-token';
+} from '../getInsightsAnonymousUserToken';
 
 const DAY = 86400000; /* 1 day in ms*/
 const DATE_TOMORROW = new Date(Date.now() + DAY).toUTCString();
@@ -39,14 +39,4 @@ describe('getInsightsAnonymousUserToken', () => {
     document.cookie = `BAD_COOKIE=val%ue;expires=${DATE_TOMORROW};path=/`;
     expect(getInsightsAnonymousUserToken()).toBe('anonymous-uuid');
   });
-
-  it('should show deprecation warning', () => {
-    warning.cache = {};
-    expect(() => {
-      getInsightsAnonymousUserToken();
-    })
-      .toWarnDev(`[InstantSearch.js]: \`getInsightsAnonymousUserToken\` function has been deprecated. It is still supported in 4.x releases, but not further. It is replaced by the \`insights\` middleware.
-
-For more information, visit https://www.algolia.com/doc/guides/getting-insights-and-analytics/search-analytics/click-through-and-conversions/how-to/send-click-and-conversion-events-with-instantsearch/js/`);
-  });
 });
diff --git a/packages/instantsearch.js/src/lib/utils/getInsightsAnonymousUserToken.ts b/packages/instantsearch.js/src/lib/utils/getInsightsAnonymousUserToken.ts
new file mode 100644
index 0000000000..ad08f9685d
--- /dev/null
+++ b/packages/instantsearch.js/src/lib/utils/getInsightsAnonymousUserToken.ts
@@ -0,0 +1,24 @@
+export const ANONYMOUS_TOKEN_COOKIE_KEY = '_ALGOLIA';
+
+function getCookie(name: string): string | undefined {
+  if (typeof document !== 'object' || typeof document.cookie !== 'string') {
+    return undefined;
+  }
+
+  const prefix = `${name}=`;
+  const cookies = document.cookie.split(';');
+  for (let i = 0; i < cookies.length; i++) {
+    let cookie = cookies[i];
+    while (cookie.charAt(0) === ' ') {
+      cookie = cookie.substring(1);
+    }
+    if (cookie.indexOf(prefix) === 0) {
+      return cookie.substring(prefix.length, cookie.length);
+    }
+  }
+  return undefined;
+}
+
+export function getInsightsAnonymousUserToken(): string | undefined {
+  return getCookie(ANONYMOUS_TOKEN_COOKIE_KEY);
+}
diff --git a/packages/instantsearch.js/src/lib/utils/index.ts b/packages/instantsearch.js/src/lib/utils/index.ts
index 45cb364232..8016765778 100644
--- a/packages/instantsearch.js/src/lib/utils/index.ts
+++ b/packages/instantsearch.js/src/lib/utils/index.ts
@@ -7,8 +7,6 @@ export * from './concatHighlightedParts';
 export * from './createConcurrentSafePromise';
 export * from './createSendEventForFacet';
 export * from './createSendEventForHits';
-export * from './setIndexHelperState';
-export * from './isIndexWidget';
 export * from './debounce';
 export * from './defer';
 export * from './documentation';
@@ -22,6 +20,7 @@ export * from './getAppIdAndApiKey';
 export * from './getContainerNode';
 export * from './getHighlightedParts';
 export * from './getHighlightFromSiblings';
+export * from './getInsightsAnonymousUserToken';
 export * from './getObjectType';
 export * from './getPropertyByPath';
 export * from './getRefinements';
@@ -34,18 +33,21 @@ export * from './isDomElement';
 export * from './isEqual';
 export * from './isFacetRefined';
 export * from './isFiniteNumber';
+export * from './isIndexWidget';
 export * from './isPlainObject';
 export * from './isSpecialClick';
-export * from './walkIndex';
 export * from './logger';
 export * from './mergeSearchParameters';
-export * from './omit';
 export * from './noop';
+export * from './omit';
 export * from './range';
 export * from './render-args';
 export * from './resolveSearchParameters';
 export * from './reverseHighlightedParts';
 export * from './safelyRunOnBrowser';
 export * from './serializer';
+export * from './setIndexHelperState';
 export * from './toArray';
 export * from './uniq';
+export * from './uuid';
+export * from './walkIndex';
diff --git a/packages/instantsearch.js/src/middlewares/createInsightsMiddleware.ts b/packages/instantsearch.js/src/middlewares/createInsightsMiddleware.ts
index 8e1fb8b634..e74d5aefca 100644
--- a/packages/instantsearch.js/src/middlewares/createInsightsMiddleware.ts
+++ b/packages/instantsearch.js/src/middlewares/createInsightsMiddleware.ts
@@ -1,12 +1,12 @@
-import { getInsightsAnonymousUserTokenInternal } from '../helpers';
 import {
   warning,
   noop,
   getAppIdAndApiKey,
   find,
   safelyRunOnBrowser,
+  getInsightsAnonymousUserToken,
+  createUUID,
 } from '../lib/utils';
-import { createUUID } from '../lib/utils/uuid';
 
 import type {
   InsightsClient,
@@ -262,8 +262,7 @@ export function createInsightsMiddleware<
         }
 
         let anonymousUserToken: string | undefined = undefined;
-        const anonymousTokenFromInsights =
-          getInsightsAnonymousUserTokenInternal();
+        const anonymousTokenFromInsights = getInsightsAnonymousUserToken();
         if (anonymousTokenFromInsights) {
           // When `aa('init', { ... })` is called, it creates an anonymous user token in cookie.
           // We can set it as userToken on instantsearch and insights. If it's not set as an insights
diff --git a/packages/instantsearch.js/src/widgets/hits/hits.tsx b/packages/instantsearch.js/src/widgets/hits/hits.tsx
index 9e1ab88d7f..849da60707 100644
--- a/packages/instantsearch.js/src/widgets/hits/hits.tsx
+++ b/packages/instantsearch.js/src/widgets/hits/hits.tsx
@@ -5,8 +5,6 @@ import { Fragment, h, render } from 'preact';
 
 import TemplateComponent from '../../components/Template/Template';
 import connectHits from '../../connectors/hits/connectHits';
-import { withInsights } from '../../lib/insights';
-import { createInsightsEventHandler } from '../../lib/insights/listener';
 import { prepareTemplateProps } from '../../lib/templating';
 import {
   getContainerNode,
@@ -54,7 +52,7 @@ const renderer =
     };
     templates: HitsTemplates<THit>;
   }): Renderer<HitsRenderState, Partial<HitsWidgetParams>> =>
-  ({ items, results, insights, sendEvent, banner }, isFirstRendering) => {
+  ({ items, results, sendEvent, banner }, isFirstRendering) => {
     if (isFirstRendering) {
       renderState.templateProps = prepareTemplateProps<HitsTemplates<THit>>({
         defaultTemplates,
@@ -63,11 +61,6 @@ const renderer =
       return;
     }
 
-    const handleInsightsClick = createInsightsEventHandler({
-      insights,
-      sendEvent,
-    });
-
     const emptyComponent: HitsUiComponentProps<Hit>['emptyComponent'] = ({
       ...rootProps
     }) => (
@@ -93,14 +86,6 @@ const renderer =
         rootTagName="li"
         rootProps={{
           ...rootProps,
-          onClick: (event: MouseEvent) => {
-            handleInsightsClick(event);
-            rootProps.onClick();
-          },
-          onAuxClick: (event: MouseEvent) => {
-            handleInsightsClick(event);
-            rootProps.onAuxClick();
-          },
         }}
         data={{
           ...hit,
@@ -220,7 +205,7 @@ export default (function hits<THit extends NonNullable<object> = BaseHit>(
     templates,
   });
 
-  const makeWidget = withInsights(connectHits)(specializedRenderer, () =>
+  const makeWidget = connectHits(specializedRenderer, () =>
     render(null, containerNode)
   );
 
diff --git a/packages/instantsearch.js/src/widgets/infinite-hits/infinite-hits.tsx b/packages/instantsearch.js/src/widgets/infinite-hits/infinite-hits.tsx
index dccea1316e..555138c41a 100644
--- a/packages/instantsearch.js/src/widgets/infinite-hits/infinite-hits.tsx
+++ b/packages/instantsearch.js/src/widgets/infinite-hits/infinite-hits.tsx
@@ -5,7 +5,6 @@ import { h, render } from 'preact';
 
 import InfiniteHits from '../../components/InfiniteHits/InfiniteHits';
 import connectInfiniteHits from '../../connectors/infinite-hits/connectInfiniteHits';
-import { withInsights } from '../../lib/insights';
 import { component } from '../../lib/suit';
 import { prepareTemplateProps } from '../../lib/templating';
 import {
@@ -288,9 +287,8 @@ export default (function infiniteHits<
     renderState: {},
   });
 
-  const makeWidget = withInsights(connectInfiniteHits)(
-    specializedRenderer,
-    () => render(null, containerNode)
+  const makeWidget = connectInfiniteHits(specializedRenderer, () =>
+    render(null, containerNode)
   );
 
   return {
diff --git a/packages/instantsearch.js/stories/hits.stories.ts b/packages/instantsearch.js/stories/hits.stories.ts
index 9b325bdf87..bf41e8a000 100644
--- a/packages/instantsearch.js/stories/hits.stories.ts
+++ b/packages/instantsearch.js/stories/hits.stories.ts
@@ -115,16 +115,20 @@ storiesOf('Results/Hits', module)
         instantsearch.widgets.hits({
           container,
           templates: {
-            item(hit) {
-              return `
-                <h4>${instantsearch.reverseSnippet({
-                  attribute: 'name',
-                  hit,
-                })}</h4>
-                <p>${instantsearch.reverseSnippet({
-                  attribute: 'description',
-                  hit,
-                })}</p>
+            item(hit, { html, components }) {
+              return html`
+                <h4>
+                  ${components.ReverseSnippet({
+                    attribute: 'name',
+                    hit,
+                  })}
+                </h4>
+                <p>
+                  ${components.ReverseSnippet({
+                    attribute: 'description',
+                    hit,
+                  })}
+                </p>
               `;
             },
           },
diff --git a/packages/instantsearch.js/test/module/is-cjs-module.cjs b/packages/instantsearch.js/test/module/is-cjs-module.cjs
index 64fea158ea..df88146871 100644
--- a/packages/instantsearch.js/test/module/is-cjs-module.cjs
+++ b/packages/instantsearch.js/test/module/is-cjs-module.cjs
@@ -3,13 +3,11 @@ const assert = require('assert');
 
 const instantsearch = require('instantsearch.js/cjs/index.js');
 const connectors = require('instantsearch.js/cjs/connectors/index.js');
-const helpers = require('instantsearch.js/cjs/helpers/index.js');
 const middlewares = require('instantsearch.js/cjs/middlewares/index.js');
 const widgets = require('instantsearch.js/cjs/widgets/index.js');
 
 assert.ok(instantsearch);
 assert.ok(connectors);
-assert.ok(helpers);
 assert.ok(middlewares);
 assert.ok(widgets);
 
diff --git a/packages/instantsearch.js/test/module/is-es-module.mjs b/packages/instantsearch.js/test/module/is-es-module.mjs
index 87a1a80ec2..21939dc564 100644
--- a/packages/instantsearch.js/test/module/is-es-module.mjs
+++ b/packages/instantsearch.js/test/module/is-es-module.mjs
@@ -3,13 +3,11 @@ import assert from 'assert';
 
 import instantsearch from 'instantsearch.js/es/index.js';
 import * as connectors from 'instantsearch.js/es/connectors/index.js';
-import * as helpers from 'instantsearch.js/es/helpers/index.js';
 import * as middlewares from 'instantsearch.js/es/middlewares/index.js';
 import * as widgets from 'instantsearch.js/es/widgets/index.js';
 
 assert.ok(instantsearch);
 assert.ok(connectors);
-assert.ok(helpers);
 assert.ok(middlewares);
 assert.ok(widgets);
 
diff --git a/packages/vue-instantsearch/src/components/Hits.js b/packages/vue-instantsearch/src/components/Hits.js
index 1eea498ecc..3860cd505a 100644
--- a/packages/vue-instantsearch/src/components/Hits.js
+++ b/packages/vue-instantsearch/src/components/Hits.js
@@ -1,5 +1,5 @@
 import { createHitsComponent } from 'instantsearch-ui-components';
-import { connectHitsWithInsights } from 'instantsearch.js/es/connectors';
+import { connectHits } from 'instantsearch.js/es/connectors';
 
 import { createSuitMixin } from '../mixins/suit';
 import { createWidgetMixin } from '../mixins/widget';
@@ -10,7 +10,7 @@ export default {
   mixins: [
     createWidgetMixin(
       {
-        connector: connectHitsWithInsights,
+        connector: connectHits,
       },
       {
         $$widgetType: 'ais.hits',
@@ -74,7 +74,6 @@ export default {
             itemSlot({
               item: hit,
               index,
-              insights: this.state.insights,
               sendEvent: this.state.sendEvent,
             })) ||
             `objectID: ${hit.objectID}, index: ${index}`,
@@ -96,7 +95,6 @@ export default {
           defaultSlot({
             banner: this.state.banner,
             items: this.state.items,
-            insights: this.state.insights,
             sendEvent: this.state.sendEvent,
           }),
         ]
diff --git a/packages/vue-instantsearch/src/components/InfiniteHits.vue b/packages/vue-instantsearch/src/components/InfiniteHits.vue
index 625eed4316..f36d6222bd 100644
--- a/packages/vue-instantsearch/src/components/InfiniteHits.vue
+++ b/packages/vue-instantsearch/src/components/InfiniteHits.vue
@@ -27,7 +27,6 @@
       :refine-previous="refinePrevious"
       :refine-next="refineNext"
       :refine="refineNext"
-      :insights="state.insights"
       :send-event="state.sendEvent"
     >
       <template
@@ -68,7 +67,6 @@
             name="item"
             :item="item"
             :index="index"
-            :insights="state.insights"
             :send-event="state.sendEvent"
           >
             objectID: {{ item.objectID }}, index: {{ index }}
@@ -99,7 +97,7 @@
 </template>
 
 <script>
-import { connectInfiniteHitsWithInsights } from 'instantsearch.js/es/connectors';
+import { connectInfiniteHits } from 'instantsearch.js/es/connectors';
 
 import { createSuitMixin } from '../mixins/suit';
 import { createWidgetMixin } from '../mixins/widget';
@@ -109,7 +107,7 @@ export default {
   mixins: [
     createWidgetMixin(
       {
-        connector: connectInfiniteHitsWithInsights,
+        connector: connectInfiniteHits,
       },
       {
         $$widgetType: 'ais.infiniteHits',
diff --git a/packages/vue-instantsearch/src/components/__tests__/Hits.js b/packages/vue-instantsearch/src/components/__tests__/Hits.js
index 6b19320dca..8bb74f8876 100644
--- a/packages/vue-instantsearch/src/components/__tests__/Hits.js
+++ b/packages/vue-instantsearch/src/components/__tests__/Hits.js
@@ -73,65 +73,6 @@ it('exposes banner prop to the banner slot', () => {
   expect(img.attributes('src')).toBe('https://via.placeholder.com/550x250');
 });
 
-it('exposes insights prop to the default slot', async () => {
-  const insights = jest.fn();
-  __setState({
-    ...defaultState,
-    insights,
-  });
-
-  const wrapper = mount({
-    components: { Hits },
-    template: `
-      <Hits>
-        <template v-slot="{ items, insights }">
-          <ul>
-            <li v-for="(item, itemIndex) in items" >
-
-              <button :id="'add-to-cart-' + item.objectID" @click="insights('clickedObjectIDsAfterSearch', {eventName: 'Add to cart', objectIDs: [item.objectID]})">
-                Add to cart
-              </button>
-            </li>
-          </ul>
-        </template>
-      </Hits>
-    `,
-  });
-  await wrapper.find('#add-to-cart-two').trigger('click');
-  expect(insights).toHaveBeenCalledWith('clickedObjectIDsAfterSearch', {
-    eventName: 'Add to cart',
-    objectIDs: ['two'],
-  });
-});
-
-it('exposes insights prop to the item slot', async () => {
-  const insights = jest.fn();
-  __setState({
-    ...defaultState,
-    insights,
-  });
-
-  const wrapper = mount({
-    components: { Hits },
-    template: `
-      <Hits>
-        <template v-slot:item="{ item, insights }">
-          <div>
-            <button :id="'add-to-cart-' + item.objectID" @click="insights('clickedObjectIDsAfterSearch', {eventName: 'Add to cart', objectIDs: [item.objectID]})">
-              Add to cart
-            </button>
-          </div>
-        </template>
-      </Hits>
-    `,
-  });
-  await wrapper.find('#add-to-cart-two').trigger('click');
-  expect(insights).toHaveBeenCalledWith('clickedObjectIDsAfterSearch', {
-    eventName: 'Add to cart',
-    objectIDs: ['two'],
-  });
-});
-
 it('exposes send-event method for insights middleware', async () => {
   const sendEvent = jest.fn();
   __setState({
diff --git a/packages/vue-instantsearch/src/components/__tests__/InfiniteHits.js b/packages/vue-instantsearch/src/components/__tests__/InfiniteHits.js
index 1f2d5f2165..20232acb42 100644
--- a/packages/vue-instantsearch/src/components/__tests__/InfiniteHits.js
+++ b/packages/vue-instantsearch/src/components/__tests__/InfiniteHits.js
@@ -160,68 +160,6 @@ it('does not render a banner when showBanner is false', () => {
   expect(wrapper.html()).toMatchSnapshot();
 });
 
-it('exposes insights prop to the default slot', async () => {
-  const insights = jest.fn();
-
-  __setState({
-    ...defaultState,
-    insights,
-  });
-
-  const wrapper = mount({
-    components: { InfiniteHits },
-    template: `
-      <InfiniteHits>
-        <template v-slot="{ items, insights }">
-        <ul>
-        <li v-for="(item, itemIndex) in items" >
-          <button :id="'add-to-cart-' + item.objectID" @click="insights('clickedObjectIDsAfterSearch', {eventName: 'Add to cart', objectIDs: [item.objectID]})">
-            Add to cart
-          </button>
-        </li>
-      </ul>
-        </template>
-      </InfiniteHits>
-    `,
-  });
-
-  await wrapper.find('#add-to-cart-00002').trigger('click');
-  expect(insights).toHaveBeenCalledWith('clickedObjectIDsAfterSearch', {
-    eventName: 'Add to cart',
-    objectIDs: ['00002'],
-  });
-});
-
-it('exposes insights prop to the item slot', async () => {
-  const insights = jest.fn();
-
-  __setState({
-    ...defaultState,
-    insights,
-  });
-
-  const wrapper = mount({
-    components: { InfiniteHits },
-    template: `
-      <InfiniteHits>
-        <template v-slot:item="{ item, insights }">
-          <div>
-            <button :id="'add-to-cart-' + item.objectID" @click="insights('clickedObjectIDsAfterSearch', {eventName: 'Add to cart', objectIDs: [item.objectID]})">
-              Add to cart
-            </button>
-          </div>
-        </template>
-      </InfiniteHits>
-    `,
-  });
-
-  await wrapper.find('#add-to-cart-00002').trigger('click');
-  expect(insights).toHaveBeenCalledWith('clickedObjectIDsAfterSearch', {
-    eventName: 'Add to cart',
-    objectIDs: ['00002'],
-  });
-});
-
 it('exposes send-event method for insights middleware', async () => {
   const sendEvent = jest.fn();
   __setState({

From 6bbfc5a9f7fe91e45a4604a41c2cf39edecb6bdb Mon Sep 17 00:00:00 2001
From: Sarah Dayan <5370675+sarahdayan@users.noreply.github.com>
Date: Fri, 25 Oct 2024 11:20:06 +0200
Subject: [PATCH 10/37] refactor: introduce `instantsearch-core` (#6371)

Co-authored-by: Dhaya <154633+dhayab@users.noreply.github.com>
Co-authored-by: Sarah Dayan <sarahdayan@users.noreply.github.com>

---------

Co-authored-by: Haroen Viaene <hello@haroen.me>
Co-authored-by: Dhaya <154633+dhayab@users.noreply.github.com>

refactor(react): replace instantsearch.js with instantsearch-core (#6439)

BREAKING CHANGE: if you are using any internal instantsearch.js functions, ensure to update to instantsearch-core to avoid duplication

refactor(vue): replace instantsearch.js with instantsearch-core (#6440)

[FX-3069]

BREAKING CHANGE: if you are using any internal instantsearch.js functions, ensure to update to instantsearch-core to avoid duplication

feat(core): migrate instantsearch.js to instantsearch-core (#6424)

BREAKING CHANGE: __hitIndex is no longer populated

refactor(js): remove duplicate files (#6493)

The files `connectors/*/connect*.ts` and `middlewares/create*Middleware.ts` files have the same name in instantsearch.js as in instantsearch-core, making file navigation annoying. This is now solved by re-exporting in the barrel file for those files only.

BREAKING CHANGE: import only from `instantsearch.js/es/{connectors,middleware}` or `instantsearch-core`, not from no longer existing child files
---
 .circleci/config.yml                          |   1 +
 .codesandbox/ci.json                          |   3 +-
 .eslintrc.js                                  |   6 +-
 babel.config.js                               |  13 +
 examples/react/default-theme/package.json     |   2 +-
 examples/react/default-theme/src/App.tsx      |   2 +-
 .../e-commerce/components/PriceSlider.tsx     |   5 +-
 .../react/e-commerce/components/Ratings.tsx   |   4 +-
 examples/react/e-commerce/package.json        |   2 +-
 examples/react/getting-started/package.json   |   2 +-
 examples/react/getting-started/src/App.tsx    |   2 +-
 .../react/getting-started/src/Product.tsx     |   3 +-
 examples/react/react-native/package.json      |   2 +-
 examples/react/react-native/src/Highlight.tsx |   8 +-
 .../react/react-native/src/InfiniteHits.tsx   |   3 +-
 examples/react/ssr/src/App.js                 |  11 +-
 examples/vue/default-theme/package.json       |   2 +-
 examples/vue/default-theme/src/App.vue        |   5 +-
 examples/vue/e-commerce/package.json          |   2 +-
 examples/vue/e-commerce/src/routing.js        |   2 +-
 .../src/widgets/ClearRefinements.vue          |   2 +-
 .../vue/e-commerce/src/widgets/NoResults.vue  |   2 +-
 examples/vue/getting-started/package.json     |   2 +-
 examples/vue/media/package.json               |   2 +-
 examples/vue/media/src/App.vue                |   5 +-
 jest.config.js                                |   3 +
 package.json                                  |   1 +
 packages/algolia-experiences/package.json     |   1 +
 .../src/__tests__/render.test.ts              |   2 +-
 packages/algolia-experiences/src/banner.tsx   |   2 +-
 packages/algolia-experiences/src/render.tsx   |   2 +-
 .../src/setup-instantsearch.ts                |   6 +-
 packages/algoliasearch-helper/index.d.ts      |   5 +-
 packages/instantsearch-core/CHANGELOG.md      |   1 +
 packages/instantsearch-core/README.md         |  44 +
 packages/instantsearch-core/package.json      |  56 ++
 .../instantsearch-core/scripts/version.cjs    |  11 +
 .../src/__tests__/RoutingManager.test.ts}     |  15 +-
 .../instantsearch-composition.test.tsx}       |  29 +-
 .../instantsearch-integration.test.ts}        |  84 +-
 .../src/__tests__/instantsearch.test.tsx}     |  89 +-
 .../src}/__tests__/server-composition.test.ts |   9 +-
 .../src}/__tests__/server.test.ts             |   9 +-
 .../src}/__tests__/status.test.ts             |   6 +-
 .../__tests__/connectAutocomplete.test.ts}    |  12 +-
 .../__tests__/connectBreadcrumb.test.ts}      |   7 +-
 .../connectClearRefinements.test.ts}          |   4 +-
 .../__tests__/connectConfigure.test.ts}       |   5 +-
 .../connectCurrentRefinements.test.ts}        |   4 +-
 .../__tests__/connectDynamicWidgets.test.ts}  |  19 +-
 .../connectFrequentlyBoughtTogether.test.ts}  |   8 +-
 .../__tests__/connectGeoSearch.test.ts}       | 133 ++-
 .../connectHierarchicalMenu.test.ts}          |   9 +-
 .../connectors/__tests__/connectHits.test.ts} |  77 +-
 .../__tests__/connectHitsPerPage.test.ts}     |   4 +-
 .../__tests__/connectInfiniteHits.test.ts}    | 118 +--
 .../__tests__/connectLookingSimilar.test.ts}  |   8 +-
 .../connectors/__tests__/connectMenu.test.ts} |  22 +-
 .../__tests__/connectNumericMenu.test.ts}     |   4 +-
 .../__tests__/connectPagination.test.ts}      |   4 +-
 .../__tests__/connectPoweredBy.test.ts}       |   4 +-
 .../__tests__/connectQueryRules.test.ts}      |  10 +-
 .../__tests__/connectRange.test.ts}           |   7 +-
 .../__tests__/connectRatingMenu.test.ts}      |   6 +-
 .../__tests__/connectRefinementList.test.ts}  |  13 +-
 .../__tests__/connectRelatedProducts.test.ts} |   8 +-
 .../__tests__/connectRelevantSort.test.ts}    |   5 +-
 .../__tests__/connectSearchBox.test.ts}       |   9 +-
 .../__tests__/connectSortBy.test.ts}          |   9 +-
 .../__tests__/connectStats.test.ts}           |   4 +-
 .../connectToggleRefinement.test.ts}          |  11 +-
 .../__tests__/connectTrendingItems.test.ts}   |   8 +-
 .../__tests__/connectVoiceSearch.test.ts}     |   8 +-
 .../src/connectors/connectAutocomplete.ts     | 265 ++++++
 .../src/connectors/connectBreadcrumb.ts       | 363 +++++++
 .../connectors}/connectClearRefinements.ts    |  12 +-
 .../src/connectors}/connectConfigure.ts       |  10 +-
 .../connectors}/connectCurrentRefinements.ts  |  13 +-
 .../src/connectors}/connectDynamicWidgets.ts  |  12 +-
 .../connectFrequentlyBoughtTogether.ts        | 241 +++++
 .../src/connectors}/connectGeoSearch.ts       |  36 +-
 .../connectors}/connectHierarchicalMenu.ts    |  13 +-
 .../src/connectors}/connectHits.ts            |  44 +-
 .../src/connectors/connectHitsPerPage.ts      | 307 ++++++
 .../src/connectors}/connectInfiniteHits.ts    |  44 +-
 .../src/connectors}/connectLookingSimilar.ts  |  34 +-
 .../src/connectors}/connectMenu.ts            |  13 +-
 .../src/connectors}/connectNumericMenu.ts     | 390 ++++----
 .../src/connectors/connectPagination.ts       | 201 ++++
 .../src/connectors}/connectPoweredBy.ts       |  10 +-
 .../src/connectors}/connectQueryRules.ts      | 230 +++--
 .../src/connectors}/connectRange.ts           |  98 +-
 .../src/connectors/connectRatingMenu.ts       | 495 ++++++++++
 .../src/connectors}/connectRefinementList.ts  |  19 +-
 .../src/connectors}/connectRelatedProducts.ts |  39 +-
 .../src/connectors/connectRelevantSort.ts     | 138 +++
 .../src/connectors}/connectSearchBox.ts       |  13 +-
 .../src/connectors}/connectSortBy.ts          |  14 +-
 .../src/connectors}/connectStats.ts           |  13 +-
 .../connectors}/connectToggleRefinement.ts    |  20 +-
 .../src/connectors}/connectTrendingItems.ts   |  35 +-
 .../src/connectors/connectVoiceSearch.ts      | 220 +++++
 .../src/connectors/index.ts                   |  29 +
 packages/instantsearch-core/src/index.ts      |  10 +
 .../instantsearch-core/src/instantsearch.ts   | 706 ++++++++++++++
 .../src/lib}/Paginator.ts                     |   2 +-
 .../src/lib}/__tests__/Paginator-test.ts      |   0
 .../__tests__/sessionStorage-key.test.ts      |   2 +-
 .../__tests__/sessionStorage.test.ts          |   2 +-
 .../src/lib/infiniteHitsCache/index.ts        |   1 +
 .../lib/infiniteHitsCache/sessionStorage.ts   |  74 ++
 .../lib/public/__tests__/capitalize.test.ts}  |   2 +-
 .../src/lib/public/__tests__/defer.test.ts}   |   2 +-
 .../lib/public/__tests__/escapeHits.test.ts}  |   2 +-
 .../lib/public/__tests__/escapeHtml.test.ts}  |   2 +-
 .../getHighlightFromSiblings.test.ts}         |   2 +-
 .../__tests__/getHighlightedParts.test.ts}    |   2 +-
 .../public/__tests__/getObjectType.test.ts}   |   2 +-
 .../__tests__/getPropertyByPath.test.ts}      |   2 +-
 .../__tests__/getWidgetAttribute.test.ts}     |  44 +-
 .../src/lib/public/__tests__/isEqual.test.ts} |   2 +-
 .../public/__tests__/isPlainObject.test.ts}   |   2 +-
 .../src/lib/public/__tests__/logger.test.ts}  |   8 +-
 .../src/lib/public/__tests__/noop.test.ts}    |   2 +-
 .../src/lib/public/__tests__/range.test.ts}   |   2 +-
 .../reverseHighlightedParts.test.ts}          |   2 +-
 .../__tests__/safelyRunOnBrowser.test.ts}     |   2 +-
 .../src/lib/public/__tests__/toArray.test.ts} |   2 +-
 .../src/lib/public/__tests__/uniq.test.ts}    |   2 +-
 .../lib/public}/__tests__/walkIndex.test.ts   |   0
 .../src/lib/public}/addWidgetId.ts            |   0
 .../src/lib/public}/capitalize.ts             |   0
 .../src/lib/public/createUUID.ts}             |   0
 .../src/lib/public}/defer.ts                  |   0
 .../src/lib/public}/documentation.ts          |   0
 .../src/lib/public}/escape-highlight.ts       |   0
 .../src/lib/public}/escape-html.ts            |   0
 .../lib/public}/getHighlightFromSiblings.ts   |   0
 .../src/lib/public}/getHighlightedParts.ts    |   0
 .../src/lib/public}/getObjectType.ts          |   0
 .../src/lib/public}/getPropertyByPath.ts      |   0
 .../src/lib/public}/getWidgetAttribute.ts     |   0
 .../src/lib/public/index.ts                   |  29 +
 .../src/lib/public}/isEqual.ts                |   0
 .../src/lib/public}/isFacetRefined.ts         |   0
 .../src/lib/public}/isIndexWidget.ts          |   0
 .../src/lib/public}/isPlainObject.ts          |   0
 .../src/lib/public}/isSpecialClick.ts         |   0
 .../src/lib/public}/logger.ts                 |  23 +-
 .../src/lib/public}/noop.ts                   |   0
 .../src/lib/public}/range.ts                  |   0
 .../src/lib/public}/render-args.ts            |   3 +-
 .../lib/public}/reverseHighlightedParts.ts    |   0
 .../src/lib/public}/safelyRunOnBrowser.ts     |   0
 .../src/lib/public}/toArray.ts                |   0
 .../src/lib/public}/typedObject.ts            |   0
 .../src/lib/public}/uniq.ts                   |   0
 .../src/lib/public}/walkIndex.ts              |   0
 .../__tests__/addAbsolutePosition.test.ts}    |   2 +-
 .../lib/utils/__tests__/addQueryID.test.ts}   |   2 +-
 .../utils/__tests__/clearRefinements.test.ts} |   2 +-
 .../createSendEventForFacet.test.ts}          |   4 +-
 .../__tests__/createSendEventForHits.test.ts} |   0
 .../lib/utils/__tests__/geo-search.test.ts}   |   5 +-
 .../__tests__/getAppIdAndApiKey.test.ts}      |   2 +-
 .../getInsightsAnonymousUserToken.test.ts}    |   5 +-
 .../utils/__tests__/getRefinements.test.ts}   |   2 +-
 .../__tests__/hydrateRecommendCache.test.ts}  |   2 +-
 .../hydrateSearchClient-composition.test.ts}  |   0
 .../__tests__/hydrateSearchClient.test.ts}    |   2 +-
 .../__tests__/mergeSearchParameters.test.ts}  |   2 +-
 .../resolveSearchParameters.test.ts}          |   2 +-
 .../src/lib/utils/addAbsolutePosition.ts}     |   0
 .../src/lib/utils/addQueryID.ts}              |   0
 .../src/lib/utils/checkIndexUiState.ts        |   6 +-
 .../src/lib/utils/checkRendering.ts           |   4 +-
 .../src/lib/utils/clearRefinements.ts         |   0
 .../src/lib/utils/createSendEventForFacet.ts  |  16 +-
 .../src/lib/utils/createSendEventForHits.ts   |  31 +-
 .../src/lib/utils/escapeFacetValue.ts         |   0
 .../src/lib/utils/geo-search.ts               |   0
 .../src/lib/utils/getAppIdAndApiKey.ts        |   0
 .../lib/utils/getInsightsAnonymousToken.ts}   |   0
 .../src/lib/utils/getRefinements.ts           |  11 +-
 .../src/lib/utils/hydrateRecommendCache.ts    |   0
 .../src/lib/utils/hydrateSearchClient.ts      |   0
 .../instantsearch-core/src/lib/utils/index.ts |  20 +
 .../src/lib/utils/mergeSearchParameters.ts    |   5 +-
 .../src/lib/utils/resolveSearchParameters.ts  |   0
 .../src/lib/utils/serializer.ts               |   2 +
 .../src/lib/utils/setIndexHelperState.ts      |   3 +-
 .../voiceSearchHelper/__tests__/index-test.ts |   0
 .../src/lib/voiceSearchHelper/index.ts        |   0
 .../src/lib/voiceSearchHelper/types.ts        |   0
 .../__tests__/createInsightsMiddleware.ts     |  43 +-
 .../__tests__/createMetadataMiddleware.ts     |  54 +-
 .../__tests__/createRouterMiddleware.ts       |  21 +-
 .../middlewares/createInsightsMiddleware.ts   |  53 +-
 .../middlewares/createMetadataMiddleware.ts   |  12 +-
 .../src/middlewares/createRouterMiddleware.ts |  21 +-
 .../src/middlewares/index.ts                  |   3 +
 .../routing/__tests__}/correct-urls.test.ts   |  11 +-
 .../routing/__tests__/dispose-start.test.ts}  |   6 +-
 .../routing/__tests__/duplicate-url.test.ts}  |   9 +-
 .../__tests__/external-influence.test.ts}     |   4 +-
 .../historyRouter-integration.test.ts}        |   8 +-
 .../routing/__tests__/historyRouter.test.ts}  |  21 +-
 .../src/routing/__tests__/modal.test.ts}      |   4 +-
 .../__tests__/simpleStateMapping.test.ts}     |   4 +-
 .../singleIndexStateMapping.test.ts}          |   4 +-
 .../routing/__tests__/spa-debounced.test.ts}  |   4 +-
 .../__tests__/spa-replace-state.test.ts}      |   4 +-
 .../src/routing/__tests__/spa.test.ts}        |   4 +-
 .../src/routing/historyRouter.ts              | 373 ++++++++
 .../instantsearch-core/src/routing/index.ts   |   3 +
 .../src/routing/simpleStateMapping.ts         |  39 +
 .../src/routing/singleIndexStateMapping.ts    |  24 +
 packages/instantsearch-core/src/server.ts     | 145 +++
 .../src/types/algoliasearch.ts                |   3 +
 .../src/types/connector.ts                    |   2 +-
 .../instantsearch-core/src/types/index.ts     |  13 +
 .../src/types/insights.ts                     |  49 +
 .../src/types/instantsearch.ts                | 133 +++
 .../src/types/middleware.ts                   |   2 +-
 .../src/types/render-state.ts                 |  62 ++
 .../src/types/results.ts                      |   0
 .../src/types/router.ts                       |  17 +
 .../instantsearch-core/src/types/ui-state.ts  |  43 +
 .../src/types/utils.ts                        |  13 +-
 .../src/types/widget.ts                       |  66 +-
 packages/instantsearch-core/src/version.ts    |   1 +
 .../src/widgets/index-widget.ts}              |  80 +-
 .../instantsearch-core/src/widgets/index.ts   |   1 +
 .../test/createInstantSearch.ts               |  77 ++
 .../instantsearch-core/test/createWidget.ts   | 109 +++
 .../tsconfig.declaration.json                 |   7 +
 .../src/components/Carousel.tsx               |   2 +-
 .../src/components/Hits.tsx                   |  12 +-
 .../src/components/__tests__/Hits.test.tsx    |   4 +-
 .../src/types/Recommend.ts                    |   2 +-
 .../src/types/index.ts                        |   5 +-
 .../src/types/shared.ts                       |  12 -
 packages/instantsearch.js/CHANGELOG.md        |   2 +-
 packages/instantsearch.js/package.json        |   6 +-
 .../src/__tests__/common-connectors.test.tsx  |   2 +-
 .../src/components/Breadcrumb/Breadcrumb.tsx  |   2 +-
 .../ClearRefinements/ClearRefinements.tsx     |   2 +-
 .../CurrentRefinements/CurrentRefinements.tsx |   2 +-
 .../components/InfiniteHits/InfiniteHits.tsx  |  23 +-
 .../src/components/MenuSelect/MenuSelect.tsx  |   5 +-
 .../src/components/RangeInput/RangeInput.tsx  |   5 +-
 .../RefinementList/RefinementList.tsx         |   2 +-
 .../src/components/Slider/Slider.tsx          |   2 +-
 .../src/components/Template/Template.tsx      |   2 +-
 .../Template/__tests__/Template-test.tsx      |   4 +-
 .../ToggleRefinement/ToggleRefinement.tsx     |   2 +-
 .../components/VoiceSearch/VoiceSearch.tsx    |   2 +-
 .../autocomplete/connectAutocomplete.ts       | 266 ------
 .../breadcrumb/connectBreadcrumb.ts           | 361 -------
 .../connectFrequentlyBoughtTogether.ts        | 227 -----
 .../hits-per-page/connectHitsPerPage.ts       | 311 ------
 .../instantsearch.js/src/connectors/index.ts  | 278 +++++-
 .../pagination/connectPagination.ts           | 207 ----
 .../rating-menu/connectRatingMenu.ts          | 498 ----------
 .../relevant-sort/connectRelevantSort.ts      | 142 ---
 .../src/connectors/toggle-refinement/types.ts |   6 -
 .../voice-search/connectVoiceSearch.ts        | 222 -----
 .../components/__tests__/Highlight.test.tsx   |   4 +-
 .../__tests__/ReverseHighlight.test.tsx       |   4 +-
 .../__tests__/ReverseSnippet.test.tsx         |   4 +-
 .../components/__tests__/Snippet.test.tsx     |   4 +-
 packages/instantsearch.js/src/index.es.ts     |  11 +-
 packages/instantsearch.js/src/index.ts        |  16 +-
 .../instantsearch.js/src/lib/InstantSearch.ts | 887 +-----------------
 .../src/lib/__tests__/InstantSearch-test.ts   |  24 +
 .../lib/infiniteHitsCache/sessionStorage.ts   |  75 +-
 .../src/lib/routers/history.ts                | 371 +-------
 packages/instantsearch.js/src/lib/server.ts   | 144 +--
 .../src/lib/stateMappings/simple.ts           |  40 +-
 .../src/lib/stateMappings/singleIndex.ts      |  27 +-
 .../src/lib/templating/renderTemplate.ts      |   2 +-
 .../__tests__/concatHighlightedParts-test.ts  |  34 -
 .../src/lib/utils/__tests__/debounce-test.ts  |  64 --
 .../src/lib/utils/__tests__/find-test.ts      |  76 --
 .../src/lib/utils/__tests__/findIndex-test.ts |  33 -
 ...rNode-test.ts => getContainerNode.test.ts} |   2 +-
 ...omElement-test.ts => isDomElement.test.ts} |   2 +-
 .../src/lib/utils/concatHighlightedParts.ts   |  15 -
 .../lib/utils/createConcurrentSafePromise.ts  |  46 -
 .../src/lib/utils/debounce.ts                 |  30 -
 .../instantsearch.js/src/lib/utils/find.ts    |  21 -
 .../src/lib/utils/findIndex.ts                |  21 -
 .../instantsearch.js/src/lib/utils/index.ts   |  89 +-
 .../src/lib/utils/isFiniteNumber.ts           |   7 -
 .../instantsearch.js/src/lib/utils/omit.ts    |  26 -
 .../instantsearch.js/src/middlewares/index.ts |  17 +-
 .../src/types/algoliasearch.ts                |   4 -
 packages/instantsearch.js/src/types/index.ts  |  26 +-
 .../src/types/instantsearch.ts                |   5 -
 .../src/types/render-state.ts                 |  60 --
 .../instantsearch.js/src/types/templates.ts   |   2 +-
 .../instantsearch.js/src/types/ui-state.ts    |  41 -
 .../src/types/widget-factory.ts               |   6 +-
 .../src/widgets/__tests__/index.test.ts       |   4 +-
 .../src/widgets/breadcrumb/breadcrumb.tsx     |   4 +-
 .../clear-refinements/clear-refinements.tsx   |   4 +-
 .../src/widgets/configure/configure.ts        |   4 +-
 .../current-refinements.tsx                   |   4 +-
 .../__tests__/dynamic-widgets-test.ts         |   2 +-
 .../dynamic-widgets/dynamic-widgets.ts        |   4 +-
 .../frequently-bought-together.tsx            |  30 +-
 .../widgets/geo-search/GeoSearchRenderer.d.ts |   2 +-
 .../geo-search/__tests__/geo-search-test.ts   | 132 +--
 .../src/widgets/geo-search/geo-search.ts      |  24 +-
 .../hierarchical-menu/hierarchical-menu.tsx   |   4 +-
 .../widgets/hits-per-page/hits-per-page.tsx   |   7 +-
 .../src/widgets/hits/__tests__/hits.test.tsx  |  99 +-
 .../src/widgets/hits/defaultTemplates.ts      |  14 +-
 .../src/widgets/hits/hits.tsx                 |  46 +-
 .../instantsearch.js/src/widgets/index.ts     |   4 +-
 .../src/widgets/index/__tests__/index-test.ts |  14 +-
 .../__tests__/infinite-hits.test.tsx          |  64 +-
 .../widgets/infinite-hits/defaultTemplates.ts |   8 +-
 .../widgets/infinite-hits/infinite-hits.tsx   |  33 +-
 .../looking-similar/looking-similar.tsx       |  35 +-
 .../src/widgets/menu-select/menu-select.tsx   |   4 +-
 .../src/widgets/menu/menu.tsx                 |   4 +-
 .../src/widgets/numeric-menu/numeric-menu.tsx |   4 +-
 .../src/widgets/pagination/pagination.tsx     |   4 +-
 .../src/widgets/panel/__tests__/panel-test.ts |  32 +-
 .../src/widgets/panel/panel.tsx               |  14 +-
 .../src/widgets/powered-by/powered-by.tsx     |   4 +-
 .../query-rule-context/query-rule-context.tsx |   4 +-
 .../query-rule-custom-data.tsx                |   4 +-
 .../src/widgets/range-input/range-input.tsx   |   4 +-
 .../src/widgets/range-slider/range-slider.tsx |   4 +-
 .../src/widgets/rating-menu/rating-menu.tsx   |   4 +-
 .../refinement-list/refinement-list.tsx       |   4 +-
 .../related-products/related-products.tsx     |  36 +-
 .../widgets/relevant-sort/relevant-sort.tsx   |   4 +-
 .../src/widgets/search-box/search-box.tsx     |   4 +-
 .../src/widgets/sort-by/sort-by.tsx           |   4 +-
 .../src/widgets/stats/stats.tsx               |   4 +-
 .../toggle-refinement/toggle-refinement.tsx   |   4 +-
 .../widgets/trending-items/trending-items.tsx |  34 +-
 .../__tests__/voice-search-test.ts            |   2 +-
 .../src/widgets/voice-search/voice-search.tsx |   6 +-
 .../test/createInstantSearch.ts               |   1 -
 .../instantsearch.js/test/createWidget.ts     |   6 +-
 .../react-instantsearch-core/package.json     |   2 +-
 .../src/components/DynamicWidgets.tsx         |   2 +-
 .../src/components/InstantSearch.tsx          |   2 +-
 .../components/InstantSearchSSRProvider.tsx   |   2 +-
 .../components/InstantSearchServerContext.ts  |   2 +-
 .../__tests__/DynamicWidgets.test.tsx         |   2 +-
 .../src/components/__tests__/Index.test.tsx   |   2 +-
 .../__tests__/InstantSearch.test.tsx          |   6 +-
 .../InstantSearchSSRProvider.test.tsx         |   8 +-
 .../__tests__/routing/dispose-start.test.tsx  |   2 +-
 .../routing/external-influence.test.tsx       |   2 +-
 .../__tests__/routing/modal.test.tsx          |   2 +-
 .../__tests__/routing/spa-debounced.test.tsx  |   2 +-
 .../routing/spa-replace-state.test.tsx        |   2 +-
 .../components/__tests__/routing/spa.test.tsx |   2 +-
 .../src/connectors/useBreadcrumb.ts           |   4 +-
 .../src/connectors/useClearRefinements.ts     |   4 +-
 .../src/connectors/useConfigure.ts            |   4 +-
 .../src/connectors/useCurrentRefinements.ts   |   4 +-
 .../src/connectors/useDynamicWidgets.ts       |   4 +-
 .../connectors/useFrequentlyBoughtTogether.ts |   6 +-
 .../src/connectors/useGeoSearch.ts            |   6 +-
 .../src/connectors/useHierarchicalMenu.ts     |   4 +-
 .../src/connectors/useHits.ts                 |   6 +-
 .../src/connectors/useHitsPerPage.ts          |   4 +-
 .../src/connectors/useInfiniteHits.ts         |   6 +-
 .../src/connectors/useLookingSimilar.ts       |   6 +-
 .../src/connectors/useMenu.ts                 |   4 +-
 .../src/connectors/useNumericMenu.ts          |   4 +-
 .../src/connectors/usePagination.ts           |   4 +-
 .../src/connectors/usePoweredBy.ts            |   4 +-
 .../src/connectors/useQueryRules.ts           |   4 +-
 .../src/connectors/useRange.ts                |   4 +-
 .../src/connectors/useRefinementList.ts       |   4 +-
 .../src/connectors/useRelatedProducts.ts      |   6 +-
 .../src/connectors/useSearchBox.ts            |   4 +-
 .../src/connectors/useSortBy.ts               |   4 +-
 .../src/connectors/useStats.ts                |   4 +-
 .../src/connectors/useToggleRefinement.ts     |   4 +-
 .../src/connectors/useTrendingItems.ts        |   6 +-
 .../src/hooks/__tests__/useConnector.test.tsx |   6 +-
 .../src/hooks/useConnector.ts                 |   2 +-
 .../src/hooks/useInstantSearch.ts             |   2 +-
 .../src/lib/IndexContext.ts                   |   2 +-
 .../src/lib/InstantSearchContext.ts           |   2 +-
 .../src/lib/InstantSearchSSRContext.ts        |   2 +-
 .../src/lib/getIndexSearchResults.ts          |   2 +-
 .../src/lib/useIndex.ts                       |   4 +-
 .../src/lib/useIndexContext.ts                |   2 +-
 .../src/lib/useInstantSearchApi.ts            |   7 +-
 .../src/lib/useInstantSearchContext.ts        |   2 +-
 .../src/lib/useInstantSearchSSRContext.ts     |   2 +-
 .../src/lib/useInstantSearchServerContext.ts  |   2 +-
 .../src/lib/useSearchResults.ts               |   4 +-
 .../src/lib/useSearchState.ts                 |   2 +-
 .../src/lib/useWidget.ts                      |   3 +-
 .../server/__tests__/getServerState.test.tsx  |  13 +-
 .../src/server/getServerState.tsx             |   9 +-
 .../react-instantsearch-nextjs/package.json   |   2 +-
 .../src/InitializePromise.tsx                 |   9 +-
 .../src/InstantSearchNext.tsx                 |  10 +-
 .../src/__tests__/InitializePromise.test.tsx  |  24 +-
 .../src/useInstantSearchRouting.ts            |   5 +-
 .../package.json                              |   2 +-
 .../src/index.ts                              |   5 +-
 packages/react-instantsearch/package.json     |   4 +-
 .../src/__tests__/common-connectors.test.tsx  |   4 +-
 .../src/__tests__/common-widgets.test.tsx     |   7 +-
 .../src/ui/CurrentRefinements.tsx             |   2 +-
 .../src/ui/HitsPerPage.tsx                    |   2 +-
 .../src/ui/InfiniteHits.tsx                   |   3 +-
 packages/react-instantsearch/src/ui/Menu.tsx  |   3 +-
 .../react-instantsearch/src/ui/Pagination.tsx |   2 +-
 .../src/ui/RefinementList.tsx                 |   4 +-
 .../src/ui/__tests__/InfiniteHits.test.tsx    |   2 +-
 .../src/widgets/FrequentlyBoughtTogether.tsx  |   2 +-
 .../src/widgets/Highlight.tsx                 |   4 +-
 .../react-instantsearch/src/widgets/Hits.tsx  |   9 +-
 .../src/widgets/InfiniteHits.tsx              |   6 +-
 .../src/widgets/LookingSimilar.tsx            |   2 +-
 .../src/widgets/RefinementList.tsx            |  17 +-
 .../src/widgets/RelatedProducts.tsx           |   6 +-
 .../src/widgets/Snippet.tsx                   |   4 +-
 .../src/widgets/TrendingItems.tsx             |   6 +-
 .../src/widgets/__tests__/Hits.test.tsx       |   2 +-
 .../widgets/__tests__/InfiniteHits.test.tsx   |   2 +-
 .../src/widgets/__tests__/Pagination.test.tsx |   2 +-
 .../src/widgets/__tests__/SearchBox.test.tsx  |   2 +-
 .../__tests__/__utils__/all-widgets.tsx       |   2 +-
 .../__mocks__/instantsearch.js/es.js          |  73 --
 packages/vue-instantsearch/package.json       |   2 +-
 packages/vue-instantsearch/rollup.config.js   |   1 +
 .../src/__tests__/common-connectors.test.js   |   3 +-
 .../src/__tests__/common-shared.test.js       |   3 +-
 .../src/__tests__/common-widgets.test.js      |   6 +-
 .../vue-instantsearch/src/__tests__/index.js  |   7 +-
 .../src/components/Autocomplete.vue           |   2 +-
 .../src/components/Breadcrumb.vue             |   2 +-
 .../src/components/ClearRefinements.vue       |   2 +-
 .../src/components/Configure.js               |   2 +-
 .../src/components/CurrentRefinements.vue     |   2 +-
 .../src/components/DynamicWidgets.js          |   2 +-
 .../src/components/HierarchicalMenu.vue       |   2 +-
 .../src/components/Highlighter.js             |   4 +-
 .../vue-instantsearch/src/components/Hits.js  |  14 +-
 .../src/components/HitsPerPage.vue            |   2 +-
 .../vue-instantsearch/src/components/Index.js |   2 +-
 .../src/components/InfiniteHits.vue           |  10 +-
 .../src/components/InstantSearch.js           |   2 +-
 .../vue-instantsearch/src/components/Menu.vue |   2 +-
 .../src/components/MenuSelect.vue             |   2 +-
 .../src/components/NumericMenu.vue            |   2 +-
 .../src/components/Pagination.vue             |   2 +-
 .../src/components/QueryRuleContext.js        |   2 +-
 .../src/components/QueryRuleCustomData.vue    |   2 +-
 .../src/components/RangeInput.vue             |   2 +-
 .../src/components/RatingMenu.vue             |   2 +-
 .../src/components/RefinementList.vue         |   2 +-
 .../src/components/RelevantSort.vue           |   2 +-
 .../src/components/SearchBox.vue              |   2 +-
 .../src/components/SortBy.vue                 |   2 +-
 .../src/components/Stats.vue                  |   2 +-
 .../src/components/ToggleRefinement.vue       |   2 +-
 .../src/components/VoiceSearch.vue            |   2 +-
 .../src/components/__Template.vue             |   2 +-
 .../src/components/__tests__/Highlight.js     |   2 -
 .../components/__tests__/Index-integration.js |   4 +-
 .../__tests__/InstantSearch-integration.js    |   1 -
 .../src/components/__tests__/InstantSearch.js | 139 ++-
 .../components/__tests__/InstantSearchSsr.js  |   4 +-
 .../src/components/__tests__/Snippet.js       |   2 -
 .../__snapshots__/InfiniteHits.js.snap        |  60 +-
 .../__tests__/createServerRootMixin.test.js   |   2 -
 .../src/util/createInstantSearchComponent.js  |  19 +-
 .../src/util/createServerRootMixin.js         |   4 +-
 .../src/util/parseAlgoliaHit.js               |   2 +-
 tests/common/common.ts                        |   2 +-
 .../frequently-bought-together/index.ts       |   2 +-
 .../connectors/looking-similar/index.ts       |   2 +-
 .../connectors/related-products/index.ts      |   2 +-
 .../common/connectors/trending-items/index.ts |   2 +-
 tests/common/package.json                     |   3 +-
 tests/common/widgets/hits/options.ts          |  99 +-
 tests/common/widgets/infinite-hits/options.ts |  94 +-
 tests/mocks/createAPIResponse.ts              |   2 +-
 tests/mocks/createInsightsClient.ts           |   2 +-
 tests/mocks/createSearchClient.ts             |   2 +-
 tests/mocks/package.json                      |   2 +-
 tests/utils/createInstantSearchSpy.tsx        |   6 +-
 tests/utils/matchers/toWarnDev.ts             |   7 +
 tests/utils/package.json                      |   2 +-
 tests/utils/setupTests.ts                     |   6 +-
 tests/utils/widgetSnapshotSerializer.ts       |  10 +-
 tsconfig.v3.json                              |  18 +-
 yarn.lock                                     | 231 +++--
 504 files changed, 7043 insertions(+), 6835 deletions(-)
 create mode 100644 packages/instantsearch-core/CHANGELOG.md
 create mode 100644 packages/instantsearch-core/README.md
 create mode 100644 packages/instantsearch-core/package.json
 create mode 100755 packages/instantsearch-core/scripts/version.cjs
 rename packages/{instantsearch.js/src/lib/__tests__/RoutingManager-test.ts => instantsearch-core/src/__tests__/RoutingManager.test.ts} (98%)
 rename packages/{instantsearch.js/src/lib/__tests__/InstantSearch-composition-test.tsx => instantsearch-core/src/__tests__/instantsearch-composition.test.tsx} (91%)
 rename packages/{instantsearch.js/src/lib/__tests__/InstantSearch-integration-test.ts => instantsearch-core/src/__tests__/instantsearch-integration.test.ts} (88%)
 rename packages/{instantsearch.js/src/lib/__tests__/InstantSearch-test.tsx => instantsearch-core/src/__tests__/instantsearch.test.tsx} (96%)
 rename packages/{instantsearch.js/src/lib => instantsearch-core/src}/__tests__/server-composition.test.ts (92%)
 rename packages/{instantsearch.js/src/lib => instantsearch-core/src}/__tests__/server.test.ts (98%)
 rename packages/{instantsearch.js/src/lib => instantsearch-core/src}/__tests__/status.test.ts (97%)
 rename packages/{instantsearch.js/src/connectors/autocomplete/__tests__/connectAutocomplete-test.ts => instantsearch-core/src/connectors/__tests__/connectAutocomplete.test.ts} (98%)
 rename packages/{instantsearch.js/src/connectors/breadcrumb/__tests__/connectBreadcrumb-test.ts => instantsearch-core/src/connectors/__tests__/connectBreadcrumb.test.ts} (99%)
 rename packages/{instantsearch.js/src/connectors/clear-refinements/__tests__/connectClearRefinements-test.ts => instantsearch-core/src/connectors/__tests__/connectClearRefinements.test.ts} (99%)
 rename packages/{instantsearch.js/src/connectors/configure/__tests__/connectConfigure-test.ts => instantsearch-core/src/connectors/__tests__/connectConfigure.test.ts} (99%)
 rename packages/{instantsearch.js/src/connectors/current-refinements/__tests__/connectCurrentRefinements-test.ts => instantsearch-core/src/connectors/__tests__/connectCurrentRefinements.test.ts} (99%)
 rename packages/{instantsearch.js/src/connectors/dynamic-widgets/__tests__/connectDynamicWidgets-test.ts => instantsearch-core/src/connectors/__tests__/connectDynamicWidgets.test.ts} (96%)
 rename packages/{instantsearch.js/src/connectors/frequently-bought-together/__tests__/connectFrequentlyBoughtTogether-test.ts => instantsearch-core/src/connectors/__tests__/connectFrequentlyBoughtTogether.test.ts} (95%)
 rename packages/{instantsearch.js/src/connectors/geo-search/__tests__/connectGeoSearch-test.ts => instantsearch-core/src/connectors/__tests__/connectGeoSearch.test.ts} (96%)
 rename packages/{instantsearch.js/src/connectors/hierarchical-menu/__tests__/connectHierarchicalMenu-test.ts => instantsearch-core/src/connectors/__tests__/connectHierarchicalMenu.test.ts} (99%)
 rename packages/{instantsearch.js/src/connectors/hits/__tests__/connectHits-test.ts => instantsearch-core/src/connectors/__tests__/connectHits.test.ts} (94%)
 rename packages/{instantsearch.js/src/connectors/hits-per-page/__tests__/connectHitsPerPage-test.ts => instantsearch-core/src/connectors/__tests__/connectHitsPerPage.test.ts} (99%)
 rename packages/{instantsearch.js/src/connectors/infinite-hits/__tests__/connectInfiniteHits-test.ts => instantsearch-core/src/connectors/__tests__/connectInfiniteHits.test.ts} (96%)
 rename packages/{instantsearch.js/src/connectors/looking-similar/__tests__/connectLookingSimilar-test.ts => instantsearch-core/src/connectors/__tests__/connectLookingSimilar.test.ts} (95%)
 rename packages/{instantsearch.js/src/connectors/menu/__tests__/connectMenu-test.ts => instantsearch-core/src/connectors/__tests__/connectMenu.test.ts} (98%)
 rename packages/{instantsearch.js/src/connectors/numeric-menu/__tests__/connectNumericMenu-test.ts => instantsearch-core/src/connectors/__tests__/connectNumericMenu.test.ts} (99%)
 rename packages/{instantsearch.js/src/connectors/pagination/__tests__/connectPagination-test.ts => instantsearch-core/src/connectors/__tests__/connectPagination.test.ts} (99%)
 rename packages/{instantsearch.js/src/connectors/powered-by/__tests__/connectPoweredBy-test.ts => instantsearch-core/src/connectors/__tests__/connectPoweredBy.test.ts} (98%)
 rename packages/{instantsearch.js/src/connectors/query-rules/__tests__/connectQueryRules-test.ts => instantsearch-core/src/connectors/__tests__/connectQueryRules.test.ts} (98%)
 rename packages/{instantsearch.js/src/connectors/range/__tests__/connectRange-test.ts => instantsearch-core/src/connectors/__tests__/connectRange.test.ts} (99%)
 rename packages/{instantsearch.js/src/connectors/rating-menu/__tests__/connectRatingMenu-test.ts => instantsearch-core/src/connectors/__tests__/connectRatingMenu.test.ts} (99%)
 rename packages/{instantsearch.js/src/connectors/refinement-list/__tests__/connectRefinementList-test.ts => instantsearch-core/src/connectors/__tests__/connectRefinementList.test.ts} (99%)
 rename packages/{instantsearch.js/src/connectors/related-products/__tests__/connectRelatedProducts-test.ts => instantsearch-core/src/connectors/__tests__/connectRelatedProducts.test.ts} (95%)
 rename packages/{instantsearch.js/src/connectors/relevant-sort/__tests__/connectRelevantSort-test.ts => instantsearch-core/src/connectors/__tests__/connectRelevantSort.test.ts} (98%)
 rename packages/{instantsearch.js/src/connectors/search-box/__tests__/connectSearchBox-test.ts => instantsearch-core/src/connectors/__tests__/connectSearchBox.test.ts} (98%)
 rename packages/{instantsearch.js/src/connectors/sort-by/__tests__/connectSortBy-test.ts => instantsearch-core/src/connectors/__tests__/connectSortBy.test.ts} (98%)
 rename packages/{instantsearch.js/src/connectors/stats/__tests__/connectStats-test.ts => instantsearch-core/src/connectors/__tests__/connectStats.test.ts} (99%)
 rename packages/{instantsearch.js/src/connectors/toggle-refinement/__tests__/connectToggleRefinement-test.ts => instantsearch-core/src/connectors/__tests__/connectToggleRefinement.test.ts} (99%)
 rename packages/{instantsearch.js/src/connectors/trending-items/__tests__/connectTrendingItems-test.ts => instantsearch-core/src/connectors/__tests__/connectTrendingItems.test.ts} (97%)
 rename packages/{instantsearch.js/src/connectors/voice-search/__tests__/connectVoiceSearch-test.ts => instantsearch-core/src/connectors/__tests__/connectVoiceSearch.test.ts} (98%)
 create mode 100644 packages/instantsearch-core/src/connectors/connectAutocomplete.ts
 create mode 100644 packages/instantsearch-core/src/connectors/connectBreadcrumb.ts
 rename packages/{instantsearch.js/src/connectors/clear-refinements => instantsearch-core/src/connectors}/connectClearRefinements.ts (97%)
 rename packages/{instantsearch.js/src/connectors/configure => instantsearch-core/src/connectors}/connectConfigure.ts (95%)
 rename packages/{instantsearch.js/src/connectors/current-refinements => instantsearch-core/src/connectors}/connectCurrentRefinements.ts (98%)
 rename packages/{instantsearch.js/src/connectors/dynamic-widgets => instantsearch-core/src/connectors}/connectDynamicWidgets.ts (97%)
 create mode 100644 packages/instantsearch-core/src/connectors/connectFrequentlyBoughtTogether.ts
 rename packages/{instantsearch.js/src/connectors/geo-search => instantsearch-core/src/connectors}/connectGeoSearch.ts (94%)
 rename packages/{instantsearch.js/src/connectors/hierarchical-menu => instantsearch-core/src/connectors}/connectHierarchicalMenu.ts (98%)
 rename packages/{instantsearch.js/src/connectors/hits => instantsearch-core/src/connectors}/connectHits.ts (87%)
 create mode 100644 packages/instantsearch-core/src/connectors/connectHitsPerPage.ts
 rename packages/{instantsearch.js/src/connectors/infinite-hits => instantsearch-core/src/connectors}/connectInfiniteHits.ts (95%)
 rename packages/{instantsearch.js/src/connectors/looking-similar => instantsearch-core/src/connectors}/connectLookingSimilar.ts (89%)
 rename packages/{instantsearch.js/src/connectors/menu => instantsearch-core/src/connectors}/connectMenu.ts (97%)
 rename packages/{instantsearch.js/src/connectors/numeric-menu => instantsearch-core/src/connectors}/connectNumericMenu.ts (54%)
 create mode 100644 packages/instantsearch-core/src/connectors/connectPagination.ts
 rename packages/{instantsearch.js/src/connectors/powered-by => instantsearch-core/src/connectors}/connectPoweredBy.ts (91%)
 rename packages/{instantsearch.js/src/connectors/query-rules => instantsearch-core/src/connectors}/connectQueryRules.ts (54%)
 rename packages/{instantsearch.js/src/connectors/range => instantsearch-core/src/connectors}/connectRange.ts (83%)
 create mode 100644 packages/instantsearch-core/src/connectors/connectRatingMenu.ts
 rename packages/{instantsearch.js/src/connectors/refinement-list => instantsearch-core/src/connectors}/connectRefinementList.ts (98%)
 rename packages/{instantsearch.js/src/connectors/related-products => instantsearch-core/src/connectors}/connectRelatedProducts.ts (87%)
 create mode 100644 packages/instantsearch-core/src/connectors/connectRelevantSort.ts
 rename packages/{instantsearch.js/src/connectors/search-box => instantsearch-core/src/connectors}/connectSearchBox.ts (94%)
 rename packages/{instantsearch.js/src/connectors/sort-by => instantsearch-core/src/connectors}/connectSortBy.ts (95%)
 rename packages/{instantsearch.js/src/connectors/stats => instantsearch-core/src/connectors}/connectStats.ts (92%)
 rename packages/{instantsearch.js/src/connectors/toggle-refinement => instantsearch-core/src/connectors}/connectToggleRefinement.ts (97%)
 rename packages/{instantsearch.js/src/connectors/trending-items => instantsearch-core/src/connectors}/connectTrendingItems.ts (91%)
 create mode 100644 packages/instantsearch-core/src/connectors/connectVoiceSearch.ts
 create mode 100644 packages/instantsearch-core/src/connectors/index.ts
 create mode 100644 packages/instantsearch-core/src/index.ts
 create mode 100644 packages/instantsearch-core/src/instantsearch.ts
 rename packages/{instantsearch.js/src/connectors/pagination => instantsearch-core/src/lib}/Paginator.ts (97%)
 rename packages/{instantsearch.js/src/connectors/pagination => instantsearch-core/src/lib}/__tests__/Paginator-test.ts (100%)
 rename packages/{instantsearch.js => instantsearch-core}/src/lib/infiniteHitsCache/__tests__/sessionStorage-key.test.ts (97%)
 rename packages/{instantsearch.js => instantsearch-core}/src/lib/infiniteHitsCache/__tests__/sessionStorage.test.ts (97%)
 create mode 100644 packages/instantsearch-core/src/lib/infiniteHitsCache/index.ts
 create mode 100644 packages/instantsearch-core/src/lib/infiniteHitsCache/sessionStorage.ts
 rename packages/{instantsearch.js/src/lib/utils/__tests__/capitalize-test.ts => instantsearch-core/src/lib/public/__tests__/capitalize.test.ts} (77%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/defer.ts => instantsearch-core/src/lib/public/__tests__/defer.test.ts} (98%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/escape-highlight-test.ts => instantsearch-core/src/lib/public/__tests__/escapeHits.test.ts} (99%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/escape-html-test.ts => instantsearch-core/src/lib/public/__tests__/escapeHtml.test.ts} (96%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/getHighlightFromSiblings-test.ts => instantsearch-core/src/lib/public/__tests__/getHighlightFromSiblings.test.ts} (92%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/getHighlightedParts-test.ts => instantsearch-core/src/lib/public/__tests__/getHighlightedParts.test.ts} (94%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/getObjectType-test.ts => instantsearch-core/src/lib/public/__tests__/getObjectType.test.ts} (95%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/getPropertyByPath-test.ts => instantsearch-core/src/lib/public/__tests__/getPropertyByPath.test.ts} (98%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/getWidgetAttribute-test.ts => instantsearch-core/src/lib/public/__tests__/getWidgetAttribute.test.ts} (78%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/isEqual-test.ts => instantsearch-core/src/lib/public/__tests__/isEqual.test.ts} (99%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/isPlainObject-test.ts => instantsearch-core/src/lib/public/__tests__/isPlainObject.test.ts} (95%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/logger-test.ts => instantsearch-core/src/lib/public/__tests__/logger.test.ts} (88%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/noop-test.ts => instantsearch-core/src/lib/public/__tests__/noop.test.ts} (88%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/range-test.ts => instantsearch-core/src/lib/public/__tests__/range.test.ts} (96%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/reverseHighlightedParts-test.ts => instantsearch-core/src/lib/public/__tests__/reverseHighlightedParts.test.ts} (94%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/safelyRunOnBrowser-test.ts => instantsearch-core/src/lib/public/__tests__/safelyRunOnBrowser.test.ts} (96%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/toArray-test.ts => instantsearch-core/src/lib/public/__tests__/toArray.test.ts} (89%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/uniq-test.ts => instantsearch-core/src/lib/public/__tests__/uniq.test.ts} (93%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/__tests__/walkIndex.test.ts (100%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/addWidgetId.ts (100%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/capitalize.ts (100%)
 rename packages/{instantsearch.js/src/lib/utils/uuid.ts => instantsearch-core/src/lib/public/createUUID.ts} (100%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/defer.ts (100%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/documentation.ts (100%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/escape-highlight.ts (100%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/escape-html.ts (100%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/getHighlightFromSiblings.ts (100%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/getHighlightedParts.ts (100%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/getObjectType.ts (100%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/getPropertyByPath.ts (100%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/getWidgetAttribute.ts (100%)
 create mode 100644 packages/instantsearch-core/src/lib/public/index.ts
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/isEqual.ts (100%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/isFacetRefined.ts (100%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/isIndexWidget.ts (100%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/isPlainObject.ts (100%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/isSpecialClick.ts (100%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/logger.ts (76%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/noop.ts (100%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/range.ts (100%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/render-args.ts (90%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/reverseHighlightedParts.ts (100%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/safelyRunOnBrowser.ts (100%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/toArray.ts (100%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/typedObject.ts (100%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/uniq.ts (100%)
 rename packages/{instantsearch.js/src/lib/utils => instantsearch-core/src/lib/public}/walkIndex.ts (100%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/hits-absolute-position-test.ts => instantsearch-core/src/lib/utils/__tests__/addAbsolutePosition.test.ts} (89%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/hits-query-id-test.ts => instantsearch-core/src/lib/utils/__tests__/addQueryID.test.ts} (92%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/clearRefinements-test.ts => instantsearch-core/src/lib/utils/__tests__/clearRefinements.test.ts} (99%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/createSendEventForFacet-test.ts => instantsearch-core/src/lib/utils/__tests__/createSendEventForFacet.test.ts} (97%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/createSendEventForHits-test.ts => instantsearch-core/src/lib/utils/__tests__/createSendEventForHits.test.ts} (100%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/geo-search-test.ts => instantsearch-core/src/lib/utils/__tests__/geo-search.test.ts} (96%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/getAppIdAndApiKey-test.ts => instantsearch-core/src/lib/utils/__tests__/getAppIdAndApiKey.test.ts} (94%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/getInsightsAnonymousUserToken-test.ts => instantsearch-core/src/lib/utils/__tests__/getInsightsAnonymousUserToken.test.ts} (92%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/getRefinements-test.ts => instantsearch-core/src/lib/utils/__tests__/getRefinements.test.ts} (99%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/hydrateRecommendCache-test.ts => instantsearch-core/src/lib/utils/__tests__/hydrateRecommendCache.test.ts} (95%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/hydrateSearchClient-composition-test.ts => instantsearch-core/src/lib/utils/__tests__/hydrateSearchClient-composition.test.ts} (100%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/hydrateSearchClient-test.ts => instantsearch-core/src/lib/utils/__tests__/hydrateSearchClient.test.ts} (99%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/mergeSearchParameters-test.ts => instantsearch-core/src/lib/utils/__tests__/mergeSearchParameters.test.ts} (99%)
 rename packages/{instantsearch.js/src/lib/utils/__tests__/resolveSearchParameters-test.ts => instantsearch-core/src/lib/utils/__tests__/resolveSearchParameters.test.ts} (96%)
 rename packages/{instantsearch.js/src/lib/utils/hits-absolute-position.ts => instantsearch-core/src/lib/utils/addAbsolutePosition.ts} (100%)
 rename packages/{instantsearch.js/src/lib/utils/hits-query-id.ts => instantsearch-core/src/lib/utils/addQueryID.ts} (100%)
 rename packages/{instantsearch.js => instantsearch-core}/src/lib/utils/checkIndexUiState.ts (97%)
 rename packages/{instantsearch.js => instantsearch-core}/src/lib/utils/checkRendering.ts (74%)
 rename packages/{instantsearch.js => instantsearch-core}/src/lib/utils/clearRefinements.ts (100%)
 rename packages/{instantsearch.js => instantsearch-core}/src/lib/utils/createSendEventForFacet.ts (81%)
 rename packages/{instantsearch.js => instantsearch-core}/src/lib/utils/createSendEventForHits.ts (87%)
 rename packages/{instantsearch.js => instantsearch-core}/src/lib/utils/escapeFacetValue.ts (100%)
 rename packages/{instantsearch.js => instantsearch-core}/src/lib/utils/geo-search.ts (100%)
 rename packages/{instantsearch.js => instantsearch-core}/src/lib/utils/getAppIdAndApiKey.ts (100%)
 rename packages/{instantsearch.js/src/lib/utils/getInsightsAnonymousUserToken.ts => instantsearch-core/src/lib/utils/getInsightsAnonymousToken.ts} (100%)
 rename packages/{instantsearch.js => instantsearch-core}/src/lib/utils/getRefinements.ts (94%)
 rename packages/{instantsearch.js => instantsearch-core}/src/lib/utils/hydrateRecommendCache.ts (100%)
 rename packages/{instantsearch.js => instantsearch-core}/src/lib/utils/hydrateSearchClient.ts (100%)
 create mode 100644 packages/instantsearch-core/src/lib/utils/index.ts
 rename packages/{instantsearch.js => instantsearch-core}/src/lib/utils/mergeSearchParameters.ts (96%)
 rename packages/{instantsearch.js => instantsearch-core}/src/lib/utils/resolveSearchParameters.ts (100%)
 rename packages/{instantsearch.js => instantsearch-core}/src/lib/utils/serializer.ts (75%)
 rename packages/{instantsearch.js => instantsearch-core}/src/lib/utils/setIndexHelperState.ts (92%)
 rename packages/{instantsearch.js => instantsearch-core}/src/lib/voiceSearchHelper/__tests__/index-test.ts (100%)
 rename packages/{instantsearch.js => instantsearch-core}/src/lib/voiceSearchHelper/index.ts (100%)
 rename packages/{instantsearch.js => instantsearch-core}/src/lib/voiceSearchHelper/types.ts (100%)
 rename packages/{instantsearch.js => instantsearch-core}/src/middlewares/__tests__/createInsightsMiddleware.ts (97%)
 rename packages/{instantsearch.js => instantsearch-core}/src/middlewares/__tests__/createMetadataMiddleware.ts (88%)
 rename packages/{instantsearch.js => instantsearch-core}/src/middlewares/__tests__/createRouterMiddleware.ts (87%)
 rename packages/{instantsearch.js => instantsearch-core}/src/middlewares/createInsightsMiddleware.ts (93%)
 rename packages/{instantsearch.js => instantsearch-core}/src/middlewares/createMetadataMiddleware.ts (94%)
 rename packages/{instantsearch.js => instantsearch-core}/src/middlewares/createRouterMiddleware.ts (85%)
 create mode 100644 packages/instantsearch-core/src/middlewares/index.ts
 rename packages/{instantsearch.js/src/lib/__tests__/routing => instantsearch-core/src/routing/__tests__}/correct-urls.test.ts (89%)
 rename packages/{instantsearch.js/src/lib/__tests__/routing/dispose-start-test.ts => instantsearch-core/src/routing/__tests__/dispose-start.test.ts} (92%)
 rename packages/{instantsearch.js/src/lib/__tests__/routing/duplicate-url-test.ts => instantsearch-core/src/routing/__tests__/duplicate-url.test.ts} (92%)
 rename packages/{instantsearch.js/src/lib/__tests__/routing/external-influence-test.ts => instantsearch-core/src/routing/__tests__/external-influence.test.ts} (93%)
 rename packages/{instantsearch.js/src/lib/routers/__tests__/history-integration.test.ts => instantsearch-core/src/routing/__tests__/historyRouter-integration.test.ts} (93%)
 rename packages/{instantsearch.js/src/lib/routers/__tests__/history.test.ts => instantsearch-core/src/routing/__tests__/historyRouter.test.ts} (96%)
 rename packages/{instantsearch.js/src/lib/__tests__/routing/modal-test.ts => instantsearch-core/src/routing/__tests__/modal.test.ts} (91%)
 rename packages/{instantsearch.js/src/lib/stateMappings/__tests__/simple-test.ts => instantsearch-core/src/routing/__tests__/simpleStateMapping.test.ts} (97%)
 rename packages/{instantsearch.js/src/lib/stateMappings/__tests__/singleIndex-test.ts => instantsearch-core/src/routing/__tests__/singleIndexStateMapping.test.ts} (98%)
 rename packages/{instantsearch.js/src/lib/__tests__/routing/spa-debounced-test.ts => instantsearch-core/src/routing/__tests__/spa-debounced.test.ts} (94%)
 rename packages/{instantsearch.js/src/lib/__tests__/routing/spa-replace-state-test.ts => instantsearch-core/src/routing/__tests__/spa-replace-state.test.ts} (94%)
 rename packages/{instantsearch.js/src/lib/__tests__/routing/spa-test.ts => instantsearch-core/src/routing/__tests__/spa.test.ts} (94%)
 create mode 100644 packages/instantsearch-core/src/routing/historyRouter.ts
 create mode 100644 packages/instantsearch-core/src/routing/index.ts
 create mode 100644 packages/instantsearch-core/src/routing/simpleStateMapping.ts
 create mode 100644 packages/instantsearch-core/src/routing/singleIndexStateMapping.ts
 create mode 100644 packages/instantsearch-core/src/server.ts
 create mode 100644 packages/instantsearch-core/src/types/algoliasearch.ts
 rename packages/{instantsearch.js => instantsearch-core}/src/types/connector.ts (97%)
 create mode 100644 packages/instantsearch-core/src/types/index.ts
 rename packages/{instantsearch.js => instantsearch-core}/src/types/insights.ts (52%)
 create mode 100644 packages/instantsearch-core/src/types/instantsearch.ts
 rename packages/{instantsearch.js => instantsearch-core}/src/types/middleware.ts (95%)
 create mode 100644 packages/instantsearch-core/src/types/render-state.ts
 rename packages/{instantsearch.js => instantsearch-core}/src/types/results.ts (100%)
 rename packages/{instantsearch.js => instantsearch-core}/src/types/router.ts (83%)
 create mode 100644 packages/instantsearch-core/src/types/ui-state.ts
 rename packages/{instantsearch.js => instantsearch-core}/src/types/utils.ts (75%)
 rename packages/{instantsearch.js => instantsearch-core}/src/types/widget.ts (82%)
 create mode 100644 packages/instantsearch-core/src/version.ts
 rename packages/{instantsearch.js/src/widgets/index/index.ts => instantsearch-core/src/widgets/index-widget.ts} (92%)
 create mode 100644 packages/instantsearch-core/src/widgets/index.ts
 create mode 100644 packages/instantsearch-core/test/createInstantSearch.ts
 create mode 100644 packages/instantsearch-core/test/createWidget.ts
 create mode 100644 packages/instantsearch-core/tsconfig.declaration.json
 delete mode 100644 packages/instantsearch-ui-components/src/types/shared.ts
 delete mode 100644 packages/instantsearch.js/src/connectors/autocomplete/connectAutocomplete.ts
 delete mode 100644 packages/instantsearch.js/src/connectors/breadcrumb/connectBreadcrumb.ts
 delete mode 100644 packages/instantsearch.js/src/connectors/frequently-bought-together/connectFrequentlyBoughtTogether.ts
 delete mode 100644 packages/instantsearch.js/src/connectors/hits-per-page/connectHitsPerPage.ts
 delete mode 100644 packages/instantsearch.js/src/connectors/pagination/connectPagination.ts
 delete mode 100644 packages/instantsearch.js/src/connectors/rating-menu/connectRatingMenu.ts
 delete mode 100644 packages/instantsearch.js/src/connectors/relevant-sort/connectRelevantSort.ts
 delete mode 100644 packages/instantsearch.js/src/connectors/toggle-refinement/types.ts
 delete mode 100644 packages/instantsearch.js/src/connectors/voice-search/connectVoiceSearch.ts
 create mode 100644 packages/instantsearch.js/src/lib/__tests__/InstantSearch-test.ts
 delete mode 100644 packages/instantsearch.js/src/lib/utils/__tests__/concatHighlightedParts-test.ts
 delete mode 100644 packages/instantsearch.js/src/lib/utils/__tests__/debounce-test.ts
 delete mode 100644 packages/instantsearch.js/src/lib/utils/__tests__/find-test.ts
 delete mode 100644 packages/instantsearch.js/src/lib/utils/__tests__/findIndex-test.ts
 rename packages/instantsearch.js/src/lib/utils/__tests__/{getContainerNode-test.ts => getContainerNode.test.ts} (94%)
 rename packages/instantsearch.js/src/lib/utils/__tests__/{isDomElement-test.ts => isDomElement.test.ts} (92%)
 delete mode 100644 packages/instantsearch.js/src/lib/utils/concatHighlightedParts.ts
 delete mode 100644 packages/instantsearch.js/src/lib/utils/createConcurrentSafePromise.ts
 delete mode 100644 packages/instantsearch.js/src/lib/utils/debounce.ts
 delete mode 100644 packages/instantsearch.js/src/lib/utils/find.ts
 delete mode 100644 packages/instantsearch.js/src/lib/utils/findIndex.ts
 delete mode 100644 packages/instantsearch.js/src/lib/utils/isFiniteNumber.ts
 delete mode 100644 packages/instantsearch.js/src/lib/utils/omit.ts
 delete mode 100644 packages/instantsearch.js/src/types/algoliasearch.ts
 delete mode 100644 packages/instantsearch.js/src/types/instantsearch.ts
 delete mode 100644 packages/instantsearch.js/src/types/render-state.ts
 delete mode 100644 packages/instantsearch.js/src/types/ui-state.ts
 delete mode 100644 packages/vue-instantsearch/__mocks__/instantsearch.js/es.js

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 54527cbf77..a1538e6971 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -178,6 +178,7 @@ jobs:
             - packages/vue-instantsearch/vue2
             - packages/vue-instantsearch/vue3
             - packages/instantsearch-ui-components/dist
+            - packages/instantsearch-core/dist
 
   test metadata:
     <<: *defaults
diff --git a/.codesandbox/ci.json b/.codesandbox/ci.json
index 901a3f76aa..baa9d5a8a0 100644
--- a/.codesandbox/ci.json
+++ b/.codesandbox/ci.json
@@ -15,7 +15,8 @@
     "packages/react-instantsearch-nextjs",
     "packages/vue-instantsearch",
     "packages/instantsearch.css",
-    "packages/instantsearch-ui-components"
+    "packages/instantsearch-ui-components",
+    "packages/instantsearch-core"
   ],
   "node": "20"
 }
diff --git a/.eslintrc.js b/.eslintrc.js
index 07617403a0..6f26cdb9c8 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -168,6 +168,7 @@ const config = {
         '@typescript-eslint/no-unnecessary-type-assertion': 'error',
         '@typescript-eslint/method-signature-style': 'error',
         '@typescript-eslint/unbound-method': 'error',
+        'import/no-unresolved': ['error'],
       },
     },
     {
@@ -265,7 +266,10 @@ const config = {
       },
     },
     {
-      files: ['packages/instantsearch.js/src/**/*'],
+      files: [
+        'packages/instantsearch.js/src/**/*',
+        'packages/instantsearch-core/src/**/*',
+      ],
       excludedFiles: [
         '**/__tests__/**/*',
         'packages/instantsearch.js/src/widgets/**/*',
diff --git a/babel.config.js b/babel.config.js
index 0fc8ca7957..5a012f0f56 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -146,6 +146,19 @@ module.exports = (api) => {
           ],
         ],
       },
+      {
+        test: 'packages/instantsearch-core',
+        plugins: [
+          [
+            '@babel/plugin-transform-runtime',
+            {
+              corejs: false,
+              helpers: true,
+              regenerator: false,
+            },
+          ],
+        ],
+      },
     ],
     // jsx is transpiled, so the comment should no longer be present in the final files
     shouldPrintComment: (value) => !value.startsWith('* @jsx'),
diff --git a/examples/react/default-theme/package.json b/examples/react/default-theme/package.json
index d9de210084..b8ab696d95 100644
--- a/examples/react/default-theme/package.json
+++ b/examples/react/default-theme/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "algoliasearch": "5.1.1",
     "instantsearch.css": "8.5.1",
-    "instantsearch.js": "4.77.3",
+    "instantsearch-core": "0.1.0",
     "react": "19.0.0",
     "react-dom": "19.0.0",
     "react-instantsearch": "7.15.3"
diff --git a/examples/react/default-theme/src/App.tsx b/examples/react/default-theme/src/App.tsx
index 3475aff134..b4a163fec7 100644
--- a/examples/react/default-theme/src/App.tsx
+++ b/examples/react/default-theme/src/App.tsx
@@ -1,5 +1,5 @@
 import { liteClient as algoliasearch } from 'algoliasearch/lite';
-import { Hit as AlgoliaHit } from 'instantsearch.js';
+import { Hit as AlgoliaHit } from 'instantsearch-core';
 import React from 'react';
 import {
   InstantSearch,
diff --git a/examples/react/e-commerce/components/PriceSlider.tsx b/examples/react/e-commerce/components/PriceSlider.tsx
index 470c54f66d..0d9e9e9c65 100644
--- a/examples/react/e-commerce/components/PriceSlider.tsx
+++ b/examples/react/e-commerce/components/PriceSlider.tsx
@@ -1,7 +1,4 @@
-import {
-  Range,
-  RangeBoundaries,
-} from 'instantsearch.js/es/connectors/range/connectRange';
+import { Range, RangeBoundaries } from 'instantsearch-core';
 import React, { useState } from 'react';
 import {
   Slider,
diff --git a/examples/react/e-commerce/components/Ratings.tsx b/examples/react/e-commerce/components/Ratings.tsx
index e6cf156002..b772e6ea5d 100644
--- a/examples/react/e-commerce/components/Ratings.tsx
+++ b/examples/react/e-commerce/components/Ratings.tsx
@@ -1,8 +1,8 @@
-import { connectRatingMenu } from 'instantsearch.js/es/connectors';
 import {
   RatingMenuConnectorParams,
   RatingMenuWidgetDescription,
-} from 'instantsearch.js/es/connectors/rating-menu/connectRatingMenu';
+} from 'instantsearch-core';
+import { connectRatingMenu } from 'instantsearch.js/es/connectors';
 import React from 'react';
 import { useConnector } from 'react-instantsearch';
 
diff --git a/examples/react/e-commerce/package.json b/examples/react/e-commerce/package.json
index 6e4ef19ac2..fd339d576b 100644
--- a/examples/react/e-commerce/package.json
+++ b/examples/react/e-commerce/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "algoliasearch": "5.1.1",
     "instantsearch.css": "8.5.1",
-    "instantsearch.js": "4.77.3",
+    "instantsearch-core": "0.1.0",
     "react": "19.0.0",
     "react-compound-slider": "3.4.0",
     "react-dom": "19.0.0",
diff --git a/examples/react/getting-started/package.json b/examples/react/getting-started/package.json
index 74f107953c..5e9c9a38fe 100644
--- a/examples/react/getting-started/package.json
+++ b/examples/react/getting-started/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "algoliasearch": "5.1.1",
     "instantsearch.css": "8.5.1",
-    "instantsearch.js": "4.77.3",
+    "instantsearch-core": "0.1.0",
     "react": "19.0.0",
     "react-dom": "19.0.0",
     "react-instantsearch": "7.15.3"
diff --git a/examples/react/getting-started/src/App.tsx b/examples/react/getting-started/src/App.tsx
index 857391877e..f7102aa0f8 100644
--- a/examples/react/getting-started/src/App.tsx
+++ b/examples/react/getting-started/src/App.tsx
@@ -1,5 +1,5 @@
 import { liteClient as algoliasearch } from 'algoliasearch/lite';
-import { Hit } from 'instantsearch.js';
+import { Hit } from 'instantsearch-core';
 import React from 'react';
 import {
   Configure,
diff --git a/examples/react/getting-started/src/Product.tsx b/examples/react/getting-started/src/Product.tsx
index 55aa2a6313..7df81df1b2 100644
--- a/examples/react/getting-started/src/Product.tsx
+++ b/examples/react/getting-started/src/Product.tsx
@@ -1,5 +1,4 @@
 import { liteClient as algoliasearch } from 'algoliasearch/lite';
-import { type Hit } from 'instantsearch.js';
 import React from 'react';
 import {
   Configure,
@@ -9,6 +8,8 @@ import {
   Carousel,
 } from 'react-instantsearch';
 
+import type { Hit } from 'instantsearch-core';
+
 import './App.css';
 import 'instantsearch.css/themes/satellite.css';
 
diff --git a/examples/react/react-native/package.json b/examples/react/react-native/package.json
index bd5d7f077d..368ef965cb 100644
--- a/examples/react/react-native/package.json
+++ b/examples/react/react-native/package.json
@@ -14,7 +14,7 @@
     "algoliasearch": "5.1.1",
     "expo": "~44.0.0",
     "expo-status-bar": "~1.2.0",
-    "instantsearch.js": "4.77.3",
+    "instantsearch-core": "0.1.0",
     "react": "17.0.1",
     "react-instantsearch-core": "7.15.3",
     "react-native": "0.64.3",
diff --git a/examples/react/react-native/src/Highlight.tsx b/examples/react/react-native/src/Highlight.tsx
index f0785cf89d..5e3acc7469 100644
--- a/examples/react/react-native/src/Highlight.tsx
+++ b/examples/react/react-native/src/Highlight.tsx
@@ -1,10 +1,8 @@
 import React, { Fragment } from 'react';
 import { StyleSheet, Text } from 'react-native';
-import { Hit as AlgoliaHit } from 'instantsearch.js';
-import {
-  getHighlightedParts,
-  getPropertyByPath,
-} from 'instantsearch.js/es/lib/utils';
+import { getHighlightedParts, getPropertyByPath } from 'instantsearch-core';
+
+import type { Hit as AlgoliaHit } from 'instantsearch-core';
 
 type HighlightPartProps = {
   children: React.ReactNode;
diff --git a/examples/react/react-native/src/InfiniteHits.tsx b/examples/react/react-native/src/InfiniteHits.tsx
index becb8a0701..e6b9d5f4fa 100644
--- a/examples/react/react-native/src/InfiniteHits.tsx
+++ b/examples/react/react-native/src/InfiniteHits.tsx
@@ -1,11 +1,12 @@
 import React, { forwardRef } from 'react';
 import { StyleSheet, View, FlatList } from 'react-native';
-import { Hit as AlgoliaHit } from 'instantsearch.js';
 import {
   useInfiniteHits,
   UseInfiniteHitsProps,
 } from 'react-instantsearch-core';
 
+import type { Hit as AlgoliaHit } from 'instantsearch-core';
+
 type InfiniteHitsProps<THit> = UseInfiniteHitsProps & {
   hitComponent: (props: { hit: THit }) => JSX.Element;
 };
diff --git a/examples/react/ssr/src/App.js b/examples/react/ssr/src/App.js
index 39cd1f77f7..bcdba14b30 100644
--- a/examples/react/ssr/src/App.js
+++ b/examples/react/ssr/src/App.js
@@ -1,5 +1,7 @@
-import { history } from 'instantsearch.js/cjs/lib/routers';
-import { simple } from 'instantsearch.js/cjs/lib/stateMappings';
+import {
+  historyRouter as history,
+  simpleStateMapping as simple,
+} from 'instantsearch-core';
 import React from 'react';
 import {
   Configure,
@@ -12,11 +14,6 @@ import {
   RefinementList,
   SearchBox,
 } from 'react-instantsearch';
-// because this is ran on node without type: "module" set in the package.json
-// we need to use commonjs instead of esm.
-// If you use ESM in Node, you can rely on these import statements instead:
-// import { simple } from 'instantsearch.js/es/lib/stateMappings';
-// import { history } from 'instantsearch.js/es/lib/routers';
 
 import { searchClient } from './searchClient';
 
diff --git a/examples/vue/default-theme/package.json b/examples/vue/default-theme/package.json
index 1095156047..26c2cd02e4 100644
--- a/examples/vue/default-theme/package.json
+++ b/examples/vue/default-theme/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "algoliasearch": "5.1.1",
-    "instantsearch.js": "4.77.3",
+    "instantsearch-core": "0.1.0",
     "vue": "2.7.14",
     "vue-instantsearch": "4.20.4"
   },
diff --git a/examples/vue/default-theme/src/App.vue b/examples/vue/default-theme/src/App.vue
index 27d0e57d2e..ce023ef04c 100644
--- a/examples/vue/default-theme/src/App.vue
+++ b/examples/vue/default-theme/src/App.vue
@@ -124,8 +124,7 @@
 
 <script>
 import { liteClient as algoliasearch } from 'algoliasearch/lite';
-import { history as historyRouter } from 'instantsearch.js/es/lib/routers';
-import { simple as simpleMapping } from 'instantsearch.js/es/lib/stateMappings';
+import { historyRouter, simpleStateMapping } from 'instantsearch-core';
 
 export default {
   data() {
@@ -138,7 +137,7 @@ export default {
         router: historyRouter({
           cleanUrlOnDispose: false,
         }),
-        stateMapping: simpleMapping(),
+        stateMapping: simpleStateMapping(),
       },
     };
   },
diff --git a/examples/vue/e-commerce/package.json b/examples/vue/e-commerce/package.json
index a836a46c00..6fab57dc9d 100644
--- a/examples/vue/e-commerce/package.json
+++ b/examples/vue/e-commerce/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "algoliasearch": "5.1.1",
-    "instantsearch.js": "4.77.3",
+    "instantsearch-core": "0.1.0",
     "vue": "2.7.14",
     "vue-instantsearch": "4.20.4",
     "vue-slider-component": "3.0.32"
diff --git a/examples/vue/e-commerce/src/routing.js b/examples/vue/e-commerce/src/routing.js
index a52ce4330a..fa91f7f9c5 100644
--- a/examples/vue/e-commerce/src/routing.js
+++ b/examples/vue/e-commerce/src/routing.js
@@ -1,6 +1,6 @@
 /* eslint-disable camelcase */
 /* eslint-disable complexity */
-import { history as historyRouter } from 'instantsearch.js/es/lib/routers';
+import { historyRouter } from 'instantsearch-core';
 
 const hitsPerPageItemsValue = [16, 32, 64];
 
diff --git a/examples/vue/e-commerce/src/widgets/ClearRefinements.vue b/examples/vue/e-commerce/src/widgets/ClearRefinements.vue
index b10baa3d53..3dab82e5d6 100644
--- a/examples/vue/e-commerce/src/widgets/ClearRefinements.vue
+++ b/examples/vue/e-commerce/src/widgets/ClearRefinements.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import { connectClearRefinements } from 'instantsearch.js/es/connectors';
+import { connectClearRefinements } from 'instantsearch-core';
 import { createWidgetMixin } from 'vue-instantsearch';
 
 export default {
diff --git a/examples/vue/e-commerce/src/widgets/NoResults.vue b/examples/vue/e-commerce/src/widgets/NoResults.vue
index 54f2dbdc5b..997cece42d 100644
--- a/examples/vue/e-commerce/src/widgets/NoResults.vue
+++ b/examples/vue/e-commerce/src/widgets/NoResults.vue
@@ -115,7 +115,7 @@
 </template>
 
 <script>
-import { connectHits } from 'instantsearch.js/es/connectors';
+import { connectHits } from 'instantsearch-core';
 import { createWidgetMixin } from 'vue-instantsearch';
 
 export default {
diff --git a/examples/vue/getting-started/package.json b/examples/vue/getting-started/package.json
index 56df1a5b31..8874f893a5 100644
--- a/examples/vue/getting-started/package.json
+++ b/examples/vue/getting-started/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "algoliasearch": "5.1.1",
-    "instantsearch.js": "4.77.3",
+    "instantsearch-core": "0.1.0",
     "vue": "2.7.14",
     "vue-instantsearch": "4.20.4"
   },
diff --git a/examples/vue/media/package.json b/examples/vue/media/package.json
index f287630b3e..386793ff6c 100644
--- a/examples/vue/media/package.json
+++ b/examples/vue/media/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "algoliasearch": "5.1.1",
-    "instantsearch.js": "4.77.3",
+    "instantsearch-core": "0.1.0",
     "vue": "2.7.14",
     "vue-instantsearch": "4.20.4"
   },
diff --git a/examples/vue/media/src/App.vue b/examples/vue/media/src/App.vue
index faf618c758..d2d1bb0798 100644
--- a/examples/vue/media/src/App.vue
+++ b/examples/vue/media/src/App.vue
@@ -113,8 +113,7 @@
 
 <script>
 import { liteClient as algoliasearch } from 'algoliasearch/lite';
-import { history as historyRouter } from 'instantsearch.js/es/lib/routers';
-import { simple as simpleMapping } from 'instantsearch.js/es/lib/stateMappings';
+import { historyRouter, simpleStateMapping } from 'instantsearch-core';
 
 export default {
   data() {
@@ -127,7 +126,7 @@ export default {
         router: historyRouter({
           cleanUrlOnDispose: false,
         }),
-        stateMapping: simpleMapping(),
+        stateMapping: simpleStateMapping(),
       },
     };
   },
diff --git a/jest.config.js b/jest.config.js
index 934bb71cc4..66e85ea805 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -54,6 +54,9 @@ const config = {
     '^instantsearch.js/(.*)$': '<rootDir>/packages/instantsearch.js/$1',
     '^instantsearch-ui-components/(.*)$':
       '<rootDir>/packages/instantsearch-ui-components/$1',
+    '^instantsearch-core$':
+      '<rootDir>/packages/instantsearch-core/src/index.ts',
+    '^instantsearch-core/(.*)$': '<rootDir>/packages/instantsearch-core/$1',
   },
   modulePathIgnorePatterns: [
     '<rootDir>/packages/create-instantsearch-app/src/templates',
diff --git a/package.json b/package.json
index 16ae882efa..dc744927b4 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
     "@babel/cli": "7.15.4",
     "@babel/core": "7.15.5",
     "@babel/plugin-proposal-class-properties": "7.14.5",
+    "@babel/plugin-proposal-private-property-in-object": "7.21.11",
     "@babel/plugin-syntax-dynamic-import": "7.8.3",
     "@babel/plugin-transform-react-constant-elements": "7.9.0",
     "@babel/plugin-transform-runtime": "7.15.0",
diff --git a/packages/algolia-experiences/package.json b/packages/algolia-experiences/package.json
index b210dd77bb..4581510761 100644
--- a/packages/algolia-experiences/package.json
+++ b/packages/algolia-experiences/package.json
@@ -10,6 +10,7 @@
   ],
   "dependencies": {
     "algoliasearch": "5.1.1",
+    "instantsearch-core": "0.1.0",
     "instantsearch.js": "4.77.3"
   },
   "devDependencies": {
diff --git a/packages/algolia-experiences/src/__tests__/render.test.ts b/packages/algolia-experiences/src/__tests__/render.test.ts
index dfe1210a2d..a8fb665862 100644
--- a/packages/algolia-experiences/src/__tests__/render.test.ts
+++ b/packages/algolia-experiences/src/__tests__/render.test.ts
@@ -7,7 +7,7 @@ import {
 } from '@instantsearch/mocks';
 import { createRecommendSearchClient } from '@instantsearch/mocks/fixtures';
 import { wait } from '@instantsearch/testutils';
-import instantsearch from 'instantsearch.js';
+import { instantsearch } from 'instantsearch-core';
 
 import { configToIndex, injectStyles } from '../render';
 
diff --git a/packages/algolia-experiences/src/banner.tsx b/packages/algolia-experiences/src/banner.tsx
index e38ec6904e..dfac3f107b 100644
--- a/packages/algolia-experiences/src/banner.tsx
+++ b/packages/algolia-experiences/src/banner.tsx
@@ -4,11 +4,11 @@ import { cx } from 'instantsearch-ui-components';
 import { h, render } from 'preact';
 
 import type { Banner } from 'algoliasearch-helper';
+import type { HitsConnectorParams } from 'instantsearch-core';
 import type {
   ComponentProps,
   HitsClassNames,
 } from 'instantsearch-ui-components';
-import type { HitsConnectorParams } from 'instantsearch.js/es/connectors/hits/connectHits';
 
 export type BannerWidgetParams = {
   container: HTMLElement;
diff --git a/packages/algolia-experiences/src/render.tsx b/packages/algolia-experiences/src/render.tsx
index 3aef09f1f3..1d90d70924 100644
--- a/packages/algolia-experiences/src/render.tsx
+++ b/packages/algolia-experiences/src/render.tsx
@@ -1,5 +1,5 @@
 /** @jsx h */
-import { getPropertyByPath } from 'instantsearch.js/es/lib/utils';
+import { getPropertyByPath } from 'instantsearch-core';
 import { carousel } from 'instantsearch.js/es/templates';
 import { index, panel } from 'instantsearch.js/es/widgets';
 import { h, Fragment } from 'preact';
diff --git a/packages/algolia-experiences/src/setup-instantsearch.ts b/packages/algolia-experiences/src/setup-instantsearch.ts
index 2798ba98c5..330b62a925 100644
--- a/packages/algolia-experiences/src/setup-instantsearch.ts
+++ b/packages/algolia-experiences/src/setup-instantsearch.ts
@@ -1,7 +1,7 @@
 /** @jsx h */
 
 import { liteClient as algoliasearch } from 'algoliasearch/lite';
-import InstantSearch from 'instantsearch.js/es/lib/InstantSearch';
+import { instantsearch } from 'instantsearch-core';
 
 import { fetchConfiguration } from './get-configuration';
 import { getSettings } from './get-information';
@@ -9,7 +9,7 @@ import { configToIndex, injectStyles } from './render';
 import { error } from './util';
 
 import type { Settings } from './get-information';
-import type { IndexWidget } from 'instantsearch.js';
+import type { IndexWidget, InstantSearch } from 'instantsearch-core';
 
 declare global {
   interface Window {
@@ -22,7 +22,7 @@ export function setupInstantSearch() {
     const settings = getSettings();
 
     const searchClient = algoliasearch(settings.appId, settings.apiKey);
-    const search = new InstantSearch({
+    const search = instantsearch({
       searchClient,
     });
     window.__search = search;
diff --git a/packages/algoliasearch-helper/index.d.ts b/packages/algoliasearch-helper/index.d.ts
index 04de5f9893..cdc7044f80 100644
--- a/packages/algoliasearch-helper/index.d.ts
+++ b/packages/algoliasearch-helper/index.d.ts
@@ -350,7 +350,10 @@ declare namespace algoliasearchHelper {
     ): this;
     on(
       event: 'result',
-      cb: (res: { results: SearchResults; state: SearchParameters }) => void
+      cb: (res: {
+        results: SearchResults | null;
+        state: SearchParameters;
+      }) => void
     ): this;
     on(
       event: 'recommend:result',
diff --git a/packages/instantsearch-core/CHANGELOG.md b/packages/instantsearch-core/CHANGELOG.md
new file mode 100644
index 0000000000..420e6f23d0
--- /dev/null
+++ b/packages/instantsearch-core/CHANGELOG.md
@@ -0,0 +1 @@
+# Change Log
diff --git a/packages/instantsearch-core/README.md b/packages/instantsearch-core/README.md
new file mode 100644
index 0000000000..371ecb07f9
--- /dev/null
+++ b/packages/instantsearch-core/README.md
@@ -0,0 +1,44 @@
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+
+- [instantsearch-core](#instantsearch-core)
+  - [Contributing](#contributing)
+  - [License](#license)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
+# instantsearch-core
+
+InstantSearch Core is an open-source UI library used by InstantSearch for common utilities and types.
+
+> Note: `instantsearch-core` exists for internal usage and isn't designed for public consumption.
+
+## Contributing
+
+We welcome all contributors, from casual to regular 💙
+
+- **Bug report**. Is something not working as expected? [Send a bug report][contributing-bugreport].
+- **Feature request**. Would you like to add something to the library? [Send a feature request][contributing-featurerequest].
+- **Documentation**. Did you find a typo in the doc? [Open an issue][contributing-newissue] and we'll take care of it.
+- **Development**. If you don't know where to start, you can check the open issues that are [tagged easy][contributing-label-easy], the [bugs][contributing-label-bug] or [chores][contributing-label-chore].
+
+To start contributing to code, you need to:
+
+1.  [Fork the project](https://help.github.com/articles/fork-a-repo/)
+1.  [Clone the repository](https://help.github.com/articles/cloning-a-repository/)
+1.  Install the dependencies: `yarn`
+
+Please read [our contribution process](https://github.com/algolia/instantsearch/blob/master/CONTRIBUTING.md) to learn more.
+
+## License
+
+InstantSearch Core is [MIT licensed](../../LICENSE).
+
+<!-- Links -->
+
+[contributing-bugreport]: https://github.com/algolia/instantsearch/issues/new?template=BUG_REPORT.yml&labels=triage,Library%3A%20InstantSearch+Core
+[contributing-featurerequest]: https://github.com/algolia/instantsearch/discussions/new?category=ideas&labels=triage,Library%3A%20InstantSearch+Core&title=Feature%20request%3A%20
+[contributing-newissue]: https://github.com/algolia/instantsearch/issues/new?labels=triage,Library%3A%20InstantSearch+Core
+[contributing-label-easy]: https://github.com/algolia/instantsearch/issues?q=is%3Aopen+is%3Aissue+label%3A%22Difficulty%3A+Easy%22+label%3A%22Library%3A%20InstantSearch+Core%22
+[contributing-label-bug]: https://github.com/algolia/instantsearch/issues?q=is%3Aissue+is%3Aopen+label%3A%22Type%3A+Bug%22+label%3A%22Library%3A%20InstantSearch+Core%22
+[contributing-label-chore]: https://github.com/algolia/instantsearch/issues?q=is%3Aissue+is%3Aopen+label%3A%22Type%3A+Chore%22+label%3A%22Library%3A%20InstantSearch+Core%22
diff --git a/packages/instantsearch-core/package.json b/packages/instantsearch-core/package.json
new file mode 100644
index 0000000000..5992e13356
--- /dev/null
+++ b/packages/instantsearch-core/package.json
@@ -0,0 +1,56 @@
+{
+  "name": "instantsearch-core",
+  "version": "0.1.0",
+  "description": "Common utilities and types for InstantSearch.",
+  "types": "dist/es/index.d.ts",
+  "main": "dist/cjs/index.js",
+  "module": "dist/es/index.js",
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./dist/es/index.d.ts",
+      "require": "./dist/cjs/index.js",
+      "default": "./dist/es/index.js"
+    }
+  },
+  "sideEffects": false,
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/algolia/instantsearch"
+  },
+  "author": {
+    "name": "Algolia, Inc.",
+    "url": "https://www.algolia.com"
+  },
+  "keywords": [
+    "algolia",
+    "components",
+    "fast",
+    "instantsearch",
+    "react",
+    "search"
+  ],
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "clean": "rm -rf dist",
+    "build": "yarn build:cjs && yarn build:es && yarn build:types",
+    "build:es:base": "BABEL_ENV=es,disableHoisting babel src --root-mode upward --extensions '.js,.ts,.tsx' --out-dir dist/es --ignore '**/__tests__/**/*','**/__mocks__/**/*'",
+    "build:es": "yarn build:es:base --quiet",
+    "build:cjs": "BABEL_ENV=cjs,disableHoisting babel src --root-mode upward --extensions '.js,.ts,.tsx' --out-dir dist/cjs --ignore '**/__tests__/**/*','**/__mocks__/**/*' --quiet && ../../scripts/prepare-cjs.sh",
+    "build:types": "tsc -p ./tsconfig.declaration.json",
+    "version": "./scripts/version.cjs",
+    "prepare": "yarn build",
+    "watch:es": "yarn --silent build:es:base --watch"
+  },
+  "dependencies": {
+    "@babel/runtime": "^7.25.9",
+    "algoliasearch-helper": "3.24.1",
+    "@algolia/events": "^4.0.1",
+    "@types/qs": "^6.5.3",
+    "qs": "^6.5.1 < 6.10",
+    "search-insights": "^2.17.2"
+  }
+}
diff --git a/packages/instantsearch-core/scripts/version.cjs b/packages/instantsearch-core/scripts/version.cjs
new file mode 100755
index 0000000000..a7399a770f
--- /dev/null
+++ b/packages/instantsearch-core/scripts/version.cjs
@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+
+const fs = require('fs');
+const path = require('path');
+
+const version = require('../package.json').version;
+
+fs.writeFileSync(
+  path.resolve(__dirname, '../src/version.ts'),
+  `export default '${version}';\n`
+);
diff --git a/packages/instantsearch.js/src/lib/__tests__/RoutingManager-test.ts b/packages/instantsearch-core/src/__tests__/RoutingManager.test.ts
similarity index 98%
rename from packages/instantsearch.js/src/lib/__tests__/RoutingManager-test.ts
rename to packages/instantsearch-core/src/__tests__/RoutingManager.test.ts
index 0dd0dad189..4dcd5356f5 100644
--- a/packages/instantsearch.js/src/lib/__tests__/RoutingManager-test.ts
+++ b/packages/instantsearch-core/src/__tests__/RoutingManager.test.ts
@@ -6,12 +6,15 @@ import { createSearchClient } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
 import qs from 'qs';
 
-import instantsearch from '../..';
-import { createWidget } from '../../../test/createWidget';
-import { connectHitsPerPage, connectSearchBox } from '../../connectors';
-import historyRouter from '../routers/history';
-
-import type { Router, UiState, StateMapping, IndexUiState } from '../../types';
+import {
+  instantsearch,
+  historyRouter,
+  connectHitsPerPage,
+  connectSearchBox,
+} from '..';
+import { createWidget } from '../../test/createWidget';
+
+import type { Router, UiState, StateMapping, IndexUiState } from '../types';
 import type { JSDOM } from 'jsdom';
 
 declare const jsdom: JSDOM;
diff --git a/packages/instantsearch.js/src/lib/__tests__/InstantSearch-composition-test.tsx b/packages/instantsearch-core/src/__tests__/instantsearch-composition.test.tsx
similarity index 91%
rename from packages/instantsearch.js/src/lib/__tests__/InstantSearch-composition-test.tsx
rename to packages/instantsearch-core/src/__tests__/instantsearch-composition.test.tsx
index 1a29a313ac..d2a7e9b8b5 100644
--- a/packages/instantsearch.js/src/lib/__tests__/InstantSearch-composition-test.tsx
+++ b/packages/instantsearch-core/src/__tests__/instantsearch-composition.test.tsx
@@ -6,9 +6,7 @@ import { castToJestMock } from '@instantsearch/testutils/castToJestMock';
 import { wait } from '@instantsearch/testutils/wait';
 import originalHelper from 'algoliasearch-helper';
 
-import { connectSearchBox } from '../../connectors';
-import { index, configure } from '../../widgets';
-import InstantSearch from '../InstantSearch';
+import { InstantSearch, index, connectConfigure, connectSearchBox } from '..';
 
 type AlgoliaHelperModule = typeof algoliasearchHelper;
 
@@ -42,6 +40,7 @@ jest.mock('algoliasearch-helper', () => {
   return mock;
 });
 
+const configure = connectConfigure(() => {});
 const virtualSearchBox = connectSearchBox(() => {});
 
 beforeEach(() => {
@@ -130,8 +129,10 @@ describe('Composition implementation', () => {
 
       search.addWidgets([
         configure({
-          highlightPreTag: 'whatever',
-          highlightPostTag: 'whenever',
+          searchParameters: {
+            highlightPreTag: 'whatever',
+            highlightPostTag: 'whenever',
+          },
         }),
         virtualSearchBox({}),
       ]);
@@ -154,7 +155,9 @@ describe('Composition implementation', () => {
       });
 
       search.addWidgets([
-        configure({ index: 'please-do-not-do-that' }),
+        configure({
+          searchParameters: { index: 'please-do-not-do-that' },
+        }),
         virtualSearchBox({}),
       ]);
       search.start();
@@ -177,8 +180,10 @@ describe('Composition implementation', () => {
 
       search.addWidgets([
         configure({
-          facets: ['brand'],
-          disjunctiveFacets: ['categories'],
+          searchParameters: {
+            facets: ['brand'],
+            disjunctiveFacets: ['categories'],
+          },
         }),
         virtualSearchBox({}),
       ]);
@@ -204,9 +209,11 @@ describe('Composition implementation', () => {
 
       search.addWidgets([
         configure({
-          tagFilters: ['tags'],
-          facetFilters: ['brand'],
-          numericFilters: ['price'],
+          searchParameters: {
+            tagFilters: ['tags'],
+            facetFilters: ['brand'],
+            numericFilters: ['price'],
+          },
         }),
         virtualSearchBox({}),
       ]);
diff --git a/packages/instantsearch.js/src/lib/__tests__/InstantSearch-integration-test.ts b/packages/instantsearch-core/src/__tests__/instantsearch-integration.test.ts
similarity index 88%
rename from packages/instantsearch.js/src/lib/__tests__/InstantSearch-integration-test.ts
rename to packages/instantsearch-core/src/__tests__/instantsearch-integration.test.ts
index a6007c69e1..27ccea5507 100644
--- a/packages/instantsearch.js/src/lib/__tests__/InstantSearch-integration-test.ts
+++ b/packages/instantsearch-core/src/__tests__/instantsearch-integration.test.ts
@@ -8,11 +8,14 @@ import { castToJestMock } from '@instantsearch/testutils';
 import { wait } from '@instantsearch/testutils/wait';
 import { getByText, fireEvent } from '@testing-library/dom';
 
-import { connectConfigure, connectSearchBox } from '../../connectors';
-import instantsearch from '../../index.es';
-import { configure, frequentlyBoughtTogether, searchBox } from '../../widgets';
+import {
+  instantsearch,
+  connectConfigure,
+  connectSearchBox,
+  connectFrequentlyBoughtTogether,
+} from '..';
 
-import type { MiddlewareDefinition } from '../../types';
+import type { MiddlewareDefinition } from '../types';
 
 describe('configure', () => {
   it('provides up-to-date uiState to onStateChange', () => {
@@ -38,8 +41,10 @@ describe('configure', () => {
       }
     });
     search.addWidgets([
-      configure({
-        hitsPerPage: 10,
+      connectConfigure(() => {})({
+        searchParameters: {
+          hitsPerPage: 10,
+        },
       }),
       customComp({ searchParameters: {} }),
     ]);
@@ -57,7 +62,6 @@ describe('configure', () => {
 
 describe('middleware', () => {
   it("runs middlewares' onStateChange when uiState changes", async () => {
-    const container = document.createElement('div');
     const search = instantsearch({
       indexName: 'instant_search',
       searchClient: createSearchClient(),
@@ -74,25 +78,17 @@ describe('middleware', () => {
 
     search.use(() => middlewareDefinition);
 
-    search.addWidgets([
-      searchBox({
-        container,
-        placeholder: 'search',
-      }),
-    ]);
+    search.addWidgets([connectSearchBox(() => {})({})]);
 
     search.start();
 
-    fireEvent.input(container.querySelector('input')!, {
-      target: { value: 'q' },
-    });
+    search.renderState.instant_search.searchBox!.refine('q');
 
     await wait(0);
     expect(middlewareDefinition.onStateChange).toHaveBeenCalledTimes(1);
   });
 
   it("runs middlewares' onStateChange when uiState changes with user-provided onStateChange param", async () => {
-    const container = document.createElement('div');
     const search = instantsearch({
       indexName: 'instant_search',
       searchClient: createSearchClient(),
@@ -112,18 +108,11 @@ describe('middleware', () => {
 
     search.use(() => middlewareDefinition);
 
-    search.addWidgets([
-      searchBox({
-        container,
-        placeholder: 'search',
-      }),
-    ]);
+    search.addWidgets([connectSearchBox(() => {})({})]);
 
     search.start();
 
-    fireEvent.input(container.querySelector('input')!, {
-      target: { value: 'q' },
-    });
+    search.renderState.instant_search.searchBox!.refine('q');
 
     await wait(0);
     expect(middlewareDefinition.onStateChange).toHaveBeenCalledTimes(1);
@@ -131,8 +120,6 @@ describe('middleware', () => {
 });
 
 describe('errors', () => {
-  const virtualSearchBox = connectSearchBox(() => {});
-
   it('client errors can be handled', () => {
     const search = instantsearch({
       searchClient: createSearchClient({
@@ -143,7 +130,7 @@ describe('errors', () => {
       indexName: '123',
     });
 
-    search.addWidgets([virtualSearchBox({})]);
+    search.addWidgets([connectSearchBox(() => {})({})]);
 
     expect.assertions(4);
 
@@ -184,7 +171,7 @@ describe('network requests', () => {
         indexName: 'indexName',
         searchClient,
       })
-        .addWidgets([searchBox({ container: document.createElement('div') })])
+        .addWidgets([connectSearchBox(() => {})({})])
         .start();
 
       await wait(0);
@@ -212,9 +199,8 @@ describe('network requests', () => {
         searchClient,
       })
         .addWidgets([
-          frequentlyBoughtTogether({
+          connectFrequentlyBoughtTogether(() => {})({
             objectIDs: ['one'],
-            container: document.createElement('div'),
           }),
         ])
         .start();
@@ -250,10 +236,9 @@ describe('network requests', () => {
         searchClient,
       })
         .addWidgets([
-          searchBox({ container: document.createElement('div') }),
-          frequentlyBoughtTogether({
+          connectSearchBox(() => {})({}),
+          connectFrequentlyBoughtTogether(() => {})({
             objectIDs: ['one'],
-            container: document.createElement('div'),
           }),
         ])
         .start();
@@ -327,7 +312,7 @@ describe('network requests', () => {
         searchClient,
         insights: true,
       })
-        .addWidgets([searchBox({ container: document.createElement('div') })])
+        .addWidgets([connectSearchBox(() => {})({})])
         .start();
 
       await wait(0);
@@ -358,9 +343,8 @@ describe('network requests', () => {
         insights: true,
       })
         .addWidgets([
-          frequentlyBoughtTogether({
+          connectFrequentlyBoughtTogether(() => {})({
             objectIDs: ['one'],
-            container: document.createElement('div'),
           }),
         ])
         .start();
@@ -397,10 +381,9 @@ describe('network requests', () => {
         insights: true,
       })
         .addWidgets([
-          searchBox({ container: document.createElement('div') }),
-          frequentlyBoughtTogether({
+          connectSearchBox(() => {})({}),
+          connectFrequentlyBoughtTogether(() => {})({
             objectIDs: ['one'],
-            container: document.createElement('div'),
           }),
         ])
         .start();
@@ -476,7 +459,7 @@ describe('network requests', () => {
         searchClient,
         insights: true,
       })
-        .addWidgets([searchBox({ container: document.createElement('div') })])
+        .addWidgets([connectSearchBox(() => {})({})])
         .start();
 
       await wait(0);
@@ -507,9 +490,8 @@ describe('network requests', () => {
         insights: true,
       })
         .addWidgets([
-          frequentlyBoughtTogether({
+          connectFrequentlyBoughtTogether(() => {})({
             objectIDs: ['one'],
-            container: document.createElement('div'),
           }),
         ])
         .start();
@@ -546,10 +528,9 @@ describe('network requests', () => {
         insights: true,
       })
         .addWidgets([
-          searchBox({ container: document.createElement('div') }),
-          frequentlyBoughtTogether({
+          connectSearchBox(() => {})({}),
+          connectFrequentlyBoughtTogether(() => {})({
             objectIDs: ['one'],
-            container: document.createElement('div'),
           }),
         ])
         .start();
@@ -592,12 +573,11 @@ describe('network requests', () => {
   describe('interactive life cycle', () => {
     it('sends no queries when widgets are removed', async () => {
       const searchClient = createRecommendSearchClient();
-      const searchBoxWidget = searchBox({
-        container: document.createElement('div'),
-      });
-      const frequentlyBoughtTogetherWidget = frequentlyBoughtTogether({
+      const searchBoxWidget = connectSearchBox(() => {})({});
+      const frequentlyBoughtTogetherWidget = connectFrequentlyBoughtTogether(
+        () => {}
+      )({
         objectIDs: ['one'],
-        container: document.createElement('div'),
       });
       const search = instantsearch({
         indexName: 'indexName',
diff --git a/packages/instantsearch.js/src/lib/__tests__/InstantSearch-test.tsx b/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
similarity index 96%
rename from packages/instantsearch.js/src/lib/__tests__/InstantSearch-test.tsx
rename to packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
index 3ff76da93e..8a132b8f15 100644
--- a/packages/instantsearch.js/src/lib/__tests__/InstantSearch-test.tsx
+++ b/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
@@ -14,23 +14,23 @@ import { wait } from '@instantsearch/testutils/wait';
 import originalHelper from 'algoliasearch-helper';
 import { h, render, createRef } from 'preact';
 
-import { createRenderOptions, createWidget } from '../../../test/createWidget';
-import { connectSearchBox, connectPagination } from '../../connectors';
-import { createInsightsMiddleware } from '../../middlewares';
-import { index } from '../../widgets';
-import InstantSearch from '../InstantSearch';
-import { noop, warning } from '../utils';
+import {
+  InstantSearch,
+  index,
+  createInsightsMiddleware,
+  connectSearchBox,
+  connectPagination,
+} from '..';
+import { createRenderOptions, createWidget } from '../../test/createWidget';
 import version from '../version';
 
 import type {
   PaginationConnectorParams,
   PaginationWidgetDescription,
-} from '../../connectors/pagination/connectPagination';
-import type {
   SearchBoxWidgetDescription,
   SearchBoxConnectorParams,
-} from '../../connectors/search-box/connectSearchBox';
-import type { UiState, Widget, IndexWidget } from '../../types';
+} from '..';
+import type { UiState, Widget, IndexWidget } from '../types';
 import type { RefObject } from 'preact';
 
 type SearchBoxWidgetInstance = Widget<
@@ -76,10 +76,6 @@ beforeEach(() => {
 });
 
 describe('Usage', () => {
-  beforeEach(() => {
-    warning.cache = {};
-  });
-
   it('throws without searchClient', () => {
     expect(() => {
       // @ts-expect-error
@@ -114,7 +110,7 @@ See: https://www.algolia.com/doc/guides/building-search-ui/going-further/backend
         search.start();
         await wait(0);
       }).toWarnDev(
-        '[InstantSearch.js]: No indexName provided, nor an explicit index widget in the widgets tree. This is required to be able to display results.'
+        '[InstantSearch]: No indexName provided, nor an explicit index widget in the widgets tree. This is required to be able to display results.'
       );
     });
 
@@ -129,7 +125,7 @@ See: https://www.algolia.com/doc/guides/building-search-ui/going-further/backend
         search.start();
         await wait(0);
       }).not.toWarnDev(
-        '[InstantSearch.js]: No indexName provided, nor an explicit index widget in the widgets tree. This is required to be able to display results.'
+        '[InstantSearch]: No indexName provided, nor an explicit index widget in the widgets tree. This is required to be able to display results.'
       );
     });
 
@@ -142,7 +138,7 @@ See: https://www.algolia.com/doc/guides/building-search-ui/going-further/backend
         search.start();
         await wait(0);
       }).not.toWarnDev(
-        '[InstantSearch.js]: No indexName provided, nor an explicit index widget in the widgets tree. This is required to be able to display results.'
+        '[InstantSearch]: No indexName provided, nor an explicit index widget in the widgets tree. This is required to be able to display results.'
       );
     });
 
@@ -156,7 +152,7 @@ See: https://www.algolia.com/doc/guides/building-search-ui/going-further/backend
         search.start();
         await wait(0);
       }).not.toWarnDev(
-        '[InstantSearch.js]: No indexName provided, nor an explicit index widget in the widgets tree. This is required to be able to display results.'
+        '[InstantSearch]: No indexName provided, nor an explicit index widget in the widgets tree. This is required to be able to display results.'
       );
     });
   });
@@ -330,7 +326,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/instantsear
         insightsClient: () => {},
       });
     }).toWarnDev(
-      `[InstantSearch.js]: \`insightsClient\` property has been deprecated. It is still supported in 4.x releases, but not further. It is replaced by the \`insights\` middleware.
+      `[InstantSearch]: \`insightsClient\` property has been deprecated. It is still supported in 4.x releases, but not further. It is replaced by the \`insights\` middleware.
 
 For more information, visit https://www.algolia.com/doc/guides/getting-insights-and-analytics/search-analytics/click-through-and-conversions/how-to/send-click-and-conversion-events-with-instantsearch/js/`
     );
@@ -365,7 +361,7 @@ describe('InstantSearch', () => {
 
     expect(searchClient.addAlgoliaAgent).toHaveBeenCalledTimes(1);
     expect(searchClient.addAlgoliaAgent).toHaveBeenCalledWith(
-      `instantsearch.js (${version})`
+      `instantsearch-core (${version})`
     );
   });
 
@@ -380,7 +376,6 @@ describe('InstantSearch', () => {
   });
 
   it('warns deprecated usage of `searchParameters`', () => {
-    warning.cache = {};
     const warn = jest.spyOn(global.console, 'warn');
     warn.mockImplementation(() => {});
 
@@ -398,7 +393,7 @@ describe('InstantSearch', () => {
         },
       });
     })
-      .toWarnDev(`[InstantSearch.js]: The \`searchParameters\` option is deprecated and will not be supported in InstantSearch.js 4.x.
+      .toWarnDev(`[InstantSearch]: The \`searchParameters\` option is deprecated and will not be supported in InstantSearch.js 4.x.
 
 You can replace it with the \`configure\` widget:
 
@@ -730,10 +725,6 @@ See https://www.algolia.com/doc/api-reference/widgets/configure/js/`);
 });
 
 describe('addWidget(s)', () => {
-  beforeEach(() => {
-    warning.cache = {};
-  });
-
   it('forwards the call of `addWidget` to the main index', () => {
     const warn = jest.spyOn(global.console, 'warn');
     warn.mockImplementation(() => {});
@@ -747,7 +738,7 @@ describe('addWidget(s)', () => {
     expect(search.mainIndex.getWidgets()).toHaveLength(0);
 
     expect(() => search.addWidget(createWidget())).toWarnDev(
-      '[InstantSearch.js]: addWidget will still be supported in 4.x releases, but not further. It is replaced by `addWidgets([widget])`'
+      '[InstantSearch]: addWidget will still be supported in 4.x releases, but not further. It is replaced by `addWidgets([widget])`'
     );
 
     expect(search.mainIndex.getWidgets()).toHaveLength(1);
@@ -782,7 +773,7 @@ describe('addWidget(s)', () => {
     expect(() => {
       result = search.addWidget(createWidget());
     }).toWarnDev(
-      '[InstantSearch.js]: addWidget will still be supported in 4.x releases, but not further. It is replaced by `addWidgets([widget])`'
+      '[InstantSearch]: addWidget will still be supported in 4.x releases, but not further. It is replaced by `addWidgets([widget])`'
     );
 
     expect(result).toBe(search);
@@ -825,10 +816,6 @@ describe('addWidget(s)', () => {
 });
 
 describe('removeWidget(s)', () => {
-  beforeEach(() => {
-    warning.cache = {};
-  });
-
   it('forwards the call to `removeWidget` to the main index', () => {
     const warn = jest.spyOn(global.console, 'warn');
     warn.mockImplementation(() => {});
@@ -846,7 +833,7 @@ describe('removeWidget(s)', () => {
     expect(search.mainIndex.getWidgets()).toHaveLength(1);
 
     expect(() => search.removeWidget(widget)).toWarnDev(
-      '[InstantSearch.js]: removeWidget will still be supported in 4.x releases, but not further. It is replaced by `removeWidgets([widget])`'
+      '[InstantSearch]: removeWidget will still be supported in 4.x releases, but not further. It is replaced by `removeWidgets([widget])`'
     );
 
     expect(search.mainIndex.getWidgets()).toHaveLength(0);
@@ -883,7 +870,7 @@ describe('removeWidget(s)', () => {
     const widget = createWidget();
 
     expect(() => search.addWidget(widget)).toWarnDev(
-      '[InstantSearch.js]: addWidget will still be supported in 4.x releases, but not further. It is replaced by `addWidgets([widget])`'
+      '[InstantSearch]: addWidget will still be supported in 4.x releases, but not further. It is replaced by `addWidgets([widget])`'
     );
 
     let result: InstantSearch | null = null;
@@ -891,7 +878,7 @@ describe('removeWidget(s)', () => {
     expect(() => {
       result = search.removeWidget(widget);
     }).toWarnDev(
-      '[InstantSearch.js]: removeWidget will still be supported in 4.x releases, but not further. It is replaced by `removeWidgets([widget])`'
+      '[InstantSearch]: removeWidget will still be supported in 4.x releases, but not further. It is replaced by `removeWidgets([widget])`'
     );
 
     expect(result).toBe(search);
@@ -1821,7 +1808,7 @@ describe('createURL', () => {
       },
     });
 
-    search.addWidgets([connectSearchBox(noop)({})]);
+    search.addWidgets([connectSearchBox(() => {})({})]);
     search.start();
 
     expect(search.createURL({ indexName: { query: 'Apple' } })).toBe(
@@ -1844,7 +1831,7 @@ describe('createURL', () => {
       },
     });
 
-    search.addWidgets([connectSearchBox(noop)({})]);
+    search.addWidgets([connectSearchBox(() => {})({})]);
     search.start();
     search.createURL();
 
@@ -1877,12 +1864,12 @@ describe('createURL', () => {
     });
 
     search.addWidgets([
-      connectSearchBox(noop)({}),
+      connectSearchBox(() => {})({}),
       index({ indexName: 'indexNameLvl1' }).addWidgets([
-        connectSearchBox(noop)({}),
+        connectSearchBox(() => {})({}),
         index({ indexName: 'indexNameLvl2' }).addWidgets([
-          connectSearchBox(noop)({}),
-          connectPagination(noop)({}),
+          connectSearchBox(() => {})({}),
+          connectPagination(() => {})({}),
           createWidget({
             render({ helper, createURL }) {
               createURL(helper.state.setPage(3).setQuery('Apple'));
@@ -2146,7 +2133,7 @@ describe('unuse', () => {
     };
     const middleware2 = jest.fn(() => middlewareSpy2);
 
-    search.addWidgets([connectSearchBox(noop)({})]);
+    search.addWidgets([connectSearchBox(() => {})({})]);
     search.use(middleware1, middleware2);
     search.start();
 
@@ -2180,10 +2167,6 @@ describe('unuse', () => {
 });
 
 describe('setUiState', () => {
-  beforeEach(() => {
-    warning.cache = {};
-  });
-
   test('throws if the instance has not started', () => {
     const searchClient = createSearchClient();
     const search = new InstantSearch({
@@ -2571,7 +2554,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/instantsear
         },
       });
     })
-      .toWarnDev(`[InstantSearch.js]: The UI state for the index "indexName" is not consistent with the widgets mounted.
+      .toWarnDev(`[InstantSearch]: The UI state for the index "indexName" is not consistent with the widgets mounted.
 
 This can happen when the UI state is specified via \`initialUiState\`, \`routing\` or \`setUiState\` but that the widgets responsible for this state were not added. This results in those query parameters not being sent to the API.
 
@@ -2714,7 +2697,7 @@ describe('getUiState', () => {
 
     search.start();
 
-    (search.mainIndex.getWidgets()[0] as SearchBoxWidgetInstance)
+    (search.mainIndex.getWidgets()[0] as unknown as SearchBoxWidgetInstance)
       .getWidgetRenderState(createRenderOptions())
       .refine('test');
 
@@ -2740,11 +2723,11 @@ describe('getUiState', () => {
 
     search.start();
 
-    (search.mainIndex.getWidgets()[0] as SearchBoxWidgetInstance)
+    (search.mainIndex.getWidgets()[0] as unknown as SearchBoxWidgetInstance)
       .getWidgetRenderState(createRenderOptions())
       .refine('test');
 
-    (search.mainIndex.getWidgets()[1] as PaginationWidgetInstance)
+    (search.mainIndex.getWidgets()[1] as unknown as PaginationWidgetInstance)
       .getWidgetRenderState(createRenderOptions())
       .refine(3);
 
@@ -2776,11 +2759,11 @@ describe('getUiState', () => {
 
     search.start();
 
-    (search.mainIndex.getWidgets()[0] as SearchBoxWidgetInstance)
+    (search.mainIndex.getWidgets()[0] as unknown as SearchBoxWidgetInstance)
       .getWidgetRenderState(createRenderOptions())
       .refine('test');
 
-    (search.mainIndex.getWidgets()[1] as PaginationWidgetInstance)
+    (search.mainIndex.getWidgets()[1] as unknown as PaginationWidgetInstance)
       .getWidgetRenderState(createRenderOptions())
       .refine(3);
 
@@ -3129,7 +3112,7 @@ describe('initialUiState', () => {
       search.start();
       await wait(0);
     })
-      .toWarnDev(`[InstantSearch.js]: The UI state for the index "indexName" is not consistent with the widgets mounted.
+      .toWarnDev(`[InstantSearch]: The UI state for the index "indexName" is not consistent with the widgets mounted.
 
 This can happen when the UI state is specified via \`initialUiState\`, \`routing\` or \`setUiState\` but that the widgets responsible for this state were not added. This results in those query parameters not being sent to the API.
 
diff --git a/packages/instantsearch.js/src/lib/__tests__/server-composition.test.ts b/packages/instantsearch-core/src/__tests__/server-composition.test.ts
similarity index 92%
rename from packages/instantsearch.js/src/lib/__tests__/server-composition.test.ts
rename to packages/instantsearch-core/src/__tests__/server-composition.test.ts
index d49e748f87..3ef9cb154b 100644
--- a/packages/instantsearch.js/src/lib/__tests__/server-composition.test.ts
+++ b/packages/instantsearch-core/src/__tests__/server-composition.test.ts
@@ -3,9 +3,12 @@ import {
   createControlledCompositionClient,
 } from '@instantsearch/mocks';
 
-import { connectConfigure, connectSearchBox } from '../../connectors';
-import instantsearch from '../../index.es';
-import { waitForResults } from '../server';
+import {
+  waitForResults,
+  instantsearch,
+  connectConfigure,
+  connectSearchBox,
+} from '..';
 
 describe('waitForResults', () => {
   test('waits for the results from the search instance', async () => {
diff --git a/packages/instantsearch.js/src/lib/__tests__/server.test.ts b/packages/instantsearch-core/src/__tests__/server.test.ts
similarity index 98%
rename from packages/instantsearch.js/src/lib/__tests__/server.test.ts
rename to packages/instantsearch-core/src/__tests__/server.test.ts
index c3c1e62555..0fac272a8e 100644
--- a/packages/instantsearch.js/src/lib/__tests__/server.test.ts
+++ b/packages/instantsearch-core/src/__tests__/server.test.ts
@@ -4,13 +4,14 @@ import {
 } from '@instantsearch/mocks';
 
 import {
+  getInitialResults,
+  waitForResults,
+  instantsearch,
+  index,
   connectConfigure,
   connectHierarchicalMenu,
   connectSearchBox,
-} from '../../connectors';
-import instantsearch from '../../index.es';
-import { index } from '../../widgets';
-import { getInitialResults, waitForResults } from '../server';
+} from '..';
 
 describe('waitForResults', () => {
   test('waits for the results from the search instance', async () => {
diff --git a/packages/instantsearch.js/src/lib/__tests__/status.test.ts b/packages/instantsearch-core/src/__tests__/status.test.ts
similarity index 97%
rename from packages/instantsearch.js/src/lib/__tests__/status.test.ts
rename to packages/instantsearch-core/src/__tests__/status.test.ts
index a46e8475cd..a5c60a46d9 100644
--- a/packages/instantsearch.js/src/lib/__tests__/status.test.ts
+++ b/packages/instantsearch-core/src/__tests__/status.test.ts
@@ -1,10 +1,10 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
 
-import { connectSearchBox } from '../../connectors';
-import instantsearch from '../../index.es';
+import { connectSearchBox } from '../connectors';
+import { instantsearch } from '../instantsearch';
 
-import type InstantSearch from '../InstantSearch';
+import type { InstantSearch } from '../instantsearch';
 
 function createDelayedSearchClient(timeout: number) {
   const searchClient = createSearchClient();
diff --git a/packages/instantsearch.js/src/connectors/autocomplete/__tests__/connectAutocomplete-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectAutocomplete.test.ts
similarity index 98%
rename from packages/instantsearch.js/src/connectors/autocomplete/__tests__/connectAutocomplete-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectAutocomplete.test.ts
index a0287ce795..c7c636608e 100644
--- a/packages/instantsearch.js/src/connectors/autocomplete/__tests__/connectAutocomplete-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectAutocomplete.test.ts
@@ -9,17 +9,15 @@ import algoliasearchHelper, {
   SearchParameters,
 } from 'algoliasearch-helper';
 
+import { connectAutocomplete, instantsearch, TAG_PLACEHOLDER } from '../..';
 import {
   createInitOptions,
   createRenderOptions,
   createDisposeOptions,
-} from '../../../../test/createWidget';
-import instantsearch from '../../../index.es';
-import { TAG_PLACEHOLDER } from '../../../lib/utils';
-import connectAutocomplete from '../connectAutocomplete';
+} from '../../../test/createWidget';
 
-import type { SearchClient, SearchResponse } from '../../../types';
-import type { AutocompleteRenderState } from '../connectAutocomplete';
+import type { AutocompleteRenderState } from '../..';
+import type { SearchClient, SearchResponse } from '../../types';
 
 describe('connectAutocomplete', () => {
   const getInitializedWidget = (config = {}) => {
@@ -71,7 +69,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/autocomplet
     };
 
     expect(trigger)
-      .toWarnDev(`[InstantSearch.js]: The option \`indices\` has been removed from the Autocomplete connector.
+      .toWarnDev(`[InstantSearch]: The option \`indices\` has been removed from the Autocomplete connector.
 
 The indices to target are now inferred from the widgets tree.
 
diff --git a/packages/instantsearch.js/src/connectors/breadcrumb/__tests__/connectBreadcrumb-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectBreadcrumb.test.ts
similarity index 99%
rename from packages/instantsearch.js/src/connectors/breadcrumb/__tests__/connectBreadcrumb-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectBreadcrumb.test.ts
index 3fd961b82e..111b74c851 100644
--- a/packages/instantsearch.js/src/connectors/breadcrumb/__tests__/connectBreadcrumb-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectBreadcrumb.test.ts
@@ -7,13 +7,12 @@ import algoliasearchHelper, {
   SearchParameters,
 } from 'algoliasearch-helper';
 
+import { connectBreadcrumb, warnCache } from '../..';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
-import { warning } from '../../../lib/utils';
-import connectBreadcrumb from '../connectBreadcrumb';
+} from '../../../test/createWidget';
 
 describe('connectBreadcrumb', () => {
   describe('Usage', () => {
@@ -377,7 +376,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/breadcrumb/
 
   describe('getWidgetSearchParameters', () => {
     beforeEach(() => {
-      warning.cache = {};
+      warnCache.current = {};
     });
 
     it('returns the `SearchParameters` with default value', () => {
diff --git a/packages/instantsearch.js/src/connectors/clear-refinements/__tests__/connectClearRefinements-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectClearRefinements.test.ts
similarity index 99%
rename from packages/instantsearch.js/src/connectors/clear-refinements/__tests__/connectClearRefinements-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectClearRefinements.test.ts
index 105294015d..df58df05e7 100644
--- a/packages/instantsearch.js/src/connectors/clear-refinements/__tests__/connectClearRefinements-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectClearRefinements.test.ts
@@ -4,12 +4,12 @@ import {
 } from '@instantsearch/mocks';
 import algoliasearchHelper, { SearchResults } from 'algoliasearch-helper';
 
+import { connectClearRefinements } from '../..';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
-import connectClearRefinements from '../connectClearRefinements';
+} from '../../../test/createWidget';
 
 describe('connectClearRefinements', () => {
   describe('Usage', () => {
diff --git a/packages/instantsearch.js/src/connectors/configure/__tests__/connectConfigure-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectConfigure.test.ts
similarity index 99%
rename from packages/instantsearch.js/src/connectors/configure/__tests__/connectConfigure-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectConfigure.test.ts
index 9889d0394d..eeeb9064ea 100644
--- a/packages/instantsearch.js/src/connectors/configure/__tests__/connectConfigure-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectConfigure.test.ts
@@ -1,13 +1,12 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import algoliasearchHelper, { SearchParameters } from 'algoliasearch-helper';
 
+import { connectConfigure, noop } from '../..';
 import {
   createInitOptions,
   createRenderOptions,
   createDisposeOptions,
-} from '../../../../test/createWidget';
-import { noop } from '../../../lib/utils';
-import connectConfigure from '../connectConfigure';
+} from '../../../test/createWidget';
 
 import type { AlgoliaSearchHelper } from 'algoliasearch-helper';
 
diff --git a/packages/instantsearch.js/src/connectors/current-refinements/__tests__/connectCurrentRefinements-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectCurrentRefinements.test.ts
similarity index 99%
rename from packages/instantsearch.js/src/connectors/current-refinements/__tests__/connectCurrentRefinements-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectCurrentRefinements.test.ts
index ae2383442b..e57289e6cb 100644
--- a/packages/instantsearch.js/src/connectors/current-refinements/__tests__/connectCurrentRefinements-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectCurrentRefinements.test.ts
@@ -7,12 +7,12 @@ import algoliasearchHelper, {
   SearchParameters,
 } from 'algoliasearch-helper';
 
+import { connectCurrentRefinements } from '../..';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
-import connectCurrentRefinements from '../connectCurrentRefinements';
+} from '../../../test/createWidget';
 
 import type { CurrentRefinementsConnectorParamsItem } from '../connectCurrentRefinements';
 import type { AlgoliaSearchHelper } from 'algoliasearch-helper';
diff --git a/packages/instantsearch.js/src/connectors/dynamic-widgets/__tests__/connectDynamicWidgets-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectDynamicWidgets.test.ts
similarity index 96%
rename from packages/instantsearch.js/src/connectors/dynamic-widgets/__tests__/connectDynamicWidgets-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectDynamicWidgets.test.ts
index 3a22279fb8..00db3fc488 100644
--- a/packages/instantsearch.js/src/connectors/dynamic-widgets/__tests__/connectDynamicWidgets-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectDynamicWidgets.test.ts
@@ -10,17 +10,20 @@ import algoliasearchHelper, {
   SearchResults,
 } from 'algoliasearch-helper';
 
-import { connectMenu, connectDynamicWidgets } from '../..';
+import {
+  connectHierarchicalMenu,
+  connectRefinementList,
+  connectMenu,
+  connectDynamicWidgets,
+  index,
+} from '../..';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
-import { index } from '../../../widgets';
-import connectHierarchicalMenu from '../../hierarchical-menu/connectHierarchicalMenu';
-import connectRefinementList from '../../refinement-list/connectRefinementList';
+} from '../../../test/createWidget';
 
-import type { SearchResponse } from '../../../types/algoliasearch';
+import type { SearchResponse } from '../../types';
 import type { DynamicWidgetsConnectorParams } from '../connectDynamicWidgets';
 
 expect.addSnapshotSerializer(widgetSnapshotSerializer);
@@ -687,7 +690,7 @@ describe('connectDynamicWidgets', () => {
       expect(() =>
         dynamicWidgets.getWidgetRenderState(createRenderOptions())
       ).toWarnDev(
-        '[InstantSearch.js]: More than 20 facets are requested to be displayed without explicitly setting which facets to retrieve. This could have a performance impact. Set "facets" to [] to do two smaller network requests, or explicitly to [\'*\'] to avoid this warning.'
+        '[InstantSearch]: More than 20 facets are requested to be displayed without explicitly setting which facets to retrieve. This could have a performance impact. Set "facets" to [] to do two smaller network requests, or explicitly to [\'*\'] to avoid this warning.'
       );
     });
 
@@ -711,7 +714,7 @@ describe('connectDynamicWidgets', () => {
           })
         )
       ).toWarnDev(
-        '[InstantSearch.js]: The maxValuesPerFacet set by dynamic widgets (20) is smaller than one of the limits set by a widget (100). This causes a mismatch in query parameters and thus an extra network request when that widget is mounted.'
+        '[InstantSearch]: The maxValuesPerFacet set by dynamic widgets (20) is smaller than one of the limits set by a widget (100). This causes a mismatch in query parameters and thus an extra network request when that widget is mounted.'
       );
     });
   });
diff --git a/packages/instantsearch.js/src/connectors/frequently-bought-together/__tests__/connectFrequentlyBoughtTogether-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectFrequentlyBoughtTogether.test.ts
similarity index 95%
rename from packages/instantsearch.js/src/connectors/frequently-bought-together/__tests__/connectFrequentlyBoughtTogether-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectFrequentlyBoughtTogether.test.ts
index 748c998bbf..0d6fce2cbe 100644
--- a/packages/instantsearch.js/src/connectors/frequently-bought-together/__tests__/connectFrequentlyBoughtTogether-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectFrequentlyBoughtTogether.test.ts
@@ -5,11 +5,11 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import algoliasearchHelper, { RecommendParameters } from 'algoliasearch-helper';
 
+import { connectFrequentlyBoughtTogether } from '../..';
 import {
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
-import connectFrequentlyBoughtTogether from '../connectFrequentlyBoughtTogether';
+} from '../../../test/createWidget';
 
 describe('connectFrequentlyBoughtTogether', () => {
   it('throws without render function', () => {
@@ -66,7 +66,7 @@ describe('connectFrequentlyBoughtTogether', () => {
     const helper = algoliasearchHelper(createSearchClient(), '', {});
     helper.search = jest.fn();
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         helper,
         state: helper.state,
@@ -83,7 +83,7 @@ describe('connectFrequentlyBoughtTogether', () => {
       helper,
     });
 
-    widget.render(renderOptions);
+    widget.render!(renderOptions);
 
     expect(renderFn).toHaveBeenCalledTimes(2);
     expect(renderFn).toHaveBeenLastCalledWith(
diff --git a/packages/instantsearch.js/src/connectors/geo-search/__tests__/connectGeoSearch-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectGeoSearch.test.ts
similarity index 96%
rename from packages/instantsearch.js/src/connectors/geo-search/__tests__/connectGeoSearch-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectGeoSearch.test.ts
index 44e949d0bd..7f868e26de 100644
--- a/packages/instantsearch.js/src/connectors/geo-search/__tests__/connectGeoSearch-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectGeoSearch.test.ts
@@ -9,16 +9,15 @@ import algoliasearchHelper, {
   SearchResults,
 } from 'algoliasearch-helper';
 
-import { createInstantSearch } from '../../../../test/createInstantSearch';
+import { connectGeoSearch, instantsearch } from '../..';
+import { createInstantSearch } from '../../../test/createInstantSearch';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
-import instantsearch from '../../../index.es';
-import connectGeoSearch from '../connectGeoSearch';
+} from '../../../test/createWidget';
 
-import type { SearchResponse } from '../../../types';
+import type { SearchResponse } from '../../types';
 
 describe('connectGeoSearch', () => {
   const createFakeHelper = () => {
@@ -37,7 +36,7 @@ describe('connectGeoSearch', () => {
 
     const helper = createFakeHelper();
 
-    widget.init(createInitOptions({ helper }));
+    widget.init!(createInitOptions({ helper }));
 
     const { refine } = widget.getWidgetRenderState(
       createInitOptions({ helper })
@@ -76,7 +75,7 @@ describe('connectGeoSearch', () => {
     const instantSearchInstance = createInstantSearch();
     const helper = instantSearchInstance.mainHelper!;
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         instantSearchInstance,
       })
@@ -88,7 +87,7 @@ describe('connectGeoSearch', () => {
       }),
     ]);
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         instantSearchInstance,
         results,
@@ -163,7 +162,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
     const instantSearchInstance = createInstantSearch();
     const { mainHelper: helper } = instantSearchInstance;
 
-    widget.init(createInitOptions({ instantSearchInstance }));
+    widget.init!(createInitOptions({ instantSearchInstance }));
 
     expect(render).toHaveBeenCalledTimes(1);
     expect(render).toHaveBeenLastCalledWith(
@@ -188,7 +187,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
     expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(false);
     expect(lastRenderArgs(render).isRefinedWithMap()).toBe(false);
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results: new SearchResults(helper!.state, [
           createSingleSearchResponse({
@@ -238,12 +237,12 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
     const helper = createFakeHelper();
 
-    widget.init(createInitOptions());
+    widget.init!(createInitOptions());
 
     expect(render).toHaveBeenCalledTimes(1);
     expect(lastRenderArgs(render).isRefineOnMapMove()).toBe(false);
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results: new SearchResults(helper.state, [
           createSingleSearchResponse({
@@ -266,9 +265,9 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
     const widget = customGeoSearch({});
 
     const helper = createFakeHelper();
-    widget.init(createInitOptions());
+    widget.init!(createInitOptions());
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results: new SearchResults(helper.state, [
           createSingleSearchResponse({
@@ -311,9 +310,9 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
     });
 
     const helper = createFakeHelper();
-    widget.init(createInitOptions());
+    widget.init!(createInitOptions());
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results: new SearchResults(helper.state, [
           createSingleSearchResponse({
@@ -350,7 +349,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
     // Simulate the configuration or external setter
     helper.setQueryParameter('aroundLatLng', '10, 12');
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         helper,
         state: helper.state,
@@ -368,7 +367,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       true
     );
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results: new SearchResults(helper.state, [
           createSingleSearchResponse({
@@ -393,7 +392,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
     // Simulate the configuration or external setter
     helper.setQueryParameter('aroundLatLng', '12, 14');
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results: new SearchResults(helper.state, [
           createSingleSearchResponse({
@@ -428,8 +427,8 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       createSingleSearchResponse(),
     ]);
 
-    widget.init(createInitOptions({ helper, state: helper.state }));
-    widget.render(
+    widget.init!(createInitOptions({ helper, state: helper.state }));
+    widget.render!(
       createRenderOptions({
         results,
         helper,
@@ -473,14 +472,14 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
     helper.setQueryParameter('aroundLatLng', '10,12');
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         state: helper.state,
         helper,
       })
     );
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results,
         helper,
@@ -489,7 +488,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
     lastRenderArgs(render).refine({ northEast, southWest });
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results,
         helper,
@@ -508,7 +507,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
     helper.setQueryParameter('aroundLatLng', '14,16');
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results,
         helper,
@@ -551,14 +550,14 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
     helper.setQueryParameter('aroundLatLng', '10,12');
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         state: helper.state,
         helper,
       })
     );
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results,
         helper,
@@ -567,7 +566,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
     lastRenderArgs(render).refine({ northEast, southWest });
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results,
         helper,
@@ -586,7 +585,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
     helper.setQueryParameter('aroundLatLng', '10,12');
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results,
         helper,
@@ -630,14 +629,14 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
     // @ts-ignore
     helper.setQueryParameter('insideBoundingBox', '10,12,14,16');
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         state: helper.state,
         helper,
       })
     );
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results,
         helper,
@@ -646,7 +645,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
     lastRenderArgs(render).refine({ northEast, southWest });
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results,
         helper,
@@ -665,7 +664,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
     helper.setQueryParameter('insideBoundingBox', undefined);
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results,
         helper,
@@ -709,14 +708,14 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
     // @ts-ignore
     helper.setQueryParameter('insideBoundingBox', '10,12,14,16');
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         state: helper.state,
         helper,
       })
     );
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results,
         helper,
@@ -725,7 +724,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
     lastRenderArgs(render).refine({ northEast, southWest });
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results,
         helper,
@@ -745,7 +744,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
     // @ts-ignore
     helper.setQueryParameter('insideBoundingBox', '12,14,16,18');
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results,
         helper,
@@ -770,7 +769,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       // @ts-ignore
       helper.setQueryParameter('insideBoundingBox', '10,12,12,14');
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           helper,
           state: helper.state,
@@ -790,7 +789,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         },
       });
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           results: new SearchResults(helper.state, [
             createSingleSearchResponse({
@@ -817,7 +816,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       // Simulate the configuration or external setter (like URLSync)
       helper.setQueryParameter('insideBoundingBox', undefined);
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           results: new SearchResults(helper.state, [
             createSingleSearchResponse({
@@ -842,7 +841,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
       helper.setQueryParameter('insideBoundingBox', [[10, 12, 12, 14]]);
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           helper,
           state: helper.state,
@@ -862,7 +861,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         },
       });
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           results: new SearchResults(helper.state, [
             createSingleSearchResponse({
@@ -889,7 +888,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       // Simulate the configuration or external setter (like URLSync)
       helper.setQueryParameter('insideBoundingBox', undefined);
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           results: new SearchResults(helper.state, [
             createSingleSearchResponse({
@@ -931,7 +930,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         }),
       ]);
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           state: helper.state,
           helper,
@@ -946,7 +945,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
       lastRenderArgs(render).refine({ northEast, southWest });
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           results,
           helper,
@@ -985,14 +984,14 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         }),
       ]);
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           state: helper.state,
           helper,
         })
       );
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           results,
           helper,
@@ -1007,7 +1006,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
       lastRenderArgs(render).refine({ northEast, southWest });
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           results,
           helper,
@@ -1048,7 +1047,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         }),
       ]);
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           state: helper.state,
           helper,
@@ -1063,7 +1062,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
       lastRenderArgs(render).refine({ northEast, southWest });
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           results,
           helper,
@@ -1078,7 +1077,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
       lastRenderArgs(render).clearMapRefinement();
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           results,
           helper,
@@ -1117,14 +1116,14 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         }),
       ]);
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           state: helper.state,
           helper,
         })
       );
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           results,
           helper,
@@ -1139,7 +1138,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
       lastRenderArgs(render).refine({ northEast, southWest });
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           results,
           helper,
@@ -1154,7 +1153,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
       lastRenderArgs(render).clearMapRefinement();
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           results,
           helper,
@@ -1179,7 +1178,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
       const helper = createFakeHelper();
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           state: helper.state,
           helper,
@@ -1194,7 +1193,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       expect(render).toHaveBeenCalledTimes(1);
       expect(lastRenderArgs(render).isRefineOnMapMove()).toBe(false);
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           results: new SearchResults(helper.state, [
             createSingleSearchResponse({
@@ -1221,14 +1220,14 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
       const helper = createFakeHelper();
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           state: helper.state,
           helper,
         })
       );
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           results: new SearchResults(helper.state, [
             createSingleSearchResponse({
@@ -1260,7 +1259,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       const customGeoSearch = connectGeoSearch(render, unmount);
       const widget = customGeoSearch({});
 
-      widget.init(createInitOptions());
+      widget.init!(createInitOptions());
 
       expect(render).toHaveBeenCalledTimes(1);
       expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(false);
@@ -1270,7 +1269,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       expect(render).toHaveBeenCalledTimes(1);
       expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(true);
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           results: new SearchResults(createFakeHelper().state, [
             createSingleSearchResponse({
@@ -1304,14 +1303,14 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         ),
       ]);
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           state: helper.state,
           helper,
         })
       );
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           results,
           helper,
@@ -1347,14 +1346,14 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         ),
       ]);
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           state: helper.state,
           helper,
         })
       );
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           results,
           helper,
@@ -1393,7 +1392,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
       const expectation = new SearchParameters({ index: '' });
 
-      const actual = widget.dispose(
+      const actual = widget.dispose!(
         createDisposeOptions({ state: helper.state })
       );
 
@@ -1405,7 +1404,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       const render = () => {};
       const customGeoSearch = connectGeoSearch(render);
       const widget = customGeoSearch({});
-      expect(() => widget.dispose(createDisposeOptions())).not.toThrow();
+      expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
     });
   });
 
diff --git a/packages/instantsearch.js/src/connectors/hierarchical-menu/__tests__/connectHierarchicalMenu-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectHierarchicalMenu.test.ts
similarity index 99%
rename from packages/instantsearch.js/src/connectors/hierarchical-menu/__tests__/connectHierarchicalMenu-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectHierarchicalMenu.test.ts
index 109db9d173..839b726d93 100644
--- a/packages/instantsearch.js/src/connectors/hierarchical-menu/__tests__/connectHierarchicalMenu-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectHierarchicalMenu.test.ts
@@ -7,14 +7,13 @@ import algoliasearchHelper, {
   SearchParameters,
 } from 'algoliasearch-helper';
 
-import { createInstantSearch } from '../../../../test/createInstantSearch';
+import { connectHierarchicalMenu, warnCache } from '../..';
+import { createInstantSearch } from '../../../test/createInstantSearch';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
-import { warning } from '../../../lib/utils';
-import connectHierarchicalMenu from '../connectHierarchicalMenu';
+} from '../../../test/createWidget';
 
 describe('connectHierarchicalMenu', () => {
   describe('Usage', () => {
@@ -1121,7 +1120,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hierarchica
 
   describe('getWidgetSearchParameters', () => {
     beforeEach(() => {
-      warning.cache = {};
+      warnCache.current = {};
     });
 
     test('returns the `SearchParameters` with the default value', () => {
diff --git a/packages/instantsearch.js/src/connectors/hits/__tests__/connectHits-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectHits.test.ts
similarity index 94%
rename from packages/instantsearch.js/src/connectors/hits/__tests__/connectHits-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectHits.test.ts
index 6185e2055a..71f1b26fbe 100644
--- a/packages/instantsearch.js/src/connectors/hits/__tests__/connectHits-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectHits.test.ts
@@ -13,24 +13,23 @@ import algoliasearchHelper, {
   SearchResults,
 } from 'algoliasearch-helper';
 
-import { createInstantSearch } from '../../../../test/createInstantSearch';
+import { connectHits, instantsearch, TAG_PLACEHOLDER } from '../..';
+import { createInstantSearch } from '../../../test/createInstantSearch';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
-import instantsearch from '../../../index.es';
-import { TAG_PLACEHOLDER, deserializePayload } from '../../../lib/utils';
-import connectHits from '../connectHits';
+} from '../../../test/createWidget';
+import { deserializePayload } from '../../lib/utils';
 
 import type {
   EscapedHits,
   Hit,
   HitAttributeHighlightResult,
   SearchResponse,
-} from '../../../types';
+} from '../../types';
 
-jest.mock('../../../lib/utils/hits-absolute-position', () => ({
+jest.mock('../../lib/utils/addAbsolutePosition', () => ({
   // The real implementation creates a new array instance, which can cause bugs,
   // especially with the __escaped mark, we thus make sure the mock also has the
   // same behavior regarding the array.
@@ -77,7 +76,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
     const helper = algoliasearchHelper(createSearchClient(), '', {});
     helper.search = jest.fn();
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         helper,
         state: helper.state,
@@ -90,7 +89,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
       true
     );
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results: new SearchResults(helper.state, [
           createSingleSearchResponse({ hits: [] }),
@@ -115,7 +114,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
     const helper = algoliasearchHelper(createSearchClient(), '', {});
     helper.search = jest.fn();
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         helper,
         state: helper.state,
@@ -138,7 +137,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
     const results = new SearchResults(helper.state, [
       createSingleSearchResponse({ hits }),
     ]);
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results,
         state: helper.state,
@@ -163,7 +162,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
     const helper = algoliasearchHelper(createSearchClient(), '', {});
     helper.search = jest.fn();
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         helper,
         state: helper.state,
@@ -196,7 +195,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
         })
       ),
     ]);
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results,
         state: helper.state,
@@ -237,7 +236,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
     const helper = algoliasearchHelper(createSearchClient(), '', {});
     helper.search = jest.fn();
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         helper,
         state: helper.state,
@@ -258,7 +257,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
     const results = new SearchResults(helper.state, [
       createSingleSearchResponse({ hits }),
     ]);
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results,
         state: helper.state,
@@ -293,8 +292,8 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
       createSingleSearchResponse(),
     ]);
 
-    widget.init(createInitOptions({ helper, state: helper.state }));
-    widget.render(
+    widget.init!(createInitOptions({ helper, state: helper.state }));
+    widget.render!(
       createRenderOptions({
         results,
         helper,
@@ -316,7 +315,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
     const helper = algoliasearchHelper(createSearchClient(), '', {});
     helper.search = jest.fn();
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         helper,
         state: helper.state,
@@ -331,7 +330,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
     const results = new SearchResults(helper.state, [
       createSingleSearchResponse({ hits, queryID: 'theQueryID' }),
     ]);
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results,
         state: helper.state,
@@ -380,7 +379,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
     const helper = algoliasearchHelper(createSearchClient(), '', {});
     helper.search = jest.fn();
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         helper,
         state: helper.state,
@@ -416,7 +415,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
       createSingleSearchResponse({ hits }),
     ]);
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results,
         state: helper.state,
@@ -467,7 +466,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
     const helper = algoliasearchHelper(createSearchClient(), '', {});
     helper.search = jest.fn();
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         helper,
         state: helper.state,
@@ -480,7 +479,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
       }),
     ]);
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results,
         state: helper.state,
@@ -625,7 +624,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
       const makeWidget = connectHits(render);
       const widget = makeWidget({});
 
-      const actual = widget.getWidgetSearchParameters(new SearchParameters(), {
+      const actual = widget.getWidgetSearchParameters!(new SearchParameters(), {
         uiState: {},
       });
 
@@ -639,7 +638,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
         escapeHTML: false,
       });
 
-      const actual = widget.getWidgetSearchParameters(new SearchParameters(), {
+      const actual = widget.getWidgetSearchParameters!(new SearchParameters(), {
         uiState: {},
       });
 
@@ -658,7 +657,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
 
       expect(unmountFn).toHaveBeenCalledTimes(0);
 
-      widget.dispose(createDisposeOptions({ helper, state: helper.state }));
+      widget.dispose!(createDisposeOptions({ helper, state: helper.state }));
 
       expect(unmountFn).toHaveBeenCalledTimes(1);
     });
@@ -671,7 +670,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
       const widget = makeWidget({});
 
       expect(() =>
-        widget.dispose(createDisposeOptions({ helper, state: helper.state }))
+        widget.dispose!(createDisposeOptions({ helper, state: helper.state }))
       ).not.toThrow();
     });
 
@@ -692,15 +691,15 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
         TAG_PLACEHOLDER.highlightPostTag
       );
 
-      const nextState = widget.dispose(
+      const nextState = widget.dispose!(
         createDisposeOptions({
           helper,
           state: helper.state,
         })
       );
 
-      expect(nextState.highlightPreTag).toBeUndefined();
-      expect(nextState.highlightPostTag).toBeUndefined();
+      expect((nextState as SearchParameters).highlightPreTag).toBeUndefined();
+      expect((nextState as SearchParameters).highlightPostTag).toBeUndefined();
     });
 
     it('does not remove the TAG_PLACEHOLDER from the `SearchParameters` with `escapeHTML` disabled', () => {
@@ -718,15 +717,15 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
       expect(helper.state.highlightPreTag).toBe('<mark>');
       expect(helper.state.highlightPostTag).toBe('</mark>');
 
-      const nextState = widget.dispose(
+      const nextState = widget.dispose!(
         createDisposeOptions({
           helper,
           state: helper.state,
         })
       );
 
-      expect(nextState.highlightPreTag).toBe('<mark>');
-      expect(nextState.highlightPostTag).toBe('</mark>');
+      expect((nextState as SearchParameters).highlightPreTag).toBe('<mark>');
+      expect((nextState as SearchParameters).highlightPostTag).toBe('</mark>');
     });
   });
 
@@ -744,7 +743,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
         state: helper.state,
       });
       const instantSearchInstance = initOptions.instantSearchInstance;
-      widget.init(initOptions);
+      widget.init!(initOptions);
 
       const hits = [
         {
@@ -764,7 +763,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
       const results = new SearchResults(helper.state, [
         createSingleSearchResponse({ hits }),
       ]);
-      widget.render(
+      widget.render!(
         createRenderOptions({
           results,
           state: helper.state,
@@ -786,7 +785,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
             sendEventToInsights: jest.fn(),
           });
 
-          widget.init(
+          widget.init!(
             createInitOptions({
               instantSearchInstance,
             })
@@ -815,7 +814,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
             createSingleSearchResponse({ hits }),
           ]);
 
-          widget.render(
+          widget.render!(
             createRenderOptions({
               instantSearchInstance,
               results,
@@ -926,7 +925,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
           });
           const instantSearchInstance = initOptions.instantSearchInstance;
           instantSearchInstance.sendEventToInsights = jest.fn();
-          widget.init(initOptions);
+          widget.init!(initOptions);
 
           const hits = [
             {
@@ -941,7 +940,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
             createSingleSearchResponse({ hits }),
           ]);
 
-          widget.render(
+          widget.render!(
             createRenderOptions({
               results,
               state: helper.state,
diff --git a/packages/instantsearch.js/src/connectors/hits-per-page/__tests__/connectHitsPerPage-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectHitsPerPage.test.ts
similarity index 99%
rename from packages/instantsearch.js/src/connectors/hits-per-page/__tests__/connectHitsPerPage-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectHitsPerPage.test.ts
index 1c5bc0d3c5..3b2bc06ef5 100644
--- a/packages/instantsearch.js/src/connectors/hits-per-page/__tests__/connectHitsPerPage-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectHitsPerPage.test.ts
@@ -12,7 +12,7 @@ import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
+} from '../../../test/createWidget';
 
 import type { HitsPerPageConnectorParams } from '../connectHitsPerPage';
 
@@ -97,7 +97,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits-per-pa
           })
         );
       })
-        .toWarnDev(`[InstantSearch.js]: The \`items\` option of \`hitsPerPage\` does not contain the "hits per page" value coming from the state: undefined.
+        .toWarnDev(`[InstantSearch]: The \`items\` option of \`hitsPerPage\` does not contain the "hits per page" value coming from the state: undefined.
 
 You may want to add another entry to the \`items\` option with this value.`);
     });
diff --git a/packages/instantsearch.js/src/connectors/infinite-hits/__tests__/connectInfiniteHits-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectInfiniteHits.test.ts
similarity index 96%
rename from packages/instantsearch.js/src/connectors/infinite-hits/__tests__/connectInfiniteHits-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectInfiniteHits.test.ts
index ac1a2f0e30..861d77a3cc 100644
--- a/packages/instantsearch.js/src/connectors/infinite-hits/__tests__/connectInfiniteHits-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectInfiniteHits.test.ts
@@ -10,16 +10,15 @@ import {
 import { wait } from '@instantsearch/testutils/wait';
 import algoliasearchHelper, { SearchResults } from 'algoliasearch-helper';
 
-import { createInstantSearch } from '../../../../test/createInstantSearch';
+import { connectInfiniteHits, instantsearch, TAG_PLACEHOLDER } from '../..';
+import { createInstantSearch } from '../../../test/createInstantSearch';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
-import instantsearch from '../../../index.es';
-import { createInfiniteHitsSessionStorageCache } from '../../../lib/infiniteHitsCache';
-import { TAG_PLACEHOLDER, deserializePayload } from '../../../lib/utils';
-import connectInfiniteHits from '../connectInfiniteHits';
+} from '../../../test/createWidget';
+import { createInfiniteHitsSessionStorageCache } from '../../lib/infiniteHitsCache';
+import { deserializePayload } from '../../lib/utils';
 
 import type {
   SearchClient,
@@ -27,9 +26,10 @@ import type {
   Hit,
   EscapedHits,
   SearchResponse,
-} from '../../../types';
+} from '../../types';
+import type { SearchParameters } from 'algoliasearch-helper';
 
-jest.mock('../../../lib/utils/hits-absolute-position', () => ({
+jest.mock('../../lib/utils/addAbsolutePosition', () => ({
   // The real implementation creates a new array instance, which can cause bugs,
   // especially with the __escaped mark, we thus make sure the mock also has the
   // same behavior regarding the array.
@@ -94,7 +94,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     const helper = algoliasearchHelper({} as SearchClient, '', {});
     helper.search = jest.fn();
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         instantSearchInstance,
         state: helper.state,
@@ -119,7 +119,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       true
     );
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results: new SearchResults(helper.state, [
           createSingleSearchResponse({ hits: [] }),
@@ -156,7 +156,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     const helper = algoliasearchHelper({} as SearchClient, '', {});
     helper.search = jest.fn();
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         state: helper.state,
         helper,
@@ -175,7 +175,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       createSingleSearchResponse({ hits }),
     ]);
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         state: helper.state,
         results,
@@ -199,7 +199,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       createSingleSearchResponse({ hits: otherHits }),
     ]);
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results: otherResults,
         state: helper.state,
@@ -223,7 +223,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     helper.searchWithoutTriggeringOnStateChange = jest.fn();
     helper.emit = jest.fn();
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         state: helper.state,
         helper,
@@ -242,7 +242,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       createSingleSearchResponse({ hits }),
     ]);
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         state: helper.state,
         results,
@@ -271,7 +271,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       createSingleSearchResponse({ hits: previousHits }),
     ]);
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results: previousResults,
         state: helper.state,
@@ -294,7 +294,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     helper.overrideStateWithoutTriggeringChangeEvent = jest.fn(() => helper);
     helper.searchWithoutTriggeringOnStateChange = jest.fn();
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         state: helper.state,
         helper,
@@ -324,7 +324,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     const helper = algoliasearchHelper({} as SearchClient, '', {});
     helper.search = jest.fn();
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         state: helper.state,
         helper,
@@ -343,7 +343,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       createSingleSearchResponse({ hits }),
     ]);
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         state: helper.state,
         results,
@@ -366,7 +366,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       createSingleSearchResponse({ hits: otherHits }),
     ]);
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results: otherResults,
         state: helper.state,
@@ -388,14 +388,14 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     });
     helper.search = jest.fn();
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         state: helper.state,
         helper,
       })
     );
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         state: helper.state,
         results: new SearchResults(helper.state, [
@@ -410,7 +410,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     );
 
     renderFn.mock.calls[1][0].showMore();
-    widget.render(
+    widget.render!(
       createRenderOptions({
         state: helper.state,
         results: new SearchResults(helper.state, [
@@ -426,7 +426,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     expect(helper.state.page).toEqual(1);
 
     renderFn.mock.calls[2][0].showMore();
-    widget.render(
+    widget.render!(
       createRenderOptions({
         state: helper.state,
         results: new SearchResults(helper.state, [
@@ -442,7 +442,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     expect(helper.state.page).toEqual(2);
 
     helper.setPage(0);
-    widget.render(
+    widget.render!(
       createRenderOptions({
         state: helper.state,
         results: new SearchResults(helper.state, [
@@ -473,7 +473,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     const helper = algoliasearchHelper({} as SearchClient, '', {});
     helper.search = jest.fn();
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         state: helper.state,
         helper,
@@ -502,7 +502,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       createSingleSearchResponse({ hits }),
     ]);
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         state: helper.state,
         results,
@@ -541,7 +541,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     const helper = algoliasearchHelper({} as SearchClient, '', {});
     helper.search = jest.fn();
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         state: helper.state,
         helper,
@@ -567,7 +567,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       createSingleSearchResponse({ hits }),
     ]);
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         state: helper.state,
         results,
@@ -603,8 +603,8 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       createSingleSearchResponse(),
     ]);
 
-    widget.init(createInitOptions({ helper, state: helper.state }));
-    widget.render(
+    widget.init!(createInitOptions({ helper, state: helper.state }));
+    widget.render!(
       createRenderOptions({
         results,
         helper,
@@ -637,7 +637,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     const helper = algoliasearchHelper({} as SearchClient, '', {});
     helper.search = jest.fn();
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         state: helper.state,
         helper,
@@ -673,7 +673,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       createSingleSearchResponse({ hits }),
     ]);
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         state: helper.state,
         results,
@@ -722,7 +722,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     const helper = algoliasearchHelper({} as SearchClient, '', {});
     helper.search = jest.fn();
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         state: helper.state,
         helper,
@@ -744,7 +744,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       createSingleSearchResponse({ hits, queryID: 'theQueryID' }),
     ]);
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         state: helper.state,
         results,
@@ -780,14 +780,14 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     const helper = algoliasearchHelper({} as SearchClient, '', {});
     helper.search = jest.fn();
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         state: helper.state,
         helper,
       })
     );
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results: new SearchResults(helper.state, [
           createSingleSearchResponse({
@@ -803,7 +803,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
 
     helper.setPage(1);
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results: new SearchResults(helper.state, [
           createSingleSearchResponse({
@@ -825,7 +825,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       false
     );
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         results: new SearchResults(helper.state, [
           createSingleSearchResponse({
@@ -858,7 +858,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
 
     createInitOptions();
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         state: helper.state,
         helper,
@@ -871,7 +871,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       }),
     ]);
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         state: helper.state,
         results,
@@ -905,7 +905,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
         instantSearchInstance,
       });
 
-      widget.init(initOptions);
+      widget.init!(initOptions);
 
       const renderWidget = (
         args: Partial<ReturnType<typeof createRenderOptions>>
@@ -917,7 +917,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
           ...args,
         });
 
-        widget.render(renderOptions);
+        widget.render!(renderOptions);
       };
       return { helper, renderFn, renderWidget };
     }
@@ -1020,7 +1020,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
         instantSearchInstance,
       });
 
-      widget.init(initOptions);
+      widget.init!(initOptions);
 
       const renderWidget = (
         args: Partial<ReturnType<typeof createRenderOptions>>
@@ -1032,7 +1032,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
           ...args,
         });
 
-        widget.render(renderOptions);
+        widget.render!(renderOptions);
       };
       return { helper, renderFn, renderWidget };
     }
@@ -1126,7 +1126,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
 
       expect(unmountFn).toHaveBeenCalledTimes(0);
 
-      widget.dispose(createDisposeOptions({ helper, state: helper.state }));
+      widget.dispose!(createDisposeOptions({ helper, state: helper.state }));
 
       expect(unmountFn).toHaveBeenCalledTimes(1);
     });
@@ -1139,7 +1139,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       const widget = makeWidget({});
 
       expect(() =>
-        widget.dispose(createDisposeOptions({ helper, state: helper.state }))
+        widget.dispose!(createDisposeOptions({ helper, state: helper.state }))
       ).not.toThrow();
     });
 
@@ -1160,15 +1160,15 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
         TAG_PLACEHOLDER.highlightPostTag
       );
 
-      const nextState = widget.dispose(
+      const nextState = widget.dispose!(
         createDisposeOptions({
           helper,
           state: helper.state,
         })
       );
 
-      expect(nextState.highlightPreTag).toBeUndefined();
-      expect(nextState.highlightPostTag).toBeUndefined();
+      expect((nextState as SearchParameters).highlightPreTag).toBeUndefined();
+      expect((nextState as SearchParameters).highlightPostTag).toBeUndefined();
     });
 
     it('does not remove the TAG_PLACEHOLDER from the `SearchParameters` with `escapeHTML` disabled', () => {
@@ -1186,15 +1186,15 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       expect(helper.state.highlightPreTag).toBe('<mark>');
       expect(helper.state.highlightPostTag).toBe('</mark>');
 
-      const nextState = widget.dispose(
+      const nextState = widget.dispose!(
         createDisposeOptions({
           helper,
           state: helper.state,
         })
       );
 
-      expect(nextState.highlightPreTag).toBe('<mark>');
-      expect(nextState.highlightPostTag).toBe('</mark>');
+      expect((nextState as SearchParameters).highlightPreTag).toBe('<mark>');
+      expect((nextState as SearchParameters).highlightPostTag).toBe('</mark>');
     });
 
     it('removes the `page` from the `SearchParameters`', () => {
@@ -1208,14 +1208,14 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
 
       expect(helper.state.page).toBe(5);
 
-      const nextState = widget.dispose(
+      const nextState = widget.dispose!(
         createDisposeOptions({
           helper,
           state: helper.state,
         })
       );
 
-      expect(nextState.page).toBeUndefined();
+      expect((nextState as SearchParameters).page).toBeUndefined();
     });
   });
 
@@ -1623,7 +1623,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
         state: helper.state,
       });
       const instantSearchInstance = initOptions.instantSearchInstance;
-      widget.init(initOptions);
+      widget.init!(initOptions);
 
       const hits = [
         {
@@ -1643,7 +1643,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       const results = new SearchResults(helper.state, [
         createSingleSearchResponse({ hits }),
       ]);
-      widget.render(
+      widget.render!(
         createRenderOptions({
           results,
           state: helper.state,
@@ -1762,7 +1762,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
           });
           const instantSearchInstance = initOptions.instantSearchInstance;
           instantSearchInstance.sendEventToInsights = jest.fn();
-          widget.init(initOptions);
+          widget.init!(initOptions);
 
           const hits = [
             {
@@ -1777,7 +1777,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
             createSingleSearchResponse({ hits }),
           ]);
 
-          widget.render(
+          widget.render!(
             createRenderOptions({
               results,
               state: helper.state,
diff --git a/packages/instantsearch.js/src/connectors/looking-similar/__tests__/connectLookingSimilar-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectLookingSimilar.test.ts
similarity index 95%
rename from packages/instantsearch.js/src/connectors/looking-similar/__tests__/connectLookingSimilar-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectLookingSimilar.test.ts
index 2898a6e451..80eae3c1d8 100644
--- a/packages/instantsearch.js/src/connectors/looking-similar/__tests__/connectLookingSimilar-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectLookingSimilar.test.ts
@@ -5,11 +5,11 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import algoliasearchHelper, { RecommendParameters } from 'algoliasearch-helper';
 
+import { connectLookingSimilar } from '../..';
 import {
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
-import connectLookingSimilar from '../connectLookingSimilar';
+} from '../../../test/createWidget';
 
 describe('connectLookingSimilar', () => {
   it('throws without render function', () => {
@@ -66,7 +66,7 @@ describe('connectLookingSimilar', () => {
     const helper = algoliasearchHelper(createSearchClient(), '', {});
     helper.search = jest.fn();
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         helper,
         state: helper.state,
@@ -83,7 +83,7 @@ describe('connectLookingSimilar', () => {
       helper,
     });
 
-    widget.render(renderOptions);
+    widget.render!(renderOptions);
 
     expect(renderFn).toHaveBeenCalledTimes(2);
     expect(renderFn).toHaveBeenLastCalledWith(
diff --git a/packages/instantsearch.js/src/connectors/menu/__tests__/connectMenu-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectMenu.test.ts
similarity index 98%
rename from packages/instantsearch.js/src/connectors/menu/__tests__/connectMenu-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectMenu.test.ts
index 4a6af23a3c..70785e60f6 100644
--- a/packages/instantsearch.js/src/connectors/menu/__tests__/connectMenu-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectMenu.test.ts
@@ -7,29 +7,19 @@ import jsHelper, {
   SearchParameters,
 } from 'algoliasearch-helper';
 
-import { createInstantSearch } from '../../../../test/createInstantSearch';
+import { connectMenu, warnCache } from '../..';
+import { createInstantSearch } from '../../../test/createInstantSearch';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
-import { warning } from '../../../lib/utils';
-import connectMenu from '../connectMenu';
+} from '../../../test/createWidget';
 
-import type { WidgetFactory } from '../../../types';
-import type {
-  MenuConnectorParams,
-  MenuRenderState,
-  MenuWidgetDescription,
-} from '../connectMenu';
+import type { MenuRenderState, MenuConnector } from '../..';
 
 describe('connectMenu', () => {
   let rendering: jest.Mock<any, [MenuRenderState, boolean]>;
-  let makeWidget: WidgetFactory<
-    MenuWidgetDescription,
-    MenuConnectorParams,
-    MenuConnectorParams
-  >;
+  let makeWidget: ReturnType<MenuConnector>;
 
   beforeEach(() => {
     rendering = jest.fn();
@@ -1428,7 +1418,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/menu/js/#co
 
     describe('warns when attribute is used for conjunctive/disjunctive faceting', () => {
       beforeEach(() => {
-        warning.cache = {};
+        warnCache.current = {};
       });
 
       it('warns when attribute is used for conjunctive faceting and does not change `SearchParameters`', () => {
diff --git a/packages/instantsearch.js/src/connectors/numeric-menu/__tests__/connectNumericMenu-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectNumericMenu.test.ts
similarity index 99%
rename from packages/instantsearch.js/src/connectors/numeric-menu/__tests__/connectNumericMenu-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectNumericMenu.test.ts
index a01dbec783..5a72026e1c 100644
--- a/packages/instantsearch.js/src/connectors/numeric-menu/__tests__/connectNumericMenu-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectNumericMenu.test.ts
@@ -11,12 +11,12 @@ import jsHelper, {
   SearchParameters,
 } from 'algoliasearch-helper';
 
+import { connectNumericMenu } from '../..';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
-import connectNumericMenu from '../connectNumericMenu';
+} from '../../../test/createWidget';
 
 import type {
   NumericMenuConnectorParamsItem,
diff --git a/packages/instantsearch.js/src/connectors/pagination/__tests__/connectPagination-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectPagination.test.ts
similarity index 99%
rename from packages/instantsearch.js/src/connectors/pagination/__tests__/connectPagination-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectPagination.test.ts
index 1e703c2f66..e6dbd384b1 100644
--- a/packages/instantsearch.js/src/connectors/pagination/__tests__/connectPagination-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectPagination.test.ts
@@ -7,12 +7,12 @@ import algoliasearchHelper, {
   SearchParameters,
 } from 'algoliasearch-helper';
 
+import { connectPagination } from '../..';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
-import connectPagination from '../connectPagination';
+} from '../../../test/createWidget';
 
 import type {
   PaginationConnectorParams,
diff --git a/packages/instantsearch.js/src/connectors/powered-by/__tests__/connectPoweredBy-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectPoweredBy.test.ts
similarity index 98%
rename from packages/instantsearch.js/src/connectors/powered-by/__tests__/connectPoweredBy-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectPoweredBy.test.ts
index 68bda8b5c8..cdf1ef1ce2 100644
--- a/packages/instantsearch.js/src/connectors/powered-by/__tests__/connectPoweredBy-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectPoweredBy.test.ts
@@ -5,12 +5,12 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import jsHelper from 'algoliasearch-helper';
 
+import { connectPoweredBy } from '../..';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
-import connectPoweredBy from '../connectPoweredBy';
+} from '../../../test/createWidget';
 
 describe('connectPoweredBy', () => {
   it('throws without rendering function', () => {
diff --git a/packages/instantsearch.js/src/connectors/query-rules/__tests__/connectQueryRules-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectQueryRules.test.ts
similarity index 98%
rename from packages/instantsearch.js/src/connectors/query-rules/__tests__/connectQueryRules-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectQueryRules.test.ts
index d88ff0e893..6a4a5867f2 100644
--- a/packages/instantsearch.js/src/connectors/query-rules/__tests__/connectQueryRules-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectQueryRules.test.ts
@@ -7,15 +7,15 @@ import algoliasearchHelper, {
   SearchParameters,
 } from 'algoliasearch-helper';
 
-import { createInstantSearch } from '../../../../test/createInstantSearch';
+import { connectQueryRules } from '../..';
+import { createInstantSearch } from '../../../test/createInstantSearch';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
-import connectQueryRules from '../connectQueryRules';
+} from '../../../test/createWidget';
 
-import type { TransformItems } from '../../../types';
+import type { TransformItems } from '../../types';
 import type { AlgoliaSearchHelper as Helper } from 'algoliasearch-helper';
 
 describe('connectQueryRules', () => {
@@ -876,7 +876,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/query-rules
             },
           });
         })
-          .toWarnDev(`[InstantSearch.js]: The maximum number of \`ruleContexts\` is 10. They have been sliced to that limit.
+          .toWarnDev(`[InstantSearch]: The maximum number of \`ruleContexts\` is 10. They have been sliced to that limit.
 Consider using \`transformRuleContexts\` to minimize the number of rules sent to Algolia.`);
 
         widget.render!(
diff --git a/packages/instantsearch.js/src/connectors/range/__tests__/connectRange-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectRange.test.ts
similarity index 99%
rename from packages/instantsearch.js/src/connectors/range/__tests__/connectRange-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectRange.test.ts
index 2fec3360d0..ec8701b910 100644
--- a/packages/instantsearch.js/src/connectors/range/__tests__/connectRange-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectRange.test.ts
@@ -7,14 +7,13 @@ import jsHelper, {
   SearchParameters,
 } from 'algoliasearch-helper';
 
-import instantsearch from '../../..';
-import { createInstantSearch } from '../../../../test/createInstantSearch';
+import { connectRange, instantsearch } from '../..';
+import { createInstantSearch } from '../../../test/createInstantSearch';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
-import connectRange from '../connectRange';
+} from '../../../test/createWidget';
 
 import type { AlgoliaSearchHelper } from 'algoliasearch-helper';
 
diff --git a/packages/instantsearch.js/src/connectors/rating-menu/__tests__/connectRatingMenu-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectRatingMenu.test.ts
similarity index 99%
rename from packages/instantsearch.js/src/connectors/rating-menu/__tests__/connectRatingMenu-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectRatingMenu.test.ts
index b41b9de2b8..0e95d40c58 100644
--- a/packages/instantsearch.js/src/connectors/rating-menu/__tests__/connectRatingMenu-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectRatingMenu.test.ts
@@ -7,13 +7,13 @@ import jsHelper, {
   SearchParameters,
 } from 'algoliasearch-helper';
 
-import { createInstantSearch } from '../../../../test/createInstantSearch';
+import { connectRatingMenu } from '../..';
+import { createInstantSearch } from '../../../test/createInstantSearch';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
-import connectRatingMenu from '../connectRatingMenu';
+} from '../../../test/createWidget';
 
 describe('connectRatingMenu', () => {
   const getInitializedWidget = (config = {}, unmount = () => {}) => {
diff --git a/packages/instantsearch.js/src/connectors/refinement-list/__tests__/connectRefinementList-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectRefinementList.test.ts
similarity index 99%
rename from packages/instantsearch.js/src/connectors/refinement-list/__tests__/connectRefinementList-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectRefinementList.test.ts
index 6d396d715a..a4630eb9ef 100644
--- a/packages/instantsearch.js/src/connectors/refinement-list/__tests__/connectRefinementList-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectRefinementList.test.ts
@@ -8,14 +8,13 @@ import jsHelper, {
   SearchParameters,
 } from 'algoliasearch-helper';
 
-import { createInstantSearch } from '../../../../test/createInstantSearch';
+import { connectRefinementList, TAG_PLACEHOLDER, warnCache } from '../..';
+import { createInstantSearch } from '../../../test/createInstantSearch';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
-import { TAG_PLACEHOLDER, warning } from '../../../lib/utils';
-import connectRefinementList from '../connectRefinementList';
+} from '../../../test/createWidget';
 
 describe('connectRefinementList', () => {
   const createWidgetFactory = () => {
@@ -3083,7 +3082,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       });
 
       test('returns the `SearchParameters` untouched and warns when attribute is used for disjunctive faceting', () => {
-        warning.cache = {};
+        warnCache.current = {};
         const render = () => {};
         const makeWidget = connectRefinementList(render);
         const helper = jsHelper(createSearchClient(), '', {
@@ -3197,7 +3196,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       });
 
       test('returns the `SearchParameters` untouched and warns when attribute is used for conjunctive faceting', () => {
-        warning.cache = {};
+        warnCache.current = {};
         const render = () => {};
         const makeWidget = connectRefinementList(render);
         const helper = jsHelper(createSearchClient(), '', {
@@ -3217,7 +3216,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
     });
 
     test('warns when attribute is used for hierarchical faceting and does not change `SearchParameters`', () => {
-      warning.cache = {};
+      warnCache.current = {};
       const helper = jsHelper(createSearchClient(), '', {
         hierarchicalFacets: [{ name: 'brand', attributes: ['brand'] }],
       });
diff --git a/packages/instantsearch.js/src/connectors/related-products/__tests__/connectRelatedProducts-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectRelatedProducts.test.ts
similarity index 95%
rename from packages/instantsearch.js/src/connectors/related-products/__tests__/connectRelatedProducts-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectRelatedProducts.test.ts
index bea1e92fe5..87dafe09eb 100644
--- a/packages/instantsearch.js/src/connectors/related-products/__tests__/connectRelatedProducts-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectRelatedProducts.test.ts
@@ -5,11 +5,11 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import algoliasearchHelper, { RecommendParameters } from 'algoliasearch-helper';
 
+import { connectRelatedProducts } from '../..';
 import {
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
-import connectRelatedProducts from '../connectRelatedProducts';
+} from '../../../test/createWidget';
 
 describe('connectRelatedProducts', () => {
   it('throws without render function', () => {
@@ -66,7 +66,7 @@ describe('connectRelatedProducts', () => {
     const helper = algoliasearchHelper(createSearchClient(), '', {});
     helper.search = jest.fn();
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         helper,
         state: helper.state,
@@ -83,7 +83,7 @@ describe('connectRelatedProducts', () => {
       helper,
     });
 
-    widget.render(renderOptions);
+    widget.render!(renderOptions);
 
     expect(renderFn).toHaveBeenCalledTimes(2);
     expect(renderFn).toHaveBeenLastCalledWith(
diff --git a/packages/instantsearch.js/src/connectors/relevant-sort/__tests__/connectRelevantSort-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectRelevantSort.test.ts
similarity index 98%
rename from packages/instantsearch.js/src/connectors/relevant-sort/__tests__/connectRelevantSort-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectRelevantSort.test.ts
index 47feee7851..bc0d1ba947 100644
--- a/packages/instantsearch.js/src/connectors/relevant-sort/__tests__/connectRelevantSort-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectRelevantSort.test.ts
@@ -7,13 +7,12 @@ import algoliasearchHelper, {
   SearchResults,
 } from 'algoliasearch-helper';
 
+import { connectRelevantSort, noop } from '../..';
 import {
   createInitOptions,
   createRenderOptions,
   createDisposeOptions,
-} from '../../../../test/createWidget';
-import { noop } from '../../../lib/utils';
-import connectRelevantSort from '../connectRelevantSort';
+} from '../../../test/createWidget';
 
 const createHelper = () => {
   return algoliasearchHelper(createSearchClient(), '', {});
diff --git a/packages/instantsearch.js/src/connectors/search-box/__tests__/connectSearchBox-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectSearchBox.test.ts
similarity index 98%
rename from packages/instantsearch.js/src/connectors/search-box/__tests__/connectSearchBox-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectSearchBox.test.ts
index ec9419eaf4..2ccf8278a5 100644
--- a/packages/instantsearch.js/src/connectors/search-box/__tests__/connectSearchBox-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectSearchBox.test.ts
@@ -7,14 +7,13 @@ import algoliasearchHelper, {
   SearchParameters,
 } from 'algoliasearch-helper';
 
-import { createInstantSearch } from '../../../../test/createInstantSearch';
+import { connectSearchBox, instantsearch } from '../..';
+import { createInstantSearch } from '../../../test/createInstantSearch';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
-import InstantSearch from '../../../lib/InstantSearch';
-import connectSearchBox from '../connectSearchBox';
+} from '../../../test/createWidget';
 
 describe('connectSearchBox', () => {
   const getInitializedWidget = (config = {}) => {
@@ -383,7 +382,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/search-box/
         }
       }
     );
-    const search = new InstantSearch({
+    const search = instantsearch({
       searchClient: createSearchClient(),
       indexName: 'indexName',
     });
diff --git a/packages/instantsearch.js/src/connectors/sort-by/__tests__/connectSortBy-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectSortBy.test.ts
similarity index 98%
rename from packages/instantsearch.js/src/connectors/sort-by/__tests__/connectSortBy-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectSortBy.test.ts
index 58d69c6665..6424fdaad1 100644
--- a/packages/instantsearch.js/src/connectors/sort-by/__tests__/connectSortBy-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectSortBy.test.ts
@@ -7,14 +7,13 @@ import algoliasearchHelper, {
   SearchParameters,
 } from 'algoliasearch-helper';
 
-import { createInstantSearch } from '../../../../test/createInstantSearch';
+import { connectSortBy, index } from '../..';
+import { createInstantSearch } from '../../../test/createInstantSearch';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
-import { index } from '../../../widgets';
-import connectSortBy from '../connectSortBy';
+} from '../../../test/createWidget';
 
 import type { SortByRenderState } from '../connectSortBy';
 
@@ -564,7 +563,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/sort-by/js/
             })
           );
         }).toWarnDev(
-          '[InstantSearch.js]: The index named "index_initial" is not listed in the `items` of `sortBy`.'
+          '[InstantSearch]: The index named "index_initial" is not listed in the `items` of `sortBy`.'
         );
 
         expect(renderFn).toHaveBeenCalledTimes(1);
diff --git a/packages/instantsearch.js/src/connectors/stats/__tests__/connectStats-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectStats.test.ts
similarity index 99%
rename from packages/instantsearch.js/src/connectors/stats/__tests__/connectStats-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectStats.test.ts
index ff7519a25b..129a42bc60 100644
--- a/packages/instantsearch.js/src/connectors/stats/__tests__/connectStats-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectStats.test.ts
@@ -5,12 +5,12 @@ import {
 import jsHelper from 'algoliasearch-helper';
 const SearchResults = jsHelper.SearchResults;
 
+import { connectStats } from '../..';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
-import connectStats from '../connectStats';
+} from '../../../test/createWidget';
 
 import type { StatsRenderState } from '../connectStats';
 
diff --git a/packages/instantsearch.js/src/connectors/toggle-refinement/__tests__/connectToggleRefinement-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectToggleRefinement.test.ts
similarity index 99%
rename from packages/instantsearch.js/src/connectors/toggle-refinement/__tests__/connectToggleRefinement-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectToggleRefinement.test.ts
index a564ae17e8..3e5dca78a8 100644
--- a/packages/instantsearch.js/src/connectors/toggle-refinement/__tests__/connectToggleRefinement-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectToggleRefinement.test.ts
@@ -7,14 +7,13 @@ import jsHelper, {
   SearchParameters,
 } from 'algoliasearch-helper';
 
-import { createInstantSearch } from '../../../../test/createInstantSearch';
+import { connectToggleRefinement, warnCache } from '../..';
+import { createInstantSearch } from '../../../test/createInstantSearch';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
-import { warning } from '../../../lib/utils';
-import connectToggleRefinement from '../connectToggleRefinement';
+} from '../../../test/createWidget';
 
 import type { ToggleRefinementRenderState } from '../connectToggleRefinement';
 
@@ -1355,7 +1354,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/toggle-refi
     });
 
     test('warns when attribute is used for hierarchical faceting and does not change `SearchParameters`', () => {
-      warning.cache = {};
+      warnCache.current = {};
       const helper = jsHelper(createSearchClient(), '', {
         hierarchicalFacets: [{ name: 'brand', attributes: ['brand'] }],
       });
@@ -1370,7 +1369,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/toggle-refi
     });
 
     test('warns when attribute is used for conjunctive faceting and does not change `SearchParameters`', () => {
-      warning.cache = {};
+      warnCache.current = {};
       const helper = jsHelper(createSearchClient(), '', {
         facets: ['brand'],
       });
diff --git a/packages/instantsearch.js/src/connectors/trending-items/__tests__/connectTrendingItems-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectTrendingItems.test.ts
similarity index 97%
rename from packages/instantsearch.js/src/connectors/trending-items/__tests__/connectTrendingItems-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectTrendingItems.test.ts
index 1d955bbf3c..9e89ec8085 100644
--- a/packages/instantsearch.js/src/connectors/trending-items/__tests__/connectTrendingItems-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectTrendingItems.test.ts
@@ -5,11 +5,11 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import algoliasearchHelper, { RecommendParameters } from 'algoliasearch-helper';
 
+import { connectTrendingItems } from '../..';
 import {
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
-import connectTrendingItems from '../connectTrendingItems';
+} from '../../../test/createWidget';
 
 describe('connectTrendingItems', () => {
   it('throws without render function', () => {
@@ -83,7 +83,7 @@ describe('connectTrendingItems', () => {
     const helper = algoliasearchHelper(createSearchClient(), '', {});
     helper.search = jest.fn();
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         helper,
         state: helper.state,
@@ -100,7 +100,7 @@ describe('connectTrendingItems', () => {
       helper,
     });
 
-    widget.render(renderOptions);
+    widget.render!(renderOptions);
 
     expect(renderFn).toHaveBeenCalledTimes(2);
     expect(renderFn).toHaveBeenLastCalledWith(
diff --git a/packages/instantsearch.js/src/connectors/voice-search/__tests__/connectVoiceSearch-test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectVoiceSearch.test.ts
similarity index 98%
rename from packages/instantsearch.js/src/connectors/voice-search/__tests__/connectVoiceSearch-test.ts
rename to packages/instantsearch-core/src/connectors/__tests__/connectVoiceSearch.test.ts
index 01de808d1e..7a2c146742 100644
--- a/packages/instantsearch.js/src/connectors/voice-search/__tests__/connectVoiceSearch-test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectVoiceSearch.test.ts
@@ -1,19 +1,19 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import algoliasearchHelper, { SearchParameters } from 'algoliasearch-helper';
 
+import { connectVoiceSearch } from '../..';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
-import connectVoiceSearch from '../connectVoiceSearch';
+} from '../../../test/createWidget';
 
 import type {
   VoiceSearchHelperParams,
   VoiceSearchHelper,
-} from '../../../lib/voiceSearchHelper/types';
+} from '../../lib/voiceSearchHelper/types';
 
-jest.mock('../../../lib/voiceSearchHelper', () => {
+jest.mock('../../lib/voiceSearchHelper', () => {
   const createVoiceHelper = ({
     onStateChange,
     onQueryChange,
diff --git a/packages/instantsearch-core/src/connectors/connectAutocomplete.ts b/packages/instantsearch-core/src/connectors/connectAutocomplete.ts
new file mode 100644
index 0000000000..e358191e0f
--- /dev/null
+++ b/packages/instantsearch-core/src/connectors/connectAutocomplete.ts
@@ -0,0 +1,265 @@
+import {
+  escapeHits,
+  TAG_PLACEHOLDER,
+  noop,
+  warning,
+  createDocumentationMessageGenerator,
+} from '../lib/public';
+import { checkRendering, createSendEventForHits } from '../lib/utils';
+
+import type {
+  Hit,
+  Connector,
+  WidgetRenderState,
+  SendEventForHits,
+} from '../types';
+import type { SearchResults } from 'algoliasearch-helper';
+
+const withUsage = createDocumentationMessageGenerator({
+  name: 'autocomplete',
+  connector: true,
+});
+
+export type AutocompleteConnectorParams = {
+  /**
+   * Escapes HTML entities from hits string values.
+   *
+   * @default `true`
+   */
+  escapeHTML?: boolean;
+};
+
+export type AutocompleteRenderState = {
+  /**
+   * The current value of the query.
+   */
+  currentRefinement: string;
+
+  /**
+   * The indices this widget has access to.
+   */
+  indices: Array<{
+    /**
+     * The name of the index
+     */
+    indexName: string;
+
+    /**
+     * The id of the index
+     */
+    indexId: string;
+
+    /**
+     * The resolved hits from the index matching the query.
+     */
+    hits: Hit[];
+
+    /**
+     * The full results object from the Algolia API.
+     */
+    results: SearchResults;
+
+    /**
+     * Send event to insights middleware
+     */
+    sendEvent: SendEventForHits;
+  }>;
+
+  /**
+   * Searches into the indices with the provided query.
+   */
+  refine: (query: string) => void;
+};
+
+export type AutocompleteWidgetDescription = {
+  $$type: 'ais.autocomplete';
+  renderState: AutocompleteRenderState;
+  indexRenderState: {
+    autocomplete: WidgetRenderState<
+      AutocompleteRenderState,
+      AutocompleteConnectorParams
+    >;
+  };
+  indexUiState: { query: string };
+};
+
+export type AutocompleteConnector = Connector<
+  AutocompleteWidgetDescription,
+  AutocompleteConnectorParams
+>;
+
+export const connectAutocomplete: AutocompleteConnector =
+  function connectAutocomplete(renderFn, unmountFn = noop) {
+    checkRendering(renderFn, withUsage());
+
+    return (widgetParams) => {
+      const {
+        // @MAJOR: this can default to false
+        escapeHTML = true,
+      } = widgetParams || {};
+
+      warning(
+        !(widgetParams as any).indices,
+        `
+The option \`indices\` has been removed from the Autocomplete connector.
+
+The indices to target are now inferred from the widgets tree.
+${
+  Array.isArray((widgetParams as any).indices)
+    ? `
+An alternative would be:
+
+const autocomplete = connectAutocomplete(renderer);
+
+search.addWidgets([
+  ${(widgetParams as any).indices
+    .map(({ value }: { value: string }) => `index({ indexName: '${value}' }),`)
+    .join('\n  ')}
+  autocomplete()
+]);
+`
+    : ''
+}
+      `
+      );
+
+      type ConnectorState = {
+        refine?: (query: string) => void;
+      };
+
+      const connectorState: ConnectorState = {};
+
+      return {
+        $$type: 'ais.autocomplete',
+
+        init(initOptions) {
+          const { instantSearchInstance } = initOptions;
+
+          renderFn(
+            {
+              ...this.getWidgetRenderState(initOptions),
+              instantSearchInstance,
+            },
+            true
+          );
+        },
+
+        render(renderOptions) {
+          const { instantSearchInstance } = renderOptions;
+
+          const renderState = this.getWidgetRenderState(renderOptions);
+
+          renderState.indices.forEach(({ sendEvent, hits }) => {
+            sendEvent('view:internal', hits);
+          });
+
+          renderFn(
+            {
+              ...renderState,
+              instantSearchInstance,
+            },
+            false
+          );
+        },
+
+        getRenderState(renderState, renderOptions) {
+          return {
+            ...renderState,
+            autocomplete: this.getWidgetRenderState(renderOptions),
+          };
+        },
+
+        getWidgetRenderState({
+          helper,
+          state,
+          scopedResults,
+          instantSearchInstance,
+        }) {
+          if (!connectorState.refine) {
+            connectorState.refine = (query: string) => {
+              helper.setQuery(query).search();
+            };
+          }
+
+          const indices = scopedResults.map((scopedResult) => {
+            // We need to escape the hits because highlighting
+            // exposes HTML tags to the end-user.
+            if (scopedResult.results) {
+              scopedResult.results.hits = escapeHTML
+                ? escapeHits(scopedResult.results.hits)
+                : scopedResult.results.hits;
+            }
+
+            const sendEvent = createSendEventForHits({
+              instantSearchInstance,
+              getIndex: () => scopedResult.results?.index || '',
+              widgetType: this.$$type,
+            });
+
+            return {
+              indexId: scopedResult.indexId,
+              indexName: scopedResult.results?.index || '',
+              hits: scopedResult.results?.hits || [],
+              results: scopedResult.results || ({} as unknown as SearchResults),
+              sendEvent,
+            };
+          });
+
+          return {
+            currentRefinement: state.query || '',
+            indices,
+            refine: connectorState.refine,
+            widgetParams,
+          };
+        },
+
+        getWidgetUiState(uiState, { searchParameters }) {
+          const query = searchParameters.query || '';
+
+          if (query === '' || (uiState && uiState.query === query)) {
+            return uiState;
+          }
+
+          return {
+            ...uiState,
+            query,
+          };
+        },
+
+        getWidgetSearchParameters(searchParameters, { uiState }) {
+          const parameters = {
+            query: uiState.query || '',
+          };
+
+          if (!escapeHTML) {
+            return searchParameters.setQueryParameters(parameters);
+          }
+
+          return searchParameters.setQueryParameters({
+            ...parameters,
+            ...TAG_PLACEHOLDER,
+          });
+        },
+
+        dispose({ state }) {
+          unmountFn();
+
+          const stateWithoutQuery = state.setQueryParameter('query', undefined);
+
+          if (!escapeHTML) {
+            return stateWithoutQuery;
+          }
+
+          return stateWithoutQuery.setQueryParameters(
+            Object.keys(TAG_PLACEHOLDER).reduce(
+              (acc, key) => ({
+                ...acc,
+                [key]: undefined,
+              }),
+              {}
+            )
+          );
+        },
+      };
+    };
+  };
diff --git a/packages/instantsearch-core/src/connectors/connectBreadcrumb.ts b/packages/instantsearch-core/src/connectors/connectBreadcrumb.ts
new file mode 100644
index 0000000000..2be4f4a775
--- /dev/null
+++ b/packages/instantsearch-core/src/connectors/connectBreadcrumb.ts
@@ -0,0 +1,363 @@
+import {
+  warning,
+  createDocumentationMessageGenerator,
+  isEqual,
+  noop,
+} from '../lib/public';
+import { checkRendering } from '../lib/utils';
+
+import type {
+  Connector,
+  TransformItems,
+  CreateURL,
+  WidgetRenderState,
+  IndexUiState,
+} from '../types';
+import type { SearchParameters, SearchResults } from 'algoliasearch-helper';
+
+const withUsage = createDocumentationMessageGenerator({
+  name: 'breadcrumb',
+  connector: true,
+});
+
+export type BreadcrumbConnectorParamsItem = {
+  /**
+   * Label of the category or subcategory.
+   */
+  label: string;
+
+  /**
+   * Value of breadcrumb item.
+   */
+  value: string | null;
+};
+
+export type BreadcrumbConnectorParams = {
+  /**
+   * Attributes to use to generate the hierarchy of the breadcrumb.
+   */
+  attributes: string[];
+
+  /**
+   * Prefix path to use if the first level is not the root level.
+   */
+  rootPath?: string;
+
+  /**
+   * Function to transform the items passed to the templates.
+   */
+  transformItems?: TransformItems<BreadcrumbConnectorParamsItem>;
+
+  /**
+   * The level separator used in the records.
+   *
+   * @default '>'
+   */
+  separator?: string;
+};
+
+export type BreadcrumbRenderState = {
+  /**
+   * Creates the URL for a single item name in the list.
+   */
+  createURL: CreateURL<BreadcrumbConnectorParamsItem['value']>;
+
+  /**
+   * Array of objects defining the different values and labels.
+   */
+  items: BreadcrumbConnectorParamsItem[];
+
+  /**
+   * Sets the path of the hierarchical filter and triggers a new search.
+   */
+  refine: (value: BreadcrumbConnectorParamsItem['value']) => void;
+
+  /**
+   * True if refinement can be applied.
+   */
+  canRefine: boolean;
+};
+
+export type BreadcrumbWidgetDescription = {
+  $$type: 'ais.breadcrumb';
+  renderState: BreadcrumbRenderState;
+  indexRenderState: {
+    breadcrumb: {
+      [rootAttribute: string]: WidgetRenderState<
+        BreadcrumbRenderState,
+        BreadcrumbConnectorParams
+      >;
+    };
+  };
+};
+
+export type BreadcrumbConnector = Connector<
+  BreadcrumbWidgetDescription,
+  BreadcrumbConnectorParams
+>;
+
+export const connectBreadcrumb: BreadcrumbConnector =
+  function connectBreadcrumb(renderFn, unmountFn = noop) {
+    checkRendering(renderFn, withUsage());
+
+    type ConnectorState = {
+      refine?: BreadcrumbRenderState['refine'];
+      createURL?: BreadcrumbRenderState['createURL'];
+    };
+
+    const connectorState: ConnectorState = {};
+
+    return (widgetParams) => {
+      const {
+        attributes,
+        separator = ' > ',
+        rootPath = null,
+        transformItems = ((items) => items) as NonNullable<
+          BreadcrumbConnectorParams['transformItems']
+        >,
+      } = widgetParams || {};
+
+      if (
+        !attributes ||
+        !Array.isArray(attributes) ||
+        attributes.length === 0
+      ) {
+        throw new Error(
+          withUsage('The `attributes` option expects an array of strings.')
+        );
+      }
+
+      const [hierarchicalFacetName] = attributes;
+
+      function getRefinedState(
+        state: SearchParameters,
+        facetValue: BreadcrumbConnectorParamsItem['value']
+      ) {
+        if (!facetValue) {
+          const breadcrumb = state.getHierarchicalFacetBreadcrumb(
+            hierarchicalFacetName
+          );
+          if (breadcrumb.length === 0) {
+            return state;
+          } else {
+            return state
+              .resetPage()
+              .toggleFacetRefinement(hierarchicalFacetName, breadcrumb[0]);
+          }
+        }
+        return state
+          .resetPage()
+          .toggleFacetRefinement(hierarchicalFacetName, facetValue);
+      }
+
+      return {
+        $$type: 'ais.breadcrumb',
+
+        init(initOptions) {
+          renderFn(
+            {
+              ...this.getWidgetRenderState(initOptions),
+              instantSearchInstance: initOptions.instantSearchInstance,
+            },
+            true
+          );
+        },
+
+        render(renderOptions) {
+          renderFn(
+            {
+              ...this.getWidgetRenderState(renderOptions),
+              instantSearchInstance: renderOptions.instantSearchInstance,
+            },
+            false
+          );
+        },
+
+        dispose() {
+          unmountFn();
+        },
+
+        getRenderState(renderState, renderOptions) {
+          return {
+            ...renderState,
+            breadcrumb: {
+              ...renderState.breadcrumb,
+              [hierarchicalFacetName]: this.getWidgetRenderState(renderOptions),
+            },
+          };
+        },
+
+        getWidgetRenderState({ helper, createURL, results, state }) {
+          function getItems() {
+            // The hierarchicalFacets condition is required for flavors
+            // that render immediately with empty results, without relying
+            // on init() (like React InstantSearch).
+            if (!results || state.hierarchicalFacets.length === 0) {
+              return [];
+            }
+
+            const [{ name: facetName }] = state.hierarchicalFacets;
+
+            const facetValues = results.getFacetValues(facetName, {});
+            const facetItems =
+              facetValues && !Array.isArray(facetValues) && facetValues.data
+                ? facetValues.data
+                : [];
+            const items = transformItems(
+              shiftItemsValues(prepareItems(facetItems)),
+              {
+                results,
+              }
+            );
+
+            return items;
+          }
+
+          const items = getItems();
+
+          if (!connectorState.createURL) {
+            connectorState.createURL = (facetValue) => {
+              return createURL((uiState) =>
+                this.getWidgetUiState!(uiState, {
+                  searchParameters: getRefinedState(helper.state, facetValue),
+                  helper,
+                })
+              );
+            };
+          }
+
+          if (!connectorState.refine) {
+            connectorState.refine = (facetValue) => {
+              helper
+                .setState(getRefinedState(helper.state, facetValue))
+                .search();
+            };
+          }
+
+          return {
+            canRefine: items.length > 0,
+            createURL: connectorState.createURL,
+            items,
+            refine: connectorState.refine,
+            widgetParams,
+          };
+        },
+
+        getWidgetUiState(uiState, { searchParameters }) {
+          const path = searchParameters.getHierarchicalFacetBreadcrumb(
+            hierarchicalFacetName
+          );
+
+          return removeEmptyRefinementsFromUiState(
+            {
+              ...uiState,
+              hierarchicalMenu: {
+                ...uiState.hierarchicalMenu,
+                [hierarchicalFacetName]: path,
+              },
+            },
+            hierarchicalFacetName
+          );
+        },
+
+        getWidgetSearchParameters(searchParameters, { uiState }) {
+          const values =
+            uiState.hierarchicalMenu &&
+            uiState.hierarchicalMenu[hierarchicalFacetName];
+
+          if (
+            searchParameters.isConjunctiveFacet(hierarchicalFacetName) ||
+            searchParameters.isDisjunctiveFacet(hierarchicalFacetName)
+          ) {
+            warning(
+              false,
+              `HierarchicalMenu: Attribute "${hierarchicalFacetName}" is already used by another widget applying conjunctive or disjunctive faceting.
+As this is not supported, please make sure to remove this other widget or this HierarchicalMenu widget will not work at all.`
+            );
+
+            return searchParameters;
+          }
+
+          if (searchParameters.isHierarchicalFacet(hierarchicalFacetName)) {
+            const facet = searchParameters.getHierarchicalFacetByName(
+              hierarchicalFacetName
+            );
+
+            warning(
+              isEqual(facet.attributes, attributes) &&
+                facet.separator === separator &&
+                facet.rootPath === rootPath,
+              'Using Breadcrumb and HierarchicalMenu on the same facet with different options overrides the configuration of the HierarchicalMenu.'
+            );
+          }
+
+          const withFacetConfiguration = searchParameters
+            .removeHierarchicalFacet(hierarchicalFacetName)
+            .addHierarchicalFacet({
+              name: hierarchicalFacetName,
+              attributes,
+              separator,
+              rootPath,
+            });
+
+          if (!values) {
+            return withFacetConfiguration.setQueryParameters({
+              hierarchicalFacetsRefinements: {
+                ...withFacetConfiguration.hierarchicalFacetsRefinements,
+                [hierarchicalFacetName]: [],
+              },
+            });
+          }
+
+          return withFacetConfiguration.addHierarchicalFacetRefinement(
+            hierarchicalFacetName,
+            values.join(separator)
+          );
+        },
+      };
+    };
+  };
+
+function prepareItems(data: SearchResults.HierarchicalFacet[]) {
+  return data.reduce<BreadcrumbConnectorParamsItem[]>((result, currentItem) => {
+    if (currentItem.isRefined) {
+      result.push({
+        label: currentItem.name,
+        value: currentItem.escapedValue,
+      });
+      if (Array.isArray(currentItem.data)) {
+        result = result.concat(prepareItems(currentItem.data));
+      }
+    }
+    return result;
+  }, []);
+}
+
+function shiftItemsValues(array: BreadcrumbConnectorParamsItem[]) {
+  return array.map((x, idx) => ({
+    label: x.label,
+    value: idx + 1 === array.length ? null : array[idx + 1].value,
+  }));
+}
+
+function removeEmptyRefinementsFromUiState(
+  indexUiState: IndexUiState,
+  attribute: string
+): IndexUiState {
+  if (!indexUiState.hierarchicalMenu) {
+    return indexUiState;
+  }
+
+  if (
+    !indexUiState.hierarchicalMenu[attribute] ||
+    !indexUiState.hierarchicalMenu[attribute].length
+  ) {
+    delete indexUiState.hierarchicalMenu[attribute];
+  }
+
+  if (Object.keys(indexUiState.hierarchicalMenu).length === 0) {
+    delete indexUiState.hierarchicalMenu;
+  }
+
+  return indexUiState;
+}
diff --git a/packages/instantsearch.js/src/connectors/clear-refinements/connectClearRefinements.ts b/packages/instantsearch-core/src/connectors/connectClearRefinements.ts
similarity index 97%
rename from packages/instantsearch.js/src/connectors/clear-refinements/connectClearRefinements.ts
rename to packages/instantsearch-core/src/connectors/connectClearRefinements.ts
index b5539cbfc9..453a3afffe 100644
--- a/packages/instantsearch.js/src/connectors/clear-refinements/connectClearRefinements.ts
+++ b/packages/instantsearch-core/src/connectors/connectClearRefinements.ts
@@ -1,12 +1,10 @@
+import { createDocumentationMessageGenerator, noop, uniq } from '../lib/public';
 import {
   checkRendering,
   clearRefinements,
   getRefinements,
-  createDocumentationMessageGenerator,
-  noop,
-  uniq,
   mergeSearchParameters,
-} from '../../lib/utils';
+} from '../lib/utils';
 
 import type {
   TransformItems,
@@ -14,7 +12,7 @@ import type {
   Connector,
   WidgetRenderState,
   ScopedResult,
-} from '../../types';
+} from '../types';
 import type { AlgoliaSearchHelper, SearchResults } from 'algoliasearch-helper';
 
 const withUsage = createDocumentationMessageGenerator({
@@ -83,7 +81,7 @@ type AttributesToClear = {
   items: string[];
 };
 
-const connectClearRefinements: ClearRefinementsConnector =
+export const connectClearRefinements: ClearRefinementsConnector =
   function connectClearRefinements(renderFn, unmountFn = noop) {
     checkRendering(renderFn, withUsage());
 
@@ -268,5 +266,3 @@ function getAttributesToClear({
     ),
   };
 }
-
-export default connectClearRefinements;
diff --git a/packages/instantsearch.js/src/connectors/configure/connectConfigure.ts b/packages/instantsearch-core/src/connectors/connectConfigure.ts
similarity index 95%
rename from packages/instantsearch.js/src/connectors/configure/connectConfigure.ts
rename to packages/instantsearch-core/src/connectors/connectConfigure.ts
index 95500753a5..0c9ea29c6f 100644
--- a/packages/instantsearch.js/src/connectors/configure/connectConfigure.ts
+++ b/packages/instantsearch-core/src/connectors/connectConfigure.ts
@@ -3,11 +3,11 @@ import algoliasearchHelper from 'algoliasearch-helper';
 import {
   createDocumentationMessageGenerator,
   isPlainObject,
-  mergeSearchParameters,
   noop,
-} from '../../lib/utils';
+} from '../lib/public';
+import { mergeSearchParameters } from '../lib/utils';
 
-import type { Connector, WidgetRenderState } from '../../types';
+import type { Connector, WidgetRenderState } from '../types';
 import type {
   SearchParameters,
   PlainSearchParameters,
@@ -76,7 +76,7 @@ export type ConfigureConnector = Connector<
   ConfigureConnectorParams
 >;
 
-const connectConfigure: ConfigureConnector = function connectConfigure(
+export const connectConfigure: ConfigureConnector = function connectConfigure(
   renderFn = noop,
   unmountFn = noop
 ) {
@@ -199,5 +199,3 @@ const connectConfigure: ConfigureConnector = function connectConfigure(
     };
   };
 };
-
-export default connectConfigure;
diff --git a/packages/instantsearch.js/src/connectors/current-refinements/connectCurrentRefinements.ts b/packages/instantsearch-core/src/connectors/connectCurrentRefinements.ts
similarity index 98%
rename from packages/instantsearch.js/src/connectors/current-refinements/connectCurrentRefinements.ts
rename to packages/instantsearch-core/src/connectors/connectCurrentRefinements.ts
index df541aaed4..a0eee2f22c 100644
--- a/packages/instantsearch.js/src/connectors/current-refinements/connectCurrentRefinements.ts
+++ b/packages/instantsearch-core/src/connectors/connectCurrentRefinements.ts
@@ -1,22 +1,21 @@
 import {
-  getRefinements,
-  checkRendering,
   createDocumentationMessageGenerator,
   noop,
   warning,
-} from '../../lib/utils';
+} from '../lib/public';
+import { getRefinements, checkRendering } from '../lib/utils';
 
 import type {
   Refinement,
   FacetRefinement,
   NumericRefinement,
-} from '../../lib/utils';
+} from '../lib/utils';
 import type {
   Connector,
   TransformItems,
   CreateURL,
   WidgetRenderState,
-} from '../../types';
+} from '../types';
 import type {
   AlgoliaSearchHelper,
   SearchParameters,
@@ -165,7 +164,7 @@ export type CurrentRefinementsConnector = Connector<
   CurrentRefinementsConnectorParams
 >;
 
-const connectCurrentRefinements: CurrentRefinementsConnector =
+export const connectCurrentRefinements: CurrentRefinementsConnector =
   function connectCurrentRefinements(renderFn, unmountFn = noop) {
     checkRendering(renderFn, withUsage());
 
@@ -426,5 +425,3 @@ function getValue(refinement: Refinement) {
 
   return refinement.name;
 }
-
-export default connectCurrentRefinements;
diff --git a/packages/instantsearch.js/src/connectors/dynamic-widgets/connectDynamicWidgets.ts b/packages/instantsearch-core/src/connectors/connectDynamicWidgets.ts
similarity index 97%
rename from packages/instantsearch.js/src/connectors/dynamic-widgets/connectDynamicWidgets.ts
rename to packages/instantsearch-core/src/connectors/connectDynamicWidgets.ts
index 81d239ddf5..36d271fcb7 100644
--- a/packages/instantsearch.js/src/connectors/dynamic-widgets/connectDynamicWidgets.ts
+++ b/packages/instantsearch-core/src/connectors/connectDynamicWidgets.ts
@@ -1,17 +1,17 @@
 import {
-  checkRendering,
   createDocumentationMessageGenerator,
-  getWidgetAttribute,
   noop,
   warning,
-} from '../../lib/utils';
+  getWidgetAttribute,
+} from '../lib/public';
+import { checkRendering } from '../lib/utils';
 
 import type {
   Connector,
   TransformItems,
   TransformItemsMetadata,
   Widget,
-} from '../../types';
+} from '../types';
 
 const withUsage = createDocumentationMessageGenerator({
   name: 'dynamic-widgets',
@@ -90,7 +90,7 @@ export type DynamicWidgetsConnector = Connector<
 
 const MAX_WILDCARD_FACETS = 20;
 
-const connectDynamicWidgets: DynamicWidgetsConnector =
+export const connectDynamicWidgets: DynamicWidgetsConnector =
   function connectDynamicWidgets(renderFn, unmountFn = noop) {
     checkRendering(renderFn, withUsage());
 
@@ -258,5 +258,3 @@ const connectDynamicWidgets: DynamicWidgetsConnector =
       };
     };
   };
-
-export default connectDynamicWidgets;
diff --git a/packages/instantsearch-core/src/connectors/connectFrequentlyBoughtTogether.ts b/packages/instantsearch-core/src/connectors/connectFrequentlyBoughtTogether.ts
new file mode 100644
index 0000000000..176cd811b8
--- /dev/null
+++ b/packages/instantsearch-core/src/connectors/connectFrequentlyBoughtTogether.ts
@@ -0,0 +1,241 @@
+import {
+  createDocumentationMessageGenerator,
+  noop,
+  escapeHits,
+  TAG_PLACEHOLDER,
+} from '../lib/public';
+import {
+  createSendEventForHits,
+  addAbsolutePosition,
+  addQueryID,
+  checkRendering,
+} from '../lib/utils';
+
+import type {
+  Connector,
+  TransformItems,
+  BaseHit,
+  Renderer,
+  Unmounter,
+  UnknownWidgetParams,
+  RecommendResponse,
+  AlgoliaHit,
+  Hit,
+  Widget,
+  SendEventForHits,
+} from '../types';
+import type { PlainSearchParameters } from 'algoliasearch-helper';
+
+const withUsage = createDocumentationMessageGenerator({
+  name: 'frequently-bought-together',
+  connector: true,
+});
+
+export type FrequentlyBoughtTogetherRenderState<
+  THit extends NonNullable<object> = BaseHit
+> = {
+  /**
+   * The matched recommendations from Algolia API.
+   */
+  items: Array<Hit<THit>>;
+
+  /**
+   * Sends an event to the Insights middleware.
+   */
+  sendEvent: SendEventForHits;
+};
+
+export type FrequentlyBoughtTogetherConnectorParams<
+  THit extends NonNullable<object> = BaseHit
+> = {
+  /**
+   * The objectIDs of the items to get the frequently bought together items for.
+   */
+  objectIDs: string[];
+
+  /**
+   * Threshold for the recommendations confidence score (between 0 and 100). Only recommendations with a greater score are returned.
+   */
+  threshold?: number;
+
+  /**
+   * The maximum number of recommendations to return.
+   */
+  limit?: number;
+
+  /**
+   * Parameters to pass to the request.
+   */
+  queryParameters?: Omit<
+    PlainSearchParameters,
+    'page' | 'hitsPerPage' | 'offset' | 'length'
+  >;
+
+  /**
+   * Whether to escape HTML tags from items string values.
+   *
+   * @default true
+   */
+  escapeHTML?: boolean;
+
+  /**
+   * Function to transform the items passed to the templates.
+   */
+  transformItems?: TransformItems<
+    Hit<THit>,
+    { results: RecommendResponse<AlgoliaHit<THit>> }
+  >;
+};
+
+export type FrequentlyBoughtTogetherWidgetDescription<
+  THit extends NonNullable<object> = BaseHit
+> = {
+  $$type: 'ais.frequentlyBoughtTogether';
+  renderState: FrequentlyBoughtTogetherRenderState<THit>;
+};
+
+export type FrequentlyBoughtTogetherConnector<
+  THit extends NonNullable<object> = BaseHit
+> = Connector<
+  FrequentlyBoughtTogetherWidgetDescription<THit>,
+  FrequentlyBoughtTogetherConnectorParams<THit>
+>;
+
+export const connectFrequentlyBoughtTogether =
+  function connectFrequentlyBoughtTogether<
+    TWidgetParams extends UnknownWidgetParams
+  >(
+    renderFn: Renderer<
+      FrequentlyBoughtTogetherRenderState,
+      TWidgetParams & FrequentlyBoughtTogetherConnectorParams
+    >,
+    unmountFn: Unmounter = noop
+  ) {
+    checkRendering(renderFn, withUsage());
+
+    return <THit extends NonNullable<object> = BaseHit>(
+      widgetParams: TWidgetParams &
+        FrequentlyBoughtTogetherConnectorParams<THit>
+    ) => {
+      const {
+        // @MAJOR: this can default to false
+        escapeHTML = true,
+        transformItems = ((items) => items) as NonNullable<
+          FrequentlyBoughtTogetherConnectorParams<THit>['transformItems']
+        >,
+        objectIDs,
+        limit,
+        threshold,
+        queryParameters,
+      } = widgetParams || {};
+
+      if (!objectIDs || objectIDs.length === 0) {
+        throw new Error(withUsage('The `objectIDs` option is required.'));
+      }
+
+      type FrequentlyBoughtTogetherWidget = Widget<
+        FrequentlyBoughtTogetherWidgetDescription<THit> & {
+          widgetParams: typeof widgetParams;
+        }
+      >;
+
+      let sendEvent: SendEventForHits;
+
+      const widget: FrequentlyBoughtTogetherWidget = {
+        dependsOn: 'recommend',
+        $$type: 'ais.frequentlyBoughtTogether',
+
+        init(initOptions) {
+          renderFn(
+            {
+              ...this.getWidgetRenderState(initOptions),
+              instantSearchInstance: initOptions.instantSearchInstance,
+            },
+            true
+          );
+        },
+
+        render(renderOptions) {
+          const renderState = this.getWidgetRenderState(renderOptions);
+
+          renderFn(
+            {
+              ...renderState,
+              instantSearchInstance: renderOptions.instantSearchInstance,
+            },
+            false
+          );
+        },
+
+        getRenderState(renderState) {
+          return renderState;
+        },
+
+        getWidgetRenderState({ results, instantSearchInstance, helper }) {
+          if (!sendEvent) {
+            sendEvent = createSendEventForHits({
+              instantSearchInstance,
+              getIndex: () => helper.getIndex(),
+              widgetType: this.$$type,
+            });
+          }
+          if (results === null || results === undefined) {
+            return { items: [], sendEvent, widgetParams };
+          }
+
+          if (escapeHTML && results.hits.length > 0) {
+            results.hits = escapeHits(results.hits);
+          }
+
+          const itemsWithAbsolutePosition = addAbsolutePosition(
+            results.hits,
+            0,
+            1
+          );
+
+          const itemsWithAbsolutePositionAndQueryID = addQueryID(
+            itemsWithAbsolutePosition,
+            results.queryID
+          );
+
+          const transformedItems = transformItems(
+            itemsWithAbsolutePositionAndQueryID,
+            {
+              results: results as RecommendResponse<AlgoliaHit<THit>>,
+            }
+          );
+
+          return {
+            items: transformedItems,
+            sendEvent,
+            widgetParams,
+          };
+        },
+
+        dispose({ recommendState }) {
+          unmountFn();
+          return recommendState.removeParams(this.$$id!);
+        },
+
+        getWidgetParameters(state) {
+          return objectIDs.reduce(
+            (acc, objectID) =>
+              acc.addFrequentlyBoughtTogether({
+                objectID,
+                threshold,
+                maxRecommendations: limit,
+                queryParameters: {
+                  ...queryParameters,
+                  ...(escapeHTML ? TAG_PLACEHOLDER : {}),
+                },
+                $$id: this.$$id!,
+              }),
+            state.removeParams(this.$$id!)
+          );
+        },
+      };
+
+      // casting to avoid large type output
+      return widget as FrequentlyBoughtTogetherWidget;
+    };
+  } satisfies FrequentlyBoughtTogetherConnector;
diff --git a/packages/instantsearch.js/src/connectors/geo-search/connectGeoSearch.ts b/packages/instantsearch-core/src/connectors/connectGeoSearch.ts
similarity index 94%
rename from packages/instantsearch.js/src/connectors/geo-search/connectGeoSearch.ts
rename to packages/instantsearch-core/src/connectors/connectGeoSearch.ts
index 42c42b6b08..3867fe531f 100644
--- a/packages/instantsearch.js/src/connectors/geo-search/connectGeoSearch.ts
+++ b/packages/instantsearch-core/src/connectors/connectGeoSearch.ts
@@ -1,19 +1,16 @@
+import { createDocumentationMessageGenerator, noop } from '../lib/public';
 import {
   checkRendering,
   aroundLatLngToPosition,
   insideBoundingBoxToBoundingBox,
-  createDocumentationMessageGenerator,
   createSendEventForHits,
-  noop,
-} from '../../lib/utils';
+} from '../lib/utils';
 
-import type { SendEventForHits } from '../../lib/utils';
 import type {
   BaseHit,
   Connector,
   GeoHit,
   GeoLoc,
-  IndexRenderState,
   InitOptions,
   Renderer,
   RenderOptions,
@@ -21,14 +18,14 @@ import type {
   UnknownWidgetParams,
   Unmounter,
   WidgetRenderState,
-} from '../../types';
+  SendEventForHits,
+  Widget,
+} from '../types';
 import type {
   AlgoliaSearchHelper,
   SearchParameters,
 } from 'algoliasearch-helper';
 
-export type { GeoHit } from '../../types';
-
 const withUsage = createDocumentationMessageGenerator({
   name: 'geo-search',
   connector: true,
@@ -159,7 +156,7 @@ export type GeoSearchConnector<THit extends GeoHit = GeoHit> = Connector<
  *
  * Currently, the feature is not compatible with multiple values in the _geoloc attribute.
  */
-export default (function connectGeoSearch<
+export const connectGeoSearch = function connectGeoSearch<
   TWidgetParams extends UnknownWidgetParams
 >(
   renderFn: Renderer<
@@ -263,7 +260,11 @@ export default (function connectGeoSearch<
 
     let sendEvent: SendEventForHits;
 
-    return {
+    type GeoSearchWidget = Widget<
+      GeoSearchWidgetDescription<THit> & { widgetParams: typeof widgetParams }
+    >;
+
+    const widget: GeoSearchWidget = {
       $$type,
 
       init(initArgs) {
@@ -373,14 +374,12 @@ export default (function connectGeoSearch<
         };
       },
 
-      getRenderState(
-        renderState,
-        renderOptions
-        // Type is explicitly redefined, to avoid having the TWidgetParams type in the definition
-      ): IndexRenderState & GeoSearchWidgetDescription['indexRenderState'] {
+      getRenderState(renderState, renderOptions) {
         return {
           ...renderState,
-          geoSearch: this.getWidgetRenderState(renderOptions),
+          geoSearch: this.getWidgetRenderState(renderOptions) as NonNullable<
+            typeof renderState['geoSearch']
+          >,
         };
       },
 
@@ -423,5 +422,8 @@ export default (function connectGeoSearch<
         );
       },
     };
+
+    // casting to avoid large type output
+    return widget as GeoSearchWidget;
   };
-} satisfies GeoSearchConnector);
+} satisfies GeoSearchConnector;
diff --git a/packages/instantsearch.js/src/connectors/hierarchical-menu/connectHierarchicalMenu.ts b/packages/instantsearch-core/src/connectors/connectHierarchicalMenu.ts
similarity index 98%
rename from packages/instantsearch.js/src/connectors/hierarchical-menu/connectHierarchicalMenu.ts
rename to packages/instantsearch-core/src/connectors/connectHierarchicalMenu.ts
index fd6233e4cc..37b50b62f8 100644
--- a/packages/instantsearch.js/src/connectors/hierarchical-menu/connectHierarchicalMenu.ts
+++ b/packages/instantsearch-core/src/connectors/connectHierarchicalMenu.ts
@@ -1,13 +1,11 @@
 import {
-  checkRendering,
   warning,
   createDocumentationMessageGenerator,
-  createSendEventForFacet,
   isEqual,
   noop,
-} from '../../lib/utils';
+} from '../lib/public';
+import { checkRendering, createSendEventForFacet } from '../lib/utils';
 
-import type { SendEventForFacet } from '../../lib/utils';
 import type {
   Connector,
   CreateURL,
@@ -17,7 +15,8 @@ import type {
   SortBy,
   WidgetRenderState,
   IndexUiState,
-} from '../../types';
+  SendEventForFacet,
+} from '../types';
 import type { SearchResults } from 'algoliasearch-helper';
 
 const withUsage = createDocumentationMessageGenerator({
@@ -165,7 +164,7 @@ export type HierarchicalMenuConnector = Connector<
  * @param {function} unmountFn Unmount function called when the widget is disposed.
  * @return {function(CustomHierarchicalMenuWidgetParams)} Re-usable widget factory for a custom **HierarchicalMenu** widget.
  */
-const connectHierarchicalMenu: HierarchicalMenuConnector =
+export const connectHierarchicalMenu: HierarchicalMenuConnector =
   function connectHierarchicalMenu(renderFn, unmountFn = noop) {
     checkRendering(renderFn, withUsage());
 
@@ -503,5 +502,3 @@ function removeEmptyRefinementsFromUiState(
 
   return indexUiState;
 }
-
-export default connectHierarchicalMenu;
diff --git a/packages/instantsearch.js/src/connectors/hits/connectHits.ts b/packages/instantsearch-core/src/connectors/connectHits.ts
similarity index 87%
rename from packages/instantsearch.js/src/connectors/hits/connectHits.ts
rename to packages/instantsearch-core/src/connectors/connectHits.ts
index ee1ece4e12..8ff829ad8c 100644
--- a/packages/instantsearch.js/src/connectors/hits/connectHits.ts
+++ b/packages/instantsearch-core/src/connectors/connectHits.ts
@@ -1,16 +1,17 @@
 import {
+  createDocumentationMessageGenerator,
+  noop,
   escapeHits,
   TAG_PLACEHOLDER,
+} from '../lib/public';
+import {
   checkRendering,
-  createDocumentationMessageGenerator,
   addAbsolutePosition,
   addQueryID,
   createSendEventForHits,
   createBindEventForHits,
-  noop,
-} from '../../lib/utils';
+} from '../lib/utils';
 
-import type { SendEventForHits, BindEventForHits } from '../../lib/utils';
 import type {
   TransformItems,
   Connector,
@@ -19,8 +20,10 @@ import type {
   BaseHit,
   Unmounter,
   Renderer,
-  IndexRenderState,
-} from '../../types';
+  SendEventForHits,
+  BindEventForHits,
+  Widget,
+} from '../types';
 import type { Banner, SearchResults } from 'algoliasearch-helper';
 
 const withUsage = createDocumentationMessageGenerator({
@@ -87,7 +90,7 @@ export type HitsWidgetDescription<THit extends NonNullable<object> = BaseHit> =
 export type HitsConnector<THit extends NonNullable<object> = BaseHit> =
   Connector<HitsWidgetDescription<THit>, HitsConnectorParams<THit>>;
 
-export default (function connectHits<TWidgetParams>(
+export const connectHits = function connectHits<TWidgetParams>(
   renderFn: Renderer<HitsRenderState, TWidgetParams & HitsConnectorParams>,
   unmountFn: Unmounter = noop
 ) {
@@ -100,13 +103,19 @@ export default (function connectHits<TWidgetParams>(
       // @MAJOR: this can default to false
       escapeHTML = true,
       transformItems = ((items) => items) as NonNullable<
-        HitsConnectorParams['transformItems']
+        HitsConnectorParams<THit>['transformItems']
       >,
-    } = widgetParams || {};
+    } = (widgetParams || {}) as HitsConnectorParams<THit>;
     let sendEvent: SendEventForHits;
     let bindEvent: BindEventForHits;
 
-    return {
+    type HitsWidget = Widget<
+      HitsWidgetDescription<THit> & {
+        widgetParams: typeof widgetParams;
+      }
+    >;
+
+    const widget: HitsWidget = {
       $$type: 'ais.hits',
 
       init(initOptions) {
@@ -133,14 +142,12 @@ export default (function connectHits<TWidgetParams>(
         renderState.sendEvent('view:internal', renderState.items);
       },
 
-      getRenderState(
-        renderState,
-        renderOptions
-        // Type is explicitly redefined, to avoid having the TWidgetParams type in the definition
-      ): IndexRenderState & HitsWidgetDescription['indexRenderState'] {
+      getRenderState(renderState, renderOptions) {
         return {
           ...renderState,
-          hits: this.getWidgetRenderState(renderOptions),
+          hits: this.getWidgetRenderState(renderOptions) as NonNullable<
+            typeof renderState['hits']
+          >,
         };
       },
 
@@ -232,5 +239,8 @@ export default (function connectHits<TWidgetParams>(
         return state.setQueryParameters(TAG_PLACEHOLDER);
       },
     };
+
+    // casting to avoid large type output
+    return widget as HitsWidget;
   };
-} satisfies HitsConnector);
+} satisfies HitsConnector;
diff --git a/packages/instantsearch-core/src/connectors/connectHitsPerPage.ts b/packages/instantsearch-core/src/connectors/connectHitsPerPage.ts
new file mode 100644
index 0000000000..7eebe8a8d2
--- /dev/null
+++ b/packages/instantsearch-core/src/connectors/connectHitsPerPage.ts
@@ -0,0 +1,307 @@
+import {
+  warning,
+  createDocumentationMessageGenerator,
+  noop,
+} from '../lib/public';
+import { checkRendering } from '../lib/utils';
+
+import type {
+  Connector,
+  TransformItems,
+  CreateURL,
+  InitOptions,
+  RenderOptions,
+  WidgetRenderState,
+  Widget,
+} from '../types';
+import type {
+  AlgoliaSearchHelper,
+  SearchParameters,
+} from 'algoliasearch-helper';
+
+const withUsage = createDocumentationMessageGenerator({
+  name: 'hits-per-page',
+  connector: true,
+});
+
+export type HitsPerPageRenderStateItem = {
+  /**
+   * Label to display in the option.
+   */
+  label: string;
+
+  /**
+   * Number of hits to display per page.
+   */
+  value: number;
+
+  /**
+   * Indicates if it's the current refined value.
+   */
+  isRefined: boolean;
+};
+
+export type HitsPerPageConnectorParamsItem = {
+  /**
+   * Label to display in the option.
+   */
+  label: string;
+
+  /**
+   * Number of hits to display per page.
+   */
+  value: number;
+
+  /**
+   * The default hits per page on first search.
+   *
+   * @default false
+   */
+  default?: boolean;
+};
+
+export type HitsPerPageConnectorParams = {
+  /**
+   * Array of objects defining the different values and labels.
+   */
+  items: HitsPerPageConnectorParamsItem[];
+
+  /**
+   * Function to transform the items passed to the templates.
+   */
+  transformItems?: TransformItems<HitsPerPageRenderStateItem>;
+};
+
+export type HitsPerPageRenderState = {
+  /**
+   * Array of objects defining the different values and labels.
+   */
+  items: HitsPerPageRenderStateItem[];
+
+  /**
+   * Creates the URL for a single item name in the list.
+   */
+  createURL: CreateURL<HitsPerPageConnectorParamsItem['value']>;
+
+  /**
+   * Sets the number of hits per page and triggers a search.
+   */
+  refine: (value: number) => void;
+
+  /**
+   * Indicates whether or not the search has results.
+   * @deprecated Use `canRefine` instead.
+   */
+  hasNoResults: boolean;
+
+  /**
+   * Indicates if search state can be refined.
+   */
+  canRefine: boolean;
+};
+
+export type HitsPerPageWidgetDescription = {
+  $$type: 'ais.hitsPerPage';
+  renderState: HitsPerPageRenderState;
+  indexRenderState: {
+    hitsPerPage: WidgetRenderState<
+      HitsPerPageRenderState,
+      HitsPerPageConnectorParams
+    >;
+  };
+  indexUiState: {
+    hitsPerPage: number;
+  };
+};
+
+export type HitsPerPageConnector = Connector<
+  HitsPerPageWidgetDescription,
+  HitsPerPageConnectorParams
+>;
+
+export const connectHitsPerPage: HitsPerPageConnector =
+  function connectHitsPerPage(renderFn, unmountFn = noop) {
+    checkRendering(renderFn, withUsage());
+
+    return (widgetParams) => {
+      const {
+        items: userItems,
+        transformItems = ((items) => items) as NonNullable<
+          HitsPerPageConnectorParams['transformItems']
+        >,
+      } = widgetParams || {};
+
+      if (!Array.isArray(userItems)) {
+        throw new Error(
+          withUsage('The `items` option expects an array of objects.')
+        );
+      }
+
+      let items = userItems;
+
+      const defaultItems = items.filter((item) => item.default === true);
+
+      if (defaultItems.length === 0) {
+        throw new Error(
+          withUsage(`A default value must be specified in \`items\`.`)
+        );
+      }
+
+      if (defaultItems.length > 1) {
+        throw new Error(
+          withUsage('More than one default value is specified in `items`.')
+        );
+      }
+
+      const defaultItem = defaultItems[0];
+
+      const normalizeItems = ({ hitsPerPage }: SearchParameters) => {
+        return items.map((item) => ({
+          ...item,
+          isRefined: Number(item.value) === Number(hitsPerPage),
+        }));
+      };
+
+      type ConnectorState = {
+        getRefine: (
+          helper: AlgoliaSearchHelper
+        ) => (value: HitsPerPageConnectorParamsItem['value']) => any;
+        createURLFactory: (props: {
+          state: SearchParameters;
+          createURL: (InitOptions | RenderOptions)['createURL'];
+          getWidgetUiState: NonNullable<Widget['getWidgetUiState']>;
+          helper: AlgoliaSearchHelper;
+        }) => HitsPerPageRenderState['createURL'];
+      };
+
+      const connectorState: ConnectorState = {
+        getRefine: (helper) => (value) => {
+          return !value && value !== 0
+            ? helper.setQueryParameter('hitsPerPage', undefined).search()
+            : helper.setQueryParameter('hitsPerPage', value).search();
+        },
+        createURLFactory:
+          ({ state, createURL, getWidgetUiState, helper }) =>
+          (value) =>
+            createURL((uiState) =>
+              getWidgetUiState(uiState, {
+                searchParameters: state
+                  .resetPage()
+                  .setQueryParameter(
+                    'hitsPerPage',
+                    !value && value !== 0 ? undefined : value
+                  ),
+                helper,
+              })
+            ),
+      };
+
+      return {
+        $$type: 'ais.hitsPerPage',
+
+        init(initOptions) {
+          const { state, instantSearchInstance } = initOptions;
+
+          const isCurrentInOptions = items.some(
+            (item) => Number(state.hitsPerPage) === Number(item.value)
+          );
+
+          if (!isCurrentInOptions) {
+            warning(
+              state.hitsPerPage !== undefined,
+              `
+\`hitsPerPage\` is not defined.
+The option \`hitsPerPage\` needs to be set using the \`configure\` widget.
+
+Learn more: https://www.algolia.com/doc/api-reference/widgets/hits-per-page/js/
+            `
+            );
+
+            warning(
+              false,
+              `
+The \`items\` option of \`hitsPerPage\` does not contain the "hits per page" value coming from the state: ${state.hitsPerPage}.
+
+You may want to add another entry to the \`items\` option with this value.`
+            );
+
+            items = [
+              // The helper will convert the empty string to `undefined`.
+              { value: '' as unknown as number, label: '' },
+              ...items,
+            ];
+          }
+
+          renderFn(
+            {
+              ...this.getWidgetRenderState(initOptions),
+              instantSearchInstance,
+            },
+            true
+          );
+        },
+
+        render(initOptions) {
+          const { instantSearchInstance } = initOptions;
+
+          renderFn(
+            {
+              ...this.getWidgetRenderState(initOptions),
+              instantSearchInstance,
+            },
+            false
+          );
+        },
+
+        dispose({ state }) {
+          unmountFn();
+
+          return state.setQueryParameter('hitsPerPage', undefined);
+        },
+
+        getRenderState(renderState, renderOptions) {
+          return {
+            ...renderState,
+            hitsPerPage: this.getWidgetRenderState(renderOptions),
+          };
+        },
+
+        getWidgetRenderState({ state, results, createURL, helper }) {
+          const canRefine = results ? results.nbHits > 0 : false;
+
+          return {
+            items: transformItems(normalizeItems(state), { results }),
+            refine: connectorState.getRefine(helper),
+            createURL: connectorState.createURLFactory({
+              state,
+              createURL,
+              getWidgetUiState: this.getWidgetUiState,
+              helper,
+            }),
+            hasNoResults: !canRefine,
+            canRefine,
+            widgetParams,
+          };
+        },
+
+        getWidgetUiState(uiState, { searchParameters }) {
+          const hitsPerPage = searchParameters.hitsPerPage;
+
+          if (hitsPerPage === undefined || hitsPerPage === defaultItem.value) {
+            return uiState;
+          }
+
+          return {
+            ...uiState,
+            hitsPerPage,
+          };
+        },
+
+        getWidgetSearchParameters(searchParameters, { uiState }) {
+          return searchParameters.setQueryParameters({
+            hitsPerPage: uiState.hitsPerPage || defaultItem.value,
+          });
+        },
+      };
+    };
+  };
diff --git a/packages/instantsearch.js/src/connectors/infinite-hits/connectInfiniteHits.ts b/packages/instantsearch-core/src/connectors/connectInfiniteHits.ts
similarity index 95%
rename from packages/instantsearch.js/src/connectors/infinite-hits/connectInfiniteHits.ts
rename to packages/instantsearch-core/src/connectors/connectInfiniteHits.ts
index 2656199140..b8d13dd703 100644
--- a/packages/instantsearch.js/src/connectors/infinite-hits/connectInfiniteHits.ts
+++ b/packages/instantsearch-core/src/connectors/connectInfiniteHits.ts
@@ -1,18 +1,19 @@
 import {
+  createDocumentationMessageGenerator,
+  isEqual,
+  noop,
+  walkIndex,
   escapeHits,
   TAG_PLACEHOLDER,
+} from '../lib/public';
+import {
   checkRendering,
-  createDocumentationMessageGenerator,
-  isEqual,
   addAbsolutePosition,
   addQueryID,
-  noop,
   createSendEventForHits,
   createBindEventForHits,
-  walkIndex,
-} from '../../lib/utils';
+} from '../lib/utils';
 
-import type { SendEventForHits, BindEventForHits } from '../../lib/utils';
 import type {
   Connector,
   TransformItems,
@@ -22,8 +23,10 @@ import type {
   Renderer,
   Unmounter,
   UnknownWidgetParams,
-  IndexRenderState,
-} from '../../types';
+  SendEventForHits,
+  BindEventForHits,
+  Widget,
+} from '../types';
 import type {
   Banner,
   AlgoliaSearchHelper as Helper,
@@ -212,7 +215,7 @@ function extractHitsFromCachedHits<THit extends NonNullable<object>>(
     }, []);
 }
 
-export default (function connectInfiniteHits<
+export const connectInfiniteHits = function connectInfiniteHits<
   TWidgetParams extends UnknownWidgetParams
 >(
   renderFn: Renderer<InfiniteHitsRenderState, TWidgetParams>,
@@ -290,7 +293,13 @@ export default (function connectInfiniteHits<
           .search();
       };
 
-    return {
+    type InfiniteHitsWidget = Widget<
+      InfiniteHitsWidgetDescription<THit> & {
+        widgetParams: typeof widgetParams;
+      }
+    >;
+
+    const widget: InfiniteHitsWidget = {
       $$type: 'ais.infiniteHits',
 
       init(initOptions) {
@@ -319,14 +328,12 @@ export default (function connectInfiniteHits<
         sendEvent('view:internal', widgetRenderState.currentPageHits);
       },
 
-      getRenderState(
-        renderState,
-        renderOptions
-        // Type is explicitly redefined, to avoid having the TWidgetParams type in the definition
-      ): IndexRenderState & InfiniteHitsWidgetDescription['indexRenderState'] {
+      getRenderState(renderState, renderOptions) {
         return {
           ...renderState,
-          infiniteHits: this.getWidgetRenderState(renderOptions),
+          infiniteHits: this.getWidgetRenderState(renderOptions) as NonNullable<
+            typeof renderState['infiniteHits']
+          >,
         };
       },
 
@@ -497,5 +504,8 @@ export default (function connectInfiniteHits<
         return widgetSearchParameters.setQueryParameter('page', page);
       },
     };
+
+    // casting to avoid large type output
+    return widget as InfiniteHitsWidget;
   };
-} satisfies InfiniteHitsConnector);
+} satisfies InfiniteHitsConnector;
diff --git a/packages/instantsearch.js/src/connectors/looking-similar/connectLookingSimilar.ts b/packages/instantsearch-core/src/connectors/connectLookingSimilar.ts
similarity index 89%
rename from packages/instantsearch.js/src/connectors/looking-similar/connectLookingSimilar.ts
rename to packages/instantsearch-core/src/connectors/connectLookingSimilar.ts
index f3feb39edd..d55fe03ef7 100644
--- a/packages/instantsearch.js/src/connectors/looking-similar/connectLookingSimilar.ts
+++ b/packages/instantsearch-core/src/connectors/connectLookingSimilar.ts
@@ -1,15 +1,16 @@
 import {
   createDocumentationMessageGenerator,
-  checkRendering,
   noop,
   escapeHits,
   TAG_PLACEHOLDER,
+} from '../lib/public';
+import {
+  checkRendering,
   createSendEventForHits,
-  addAbsolutePosition,
   addQueryID,
-} from '../../lib/utils';
+  addAbsolutePosition,
+} from '../lib/utils';
 
-import type { SendEventForHits } from '../../lib/utils';
 import type {
   Connector,
   TransformItems,
@@ -20,7 +21,9 @@ import type {
   RecommendResponse,
   Hit,
   AlgoliaHit,
-} from '../../types';
+  Widget,
+  SendEventForHits,
+} from '../types';
 import type { PlainSearchParameters } from 'algoliasearch-helper';
 
 const withUsage = createDocumentationMessageGenerator({
@@ -99,7 +102,7 @@ export type LookingSimilarConnector<
   LookingSimilarConnectorParams<THit>
 >;
 
-export default (function connectLookingSimilar<
+export const connectLookingSimilar = function connectLookingSimilar<
   TWidgetParams extends UnknownWidgetParams
 >(
   renderFn: Renderer<
@@ -130,9 +133,15 @@ export default (function connectLookingSimilar<
       throw new Error(withUsage('The `objectIDs` option is required.'));
     }
 
+    type LookingSimilarWidget = Widget<
+      LookingSimilarWidgetDescription<THit> & {
+        widgetParams: typeof widgetParams;
+      }
+    >;
+
     let sendEvent: SendEventForHits;
 
-    return {
+    const widget: LookingSimilarWidget = {
       dependsOn: 'recommend',
       $$type: 'ais.lookingSimilar',
 
@@ -162,7 +171,7 @@ export default (function connectLookingSimilar<
         return renderState;
       },
 
-      getWidgetRenderState({ results, helper, instantSearchInstance }) {
+      getWidgetRenderState({ results, instantSearchInstance, helper }) {
         if (!sendEvent) {
           sendEvent = createSendEventForHits({
             instantSearchInstance,
@@ -171,7 +180,7 @@ export default (function connectLookingSimilar<
           });
         }
         if (results === null || results === undefined) {
-          return { items: [], widgetParams, sendEvent };
+          return { items: [], sendEvent, widgetParams };
         }
 
         if (escapeHTML && results.hits.length > 0) {
@@ -198,8 +207,8 @@ export default (function connectLookingSimilar<
 
         return {
           items: transformedItems,
-          widgetParams,
           sendEvent,
+          widgetParams,
         };
       },
 
@@ -229,5 +238,8 @@ export default (function connectLookingSimilar<
         );
       },
     };
+
+    // casting to avoid large type output
+    return widget as LookingSimilarWidget;
   };
-} satisfies LookingSimilarConnector);
+} satisfies LookingSimilarConnector;
diff --git a/packages/instantsearch.js/src/connectors/menu/connectMenu.ts b/packages/instantsearch-core/src/connectors/connectMenu.ts
similarity index 97%
rename from packages/instantsearch.js/src/connectors/menu/connectMenu.ts
rename to packages/instantsearch-core/src/connectors/connectMenu.ts
index 93aee24dbb..2a0c2fd54e 100644
--- a/packages/instantsearch.js/src/connectors/menu/connectMenu.ts
+++ b/packages/instantsearch-core/src/connectors/connectMenu.ts
@@ -1,12 +1,10 @@
 import {
-  checkRendering,
   createDocumentationMessageGenerator,
-  createSendEventForFacet,
   noop,
   warning,
-} from '../../lib/utils';
+} from '../lib/public';
+import { checkRendering, createSendEventForFacet } from '../lib/utils';
 
-import type { SendEventForFacet } from '../../lib/utils';
 import type {
   Connector,
   CreateURL,
@@ -16,7 +14,8 @@ import type {
   TransformItems,
   Widget,
   WidgetRenderState,
-} from '../../types';
+  SendEventForFacet,
+} from '../types';
 import type { SearchResults } from 'algoliasearch-helper';
 
 const withUsage = createDocumentationMessageGenerator({
@@ -144,7 +143,7 @@ export type MenuConnector = Connector<
  *
  * **Requirement:** the attribute passed as `attribute` must be present in "attributes for faceting" on the Algolia dashboard or configured as attributesForFaceting via a set settings call to the Algolia API.
  */
-const connectMenu: MenuConnector = function connectMenu(
+export const connectMenu: MenuConnector = function connectMenu(
   renderFn,
   unmountFn = noop
 ) {
@@ -418,5 +417,3 @@ function removeEmptyRefinementsFromUiState(
 
   return indexUiState;
 }
-
-export default connectMenu;
diff --git a/packages/instantsearch.js/src/connectors/numeric-menu/connectNumericMenu.ts b/packages/instantsearch-core/src/connectors/connectNumericMenu.ts
similarity index 54%
rename from packages/instantsearch.js/src/connectors/numeric-menu/connectNumericMenu.ts
rename to packages/instantsearch-core/src/connectors/connectNumericMenu.ts
index 7c931bf9c2..a44d6d0e60 100644
--- a/packages/instantsearch.js/src/connectors/numeric-menu/connectNumericMenu.ts
+++ b/packages/instantsearch-core/src/connectors/connectNumericMenu.ts
@@ -1,19 +1,15 @@
-import {
-  checkRendering,
-  createDocumentationMessageGenerator,
-  isFiniteNumber,
-  noop,
-} from '../../lib/utils';
-
-import type { SendEventForFacet } from '../../lib/utils';
+import { createDocumentationMessageGenerator, noop } from '../lib/public';
+import { checkRendering } from '../lib/utils';
+
+import type { InstantSearch } from '../instantsearch';
 import type {
   Connector,
   CreateURL,
   IndexUiState,
-  InstantSearch,
   TransformItems,
   WidgetRenderState,
-} from '../../types';
+  SendEventForFacet,
+} from '../types';
 import type { SearchParameters } from 'algoliasearch-helper';
 
 const withUsage = createDocumentationMessageGenerator({
@@ -146,218 +142,214 @@ const createSendEvent =
     }
   };
 
-const connectNumericMenu: NumericMenuConnector = function connectNumericMenu(
-  renderFn,
-  unmountFn = noop
-) {
-  checkRendering(renderFn, withUsage());
-
-  return (widgetParams) => {
-    const {
-      attribute = '',
-      items = [],
-      transformItems = ((item) => item) as NonNullable<
-        NumericMenuConnectorParams['transformItems']
-      >,
-    } = widgetParams || {};
-
-    if (attribute === '') {
-      throw new Error(withUsage('The `attribute` option is required.'));
-    }
+export const connectNumericMenu: NumericMenuConnector =
+  function connectNumericMenu(renderFn, unmountFn = noop) {
+    checkRendering(renderFn, withUsage());
+
+    return (widgetParams) => {
+      const {
+        attribute = '',
+        items = [],
+        transformItems = ((item) => item) as NonNullable<
+          NumericMenuConnectorParams['transformItems']
+        >,
+      } = widgetParams || {};
+
+      if (attribute === '') {
+        throw new Error(withUsage('The `attribute` option is required.'));
+      }
 
-    if (!items || items.length === 0) {
-      throw new Error(
-        withUsage('The `items` option expects an array of objects.')
-      );
-    }
+      if (!items || items.length === 0) {
+        throw new Error(
+          withUsage('The `items` option expects an array of objects.')
+        );
+      }
 
-    type ConnectorState = {
-      refine?: (facetValue: string) => void;
-      createURL?: (state: SearchParameters) => (facetValue: string) => string;
-      sendEvent?: SendEventForFacet;
-    };
+      type ConnectorState = {
+        refine?: (facetValue: string) => void;
+        createURL?: (state: SearchParameters) => (facetValue: string) => string;
+        sendEvent?: SendEventForFacet;
+      };
 
-    const prepareItems = (state: SearchParameters) =>
-      items.map(({ start, end, label }) => ({
-        label,
-        value: encodeURI(JSON.stringify({ start, end })),
-        isRefined: isRefined(state, attribute, { start, end, label }),
-      }));
+      const prepareItems = (state: SearchParameters) =>
+        items.map(({ start, end, label }) => ({
+          label,
+          value: encodeURI(JSON.stringify({ start, end })),
+          isRefined: isRefined(state, attribute, { start, end, label }),
+        }));
 
-    const connectorState: ConnectorState = {};
+      const connectorState: ConnectorState = {};
 
-    return {
-      $$type,
+      return {
+        $$type,
 
-      init(initOptions) {
-        const { instantSearchInstance } = initOptions;
+        init(initOptions) {
+          const { instantSearchInstance } = initOptions;
 
-        renderFn(
-          {
-            ...this.getWidgetRenderState(initOptions),
-            instantSearchInstance,
-          },
-          true
-        );
-      },
-
-      render(renderOptions) {
-        const { instantSearchInstance } = renderOptions;
-        renderFn(
-          {
-            ...this.getWidgetRenderState(renderOptions),
-            instantSearchInstance,
-          },
-          false
-        );
-      },
+          renderFn(
+            {
+              ...this.getWidgetRenderState(initOptions),
+              instantSearchInstance,
+            },
+            true
+          );
+        },
+
+        render(renderOptions) {
+          const { instantSearchInstance } = renderOptions;
+          renderFn(
+            {
+              ...this.getWidgetRenderState(renderOptions),
+              instantSearchInstance,
+            },
+            false
+          );
+        },
+
+        dispose({ state }) {
+          unmountFn();
+          return state.removeNumericRefinement(attribute);
+        },
+
+        getWidgetUiState(uiState, { searchParameters }) {
+          const values = searchParameters.getNumericRefinements(attribute);
+
+          const equal = values['='] && values['='][0];
+
+          if (equal || equal === 0) {
+            return {
+              ...uiState,
+              numericMenu: {
+                ...uiState.numericMenu,
+                [attribute]: `${values['=']}`,
+              },
+            };
+          }
 
-      dispose({ state }) {
-        unmountFn();
-        return state.removeNumericRefinement(attribute);
-      },
+          const min = (values['>='] && values['>='][0]) || '';
+          const max = (values['<='] && values['<='][0]) || '';
 
-      getWidgetUiState(uiState, { searchParameters }) {
-        const values = searchParameters.getNumericRefinements(attribute);
+          return removeEmptyRefinementsFromUiState(
+            {
+              ...uiState,
+              numericMenu: {
+                ...uiState.numericMenu,
+                [attribute]: `${min}:${max}`,
+              },
+            },
+            attribute
+          );
+        },
 
-        const equal = values['='] && values['='][0];
+        getWidgetSearchParameters(searchParameters, { uiState }) {
+          const value = uiState.numericMenu && uiState.numericMenu[attribute];
 
-        if (equal || equal === 0) {
-          return {
-            ...uiState,
-            numericMenu: {
-              ...uiState.numericMenu,
-              [attribute]: `${values['=']}`,
+          const withoutRefinements = searchParameters.setQueryParameters({
+            numericRefinements: {
+              ...searchParameters.numericRefinements,
+              [attribute]: {},
             },
-          };
-        }
+          });
 
-        const min = (values['>='] && values['>='][0]) || '';
-        const max = (values['<='] && values['<='][0]) || '';
+          if (!value) {
+            return withoutRefinements;
+          }
 
-        return removeEmptyRefinementsFromUiState(
-          {
-            ...uiState,
-            numericMenu: {
-              ...uiState.numericMenu,
-              [attribute]: `${min}:${max}`,
-            },
-          },
-          attribute
-        );
-      },
+          const isExact = value.indexOf(':') === -1;
 
-      getWidgetSearchParameters(searchParameters, { uiState }) {
-        const value = uiState.numericMenu && uiState.numericMenu[attribute];
+          if (isExact) {
+            return withoutRefinements.addNumericRefinement(
+              attribute,
+              '=',
+              Number(value)
+            );
+          }
 
-        const withoutRefinements = searchParameters.setQueryParameters({
-          numericRefinements: {
-            ...searchParameters.numericRefinements,
-            [attribute]: {},
-          },
-        });
+          const [min, max] = value.split(':').map(parseFloat);
 
-        if (!value) {
-          return withoutRefinements;
-        }
+          const withMinRefinement = Number.isFinite(min)
+            ? withoutRefinements.addNumericRefinement(attribute, '>=', min)
+            : withoutRefinements;
 
-        const isExact = value.indexOf(':') === -1;
+          const withMaxRefinement = Number.isFinite(max)
+            ? withMinRefinement.addNumericRefinement(attribute, '<=', max)
+            : withMinRefinement;
 
-        if (isExact) {
-          return withoutRefinements.addNumericRefinement(
-            attribute,
-            '=',
-            Number(value)
-          );
-        }
-
-        const [min, max] = value.split(':').map(parseFloat);
-
-        const withMinRefinement = isFiniteNumber(min)
-          ? withoutRefinements.addNumericRefinement(attribute, '>=', min)
-          : withoutRefinements;
-
-        const withMaxRefinement = isFiniteNumber(max)
-          ? withMinRefinement.addNumericRefinement(attribute, '<=', max)
-          : withMinRefinement;
-
-        return withMaxRefinement;
-      },
-
-      getRenderState(renderState, renderOptions) {
-        return {
-          ...renderState,
-          numericMenu: {
-            ...renderState.numericMenu,
-            [attribute]: this.getWidgetRenderState(renderOptions),
-          },
-        };
-      },
-
-      getWidgetRenderState({
-        results,
-        state,
-        instantSearchInstance,
-        helper,
-        createURL,
-      }) {
-        if (!connectorState.refine) {
-          connectorState.refine = (facetValue) => {
-            const refinedState = getRefinedState(
-              helper.state,
-              attribute,
-              facetValue
-            );
-            connectorState.sendEvent!('click:internal', facetValue);
-            helper.setState(refinedState).search();
+          return withMaxRefinement;
+        },
+
+        getRenderState(renderState, renderOptions) {
+          return {
+            ...renderState,
+            numericMenu: {
+              ...renderState.numericMenu,
+              [attribute]: this.getWidgetRenderState(renderOptions),
+            },
           };
-        }
-
-        if (!connectorState.createURL) {
-          connectorState.createURL = (newState) => (facetValue) =>
-            createURL((uiState) =>
-              this.getWidgetUiState(uiState, {
-                searchParameters: getRefinedState(
-                  newState,
-                  attribute,
-                  facetValue
-                ),
-                helper,
-              })
-            );
-        }
+        },
+
+        getWidgetRenderState({
+          results,
+          state,
+          instantSearchInstance,
+          helper,
+          createURL,
+        }) {
+          if (!connectorState.refine) {
+            connectorState.refine = (facetValue) => {
+              const refinedState = getRefinedState(
+                helper.state,
+                attribute,
+                facetValue
+              );
+              connectorState.sendEvent!('click:internal', facetValue);
+              helper.setState(refinedState).search();
+            };
+          }
 
-        if (!connectorState.sendEvent) {
-          connectorState.sendEvent = createSendEvent({
-            instantSearchInstance,
-          });
-        }
-
-        const hasNoResults = results ? results.nbHits === 0 : true;
-        const preparedItems = prepareItems(state);
-        let allIsSelected = true;
-        // @TODO avoid for..of for polyfill reasons
-        // eslint-disable-next-line no-restricted-syntax
-        for (const item of preparedItems) {
-          if (item.isRefined && decodeURI(item.value) !== '{}') {
-            allIsSelected = false;
-            break;
+          if (!connectorState.createURL) {
+            connectorState.createURL = (newState) => (facetValue) =>
+              createURL((uiState) =>
+                this.getWidgetUiState(uiState, {
+                  searchParameters: getRefinedState(
+                    newState,
+                    attribute,
+                    facetValue
+                  ),
+                  helper,
+                })
+              );
+          }
+
+          if (!connectorState.sendEvent) {
+            connectorState.sendEvent = createSendEvent({
+              instantSearchInstance,
+            });
+          }
+
+          const hasNoResults = results ? results.nbHits === 0 : true;
+          const preparedItems = prepareItems(state);
+          let allIsSelected = true;
+          for (const item of preparedItems) {
+            if (item.isRefined && decodeURI(item.value) !== '{}') {
+              allIsSelected = false;
+              break;
+            }
           }
-        }
-
-        return {
-          createURL: connectorState.createURL(state),
-          items: transformItems(preparedItems, { results }),
-          hasNoResults,
-          canRefine: !(hasNoResults && allIsSelected),
-          refine: connectorState.refine,
-          sendEvent: connectorState.sendEvent,
-          widgetParams,
-        };
-      },
+
+          return {
+            createURL: connectorState.createURL(state),
+            items: transformItems(preparedItems, { results }),
+            hasNoResults,
+            canRefine: !(hasNoResults && allIsSelected),
+            refine: connectorState.refine,
+            sendEvent: connectorState.sendEvent,
+            widgetParams,
+          };
+        },
+      };
     };
   };
-};
 
 function isRefined(
   state: SearchParameters,
@@ -504,5 +496,3 @@ function removeEmptyRefinementsFromUiState(
 
   return indexUiState;
 }
-
-export default connectNumericMenu;
diff --git a/packages/instantsearch-core/src/connectors/connectPagination.ts b/packages/instantsearch-core/src/connectors/connectPagination.ts
new file mode 100644
index 0000000000..6c278a3dcc
--- /dev/null
+++ b/packages/instantsearch-core/src/connectors/connectPagination.ts
@@ -0,0 +1,201 @@
+import Paginator from '../lib/Paginator';
+import { createDocumentationMessageGenerator, noop } from '../lib/public';
+import { checkRendering } from '../lib/utils';
+
+import type { Connector, CreateURL, WidgetRenderState } from '../types';
+
+const withUsage = createDocumentationMessageGenerator({
+  name: 'pagination',
+  connector: true,
+});
+
+export type PaginationConnectorParams = {
+  /**
+   * The total number of pages to browse.
+   */
+  totalPages?: number;
+
+  /**
+   * The padding of pages to show around the current page
+   * @default 3
+   */
+  padding?: number;
+};
+
+export type PaginationRenderState = {
+  /** Creates URLs for the next state, the number is the page to generate the URL for. */
+  createURL: CreateURL<number>;
+
+  /** Sets the current page and triggers a search. */
+  refine: (page: number) => void;
+
+  /** true if this search returned more than one page */
+  canRefine: boolean;
+
+  /** The number of the page currently displayed. */
+  currentRefinement: number;
+
+  /** The number of hits computed for the last query (can be approximated). */
+  nbHits: number;
+
+  /** The number of pages for the result set. */
+  nbPages: number;
+
+  /** The actual pages relevant to the current situation and padding. */
+  pages: number[];
+
+  /** true if the current page is also the first page. */
+  isFirstPage: boolean;
+
+  /** true if the current page is also the last page. */
+  isLastPage: boolean;
+};
+
+export type PaginationWidgetDescription = {
+  $$type: 'ais.pagination';
+  renderState: PaginationRenderState;
+  indexRenderState: {
+    pagination: WidgetRenderState<
+      PaginationRenderState,
+      PaginationConnectorParams
+    >;
+  };
+  indexUiState: {
+    page: number;
+  };
+};
+
+export type PaginationConnector = Connector<
+  PaginationWidgetDescription,
+  PaginationConnectorParams
+>;
+
+/**
+ * **Pagination** connector provides the logic to build a widget that will let the user
+ * choose the current page of the results.
+ *
+ * When using the pagination with Algolia, you should be aware that the engine won't provide you pages
+ * beyond the 1000th hits by default. You can find more information on the [Algolia documentation](https://www.algolia.com/doc/guides/searching/pagination/#pagination-limitations).
+ */
+export const connectPagination: PaginationConnector =
+  function connectPagination(renderFn, unmountFn = noop) {
+    checkRendering(renderFn, withUsage());
+
+    return (widgetParams) => {
+      const { totalPages, padding = 3 } = widgetParams || {};
+
+      const pager = new Paginator({
+        currentPage: 0,
+        total: 0,
+        padding,
+      });
+
+      type ConnectorState = {
+        refine?: (page: number) => void;
+        createURL?: (page: number) => string;
+      };
+
+      const connectorState: ConnectorState = {};
+
+      function getMaxPage({ nbPages }: { nbPages: number }) {
+        return totalPages !== undefined
+          ? Math.min(totalPages, nbPages)
+          : nbPages;
+      }
+
+      return {
+        $$type: 'ais.pagination',
+
+        init(initOptions) {
+          const { instantSearchInstance } = initOptions;
+
+          renderFn(
+            {
+              ...this.getWidgetRenderState(initOptions),
+              instantSearchInstance,
+            },
+            true
+          );
+        },
+
+        render(renderOptions) {
+          const { instantSearchInstance } = renderOptions;
+
+          renderFn(
+            {
+              ...this.getWidgetRenderState(renderOptions),
+              instantSearchInstance,
+            },
+            false
+          );
+        },
+
+        dispose({ state }) {
+          unmountFn();
+
+          return state.setQueryParameter('page', undefined);
+        },
+
+        getWidgetUiState(uiState, { searchParameters }) {
+          const page = searchParameters.page || 0;
+
+          if (!page) {
+            return uiState;
+          }
+
+          return {
+            ...uiState,
+            page: page + 1,
+          };
+        },
+
+        getWidgetSearchParameters(searchParameters, { uiState }) {
+          const page = uiState.page ? uiState.page - 1 : 0;
+
+          return searchParameters.setQueryParameter('page', page);
+        },
+
+        getWidgetRenderState({ results, helper, state, createURL }) {
+          if (!connectorState.refine) {
+            connectorState.refine = (page) => {
+              helper.setPage(page);
+              helper.search();
+            };
+          }
+
+          if (!connectorState.createURL) {
+            connectorState.createURL = (page) =>
+              createURL((uiState) => ({
+                ...uiState,
+                page: page + 1,
+              }));
+          }
+
+          const page = state.page || 0;
+          const nbPages = getMaxPage(results || { nbPages: 0 });
+          pager.currentPage = page;
+          pager.total = nbPages;
+
+          return {
+            createURL: connectorState.createURL,
+            refine: connectorState.refine,
+            canRefine: nbPages > 1,
+            currentRefinement: page,
+            nbHits: results?.nbHits || 0,
+            nbPages,
+            pages: results ? pager.pages() : [],
+            isFirstPage: pager.isFirstPage(),
+            isLastPage: pager.isLastPage(),
+            widgetParams,
+          };
+        },
+
+        getRenderState(renderState, renderOptions) {
+          return {
+            ...renderState,
+            pagination: this.getWidgetRenderState(renderOptions),
+          };
+        },
+      };
+    };
+  };
diff --git a/packages/instantsearch.js/src/connectors/powered-by/connectPoweredBy.ts b/packages/instantsearch-core/src/connectors/connectPoweredBy.ts
similarity index 91%
rename from packages/instantsearch.js/src/connectors/powered-by/connectPoweredBy.ts
rename to packages/instantsearch-core/src/connectors/connectPoweredBy.ts
index 88ba26ba8c..7cc36b8016 100644
--- a/packages/instantsearch.js/src/connectors/powered-by/connectPoweredBy.ts
+++ b/packages/instantsearch-core/src/connectors/connectPoweredBy.ts
@@ -1,11 +1,11 @@
 import {
   safelyRunOnBrowser,
-  checkRendering,
   createDocumentationMessageGenerator,
   noop,
-} from '../../lib/utils';
+} from '../lib/public';
+import { checkRendering } from '../lib/utils';
 
-import type { Connector, WidgetRenderState } from '../../types';
+import type { Connector, WidgetRenderState } from '../types';
 
 const withUsage = createDocumentationMessageGenerator({
   name: 'powered-by',
@@ -42,7 +42,7 @@ export type PoweredByConnector = Connector<
  * **PoweredBy** connector provides the logic to build a custom widget that will displays
  * the logo to redirect to Algolia.
  */
-const connectPoweredBy: PoweredByConnector = function connectPoweredBy(
+export const connectPoweredBy: PoweredByConnector = function connectPoweredBy(
   renderFn,
   unmountFn = noop
 ) {
@@ -107,5 +107,3 @@ const connectPoweredBy: PoweredByConnector = function connectPoweredBy(
     };
   };
 };
-
-export default connectPoweredBy;
diff --git a/packages/instantsearch.js/src/connectors/query-rules/connectQueryRules.ts b/packages/instantsearch-core/src/connectors/connectQueryRules.ts
similarity index 54%
rename from packages/instantsearch.js/src/connectors/query-rules/connectQueryRules.ts
rename to packages/instantsearch-core/src/connectors/connectQueryRules.ts
index 8a84f22dc1..9a05a73a80 100644
--- a/packages/instantsearch.js/src/connectors/query-rules/connectQueryRules.ts
+++ b/packages/instantsearch-core/src/connectors/connectQueryRules.ts
@@ -1,17 +1,16 @@
 import {
-  checkRendering,
   createDocumentationMessageGenerator,
   warning,
-  getRefinements,
   isEqual,
   noop,
-} from '../../lib/utils';
+} from '../lib/public';
+import { checkRendering, getRefinements } from '../lib/utils';
 
 import type {
   Refinement as InternalRefinement,
   NumericRefinement as InternalNumericRefinement,
-} from '../../lib/utils';
-import type { Connector, TransformItems, WidgetRenderState } from '../../types';
+} from '../lib/utils';
+import type { Connector, TransformItems, WidgetRenderState } from '../types';
 import type {
   AlgoliaSearchHelper as Helper,
   SearchParameters,
@@ -158,120 +157,117 @@ export type QueryRulesConnector = Connector<
   QueryRulesConnectorParams
 >;
 
-const connectQueryRules: QueryRulesConnector = function connectQueryRules(
-  render,
-  unmount = noop
-) {
-  checkRendering(render, withUsage());
-
-  return (widgetParams) => {
-    const {
-      trackedFilters = {} as ParamTrackedFilters,
-      transformRuleContexts = ((rules) => rules) as ParamTransformRuleContexts,
-      transformItems = ((items) => items) as NonNullable<
-        QueryRulesConnectorParams['transformItems']
-      >,
-    } = widgetParams || {};
-
-    Object.keys(trackedFilters).forEach((facetName) => {
-      if (typeof trackedFilters[facetName] !== 'function') {
-        throw new Error(
-          withUsage(
-            `'The "${facetName}" filter value in the \`trackedFilters\` option expects a function.`
-          )
-        );
-      }
-    });
-
-    const hasTrackedFilters = Object.keys(trackedFilters).length > 0;
-
-    // We store the initial rule contexts applied before creating the widget
-    // so that we do not override them with the rules created from `trackedFilters`.
-    let initialRuleContexts: string[] = [];
-    let onHelperChange: (event: { state: SearchParameters }) => void;
-
-    return {
-      $$type: 'ais.queryRules',
-
-      init(initOptions) {
-        const { helper, state, instantSearchInstance } = initOptions;
-
-        initialRuleContexts = state.ruleContexts || [];
-        onHelperChange = applyRuleContexts.bind({
-          helper,
-          initialRuleContexts,
-          trackedFilters,
-          transformRuleContexts,
-        });
-
-        if (hasTrackedFilters) {
-          // We need to apply the `ruleContexts` based on the `trackedFilters`
-          // before the helper changes state in some cases:
-          //   - Some filters are applied on the first load (e.g. using `configure`)
-          //   - The `transformRuleContexts` option sets initial `ruleContexts`.
-          if (
-            hasStateRefinements(state) ||
-            Boolean(widgetParams.transformRuleContexts)
-          ) {
-            onHelperChange({ state });
-          }
-
-          // We track every change in the helper to override its state and add
-          // any `ruleContexts` needed based on the `trackedFilters`.
-          helper.on('change', onHelperChange);
+export const connectQueryRules: QueryRulesConnector =
+  function connectQueryRules(render, unmount = noop) {
+    checkRendering(render, withUsage());
+
+    return (widgetParams) => {
+      const {
+        trackedFilters = {} as ParamTrackedFilters,
+        transformRuleContexts = ((rules) =>
+          rules) as ParamTransformRuleContexts,
+        transformItems = ((items) => items) as NonNullable<
+          QueryRulesConnectorParams['transformItems']
+        >,
+      } = widgetParams || {};
+
+      Object.keys(trackedFilters).forEach((facetName) => {
+        if (typeof trackedFilters[facetName] !== 'function') {
+          throw new Error(
+            withUsage(
+              `'The "${facetName}" filter value in the \`trackedFilters\` option expects a function.`
+            )
+          );
         }
+      });
+
+      const hasTrackedFilters = Object.keys(trackedFilters).length > 0;
+
+      // We store the initial rule contexts applied before creating the widget
+      // so that we do not override them with the rules created from `trackedFilters`.
+      let initialRuleContexts: string[] = [];
+      let onHelperChange: (event: { state: SearchParameters }) => void;
+
+      return {
+        $$type: 'ais.queryRules',
+
+        init(initOptions) {
+          const { helper, state, instantSearchInstance } = initOptions;
+
+          initialRuleContexts = state.ruleContexts || [];
+          onHelperChange = applyRuleContexts.bind({
+            helper,
+            initialRuleContexts,
+            trackedFilters,
+            transformRuleContexts,
+          });
+
+          if (hasTrackedFilters) {
+            // We need to apply the `ruleContexts` based on the `trackedFilters`
+            // before the helper changes state in some cases:
+            //   - Some filters are applied on the first load (e.g. using `configure`)
+            //   - The `transformRuleContexts` option sets initial `ruleContexts`.
+            if (
+              hasStateRefinements(state) ||
+              Boolean(widgetParams.transformRuleContexts)
+            ) {
+              onHelperChange({ state });
+            }
+
+            // We track every change in the helper to override its state and add
+            // any `ruleContexts` needed based on the `trackedFilters`.
+            helper.on('change', onHelperChange);
+          }
 
-        render(
-          {
-            ...this.getWidgetRenderState(initOptions),
-            instantSearchInstance,
-          },
-          true
-        );
-      },
-
-      render(renderOptions) {
-        const { instantSearchInstance } = renderOptions;
-
-        render(
-          {
-            ...this.getWidgetRenderState(renderOptions),
-            instantSearchInstance,
-          },
-          false
-        );
-      },
-
-      getWidgetRenderState({ results }) {
-        const { userData = [] } = results || {};
-        const items = transformItems(userData, { results });
-
-        return {
-          items,
-          widgetParams,
-        };
-      },
-
-      getRenderState(renderState, renderOptions) {
-        return {
-          ...renderState,
-          queryRules: this.getWidgetRenderState(renderOptions),
-        };
-      },
-
-      dispose({ helper, state }) {
-        unmount();
-
-        if (hasTrackedFilters) {
-          helper.removeListener('change', onHelperChange);
-
-          return state.setQueryParameter('ruleContexts', initialRuleContexts);
-        }
+          render(
+            {
+              ...this.getWidgetRenderState(initOptions),
+              instantSearchInstance,
+            },
+            true
+          );
+        },
+
+        render(renderOptions) {
+          const { instantSearchInstance } = renderOptions;
+
+          render(
+            {
+              ...this.getWidgetRenderState(renderOptions),
+              instantSearchInstance,
+            },
+            false
+          );
+        },
+
+        getWidgetRenderState({ results }) {
+          const { userData = [] } = results || {};
+          const items = transformItems(userData, { results });
+
+          return {
+            items,
+            widgetParams,
+          };
+        },
+
+        getRenderState(renderState, renderOptions) {
+          return {
+            ...renderState,
+            queryRules: this.getWidgetRenderState(renderOptions),
+          };
+        },
+
+        dispose({ helper, state }) {
+          unmount();
+
+          if (hasTrackedFilters) {
+            helper.removeListener('change', onHelperChange);
+
+            return state.setQueryParameter('ruleContexts', initialRuleContexts);
+          }
 
-        return state;
-      },
+          return state;
+        },
+      };
     };
   };
-};
-
-export default connectQueryRules;
diff --git a/packages/instantsearch.js/src/connectors/range/connectRange.ts b/packages/instantsearch-core/src/connectors/connectRange.ts
similarity index 83%
rename from packages/instantsearch.js/src/connectors/range/connectRange.ts
rename to packages/instantsearch-core/src/connectors/connectRange.ts
index b951b05e33..314108070f 100644
--- a/packages/instantsearch.js/src/connectors/range/connectRange.ts
+++ b/packages/instantsearch-core/src/connectors/connectRange.ts
@@ -1,13 +1,8 @@
-import {
-  checkRendering,
-  createDocumentationMessageGenerator,
-  isFiniteNumber,
-  find,
-  noop,
-} from '../../lib/utils';
-
-import type { SendEventForFacet } from '../../lib/utils';
-import type { Connector, InstantSearch, WidgetRenderState } from '../../types';
+import { createDocumentationMessageGenerator, noop } from '../lib/public';
+import { checkRendering } from '../lib/utils';
+
+import type { InstantSearch } from '../instantsearch';
+import type { Connector, WidgetRenderState, SendEventForFacet } from '../types';
 import type { AlgoliaSearchHelper, SearchResults } from 'algoliasearch-helper';
 
 const withUsage = createDocumentationMessageGenerator(
@@ -136,7 +131,7 @@ function toPrecision({
  * This connectors provides a `refine()` function that accepts bounds. It will also provide
  * information about the min and max bounds for the current result set.
  */
-const connectRange: RangeConnector = function connectRange(
+export const connectRange: RangeConnector = function connectRange(
   renderFn,
   unmountFn = noop
 ) {
@@ -155,9 +150,9 @@ const connectRange: RangeConnector = function connectRange(
     }
 
     if (
-      isFiniteNumber(minBound) &&
-      isFiniteNumber(maxBound) &&
-      minBound > maxBound
+      Number.isFinite(minBound) &&
+      Number.isFinite(maxBound) &&
+      minBound! > maxBound!
     ) {
       throw new Error(withUsage("The `max` option can't be lower than `min`."));
     }
@@ -193,18 +188,18 @@ const connectRange: RangeConnector = function connectRange(
       });
 
       let newNextMin: RangeMin;
-      if (!isFiniteNumber(minBound) && currentRangeMin === nextMinAsNumber) {
+      if (!Number.isFinite(minBound) && currentRangeMin === nextMinAsNumber) {
         newNextMin = undefined;
-      } else if (isFiniteNumber(minBound) && isResetMin) {
+      } else if (Number.isFinite(minBound) && isResetMin) {
         newNextMin = minBound;
       } else {
         newNextMin = nextMinAsNumber;
       }
 
       let newNextMax: RangeMax;
-      if (!isFiniteNumber(maxBound) && currentRangeMax === nextMaxAsNumber) {
+      if (!Number.isFinite(maxBound) && currentRangeMax === nextMaxAsNumber) {
         newNextMax = undefined;
-      } else if (isFiniteNumber(maxBound) && isResetMax) {
+      } else if (Number.isFinite(maxBound) && isResetMax) {
         newNextMax = maxBound;
       } else {
         newNextMax = nextMaxAsNumber;
@@ -213,19 +208,19 @@ const connectRange: RangeConnector = function connectRange(
       const isResetNewNextMin = newNextMin === undefined;
 
       const isGreaterThanCurrentRange =
-        isFiniteNumber(currentRangeMin) && currentRangeMin <= newNextMin!;
+        Number.isFinite(currentRangeMin) && currentRangeMin! <= newNextMin!;
       const isMinValid =
         isResetNewNextMin ||
-        (isFiniteNumber(newNextMin) &&
-          (!isFiniteNumber(currentRangeMin) || isGreaterThanCurrentRange));
+        (Number.isFinite(newNextMin) &&
+          (!Number.isFinite(currentRangeMin) || isGreaterThanCurrentRange));
 
       const isResetNewNextMax = newNextMax === undefined;
       const isLowerThanRange =
-        isFiniteNumber(newNextMax) && currentRangeMax! >= newNextMax;
+        Number.isFinite(newNextMax) && currentRangeMax! >= newNextMax!;
       const isMaxValid =
         isResetNewNextMax ||
-        (isFiniteNumber(newNextMax) &&
-          (!isFiniteNumber(currentRangeMax) || isLowerThanRange));
+        (Number.isFinite(newNextMax) &&
+          (!Number.isFinite(currentRangeMax) || isLowerThanRange));
 
       const hasMinChange = min !== newNextMin;
       const hasMaxChange = max !== newNextMax;
@@ -233,19 +228,19 @@ const connectRange: RangeConnector = function connectRange(
       if ((hasMinChange || hasMaxChange) && isMinValid && isMaxValid) {
         resolvedState = resolvedState.removeNumericRefinement(attribute);
 
-        if (isFiniteNumber(newNextMin)) {
+        if (Number.isFinite(newNextMin)) {
           resolvedState = resolvedState.addNumericRefinement(
             attribute,
             '>=',
-            newNextMin
+            newNextMin!
           );
         }
 
-        if (isFiniteNumber(newNextMax)) {
+        if (Number.isFinite(newNextMax)) {
           resolvedState = resolvedState.addNumericRefinement(
             attribute,
             '<=',
-            newNextMax
+            newNextMax!
           );
         }
 
@@ -268,19 +263,19 @@ const connectRange: RangeConnector = function connectRange(
       stats: Partial<NonNullable<SearchResults.Facet['stats']>>
     ) {
       let min: number;
-      if (isFiniteNumber(minBound)) {
-        min = minBound;
-      } else if (isFiniteNumber(stats.min)) {
-        min = stats.min;
+      if (Number.isFinite(minBound)) {
+        min = minBound!;
+      } else if (Number.isFinite(stats.min)) {
+        min = stats.min!;
       } else {
         min = 0;
       }
 
       let max: number;
-      if (isFiniteNumber(maxBound)) {
-        max = maxBound;
-      } else if (isFiniteNumber(stats.max)) {
-        max = stats.max;
+      if (Number.isFinite(maxBound)) {
+        max = maxBound!;
+      } else if (Number.isFinite(stats.max)) {
+        max = stats.max!;
       } else {
         max = 0;
       }
@@ -295,8 +290,14 @@ const connectRange: RangeConnector = function connectRange(
 
       const [maxValue] = helper.getNumericRefinement(attribute, '<=') || [];
 
-      const min = isFiniteNumber(minValue) ? minValue : -Infinity;
-      const max = isFiniteNumber(maxValue) ? maxValue : Infinity;
+      const min =
+        typeof minValue === 'number' && Number.isFinite(minValue)
+          ? minValue
+          : -Infinity;
+      const max =
+        typeof maxValue === 'number' && Number.isFinite(maxValue)
+          ? maxValue
+          : Infinity;
 
       return [min, max];
     }
@@ -350,8 +351,7 @@ const connectRange: RangeConnector = function connectRange(
 
       getWidgetRenderState({ results, helper, instantSearchInstance }) {
         const facetsFromResults = (results && results.disjunctiveFacets) || [];
-        const facet = find(
-          facetsFromResults,
+        const facet = facetsFromResults.find(
           (facetResult) => facetResult.name === attribute
         );
         const stats = (facet && facet.stats) || {
@@ -425,19 +425,19 @@ const connectRange: RangeConnector = function connectRange(
             },
           });
 
-        if (isFiniteNumber(minBound)) {
+        if (Number.isFinite(minBound)) {
           widgetSearchParameters = widgetSearchParameters.addNumericRefinement(
             attribute,
             '>=',
-            minBound
+            minBound!
           );
         }
 
-        if (isFiniteNumber(maxBound)) {
+        if (Number.isFinite(maxBound)) {
           widgetSearchParameters = widgetSearchParameters.addNumericRefinement(
             attribute,
             '<=',
-            maxBound
+            maxBound!
           );
         }
 
@@ -450,8 +450,8 @@ const connectRange: RangeConnector = function connectRange(
         const [lowerBound, upperBound] = value.split(':').map(parseFloat);
 
         if (
-          isFiniteNumber(lowerBound) &&
-          (!isFiniteNumber(minBound) || minBound < lowerBound)
+          Number.isFinite(lowerBound) &&
+          (!Number.isFinite(minBound) || minBound! < lowerBound)
         ) {
           widgetSearchParameters =
             widgetSearchParameters.removeNumericRefinement(attribute, '>=');
@@ -463,8 +463,8 @@ const connectRange: RangeConnector = function connectRange(
         }
 
         if (
-          isFiniteNumber(upperBound) &&
-          (!isFiniteNumber(maxBound) || upperBound < maxBound)
+          Number.isFinite(upperBound) &&
+          (!Number.isFinite(maxBound) || upperBound < maxBound!)
         ) {
           widgetSearchParameters =
             widgetSearchParameters.removeNumericRefinement(attribute, '<=');
@@ -480,5 +480,3 @@ const connectRange: RangeConnector = function connectRange(
     };
   };
 };
-
-export default connectRange;
diff --git a/packages/instantsearch-core/src/connectors/connectRatingMenu.ts b/packages/instantsearch-core/src/connectors/connectRatingMenu.ts
new file mode 100644
index 0000000000..1a354dea7a
--- /dev/null
+++ b/packages/instantsearch-core/src/connectors/connectRatingMenu.ts
@@ -0,0 +1,495 @@
+import {
+  createDocumentationLink,
+  createDocumentationMessageGenerator,
+  noop,
+  warning,
+} from '../lib/public';
+import { checkRendering } from '../lib/utils';
+
+import type { InstantSearch } from '../instantsearch';
+import type {
+  InsightsEvent,
+  Connector,
+  CreateURL,
+  WidgetRenderState,
+  Widget,
+  InitOptions,
+  RenderOptions,
+  IndexUiState,
+} from '../types';
+import type {
+  AlgoliaSearchHelper,
+  SearchParameters,
+  SearchResults,
+} from 'algoliasearch-helper';
+
+const withUsage = createDocumentationMessageGenerator({
+  name: 'rating-menu',
+  connector: true,
+});
+
+const $$type = 'ais.ratingMenu';
+
+const MAX_VALUES_PER_FACET_API_LIMIT = 1000;
+const STEP = 1;
+
+type SendEvent = (...args: [InsightsEvent] | [string, string, string?]) => void;
+
+type CreateSendEvent = (createSendEventArgs: {
+  instantSearchInstance: InstantSearch;
+  helper: AlgoliaSearchHelper;
+  getRefinedStar: () => number | number[] | undefined;
+  attribute: string;
+}) => SendEvent;
+
+const createSendEvent: CreateSendEvent =
+  ({ instantSearchInstance, helper, getRefinedStar, attribute }) =>
+  (...args) => {
+    if (args.length === 1) {
+      instantSearchInstance.sendEventToInsights(args[0]);
+      return;
+    }
+    const [, facetValue, eventName = 'Filter Applied'] = args;
+    const [eventType, eventModifier] = args[0].split(':');
+    if (eventType !== 'click') {
+      return;
+    }
+    const isRefined = getRefinedStar() === Number(facetValue);
+    if (!isRefined) {
+      instantSearchInstance.sendEventToInsights({
+        insightsMethod: 'clickedFilters',
+        widgetType: $$type,
+        eventType,
+        eventModifier,
+        payload: {
+          eventName,
+          index: helper.getIndex(),
+          filters: [`${attribute}>=${facetValue}`],
+        },
+        attribute,
+      });
+    }
+  };
+
+type StarRatingItems = {
+  /**
+   * Name corresponding to the number of stars.
+   */
+  name: string;
+  /**
+   * Human-readable name corresponding to the number of stars.
+   */
+  label: string;
+  /**
+   * Number of stars as string.
+   */
+  value: string;
+  /**
+   * Count of matched results corresponding to the number of stars.
+   */
+  count: number;
+  /**
+   *  Array of length of maximum rating value with stars to display or not.
+   */
+  stars: boolean[];
+  /**
+   * Indicates if star rating refinement is applied.
+   */
+  isRefined: boolean;
+};
+
+export type RatingMenuConnectorParams = {
+  /**
+   * Name of the attribute for faceting (eg. "free_shipping").
+   */
+  attribute: string;
+
+  /**
+   * The maximum rating value.
+   */
+  max?: number;
+};
+
+export type RatingMenuRenderState = {
+  /**
+   * Possible star ratings the user can apply.
+   */
+  items: StarRatingItems[];
+
+  /**
+   * Creates an URL for the next state (takes the item value as parameter). Takes the value of an item as parameter.
+   */
+  createURL: CreateURL<string>;
+
+  /**
+   *  Indicates if search state can be refined.
+   */
+  canRefine: boolean;
+
+  /**
+   * Selects a rating to filter the results (takes the filter value as parameter). Takes the value of an item as parameter.
+   */
+  refine: (value: string) => void;
+
+  /**
+   * `true` if the last search contains no result.
+   *
+   * @deprecated Use `canRefine` instead.
+   */
+  hasNoResults: boolean;
+
+  /**
+   * Send event to insights middleware
+   */
+  sendEvent: SendEvent;
+};
+
+export type RatingMenuWidgetDescription = {
+  $$type: 'ais.ratingMenu';
+  renderState: RatingMenuRenderState;
+  indexRenderState: {
+    ratingMenu: {
+      [attribute: string]: WidgetRenderState<
+        RatingMenuRenderState,
+        RatingMenuConnectorParams
+      >;
+    };
+  };
+  indexUiState: {
+    ratingMenu: {
+      [attribute: string]: number | undefined;
+    };
+  };
+};
+
+export type RatingMenuConnector = Connector<
+  RatingMenuWidgetDescription,
+  RatingMenuConnectorParams
+>;
+
+/**
+ * **RatingMenu** connector provides the logic to build a custom widget that will let
+ * the user refine search results based on ratings.
+ *
+ * The connector provides to the rendering: `refine()` to select a value and
+ * `items` that are the values that can be selected. `refine` should be used
+ * with `items.value`.
+ */
+export const connectRatingMenu: RatingMenuConnector =
+  function connectRatingMenu(renderFn, unmountFn = noop) {
+    checkRendering(renderFn, withUsage());
+
+    return (widgetParams) => {
+      const { attribute, max = 5 } = widgetParams || {};
+      let sendEvent: SendEvent;
+
+      if (!attribute) {
+        throw new Error(withUsage('The `attribute` option is required.'));
+      }
+
+      const getRefinedStar = (state: SearchParameters) => {
+        const values = state.getNumericRefinements(attribute);
+
+        if (!values['>=']?.length) {
+          return undefined;
+        }
+
+        return values['>='][0];
+      };
+
+      const getFacetsMaxDecimalPlaces = (
+        facetResults: SearchResults.FacetValue[]
+      ) => {
+        let maxDecimalPlaces = 0;
+        facetResults.forEach((facetResult) => {
+          const [, decimal = ''] = facetResult.name.split('.');
+          maxDecimalPlaces = Math.max(maxDecimalPlaces, decimal.length);
+        });
+        return maxDecimalPlaces;
+      };
+
+      const getFacetValuesWarningMessage = ({
+        maxDecimalPlaces,
+        maxFacets,
+        maxValuesPerFacet,
+      }: {
+        maxDecimalPlaces: number;
+        maxFacets: number;
+        maxValuesPerFacet: number;
+      }) => {
+        const maxDecimalPlacesInRange = Math.max(
+          0,
+          Math.floor(Math.log10(MAX_VALUES_PER_FACET_API_LIMIT / max))
+        );
+        const maxFacetsInRange = Math.min(
+          MAX_VALUES_PER_FACET_API_LIMIT,
+          Math.pow(10, maxDecimalPlacesInRange) * max
+        );
+
+        const solutions: string[] = [];
+
+        if (maxFacets > MAX_VALUES_PER_FACET_API_LIMIT) {
+          solutions.push(
+            `- Update your records to lower the precision of the values in the "${attribute}" attribute (for example: ${(5.123456789).toPrecision(
+              maxDecimalPlaces + 1
+            )} to ${(5.123456789).toPrecision(maxDecimalPlacesInRange + 1)})`
+          );
+        }
+        if (maxValuesPerFacet < maxFacetsInRange) {
+          solutions.push(
+            `- Increase the maximum number of facet values to ${maxFacetsInRange} using the "configure" widget ${createDocumentationLink(
+              { name: 'configure' }
+            )} and the "maxValuesPerFacet" parameter https://www.algolia.com/doc/api-reference/api-parameters/maxValuesPerFacet/`
+          );
+        }
+
+        return `The ${attribute} attribute can have ${maxFacets} different values (0 to ${max} with a maximum of ${maxDecimalPlaces} decimals = ${maxFacets}) but you retrieved only ${maxValuesPerFacet} facet values. Therefore the number of results that match the refinements can be incorrect.
+    ${
+      solutions.length
+        ? `To resolve this problem you can:\n${solutions.join('\n')}`
+        : ``
+    }`;
+      };
+
+      function getRefinedState(state: SearchParameters, facetValue: string) {
+        const isRefined = getRefinedStar(state) === Number(facetValue);
+
+        const emptyState = state.resetPage().removeNumericRefinement(attribute);
+
+        if (!isRefined) {
+          return emptyState
+            .addNumericRefinement(attribute, '<=', max)
+            .addNumericRefinement(attribute, '>=', Number(facetValue));
+        }
+        return emptyState;
+      }
+
+      const toggleRefinement = (
+        helper: AlgoliaSearchHelper,
+        facetValue: string
+      ) => {
+        sendEvent('click:internal', facetValue);
+        helper.setState(getRefinedState(helper.state, facetValue)).search();
+      };
+
+      type ConnectorState = {
+        toggleRefinementFactory: (
+          helper: AlgoliaSearchHelper
+        ) => (facetValue: string) => void;
+        createURLFactory: ({
+          state,
+          createURL,
+        }: {
+          state: SearchParameters;
+          createURL: (InitOptions | RenderOptions)['createURL'];
+          getWidgetUiState: NonNullable<Widget['getWidgetUiState']>;
+          helper: AlgoliaSearchHelper;
+        }) => (value: string) => string;
+      };
+
+      const connectorState: ConnectorState = {
+        toggleRefinementFactory: (helper) =>
+          toggleRefinement.bind(null, helper),
+        createURLFactory:
+          ({ state, createURL, getWidgetUiState, helper }) =>
+          (value) =>
+            createURL((uiState) =>
+              getWidgetUiState(uiState, {
+                searchParameters: getRefinedState(state, value),
+                helper,
+              })
+            ),
+      };
+
+      return {
+        $$type,
+
+        init(initOptions) {
+          const { instantSearchInstance } = initOptions;
+
+          renderFn(
+            {
+              ...this.getWidgetRenderState(initOptions),
+              instantSearchInstance,
+            },
+            true
+          );
+        },
+
+        render(renderOptions) {
+          const { instantSearchInstance } = renderOptions;
+
+          renderFn(
+            {
+              ...this.getWidgetRenderState(renderOptions),
+              instantSearchInstance,
+            },
+            false
+          );
+        },
+
+        getRenderState(renderState, renderOptions) {
+          return {
+            ...renderState,
+            ratingMenu: {
+              ...renderState.ratingMenu,
+              [attribute]: this.getWidgetRenderState(renderOptions),
+            },
+          };
+        },
+
+        getWidgetRenderState({
+          helper,
+          results,
+          state,
+          instantSearchInstance,
+          createURL,
+        }) {
+          let facetValues: StarRatingItems[] = [];
+
+          if (!sendEvent) {
+            sendEvent = createSendEvent({
+              instantSearchInstance,
+              helper,
+              getRefinedStar: () => getRefinedStar(helper.state),
+              attribute,
+            });
+          }
+
+          let refinementIsApplied = false;
+          let totalCount = 0;
+
+          const facetResults = results?.getFacetValues(attribute, {}) as
+            | SearchResults.FacetValue[]
+            | undefined;
+
+          if (results && facetResults) {
+            const maxValuesPerFacet = facetResults.length;
+            const maxDecimalPlaces = getFacetsMaxDecimalPlaces(facetResults);
+            const maxFacets = Math.pow(10, maxDecimalPlaces) * max;
+
+            warning(
+              maxFacets <= maxValuesPerFacet || Boolean(results.__isArtificial),
+              getFacetValuesWarningMessage({
+                maxDecimalPlaces,
+                maxFacets,
+                maxValuesPerFacet,
+              })
+            );
+
+            const refinedStar = getRefinedStar(state);
+
+            for (let star = STEP; star < max; star += STEP) {
+              const isRefined = refinedStar === star;
+              refinementIsApplied = refinementIsApplied || isRefined;
+
+              const count = facetResults
+                .filter((f) => Number(f.name) >= star && Number(f.name) <= max)
+                .map((f) => f.count)
+                .reduce((sum, current) => sum + current, 0);
+              totalCount += count;
+
+              if (refinedStar && !isRefined && count === 0) {
+                // skip count==0 when at least 1 refinement is enabled
+                // eslint-disable-next-line no-continue
+                continue;
+              }
+
+              const stars = [...new Array(Math.floor(max / STEP))].map(
+                (_v, i) => i * STEP < star
+              );
+
+              facetValues.push({
+                stars,
+                name: String(star),
+                label: String(star),
+                value: String(star),
+                count,
+                isRefined,
+              });
+            }
+          }
+          facetValues = facetValues.reverse();
+
+          const hasNoResults = results ? results.nbHits === 0 : true;
+
+          return {
+            items: facetValues,
+            hasNoResults,
+            canRefine: (!hasNoResults || refinementIsApplied) && totalCount > 0,
+            refine: connectorState.toggleRefinementFactory(helper),
+            sendEvent,
+            createURL: connectorState.createURLFactory({
+              state,
+              createURL,
+              helper,
+              getWidgetUiState: this.getWidgetUiState,
+            }),
+            widgetParams,
+          };
+        },
+
+        dispose({ state }) {
+          unmountFn();
+
+          return state.removeNumericRefinement(attribute);
+        },
+
+        getWidgetUiState(uiState, { searchParameters }) {
+          const value = getRefinedStar(searchParameters);
+
+          return removeEmptyRefinementsFromUiState(
+            {
+              ...uiState,
+              ratingMenu: {
+                ...uiState.ratingMenu,
+                [attribute]: typeof value === 'number' ? value : undefined,
+              },
+            },
+            attribute
+          );
+        },
+
+        getWidgetSearchParameters(searchParameters, { uiState }) {
+          const value = uiState.ratingMenu && uiState.ratingMenu[attribute];
+
+          const withDisjunctiveFacet = searchParameters
+            .addDisjunctiveFacet(attribute)
+            .removeNumericRefinement(attribute)
+            .removeDisjunctiveFacetRefinement(attribute);
+
+          if (!value) {
+            return withDisjunctiveFacet.setQueryParameters({
+              numericRefinements: {
+                ...withDisjunctiveFacet.numericRefinements,
+                [attribute]: {},
+              },
+            });
+          }
+
+          return withDisjunctiveFacet
+            .addNumericRefinement(attribute, '<=', max)
+            .addNumericRefinement(attribute, '>=', value);
+        },
+      };
+    };
+  };
+
+function removeEmptyRefinementsFromUiState(
+  indexUiState: IndexUiState,
+  attribute: string
+): IndexUiState {
+  if (!indexUiState.ratingMenu) {
+    return indexUiState;
+  }
+
+  if (typeof indexUiState.ratingMenu[attribute] !== 'number') {
+    delete indexUiState.ratingMenu[attribute];
+  }
+
+  if (Object.keys(indexUiState.ratingMenu).length === 0) {
+    delete indexUiState.ratingMenu;
+  }
+
+  return indexUiState;
+}
diff --git a/packages/instantsearch.js/src/connectors/refinement-list/connectRefinementList.ts b/packages/instantsearch-core/src/connectors/connectRefinementList.ts
similarity index 98%
rename from packages/instantsearch.js/src/connectors/refinement-list/connectRefinementList.ts
rename to packages/instantsearch-core/src/connectors/connectRefinementList.ts
index 1aa2342dc0..8be83bd411 100644
--- a/packages/instantsearch.js/src/connectors/refinement-list/connectRefinementList.ts
+++ b/packages/instantsearch-core/src/connectors/connectRefinementList.ts
@@ -1,15 +1,13 @@
 import {
-  escapeFacets,
-  TAG_PLACEHOLDER,
-  TAG_REPLACEMENT,
-  checkRendering,
   createDocumentationMessageGenerator,
-  createSendEventForFacet,
   noop,
   warning,
-} from '../../lib/utils';
+  escapeFacets,
+  TAG_PLACEHOLDER,
+  TAG_REPLACEMENT,
+} from '../lib/public';
+import { checkRendering, createSendEventForFacet } from '../lib/utils';
 
-import type { SendEventForFacet } from '../../lib/utils';
 import type {
   Connector,
   TransformItems,
@@ -21,7 +19,8 @@ import type {
   CreateURL,
   WidgetRenderState,
   IndexUiState,
-} from '../../types';
+  SendEventForFacet,
+} from '../types';
 import type { AlgoliaSearchHelper, SearchResults } from 'algoliasearch-helper';
 
 const withUsage = createDocumentationMessageGenerator({
@@ -180,7 +179,7 @@ export type RefinementListConnector = Connector<
  * - a `toggleShowMore()` function to display more or less items
  * - a `searchForItems()` function to search within the items.
  */
-const connectRefinementList: RefinementListConnector =
+export const connectRefinementList: RefinementListConnector =
   function connectRefinementList(renderFn, unmountFn = noop) {
     checkRendering(renderFn, withUsage());
 
@@ -587,5 +586,3 @@ function removeEmptyRefinementsFromUiState(
 
   return indexUiState;
 }
-
-export default connectRefinementList;
diff --git a/packages/instantsearch.js/src/connectors/related-products/connectRelatedProducts.ts b/packages/instantsearch-core/src/connectors/connectRelatedProducts.ts
similarity index 87%
rename from packages/instantsearch.js/src/connectors/related-products/connectRelatedProducts.ts
rename to packages/instantsearch-core/src/connectors/connectRelatedProducts.ts
index a8ac1aa5df..b848105bb7 100644
--- a/packages/instantsearch.js/src/connectors/related-products/connectRelatedProducts.ts
+++ b/packages/instantsearch-core/src/connectors/connectRelatedProducts.ts
@@ -1,15 +1,16 @@
 import {
   createDocumentationMessageGenerator,
-  checkRendering,
   noop,
   escapeHits,
   TAG_PLACEHOLDER,
-  createSendEventForHits,
+} from '../lib/public';
+import {
   addAbsolutePosition,
   addQueryID,
-} from '../../lib/utils';
+  checkRendering,
+  createSendEventForHits,
+} from '../lib/utils';
 
-import type { SendEventForHits } from '../../lib/utils';
 import type {
   Connector,
   TransformItems,
@@ -20,7 +21,9 @@ import type {
   RecommendResponse,
   Hit,
   AlgoliaHit,
-} from '../../types';
+  Widget,
+  SendEventForHits,
+} from '../types';
 import type { PlainSearchParameters } from 'algoliasearch-helper';
 
 const withUsage = createDocumentationMessageGenerator({
@@ -35,7 +38,6 @@ export type RelatedProductsRenderState<
    * The matched recommendations from the Algolia API.
    */
   items: Array<Hit<THit>>;
-
   /**
    * Sends an event to the Insights middleware.
    */
@@ -100,12 +102,12 @@ export type RelatedProductsConnector<
   RelatedProductsConnectorParams<THit>
 >;
 
-export default (function connectRelatedProducts<
+export const connectRelatedProducts = function connectRelatedProducts<
   TWidgetParams extends UnknownWidgetParams
 >(
   renderFn: Renderer<
     RelatedProductsRenderState,
-    RelatedProductsConnectorParams & TWidgetParams
+    TWidgetParams & RelatedProductsConnectorParams
   >,
   unmountFn: Unmounter = noop
 ) {
@@ -123,7 +125,7 @@ export default (function connectRelatedProducts<
       fallbackParameters,
       queryParameters,
       transformItems = ((items) => items) as NonNullable<
-        RelatedProductsConnectorParams['transformItems']
+        RelatedProductsConnectorParams<THit>['transformItems']
       >,
     } = widgetParams || {};
 
@@ -131,9 +133,15 @@ export default (function connectRelatedProducts<
       throw new Error(withUsage('The `objectIDs` option is required.'));
     }
 
+    type RelatedProductsWidget = Widget<
+      RelatedProductsWidgetDescription<THit> & {
+        widgetParams: typeof widgetParams;
+      }
+    >;
+
     let sendEvent: SendEventForHits;
 
-    return {
+    const widget: RelatedProductsWidget = {
       dependsOn: 'recommend',
       $$type: 'ais.relatedProducts',
 
@@ -163,7 +171,7 @@ export default (function connectRelatedProducts<
         return renderState;
       },
 
-      getWidgetRenderState({ results, helper, instantSearchInstance }) {
+      getWidgetRenderState({ results, instantSearchInstance, helper }) {
         if (!sendEvent) {
           sendEvent = createSendEventForHits({
             instantSearchInstance,
@@ -172,7 +180,7 @@ export default (function connectRelatedProducts<
           });
         }
         if (results === null || results === undefined) {
-          return { items: [], widgetParams, sendEvent };
+          return { items: [], sendEvent, widgetParams };
         }
 
         if (escapeHTML && results.hits.length > 0) {
@@ -199,8 +207,8 @@ export default (function connectRelatedProducts<
 
         return {
           items: transformedItems,
-          widgetParams,
           sendEvent,
+          widgetParams,
         };
       },
 
@@ -230,5 +238,8 @@ export default (function connectRelatedProducts<
         );
       },
     };
+
+    // casting to avoid large type output
+    return widget as RelatedProductsWidget;
   };
-} satisfies RelatedProductsConnector);
+} satisfies RelatedProductsConnector;
diff --git a/packages/instantsearch-core/src/connectors/connectRelevantSort.ts b/packages/instantsearch-core/src/connectors/connectRelevantSort.ts
new file mode 100644
index 0000000000..d0ab509ea0
--- /dev/null
+++ b/packages/instantsearch-core/src/connectors/connectRelevantSort.ts
@@ -0,0 +1,138 @@
+import { noop } from '../lib/public';
+
+import type { Connector, WidgetRenderState } from '../types';
+
+export type RelevantSortConnectorParams = Record<string, unknown>;
+
+type Refine = (relevancyStrictness: number | undefined) => void;
+
+export type RelevantSortRenderState = {
+  /**
+   * Indicates if it has appliedRelevancyStrictness greater than zero
+   */
+  isRelevantSorted: boolean;
+
+  /**
+   * Indicates if the results come from a virtual replica
+   */
+  isVirtualReplica: boolean;
+
+  /**
+   * Indicates if search state can be refined
+   */
+  canRefine: boolean;
+
+  /**
+   * Sets the value as relevancyStrictness and trigger a new search
+   */
+  refine: Refine;
+};
+
+export type RelevantSortWidgetDescription = {
+  $$type: 'ais.relevantSort';
+  renderState: RelevantSortRenderState;
+  indexRenderState: {
+    relevantSort: WidgetRenderState<
+      RelevantSortRenderState,
+      RelevantSortConnectorParams
+    >;
+  };
+  indexUiState: {
+    relevantSort: number;
+  };
+};
+
+export type RelevantSortConnector = Connector<
+  RelevantSortWidgetDescription,
+  RelevantSortConnectorParams
+>;
+
+export const connectRelevantSort: RelevantSortConnector =
+  function connectRelevantSort(renderFn = noop, unmountFn = noop) {
+    return (widgetParams) => {
+      type ConnectorState = {
+        refine?: Refine;
+      };
+
+      const connectorState: ConnectorState = {};
+
+      return {
+        $$type: 'ais.relevantSort',
+
+        init(initOptions) {
+          const { instantSearchInstance } = initOptions;
+          renderFn(
+            {
+              ...this.getWidgetRenderState(initOptions),
+              instantSearchInstance,
+            },
+            true
+          );
+        },
+
+        render(renderOptions) {
+          const { instantSearchInstance } = renderOptions;
+
+          renderFn(
+            {
+              ...this.getWidgetRenderState(renderOptions),
+              instantSearchInstance,
+            },
+            false
+          );
+        },
+
+        dispose({ state }) {
+          unmountFn();
+
+          return state.setQueryParameter('relevancyStrictness', undefined);
+        },
+
+        getRenderState(renderState, renderOptions) {
+          return {
+            ...renderState,
+            relevantSort: this.getWidgetRenderState(renderOptions),
+          };
+        },
+
+        getWidgetRenderState({ results, helper }) {
+          if (!connectorState.refine) {
+            connectorState.refine = (relevancyStrictness) => {
+              helper
+                .setQueryParameter('relevancyStrictness', relevancyStrictness)
+                .search();
+            };
+          }
+
+          const { appliedRelevancyStrictness } = results || {};
+
+          const isVirtualReplica = appliedRelevancyStrictness !== undefined;
+
+          return {
+            isRelevantSorted:
+              typeof appliedRelevancyStrictness !== 'undefined' &&
+              appliedRelevancyStrictness > 0,
+            isVirtualReplica,
+            canRefine: isVirtualReplica,
+            refine: connectorState.refine,
+            widgetParams,
+          };
+        },
+
+        getWidgetSearchParameters(state, { uiState }) {
+          return state.setQueryParameter(
+            'relevancyStrictness',
+            uiState.relevantSort ?? state.relevancyStrictness
+          );
+        },
+
+        getWidgetUiState(uiState, { searchParameters }) {
+          return {
+            ...uiState,
+            relevantSort:
+              searchParameters.relevancyStrictness || uiState.relevantSort,
+          };
+        },
+      };
+    };
+  };
diff --git a/packages/instantsearch.js/src/connectors/search-box/connectSearchBox.ts b/packages/instantsearch-core/src/connectors/connectSearchBox.ts
similarity index 94%
rename from packages/instantsearch.js/src/connectors/search-box/connectSearchBox.ts
rename to packages/instantsearch-core/src/connectors/connectSearchBox.ts
index d9efe51426..4aa121a18a 100644
--- a/packages/instantsearch.js/src/connectors/search-box/connectSearchBox.ts
+++ b/packages/instantsearch-core/src/connectors/connectSearchBox.ts
@@ -1,10 +1,7 @@
-import {
-  checkRendering,
-  createDocumentationMessageGenerator,
-  noop,
-} from '../../lib/utils';
+import { createDocumentationMessageGenerator, noop } from '../lib/public';
+import { checkRendering } from '../lib/utils';
 
-import type { Connector, WidgetRenderState } from '../../types';
+import type { Connector, WidgetRenderState } from '../types';
 
 const withUsage = createDocumentationMessageGenerator({
   name: 'search-box',
@@ -81,7 +78,7 @@ const defaultQueryHook: SearchBoxConnectorParams['queryHook'] = (query, hook) =>
  * The connector provides to the rendering: `refine()` to set the query. The behaviour of this function
  * may be impacted by the `queryHook` widget parameter.
  */
-const connectSearchBox: SearchBoxConnector = function connectSearchBox(
+export const connectSearchBox: SearchBoxConnector = function connectSearchBox(
   renderFn,
   unmountFn = noop
 ) {
@@ -172,5 +169,3 @@ const connectSearchBox: SearchBoxConnector = function connectSearchBox(
     };
   };
 };
-
-export default connectSearchBox;
diff --git a/packages/instantsearch.js/src/connectors/sort-by/connectSortBy.ts b/packages/instantsearch-core/src/connectors/connectSortBy.ts
similarity index 95%
rename from packages/instantsearch.js/src/connectors/sort-by/connectSortBy.ts
rename to packages/instantsearch-core/src/connectors/connectSortBy.ts
index cda4d97a1d..e27b8ce846 100644
--- a/packages/instantsearch.js/src/connectors/sort-by/connectSortBy.ts
+++ b/packages/instantsearch-core/src/connectors/connectSortBy.ts
@@ -1,12 +1,11 @@
 import {
-  checkRendering,
   createDocumentationMessageGenerator,
-  find,
   warning,
   noop,
-} from '../../lib/utils';
+} from '../lib/public';
+import { checkRendering } from '../lib/utils';
 
-import type { Connector, TransformItems, WidgetRenderState } from '../../types';
+import type { Connector, TransformItems, WidgetRenderState } from '../types';
 
 const withUsage = createDocumentationMessageGenerator({
   name: 'sort-by',
@@ -85,7 +84,7 @@ export type SortByConnector = Connector<
   SortByConnectorParams
 >;
 
-const connectSortBy: SortByConnector = function connectSortBy(
+export const connectSortBy: SortByConnector = function connectSortBy(
   renderFn,
   unmountFn = noop
 ) {
@@ -120,8 +119,7 @@ const connectSortBy: SortByConnector = function connectSortBy(
 
         const widgetRenderState = this.getWidgetRenderState(initOptions);
         const currentIndex = widgetRenderState.currentRefinement;
-        const isCurrentIndexInItems = find(
-          items,
+        const isCurrentIndexInItems = items.find(
           (item) => item.value === currentIndex
         );
 
@@ -210,5 +208,3 @@ const connectSortBy: SortByConnector = function connectSortBy(
     };
   };
 };
-
-export default connectSortBy;
diff --git a/packages/instantsearch.js/src/connectors/stats/connectStats.ts b/packages/instantsearch-core/src/connectors/connectStats.ts
similarity index 92%
rename from packages/instantsearch.js/src/connectors/stats/connectStats.ts
rename to packages/instantsearch-core/src/connectors/connectStats.ts
index f31cf708e9..565daf1df2 100644
--- a/packages/instantsearch.js/src/connectors/stats/connectStats.ts
+++ b/packages/instantsearch-core/src/connectors/connectStats.ts
@@ -1,10 +1,7 @@
-import {
-  checkRendering,
-  createDocumentationMessageGenerator,
-  noop,
-} from '../../lib/utils';
+import { createDocumentationMessageGenerator, noop } from '../lib/public';
+import { checkRendering } from '../lib/utils';
 
-import type { Connector, WidgetRenderState } from '../../types';
+import type { Connector, WidgetRenderState } from '../types';
 
 const withUsage = createDocumentationMessageGenerator({
   name: 'stats',
@@ -66,7 +63,7 @@ export type StatsConnector = Connector<
   StatsConnectorParams
 >;
 
-const connectStats: StatsConnector = function connectStats(
+export const connectStats: StatsConnector = function connectStats(
   renderFn,
   unmountFn = noop
 ) {
@@ -142,5 +139,3 @@ const connectStats: StatsConnector = function connectStats(
     },
   });
 };
-
-export default connectStats;
diff --git a/packages/instantsearch.js/src/connectors/toggle-refinement/connectToggleRefinement.ts b/packages/instantsearch-core/src/connectors/connectToggleRefinement.ts
similarity index 97%
rename from packages/instantsearch.js/src/connectors/toggle-refinement/connectToggleRefinement.ts
rename to packages/instantsearch-core/src/connectors/connectToggleRefinement.ts
index bbc2799fe3..ae67f32ce8 100644
--- a/packages/instantsearch.js/src/connectors/toggle-refinement/connectToggleRefinement.ts
+++ b/packages/instantsearch-core/src/connectors/connectToggleRefinement.ts
@@ -1,22 +1,20 @@
 import {
-  checkRendering,
-  escapeFacetValue,
   createDocumentationMessageGenerator,
-  find,
   noop,
   toArray,
   warning,
-} from '../../lib/utils';
+} from '../lib/public';
+import { checkRendering, escapeFacetValue } from '../lib/utils';
 
+import type { InstantSearch } from '../instantsearch';
 import type {
   Connector,
   CreateURL,
   InitOptions,
-  InstantSearch,
   RenderOptions,
   Widget,
   WidgetRenderState,
-} from '../../types';
+} from '../types';
 import type {
   AlgoliaSearchHelper,
   SearchParameters,
@@ -184,7 +182,7 @@ export type ToggleRefinementConnector = Connector<
  *  - with or without the value filtered
  *  - switch between two values.
  */
-const connectToggleRefinement: ToggleRefinementConnector =
+export const connectToggleRefinement: ToggleRefinementConnector =
   function connectToggleRefinement(renderFn, unmountFn = noop) {
     checkRendering(renderFn, withUsage());
 
@@ -350,8 +348,7 @@ const connectToggleRefinement: ToggleRefinementConnector =
 
             const onData = on
               .map((v) =>
-                find(
-                  allFacetValues,
+                allFacetValues.find(
                   ({ escapedValue }) =>
                     escapedValue === escapeFacetValue(String(v))
                 )
@@ -361,8 +358,7 @@ const connectToggleRefinement: ToggleRefinementConnector =
             const offData = hasAnOffValue
               ? offValue
                   .map((v) =>
-                    find(
-                      allFacetValues,
+                    allFacetValues.find(
                       ({ escapedValue }) =>
                         escapedValue === escapeFacetValue(String(v))
                     )
@@ -501,5 +497,3 @@ As this is not supported, please make sure to remove this other widget or this T
       };
     };
   };
-
-export default connectToggleRefinement;
diff --git a/packages/instantsearch.js/src/connectors/trending-items/connectTrendingItems.ts b/packages/instantsearch-core/src/connectors/connectTrendingItems.ts
similarity index 91%
rename from packages/instantsearch.js/src/connectors/trending-items/connectTrendingItems.ts
rename to packages/instantsearch-core/src/connectors/connectTrendingItems.ts
index 8f1b1e76bc..f580e7547e 100644
--- a/packages/instantsearch.js/src/connectors/trending-items/connectTrendingItems.ts
+++ b/packages/instantsearch-core/src/connectors/connectTrendingItems.ts
@@ -1,16 +1,17 @@
 import {
   createDocumentationMessageGenerator,
-  checkRendering,
   noop,
+  getObjectType,
   escapeHits,
   TAG_PLACEHOLDER,
-  getObjectType,
-  createSendEventForHits,
+} from '../lib/public';
+import {
   addAbsolutePosition,
   addQueryID,
-} from '../../lib/utils';
+  checkRendering,
+  createSendEventForHits,
+} from '../lib/utils';
 
-import type { SendEventForHits } from '../../lib/utils';
 import type {
   Connector,
   TransformItems,
@@ -21,7 +22,9 @@ import type {
   RecommendResponse,
   Hit,
   AlgoliaHit,
-} from '../../types';
+  Widget,
+  SendEventForHits,
+} from '../types';
 import type { PlainSearchParameters } from 'algoliasearch-helper';
 
 const withUsage = createDocumentationMessageGenerator({
@@ -36,7 +39,6 @@ export type TrendingItemsRenderState<
    * The matched recommendations from the Algolia API.
    */
   items: Array<Hit<THit>>;
-
   /**
    * Sends an event to the Insights middleware.
    */
@@ -111,7 +113,7 @@ export type TrendingItemsConnector<THit extends NonNullable<object> = BaseHit> =
     TrendingItemsConnectorParams<THit>
   >;
 
-export default (function connectTrendingItems<
+export const connectTrendingItems = function connectTrendingItems<
   TWidgetParams extends UnknownWidgetParams
 >(
   renderFn: Renderer<
@@ -151,9 +153,15 @@ export default (function connectTrendingItems<
       );
     }
 
+    type TrendingItemsWidget = Widget<
+      TrendingItemsWidgetDescription<THit> & {
+        widgetParams: typeof widgetParams;
+      }
+    >;
+
     let sendEvent: SendEventForHits;
 
-    return {
+    const widget: TrendingItemsWidget = {
       dependsOn: 'recommend',
       $$type: 'ais.trendingItems',
 
@@ -192,7 +200,7 @@ export default (function connectTrendingItems<
           });
         }
         if (results === null || results === undefined) {
-          return { items: [], widgetParams, sendEvent };
+          return { items: [], sendEvent, widgetParams };
         }
 
         if (escapeHTML && results.hits.length > 0) {
@@ -219,8 +227,8 @@ export default (function connectTrendingItems<
 
         return {
           items: transformedItems,
-          widgetParams,
           sendEvent,
+          widgetParams,
         };
       },
 
@@ -247,5 +255,8 @@ export default (function connectTrendingItems<
         });
       },
     };
+
+    // casting to avoid large type output
+    return widget as TrendingItemsWidget;
   };
-} satisfies TrendingItemsConnector);
+} satisfies TrendingItemsConnector;
diff --git a/packages/instantsearch-core/src/connectors/connectVoiceSearch.ts b/packages/instantsearch-core/src/connectors/connectVoiceSearch.ts
new file mode 100644
index 0000000000..f22fb5d165
--- /dev/null
+++ b/packages/instantsearch-core/src/connectors/connectVoiceSearch.ts
@@ -0,0 +1,220 @@
+import { createDocumentationMessageGenerator, noop } from '../lib/public';
+import { checkRendering } from '../lib/utils';
+import builtInCreateVoiceSearchHelper from '../lib/voiceSearchHelper';
+
+import type {
+  CreateVoiceSearchHelper,
+  VoiceListeningState,
+} from '../lib/voiceSearchHelper/types';
+import type { Connector, WidgetRenderState } from '../types';
+import type { PlainSearchParameters } from 'algoliasearch-helper';
+
+const withUsage = createDocumentationMessageGenerator({
+  name: 'voice-search',
+  connector: true,
+});
+
+export { type VoiceListeningState, type CreateVoiceSearchHelper };
+
+export type VoiceSearchConnectorParams = {
+  searchAsYouSpeak?: boolean;
+  language?: string;
+  additionalQueryParameters?: (params: {
+    query: string;
+  }) => PlainSearchParameters | void;
+  createVoiceSearchHelper?: CreateVoiceSearchHelper;
+};
+
+export type VoiceSearchRenderState = {
+  isBrowserSupported: boolean;
+  isListening: boolean;
+  toggleListening: () => void;
+  voiceListeningState: VoiceListeningState;
+};
+
+export type VoiceSearchWidgetDescription = {
+  $$type: 'ais.voiceSearch';
+  renderState: VoiceSearchRenderState;
+  indexRenderState: {
+    voiceSearch: WidgetRenderState<
+      VoiceSearchRenderState,
+      VoiceSearchConnectorParams
+    >;
+  };
+  indexUiState: {
+    query: string;
+  };
+};
+
+export type VoiceSearchConnector = Connector<
+  VoiceSearchWidgetDescription,
+  VoiceSearchConnectorParams
+>;
+
+export const connectVoiceSearch: VoiceSearchConnector =
+  function connectVoiceSearch(renderFn, unmountFn = noop) {
+    checkRendering(renderFn, withUsage());
+
+    return (widgetParams) => {
+      const {
+        searchAsYouSpeak = false,
+        language,
+        additionalQueryParameters,
+        createVoiceSearchHelper = builtInCreateVoiceSearchHelper,
+      } = widgetParams;
+
+      return {
+        $$type: 'ais.voiceSearch',
+
+        init(initOptions) {
+          const { instantSearchInstance } = initOptions;
+          renderFn(
+            {
+              ...this.getWidgetRenderState(initOptions),
+              instantSearchInstance,
+            },
+            true
+          );
+        },
+
+        render(renderOptions) {
+          const { instantSearchInstance } = renderOptions;
+          renderFn(
+            {
+              ...this.getWidgetRenderState(renderOptions),
+              instantSearchInstance,
+            },
+            false
+          );
+        },
+
+        getRenderState(renderState, renderOptions) {
+          return {
+            ...renderState,
+            voiceSearch: this.getWidgetRenderState(renderOptions),
+          };
+        },
+
+        getWidgetRenderState(renderOptions) {
+          const { helper, instantSearchInstance } = renderOptions;
+          if (!(this as any)._refine) {
+            (this as any)._refine = (query: string): void => {
+              if (query !== helper.state.query) {
+                const queryLanguages = language
+                  ? [language.split('-')[0]]
+                  : undefined;
+                // @ts-ignore queryLanguages is allowed to be a string, not just an array
+                helper.setQueryParameter('queryLanguages', queryLanguages);
+
+                if (typeof additionalQueryParameters === 'function') {
+                  helper.setState(
+                    helper.state.setQueryParameters({
+                      ignorePlurals: true,
+                      removeStopWords: true,
+                      // @ts-ignore optionalWords is allowed to be a string too
+                      optionalWords: query,
+                      ...additionalQueryParameters({ query }),
+                    })
+                  );
+                }
+
+                helper.setQuery(query).search();
+              }
+            };
+          }
+
+          if (!(this as any)._voiceSearchHelper) {
+            (this as any)._voiceSearchHelper = createVoiceSearchHelper({
+              searchAsYouSpeak,
+              language,
+              onQueryChange: (query) => (this as any)._refine(query),
+              onStateChange: () => {
+                renderFn(
+                  {
+                    ...this.getWidgetRenderState(renderOptions),
+                    instantSearchInstance,
+                  },
+                  false
+                );
+              },
+            });
+          }
+
+          const {
+            isBrowserSupported,
+            isListening,
+            startListening,
+            stopListening,
+            getState,
+          } = (this as any)._voiceSearchHelper;
+
+          return {
+            isBrowserSupported: isBrowserSupported(),
+            isListening: isListening(),
+            toggleListening() {
+              if (!isBrowserSupported()) {
+                return;
+              }
+              if (isListening()) {
+                stopListening();
+              } else {
+                startListening();
+              }
+            },
+            voiceListeningState: getState(),
+            widgetParams,
+          };
+        },
+
+        dispose({ state }) {
+          (this as any)._voiceSearchHelper.dispose();
+
+          unmountFn();
+
+          let newState = state;
+          if (typeof additionalQueryParameters === 'function') {
+            const additional = additionalQueryParameters({ query: '' });
+            const toReset = additional
+              ? (
+                  Object.keys(additional) as Array<keyof PlainSearchParameters>
+                ).reduce<PlainSearchParameters>((acc, current) => {
+                  // @ts-ignore search parameters is typed as readonly in v4
+                  acc[current] = undefined;
+                  return acc;
+                }, {})
+              : {};
+            newState = state.setQueryParameters({
+              // @ts-ignore (queryLanguages is not added to algoliasearch v3)
+              queryLanguages: undefined,
+              ignorePlurals: undefined,
+              removeStopWords: undefined,
+              optionalWords: undefined,
+              ...toReset,
+            });
+          }
+
+          return newState.setQueryParameter('query', undefined);
+        },
+
+        getWidgetUiState(uiState, { searchParameters }) {
+          const query = searchParameters.query || '';
+
+          if (!query) {
+            return uiState;
+          }
+
+          return {
+            ...uiState,
+            query,
+          };
+        },
+
+        getWidgetSearchParameters(searchParameters, { uiState }) {
+          return searchParameters.setQueryParameter(
+            'query',
+            uiState.query || ''
+          );
+        },
+      };
+    };
+  };
diff --git a/packages/instantsearch-core/src/connectors/index.ts b/packages/instantsearch-core/src/connectors/index.ts
new file mode 100644
index 0000000000..e1914e0104
--- /dev/null
+++ b/packages/instantsearch-core/src/connectors/index.ts
@@ -0,0 +1,29 @@
+export * from './connectAutocomplete';
+export * from './connectBreadcrumb';
+export * from './connectClearRefinements';
+export * from './connectConfigure';
+export * from './connectCurrentRefinements';
+export * from './connectDynamicWidgets';
+export * from './connectFrequentlyBoughtTogether';
+export * from './connectGeoSearch';
+export * from './connectHierarchicalMenu';
+export * from './connectHits';
+export * from './connectHitsPerPage';
+export * from './connectInfiniteHits';
+export * from './connectLookingSimilar';
+export * from './connectMenu';
+export * from './connectNumericMenu';
+export * from './connectPagination';
+export * from './connectPoweredBy';
+export * from './connectQueryRules';
+export * from './connectRange';
+export * from './connectRatingMenu';
+export * from './connectRefinementList';
+export * from './connectRelatedProducts';
+export * from './connectRelevantSort';
+export * from './connectSearchBox';
+export * from './connectSortBy';
+export * from './connectStats';
+export * from './connectToggleRefinement';
+export * from './connectTrendingItems';
+export * from './connectVoiceSearch';
diff --git a/packages/instantsearch-core/src/index.ts b/packages/instantsearch-core/src/index.ts
new file mode 100644
index 0000000000..727e6c9cd3
--- /dev/null
+++ b/packages/instantsearch-core/src/index.ts
@@ -0,0 +1,10 @@
+export { default as version } from './version';
+export * from './connectors';
+export * from './instantsearch';
+export * from './lib/infiniteHitsCache';
+export * from './lib/public';
+export * from './middlewares';
+export * from './routing';
+export * from './server';
+export * from './widgets';
+export type * from './types';
diff --git a/packages/instantsearch-core/src/instantsearch.ts b/packages/instantsearch-core/src/instantsearch.ts
new file mode 100644
index 0000000000..610636abec
--- /dev/null
+++ b/packages/instantsearch-core/src/instantsearch.ts
@@ -0,0 +1,706 @@
+import EventEmitter from '@algolia/events';
+import algoliasearchHelper from 'algoliasearch-helper';
+
+import {
+  createDocumentationMessageGenerator,
+  createDocumentationLink,
+  defer,
+  isIndexWidget,
+  noop,
+  warning,
+} from './lib/public';
+import {
+  hydrateRecommendCache,
+  hydrateSearchClient,
+  setIndexHelperState,
+} from './lib/utils';
+import { createInsightsMiddleware } from './middlewares/createInsightsMiddleware';
+import {
+  createMetadataMiddleware,
+  isMetadataEnabled,
+} from './middlewares/createMetadataMiddleware';
+import { createRouterMiddleware } from './middlewares/createRouterMiddleware';
+import version from './version';
+import { index } from './widgets/index-widget';
+
+import type {
+  InsightsClient as AlgoliaInsightsClient,
+  SearchClient,
+  Widget,
+  IndexWidget,
+  UiState,
+  CreateURL,
+  Middleware,
+  MiddlewareDefinition,
+  RenderState,
+  InitialResults,
+  Expand,
+  InstantSearchOptions,
+  InstantSearchStatus,
+  InsightsEvent,
+} from './types';
+import type { AlgoliaSearchHelper } from 'algoliasearch-helper';
+
+const withUsage = createDocumentationMessageGenerator({
+  name: 'instantsearch',
+});
+
+function defaultCreateURL() {
+  return '#';
+}
+
+export const INSTANTSEARCH_FUTURE_DEFAULTS: Required<
+  InstantSearchOptions['future']
+> = {
+  preserveSharedStateOnUnmount: false,
+  persistHierarchicalRootCount: false,
+};
+
+/**
+ * The actual implementation of the InstantSearch. This is
+ * created using the `instantsearch` factory function.
+ * It emits the 'render' event every time a search is done
+ */
+export class InstantSearch<
+  TUiState extends UiState = UiState,
+  TRouteState = TUiState
+> extends EventEmitter {
+  client: InstantSearchOptions['searchClient'];
+  indexName: string;
+  compositionID?: string;
+  insightsClient: AlgoliaInsightsClient | null;
+  onStateChange: InstantSearchOptions<TUiState>['onStateChange'] | null = null;
+  future: NonNullable<InstantSearchOptions<TUiState>['future']>;
+  helper: AlgoliaSearchHelper | null;
+  mainHelper: AlgoliaSearchHelper | null;
+  mainIndex: IndexWidget;
+  started: boolean;
+  renderState: RenderState = {};
+  _stalledSearchDelay: number;
+  _searchStalledTimer: any;
+  _initialUiState: TUiState;
+  _initialResults: InitialResults | null;
+  _createURL: CreateURL<TUiState>;
+  _searchFunction?: InstantSearchOptions['searchFunction'];
+  _mainHelperSearch?: AlgoliaSearchHelper['search'];
+  _hasSearchWidget: boolean = false;
+  _hasRecommendWidget: boolean = false;
+  _insights: InstantSearchOptions['insights'];
+  middleware: Array<{
+    creator: Middleware<TUiState>;
+    instance: MiddlewareDefinition<TUiState>;
+  }> = [];
+  sendEventToInsights: (event: InsightsEvent) => void;
+  /**
+   * The status of the search. Can be "idle", "loading", "stalled", or "error".
+   */
+  status: InstantSearchStatus = 'idle';
+  /**
+   * The last returned error from the Search API.
+   * The error gets cleared when the next valid search response is rendered.
+   */
+  error: Error | undefined = undefined;
+
+  constructor(options: InstantSearchOptions<TUiState, TRouteState>) {
+    super();
+
+    // prevent `render` event listening from causing a warning
+    this.setMaxListeners(100);
+
+    const {
+      indexName = '',
+      compositionID,
+      initialUiState = {} as TUiState,
+      routing = null,
+      insights = undefined,
+      searchFunction,
+      stalledSearchDelay = 200,
+      searchClient = null,
+      insightsClient = null,
+      onStateChange = null,
+      future = {
+        ...INSTANTSEARCH_FUTURE_DEFAULTS,
+        ...(options.future || {}),
+      },
+    } = options;
+
+    if (searchClient === null) {
+      throw new Error(withUsage('The `searchClient` option is required.'));
+    }
+
+    if (typeof searchClient.search !== 'function') {
+      throw new Error(
+        `The \`searchClient\` must implement a \`search\` method.
+
+See: https://www.algolia.com/doc/guides/building-search-ui/going-further/backend-search/in-depth/backend-instantsearch/js/`
+      );
+    }
+
+    if (typeof searchClient.addAlgoliaAgent === 'function') {
+      searchClient.addAlgoliaAgent(`instantsearch-core (${version})`);
+    }
+
+    warning(
+      insightsClient === null,
+      `\`insightsClient\` property has been deprecated. It is still supported in 4.x releases, but not further. It is replaced by the \`insights\` middleware.
+
+For more information, visit https://www.algolia.com/doc/guides/getting-insights-and-analytics/search-analytics/click-through-and-conversions/how-to/send-click-and-conversion-events-with-instantsearch/js/`
+    );
+
+    if (insightsClient && typeof insightsClient !== 'function') {
+      throw new Error(
+        withUsage('The `insightsClient` option should be a function.')
+      );
+    }
+
+    warning(
+      !(options as any).searchParameters,
+      `The \`searchParameters\` option is deprecated and will not be supported in InstantSearch.js 4.x.
+
+You can replace it with the \`configure\` widget:
+
+\`\`\`
+search.addWidgets([
+  configure(${JSON.stringify((options as any).searchParameters, null, 2)})
+]);
+\`\`\`
+
+See ${createDocumentationLink({
+        name: 'configure',
+      })}`
+    );
+
+    if (__DEV__ && options.future?.preserveSharedStateOnUnmount === undefined) {
+      // eslint-disable-next-line no-console
+      console.info(`Starting from the next major version, InstantSearch will change how widgets state is preserved when they are removed. InstantSearch will keep the state of unmounted widgets to be usable by other widgets with the same attribute.
+
+We recommend setting \`future.preserveSharedStateOnUnmount\` to true to adopt this change today.
+To stay with the current behaviour and remove this warning, set the option to false.
+
+See documentation: ${createDocumentationLink({
+        name: 'instantsearch',
+      })}#widget-param-future
+          `);
+    }
+
+    this.client = searchClient;
+    this.future = future;
+    this.insightsClient = insightsClient;
+    this.indexName = indexName;
+    this.compositionID = compositionID;
+    this.helper = null;
+    this.mainHelper = null;
+    this.mainIndex = index({
+      // we use an index widget to render compositions
+      // this only works because there's only one composition index allow for now
+      indexName: this.compositionID || this.indexName,
+    });
+    this.onStateChange = onStateChange;
+
+    this.started = false;
+
+    this._stalledSearchDelay = stalledSearchDelay;
+    this._searchStalledTimer = null;
+
+    this._createURL = defaultCreateURL;
+    this._initialUiState = initialUiState;
+    this._initialResults = null;
+
+    this._insights = insights;
+
+    if (searchFunction) {
+      warning(
+        false,
+        `The \`searchFunction\` option is deprecated. Use \`onStateChange\` instead.`
+      );
+      this._searchFunction = searchFunction;
+    }
+
+    this.sendEventToInsights = noop;
+
+    if (routing) {
+      const routerOptions = typeof routing === 'boolean' ? {} : routing;
+      routerOptions.$$internal = true;
+      this.use(createRouterMiddleware(routerOptions));
+    }
+
+    // This is the default Insights middleware,
+    // added when `insights` is set to true by the user.
+    // Any user-provided middleware will be added later and override this one.
+    if (insights) {
+      const insightsOptions = typeof insights === 'boolean' ? {} : insights;
+      insightsOptions.$$internal = true;
+      this.use(createInsightsMiddleware(insightsOptions));
+    }
+
+    if (isMetadataEnabled()) {
+      this.use(createMetadataMiddleware({ $$internal: true }));
+    }
+  }
+
+  use(...middleware: Array<Middleware<TUiState>>) {
+    const newMiddlewareList = middleware.map((fn) => {
+      const newMiddleware = {
+        $$type: '__unknown__',
+        $$internal: false,
+        subscribe: noop,
+        started: noop,
+        unsubscribe: noop,
+        onStateChange: noop,
+        ...fn({
+          instantSearchInstance: this as unknown as InstantSearch<
+            UiState,
+            UiState
+          >,
+        }),
+      };
+      this.middleware.push({
+        creator: fn,
+        instance: newMiddleware,
+      });
+      return newMiddleware;
+    });
+
+    // If the instance has already started, we directly subscribe the
+    // middleware so they're notified of changes.
+    if (this.started) {
+      newMiddlewareList.forEach((m) => {
+        m.subscribe();
+        m.started();
+      });
+    }
+
+    return this;
+  }
+
+  unuse(...middlewareToUnuse: Array<Middleware<TUiState>>) {
+    this.middleware
+      .filter((m) => middlewareToUnuse.includes(m.creator))
+      .forEach((m) => m.instance.unsubscribe());
+
+    this.middleware = this.middleware.filter(
+      (m) => !middlewareToUnuse.includes(m.creator)
+    );
+
+    return this;
+  }
+
+  addWidget(widget: Widget | IndexWidget) {
+    warning(
+      false,
+      'addWidget will still be supported in 4.x releases, but not further. It is replaced by `addWidgets([widget])`'
+    );
+
+    return this.addWidgets([widget]);
+  }
+
+  addWidgets(widgets: Array<Widget | IndexWidget>) {
+    if (!Array.isArray(widgets)) {
+      throw new Error(
+        withUsage(
+          'The `addWidgets` method expects an array of widgets. Please use `addWidget`.'
+        )
+      );
+    }
+
+    if (
+      widgets.some(
+        (widget) =>
+          typeof widget.init !== 'function' &&
+          typeof widget.render !== 'function'
+      )
+    ) {
+      throw new Error(
+        withUsage(
+          'The widget definition expects a `render` and/or an `init` method.'
+        )
+      );
+    }
+
+    if (this.compositionID && widgets.some(isIndexWidget)) {
+      throw new Error(
+        withUsage(
+          'The `index` widget cannot be used with a composition-based InstantSearch implementation.'
+        )
+      );
+    }
+
+    this.mainIndex.addWidgets(widgets);
+
+    return this;
+  }
+
+  removeWidget(widget: Widget | IndexWidget) {
+    warning(
+      false,
+      'removeWidget will still be supported in 4.x releases, but not further. It is replaced by `removeWidgets([widget])`'
+    );
+
+    return this.removeWidgets([widget]);
+  }
+
+  removeWidgets(widgets: Array<Widget | IndexWidget>) {
+    if (!Array.isArray(widgets)) {
+      throw new Error(
+        withUsage(
+          'The `removeWidgets` method expects an array of widgets. Please use `removeWidget`.'
+        )
+      );
+    }
+
+    if (widgets.some((widget) => typeof widget.dispose !== 'function')) {
+      throw new Error(
+        withUsage('The widget definition expects a `dispose` method.')
+      );
+    }
+
+    this.mainIndex.removeWidgets(widgets);
+
+    return this;
+  }
+
+  start() {
+    if (this.started) {
+      throw new Error(
+        withUsage('The `start` method has already been called once.')
+      );
+    }
+
+    // This Helper is used for the queries, we don't care about its state. The
+    // states are managed at the `index` level. We use this Helper to create
+    // DerivedHelper scoped into the `index` widgets.
+    // In Vue InstantSearch' hydrate, a main helper gets set before start, so
+    // we need to respect this helper as a way to keep all listeners correct.
+    const mainHelper =
+      this.mainHelper ||
+      algoliasearchHelper(this.client, this.indexName, undefined, {
+        persistHierarchicalRootCount: this.future.persistHierarchicalRootCount,
+      });
+
+    if (this.compositionID) {
+      mainHelper.searchForFacetValues =
+        mainHelper.searchForCompositionFacetValues.bind(mainHelper);
+    }
+
+    mainHelper.search = () => {
+      this.status = 'loading';
+      this.scheduleRender(false);
+
+      warning(
+        Boolean(this.indexName) ||
+          Boolean(this.compositionID) ||
+          this.mainIndex.getWidgets().some(isIndexWidget),
+        'No indexName provided, nor an explicit index widget in the widgets tree. This is required to be able to display results.'
+      );
+
+      // This solution allows us to keep the exact same API for the users but
+      // under the hood, we have a different implementation. It should be
+      // completely transparent for the rest of the codebase. Only this module
+      // is impacted.
+      if (this._hasSearchWidget) {
+        if (this.compositionID) {
+          mainHelper.searchWithComposition();
+        } else {
+          mainHelper.searchOnlyWithDerivedHelpers();
+        }
+      }
+
+      if (this._hasRecommendWidget) {
+        mainHelper.recommend();
+      }
+
+      return mainHelper;
+    };
+
+    if (this._searchFunction) {
+      // this client isn't used to actually search, but required for the helper
+      // to not throw errors
+      const fakeClient = {
+        search: () => new Promise(noop),
+      } as any as SearchClient;
+
+      this._mainHelperSearch = mainHelper.search.bind(mainHelper);
+      mainHelper.search = () => {
+        const mainIndexHelper = this.mainIndex.getHelper()!;
+        const searchFunctionHelper = algoliasearchHelper(
+          fakeClient,
+          mainIndexHelper.state.index,
+          mainIndexHelper.state
+        );
+        searchFunctionHelper.once('search', ({ state }) => {
+          mainIndexHelper.overrideStateWithoutTriggeringChangeEvent(state);
+          this._mainHelperSearch!();
+        });
+        // Forward state changes from `searchFunctionHelper` to `mainIndexHelper`
+        searchFunctionHelper.on('change', ({ state }) => {
+          mainIndexHelper.setState(state);
+        });
+        this._searchFunction!(searchFunctionHelper);
+        return mainHelper;
+      };
+    }
+
+    // Only the "main" Helper emits the `error` event vs the one for `search`
+    // and `results` that are also emitted on the derived one.
+    mainHelper.on('error', ({ error }) => {
+      if (!(error instanceof Error)) {
+        // typescript lies here, error is in some cases { name: string, message: string }
+        const err = error as Record<string, any>;
+        error = Object.keys(err).reduce((acc, key) => {
+          (acc as any)[key] = err[key];
+          return acc;
+        }, new Error(err.message));
+      }
+      // If an error is emitted, it is re-thrown by events. In previous versions
+      // we emitted {error}, which is thrown as:
+      // "Uncaught, unspecified \"error\" event. ([object Object])"
+      // To avoid breaking changes, we make the error available in both
+      // `error` and `error.error`
+      // @MAJOR emit only error
+      (error as any).error = error;
+      this.error = error;
+      this.status = 'error';
+      this.scheduleRender(false);
+
+      // This needs to execute last because it throws the error.
+      this.emit('error', error);
+    });
+
+    this.mainHelper = mainHelper;
+
+    this.middleware.forEach(({ instance }) => {
+      instance.subscribe();
+    });
+
+    this.mainIndex.init({
+      instantSearchInstance: this as unknown as InstantSearch<UiState, UiState>,
+      parent: null,
+      uiState: this._initialUiState,
+    });
+
+    if (this._initialResults) {
+      hydrateSearchClient(this.client, this._initialResults);
+      hydrateRecommendCache(this.mainHelper, this._initialResults);
+
+      const originalScheduleSearch = this.scheduleSearch;
+      // We don't schedule a first search when initial results are provided
+      // because we already have the results to render. This skips the initial
+      // network request on the browser on `start`.
+      this.scheduleSearch = defer(noop);
+      // We also skip the initial network request when widgets are dynamically
+      // added in the first tick (that's the case in all the framework-based flavors).
+      // When we add a widget to `index`, it calls `scheduleSearch`. We can rely
+      // on our `defer` util to restore the original `scheduleSearch` value once
+      // widgets are added to hook back to the regular lifecycle.
+      defer(() => {
+        this.scheduleSearch = originalScheduleSearch;
+      })();
+    }
+    // We only schedule a search when widgets have been added before `start()`
+    // because there are listeners that can use these results.
+    // This is especially useful in framework-based flavors that wait for
+    // dynamically-added widgets to trigger a network request. It avoids
+    // having to batch this initial network request with the one coming from
+    // `addWidgets()`.
+    // Later, we could also skip `index()` widgets and widgets that don't read
+    // the results, but this is an optimization that has a very low impact for now.
+    else if (this.mainIndex.getWidgets().length > 0) {
+      this.scheduleSearch();
+    }
+
+    // Keep the previous reference for legacy purpose, some pattern use
+    // the direct Helper access `search.helper` (e.g multi-index).
+    this.helper = this.mainIndex.getHelper();
+
+    // track we started the search if we add more widgets,
+    // to init them directly after add
+    this.started = true;
+
+    this.middleware.forEach(({ instance }) => {
+      instance.started();
+    });
+
+    // This is the automatic Insights middleware,
+    // added when `insights` is unset and the initial results possess `queryID`.
+    // Any user-provided middleware will be added later and override this one.
+    if (typeof this._insights === 'undefined') {
+      mainHelper.derivedHelpers[0].once('result', () => {
+        const hasAutomaticInsights = this.mainIndex
+          .getScopedResults()
+          .some(({ results }) => results?._automaticInsights);
+        if (hasAutomaticInsights) {
+          this.use(
+            createInsightsMiddleware({
+              $$internal: true,
+              $$automatic: true,
+            })
+          );
+        }
+      });
+    }
+  }
+
+  dispose() {
+    this.scheduleSearch.cancel();
+    this.scheduleRender.cancel();
+    clearTimeout(this._searchStalledTimer);
+
+    this.removeWidgets(this.mainIndex.getWidgets());
+    this.mainIndex.dispose();
+
+    // You can not start an instance two times, therefore a disposed instance
+    // needs to set started as false otherwise this can not be restarted at a
+    // later point.
+    this.started = false;
+
+    // The helper needs to be reset to perform the next search from a fresh state.
+    // If not reset, it would use the state stored before calling `dispose()`.
+    this.removeAllListeners();
+    this.mainHelper?.removeAllListeners();
+    this.mainHelper = null;
+    this.helper = null;
+
+    this.middleware.forEach(({ instance }) => {
+      instance.unsubscribe();
+    });
+  }
+
+  scheduleSearch = defer(() => {
+    if (this.started) {
+      this.mainHelper!.search();
+    }
+  });
+
+  scheduleRender = defer((shouldResetStatus: boolean = true) => {
+    if (!this.mainHelper?.hasPendingRequests()) {
+      clearTimeout(this._searchStalledTimer);
+      this._searchStalledTimer = null;
+
+      if (shouldResetStatus) {
+        this.status = 'idle';
+        this.error = undefined;
+      }
+    }
+
+    this.mainIndex.render({
+      instantSearchInstance: this as unknown as InstantSearch<UiState, UiState>,
+    });
+
+    this.emit('render');
+  });
+
+  scheduleStalledRender() {
+    if (!this._searchStalledTimer) {
+      this._searchStalledTimer = setTimeout(() => {
+        this.status = 'stalled';
+        this.scheduleRender();
+      }, this._stalledSearchDelay);
+    }
+  }
+
+  setUiState(
+    uiState: TUiState | ((previousUiState: TUiState) => TUiState),
+    callOnStateChange = true
+  ) {
+    if (!this.mainHelper) {
+      throw new Error(
+        withUsage('The `start` method needs to be called before `setUiState`.')
+      );
+    }
+
+    // We refresh the index UI state to update the local UI state that the
+    // main index passes to the function form of `setUiState`.
+    this.mainIndex.refreshUiState();
+    const nextUiState =
+      typeof uiState === 'function'
+        ? uiState(this.mainIndex.getWidgetUiState({}) as TUiState)
+        : uiState;
+
+    if (this.onStateChange && callOnStateChange) {
+      this.onStateChange({
+        uiState: nextUiState,
+        setUiState: (finalUiState) => {
+          setIndexHelperState(
+            typeof finalUiState === 'function'
+              ? finalUiState(nextUiState)
+              : finalUiState,
+            this.mainIndex
+          );
+
+          this.scheduleSearch();
+          this.onInternalStateChange();
+        },
+      });
+    } else {
+      setIndexHelperState(nextUiState, this.mainIndex);
+
+      this.scheduleSearch();
+      this.onInternalStateChange();
+    }
+  }
+
+  getUiState() {
+    if (this.started) {
+      // We refresh the index UI state to make sure changes from `refine` are taken in account
+      this.mainIndex.refreshUiState();
+    }
+
+    return this.mainIndex.getWidgetUiState({}) as TUiState;
+  }
+
+  onInternalStateChange = defer(() => {
+    const nextUiState = this.mainIndex.getWidgetUiState({}) as TUiState;
+
+    this.middleware.forEach(({ instance }) => {
+      instance.onStateChange({
+        uiState: nextUiState,
+      });
+    });
+  });
+
+  createURL(nextState: TUiState = {} as TUiState) {
+    if (!this.started) {
+      throw new Error(
+        withUsage('The `start` method needs to be called before `createURL`.')
+      );
+    }
+
+    return this._createURL(nextState);
+  }
+
+  refresh() {
+    if (!this.mainHelper) {
+      throw new Error(
+        withUsage('The `start` method needs to be called before `refresh`.')
+      );
+    }
+
+    this.mainHelper.clearCache().search();
+  }
+}
+
+type InstantSearchModule = {
+  <TUiState = Record<string, unknown>, TRouteState = TUiState>(
+    options: InstantSearchOptions<Expand<UiState & TUiState>, TRouteState>
+  ): InstantSearch<Expand<UiState & TUiState>, TRouteState>;
+  version: string;
+};
+
+/**
+ * InstantSearch is the main component of InstantSearch.js. This object
+ * manages the widget and lets you add new ones.
+ *
+ * Two parameters are required to get you started with InstantSearch.js:
+ *  - `indexName`: the main index that you will use for your new search UI
+ *  - `searchClient`: the search client to plug to InstantSearch.js
+ *
+ * The [search client provided by Algolia](algolia.com/doc/api-client/getting-started/what-is-the-api-client/javascript/)
+ * needs an `appId` and an `apiKey`. Those parameters can be found in your
+ * [Algolia dashboard](https://www.algolia.com/api-keys).
+ *
+ * If you want to get up and running quickly with InstantSearch.js, have a
+ * look at the [getting started](https://www.algolia.com/doc/guides/building-search-ui/getting-started/js/).
+ */
+export const instantsearch: InstantSearchModule = (options) =>
+  new InstantSearch(options);
+instantsearch.version = version;
diff --git a/packages/instantsearch.js/src/connectors/pagination/Paginator.ts b/packages/instantsearch-core/src/lib/Paginator.ts
similarity index 97%
rename from packages/instantsearch.js/src/connectors/pagination/Paginator.ts
rename to packages/instantsearch-core/src/lib/Paginator.ts
index 283cfcae0d..798c807d58 100644
--- a/packages/instantsearch.js/src/connectors/pagination/Paginator.ts
+++ b/packages/instantsearch-core/src/lib/Paginator.ts
@@ -1,4 +1,4 @@
-import { range } from '../../lib/utils';
+import { range } from './public';
 
 class Paginator {
   public currentPage: number;
diff --git a/packages/instantsearch.js/src/connectors/pagination/__tests__/Paginator-test.ts b/packages/instantsearch-core/src/lib/__tests__/Paginator-test.ts
similarity index 100%
rename from packages/instantsearch.js/src/connectors/pagination/__tests__/Paginator-test.ts
rename to packages/instantsearch-core/src/lib/__tests__/Paginator-test.ts
diff --git a/packages/instantsearch.js/src/lib/infiniteHitsCache/__tests__/sessionStorage-key.test.ts b/packages/instantsearch-core/src/lib/infiniteHitsCache/__tests__/sessionStorage-key.test.ts
similarity index 97%
rename from packages/instantsearch.js/src/lib/infiniteHitsCache/__tests__/sessionStorage-key.test.ts
rename to packages/instantsearch-core/src/lib/infiniteHitsCache/__tests__/sessionStorage-key.test.ts
index 7981acefde..9bd48e7f64 100644
--- a/packages/instantsearch.js/src/lib/infiniteHitsCache/__tests__/sessionStorage-key.test.ts
+++ b/packages/instantsearch-core/src/lib/infiniteHitsCache/__tests__/sessionStorage-key.test.ts
@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 
-import createInfiniteHitsSessionStorageCache from '../sessionStorage';
+import { createInfiniteHitsSessionStorageCache } from '../sessionStorage';
 
 const KEY = 'ais.infiniteHits:myKey';
 
diff --git a/packages/instantsearch.js/src/lib/infiniteHitsCache/__tests__/sessionStorage.test.ts b/packages/instantsearch-core/src/lib/infiniteHitsCache/__tests__/sessionStorage.test.ts
similarity index 97%
rename from packages/instantsearch.js/src/lib/infiniteHitsCache/__tests__/sessionStorage.test.ts
rename to packages/instantsearch-core/src/lib/infiniteHitsCache/__tests__/sessionStorage.test.ts
index 6d20f94c75..94d8c1f6a1 100644
--- a/packages/instantsearch.js/src/lib/infiniteHitsCache/__tests__/sessionStorage.test.ts
+++ b/packages/instantsearch-core/src/lib/infiniteHitsCache/__tests__/sessionStorage.test.ts
@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 
-import createInfiniteHitsSessionStorageCache from '../sessionStorage';
+import { createInfiniteHitsSessionStorageCache } from '../sessionStorage';
 
 const KEY = 'ais.infiniteHits';
 
diff --git a/packages/instantsearch-core/src/lib/infiniteHitsCache/index.ts b/packages/instantsearch-core/src/lib/infiniteHitsCache/index.ts
new file mode 100644
index 0000000000..aa36aee1f4
--- /dev/null
+++ b/packages/instantsearch-core/src/lib/infiniteHitsCache/index.ts
@@ -0,0 +1 @@
+export * from './sessionStorage';
diff --git a/packages/instantsearch-core/src/lib/infiniteHitsCache/sessionStorage.ts b/packages/instantsearch-core/src/lib/infiniteHitsCache/sessionStorage.ts
new file mode 100644
index 0000000000..3455c0b2bb
--- /dev/null
+++ b/packages/instantsearch-core/src/lib/infiniteHitsCache/sessionStorage.ts
@@ -0,0 +1,74 @@
+import { isEqual, safelyRunOnBrowser } from '../public';
+
+import type { InfiniteHitsCache } from '../../connectors/connectInfiniteHits';
+import type { PlainSearchParameters } from 'algoliasearch-helper';
+
+function getStateWithoutPage(state: PlainSearchParameters) {
+  const { page, ...rest } = state || {};
+  return rest;
+}
+
+export function createInfiniteHitsSessionStorageCache({
+  key,
+}: {
+  /**
+   * If you display multiple instances of infiniteHits on the same page,
+   * you must provide a unique key for each instance.
+   */
+  key?: string;
+} = {}): InfiniteHitsCache {
+  const KEY = ['ais.infiniteHits', key].filter(Boolean).join(':');
+
+  return {
+    read({ state }) {
+      const sessionStorage = safelyRunOnBrowser<Storage | undefined>(
+        ({ window }) => window.sessionStorage
+      );
+
+      if (!sessionStorage) {
+        return null;
+      }
+
+      try {
+        const cache = JSON.parse(
+          // @ts-expect-error JSON.parse() requires a string, but it actually accepts null, too.
+          sessionStorage.getItem(KEY)
+        );
+
+        return cache && isEqual(cache.state, getStateWithoutPage(state))
+          ? cache.hits
+          : null;
+      } catch (error) {
+        if (error instanceof SyntaxError) {
+          try {
+            sessionStorage.removeItem(KEY);
+          } catch (err) {
+            // do nothing
+          }
+        }
+        return null;
+      }
+    },
+    write({ state, hits }) {
+      const sessionStorage = safelyRunOnBrowser<Storage | undefined>(
+        ({ window }) => window.sessionStorage
+      );
+
+      if (!sessionStorage) {
+        return;
+      }
+
+      try {
+        sessionStorage.setItem(
+          KEY,
+          JSON.stringify({
+            state: getStateWithoutPage(state),
+            hits,
+          })
+        );
+      } catch (error) {
+        // do nothing
+      }
+    },
+  };
+}
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/capitalize-test.ts b/packages/instantsearch-core/src/lib/public/__tests__/capitalize.test.ts
similarity index 77%
rename from packages/instantsearch.js/src/lib/utils/__tests__/capitalize-test.ts
rename to packages/instantsearch-core/src/lib/public/__tests__/capitalize.test.ts
index 3eddaab145..4e73ca5937 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/capitalize-test.ts
+++ b/packages/instantsearch-core/src/lib/public/__tests__/capitalize.test.ts
@@ -1,4 +1,4 @@
-import { capitalize } from '../capitalize';
+import { capitalize } from '..';
 
 describe('capitalize', () => {
   it('should capitalize the first character only', () => {
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/defer.ts b/packages/instantsearch-core/src/lib/public/__tests__/defer.test.ts
similarity index 98%
rename from packages/instantsearch.js/src/lib/utils/__tests__/defer.ts
rename to packages/instantsearch-core/src/lib/public/__tests__/defer.test.ts
index 4cfd83f034..e6e63c57ce 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/defer.ts
+++ b/packages/instantsearch-core/src/lib/public/__tests__/defer.test.ts
@@ -1,4 +1,4 @@
-import { defer } from '../defer';
+import { defer } from '..';
 
 describe('defer', () => {
   it('defers the call to the function', async () => {
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/escape-highlight-test.ts b/packages/instantsearch-core/src/lib/public/__tests__/escapeHits.test.ts
similarity index 99%
rename from packages/instantsearch.js/src/lib/utils/__tests__/escape-highlight-test.ts
rename to packages/instantsearch-core/src/lib/public/__tests__/escapeHits.test.ts
index 7a13ce9444..b9315c62f6 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/escape-highlight-test.ts
+++ b/packages/instantsearch-core/src/lib/public/__tests__/escapeHits.test.ts
@@ -1,4 +1,4 @@
-import { escapeHits } from '../escape-highlight';
+import { escapeHits } from '..';
 
 describe('escapeHits()', () => {
   it('should escape highlightProperty simple text value', () => {
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/escape-html-test.ts b/packages/instantsearch-core/src/lib/public/__tests__/escapeHtml.test.ts
similarity index 96%
rename from packages/instantsearch.js/src/lib/utils/__tests__/escape-html-test.ts
rename to packages/instantsearch-core/src/lib/public/__tests__/escapeHtml.test.ts
index b89883189c..3719d9a721 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/escape-html-test.ts
+++ b/packages/instantsearch-core/src/lib/public/__tests__/escapeHtml.test.ts
@@ -1,4 +1,4 @@
-import { escape, unescape } from '../escape-html';
+import { escape, unescape } from '..';
 
 describe('escape', () => {
   test('should escape values', () => {
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/getHighlightFromSiblings-test.ts b/packages/instantsearch-core/src/lib/public/__tests__/getHighlightFromSiblings.test.ts
similarity index 92%
rename from packages/instantsearch.js/src/lib/utils/__tests__/getHighlightFromSiblings-test.ts
rename to packages/instantsearch-core/src/lib/public/__tests__/getHighlightFromSiblings.test.ts
index 7cb35c0243..fe13a1837d 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/getHighlightFromSiblings-test.ts
+++ b/packages/instantsearch-core/src/lib/public/__tests__/getHighlightFromSiblings.test.ts
@@ -1,4 +1,4 @@
-import { getHighlightFromSiblings } from '../getHighlightFromSiblings';
+import { getHighlightFromSiblings } from '..';
 
 import type { HighlightedParts } from '../../../types';
 
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/getHighlightedParts-test.ts b/packages/instantsearch-core/src/lib/public/__tests__/getHighlightedParts.test.ts
similarity index 94%
rename from packages/instantsearch.js/src/lib/utils/__tests__/getHighlightedParts-test.ts
rename to packages/instantsearch-core/src/lib/public/__tests__/getHighlightedParts.test.ts
index a3ac6e639e..d5c65411d9 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/getHighlightedParts-test.ts
+++ b/packages/instantsearch-core/src/lib/public/__tests__/getHighlightedParts.test.ts
@@ -1,4 +1,4 @@
-import { getHighlightedParts } from '../getHighlightedParts';
+import { getHighlightedParts } from '..';
 
 describe('getHighlightedParts', () => {
   test('returns an HighlightParts array of object from a string with a single match', () => {
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/getObjectType-test.ts b/packages/instantsearch-core/src/lib/public/__tests__/getObjectType.test.ts
similarity index 95%
rename from packages/instantsearch.js/src/lib/utils/__tests__/getObjectType-test.ts
rename to packages/instantsearch-core/src/lib/public/__tests__/getObjectType.test.ts
index 0f472ff594..817f8fcc10 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/getObjectType-test.ts
+++ b/packages/instantsearch-core/src/lib/public/__tests__/getObjectType.test.ts
@@ -1,4 +1,4 @@
-import { getObjectType } from '../getObjectType';
+import { getObjectType } from '..';
 
 describe('getObjectType', () => {
   test('returns the type of a string', () => {
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/getPropertyByPath-test.ts b/packages/instantsearch-core/src/lib/public/__tests__/getPropertyByPath.test.ts
similarity index 98%
rename from packages/instantsearch.js/src/lib/utils/__tests__/getPropertyByPath-test.ts
rename to packages/instantsearch-core/src/lib/public/__tests__/getPropertyByPath.test.ts
index 6bd1ce31cb..f6c4ad2cba 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/getPropertyByPath-test.ts
+++ b/packages/instantsearch-core/src/lib/public/__tests__/getPropertyByPath.test.ts
@@ -1,4 +1,4 @@
-import { getPropertyByPath } from '../getPropertyByPath';
+import { getPropertyByPath } from '..';
 
 describe('getPropertyByPath', () => {
   describe('path as string', () => {
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/getWidgetAttribute-test.ts b/packages/instantsearch-core/src/lib/public/__tests__/getWidgetAttribute.test.ts
similarity index 78%
rename from packages/instantsearch.js/src/lib/utils/__tests__/getWidgetAttribute-test.ts
rename to packages/instantsearch-core/src/lib/public/__tests__/getWidgetAttribute.test.ts
index 3d6ade37c7..37bd73b0e8 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/getWidgetAttribute-test.ts
+++ b/packages/instantsearch-core/src/lib/public/__tests__/getWidgetAttribute.test.ts
@@ -3,22 +3,24 @@
  */
 
 import { getWidgetAttribute } from '..';
-import { createInitOptions } from '../../../../test/createWidget';
-import { connectRefinementList } from '../../../connectors';
 import {
-  hierarchicalMenu,
-  hits,
-  panel,
-  refinementList,
-  toggleRefinement,
-} from '../../../widgets';
+  connectHits,
+  connectRefinementList,
+  connectHierarchicalMenu,
+  connectToggleRefinement,
+} from '../../..';
+import { createInitOptions } from '../../../../test/createWidget';
+
+const hierarchicalMenu = connectHierarchicalMenu(() => {});
+const hits = connectHits(() => {});
+const refinementList = connectRefinementList(() => {});
+const toggleRefinement = connectToggleRefinement(() => {});
 
 describe('getWidgetAttribute', () => {
   it('reads the attribute from a refinementList', () => {
     expect(
       getWidgetAttribute(
         refinementList({
-          container: document.createElement('div'),
           attribute: 'test',
         }),
         createInitOptions()
@@ -39,7 +41,6 @@ describe('getWidgetAttribute', () => {
     expect(
       getWidgetAttribute(
         hierarchicalMenu({
-          container: document.createElement('div'),
           attributes: ['test1', 'test2'],
         }),
         createInitOptions()
@@ -51,7 +52,6 @@ describe('getWidgetAttribute', () => {
     expect(
       getWidgetAttribute(
         toggleRefinement({
-          container: document.createElement('div'),
           attribute: 'test',
           on: 'yes',
           off: 'no',
@@ -61,18 +61,6 @@ describe('getWidgetAttribute', () => {
     ).toBe('test');
   });
 
-  it('reads the attribute from a panel', () => {
-    expect(
-      getWidgetAttribute(
-        panel()(refinementList)({
-          container: document.createElement('div'),
-          attribute: 'test',
-        }),
-        createInitOptions()
-      )
-    ).toBe('test');
-  });
-
   it('reads the attribute from a custom widget', () => {
     expect(
       getWidgetAttribute(
@@ -88,14 +76,10 @@ describe('getWidgetAttribute', () => {
   });
 
   it('does not read the attribute from hits', () => {
-    expect(() =>
-      getWidgetAttribute(
-        hits({ container: document.createElement('div') }),
-        createInitOptions()
-      )
-    ).toThrow(`Could not find the attribute of the widget:
+    expect(() => getWidgetAttribute(hits({}), createInitOptions()))
+      .toThrow(`Could not find the attribute of the widget:
 
-{"$$type":"ais.hits","$$widgetType":"ais.hits"}
+{"$$type":"ais.hits"}
 
 Please check whether the widget's getWidgetRenderState returns widgetParams.attribute correctly.`);
   });
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/isEqual-test.ts b/packages/instantsearch-core/src/lib/public/__tests__/isEqual.test.ts
similarity index 99%
rename from packages/instantsearch.js/src/lib/utils/__tests__/isEqual-test.ts
rename to packages/instantsearch-core/src/lib/public/__tests__/isEqual.test.ts
index 265b60ecb8..467a7c629b 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/isEqual-test.ts
+++ b/packages/instantsearch-core/src/lib/public/__tests__/isEqual.test.ts
@@ -1,4 +1,4 @@
-import { isEqual } from '../isEqual';
+import { isEqual } from '..';
 
 describe('isEqual', () => {
   describe('with primitives', () => {
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/isPlainObject-test.ts b/packages/instantsearch-core/src/lib/public/__tests__/isPlainObject.test.ts
similarity index 95%
rename from packages/instantsearch.js/src/lib/utils/__tests__/isPlainObject-test.ts
rename to packages/instantsearch-core/src/lib/public/__tests__/isPlainObject.test.ts
index 32858abb2f..2561a993f6 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/isPlainObject-test.ts
+++ b/packages/instantsearch-core/src/lib/public/__tests__/isPlainObject.test.ts
@@ -1,4 +1,4 @@
-import { isPlainObject } from '../isPlainObject';
+import { isPlainObject } from '..';
 
 describe('isPlainObject', () => {
   test('with primitive should be false', () => {
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/logger-test.ts b/packages/instantsearch-core/src/lib/public/__tests__/logger.test.ts
similarity index 88%
rename from packages/instantsearch.js/src/lib/utils/__tests__/logger-test.ts
rename to packages/instantsearch-core/src/lib/public/__tests__/logger.test.ts
index 4c8b51a047..17dc29f074 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/logger-test.ts
+++ b/packages/instantsearch-core/src/lib/public/__tests__/logger.test.ts
@@ -1,4 +1,4 @@
-import { deprecate, warning } from '../logger';
+import { deprecate, warning, warnCache } from '..';
 
 describe('deprecate', () => {
   const sum = (...args: number[]) => args.reduce((acc, _) => acc + _, 0);
@@ -21,7 +21,7 @@ describe('deprecate', () => {
     const actual = 6;
 
     expect(actual).toBe(expectation);
-    expect(warn).toHaveBeenCalledWith('[InstantSearch.js]: message');
+    expect(warn).toHaveBeenCalledWith('[InstantSearch]: message');
   });
 
   it('expect to call initial function twice and print message once', () => {
@@ -48,13 +48,13 @@ describe('warning', () => {
   afterEach(() => {
     warn.mockReset();
     warn.mockRestore();
-    warning.cache = {};
+    warnCache.current = {};
   });
 
   it('prints a warning message with a false condition', () => {
     warning(false, 'message');
 
-    expect(warn).toHaveBeenCalledWith('[InstantSearch.js]: message');
+    expect(warn).toHaveBeenCalledWith('[InstantSearch]: message');
   });
 
   it('does not print a warning message with a true condition', () => {
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/noop-test.ts b/packages/instantsearch-core/src/lib/public/__tests__/noop.test.ts
similarity index 88%
rename from packages/instantsearch.js/src/lib/utils/__tests__/noop-test.ts
rename to packages/instantsearch-core/src/lib/public/__tests__/noop.test.ts
index 87492ffd27..d4e56ec699 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/noop-test.ts
+++ b/packages/instantsearch-core/src/lib/public/__tests__/noop.test.ts
@@ -1,4 +1,4 @@
-import { noop } from '../noop';
+import { noop } from '..';
 
 describe('noop', () => {
   test('does nothing', () => {
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/range-test.ts b/packages/instantsearch-core/src/lib/public/__tests__/range.test.ts
similarity index 96%
rename from packages/instantsearch.js/src/lib/utils/__tests__/range-test.ts
rename to packages/instantsearch-core/src/lib/public/__tests__/range.test.ts
index 5f479b95eb..39bd8410fd 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/range-test.ts
+++ b/packages/instantsearch-core/src/lib/public/__tests__/range.test.ts
@@ -1,4 +1,4 @@
-import { range } from '../range';
+import { range } from '..';
 
 describe('range', () => {
   test('with end', () => {
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/reverseHighlightedParts-test.ts b/packages/instantsearch-core/src/lib/public/__tests__/reverseHighlightedParts.test.ts
similarity index 94%
rename from packages/instantsearch.js/src/lib/utils/__tests__/reverseHighlightedParts-test.ts
rename to packages/instantsearch-core/src/lib/public/__tests__/reverseHighlightedParts.test.ts
index b4943754b4..cabc6f5500 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/reverseHighlightedParts-test.ts
+++ b/packages/instantsearch-core/src/lib/public/__tests__/reverseHighlightedParts.test.ts
@@ -1,4 +1,4 @@
-import { reverseHighlightedParts } from '../reverseHighlightedParts';
+import { reverseHighlightedParts } from '..';
 
 describe('reverseHighlightedParts', () => {
   test('returns reversed HighlightedParts with a single match', () => {
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/safelyRunOnBrowser-test.ts b/packages/instantsearch-core/src/lib/public/__tests__/safelyRunOnBrowser.test.ts
similarity index 96%
rename from packages/instantsearch.js/src/lib/utils/__tests__/safelyRunOnBrowser-test.ts
rename to packages/instantsearch-core/src/lib/public/__tests__/safelyRunOnBrowser.test.ts
index 30fb911fc2..9540d03b8a 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/safelyRunOnBrowser-test.ts
+++ b/packages/instantsearch-core/src/lib/public/__tests__/safelyRunOnBrowser.test.ts
@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 
-import { safelyRunOnBrowser } from '../safelyRunOnBrowser';
+import { safelyRunOnBrowser } from '..';
 
 type CallbackReturn = {
   env: 'client' | 'server';
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/toArray-test.ts b/packages/instantsearch-core/src/lib/public/__tests__/toArray.test.ts
similarity index 89%
rename from packages/instantsearch.js/src/lib/utils/__tests__/toArray-test.ts
rename to packages/instantsearch-core/src/lib/public/__tests__/toArray.test.ts
index 8b8634f3d9..63061a2e2c 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/toArray-test.ts
+++ b/packages/instantsearch-core/src/lib/public/__tests__/toArray.test.ts
@@ -1,4 +1,4 @@
-import { toArray } from '../toArray';
+import { toArray } from '..';
 
 describe('toArray', () => {
   test('cast to array if necessary', () => {
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/uniq-test.ts b/packages/instantsearch-core/src/lib/public/__tests__/uniq.test.ts
similarity index 93%
rename from packages/instantsearch.js/src/lib/utils/__tests__/uniq-test.ts
rename to packages/instantsearch-core/src/lib/public/__tests__/uniq.test.ts
index 04279a9328..1f89b1b904 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/uniq-test.ts
+++ b/packages/instantsearch-core/src/lib/public/__tests__/uniq.test.ts
@@ -1,4 +1,4 @@
-import { uniq } from '../uniq';
+import { uniq } from '..';
 
 describe('uniq', () => {
   test('with empty array', () => {
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/walkIndex.test.ts b/packages/instantsearch-core/src/lib/public/__tests__/walkIndex.test.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/__tests__/walkIndex.test.ts
rename to packages/instantsearch-core/src/lib/public/__tests__/walkIndex.test.ts
diff --git a/packages/instantsearch.js/src/lib/utils/addWidgetId.ts b/packages/instantsearch-core/src/lib/public/addWidgetId.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/addWidgetId.ts
rename to packages/instantsearch-core/src/lib/public/addWidgetId.ts
diff --git a/packages/instantsearch.js/src/lib/utils/capitalize.ts b/packages/instantsearch-core/src/lib/public/capitalize.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/capitalize.ts
rename to packages/instantsearch-core/src/lib/public/capitalize.ts
diff --git a/packages/instantsearch.js/src/lib/utils/uuid.ts b/packages/instantsearch-core/src/lib/public/createUUID.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/uuid.ts
rename to packages/instantsearch-core/src/lib/public/createUUID.ts
diff --git a/packages/instantsearch.js/src/lib/utils/defer.ts b/packages/instantsearch-core/src/lib/public/defer.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/defer.ts
rename to packages/instantsearch-core/src/lib/public/defer.ts
diff --git a/packages/instantsearch.js/src/lib/utils/documentation.ts b/packages/instantsearch-core/src/lib/public/documentation.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/documentation.ts
rename to packages/instantsearch-core/src/lib/public/documentation.ts
diff --git a/packages/instantsearch.js/src/lib/utils/escape-highlight.ts b/packages/instantsearch-core/src/lib/public/escape-highlight.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/escape-highlight.ts
rename to packages/instantsearch-core/src/lib/public/escape-highlight.ts
diff --git a/packages/instantsearch.js/src/lib/utils/escape-html.ts b/packages/instantsearch-core/src/lib/public/escape-html.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/escape-html.ts
rename to packages/instantsearch-core/src/lib/public/escape-html.ts
diff --git a/packages/instantsearch.js/src/lib/utils/getHighlightFromSiblings.ts b/packages/instantsearch-core/src/lib/public/getHighlightFromSiblings.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/getHighlightFromSiblings.ts
rename to packages/instantsearch-core/src/lib/public/getHighlightFromSiblings.ts
diff --git a/packages/instantsearch.js/src/lib/utils/getHighlightedParts.ts b/packages/instantsearch-core/src/lib/public/getHighlightedParts.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/getHighlightedParts.ts
rename to packages/instantsearch-core/src/lib/public/getHighlightedParts.ts
diff --git a/packages/instantsearch.js/src/lib/utils/getObjectType.ts b/packages/instantsearch-core/src/lib/public/getObjectType.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/getObjectType.ts
rename to packages/instantsearch-core/src/lib/public/getObjectType.ts
diff --git a/packages/instantsearch.js/src/lib/utils/getPropertyByPath.ts b/packages/instantsearch-core/src/lib/public/getPropertyByPath.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/getPropertyByPath.ts
rename to packages/instantsearch-core/src/lib/public/getPropertyByPath.ts
diff --git a/packages/instantsearch.js/src/lib/utils/getWidgetAttribute.ts b/packages/instantsearch-core/src/lib/public/getWidgetAttribute.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/getWidgetAttribute.ts
rename to packages/instantsearch-core/src/lib/public/getWidgetAttribute.ts
diff --git a/packages/instantsearch-core/src/lib/public/index.ts b/packages/instantsearch-core/src/lib/public/index.ts
new file mode 100644
index 0000000000..0c571b4490
--- /dev/null
+++ b/packages/instantsearch-core/src/lib/public/index.ts
@@ -0,0 +1,29 @@
+// This folder is used for utility functions that are useful within the InstantSearch Core library and externally from other flavours. Not for internal-only usage. For that the `src/lib/utils` folder should be used.
+
+export * from './addWidgetId';
+export * from './capitalize';
+export * from './createUUID';
+export * from './defer';
+export * from './documentation';
+export * from './escape-highlight';
+export * from './escape-html';
+export * from './getHighlightedParts';
+export * from './getHighlightFromSiblings';
+export * from './getObjectType';
+export * from './getPropertyByPath';
+export * from './getWidgetAttribute';
+export * from './isEqual';
+export * from './isFacetRefined';
+export * from './isIndexWidget';
+export * from './isPlainObject';
+export * from './isSpecialClick';
+export * from './logger';
+export * from './noop';
+export * from './range';
+export * from './render-args';
+export * from './reverseHighlightedParts';
+export * from './safelyRunOnBrowser';
+export * from './toArray';
+export * from './typedObject';
+export * from './uniq';
+export * from './walkIndex';
diff --git a/packages/instantsearch.js/src/lib/utils/isEqual.ts b/packages/instantsearch-core/src/lib/public/isEqual.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/isEqual.ts
rename to packages/instantsearch-core/src/lib/public/isEqual.ts
diff --git a/packages/instantsearch.js/src/lib/utils/isFacetRefined.ts b/packages/instantsearch-core/src/lib/public/isFacetRefined.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/isFacetRefined.ts
rename to packages/instantsearch-core/src/lib/public/isFacetRefined.ts
diff --git a/packages/instantsearch.js/src/lib/utils/isIndexWidget.ts b/packages/instantsearch-core/src/lib/public/isIndexWidget.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/isIndexWidget.ts
rename to packages/instantsearch-core/src/lib/public/isIndexWidget.ts
diff --git a/packages/instantsearch.js/src/lib/utils/isPlainObject.ts b/packages/instantsearch-core/src/lib/public/isPlainObject.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/isPlainObject.ts
rename to packages/instantsearch-core/src/lib/public/isPlainObject.ts
diff --git a/packages/instantsearch.js/src/lib/utils/isSpecialClick.ts b/packages/instantsearch-core/src/lib/public/isSpecialClick.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/isSpecialClick.ts
rename to packages/instantsearch-core/src/lib/public/isSpecialClick.ts
diff --git a/packages/instantsearch.js/src/lib/utils/logger.ts b/packages/instantsearch-core/src/lib/public/logger.ts
similarity index 76%
rename from packages/instantsearch.js/src/lib/utils/logger.ts
rename to packages/instantsearch-core/src/lib/public/logger.ts
index e9fc2eebd4..b0f7fc513a 100644
--- a/packages/instantsearch.js/src/lib/utils/logger.ts
+++ b/packages/instantsearch-core/src/lib/public/logger.ts
@@ -1,12 +1,17 @@
 import { noop } from './noop';
 
-type Warn = (message: string) => void;
+type WarnCache = {
+  current: Record<string, boolean>;
+};
 
-type Warning = {
-  (condition: boolean, message: string): void;
-  cache: { [message: string]: boolean };
+export const warnCache: WarnCache = {
+  current: {},
 };
 
+type Warn = (message: string) => void;
+
+type Warning = (condition: boolean, message: string) => void;
+
 /**
  * Logs a warning when this function is called, in development environment only.
  */
@@ -32,7 +37,7 @@ let warning = noop as Warning;
 if (__DEV__) {
   warn = (message) => {
     // eslint-disable-next-line no-console
-    console.warn(`[InstantSearch.js]: ${message.trim()}`);
+    console.warn(`[InstantSearch]: ${message.trim()}`);
   };
 
   deprecate = (fn, message) => {
@@ -54,16 +59,14 @@ if (__DEV__) {
       return;
     }
 
-    const hasAlreadyPrinted = warning.cache[message];
+    const hasAlreadyPrinted = warnCache.current[message];
 
     if (!hasAlreadyPrinted) {
-      warning.cache[message] = true;
+      warnCache.current[message] = true;
 
       warn(message);
     }
   }) as Warning;
-
-  warning.cache = {};
 }
 
-export { warn, deprecate, warning };
+export { deprecate, warning };
diff --git a/packages/instantsearch.js/src/lib/utils/noop.ts b/packages/instantsearch-core/src/lib/public/noop.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/noop.ts
rename to packages/instantsearch-core/src/lib/public/noop.ts
diff --git a/packages/instantsearch.js/src/lib/utils/range.ts b/packages/instantsearch-core/src/lib/public/range.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/range.ts
rename to packages/instantsearch-core/src/lib/public/range.ts
diff --git a/packages/instantsearch.js/src/lib/utils/render-args.ts b/packages/instantsearch-core/src/lib/public/render-args.ts
similarity index 90%
rename from packages/instantsearch.js/src/lib/utils/render-args.ts
rename to packages/instantsearch-core/src/lib/public/render-args.ts
index 4b5a2a2f16..557f5a55d1 100644
--- a/packages/instantsearch.js/src/lib/utils/render-args.ts
+++ b/packages/instantsearch-core/src/lib/public/render-args.ts
@@ -1,4 +1,5 @@
-import type { InstantSearch, UiState, Widget, IndexWidget } from '../../types';
+import type { InstantSearch } from '../../instantsearch';
+import type { UiState, Widget, IndexWidget } from '../../types';
 
 export function createInitArgs(
   instantSearchInstance: InstantSearch,
diff --git a/packages/instantsearch.js/src/lib/utils/reverseHighlightedParts.ts b/packages/instantsearch-core/src/lib/public/reverseHighlightedParts.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/reverseHighlightedParts.ts
rename to packages/instantsearch-core/src/lib/public/reverseHighlightedParts.ts
diff --git a/packages/instantsearch.js/src/lib/utils/safelyRunOnBrowser.ts b/packages/instantsearch-core/src/lib/public/safelyRunOnBrowser.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/safelyRunOnBrowser.ts
rename to packages/instantsearch-core/src/lib/public/safelyRunOnBrowser.ts
diff --git a/packages/instantsearch.js/src/lib/utils/toArray.ts b/packages/instantsearch-core/src/lib/public/toArray.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/toArray.ts
rename to packages/instantsearch-core/src/lib/public/toArray.ts
diff --git a/packages/instantsearch.js/src/lib/utils/typedObject.ts b/packages/instantsearch-core/src/lib/public/typedObject.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/typedObject.ts
rename to packages/instantsearch-core/src/lib/public/typedObject.ts
diff --git a/packages/instantsearch.js/src/lib/utils/uniq.ts b/packages/instantsearch-core/src/lib/public/uniq.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/uniq.ts
rename to packages/instantsearch-core/src/lib/public/uniq.ts
diff --git a/packages/instantsearch.js/src/lib/utils/walkIndex.ts b/packages/instantsearch-core/src/lib/public/walkIndex.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/walkIndex.ts
rename to packages/instantsearch-core/src/lib/public/walkIndex.ts
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/hits-absolute-position-test.ts b/packages/instantsearch-core/src/lib/utils/__tests__/addAbsolutePosition.test.ts
similarity index 89%
rename from packages/instantsearch.js/src/lib/utils/__tests__/hits-absolute-position-test.ts
rename to packages/instantsearch-core/src/lib/utils/__tests__/addAbsolutePosition.test.ts
index ca31b7a6a8..72ff4c45a0 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/hits-absolute-position-test.ts
+++ b/packages/instantsearch-core/src/lib/utils/__tests__/addAbsolutePosition.test.ts
@@ -1,4 +1,4 @@
-import { addAbsolutePosition } from '../hits-absolute-position';
+import { addAbsolutePosition } from '..';
 
 describe('addAbsolutePosition', () => {
   it('should equal index + 1 on first page (page 0)', () => {
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/hits-query-id-test.ts b/packages/instantsearch-core/src/lib/utils/__tests__/addQueryID.test.ts
similarity index 92%
rename from packages/instantsearch.js/src/lib/utils/__tests__/hits-query-id-test.ts
rename to packages/instantsearch-core/src/lib/utils/__tests__/addQueryID.test.ts
index 53f4b575a0..70fd1bace6 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/hits-query-id-test.ts
+++ b/packages/instantsearch-core/src/lib/utils/__tests__/addQueryID.test.ts
@@ -1,4 +1,4 @@
-import { addQueryID } from '../hits-query-id';
+import { addQueryID } from '..';
 
 describe('addQueryID', () => {
   it('should add __queryID to every hit when given', () => {
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/clearRefinements-test.ts b/packages/instantsearch-core/src/lib/utils/__tests__/clearRefinements.test.ts
similarity index 99%
rename from packages/instantsearch.js/src/lib/utils/__tests__/clearRefinements-test.ts
rename to packages/instantsearch-core/src/lib/utils/__tests__/clearRefinements.test.ts
index 447b802946..ff1b8e1cbc 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/clearRefinements-test.ts
+++ b/packages/instantsearch-core/src/lib/utils/__tests__/clearRefinements.test.ts
@@ -1,6 +1,6 @@
 import algoliasearchHelper, { SearchParameters } from 'algoliasearch-helper';
 
-import { clearRefinements } from '../clearRefinements';
+import { clearRefinements } from '..';
 
 import type { SearchClient } from '../../../types';
 
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/createSendEventForFacet-test.ts b/packages/instantsearch-core/src/lib/utils/__tests__/createSendEventForFacet.test.ts
similarity index 97%
rename from packages/instantsearch.js/src/lib/utils/__tests__/createSendEventForFacet-test.ts
rename to packages/instantsearch-core/src/lib/utils/__tests__/createSendEventForFacet.test.ts
index 215ef7156d..3260c9868b 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/createSendEventForFacet-test.ts
+++ b/packages/instantsearch-core/src/lib/utils/__tests__/createSendEventForFacet.test.ts
@@ -2,12 +2,12 @@ import { castToJestMock } from '@instantsearch/testutils/castToJestMock';
 import algoliasearchHelper from 'algoliasearch-helper';
 
 import { createInstantSearch } from '../../../../test/createInstantSearch';
+import { isFacetRefined } from '../../public/isFacetRefined';
 import { createSendEventForFacet } from '../createSendEventForFacet';
-import { isFacetRefined } from '../isFacetRefined';
 
 import type { SearchClient } from '../../../types';
 
-jest.mock('../isFacetRefined', () => ({ isFacetRefined: jest.fn() }));
+jest.mock('../../public/isFacetRefined', () => ({ isFacetRefined: jest.fn() }));
 
 const createTestEnvironment = () => {
   const instantSearchInstance = createInstantSearch();
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/createSendEventForHits-test.ts b/packages/instantsearch-core/src/lib/utils/__tests__/createSendEventForHits.test.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/__tests__/createSendEventForHits-test.ts
rename to packages/instantsearch-core/src/lib/utils/__tests__/createSendEventForHits.test.ts
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/geo-search-test.ts b/packages/instantsearch-core/src/lib/utils/__tests__/geo-search.test.ts
similarity index 96%
rename from packages/instantsearch.js/src/lib/utils/__tests__/geo-search-test.ts
rename to packages/instantsearch-core/src/lib/utils/__tests__/geo-search.test.ts
index 90b67003b8..73f58b9c12 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/geo-search-test.ts
+++ b/packages/instantsearch-core/src/lib/utils/__tests__/geo-search.test.ts
@@ -1,7 +1,4 @@
-import {
-  aroundLatLngToPosition,
-  insideBoundingBoxToBoundingBox,
-} from '../geo-search';
+import { aroundLatLngToPosition, insideBoundingBoxToBoundingBox } from '..';
 
 import type { LatLng } from '../geo-search';
 
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/getAppIdAndApiKey-test.ts b/packages/instantsearch-core/src/lib/utils/__tests__/getAppIdAndApiKey.test.ts
similarity index 94%
rename from packages/instantsearch.js/src/lib/utils/__tests__/getAppIdAndApiKey-test.ts
rename to packages/instantsearch-core/src/lib/utils/__tests__/getAppIdAndApiKey.test.ts
index 710ea43499..a4a731588c 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/getAppIdAndApiKey-test.ts
+++ b/packages/instantsearch-core/src/lib/utils/__tests__/getAppIdAndApiKey.test.ts
@@ -2,7 +2,7 @@ import algoliasearchV3 from 'algoliasearch-v3';
 import algoliasearchV4 from 'algoliasearch-v4';
 import { liteClient as algoliasearchV5 } from 'algoliasearch-v5/lite';
 
-import { getAppIdAndApiKey } from '../getAppIdAndApiKey';
+import { getAppIdAndApiKey } from '..';
 
 const APP_ID = 'myAppId';
 const API_KEY = 'myApiKey';
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/getInsightsAnonymousUserToken-test.ts b/packages/instantsearch-core/src/lib/utils/__tests__/getInsightsAnonymousUserToken.test.ts
similarity index 92%
rename from packages/instantsearch.js/src/lib/utils/__tests__/getInsightsAnonymousUserToken-test.ts
rename to packages/instantsearch-core/src/lib/utils/__tests__/getInsightsAnonymousUserToken.test.ts
index 2488a7a8b9..5d32dda12c 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/getInsightsAnonymousUserToken-test.ts
+++ b/packages/instantsearch-core/src/lib/utils/__tests__/getInsightsAnonymousUserToken.test.ts
@@ -2,10 +2,7 @@
  * @jest-environment jsdom
  */
 
-import {
-  getInsightsAnonymousUserToken,
-  ANONYMOUS_TOKEN_COOKIE_KEY,
-} from '../getInsightsAnonymousUserToken';
+import { getInsightsAnonymousUserToken, ANONYMOUS_TOKEN_COOKIE_KEY } from '..';
 
 const DAY = 86400000; /* 1 day in ms*/
 const DATE_TOMORROW = new Date(Date.now() + DAY).toUTCString();
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/getRefinements-test.ts b/packages/instantsearch-core/src/lib/utils/__tests__/getRefinements.test.ts
similarity index 99%
rename from packages/instantsearch.js/src/lib/utils/__tests__/getRefinements-test.ts
rename to packages/instantsearch-core/src/lib/utils/__tests__/getRefinements.test.ts
index 26a5659389..84e25c41da 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/getRefinements-test.ts
+++ b/packages/instantsearch-core/src/lib/utils/__tests__/getRefinements.test.ts
@@ -7,7 +7,7 @@ import algoliasearchHelper, {
   SearchResults,
 } from 'algoliasearch-helper';
 
-import { getRefinements } from '../getRefinements';
+import { getRefinements } from '..';
 
 import type { AlgoliaSearchHelper } from 'algoliasearch-helper';
 
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/hydrateRecommendCache-test.ts b/packages/instantsearch-core/src/lib/utils/__tests__/hydrateRecommendCache.test.ts
similarity index 95%
rename from packages/instantsearch.js/src/lib/utils/__tests__/hydrateRecommendCache-test.ts
rename to packages/instantsearch-core/src/lib/utils/__tests__/hydrateRecommendCache.test.ts
index 5a37e63588..c8b68f6ddd 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/hydrateRecommendCache-test.ts
+++ b/packages/instantsearch-core/src/lib/utils/__tests__/hydrateRecommendCache.test.ts
@@ -5,7 +5,7 @@ import {
 import { wait } from '@instantsearch/testutils';
 import algoliaSearchHelper from 'algoliasearch-helper';
 
-import { hydrateRecommendCache } from '../hydrateRecommendCache';
+import { hydrateRecommendCache } from '..';
 
 describe('hydrateRecommendCache', () => {
   it('should hydrate the helper with the recommend cache', async () => {
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/hydrateSearchClient-composition-test.ts b/packages/instantsearch-core/src/lib/utils/__tests__/hydrateSearchClient-composition.test.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/__tests__/hydrateSearchClient-composition-test.ts
rename to packages/instantsearch-core/src/lib/utils/__tests__/hydrateSearchClient-composition.test.ts
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/hydrateSearchClient-test.ts b/packages/instantsearch-core/src/lib/utils/__tests__/hydrateSearchClient.test.ts
similarity index 99%
rename from packages/instantsearch.js/src/lib/utils/__tests__/hydrateSearchClient-test.ts
rename to packages/instantsearch-core/src/lib/utils/__tests__/hydrateSearchClient.test.ts
index 66fc52c0a2..313e8f5a22 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/hydrateSearchClient-test.ts
+++ b/packages/instantsearch-core/src/lib/utils/__tests__/hydrateSearchClient.test.ts
@@ -2,7 +2,7 @@ import algoliasearchV3 from 'algoliasearch-v3';
 import algoliasearchV4 from 'algoliasearch-v4';
 import { liteClient as algoliasearchV5 } from 'algoliasearch-v5/lite';
 
-import { hydrateSearchClient } from '../hydrateSearchClient';
+import { hydrateSearchClient } from '..';
 
 import type { SearchClient, InitialResults } from '../../../types';
 
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/mergeSearchParameters-test.ts b/packages/instantsearch-core/src/lib/utils/__tests__/mergeSearchParameters.test.ts
similarity index 99%
rename from packages/instantsearch.js/src/lib/utils/__tests__/mergeSearchParameters-test.ts
rename to packages/instantsearch-core/src/lib/utils/__tests__/mergeSearchParameters.test.ts
index 2102b2b300..b92732f207 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/mergeSearchParameters-test.ts
+++ b/packages/instantsearch-core/src/lib/utils/__tests__/mergeSearchParameters.test.ts
@@ -1,6 +1,6 @@
 import algoliasearchHelper from 'algoliasearch-helper';
 
-import { mergeSearchParameters } from '../mergeSearchParameters';
+import { mergeSearchParameters } from '..';
 
 describe('mergeSearchParameters', () => {
   it('overrides non-managed parameters', () => {
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/resolveSearchParameters-test.ts b/packages/instantsearch-core/src/lib/utils/__tests__/resolveSearchParameters.test.ts
similarity index 96%
rename from packages/instantsearch.js/src/lib/utils/__tests__/resolveSearchParameters-test.ts
rename to packages/instantsearch-core/src/lib/utils/__tests__/resolveSearchParameters.test.ts
index baf7e1504d..3b1520fe69 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/resolveSearchParameters-test.ts
+++ b/packages/instantsearch-core/src/lib/utils/__tests__/resolveSearchParameters.test.ts
@@ -1,6 +1,6 @@
+import { resolveSearchParameters } from '..';
 import { createIndexInitOptions } from '../../../../test/createWidget';
 import { index } from '../../../widgets';
-import { resolveSearchParameters } from '../resolveSearchParameters';
 
 describe('mergeSearchParameters', () => {
   describe('1 level', () => {
diff --git a/packages/instantsearch.js/src/lib/utils/hits-absolute-position.ts b/packages/instantsearch-core/src/lib/utils/addAbsolutePosition.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/hits-absolute-position.ts
rename to packages/instantsearch-core/src/lib/utils/addAbsolutePosition.ts
diff --git a/packages/instantsearch.js/src/lib/utils/hits-query-id.ts b/packages/instantsearch-core/src/lib/utils/addQueryID.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/hits-query-id.ts
rename to packages/instantsearch-core/src/lib/utils/addQueryID.ts
diff --git a/packages/instantsearch.js/src/lib/utils/checkIndexUiState.ts b/packages/instantsearch-core/src/lib/utils/checkIndexUiState.ts
similarity index 97%
rename from packages/instantsearch.js/src/lib/utils/checkIndexUiState.ts
rename to packages/instantsearch-core/src/lib/utils/checkIndexUiState.ts
index 3e57b2ea33..385b819fd2 100644
--- a/packages/instantsearch.js/src/lib/utils/checkIndexUiState.ts
+++ b/packages/instantsearch-core/src/lib/utils/checkIndexUiState.ts
@@ -1,6 +1,6 @@
-import { capitalize } from './capitalize';
-import { warning } from './logger';
-import { keys } from './typedObject';
+import { capitalize } from '../public/capitalize';
+import { warning } from '../public/logger';
+import { keys } from '../public/typedObject';
 
 import type { Widget, IndexUiState, IndexWidget } from '../../types';
 
diff --git a/packages/instantsearch.js/src/lib/utils/checkRendering.ts b/packages/instantsearch-core/src/lib/utils/checkRendering.ts
similarity index 74%
rename from packages/instantsearch.js/src/lib/utils/checkRendering.ts
rename to packages/instantsearch-core/src/lib/utils/checkRendering.ts
index e6d91aceaa..a5001d0009 100644
--- a/packages/instantsearch.js/src/lib/utils/checkRendering.ts
+++ b/packages/instantsearch-core/src/lib/utils/checkRendering.ts
@@ -1,6 +1,6 @@
-import { getObjectType } from './getObjectType';
+import { getObjectType } from '../public/getObjectType';
 
-import type { Renderer } from '../../types/connector';
+import type { Renderer } from '../../types';
 
 export function checkRendering(
   rendering: any,
diff --git a/packages/instantsearch.js/src/lib/utils/clearRefinements.ts b/packages/instantsearch-core/src/lib/utils/clearRefinements.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/clearRefinements.ts
rename to packages/instantsearch-core/src/lib/utils/clearRefinements.ts
diff --git a/packages/instantsearch.js/src/lib/utils/createSendEventForFacet.ts b/packages/instantsearch-core/src/lib/utils/createSendEventForFacet.ts
similarity index 81%
rename from packages/instantsearch.js/src/lib/utils/createSendEventForFacet.ts
rename to packages/instantsearch-core/src/lib/utils/createSendEventForFacet.ts
index 2a8652c9b1..bb34caf6d9 100644
--- a/packages/instantsearch.js/src/lib/utils/createSendEventForFacet.ts
+++ b/packages/instantsearch-core/src/lib/utils/createSendEventForFacet.ts
@@ -1,19 +1,9 @@
-import { isFacetRefined } from './isFacetRefined';
+import { isFacetRefined } from '../public/isFacetRefined';
 
-import type { InstantSearch } from '../../types';
+import type { InstantSearch } from '../../instantsearch';
+import type { SendEventForFacet } from '../../types';
 import type { AlgoliaSearchHelper } from 'algoliasearch-helper';
 
-type BuiltInSendEventForFacet = (
-  eventType: string,
-  facetValue: string,
-  eventName?: string,
-  additionalData?: Record<string, any>
-) => void;
-type CustomSendEventForFacet = (customPayload: any) => void;
-
-export type SendEventForFacet = BuiltInSendEventForFacet &
-  CustomSendEventForFacet;
-
 type CreateSendEventForFacetOptions = {
   instantSearchInstance: InstantSearch;
   helper: AlgoliaSearchHelper;
diff --git a/packages/instantsearch.js/src/lib/utils/createSendEventForHits.ts b/packages/instantsearch-core/src/lib/utils/createSendEventForHits.ts
similarity index 87%
rename from packages/instantsearch.js/src/lib/utils/createSendEventForHits.ts
rename to packages/instantsearch-core/src/lib/utils/createSendEventForHits.ts
index 8b62d505be..78e525b966 100644
--- a/packages/instantsearch.js/src/lib/utils/createSendEventForHits.ts
+++ b/packages/instantsearch-core/src/lib/utils/createSendEventForHits.ts
@@ -1,25 +1,13 @@
 import { serializePayload } from './serializer';
 
-import type { InsightsEvent } from '../../middlewares/createInsightsMiddleware';
-import type { InstantSearch, Hit, EscapedHits } from '../../types';
-
-type BuiltInSendEventForHits = (
-  eventType: string,
-  hits: Hit | Hit[],
-  eventName?: string,
-  additionalData?: Record<string, any>
-) => void;
-type CustomSendEventForHits = (customPayload: any) => void;
-export type SendEventForHits = BuiltInSendEventForHits & CustomSendEventForHits;
-
-export type BuiltInBindEventForHits = (
-  eventType: string,
-  hits: Hit | Hit[],
-  eventName?: string,
-  additionalData?: Record<string, any>
-) => string;
-export type CustomBindEventForHits = (customPayload: any) => string;
-export type BindEventForHits = BuiltInBindEventForHits & CustomBindEventForHits;
+import type { InstantSearch } from '../../instantsearch';
+import type {
+  Hit,
+  EscapedHits,
+  InsightsEvent,
+  BindEventForHits,
+  SendEventForHits,
+} from '../../types';
 
 function chunk<TItem>(arr: TItem[], chunkSize: number = 20): TItem[][] {
   const chunks: TItem[][] = [];
@@ -195,6 +183,9 @@ export function createSendEventForHits({
   return sendEventForHits;
 }
 
+/**
+ * @deprecated
+ */
 export function createBindEventForHits({
   getIndex,
   widgetType,
diff --git a/packages/instantsearch.js/src/lib/utils/escapeFacetValue.ts b/packages/instantsearch-core/src/lib/utils/escapeFacetValue.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/escapeFacetValue.ts
rename to packages/instantsearch-core/src/lib/utils/escapeFacetValue.ts
diff --git a/packages/instantsearch.js/src/lib/utils/geo-search.ts b/packages/instantsearch-core/src/lib/utils/geo-search.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/geo-search.ts
rename to packages/instantsearch-core/src/lib/utils/geo-search.ts
diff --git a/packages/instantsearch.js/src/lib/utils/getAppIdAndApiKey.ts b/packages/instantsearch-core/src/lib/utils/getAppIdAndApiKey.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/getAppIdAndApiKey.ts
rename to packages/instantsearch-core/src/lib/utils/getAppIdAndApiKey.ts
diff --git a/packages/instantsearch.js/src/lib/utils/getInsightsAnonymousUserToken.ts b/packages/instantsearch-core/src/lib/utils/getInsightsAnonymousToken.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/getInsightsAnonymousUserToken.ts
rename to packages/instantsearch-core/src/lib/utils/getInsightsAnonymousToken.ts
diff --git a/packages/instantsearch.js/src/lib/utils/getRefinements.ts b/packages/instantsearch-core/src/lib/utils/getRefinements.ts
similarity index 94%
rename from packages/instantsearch.js/src/lib/utils/getRefinements.ts
rename to packages/instantsearch-core/src/lib/utils/getRefinements.ts
index caca0f47a6..2e195ee6b5 100644
--- a/packages/instantsearch.js/src/lib/utils/getRefinements.ts
+++ b/packages/instantsearch-core/src/lib/utils/getRefinements.ts
@@ -1,5 +1,4 @@
 import { unescapeFacetValue, escapeFacetValue } from './escapeFacetValue';
-import { find } from './find';
 
 import type { SearchParameters, SearchResults } from 'algoliasearch-helper';
 
@@ -64,8 +63,7 @@ function getRefinement(
     name,
     escapedValue: escapeFacetValue(name),
   };
-  let facet: any = find<SearchResults.Facet | SearchResults.HierarchicalFacet>(
-    resultsFacets,
+  let facet: any = resultsFacets.find(
     (resultsFacet) => resultsFacet.name === attribute
   );
   let count: number;
@@ -83,10 +81,9 @@ function getRefinement(
       facet =
         facet &&
         facet.data &&
-        find(
-          Object.keys(facet.data).map(getFacetRefinement(facet.data)),
-          (refinement) => refinement.name === nameParts[i]
-        );
+        Object.keys(facet.data)
+          .map(getFacetRefinement(facet.data))
+          .find((refinement) => refinement.name === nameParts[i]);
     }
 
     count = facet && facet.count;
diff --git a/packages/instantsearch.js/src/lib/utils/hydrateRecommendCache.ts b/packages/instantsearch-core/src/lib/utils/hydrateRecommendCache.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/hydrateRecommendCache.ts
rename to packages/instantsearch-core/src/lib/utils/hydrateRecommendCache.ts
diff --git a/packages/instantsearch.js/src/lib/utils/hydrateSearchClient.ts b/packages/instantsearch-core/src/lib/utils/hydrateSearchClient.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/hydrateSearchClient.ts
rename to packages/instantsearch-core/src/lib/utils/hydrateSearchClient.ts
diff --git a/packages/instantsearch-core/src/lib/utils/index.ts b/packages/instantsearch-core/src/lib/utils/index.ts
new file mode 100644
index 0000000000..d4912e484f
--- /dev/null
+++ b/packages/instantsearch-core/src/lib/utils/index.ts
@@ -0,0 +1,20 @@
+// This folder is used for utility functions that are useful within the InstantSearch Core library. Not for external usage. For that the `src/lib/public` folder should be used.
+
+export * from './addAbsolutePosition';
+export * from './addQueryID';
+export * from './checkIndexUiState';
+export * from './checkRendering';
+export * from './clearRefinements';
+export * from './createSendEventForFacet';
+export * from './createSendEventForHits';
+export * from './escapeFacetValue';
+export * from './geo-search';
+export * from './getAppIdAndApiKey';
+export * from './getInsightsAnonymousToken';
+export * from './getRefinements';
+export * from './hydrateRecommendCache';
+export * from './hydrateSearchClient';
+export * from './mergeSearchParameters';
+export * from './resolveSearchParameters';
+export * from './serializer';
+export * from './setIndexHelperState';
diff --git a/packages/instantsearch.js/src/lib/utils/mergeSearchParameters.ts b/packages/instantsearch-core/src/lib/utils/mergeSearchParameters.ts
similarity index 96%
rename from packages/instantsearch.js/src/lib/utils/mergeSearchParameters.ts
rename to packages/instantsearch-core/src/lib/utils/mergeSearchParameters.ts
index 16309a425f..646d99ef85 100644
--- a/packages/instantsearch.js/src/lib/utils/mergeSearchParameters.ts
+++ b/packages/instantsearch-core/src/lib/utils/mergeSearchParameters.ts
@@ -1,5 +1,4 @@
-import { findIndex } from './findIndex';
-import { uniq } from './uniq';
+import { uniq } from '../public/uniq';
 
 import type { SearchParameters } from 'algoliasearch-helper';
 
@@ -39,7 +38,7 @@ const mergeDisjunctiveFacets: Merger = (left, right) =>
 const mergeHierarchicalFacets: Merger = (left, right) =>
   left.setQueryParameters({
     hierarchicalFacets: right.hierarchicalFacets.reduce((facets, facet) => {
-      const index = findIndex(facets, (_) => _.name === facet.name);
+      const index = facets.findIndex((_) => _.name === facet.name);
 
       if (index === -1) {
         return facets.concat(facet);
diff --git a/packages/instantsearch.js/src/lib/utils/resolveSearchParameters.ts b/packages/instantsearch-core/src/lib/utils/resolveSearchParameters.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/utils/resolveSearchParameters.ts
rename to packages/instantsearch-core/src/lib/utils/resolveSearchParameters.ts
diff --git a/packages/instantsearch.js/src/lib/utils/serializer.ts b/packages/instantsearch-core/src/lib/utils/serializer.ts
similarity index 75%
rename from packages/instantsearch.js/src/lib/utils/serializer.ts
rename to packages/instantsearch-core/src/lib/utils/serializer.ts
index 2697881950..03f6e95c7f 100644
--- a/packages/instantsearch.js/src/lib/utils/serializer.ts
+++ b/packages/instantsearch-core/src/lib/utils/serializer.ts
@@ -1,7 +1,9 @@
+// @MAJOR delete after bindEvent is removed
 export function serializePayload<TPayload>(payload: TPayload): string {
   return btoa(encodeURIComponent(JSON.stringify(payload)));
 }
 
+// @MAJOR delete after bindEvent is removed
 export function deserializePayload<TPayload>(serialized: string): TPayload {
   return JSON.parse(decodeURIComponent(atob(serialized)));
 }
diff --git a/packages/instantsearch.js/src/lib/utils/setIndexHelperState.ts b/packages/instantsearch-core/src/lib/utils/setIndexHelperState.ts
similarity index 92%
rename from packages/instantsearch.js/src/lib/utils/setIndexHelperState.ts
rename to packages/instantsearch-core/src/lib/utils/setIndexHelperState.ts
index 70894f87d7..c8e3dc8f21 100644
--- a/packages/instantsearch.js/src/lib/utils/setIndexHelperState.ts
+++ b/packages/instantsearch-core/src/lib/utils/setIndexHelperState.ts
@@ -1,5 +1,6 @@
+import { isIndexWidget } from '../public/isIndexWidget';
+
 import { checkIndexUiState } from './checkIndexUiState';
-import { isIndexWidget } from './isIndexWidget';
 
 import type { UiState, IndexWidget } from '../../types';
 
diff --git a/packages/instantsearch.js/src/lib/voiceSearchHelper/__tests__/index-test.ts b/packages/instantsearch-core/src/lib/voiceSearchHelper/__tests__/index-test.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/voiceSearchHelper/__tests__/index-test.ts
rename to packages/instantsearch-core/src/lib/voiceSearchHelper/__tests__/index-test.ts
diff --git a/packages/instantsearch.js/src/lib/voiceSearchHelper/index.ts b/packages/instantsearch-core/src/lib/voiceSearchHelper/index.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/voiceSearchHelper/index.ts
rename to packages/instantsearch-core/src/lib/voiceSearchHelper/index.ts
diff --git a/packages/instantsearch.js/src/lib/voiceSearchHelper/types.ts b/packages/instantsearch-core/src/lib/voiceSearchHelper/types.ts
similarity index 100%
rename from packages/instantsearch.js/src/lib/voiceSearchHelper/types.ts
rename to packages/instantsearch-core/src/lib/voiceSearchHelper/types.ts
diff --git a/packages/instantsearch.js/src/middlewares/__tests__/createInsightsMiddleware.ts b/packages/instantsearch-core/src/middlewares/__tests__/createInsightsMiddleware.ts
similarity index 97%
rename from packages/instantsearch.js/src/middlewares/__tests__/createInsightsMiddleware.ts
rename to packages/instantsearch-core/src/middlewares/__tests__/createInsightsMiddleware.ts
index 4b84abc8db..afa82f0345 100644
--- a/packages/instantsearch.js/src/middlewares/__tests__/createInsightsMiddleware.ts
+++ b/packages/instantsearch-core/src/middlewares/__tests__/createInsightsMiddleware.ts
@@ -13,16 +13,19 @@ import { castToJestMock } from '@instantsearch/testutils';
 import { wait } from '@instantsearch/testutils/wait';
 import { fireEvent } from '@testing-library/dom';
 
-import { createInsightsMiddleware } from '..';
+import {
+  createInsightsMiddleware,
+  connectSearchBox,
+  connectHits,
+  connectRefinementList,
+  connectDynamicWidgets,
+  warnCache,
+  instantsearch,
+  historyRouter,
+} from '../..';
 import { createInstantSearch } from '../../../test/createInstantSearch';
-import { connectSearchBox } from '../../connectors';
-import instantsearch from '../../index.es';
-import { history } from '../../lib/routers';
-import { warning } from '../../lib/utils';
-import { dynamicWidgets, hits, refinementList } from '../../widgets';
-
-import type { InsightsProps } from '..';
-import type { SearchClient } from '../../index.es';
+
+import type { SearchClient, InsightsProps } from '../../types';
 import type { PlainSearchParameters } from 'algoliasearch-helper';
 import type { JSDOM } from 'jsdom';
 
@@ -117,7 +120,7 @@ describe('insights', () => {
   };
 
   beforeEach(() => {
-    warning.cache = {};
+    warnCache.current = {};
 
     (window as any).AlgoliaAnalyticsObject = undefined;
     (window as any).aa = undefined;
@@ -344,7 +347,7 @@ describe('insights', () => {
           // insights error
         }
       }).toWarnDev(
-        '[InstantSearch.js]: could not extract Algolia credentials from searchClient in insights middleware.'
+        '[InstantSearch]: could not extract Algolia credentials from searchClient in insights middleware.'
       );
     });
 
@@ -1451,7 +1454,7 @@ describe('insights', () => {
       indexName: 'instant_search',
       searchClient: searchClientWithCredentials,
       routing: {
-        router: history({
+        router: historyRouter({
           writeDelay: 10,
         }),
       },
@@ -1485,7 +1488,7 @@ describe('insights', () => {
       indexName: 'instant_search',
       searchClient: searchClientWithCredentials,
       routing: {
-        router: history({
+        router: historyRouter({
           writeDelay: 10,
         }),
       },
@@ -1537,24 +1540,20 @@ describe('insights', () => {
     instantSearchInstance.use(createInsightsMiddleware({ insightsClient }));
 
     instantSearchInstance.addWidgets([
-      dynamicWidgets({
-        container: document.createElement('div'),
-        widgets: [
-          (container) => refinementList({ container, attribute: 'brand' }),
-        ],
-      }),
-      hits({
-        container: document.createElement('div'),
+      connectDynamicWidgets(() => {})({
+        widgets: [connectRefinementList(() => {})({ attribute: 'brand' })],
       }),
+      connectHits(() => {})({}),
     ]);
 
     instantSearchInstance.start();
 
     await wait(0);
 
-    // Dynamic widgets will trigger 2 searches. To avoid missing the cache on the second search, createInsightsMiddleware delays setting the userToken.
+    // Dynamic widgets will trigger 2 searches. We need to ensure the userToken is always set before the first search.
 
     const userToken = getUserToken();
+    expect(userToken).toMatch(/^anonymous-/);
 
     expect(searchClient.search).toHaveBeenCalledTimes(2);
     expect(searchClient.search.mock.calls[0][0][0].params.userToken).toBe(
diff --git a/packages/instantsearch.js/src/middlewares/__tests__/createMetadataMiddleware.ts b/packages/instantsearch-core/src/middlewares/__tests__/createMetadataMiddleware.ts
similarity index 88%
rename from packages/instantsearch.js/src/middlewares/__tests__/createMetadataMiddleware.ts
rename to packages/instantsearch-core/src/middlewares/__tests__/createMetadataMiddleware.ts
index 60f85874ba..eecf47e3e2 100644
--- a/packages/instantsearch.js/src/middlewares/__tests__/createMetadataMiddleware.ts
+++ b/packages/instantsearch-core/src/middlewares/__tests__/createMetadataMiddleware.ts
@@ -9,8 +9,14 @@ import algoliasearchV4 from 'algoliasearch-v4';
 import { algoliasearch as algoliasearchV5 } from 'algoliasearch-v5';
 
 import { createMetadataMiddleware } from '..';
-import instantsearch from '../..';
-import { configure, hits, index, pagination, searchBox } from '../../widgets';
+import {
+  instantsearch,
+  index,
+  connectConfigure,
+  connectSearchBox,
+  connectPagination,
+  connectHits,
+} from '../..';
 import { isMetadataEnabled } from '../createMetadataMiddleware';
 
 declare global {
@@ -113,12 +119,26 @@ describe('createMetadataMiddleware', () => {
       });
 
       search.addWidgets([
-        searchBox({ container: document.createElement('div') }),
-        searchBox({ container: document.createElement('div') }),
-        hits({ container: document.createElement('div'), escapeHTML: true }),
+        { ...connectSearchBox(() => {})({}), $$widgetType: 'ais.searchBox' },
+        { ...connectSearchBox(() => {})({}), $$widgetType: 'custom.searchBox' },
+        {
+          ...connectHits(() => {})({ escapeHTML: true }),
+          $$widgetType: 'ais.hits',
+        },
         index({ indexName: 'test2' }).addWidgets([
-          pagination({ container: document.createElement('div') }),
-          configure({ distinct: true, filters: 'hehe secret string!' }),
+          {
+            ...connectPagination(() => {})({ padding: 50 }),
+            $$widgetType: 'ais.pagination',
+          },
+          {
+            ...connectConfigure(() => {})({
+              searchParameters: {
+                distinct: true,
+                filters: 'hehe secret string!',
+              },
+            }),
+            $$widgetType: 'ais.configure',
+          },
         ]),
       ]);
 
@@ -129,7 +149,7 @@ describe('createMetadataMiddleware', () => {
       expect(document.head).toMatchInlineSnapshot(`
         <head>
           <meta
-            content="{\\"widgets\\":[{\\"type\\":\\"ais.searchBox\\",\\"widgetType\\":\\"ais.searchBox\\",\\"params\\":[]},{\\"type\\":\\"ais.searchBox\\",\\"widgetType\\":\\"ais.searchBox\\",\\"params\\":[]},{\\"type\\":\\"ais.hits\\",\\"widgetType\\":\\"ais.hits\\",\\"params\\":[\\"escapeHTML\\"]},{\\"type\\":\\"ais.index\\",\\"widgetType\\":\\"ais.index\\",\\"params\\":[]},{\\"type\\":\\"ais.pagination\\",\\"widgetType\\":\\"ais.pagination\\",\\"params\\":[]},{\\"type\\":\\"ais.configure\\",\\"widgetType\\":\\"ais.configure\\",\\"params\\":[\\"searchParameters\\"]},{\\"middleware\\":true,\\"type\\":\\"ais.metadata\\",\\"internal\\":true}]}"
+            content="{\\"widgets\\":[{\\"type\\":\\"ais.searchBox\\",\\"widgetType\\":\\"ais.searchBox\\",\\"params\\":[]},{\\"type\\":\\"ais.searchBox\\",\\"widgetType\\":\\"custom.searchBox\\",\\"params\\":[]},{\\"type\\":\\"ais.hits\\",\\"widgetType\\":\\"ais.hits\\",\\"params\\":[\\"escapeHTML\\"]},{\\"type\\":\\"ais.index\\",\\"widgetType\\":\\"ais.index\\",\\"params\\":[]},{\\"type\\":\\"ais.pagination\\",\\"widgetType\\":\\"ais.pagination\\",\\"params\\":[\\"padding\\"]},{\\"type\\":\\"ais.configure\\",\\"widgetType\\":\\"ais.configure\\",\\"params\\":[\\"searchParameters\\"]},{\\"middleware\\":true,\\"type\\":\\"ais.metadata\\",\\"internal\\":true}]}"
             name="instantsearch:widgets"
           />
         </head>
@@ -146,7 +166,7 @@ describe('createMetadataMiddleware', () => {
           {
             "params": [],
             "type": "ais.searchBox",
-            "widgetType": "ais.searchBox",
+            "widgetType": "custom.searchBox",
           },
           {
             "params": [
@@ -161,7 +181,9 @@ describe('createMetadataMiddleware', () => {
             "widgetType": "ais.index",
           },
           {
-            "params": [],
+            "params": [
+              "padding",
+            ],
             "type": "ais.pagination",
             "widgetType": "ais.pagination",
           },
@@ -271,7 +293,7 @@ describe('createMetadataMiddleware', () => {
           expect.stringMatching(/Algolia for JavaScript \(5\..*\)/),
           expect.stringMatching(/Search \(5\..*\)/),
           expect.stringMatching(/Node.js \(.*\)/),
-          expect.stringMatching(/instantsearch.js \(4\..*\)/),
+          expect.stringMatching(/instantsearch-core \(0\..*\)/),
           expect.stringMatching(/JS Helper \(3\..*\)/),
         ]);
       });
@@ -312,7 +334,7 @@ describe('createMetadataMiddleware', () => {
           expect.stringMatching(/Algolia for JavaScript \(5\..*\)/),
           expect.stringMatching(/Search \(5\..*\)/),
           expect.stringMatching(/Node.js \(.*\)/),
-          expect.stringMatching(/instantsearch.js \(4\..*\)/),
+          expect.stringMatching(/instantsearch-core \(0\..*\)/),
           expect.stringMatching(/JS Helper \(3\..*\)/),
           'test (cool)',
         ]);
@@ -351,7 +373,7 @@ describe('createMetadataMiddleware', () => {
         ).toEqual([
           expect.stringMatching(/Algolia for JavaScript \(4\..*\)/),
           expect.stringMatching(/Node.js \(.*\)/),
-          expect.stringMatching(/instantsearch.js \(4\..*\)/),
+          expect.stringMatching(/instantsearch-core \(0\..*\)/),
           expect.stringMatching(/JS Helper \(3\..*\)/),
         ]);
       });
@@ -391,7 +413,7 @@ describe('createMetadataMiddleware', () => {
         ).toEqual([
           expect.stringMatching(/Algolia for JavaScript \(4\..*\)/),
           expect.stringMatching(/Node.js \(.*\)/),
-          expect.stringMatching(/instantsearch.js \(4\..*\)/),
+          expect.stringMatching(/instantsearch-core \(0\..*\)/),
           expect.stringMatching(/JS Helper \(3\..*\)/),
           'test (cool)',
         ]);
@@ -430,7 +452,7 @@ describe('createMetadataMiddleware', () => {
         ).toEqual([
           expect.stringMatching(/Algolia for JavaScript \(3\..*\)/),
           expect.stringMatching(/Node.js \(.*\)/),
-          expect.stringMatching(/instantsearch.js \(4\..*\)/),
+          expect.stringMatching(/instantsearch-core \(0\..*\)/),
           expect.stringMatching(/JS Helper \(3\..*\)/),
         ]);
       });
@@ -470,7 +492,7 @@ describe('createMetadataMiddleware', () => {
         ).toEqual([
           expect.stringMatching(/Algolia for JavaScript \(3\..*\)/),
           expect.stringMatching(/Node.js \(.*\)/),
-          expect.stringMatching(/instantsearch.js \(4\..*\)/),
+          expect.stringMatching(/instantsearch-core \(0\..*\)/),
           expect.stringMatching(/JS Helper \(3\..*\)/),
           'test (cool)',
         ]);
diff --git a/packages/instantsearch.js/src/middlewares/__tests__/createRouterMiddleware.ts b/packages/instantsearch-core/src/middlewares/__tests__/createRouterMiddleware.ts
similarity index 87%
rename from packages/instantsearch.js/src/middlewares/__tests__/createRouterMiddleware.ts
rename to packages/instantsearch-core/src/middlewares/__tests__/createRouterMiddleware.ts
index 599d236031..38f5508cca 100644
--- a/packages/instantsearch.js/src/middlewares/__tests__/createRouterMiddleware.ts
+++ b/packages/instantsearch-core/src/middlewares/__tests__/createRouterMiddleware.ts
@@ -5,10 +5,11 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
 
-import instantsearch from '../../index.es';
-import { searchBox } from '../../widgets';
+import { instantsearch, connectSearchBox } from '../..';
 
-import type { Router } from '../../index.es';
+import type { Router } from '../../types';
+
+const searchBox = connectSearchBox(() => {});
 
 describe('router', () => {
   it('sets initial ui state after reading URL', async () => {
@@ -32,9 +33,7 @@ describe('router', () => {
         },
       },
     });
-    search.addWidgets([
-      searchBox({ container: document.createElement('div') }),
-    ]);
+    search.addWidgets([searchBox({})]);
     search.start();
 
     await wait(0);
@@ -72,9 +71,7 @@ describe('router', () => {
         },
       },
     });
-    search.addWidgets([
-      searchBox({ container: document.createElement('div') }),
-    ]);
+    search.addWidgets([searchBox({})]);
     search.start();
     await wait(0);
     expect(search.getUiState()).toMatchInlineSnapshot(`
@@ -91,9 +88,7 @@ describe('router', () => {
         query: 'MacBook',
       },
     };
-    search.addWidgets([
-      searchBox({ container: document.createElement('div') }),
-    ]);
+    search.addWidgets([searchBox({})]);
     search.start();
     await wait(0);
     expect(search.getUiState()).toMatchInlineSnapshot(`
@@ -174,7 +169,7 @@ describe('router', () => {
     expect(() => {
       search.start();
     }).toWarnDev(
-      '[InstantSearch.js]: Using `initialUiState` together with routing is not recommended. The `initialUiState` will be overwritten by the URL parameters.'
+      '[InstantSearch]: Using `initialUiState` together with routing is not recommended. The `initialUiState` will be overwritten by the URL parameters.'
     );
   });
 
diff --git a/packages/instantsearch.js/src/middlewares/createInsightsMiddleware.ts b/packages/instantsearch-core/src/middlewares/createInsightsMiddleware.ts
similarity index 93%
rename from packages/instantsearch.js/src/middlewares/createInsightsMiddleware.ts
rename to packages/instantsearch-core/src/middlewares/createInsightsMiddleware.ts
index e74d5aefca..1503037151 100644
--- a/packages/instantsearch.js/src/middlewares/createInsightsMiddleware.ts
+++ b/packages/instantsearch-core/src/middlewares/createInsightsMiddleware.ts
@@ -1,47 +1,21 @@
-import {
-  warning,
-  noop,
-  getAppIdAndApiKey,
-  find,
-  safelyRunOnBrowser,
-  getInsightsAnonymousUserToken,
-  createUUID,
-} from '../lib/utils';
+import { warning, noop, safelyRunOnBrowser, createUUID } from '../lib/public';
+import { getAppIdAndApiKey, getInsightsAnonymousUserToken } from '../lib/utils';
 
+import type { InstantSearch } from '../instantsearch';
 import type {
   InsightsClient,
-  InsightsEvent as _InsightsEvent,
   InsightsMethod,
   InsightsMethodMap,
   InternalMiddleware,
-  InstantSearch,
+  ProvidedInsightsClient,
+  InsightsEvent,
+  InsightsProps,
 } from '../types';
 import type {
   AlgoliaSearchHelper,
   PlainSearchParameters,
 } from 'algoliasearch-helper';
 
-type ProvidedInsightsClient = InsightsClient | null | undefined;
-
-export type InsightsEvent<TMethod extends InsightsMethod = InsightsMethod> =
-  _InsightsEvent<TMethod>;
-
-export type InsightsProps<
-  TInsightsClient extends ProvidedInsightsClient = ProvidedInsightsClient
-> = {
-  insightsClient?: TInsightsClient;
-  insightsInitParams?: Partial<InsightsMethodMap['init'][0][0]>;
-  onEvent?: (event: InsightsEvent, insightsClient: TInsightsClient) => void;
-  /**
-   * @internal indicator for the default insights middleware
-   */
-  $$internal?: boolean;
-  /**
-   * @internal indicator for sending the `clickAnalytics` search parameter
-   */
-  $$automatic?: boolean;
-};
-
 const ALGOLIA_INSIGHTS_VERSION = '2.17.2';
 const ALGOLIA_INSIGHTS_SRC = `https://cdn.jsdelivr.net/npm/search-insights@${ALGOLIA_INSIGHTS_VERSION}/dist/search-insights.min.js`;
 
@@ -134,7 +108,10 @@ export function createInsightsMiddleware<
       [queuedUserToken, queuedInitParams] = ['setUserToken', 'init'].map(
         (key) => {
           const [, value] =
-            find(queue.slice().reverse(), ([method]) => method === key) || [];
+            queue
+              .slice()
+              .reverse()
+              .find(([method]) => method === key) || [];
 
           return value as any as NonNullable<typeof value>;
         }
@@ -181,6 +158,8 @@ export function createInsightsMiddleware<
           script.onerror = () => {
             instantSearchInstance.emit('error', new Error(errorMessage));
           };
+          // Does not work from Firefox 55 to 59
+          // eslint-disable-next-line compat/compat
           document.body.appendChild(script);
           insightsClient.shouldAddScript = false;
         } catch (cause) {
@@ -199,10 +178,10 @@ export function createInsightsMiddleware<
           [queuedUserToken, queuedInitParams] = ['setUserToken', 'init'].map(
             (key) => {
               const [, value] =
-                find(
-                  queueAtStart.slice().reverse(),
-                  ([method]) => method === key
-                ) || [];
+                queueAtStart
+                  .slice()
+                  .reverse()
+                  .find(([method]) => method === key) || [];
 
               return value;
             }
diff --git a/packages/instantsearch.js/src/middlewares/createMetadataMiddleware.ts b/packages/instantsearch-core/src/middlewares/createMetadataMiddleware.ts
similarity index 94%
rename from packages/instantsearch.js/src/middlewares/createMetadataMiddleware.ts
rename to packages/instantsearch-core/src/middlewares/createMetadataMiddleware.ts
index 426ff83bb2..9cf8b95677 100644
--- a/packages/instantsearch.js/src/middlewares/createMetadataMiddleware.ts
+++ b/packages/instantsearch-core/src/middlewares/createMetadataMiddleware.ts
@@ -1,11 +1,7 @@
-import { createInitArgs, safelyRunOnBrowser } from '../lib/utils';
-
-import type {
-  InstantSearch,
-  InternalMiddleware,
-  Widget,
-  IndexWidget,
-} from '../types';
+import { createInitArgs, safelyRunOnBrowser } from '../lib/public';
+
+import type { InstantSearch } from '../instantsearch';
+import type { InternalMiddleware, Widget, IndexWidget } from '../types';
 
 type WidgetMetadata =
   | {
diff --git a/packages/instantsearch.js/src/middlewares/createRouterMiddleware.ts b/packages/instantsearch-core/src/middlewares/createRouterMiddleware.ts
similarity index 85%
rename from packages/instantsearch.js/src/middlewares/createRouterMiddleware.ts
rename to packages/instantsearch-core/src/middlewares/createRouterMiddleware.ts
index acb88a4621..12e919282a 100644
--- a/packages/instantsearch.js/src/middlewares/createRouterMiddleware.ts
+++ b/packages/instantsearch-core/src/middlewares/createRouterMiddleware.ts
@@ -1,29 +1,14 @@
-import historyRouter from '../lib/routers/history';
-import simpleStateMapping from '../lib/stateMappings/simple';
-import { isEqual, warning } from '../lib/utils';
+import { isEqual, warning } from '../lib/public';
+import { historyRouter, simpleStateMapping } from '../routing';
 
 import type {
-  Router,
+  RouterProps,
   StateMapping,
   UiState,
   InternalMiddleware,
   CreateURL,
 } from '../types';
 
-export type RouterProps<
-  TUiState extends UiState = UiState,
-  TRouteState = TUiState
-> = {
-  router?: Router<TRouteState>;
-  // ideally stateMapping should be required if TRouteState is given,
-  // but there's no way to check if a generic is provided or the default value.
-  stateMapping?: StateMapping<TUiState, TRouteState>;
-  /**
-   * @internal indicator for the default middleware
-   */
-  $$internal?: boolean;
-};
-
 export const createRouterMiddleware = <
   TUiState extends UiState = UiState,
   TRouteState = TUiState
diff --git a/packages/instantsearch-core/src/middlewares/index.ts b/packages/instantsearch-core/src/middlewares/index.ts
new file mode 100644
index 0000000000..a44215a78b
--- /dev/null
+++ b/packages/instantsearch-core/src/middlewares/index.ts
@@ -0,0 +1,3 @@
+export * from './createInsightsMiddleware';
+export * from './createRouterMiddleware';
+export * from './createMetadataMiddleware';
diff --git a/packages/instantsearch.js/src/lib/__tests__/routing/correct-urls.test.ts b/packages/instantsearch-core/src/routing/__tests__/correct-urls.test.ts
similarity index 89%
rename from packages/instantsearch.js/src/lib/__tests__/routing/correct-urls.test.ts
rename to packages/instantsearch-core/src/routing/__tests__/correct-urls.test.ts
index 639cbda9d9..436e1c48e3 100644
--- a/packages/instantsearch.js/src/lib/__tests__/routing/correct-urls.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/correct-urls.test.ts
@@ -5,10 +5,13 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
 
-import { connectPagination, connectSearchBox } from '../../../connectors';
-import instantsearch from '../../../index.es';
-import { index } from '../../../widgets';
-import historyRouter from '../../routers/history';
+import {
+  instantsearch,
+  index,
+  historyRouter,
+  connectPagination,
+  connectSearchBox,
+} from '../..';
 
 beforeEach(() => {
   window.history.pushState({}, '', '/');
diff --git a/packages/instantsearch.js/src/lib/__tests__/routing/dispose-start-test.ts b/packages/instantsearch-core/src/routing/__tests__/dispose-start.test.ts
similarity index 92%
rename from packages/instantsearch.js/src/lib/__tests__/routing/dispose-start-test.ts
rename to packages/instantsearch-core/src/routing/__tests__/dispose-start.test.ts
index 4ee85f4ee5..673f09ec6a 100644
--- a/packages/instantsearch.js/src/lib/__tests__/routing/dispose-start-test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/dispose-start.test.ts
@@ -5,11 +5,9 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
 
-import instantsearch from '../../..';
-import { connectSearchBox } from '../../../connectors';
-import historyRouter from '../../routers/history';
+import { instantsearch, historyRouter, connectSearchBox } from '../..';
 
-import type InstantSearch from '../../InstantSearch';
+import type { InstantSearch } from '../..';
 
 /* eslint no-lone-blocks: "off" */
 
diff --git a/packages/instantsearch.js/src/lib/__tests__/routing/duplicate-url-test.ts b/packages/instantsearch-core/src/routing/__tests__/duplicate-url.test.ts
similarity index 92%
rename from packages/instantsearch.js/src/lib/__tests__/routing/duplicate-url-test.ts
rename to packages/instantsearch-core/src/routing/__tests__/duplicate-url.test.ts
index df75464ddb..d93f293f76 100644
--- a/packages/instantsearch.js/src/lib/__tests__/routing/duplicate-url-test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/duplicate-url.test.ts
@@ -5,9 +5,12 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
 
-import instantsearch from '../../..';
-import { connectPagination, connectSearchBox } from '../../../connectors';
-import historyRouter from '../../routers/history';
+import {
+  instantsearch,
+  historyRouter,
+  connectPagination,
+  connectSearchBox,
+} from '../..';
 
 /* eslint no-lone-blocks: "off" */
 
diff --git a/packages/instantsearch.js/src/lib/__tests__/routing/external-influence-test.ts b/packages/instantsearch-core/src/routing/__tests__/external-influence.test.ts
similarity index 93%
rename from packages/instantsearch.js/src/lib/__tests__/routing/external-influence-test.ts
rename to packages/instantsearch-core/src/routing/__tests__/external-influence.test.ts
index d369a7f5f3..616546f016 100644
--- a/packages/instantsearch.js/src/lib/__tests__/routing/external-influence-test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/external-influence.test.ts
@@ -5,9 +5,7 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
 
-import instantsearch from '../../..';
-import { connectSearchBox } from '../../../connectors';
-import historyRouter from '../../routers/history';
+import { instantsearch, historyRouter, connectSearchBox } from '../..';
 
 /* eslint no-lone-blocks: "off" */
 
diff --git a/packages/instantsearch.js/src/lib/routers/__tests__/history-integration.test.ts b/packages/instantsearch-core/src/routing/__tests__/historyRouter-integration.test.ts
similarity index 93%
rename from packages/instantsearch.js/src/lib/routers/__tests__/history-integration.test.ts
rename to packages/instantsearch-core/src/routing/__tests__/historyRouter-integration.test.ts
index c1eafec9f3..3e7c5aad94 100644
--- a/packages/instantsearch.js/src/lib/routers/__tests__/history-integration.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/historyRouter-integration.test.ts
@@ -5,10 +5,10 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
 
-import { connectPagination, connectSearchBox } from '../../../connectors';
-import instantsearch from '../../../index.es';
-import { index } from '../../../widgets';
-import historyRouter from '../history';
+import { historyRouter } from '..';
+import { connectPagination, connectSearchBox } from '../../connectors';
+import { instantsearch } from '../../instantsearch';
+import { index } from '../../widgets';
 
 beforeEach(() => {
   window.history.pushState({}, '', '/');
diff --git a/packages/instantsearch.js/src/lib/routers/__tests__/history.test.ts b/packages/instantsearch-core/src/routing/__tests__/historyRouter.test.ts
similarity index 96%
rename from packages/instantsearch.js/src/lib/routers/__tests__/history.test.ts
rename to packages/instantsearch-core/src/routing/__tests__/historyRouter.test.ts
index c53d24931e..b727dd97a3 100644
--- a/packages/instantsearch.js/src/lib/routers/__tests__/history.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/historyRouter.test.ts
@@ -4,12 +4,15 @@
 
 import { createSearchClient } from '@instantsearch/mocks';
 
-import instantsearch from '../../..';
-import { simple } from '../../stateMappings';
-import { noop, warning } from '../../utils';
-import historyRouter from '../history';
+import {
+  historyRouter,
+  simpleStateMapping,
+  instantsearch,
+  noop,
+  warnCache,
+} from '../..';
 
-import type { UiState } from '../../../types';
+import type { UiState } from '../../types';
 
 jest.useFakeTimers();
 
@@ -156,7 +159,7 @@ describe('life cycle', () => {
 
     test("doesn't throw if an index history state is null", () => {
       const router = historyRouter<UiState>({ cleanUrlOnDispose: true });
-      const stateMapping = simple();
+      const stateMapping = simpleStateMapping();
 
       router.onUpdate((routeState) => {
         const state = stateMapping.routeToState(routeState);
@@ -211,7 +214,7 @@ describe('life cycle', () => {
           indexName: 'indexName',
           searchClient: createSearchClient(),
           routing: {
-            stateMapping: simple(),
+            stateMapping: simpleStateMapping(),
             router,
           },
         });
@@ -379,7 +382,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/history-rou
 
   describe('createURL', () => {
     test('prints a warning when created URL is not valid', () => {
-      warning.cache = {};
+      warnCache.current = {};
 
       const router = historyRouter<UiState>({
         createURL: () => '/search',
@@ -387,7 +390,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/history-rou
       });
 
       expect(() => router.createURL({ indexName: {} }))
-        .toWarnDev(`[InstantSearch.js]: The URL returned by the \`createURL\` function is invalid.
+        .toWarnDev(`[InstantSearch]: The URL returned by the \`createURL\` function is invalid.
 Please make sure it returns an absolute URL to avoid issues, e.g: \`https://algolia.com/search?query=iphone\`.`);
     });
   });
diff --git a/packages/instantsearch.js/src/lib/__tests__/routing/modal-test.ts b/packages/instantsearch-core/src/routing/__tests__/modal.test.ts
similarity index 91%
rename from packages/instantsearch.js/src/lib/__tests__/routing/modal-test.ts
rename to packages/instantsearch-core/src/routing/__tests__/modal.test.ts
index 6f7965c5b1..9ccd1a047e 100644
--- a/packages/instantsearch.js/src/lib/__tests__/routing/modal-test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/modal.test.ts
@@ -5,9 +5,7 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
 
-import instantsearch from '../../..';
-import { connectSearchBox } from '../../../connectors';
-import historyRouter from '../../routers/history';
+import { instantsearch, historyRouter, connectSearchBox } from '../..';
 
 /* eslint no-lone-blocks: "off" */
 
diff --git a/packages/instantsearch.js/src/lib/stateMappings/__tests__/simple-test.ts b/packages/instantsearch-core/src/routing/__tests__/simpleStateMapping.test.ts
similarity index 97%
rename from packages/instantsearch.js/src/lib/stateMappings/__tests__/simple-test.ts
rename to packages/instantsearch-core/src/routing/__tests__/simpleStateMapping.test.ts
index 21118bbed1..8b0486ff1d 100644
--- a/packages/instantsearch.js/src/lib/stateMappings/__tests__/simple-test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/simpleStateMapping.test.ts
@@ -1,6 +1,6 @@
-import simpleStateMapping from '../simple';
+import { simpleStateMapping } from '..';
 
-import type { UiState } from '../../../types';
+import type { UiState } from '../../types';
 
 describe('simpleStateMapping', () => {
   describe('stateToRoute', () => {
diff --git a/packages/instantsearch.js/src/lib/stateMappings/__tests__/singleIndex-test.ts b/packages/instantsearch-core/src/routing/__tests__/singleIndexStateMapping.test.ts
similarity index 98%
rename from packages/instantsearch.js/src/lib/stateMappings/__tests__/singleIndex-test.ts
rename to packages/instantsearch-core/src/routing/__tests__/singleIndexStateMapping.test.ts
index d1a8e9177e..d88bc16f31 100644
--- a/packages/instantsearch.js/src/lib/stateMappings/__tests__/singleIndex-test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/singleIndexStateMapping.test.ts
@@ -1,6 +1,6 @@
-import singleIndexStateMapping from '../singleIndex';
+import { singleIndexStateMapping } from '..';
 
-import type { UiState } from '../../../types';
+import type { UiState } from '../../types';
 
 describe('singleIndexStateMapping', () => {
   describe('stateToRoute', () => {
diff --git a/packages/instantsearch.js/src/lib/__tests__/routing/spa-debounced-test.ts b/packages/instantsearch-core/src/routing/__tests__/spa-debounced.test.ts
similarity index 94%
rename from packages/instantsearch.js/src/lib/__tests__/routing/spa-debounced-test.ts
rename to packages/instantsearch-core/src/routing/__tests__/spa-debounced.test.ts
index 3622100181..75f53d5366 100644
--- a/packages/instantsearch.js/src/lib/__tests__/routing/spa-debounced-test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/spa-debounced.test.ts
@@ -5,9 +5,7 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
 
-import instantsearch from '../../..';
-import { connectSearchBox } from '../../../connectors';
-import historyRouter from '../../routers/history';
+import { instantsearch, historyRouter, connectSearchBox } from '../..';
 
 /* eslint no-lone-blocks: "off" */
 
diff --git a/packages/instantsearch.js/src/lib/__tests__/routing/spa-replace-state-test.ts b/packages/instantsearch-core/src/routing/__tests__/spa-replace-state.test.ts
similarity index 94%
rename from packages/instantsearch.js/src/lib/__tests__/routing/spa-replace-state-test.ts
rename to packages/instantsearch-core/src/routing/__tests__/spa-replace-state.test.ts
index e5a78d2578..dfa5869a6d 100644
--- a/packages/instantsearch.js/src/lib/__tests__/routing/spa-replace-state-test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/spa-replace-state.test.ts
@@ -5,9 +5,7 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
 
-import instantsearch from '../../..';
-import { connectSearchBox } from '../../../connectors';
-import historyRouter from '../../routers/history';
+import { instantsearch, historyRouter, connectSearchBox } from '../..';
 
 /* eslint no-lone-blocks: "off" */
 
diff --git a/packages/instantsearch.js/src/lib/__tests__/routing/spa-test.ts b/packages/instantsearch-core/src/routing/__tests__/spa.test.ts
similarity index 94%
rename from packages/instantsearch.js/src/lib/__tests__/routing/spa-test.ts
rename to packages/instantsearch-core/src/routing/__tests__/spa.test.ts
index de9de4e5e8..3ee8a48362 100644
--- a/packages/instantsearch.js/src/lib/__tests__/routing/spa-test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/spa.test.ts
@@ -5,9 +5,7 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
 
-import instantsearch from '../../..';
-import { connectSearchBox } from '../../../connectors';
-import historyRouter from '../../routers/history';
+import { instantsearch, historyRouter, connectSearchBox } from '../..';
 
 /* eslint no-lone-blocks: "off" */
 
diff --git a/packages/instantsearch-core/src/routing/historyRouter.ts b/packages/instantsearch-core/src/routing/historyRouter.ts
new file mode 100644
index 0000000000..7ae0978ca8
--- /dev/null
+++ b/packages/instantsearch-core/src/routing/historyRouter.ts
@@ -0,0 +1,373 @@
+import qs from 'qs';
+
+import {
+  createDocumentationLink,
+  safelyRunOnBrowser,
+  warning,
+} from '../lib/public';
+
+import type { Router, UiState } from '../types';
+
+type CreateURL<TRouteState> = (args: {
+  qsModule: typeof qs;
+  routeState: TRouteState;
+  location: Location;
+}) => string;
+
+type ParseURL<TRouteState> = (args: {
+  qsModule: typeof qs;
+  location: Location;
+}) => TRouteState;
+
+export type BrowserHistoryArgs<TRouteState> = {
+  windowTitle?: (routeState: TRouteState) => string;
+  writeDelay: number;
+  createURL: CreateURL<TRouteState>;
+  parseURL: ParseURL<TRouteState>;
+  // @MAJOR: The `Location` type is hard to simulate in non-browser environments
+  // so we should accept a subset of it that is easier to work with in any
+  // environments.
+  getLocation: () => Location;
+  start?: (onUpdate: () => void) => void;
+  dispose?: () => void;
+  push?: (url: string) => void;
+  /**
+   * Whether the URL should be cleaned up when the router is disposed.
+   * This can be useful when closing a modal containing InstantSearch, to
+   * remove active refinements from the URL.
+   * @default true
+   */
+  // @MAJOR: Switch the default to `false` and remove the console info in the next major version.
+  cleanUrlOnDispose?: boolean;
+};
+
+const setWindowTitle = (title?: string): void => {
+  if (title) {
+    // This function is only executed on browsers so we can disable this check.
+    // eslint-disable-next-line no-restricted-globals
+    window.document.title = title;
+  }
+};
+
+class BrowserHistory<TRouteState> implements Router<TRouteState> {
+  public $$type = 'ais.browser';
+  /**
+   * Transforms a UI state into a title for the page.
+   */
+  private readonly windowTitle?: BrowserHistoryArgs<TRouteState>['windowTitle'];
+  /**
+   * Time in milliseconds before performing a write in the history.
+   * It prevents from adding too many entries in the history and
+   * makes the back button more usable.
+   *
+   * @default 400
+   */
+  private readonly writeDelay: Required<
+    BrowserHistoryArgs<TRouteState>
+  >['writeDelay'];
+  /**
+   * Creates a full URL based on the route state.
+   * The storage adaptor maps all syncable keys to the query string of the URL.
+   */
+  private readonly _createURL: Required<
+    BrowserHistoryArgs<TRouteState>
+  >['createURL'];
+  /**
+   * Parses the URL into a route state.
+   * It should be symmetrical to `createURL`.
+   */
+  private readonly parseURL: Required<
+    BrowserHistoryArgs<TRouteState>
+  >['parseURL'];
+  /**
+   * Returns the location to store in the history.
+   * @default () => window.location
+   */
+  private readonly getLocation: Required<
+    BrowserHistoryArgs<TRouteState>
+  >['getLocation'];
+
+  private writeTimer?: ReturnType<typeof setTimeout>;
+  private _onPopState?: (event: PopStateEvent) => void;
+
+  /**
+   * Indicates if last action was back/forward in the browser.
+   */
+  private inPopState: boolean = false;
+
+  /**
+   * Indicates whether the history router is disposed or not.
+   */
+  protected isDisposed: boolean = false;
+
+  /**
+   * Indicates the window.history.length before the last call to
+   * window.history.pushState (called in `write`).
+   * It allows to determine if a `pushState` has been triggered elsewhere,
+   * and thus to prevent the `write` method from calling `pushState`.
+   */
+  private latestAcknowledgedHistory: number = 0;
+
+  private _start?: (onUpdate: () => void) => void;
+  private _dispose?: () => void;
+  private _push?: (url: string) => void;
+  private _cleanUrlOnDispose: boolean;
+
+  /**
+   * Initializes a new storage provider that syncs the search state to the URL
+   * using web APIs (`window.location.pushState` and `onpopstate` event).
+   */
+  public constructor({
+    windowTitle,
+    writeDelay = 400,
+    createURL,
+    parseURL,
+    getLocation,
+    start,
+    dispose,
+    push,
+    cleanUrlOnDispose,
+  }: BrowserHistoryArgs<TRouteState>) {
+    this.windowTitle = windowTitle;
+    this.writeTimer = undefined;
+    this.writeDelay = writeDelay;
+    this._createURL = createURL;
+    this.parseURL = parseURL;
+    this.getLocation = getLocation;
+    this._start = start;
+    this._dispose = dispose;
+    this._push = push;
+    this._cleanUrlOnDispose =
+      typeof cleanUrlOnDispose === 'undefined' ? true : cleanUrlOnDispose;
+
+    if (__DEV__ && typeof cleanUrlOnDispose === 'undefined') {
+      // eslint-disable-next-line no-console
+      console.info(`Starting from the next major version, InstantSearch will not clean up the URL from active refinements when it is disposed.
+
+We recommend setting \`cleanUrlOnDispose\` to false to adopt this change today.
+To stay with the current behaviour and remove this warning, set the option to true.
+
+See documentation: ${createDocumentationLink({
+        name: 'history-router',
+      })}#widget-param-cleanurlondispose`);
+    }
+
+    safelyRunOnBrowser(({ window }) => {
+      const title = this.windowTitle && this.windowTitle(this.read());
+      setWindowTitle(title);
+
+      this.latestAcknowledgedHistory = window.history.length;
+    });
+  }
+
+  /**
+   * Reads the URL and returns a syncable UI search state.
+   */
+  public read(): TRouteState {
+    return this.parseURL({ qsModule: qs, location: this.getLocation() });
+  }
+
+  /**
+   * Pushes a search state into the URL.
+   */
+  public write(routeState: TRouteState): void {
+    safelyRunOnBrowser(({ window }) => {
+      const url = this.createURL(routeState);
+      const title = this.windowTitle && this.windowTitle(routeState);
+
+      if (this.writeTimer) {
+        clearTimeout(this.writeTimer);
+      }
+
+      this.writeTimer = setTimeout(() => {
+        setWindowTitle(title);
+
+        if (this.shouldWrite(url)) {
+          if (this._push) {
+            this._push(url);
+          } else {
+            window.history.pushState(routeState, title || '', url);
+          }
+          this.latestAcknowledgedHistory = window.history.length;
+        }
+        this.inPopState = false;
+        this.writeTimer = undefined;
+      }, this.writeDelay);
+    });
+  }
+
+  /**
+   * Sets a callback on the `onpopstate` event of the history API of the current page.
+   * It enables the URL sync to keep track of the changes.
+   */
+  public onUpdate(callback: (routeState: TRouteState) => void): void {
+    if (this._start) {
+      this._start(() => {
+        callback(this.read());
+      });
+    }
+
+    this._onPopState = () => {
+      if (this.writeTimer) {
+        clearTimeout(this.writeTimer);
+        this.writeTimer = undefined;
+      }
+
+      this.inPopState = true;
+
+      // We always read the state from the URL because the state of the history
+      // can be incorect in some cases (e.g. using React Router).
+      callback(this.read());
+    };
+
+    safelyRunOnBrowser(({ window }) => {
+      window.addEventListener('popstate', this._onPopState!);
+    });
+  }
+
+  /**
+   * Creates a complete URL from a given syncable UI state.
+   *
+   * It always generates the full URL, not a relative one.
+   * This allows to handle cases like using a <base href>.
+   * See: https://github.com/algolia/instantsearch/issues/790
+   */
+  public createURL(routeState: TRouteState): string {
+    const url = this._createURL({
+      qsModule: qs,
+      routeState,
+      location: this.getLocation(),
+    });
+
+    if (__DEV__) {
+      try {
+        // We just want to check if the URL is valid.
+        // eslint-disable-next-line no-new
+        new URL(url);
+      } catch (e) {
+        warning(
+          false,
+          `The URL returned by the \`createURL\` function is invalid.
+Please make sure it returns an absolute URL to avoid issues, e.g: \`https://algolia.com/search?query=iphone\`.`
+        );
+      }
+    }
+
+    return url;
+  }
+
+  /**
+   * Removes the event listener and cleans up the URL.
+   */
+  public dispose(): void {
+    if (this._dispose) {
+      this._dispose();
+    }
+
+    this.isDisposed = true;
+
+    safelyRunOnBrowser(({ window }) => {
+      if (this._onPopState) {
+        window.removeEventListener('popstate', this._onPopState);
+      }
+    });
+
+    if (this.writeTimer) {
+      clearTimeout(this.writeTimer);
+    }
+
+    if (this._cleanUrlOnDispose) {
+      this.write({} as TRouteState);
+    }
+  }
+
+  public start() {
+    this.isDisposed = false;
+  }
+
+  private shouldWrite(url: string): boolean {
+    return safelyRunOnBrowser(({ window }) => {
+      // When disposed and the cleanUrlOnDispose is set to false, we do not want to write the URL.
+      if (this.isDisposed && !this._cleanUrlOnDispose) {
+        return false;
+      }
+
+      // We do want to `pushState` if:
+      // - the router is not disposed, IS.js needs to update the URL
+      // OR
+      // - the last write was from InstantSearch.js
+      // (unlike a SPA, where it would have last written)
+      const lastPushWasByISAfterDispose = !(
+        this.isDisposed &&
+        this.latestAcknowledgedHistory !== window.history.length
+      );
+
+      return (
+        // When the last state change was through popstate, the IS.js state changes,
+        // but that should not write the URL.
+        !this.inPopState &&
+        // When the previous pushState after dispose was by IS.js, we want to write the URL.
+        lastPushWasByISAfterDispose &&
+        // When the URL is the same as the current one, we do not want to write it.
+        url !== window.location.href
+      );
+    });
+  }
+}
+
+export function historyRouter<TRouteState = UiState>({
+  createURL = ({ qsModule, routeState, location }) => {
+    const { protocol, hostname, port = '', pathname, hash } = location;
+    const queryString = qsModule.stringify(routeState);
+    const portWithPrefix = port === '' ? '' : `:${port}`;
+
+    // IE <= 11 has no proper `location.origin` so we cannot rely on it.
+    if (!queryString) {
+      return `${protocol}//${hostname}${portWithPrefix}${pathname}${hash}`;
+    }
+
+    return `${protocol}//${hostname}${portWithPrefix}${pathname}?${queryString}${hash}`;
+  },
+  parseURL = ({ qsModule, location }) => {
+    // `qs` by default converts arrays with more than 20 items to an object.
+    // We want to avoid this because the data structure manipulated can therefore vary.
+    // Setting the limit to `100` seems a good number because the engine's default is 100
+    // (it can go up to 1000 but it is very unlikely to select more than 100 items in the UI).
+    //
+    // Using an `arrayLimit` of `n` allows `n + 1` items.
+    //
+    // See:
+    //   - https://github.com/ljharb/qs#parsing-arrays
+    //   - https://www.algolia.com/doc/api-reference/api-parameters/maxValuesPerFacet/
+    return qsModule.parse(location.search.slice(1), {
+      arrayLimit: 99,
+    }) as unknown as TRouteState;
+  },
+  writeDelay = 400,
+  windowTitle,
+  getLocation = () => {
+    return safelyRunOnBrowser<Location>(({ window }) => window.location, {
+      fallback: () => {
+        throw new Error(
+          'You need to provide `getLocation` to the `history` router in environments where `window` does not exist.'
+        );
+      },
+    });
+  },
+  start,
+  dispose,
+  push,
+  cleanUrlOnDispose,
+}: Partial<BrowserHistoryArgs<TRouteState>> = {}): BrowserHistory<TRouteState> {
+  return new BrowserHistory({
+    createURL,
+    parseURL,
+    writeDelay,
+    windowTitle,
+    getLocation,
+    start,
+    dispose,
+    push,
+    cleanUrlOnDispose,
+  });
+}
diff --git a/packages/instantsearch-core/src/routing/index.ts b/packages/instantsearch-core/src/routing/index.ts
new file mode 100644
index 0000000000..125c0849df
--- /dev/null
+++ b/packages/instantsearch-core/src/routing/index.ts
@@ -0,0 +1,3 @@
+export * from './historyRouter';
+export * from './simpleStateMapping';
+export * from './singleIndexStateMapping';
diff --git a/packages/instantsearch-core/src/routing/simpleStateMapping.ts b/packages/instantsearch-core/src/routing/simpleStateMapping.ts
new file mode 100644
index 0000000000..97f57c9162
--- /dev/null
+++ b/packages/instantsearch-core/src/routing/simpleStateMapping.ts
@@ -0,0 +1,39 @@
+import type { UiState, IndexUiState, StateMapping } from '../types';
+
+function getIndexStateWithoutConfigure<TIndexUiState extends IndexUiState>(
+  uiState: TIndexUiState
+): Omit<TIndexUiState, 'configure'> {
+  const { configure, ...trackedUiState } = uiState;
+  return trackedUiState;
+}
+
+// technically a URL could contain any key, since users provide it,
+// which is why the input to this function is UiState, not something
+// which excludes "configure" as this function does.
+export function simpleStateMapping<
+  TUiState extends UiState = UiState
+>(): StateMapping<TUiState, TUiState> {
+  return {
+    $$type: 'ais.simple',
+
+    stateToRoute(uiState) {
+      return Object.keys(uiState).reduce(
+        (state, indexId) => ({
+          ...state,
+          [indexId]: getIndexStateWithoutConfigure(uiState[indexId]),
+        }),
+        {} as TUiState
+      );
+    },
+
+    routeToState(routeState = {} as TUiState) {
+      return Object.keys(routeState).reduce(
+        (state, indexId) => ({
+          ...state,
+          [indexId]: getIndexStateWithoutConfigure(routeState[indexId]),
+        }),
+        {} as TUiState
+      );
+    },
+  };
+}
diff --git a/packages/instantsearch-core/src/routing/singleIndexStateMapping.ts b/packages/instantsearch-core/src/routing/singleIndexStateMapping.ts
new file mode 100644
index 0000000000..4495ae436f
--- /dev/null
+++ b/packages/instantsearch-core/src/routing/singleIndexStateMapping.ts
@@ -0,0 +1,24 @@
+import type { StateMapping, IndexUiState, UiState } from '../types';
+
+function getIndexStateWithoutConfigure<TIndexUiState extends IndexUiState>(
+  uiState: TIndexUiState
+): TIndexUiState {
+  const { configure, ...trackedUiState } = uiState;
+  return trackedUiState as TIndexUiState;
+}
+
+export function singleIndexStateMapping<TUiState extends UiState = UiState>(
+  indexName: keyof TUiState
+): StateMapping<TUiState, TUiState[typeof indexName]> {
+  return {
+    $$type: 'ais.singleIndex',
+    stateToRoute(uiState) {
+      return getIndexStateWithoutConfigure(uiState[indexName] || {});
+    },
+    routeToState(routeState = {} as TUiState[typeof indexName]) {
+      return {
+        [indexName]: getIndexStateWithoutConfigure(routeState),
+      } as unknown as TUiState;
+    },
+  };
+}
diff --git a/packages/instantsearch-core/src/server.ts b/packages/instantsearch-core/src/server.ts
new file mode 100644
index 0000000000..67cad673a6
--- /dev/null
+++ b/packages/instantsearch-core/src/server.ts
@@ -0,0 +1,145 @@
+import { walkIndex } from './lib/public';
+
+import type { InstantSearch } from './instantsearch';
+import type {
+  SearchClient,
+  CompositionClient,
+  IndexWidget,
+  InitialResults,
+  SearchOptions,
+} from './types';
+
+/**
+ * Waits for the results from the search instance to coordinate the next steps
+ * in `getServerState()`.
+ */
+export function waitForResults(
+  search: InstantSearch,
+  skipRecommend: boolean = false
+): Promise<SearchOptions[]> {
+  const helper = search.mainHelper!;
+
+  // Extract search parameters from the search client to use them
+  // later during hydration.
+  let requestParamsList: SearchOptions[];
+  const client = helper.getClient();
+  if (search.compositionID) {
+    helper.setClient({
+      ...client,
+      search(query) {
+        requestParamsList = [query.requestBody.params];
+        return (client as CompositionClient).search(query);
+      },
+    } as CompositionClient);
+  } else {
+    helper.setClient({
+      ...client,
+      search(queries) {
+        requestParamsList = queries.map(({ params }) => params);
+        return (client as SearchClient).search(queries);
+      },
+    } as SearchClient);
+  }
+
+  if (search._hasSearchWidget) {
+    if (search.compositionID) {
+      helper.searchWithComposition();
+    } else {
+      helper.searchOnlyWithDerivedHelpers();
+    }
+  }
+  if (!skipRecommend && search._hasRecommendWidget) {
+    helper.recommend();
+  }
+
+  return new Promise((resolve, reject) => {
+    let searchResultsReceived = !search._hasSearchWidget;
+    let recommendResultsReceived = !search._hasRecommendWidget || skipRecommend;
+    // All derived helpers resolve in the same tick so we're safe only relying
+    // on the first one.
+    helper.derivedHelpers[0].on('result', () => {
+      searchResultsReceived = true;
+      if (recommendResultsReceived) {
+        resolve(requestParamsList!);
+      }
+    });
+    helper.derivedHelpers[0].on('recommend:result', () => {
+      recommendResultsReceived = true;
+      if (searchResultsReceived) {
+        resolve(requestParamsList!);
+      }
+    });
+
+    // However, we listen to errors that can happen on any derived helper because
+    // any error is critical.
+    helper.on('error', (error) => {
+      reject(error);
+    });
+    search.on('error', (error) => {
+      reject(error);
+    });
+    helper.derivedHelpers.forEach((derivedHelper) =>
+      derivedHelper.on('error', (error) => {
+        reject(error);
+      })
+    );
+  });
+}
+
+/**
+ * Walks the InstantSearch root index to construct the initial results.
+ */
+export function getInitialResults(
+  rootIndex: IndexWidget,
+  /**
+   * Search parameters sent to the search client,
+   * returned by `waitForResults()`.
+   */
+  requestParamsList?: SearchOptions[]
+): InitialResults {
+  const initialResults: InitialResults = {};
+
+  let requestParamsIndex = 0;
+  walkIndex(rootIndex, (widget) => {
+    const searchResults = widget.getResults();
+    const recommendResults = widget.getHelper()?.lastRecommendResults;
+    if (searchResults || recommendResults) {
+      const resultsCount = searchResults?._rawResults?.length || 0;
+      const requestParams = resultsCount
+        ? requestParamsList?.slice(
+            requestParamsIndex,
+            requestParamsIndex + resultsCount
+          )
+        : [];
+      requestParamsIndex += resultsCount;
+      initialResults[widget.getIndexId()] = {
+        // We convert the Helper state to a plain object to pass parsable data
+        // structures from server to client.
+        ...(searchResults && {
+          state: {
+            ...searchResults._state,
+            clickAnalytics: requestParams?.[0]?.clickAnalytics,
+            userToken: requestParams?.[0]?.userToken,
+          },
+          results: searchResults._rawResults,
+        }),
+        ...(recommendResults && {
+          recommendResults: {
+            // We have to stringify + parse because of some explicitly undefined values.
+            params: JSON.parse(JSON.stringify(recommendResults._state.params)),
+            results: recommendResults._rawResults,
+          },
+        }),
+        ...(requestParams && { requestParams }),
+      };
+    }
+  });
+
+  if (Object.keys(initialResults).length === 0) {
+    throw new Error(
+      'The root index does not have any results. Make sure you have at least one widget that provides results.'
+    );
+  }
+
+  return initialResults;
+}
diff --git a/packages/instantsearch-core/src/types/algoliasearch.ts b/packages/instantsearch-core/src/types/algoliasearch.ts
new file mode 100644
index 0000000000..550af13043
--- /dev/null
+++ b/packages/instantsearch-core/src/types/algoliasearch.ts
@@ -0,0 +1,3 @@
+export type * from 'algoliasearch-helper/types/algoliasearch.d.ts';
+
+export {};
diff --git a/packages/instantsearch.js/src/types/connector.ts b/packages/instantsearch-core/src/types/connector.ts
similarity index 97%
rename from packages/instantsearch.js/src/types/connector.ts
rename to packages/instantsearch-core/src/types/connector.ts
index 2e285219ad..f3cc06b7c3 100644
--- a/packages/instantsearch.js/src/types/connector.ts
+++ b/packages/instantsearch-core/src/types/connector.ts
@@ -1,5 +1,5 @@
+import type { InstantSearch } from '../instantsearch';
 import type { InsightsClient } from './insights';
-import type { InstantSearch } from './instantsearch';
 import type { Hit } from './results';
 import type { UnknownWidgetParams, Widget, WidgetDescription } from './widget';
 import type { SearchResults } from 'algoliasearch-helper';
diff --git a/packages/instantsearch-core/src/types/index.ts b/packages/instantsearch-core/src/types/index.ts
new file mode 100644
index 0000000000..b71d5c1d20
--- /dev/null
+++ b/packages/instantsearch-core/src/types/index.ts
@@ -0,0 +1,13 @@
+export type * from './algoliasearch';
+export type * from './connector';
+export type * from './insights';
+export type * from './instantsearch';
+export type * from './middleware';
+export type * from './render-state';
+export type * from './results';
+export type * from './router';
+export type * from './ui-state';
+export type * from './utils';
+export type * from './widget';
+
+export {};
diff --git a/packages/instantsearch.js/src/types/insights.ts b/packages/instantsearch-core/src/types/insights.ts
similarity index 52%
rename from packages/instantsearch.js/src/types/insights.ts
rename to packages/instantsearch-core/src/types/insights.ts
index 424bdf124f..2ac1329858 100644
--- a/packages/instantsearch.js/src/types/insights.ts
+++ b/packages/instantsearch-core/src/types/insights.ts
@@ -61,3 +61,52 @@ export type QueueItem = QueueItemMap[keyof QueueItemMap];
 export type InsightsClient = _InsightsClient & {
   queue?: QueueItem[];
 };
+
+export type ProvidedInsightsClient = InsightsClient | null | undefined;
+
+export type InsightsProps<
+  TInsightsClient extends ProvidedInsightsClient = ProvidedInsightsClient
+> = {
+  insightsClient?: TInsightsClient;
+  insightsInitParams?: Partial<InsightsMethodMap['init'][0][0]>;
+  onEvent?: (event: InsightsEvent, insightsClient: TInsightsClient) => void;
+  /**
+   * @internal indicator for the default insights middleware
+   */
+  $$internal?: boolean;
+  /**
+   * @internal indicator for sending the `clickAnalytics` search parameter
+   */
+  $$automatic?: boolean;
+};
+
+type BuiltInSendEventForHits = (
+  eventType: string,
+  hits: Hit | Hit[],
+  eventName?: string,
+  additionalData?: Record<string, any>
+) => void;
+type CustomSendEventForHits = (customPayload: any) => void;
+export type SendEventForHits = BuiltInSendEventForHits & CustomSendEventForHits;
+
+type BuiltInSendEventForFacet = (
+  eventType: string,
+  facetValue: string,
+  eventName?: string,
+  additionalData?: Record<string, any>
+) => void;
+type CustomSendEventForFacet = (customPayload: any) => void;
+export type SendEventForFacet = BuiltInSendEventForFacet &
+  CustomSendEventForFacet;
+
+/** @deprecated */
+type BuiltInBindEventForHits = (
+  eventType: string,
+  hits: Hit | Hit[],
+  eventName?: string,
+  additionalData?: Record<string, any>
+) => string;
+/** @deprecated */
+export type CustomBindEventForHits = (customPayload: any) => string;
+/** @deprecated */
+export type BindEventForHits = BuiltInBindEventForHits & CustomBindEventForHits;
diff --git a/packages/instantsearch-core/src/types/instantsearch.ts b/packages/instantsearch-core/src/types/instantsearch.ts
new file mode 100644
index 0000000000..a98169f661
--- /dev/null
+++ b/packages/instantsearch-core/src/types/instantsearch.ts
@@ -0,0 +1,133 @@
+import type { CompositionClient, SearchClient } from './algoliasearch';
+import type {
+  InsightsClient as AlgoliaInsightsClient,
+  InsightsProps,
+} from './insights';
+import type { RouterProps } from './router';
+import type { UiState } from './ui-state';
+import type { AlgoliaSearchHelper } from 'algoliasearch-helper';
+
+export type InstantSearchOptions<
+  TUiState extends UiState = UiState,
+  TRouteState = TUiState
+> = {
+  /**
+   * The name of the main index. If no indexName is provided, you have to manually add an index widget.
+   */
+  indexName?: string;
+  /**
+   * The objectID of the composition.
+   * If this is passed, the composition API will be used for search.
+   * Multi-index search is not supported with this option.
+   */
+  compositionID?: string;
+  /**
+   * The search client to plug to InstantSearch.js
+   *
+   * Usage:
+   * ```javascript
+   * // Using the default Algolia search client
+   * instantsearch({
+   *   indexName: 'indexName',
+   *   searchClient: algoliasearch('appId', 'apiKey')
+   * });
+   *
+   * // Using a custom search client
+   * instantsearch({
+   *   indexName: 'indexName',
+   *   searchClient: {
+   *     search(requests) {
+   *       // fetch response based on requests
+   *       return response;
+   *     },
+   *     searchForFacetValues(requests) {
+   *       // fetch response based on requests
+   *       return response;
+   *     }
+   *   }
+   * });
+   * ```
+   */
+  searchClient: SearchClient | CompositionClient;
+  /**
+   * The locale used to display numbers. This will be passed
+   * to `Number.prototype.toLocaleString()`
+   */
+  numberLocale?: string;
+  /**
+   * A hook that will be called each time a search needs to be done, with the
+   * helper as a parameter. It's your responsibility to call `helper.search()`.
+   * This option allows you to avoid doing searches at page load for example.
+   * @deprecated use onStateChange instead
+   */
+  searchFunction?: (helper: AlgoliaSearchHelper) => void;
+  /**
+   * Function called when the state changes.
+   *
+   * Using this function makes the instance controlled. This means that you
+   * become in charge of updating the UI state with the `setUiState` function.
+   */
+  onStateChange?: (params: {
+    uiState: TUiState;
+    setUiState: (
+      uiState: TUiState | ((previousUiState: TUiState) => TUiState)
+    ) => void;
+  }) => void;
+  /**
+   * Injects a `uiState` to the `instantsearch` instance. You can use this option
+   * to provide an initial state to a widget. Note that the state is only used
+   * for the first search. To unconditionally pass additional parameters to the
+   * Algolia API, take a look at the `configure` widget.
+   */
+  initialUiState?: NoInfer<TUiState>;
+  /**
+   * Time before a search is considered stalled. The default is 200ms
+   */
+  stalledSearchDelay?: number;
+  /**
+   * Router configuration used to save the UI State into the URL or any other
+   * client side persistence. Passing `true` will use the default URL options.
+   */
+  routing?: RouterProps<TUiState, TRouteState> | boolean;
+  /**
+   * Enables the Insights middleware and loads the Insights library
+   * if not already loaded.
+   *
+   * The Insights middleware sends view and click events automatically, and lets
+   * you set up your own events.
+   *
+   * @default false
+   */
+  insights?: InsightsProps | boolean;
+  /**
+   * the instance of search-insights to use for sending insights events inside
+   * widgets like `hits`.
+   *
+   * @deprecated This property will be still supported in 4.x releases, but not further. It is replaced by the `insights` middleware. For more information, visit https://www.algolia.com/doc/guides/getting-insights-and-analytics/search-analytics/click-through-and-conversions/how-to/send-click-and-conversion-events-with-instantsearch/js/
+   */
+  insightsClient?: AlgoliaInsightsClient;
+  future?: {
+    /**
+     * Changes the way `dispose` is used in InstantSearch lifecycle.
+     *
+     * If `false` (by default), each widget unmounting will remove its state as well, even if there are multiple widgets reading that UI State.
+     *
+     * If `true`, each widget unmounting will only remove its own state if it's the last of its type. This allows for dynamically adding and removing widgets without losing their state.
+     *
+     * @default false
+     */
+    preserveSharedStateOnUnmount?: boolean; // @MAJOR remove option, only keep the "true" behaviour
+    /**
+     * Changes the way root levels of hierarchical facets have their count displayed.
+     *
+     * If `false` (by default), the count of the refined root level is updated to match the count of the actively refined parent level.
+     *
+     * If `true`, the count of the root level stays the same as the count of all children levels.
+     *
+     * @default false
+     */
+    persistHierarchicalRootCount?: boolean; // @MAJOR change the default to true
+  };
+};
+
+export type InstantSearchStatus = 'idle' | 'loading' | 'stalled' | 'error';
diff --git a/packages/instantsearch.js/src/types/middleware.ts b/packages/instantsearch-core/src/types/middleware.ts
similarity index 95%
rename from packages/instantsearch.js/src/types/middleware.ts
rename to packages/instantsearch-core/src/types/middleware.ts
index 4806a7494e..00e46167f0 100644
--- a/packages/instantsearch.js/src/types/middleware.ts
+++ b/packages/instantsearch-core/src/types/middleware.ts
@@ -1,4 +1,4 @@
-import type InstantSearch from '../lib/InstantSearch';
+import type { InstantSearch } from '../instantsearch';
 import type { UiState } from './ui-state';
 import type { AtLeastOne } from './utils';
 
diff --git a/packages/instantsearch-core/src/types/render-state.ts b/packages/instantsearch-core/src/types/render-state.ts
new file mode 100644
index 0000000000..d29449c953
--- /dev/null
+++ b/packages/instantsearch-core/src/types/render-state.ts
@@ -0,0 +1,62 @@
+import type {
+  AutocompleteWidgetDescription,
+  BreadcrumbWidgetDescription,
+  ClearRefinementsWidgetDescription,
+  ConfigureWidgetDescription,
+  CurrentRefinementsWidgetDescription,
+  GeoSearchWidgetDescription,
+  HierarchicalMenuWidgetDescription,
+  HitsWidgetDescription,
+  HitsPerPageWidgetDescription,
+  InfiniteHitsWidgetDescription,
+  MenuWidgetDescription,
+  NumericMenuWidgetDescription,
+  PaginationWidgetDescription,
+  PoweredByWidgetDescription,
+  QueryRulesWidgetDescription,
+  RangeWidgetDescription,
+  RatingMenuWidgetDescription,
+  RefinementListWidgetDescription,
+  RelevantSortWidgetDescription,
+  SearchBoxWidgetDescription,
+  SortByWidgetDescription,
+  StatsWidgetDescription,
+  ToggleRefinementWidgetDescription,
+  VoiceSearchWidgetDescription,
+} from '../connectors';
+
+type ConnectorRenderStates = AutocompleteWidgetDescription['indexRenderState'] &
+  BreadcrumbWidgetDescription['indexRenderState'] &
+  ClearRefinementsWidgetDescription['indexRenderState'] &
+  ConfigureWidgetDescription['indexRenderState'] &
+  CurrentRefinementsWidgetDescription['indexRenderState'] &
+  GeoSearchWidgetDescription['indexRenderState'] &
+  HierarchicalMenuWidgetDescription['indexRenderState'] &
+  HitsWidgetDescription['indexRenderState'] &
+  HitsPerPageWidgetDescription['indexRenderState'] &
+  InfiniteHitsWidgetDescription['indexRenderState'] &
+  MenuWidgetDescription['indexRenderState'] &
+  NumericMenuWidgetDescription['indexRenderState'] &
+  PaginationWidgetDescription['indexRenderState'] &
+  PoweredByWidgetDescription['indexRenderState'] &
+  QueryRulesWidgetDescription['indexRenderState'] &
+  RangeWidgetDescription['indexRenderState'] &
+  RatingMenuWidgetDescription['indexRenderState'] &
+  RefinementListWidgetDescription['indexRenderState'] &
+  RelevantSortWidgetDescription['indexRenderState'] &
+  SearchBoxWidgetDescription['indexRenderState'] &
+  SortByWidgetDescription['indexRenderState'] &
+  StatsWidgetDescription['indexRenderState'] &
+  ToggleRefinementWidgetDescription['indexRenderState'] &
+  VoiceSearchWidgetDescription['indexRenderState'];
+
+export type IndexRenderState = Partial<ConnectorRenderStates>;
+
+export type RenderState = {
+  [indexId: string]: IndexRenderState;
+};
+
+export type WidgetRenderState<TWidgetRenderState, TWidgetParams> =
+  TWidgetRenderState & {
+    widgetParams: TWidgetParams;
+  };
diff --git a/packages/instantsearch.js/src/types/results.ts b/packages/instantsearch-core/src/types/results.ts
similarity index 100%
rename from packages/instantsearch.js/src/types/results.ts
rename to packages/instantsearch-core/src/types/results.ts
diff --git a/packages/instantsearch.js/src/types/router.ts b/packages/instantsearch-core/src/types/router.ts
similarity index 83%
rename from packages/instantsearch.js/src/types/router.ts
rename to packages/instantsearch-core/src/types/router.ts
index 326b47e0b7..3774214e0a 100644
--- a/packages/instantsearch.js/src/types/router.ts
+++ b/packages/instantsearch-core/src/types/router.ts
@@ -73,3 +73,20 @@ export type StateMapping<TUiState = UiState, TRouteState = TUiState> = {
    */
   $$type?: string;
 };
+
+/**
+ * Arguments for the router option and middleware.
+ */
+export type RouterProps<
+  TUiState extends UiState = UiState,
+  TRouteState = TUiState
+> = {
+  router?: Router<TRouteState>;
+  // ideally stateMapping should be required if TRouteState is given,
+  // but there's no way to check if a generic is provided or the default value.
+  stateMapping?: StateMapping<TUiState, TRouteState>;
+  /**
+   * @internal indicator for the default middleware
+   */
+  $$internal?: boolean;
+};
diff --git a/packages/instantsearch-core/src/types/ui-state.ts b/packages/instantsearch-core/src/types/ui-state.ts
new file mode 100644
index 0000000000..b305f47cfc
--- /dev/null
+++ b/packages/instantsearch-core/src/types/ui-state.ts
@@ -0,0 +1,43 @@
+import type {
+  AutocompleteWidgetDescription,
+  ConfigureWidgetDescription,
+  GeoSearchWidgetDescription,
+  HierarchicalMenuWidgetDescription,
+  HitsPerPageWidgetDescription,
+  InfiniteHitsWidgetDescription,
+  MenuWidgetDescription,
+  NumericMenuWidgetDescription,
+  PaginationWidgetDescription,
+  RangeWidgetDescription,
+  RatingMenuWidgetDescription,
+  RefinementListWidgetDescription,
+  RelevantSortWidgetDescription,
+  SearchBoxWidgetDescription,
+  SortByWidgetDescription,
+  ToggleRefinementWidgetDescription,
+  VoiceSearchWidgetDescription,
+} from '../connectors';
+
+type ConnectorUiStates = AutocompleteWidgetDescription['indexUiState'] &
+  ConfigureWidgetDescription['indexUiState'] &
+  GeoSearchWidgetDescription['indexUiState'] &
+  HierarchicalMenuWidgetDescription['indexUiState'] &
+  HitsPerPageWidgetDescription['indexUiState'] &
+  InfiniteHitsWidgetDescription['indexUiState'] &
+  MenuWidgetDescription['indexUiState'] &
+  NumericMenuWidgetDescription['indexUiState'] &
+  PaginationWidgetDescription['indexUiState'] &
+  RangeWidgetDescription['indexUiState'] &
+  RatingMenuWidgetDescription['indexUiState'] &
+  RefinementListWidgetDescription['indexUiState'] &
+  RelevantSortWidgetDescription['indexUiState'] &
+  SearchBoxWidgetDescription['indexUiState'] &
+  SortByWidgetDescription['indexUiState'] &
+  ToggleRefinementWidgetDescription['indexUiState'] &
+  VoiceSearchWidgetDescription['indexUiState'];
+
+export type IndexUiState = Partial<ConnectorUiStates>;
+
+export type UiState = {
+  [indexId: string]: IndexUiState;
+};
diff --git a/packages/instantsearch.js/src/types/utils.ts b/packages/instantsearch-core/src/types/utils.ts
similarity index 75%
rename from packages/instantsearch.js/src/types/utils.ts
rename to packages/instantsearch-core/src/types/utils.ts
index 7a2b73f97f..3c37845d99 100644
--- a/packages/instantsearch.js/src/types/utils.ts
+++ b/packages/instantsearch-core/src/types/utils.ts
@@ -3,16 +3,23 @@ export type HighlightedParts = {
   isHighlighted: boolean;
 };
 
-// https://stackoverflow.com/questions/48230773/how-to-create-a-partial-like-that-requires-a-single-property-to-be-set/48244432#48244432
+/**
+ * Makes at least one of an object property required.
+ * https://stackoverflow.com/questions/48230773/how-to-create-a-partial-like-that-requires-a-single-property-to-be-set/48244432#48244432
+ */
 export type AtLeastOne<
   TTarget,
   TMapped = { [Key in keyof TTarget]: Pick<TTarget, Key> }
 > = Partial<TTarget> & TMapped[keyof TMapped];
 
-// removes intermediary composed types in IntelliSense
+/**
+ * Removes intermediary composed types in IntelliSense
+ */
 export type Expand<T> = T extends infer O ? { [K in keyof O]: O[K] } : never;
 
-// Make certain keys in an object required
+/**
+ * Make certain keys in an object required.
+ */
 export type RequiredKeys<TObject, TKeys extends keyof TObject> = Expand<
   Required<Pick<TObject, TKeys>> & Omit<TObject, TKeys>
 >;
diff --git a/packages/instantsearch.js/src/types/widget.ts b/packages/instantsearch-core/src/types/widget.ts
similarity index 82%
rename from packages/instantsearch.js/src/types/widget.ts
rename to packages/instantsearch-core/src/types/widget.ts
index 531803549e..06d3c4ac65 100644
--- a/packages/instantsearch.js/src/types/widget.ts
+++ b/packages/instantsearch-core/src/types/widget.ts
@@ -1,6 +1,11 @@
-import type { IndexWidget } from '../widgets';
+import type { InstantSearch } from '../instantsearch';
+import type {
+  IndexInitOptions,
+  IndexRenderOptions,
+  IndexWidgetDescription,
+  IndexWidgetParams,
+} from '../widgets/index-widget';
 import type { RecommendResponse } from './algoliasearch';
-import type { InstantSearch } from './instantsearch';
 import type { IndexRenderState, WidgetRenderState } from './render-state';
 import type { IndexUiState, UiState } from './ui-state';
 import type { Expand, RequiredKeys } from './utils';
@@ -149,6 +154,7 @@ type SearchWidget<TWidgetDescription extends WidgetDescription> = {
       >;
     }
   ) => SearchParameters;
+  $$id?: never;
 };
 
 type RecommendRenderOptions = SharedRenderOptions & {
@@ -327,7 +333,61 @@ export type Widget<
 > &
   (SearchWidget<TWidgetDescription> | RecommendWidget<TWidgetDescription>);
 
-export type { IndexWidget } from '../widgets';
+export type IndexWidget<TUiState extends UiState = UiState> = Omit<
+  Widget<IndexWidgetDescription & { widgetParams: IndexWidgetParams }>,
+  'getWidgetUiState' | 'getWidgetState'
+> & {
+  // public API
+  addWidgets: (widgets: Array<Widget | IndexWidget>) => IndexWidget;
+  removeWidgets: (widgets: Array<Widget | IndexWidget>) => IndexWidget;
+
+  // "private" API
+  getIndexName: () => string;
+  getIndexId: () => string;
+  getHelper: () => Helper | null;
+  getResults: () => SearchResults | null;
+  getResultsForWidget: (
+    widget: IndexWidget | Widget
+  ) => SearchResults | RecommendResponse<any> | null;
+  getPreviousState: () => SearchParameters | null;
+  getScopedResults: () => ScopedResult[];
+  getParent: () => IndexWidget | null;
+  getWidgets: () => Array<Widget | IndexWidget>;
+  createURL: (
+    nextState: SearchParameters | ((state: IndexUiState) => IndexUiState)
+  ) => string;
+  /**
+   * Set this index' UI state back to the state defined by the widgets.
+   * Can only be called after `init`.
+   */
+  refreshUiState: () => void;
+  /**
+   * Set this index' UI state and search. This is the equivalent of calling
+   * a spread `setUiState` on the InstantSearch instance.
+   * Can only be called after `init`.
+   */
+  setIndexUiState: (
+    indexUiState:
+      | TUiState[string]
+      | ((previousIndexUiState: TUiState[string]) => TUiState[string])
+  ) => void;
+
+  // widget lifecycle
+  init: (options: IndexInitOptions) => void;
+  render: (options: IndexRenderOptions) => void;
+  dispose: (options?: DisposeOptions) => void;
+  /**
+   * @deprecated
+   */
+  getWidgetState: (uiState: UiState) => UiState;
+  getWidgetUiState: <TSpecificUiState extends UiState = TUiState>(
+    uiState: TSpecificUiState
+  ) => TSpecificUiState;
+  getWidgetSearchParameters: (
+    searchParameters: SearchParameters,
+    searchParametersOptions: { uiState: IndexUiState }
+  ) => SearchParameters;
+};
 
 export type TransformItemsMetadata = {
   results: SearchResults | undefined | null;
diff --git a/packages/instantsearch-core/src/version.ts b/packages/instantsearch-core/src/version.ts
new file mode 100644
index 0000000000..2f6ce8b5e7
--- /dev/null
+++ b/packages/instantsearch-core/src/version.ts
@@ -0,0 +1 @@
+export default '0.1.0';
diff --git a/packages/instantsearch.js/src/widgets/index/index.ts b/packages/instantsearch-core/src/widgets/index-widget.ts
similarity index 92%
rename from packages/instantsearch.js/src/widgets/index/index.ts
rename to packages/instantsearch-core/src/widgets/index-widget.ts
index 1818b65a19..bcabd94be5 100644
--- a/packages/instantsearch.js/src/widgets/index/index.ts
+++ b/packages/instantsearch-core/src/widgets/index-widget.ts
@@ -1,19 +1,21 @@
 import algoliasearchHelper from 'algoliasearch-helper';
 
 import {
-  checkIndexUiState,
+  addWidgetId,
   createDocumentationMessageGenerator,
-  resolveSearchParameters,
-  mergeSearchParameters,
   warning,
   isIndexWidget,
   createInitArgs,
   createRenderArgs,
-} from '../../lib/utils';
-import { addWidgetId } from '../../lib/utils/addWidgetId';
+} from '../lib/public';
+import {
+  checkIndexUiState,
+  resolveSearchParameters,
+  mergeSearchParameters,
+} from '../lib/utils';
 
+import type { InstantSearch } from '../instantsearch';
 import type {
-  InstantSearch,
   UiState,
   IndexUiState,
   Widget,
@@ -21,14 +23,13 @@ import type {
   SearchClient,
   IndexRenderState,
   RenderOptions,
-  RecommendResponse,
-} from '../../types';
+  IndexWidget,
+} from '../types';
 import type {
   AlgoliaSearchHelper as Helper,
   DerivedHelper,
   PlainSearchParameters,
   SearchParameters,
-  SearchResults,
   AlgoliaSearchHelper,
   RecommendParameters,
 } from 'algoliasearch-helper';
@@ -67,59 +68,6 @@ export type IndexWidgetDescription = {
   $$widgetType: 'ais.index';
 };
 
-export type IndexWidget<TUiState extends UiState = UiState> = Omit<
-  Widget<IndexWidgetDescription & { widgetParams: IndexWidgetParams }>,
-  'getWidgetUiState' | 'getWidgetState'
-> & {
-  getIndexName: () => string;
-  getIndexId: () => string;
-  getHelper: () => Helper | null;
-  getResults: () => SearchResults | null;
-  getResultsForWidget: (
-    widget: IndexWidget | Widget
-  ) => SearchResults | RecommendResponse<any> | null;
-  getPreviousState: () => SearchParameters | null;
-  getScopedResults: () => ScopedResult[];
-  getParent: () => IndexWidget | null;
-  getWidgets: () => Array<Widget | IndexWidget>;
-  createURL: (
-    nextState: SearchParameters | ((state: IndexUiState) => IndexUiState)
-  ) => string;
-
-  addWidgets: (widgets: Array<Widget | IndexWidget>) => IndexWidget;
-  removeWidgets: (widgets: Array<Widget | IndexWidget>) => IndexWidget;
-
-  init: (options: IndexInitOptions) => void;
-  render: (options: IndexRenderOptions) => void;
-  dispose: () => void;
-  /**
-   * @deprecated
-   */
-  getWidgetState: (uiState: UiState) => UiState;
-  getWidgetUiState: <TSpecificUiState extends UiState = TUiState>(
-    uiState: TSpecificUiState
-  ) => TSpecificUiState;
-  getWidgetSearchParameters: (
-    searchParameters: SearchParameters,
-    searchParametersOptions: { uiState: IndexUiState }
-  ) => SearchParameters;
-  /**
-   * Set this index' UI state back to the state defined by the widgets.
-   * Can only be called after `init`.
-   */
-  refreshUiState: () => void;
-  /**
-   * Set this index' UI state and search. This is the equivalent of calling
-   * a spread `setUiState` on the InstantSearch instance.
-   * Can only be called after `init`.
-   */
-  setIndexUiState: (
-    indexUiState:
-      | TUiState[string]
-      | ((previousIndexUiState: TUiState[string]) => TUiState[string])
-  ) => void;
-};
-
 /**
  * This is the same content as helper._change / setState, but allowing for extra
  * UiState to be synchronized.
@@ -259,7 +207,7 @@ function resolveScopedResultsFromWidgets(
   }, []);
 }
 
-const index = (widgetParams: IndexWidgetParams): IndexWidget => {
+export const index = (widgetParams: IndexWidgetParams): IndexWidget => {
   if (widgetParams === undefined || widgetParams.indexName === undefined) {
     throw new Error(withUsage('The `indexName` option is required.'));
   }
@@ -268,7 +216,7 @@ const index = (widgetParams: IndexWidgetParams): IndexWidget => {
 
   let localWidgets: Array<Widget | IndexWidget> = [];
   let localUiState: IndexUiState = {};
-  let localInstantSearchInstance: InstantSearch | null = null;
+  let localInstantSearchInstance: InstantSearch<UiState, UiState> | null = null;
   let localParent: IndexWidget | null = null;
   let helper: Helper | null = null;
   let derivedHelper: DerivedHelper | null = null;
@@ -701,7 +649,7 @@ const index = (widgetParams: IndexWidgetParams): IndexWidget => {
         // does not have access to lastResults, which it used to in pre-federated
         // search behavior.
         helper!.lastResults = results;
-        lastValidSearchParameters = results?._state;
+        lastValidSearchParameters = results?._state || null;
       });
 
       // eslint-disable-next-line no-warning-comments
@@ -944,8 +892,6 @@ const index = (widgetParams: IndexWidgetParams): IndexWidget => {
   };
 };
 
-export default index;
-
 function storeRenderState({
   renderState,
   instantSearchInstance,
diff --git a/packages/instantsearch-core/src/widgets/index.ts b/packages/instantsearch-core/src/widgets/index.ts
new file mode 100644
index 0000000000..02bf8b0be1
--- /dev/null
+++ b/packages/instantsearch-core/src/widgets/index.ts
@@ -0,0 +1 @@
+export * from './index-widget';
diff --git a/packages/instantsearch-core/test/createInstantSearch.ts b/packages/instantsearch-core/test/createInstantSearch.ts
new file mode 100644
index 0000000000..e1271d43fa
--- /dev/null
+++ b/packages/instantsearch-core/test/createInstantSearch.ts
@@ -0,0 +1,77 @@
+import { createSearchClient } from '@instantsearch/mocks';
+import algoliasearchHelper from 'algoliasearch-helper';
+
+import { INSTANTSEARCH_FUTURE_DEFAULTS, index, defer } from '../src';
+
+import type { InstantSearch } from '../src';
+
+export const createInstantSearch = (
+  args: Partial<InstantSearch> = {}
+): InstantSearch => {
+  const { indexName = 'indexName', client = createSearchClient() } = args;
+  const mainHelper = algoliasearchHelper(client, indexName, {});
+  const mainIndex = index({ indexName });
+
+  return {
+    indexName,
+    mainIndex,
+    mainHelper,
+    client,
+    started: false,
+    status: 'idle',
+    error: undefined,
+    start() {
+      this.started = true;
+    },
+    dispose() {
+      this.started = false;
+    },
+    refresh: jest.fn(),
+    helper: mainHelper, // @TODO: use the Helper from the index once the RoutingManger uses the index
+    insightsClient: null,
+    middleware: [],
+    renderState: {},
+    scheduleStalledRender: defer(jest.fn()),
+    scheduleSearch: defer(jest.fn()),
+    scheduleRender: defer(jest.fn()),
+    _stalledSearchDelay: 200,
+    _searchStalledTimer: null,
+    _initialUiState: {},
+    _initialResults: null,
+    _createURL: jest.fn(() => '#'),
+    _insights: undefined,
+    _hasRecommendWidget: false,
+    _hasSearchWidget: false,
+    onStateChange: null,
+    setUiState: jest.fn(),
+    getUiState: jest.fn(() => ({})),
+    // Since we defer `onInternalStateChange` with our `defer` util which
+    // creates a scoped deferred function, we're not able to spy that method.
+    // We'll therefore need to override it when calling `createInstantSearch`.
+    // See https://github.com/algolia/instantsearch/blob/f3213b2f118d75acac31a1f6cf4640241c438e9d/src/lib/utils/defer.ts#L13-L28
+    onInternalStateChange: jest.fn() as any,
+    createURL: jest.fn(() => '#'),
+    addWidget: jest.fn(),
+    addWidgets: jest.fn(),
+    removeWidget: jest.fn(),
+    removeWidgets: jest.fn(),
+    use: jest.fn(),
+    unuse: jest.fn(),
+    // methods from EventEmitter
+    addListener: jest.fn(),
+    removeListener: jest.fn(),
+    on: jest.fn(),
+    once: jest.fn(),
+    removeAllListeners: jest.fn(),
+    setMaxListeners: jest.fn(),
+    listeners: jest.fn(),
+    emit: jest.fn(),
+    listenerCount: jest.fn(),
+    sendEventToInsights: jest.fn(),
+    future: {
+      ...INSTANTSEARCH_FUTURE_DEFAULTS,
+      ...(args.future || {}),
+    },
+    ...args,
+  };
+};
diff --git a/packages/instantsearch-core/test/createWidget.ts b/packages/instantsearch-core/test/createWidget.ts
new file mode 100644
index 0000000000..f4326bd0f4
--- /dev/null
+++ b/packages/instantsearch-core/test/createWidget.ts
@@ -0,0 +1,109 @@
+import { createMultiSearchResponse } from '@instantsearch/mocks';
+import algoliasearchHelper from 'algoliasearch-helper';
+
+import { createInstantSearch } from './createInstantSearch';
+
+import type {
+  InitOptions,
+  RenderOptions,
+  DisposeOptions,
+  Widget,
+} from '../src/types';
+import type { IndexInitOptions } from '../src/widgets';
+import type { SearchResponse } from 'algoliasearch-helper/types/algoliasearch';
+
+export const createInitOptions = (
+  args: Partial<InitOptions> = {}
+): InitOptions => {
+  const { instantSearchInstance = createInstantSearch(), ...rest } = args;
+  const helper = args.helper || instantSearchInstance.helper!;
+
+  return {
+    instantSearchInstance,
+    parent: instantSearchInstance.mainIndex,
+    uiState: instantSearchInstance._initialUiState,
+    helper,
+    state: helper.state,
+    renderState: instantSearchInstance.renderState,
+    scopedResults: [],
+    createURL: jest.fn(() => '#'),
+    searchMetadata: {
+      isSearchStalled: false,
+    },
+    status: instantSearchInstance.status,
+    error: instantSearchInstance.error,
+    ...rest,
+  };
+};
+
+export const createIndexInitOptions = (
+  args: Partial<IndexInitOptions> = {}
+): IndexInitOptions => {
+  const { instantSearchInstance = createInstantSearch(), ...rest } = args;
+
+  return {
+    instantSearchInstance,
+    parent: instantSearchInstance.mainIndex,
+    uiState: instantSearchInstance._initialUiState,
+    ...rest,
+  };
+};
+
+export const createRenderOptions = (
+  args: Partial<RenderOptions> = {}
+): RenderOptions => {
+  const { instantSearchInstance = createInstantSearch(), ...rest } = args;
+  const response = createMultiSearchResponse();
+  const helper = args.helper || instantSearchInstance.helper!;
+  const results = new algoliasearchHelper.SearchResults(
+    instantSearchInstance.helper!.state,
+    response.results as Array<SearchResponse<any>>
+  );
+
+  return {
+    instantSearchInstance,
+    parent: instantSearchInstance.mainIndex,
+    helper,
+    state: helper.state,
+    renderState: instantSearchInstance.renderState,
+    results,
+    scopedResults: [
+      {
+        indexId: helper.state.index,
+        helper,
+        results,
+      },
+    ],
+    searchMetadata: {
+      isSearchStalled: false,
+    },
+    status: instantSearchInstance.status,
+    error: instantSearchInstance.error,
+    createURL: jest.fn(() => '#'),
+    ...rest,
+  };
+};
+
+export const createDisposeOptions = (
+  args: Partial<DisposeOptions> = {}
+): DisposeOptions => {
+  const instantSearchInstance = createInstantSearch();
+  const helper = args.helper || instantSearchInstance.helper!;
+
+  return {
+    helper,
+    state: helper.state,
+    recommendState: helper.recommendState,
+    parent: instantSearchInstance.mainIndex,
+    ...args,
+  };
+};
+
+export const createWidget = (args: Partial<Widget> = {}): Widget =>
+  ({
+    $$type: 'mock.widget',
+    init: jest.fn(),
+    render: jest.fn(),
+    dispose: jest.fn(),
+    ...args,
+  } as unknown as Widget);
diff --git a/packages/instantsearch-core/tsconfig.declaration.json b/packages/instantsearch-core/tsconfig.declaration.json
new file mode 100644
index 0000000000..0beb23fd5d
--- /dev/null
+++ b/packages/instantsearch-core/tsconfig.declaration.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig.declaration",
+  "compilerOptions": {
+    "outDir": "./dist/es"
+  },
+  "include": ["src", "types"]
+}
diff --git a/packages/instantsearch-ui-components/src/components/Carousel.tsx b/packages/instantsearch-ui-components/src/components/Carousel.tsx
index 7916447a37..c7175ac48b 100644
--- a/packages/instantsearch-ui-components/src/components/Carousel.tsx
+++ b/packages/instantsearch-ui-components/src/components/Carousel.tsx
@@ -9,8 +9,8 @@ import type {
   RecommendItemComponentProps,
   RecordWithObjectID,
   Renderer,
-  SendEventForHits,
 } from '../types';
+import type { SendEventForHits } from 'instantsearch-core';
 
 export type CarouselProps<
   TObject,
diff --git a/packages/instantsearch-ui-components/src/components/Hits.tsx b/packages/instantsearch-ui-components/src/components/Hits.tsx
index 546e16ccdc..050785e9fd 100644
--- a/packages/instantsearch-ui-components/src/components/Hits.tsx
+++ b/packages/instantsearch-ui-components/src/components/Hits.tsx
@@ -1,13 +1,9 @@
 /** @jsx createElement */
 import { cx } from '../lib';
 
-import type { ComponentProps, Renderer, SendEventForHits } from '../types';
+import type { ComponentProps, Renderer } from '../types';
 import type { Banner } from 'algoliasearch-helper';
-
-// Should be imported from a shared package in the future
-type Hit = Record<string, unknown> & {
-  objectID: string;
-};
+import type { SendEventForHits, Hit } from 'instantsearch-core';
 
 type BannerProps = ComponentProps<'aside'> & {
   banner: Banner;
@@ -52,7 +48,6 @@ export type HitsProps<THit> = ComponentProps<'div'> & {
   hits: THit[];
   itemComponent: (props: {
     hit: THit;
-    index: number;
     className: string;
     onClick: () => void;
     onAuxClick: () => void;
@@ -140,11 +135,10 @@ export function createHitsComponent({ createElement, Fragment }: Renderer) {
           <EmptyComponent />
         ) : (
           <ol className={cx('ais-Hits-list', classNames.list)}>
-            {hits.map((hit, index) => (
+            {hits.map((hit) => (
               <ItemComponent
                 key={hit.objectID}
                 hit={hit}
-                index={index}
                 className={cx('ais-Hits-item', classNames.item)}
                 onClick={() => {
                   sendEvent('click:internal', hit, 'Hit Clicked');
diff --git a/packages/instantsearch-ui-components/src/components/__tests__/Hits.test.tsx b/packages/instantsearch-ui-components/src/components/__tests__/Hits.test.tsx
index 986402b942..f2c9261619 100644
--- a/packages/instantsearch-ui-components/src/components/__tests__/Hits.test.tsx
+++ b/packages/instantsearch-ui-components/src/components/__tests__/Hits.test.tsx
@@ -24,7 +24,7 @@ describe('Hits', () => {
         { objectID: 'def', __position: 2 },
       ] as THit[],
       sendEvent: jest.fn(),
-      itemComponent: ({ hit, index: _index, ...itemProps }) => (
+      itemComponent: ({ hit, ...itemProps }) => (
         <li key={hit.objectID} {...itemProps}>
           {hit.objectID}
         </li>
@@ -235,7 +235,7 @@ describe('Hits', () => {
     test('renders with props', () => {
       const props = createProps({
         hits: [{ objectID: 'abc', __position: 1, custom: 'value' }],
-        itemComponent: jest.fn(({ hit, index, ...itemProps }) => (
+        itemComponent: jest.fn(({ hit, ...itemProps }) => (
           <li {...itemProps}>
             {hit.objectID}:{hit.custom}
           </li>
diff --git a/packages/instantsearch-ui-components/src/types/Recommend.ts b/packages/instantsearch-ui-components/src/types/Recommend.ts
index be43ddf7fb..c031fe2eb0 100644
--- a/packages/instantsearch-ui-components/src/types/Recommend.ts
+++ b/packages/instantsearch-ui-components/src/types/Recommend.ts
@@ -1,4 +1,4 @@
-import type { SendEventForHits } from '.';
+import type { SendEventForHits } from 'instantsearch-core';
 
 export type RecommendClassNames = {
   /**
diff --git a/packages/instantsearch-ui-components/src/types/index.ts b/packages/instantsearch-ui-components/src/types/index.ts
index bd4558b407..99c89f0229 100644
--- a/packages/instantsearch-ui-components/src/types/index.ts
+++ b/packages/instantsearch-ui-components/src/types/index.ts
@@ -1,3 +1,2 @@
-export * from './Renderer';
-export * from './Recommend';
-export * from './shared';
+export type * from './Renderer';
+export type * from './Recommend';
diff --git a/packages/instantsearch-ui-components/src/types/shared.ts b/packages/instantsearch-ui-components/src/types/shared.ts
deleted file mode 100644
index f45e01f6dd..0000000000
--- a/packages/instantsearch-ui-components/src/types/shared.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Should be imported from a shared package in the future
-
-import type { RecordWithObjectID } from './Recommend';
-
-type BuiltInSendEventForHits = (
-  eventType: string,
-  hits: RecordWithObjectID<any> | Array<RecordWithObjectID<any>>,
-  eventName?: string,
-  additionalData?: Record<string, any>
-) => void;
-type CustomSendEventForHits = (customPayload: any) => void;
-export type SendEventForHits = BuiltInSendEventForHits & CustomSendEventForHits;
diff --git a/packages/instantsearch.js/CHANGELOG.md b/packages/instantsearch.js/CHANGELOG.md
index e18cff29ed..b3fe985677 100644
--- a/packages/instantsearch.js/CHANGELOG.md
+++ b/packages/instantsearch.js/CHANGELOG.md
@@ -926,7 +926,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ### Bug Fixes
 
-- **insights:** don't send view event if search is stalled ([#5058](https://github.com/algolia/instantsearch/issues/5058)) ([1686dfb](https://github.com/algolia/instantsearch/commit/1686dfb096cfce062e268feda7956e3b160bf2da)), closes [/github.com/algolia/instantsearch/blob/99f6fe1dc51e4815e5b9efcfb30e3e2f3127e763/src/lib/utils/createSendEventForHits.ts#L168](https://github.com//github.com/algolia/instantsearch/blob/99f6fe1dc51e4815e5b9efcfb30e3e2f3127e763/src/lib/utils/createSendEventForHits.ts/issues/L168) [/github.com/algolia/instantsearch/blob/55313e4ea4105b777f3f102e9f48a7e440496d25/src/middlewares/createInsightsMiddleware.ts#L144](https://github.com//github.com/algolia/instantsearch/blob/55313e4ea4105b777f3f102e9f48a7e440496d25/src/middlewares/createInsightsMiddleware.ts/issues/L144)
+- **insights:** don't send view event if search is stalled ([#5058](https://github.com/algolia/instantsearch/issues/5058)) ([1686dfb](https://github.com/algolia/instantsearch/commit/1686dfb096cfce062e268feda7956e3b160bf2da))
 - **types:** avoid inferring UiState type from initialUiState ([#5061](https://github.com/algolia/instantsearch/issues/5061)) ([80ca07e](https://github.com/algolia/instantsearch/commit/80ca07e29064357343ee997be94ef10beadba637)), closes [/github.com/Microsoft/TypeScript/issues/14829#issuecomment-504042546](https://github.com//github.com/Microsoft/TypeScript/issues/14829/issues/issuecomment-504042546) [#5060](https://github.com/algolia/instantsearch/issues/5060)
 - **types:** make all usages of UiState in InstantSearch generic ([#5060](https://github.com/algolia/instantsearch/issues/5060)) ([2b9e76b](https://github.com/algolia/instantsearch/commit/2b9e76b568fb4d4cc5bd49c384ee583d84d6f39a))
 
diff --git a/packages/instantsearch.js/package.json b/packages/instantsearch.js/package.json
index 0ca46b6a85..b986d1dfc3 100644
--- a/packages/instantsearch.js/package.json
+++ b/packages/instantsearch.js/package.json
@@ -25,16 +25,14 @@
     "es"
   ],
   "dependencies": {
-    "@algolia/events": "^4.0.1",
     "@types/dom-speech-recognition": "^0.0.1",
     "@types/google.maps": "^3.55.12",
     "@types/qs": "^6.5.3",
     "algoliasearch-helper": "3.24.1",
     "htm": "^3.0.0",
+    "instantsearch-core": "0.1.0",
     "instantsearch-ui-components": "0.11.1",
-    "preact": "^10.10.0",
-    "qs": "^6.5.1 < 6.10",
-    "search-insights": "^2.17.2"
+    "preact": "^10.10.0"
   },
   "peerDependencies": {
     "algoliasearch": ">= 3.1 < 6"
diff --git a/packages/instantsearch.js/src/__tests__/common-connectors.test.tsx b/packages/instantsearch.js/src/__tests__/common-connectors.test.tsx
index 1b0f8c6e29..f00313a178 100644
--- a/packages/instantsearch.js/src/__tests__/common-connectors.test.tsx
+++ b/packages/instantsearch.js/src/__tests__/common-connectors.test.tsx
@@ -23,8 +23,8 @@ import {
 import instantsearch from '../index.es';
 import { refinementList } from '../widgets';
 
-import type { InstantSearch, Widget } from '../index.es';
 import type { TestOptionsMap, TestSetupsMap } from '@instantsearch/tests';
+import type { InstantSearch, Widget } from 'instantsearch-core';
 
 type TestSuites = typeof suites;
 const testSuites: TestSuites = suites;
diff --git a/packages/instantsearch.js/src/components/Breadcrumb/Breadcrumb.tsx b/packages/instantsearch.js/src/components/Breadcrumb/Breadcrumb.tsx
index e27e1b306d..d4d326d28b 100644
--- a/packages/instantsearch.js/src/components/Breadcrumb/Breadcrumb.tsx
+++ b/packages/instantsearch.js/src/components/Breadcrumb/Breadcrumb.tsx
@@ -6,7 +6,7 @@ import { h } from 'preact';
 import { isSpecialClick } from '../../lib/utils';
 import Template from '../Template/Template';
 
-import type { BreadcrumbConnectorParamsItem } from '../../connectors/breadcrumb/connectBreadcrumb';
+import type { BreadcrumbConnectorParamsItem } from '../../connectors';
 import type { PreparedTemplateProps } from '../../lib/templating';
 import type { ComponentCSSClasses } from '../../types';
 import type {
diff --git a/packages/instantsearch.js/src/components/ClearRefinements/ClearRefinements.tsx b/packages/instantsearch.js/src/components/ClearRefinements/ClearRefinements.tsx
index aa776d002f..637ecf2e44 100644
--- a/packages/instantsearch.js/src/components/ClearRefinements/ClearRefinements.tsx
+++ b/packages/instantsearch.js/src/components/ClearRefinements/ClearRefinements.tsx
@@ -5,7 +5,7 @@ import { h } from 'preact';
 
 import Template from '../Template/Template';
 
-import type { ClearRefinementsRenderState } from '../../connectors/clear-refinements/connectClearRefinements';
+import type { ClearRefinementsRenderState } from '../../connectors';
 import type { PreparedTemplateProps } from '../../lib/templating';
 import type { ComponentCSSClasses } from '../../types';
 import type {
diff --git a/packages/instantsearch.js/src/components/CurrentRefinements/CurrentRefinements.tsx b/packages/instantsearch.js/src/components/CurrentRefinements/CurrentRefinements.tsx
index d2d9d48e0b..a78b652adf 100644
--- a/packages/instantsearch.js/src/components/CurrentRefinements/CurrentRefinements.tsx
+++ b/packages/instantsearch.js/src/components/CurrentRefinements/CurrentRefinements.tsx
@@ -8,7 +8,7 @@ import { isSpecialClick, capitalize } from '../../lib/utils';
 import type {
   CurrentRefinementsConnectorParamsItem,
   CurrentRefinementsConnectorParamsRefinement,
-} from '../../connectors/current-refinements/connectCurrentRefinements';
+} from '../../connectors';
 import type { ComponentCSSClasses } from '../../types';
 import type { CurrentRefinementsCSSClasses } from '../../widgets/current-refinements/current-refinements';
 
diff --git a/packages/instantsearch.js/src/components/InfiniteHits/InfiniteHits.tsx b/packages/instantsearch.js/src/components/InfiniteHits/InfiniteHits.tsx
index be10f7cf30..391294a009 100644
--- a/packages/instantsearch.js/src/components/InfiniteHits/InfiniteHits.tsx
+++ b/packages/instantsearch.js/src/components/InfiniteHits/InfiniteHits.tsx
@@ -3,11 +3,15 @@
 import { cx } from 'instantsearch-ui-components';
 import { h } from 'preact';
 
-import { warning } from '../../lib/utils';
 import Template from '../Template/Template';
 
-import type { SendEventForHits, BindEventForHits } from '../../lib/utils';
-import type { ComponentCSSClasses, Hit, InsightsClient } from '../../types';
+import type {
+  ComponentCSSClasses,
+  Hit,
+  InsightsClient,
+  SendEventForHits,
+  BindEventForHits,
+} from '../../types';
 import type {
   InfiniteHitsCSSClasses,
   InfiniteHitsTemplates,
@@ -151,7 +155,7 @@ const InfiniteHits = ({
         ))}
 
       <ol className={cssClasses.list}>
-        {hits.map((hit, index) => (
+        {hits.map((hit) => (
           <Template
             {...templateProps}
             templateKey="item"
@@ -166,16 +170,7 @@ const InfiniteHits = ({
               },
             }}
             key={hit.objectID}
-            data={{
-              ...hit,
-              get __hitIndex() {
-                warning(
-                  false,
-                  'The `__hitIndex` property is deprecated. Use the absolute `__position` instead.'
-                );
-                return index;
-              },
-            }}
+            data={hit}
             sendEvent={sendEvent}
           />
         ))}
diff --git a/packages/instantsearch.js/src/components/MenuSelect/MenuSelect.tsx b/packages/instantsearch.js/src/components/MenuSelect/MenuSelect.tsx
index 1b4e39e8af..8ac28b949b 100644
--- a/packages/instantsearch.js/src/components/MenuSelect/MenuSelect.tsx
+++ b/packages/instantsearch.js/src/components/MenuSelect/MenuSelect.tsx
@@ -3,10 +3,9 @@
 import { cx } from 'instantsearch-ui-components';
 import { h } from 'preact';
 
-import { find } from '../../lib/utils';
 import Template from '../Template/Template';
 
-import type { MenuRenderState } from '../../connectors/menu/connectMenu';
+import type { MenuRenderState } from '../../connectors';
 import type { ComponentCSSClasses } from '../../types';
 import type {
   MenuSelectCSSClasses,
@@ -47,7 +46,7 @@ type Props = {
 };
 
 function MenuSelect({ cssClasses, templateProps, items, refine }: Props) {
-  const { value: selectedValue } = find(items, (item) => item.isRefined) || {
+  const { value: selectedValue } = items.find((item) => item.isRefined) || {
     value: '',
   };
 
diff --git a/packages/instantsearch.js/src/components/RangeInput/RangeInput.tsx b/packages/instantsearch.js/src/components/RangeInput/RangeInput.tsx
index c6786e5756..0c54d0fa7a 100644
--- a/packages/instantsearch.js/src/components/RangeInput/RangeInput.tsx
+++ b/packages/instantsearch.js/src/components/RangeInput/RangeInput.tsx
@@ -5,10 +5,7 @@ import { h, Component } from 'preact';
 
 import Template from '../Template/Template';
 
-import type {
-  Range,
-  RangeBoundaries,
-} from '../../connectors/range/connectRange';
+import type { Range, RangeBoundaries } from '../../connectors';
 import type { ComponentCSSClasses } from '../../types';
 import type {
   RangeInputCSSClasses,
diff --git a/packages/instantsearch.js/src/components/RefinementList/RefinementList.tsx b/packages/instantsearch.js/src/components/RefinementList/RefinementList.tsx
index a66e74f42f..e5d5267644 100644
--- a/packages/instantsearch.js/src/components/RefinementList/RefinementList.tsx
+++ b/packages/instantsearch.js/src/components/RefinementList/RefinementList.tsx
@@ -9,7 +9,7 @@ import Template from '../Template/Template';
 
 import RefinementListItem from './RefinementListItem';
 
-import type { HierarchicalMenuItem } from '../../connectors/hierarchical-menu/connectHierarchicalMenu';
+import type { HierarchicalMenuItem } from '../../connectors';
 import type { PreparedTemplateProps } from '../../lib/templating';
 import type { ComponentCSSClasses, CreateURL, Templates } from '../../types';
 import type { HierarchicalMenuComponentCSSClasses } from '../../widgets/hierarchical-menu/hierarchical-menu';
diff --git a/packages/instantsearch.js/src/components/Slider/Slider.tsx b/packages/instantsearch.js/src/components/Slider/Slider.tsx
index 3ef245780c..008ff82c0d 100644
--- a/packages/instantsearch.js/src/components/Slider/Slider.tsx
+++ b/packages/instantsearch.js/src/components/Slider/Slider.tsx
@@ -8,7 +8,7 @@ import { range } from '../../lib/utils';
 import Pit from './Pit';
 import Rheostat from './Rheostat';
 
-import type { RangeBoundaries } from '../../connectors/range/connectRange';
+import type { RangeBoundaries } from '../../connectors';
 import type { ComponentCSSClasses } from '../../types';
 import type {
   RangeSliderCssClasses,
diff --git a/packages/instantsearch.js/src/components/Template/Template.tsx b/packages/instantsearch.js/src/components/Template/Template.tsx
index 3833b344ed..155c0e2932 100644
--- a/packages/instantsearch.js/src/components/Template/Template.tsx
+++ b/packages/instantsearch.js/src/components/Template/Template.tsx
@@ -6,8 +6,8 @@ import { renderTemplate } from '../../lib/templating';
 import { isEqual } from '../../lib/utils';
 
 import type { PreparedTemplateProps } from '../../lib/templating';
-import type { SendEventForHits } from '../../lib/utils';
 import type { Templates } from '../../types';
+import type { SendEventForHits } from 'instantsearch-core';
 import type { JSX } from 'preact';
 
 const defaultProps = {
diff --git a/packages/instantsearch.js/src/components/Template/__tests__/Template-test.tsx b/packages/instantsearch.js/src/components/Template/__tests__/Template-test.tsx
index 47122c9343..ae41683d2a 100644
--- a/packages/instantsearch.js/src/components/Template/__tests__/Template-test.tsx
+++ b/packages/instantsearch.js/src/components/Template/__tests__/Template-test.tsx
@@ -7,7 +7,7 @@ import { mount, shallow } from '@instantsearch/testutils/enzyme';
 import { render } from '@testing-library/preact';
 import { h } from 'preact';
 
-import { warning } from '../../../lib/utils';
+import { warnCache } from '../../../lib/utils';
 import Template from '../Template';
 
 import type { TemplateProps } from '../Template';
@@ -30,7 +30,7 @@ function getProps({
 
 describe('Template', () => {
   afterEach(() => {
-    warning.cache = {};
+    warnCache.current = {};
   });
 
   it('can configure custom rootTagName', () => {
diff --git a/packages/instantsearch.js/src/components/ToggleRefinement/ToggleRefinement.tsx b/packages/instantsearch.js/src/components/ToggleRefinement/ToggleRefinement.tsx
index bc57db747d..67ffa3d703 100644
--- a/packages/instantsearch.js/src/components/ToggleRefinement/ToggleRefinement.tsx
+++ b/packages/instantsearch.js/src/components/ToggleRefinement/ToggleRefinement.tsx
@@ -7,7 +7,7 @@ import Template from '../Template/Template';
 import type {
   ToggleRefinementRenderState,
   ToggleRefinementValue,
-} from '../../connectors/toggle-refinement/connectToggleRefinement';
+} from '../../connectors';
 import type { PreparedTemplateProps } from '../../lib/templating';
 import type { ComponentCSSClasses } from '../../types';
 import type {
diff --git a/packages/instantsearch.js/src/components/VoiceSearch/VoiceSearch.tsx b/packages/instantsearch.js/src/components/VoiceSearch/VoiceSearch.tsx
index 02508d69d0..24aa1e06a9 100644
--- a/packages/instantsearch.js/src/components/VoiceSearch/VoiceSearch.tsx
+++ b/packages/instantsearch.js/src/components/VoiceSearch/VoiceSearch.tsx
@@ -4,7 +4,7 @@ import { h } from 'preact';
 
 import Template from '../Template/Template';
 
-import type { VoiceListeningState } from '../../lib/voiceSearchHelper/types';
+import type { VoiceListeningState } from '../../connectors';
 import type { ComponentCSSClasses } from '../../types';
 import type {
   VoiceSearchCSSClasses,
diff --git a/packages/instantsearch.js/src/connectors/autocomplete/connectAutocomplete.ts b/packages/instantsearch.js/src/connectors/autocomplete/connectAutocomplete.ts
deleted file mode 100644
index 095600b86a..0000000000
--- a/packages/instantsearch.js/src/connectors/autocomplete/connectAutocomplete.ts
+++ /dev/null
@@ -1,266 +0,0 @@
-import {
-  escapeHits,
-  TAG_PLACEHOLDER,
-  checkRendering,
-  createDocumentationMessageGenerator,
-  createSendEventForHits,
-  noop,
-  warning,
-} from '../../lib/utils';
-
-import type { SendEventForHits } from '../../lib/utils';
-import type { Hit, Connector, WidgetRenderState } from '../../types';
-import type { SearchResults } from 'algoliasearch-helper';
-
-const withUsage = createDocumentationMessageGenerator({
-  name: 'autocomplete',
-  connector: true,
-});
-
-export type AutocompleteConnectorParams = {
-  /**
-   * Escapes HTML entities from hits string values.
-   *
-   * @default `true`
-   */
-  escapeHTML?: boolean;
-};
-
-export type AutocompleteRenderState = {
-  /**
-   * The current value of the query.
-   */
-  currentRefinement: string;
-
-  /**
-   * The indices this widget has access to.
-   */
-  indices: Array<{
-    /**
-     * The name of the index
-     */
-    indexName: string;
-
-    /**
-     * The id of the index
-     */
-    indexId: string;
-
-    /**
-     * The resolved hits from the index matching the query.
-     */
-    hits: Hit[];
-
-    /**
-     * The full results object from the Algolia API.
-     */
-    results: SearchResults;
-
-    /**
-     * Send event to insights middleware
-     */
-    sendEvent: SendEventForHits;
-  }>;
-
-  /**
-   * Searches into the indices with the provided query.
-   */
-  refine: (query: string) => void;
-};
-
-export type AutocompleteWidgetDescription = {
-  $$type: 'ais.autocomplete';
-  renderState: AutocompleteRenderState;
-  indexRenderState: {
-    autocomplete: WidgetRenderState<
-      AutocompleteRenderState,
-      AutocompleteConnectorParams
-    >;
-  };
-  indexUiState: { query: string };
-};
-
-export type AutocompleteConnector = Connector<
-  AutocompleteWidgetDescription,
-  AutocompleteConnectorParams
->;
-
-const connectAutocomplete: AutocompleteConnector = function connectAutocomplete(
-  renderFn,
-  unmountFn = noop
-) {
-  checkRendering(renderFn, withUsage());
-
-  return (widgetParams) => {
-    const {
-      // @MAJOR: this can default to false
-      escapeHTML = true,
-    } = widgetParams || {};
-
-    warning(
-      !(widgetParams as any).indices,
-      `
-The option \`indices\` has been removed from the Autocomplete connector.
-
-The indices to target are now inferred from the widgets tree.
-${
-  Array.isArray((widgetParams as any).indices)
-    ? `
-An alternative would be:
-
-const autocomplete = connectAutocomplete(renderer);
-
-search.addWidgets([
-  ${(widgetParams as any).indices
-    .map(({ value }: { value: string }) => `index({ indexName: '${value}' }),`)
-    .join('\n  ')}
-  autocomplete()
-]);
-`
-    : ''
-}
-      `
-    );
-
-    type ConnectorState = {
-      refine?: (query: string) => void;
-    };
-
-    const connectorState: ConnectorState = {};
-
-    return {
-      $$type: 'ais.autocomplete',
-
-      init(initOptions) {
-        const { instantSearchInstance } = initOptions;
-
-        renderFn(
-          {
-            ...this.getWidgetRenderState(initOptions),
-            instantSearchInstance,
-          },
-          true
-        );
-      },
-
-      render(renderOptions) {
-        const { instantSearchInstance } = renderOptions;
-
-        const renderState = this.getWidgetRenderState(renderOptions);
-
-        renderState.indices.forEach(({ sendEvent, hits }) => {
-          sendEvent('view:internal', hits);
-        });
-
-        renderFn(
-          {
-            ...renderState,
-            instantSearchInstance,
-          },
-          false
-        );
-      },
-
-      getRenderState(renderState, renderOptions) {
-        return {
-          ...renderState,
-          autocomplete: this.getWidgetRenderState(renderOptions),
-        };
-      },
-
-      getWidgetRenderState({
-        helper,
-        state,
-        scopedResults,
-        instantSearchInstance,
-      }) {
-        if (!connectorState.refine) {
-          connectorState.refine = (query: string) => {
-            helper.setQuery(query).search();
-          };
-        }
-
-        const indices = scopedResults.map((scopedResult) => {
-          // We need to escape the hits because highlighting
-          // exposes HTML tags to the end-user.
-          if (scopedResult.results) {
-            scopedResult.results.hits = escapeHTML
-              ? escapeHits(scopedResult.results.hits)
-              : scopedResult.results.hits;
-          }
-
-          const sendEvent = createSendEventForHits({
-            instantSearchInstance,
-            getIndex: () => scopedResult.results?.index || '',
-            widgetType: this.$$type,
-          });
-
-          return {
-            indexId: scopedResult.indexId,
-            indexName: scopedResult.results?.index || '',
-            hits: scopedResult.results?.hits || [],
-            results: scopedResult.results || ({} as unknown as SearchResults),
-            sendEvent,
-          };
-        });
-
-        return {
-          currentRefinement: state.query || '',
-          indices,
-          refine: connectorState.refine,
-          widgetParams,
-        };
-      },
-
-      getWidgetUiState(uiState, { searchParameters }) {
-        const query = searchParameters.query || '';
-
-        if (query === '' || (uiState && uiState.query === query)) {
-          return uiState;
-        }
-
-        return {
-          ...uiState,
-          query,
-        };
-      },
-
-      getWidgetSearchParameters(searchParameters, { uiState }) {
-        const parameters = {
-          query: uiState.query || '',
-        };
-
-        if (!escapeHTML) {
-          return searchParameters.setQueryParameters(parameters);
-        }
-
-        return searchParameters.setQueryParameters({
-          ...parameters,
-          ...TAG_PLACEHOLDER,
-        });
-      },
-
-      dispose({ state }) {
-        unmountFn();
-
-        const stateWithoutQuery = state.setQueryParameter('query', undefined);
-
-        if (!escapeHTML) {
-          return stateWithoutQuery;
-        }
-
-        return stateWithoutQuery.setQueryParameters(
-          Object.keys(TAG_PLACEHOLDER).reduce(
-            (acc, key) => ({
-              ...acc,
-              [key]: undefined,
-            }),
-            {}
-          )
-        );
-      },
-    };
-  };
-};
-
-export default connectAutocomplete;
diff --git a/packages/instantsearch.js/src/connectors/breadcrumb/connectBreadcrumb.ts b/packages/instantsearch.js/src/connectors/breadcrumb/connectBreadcrumb.ts
deleted file mode 100644
index 29242253c9..0000000000
--- a/packages/instantsearch.js/src/connectors/breadcrumb/connectBreadcrumb.ts
+++ /dev/null
@@ -1,361 +0,0 @@
-import {
-  checkRendering,
-  warning,
-  createDocumentationMessageGenerator,
-  isEqual,
-  noop,
-} from '../../lib/utils';
-
-import type {
-  Connector,
-  TransformItems,
-  CreateURL,
-  WidgetRenderState,
-  IndexUiState,
-} from '../../types';
-import type { SearchParameters, SearchResults } from 'algoliasearch-helper';
-
-const withUsage = createDocumentationMessageGenerator({
-  name: 'breadcrumb',
-  connector: true,
-});
-
-export type BreadcrumbConnectorParamsItem = {
-  /**
-   * Label of the category or subcategory.
-   */
-  label: string;
-
-  /**
-   * Value of breadcrumb item.
-   */
-  value: string | null;
-};
-
-export type BreadcrumbConnectorParams = {
-  /**
-   * Attributes to use to generate the hierarchy of the breadcrumb.
-   */
-  attributes: string[];
-
-  /**
-   * Prefix path to use if the first level is not the root level.
-   */
-  rootPath?: string;
-
-  /**
-   * Function to transform the items passed to the templates.
-   */
-  transformItems?: TransformItems<BreadcrumbConnectorParamsItem>;
-
-  /**
-   * The level separator used in the records.
-   *
-   * @default '>'
-   */
-  separator?: string;
-};
-
-export type BreadcrumbRenderState = {
-  /**
-   * Creates the URL for a single item name in the list.
-   */
-  createURL: CreateURL<BreadcrumbConnectorParamsItem['value']>;
-
-  /**
-   * Array of objects defining the different values and labels.
-   */
-  items: BreadcrumbConnectorParamsItem[];
-
-  /**
-   * Sets the path of the hierarchical filter and triggers a new search.
-   */
-  refine: (value: BreadcrumbConnectorParamsItem['value']) => void;
-
-  /**
-   * True if refinement can be applied.
-   */
-  canRefine: boolean;
-};
-
-export type BreadcrumbWidgetDescription = {
-  $$type: 'ais.breadcrumb';
-  renderState: BreadcrumbRenderState;
-  indexRenderState: {
-    breadcrumb: {
-      [rootAttribute: string]: WidgetRenderState<
-        BreadcrumbRenderState,
-        BreadcrumbConnectorParams
-      >;
-    };
-  };
-};
-
-export type BreadcrumbConnector = Connector<
-  BreadcrumbWidgetDescription,
-  BreadcrumbConnectorParams
->;
-
-const connectBreadcrumb: BreadcrumbConnector = function connectBreadcrumb(
-  renderFn,
-  unmountFn = noop
-) {
-  checkRendering(renderFn, withUsage());
-
-  type ConnectorState = {
-    refine?: BreadcrumbRenderState['refine'];
-    createURL?: BreadcrumbRenderState['createURL'];
-  };
-
-  const connectorState: ConnectorState = {};
-
-  return (widgetParams) => {
-    const {
-      attributes,
-      separator = ' > ',
-      rootPath = null,
-      transformItems = ((items) => items) as NonNullable<
-        BreadcrumbConnectorParams['transformItems']
-      >,
-    } = widgetParams || {};
-
-    if (!attributes || !Array.isArray(attributes) || attributes.length === 0) {
-      throw new Error(
-        withUsage('The `attributes` option expects an array of strings.')
-      );
-    }
-
-    const [hierarchicalFacetName] = attributes;
-
-    function getRefinedState(
-      state: SearchParameters,
-      facetValue: BreadcrumbConnectorParamsItem['value']
-    ) {
-      if (!facetValue) {
-        const breadcrumb = state.getHierarchicalFacetBreadcrumb(
-          hierarchicalFacetName
-        );
-        if (breadcrumb.length === 0) {
-          return state;
-        } else {
-          return state
-            .resetPage()
-            .toggleFacetRefinement(hierarchicalFacetName, breadcrumb[0]);
-        }
-      }
-      return state
-        .resetPage()
-        .toggleFacetRefinement(hierarchicalFacetName, facetValue);
-    }
-
-    return {
-      $$type: 'ais.breadcrumb',
-
-      init(initOptions) {
-        renderFn(
-          {
-            ...this.getWidgetRenderState(initOptions),
-            instantSearchInstance: initOptions.instantSearchInstance,
-          },
-          true
-        );
-      },
-
-      render(renderOptions) {
-        renderFn(
-          {
-            ...this.getWidgetRenderState(renderOptions),
-            instantSearchInstance: renderOptions.instantSearchInstance,
-          },
-          false
-        );
-      },
-
-      dispose() {
-        unmountFn();
-      },
-
-      getRenderState(renderState, renderOptions) {
-        return {
-          ...renderState,
-          breadcrumb: {
-            ...renderState.breadcrumb,
-            [hierarchicalFacetName]: this.getWidgetRenderState(renderOptions),
-          },
-        };
-      },
-
-      getWidgetRenderState({ helper, createURL, results, state }) {
-        function getItems() {
-          // The hierarchicalFacets condition is required for flavors
-          // that render immediately with empty results, without relying
-          // on init() (like React InstantSearch).
-          if (!results || state.hierarchicalFacets.length === 0) {
-            return [];
-          }
-
-          const [{ name: facetName }] = state.hierarchicalFacets;
-
-          const facetValues = results.getFacetValues(facetName, {});
-          const facetItems =
-            facetValues && !Array.isArray(facetValues) && facetValues.data
-              ? facetValues.data
-              : [];
-          const items = transformItems(
-            shiftItemsValues(prepareItems(facetItems)),
-            {
-              results,
-            }
-          );
-
-          return items;
-        }
-
-        const items = getItems();
-
-        if (!connectorState.createURL) {
-          connectorState.createURL = (facetValue) => {
-            return createURL((uiState) =>
-              this.getWidgetUiState!(uiState, {
-                searchParameters: getRefinedState(helper.state, facetValue),
-                helper,
-              })
-            );
-          };
-        }
-
-        if (!connectorState.refine) {
-          connectorState.refine = (facetValue) => {
-            helper.setState(getRefinedState(helper.state, facetValue)).search();
-          };
-        }
-
-        return {
-          canRefine: items.length > 0,
-          createURL: connectorState.createURL,
-          items,
-          refine: connectorState.refine,
-          widgetParams,
-        };
-      },
-
-      getWidgetUiState(uiState, { searchParameters }) {
-        const path = searchParameters.getHierarchicalFacetBreadcrumb(
-          hierarchicalFacetName
-        );
-
-        return removeEmptyRefinementsFromUiState(
-          {
-            ...uiState,
-            hierarchicalMenu: {
-              ...uiState.hierarchicalMenu,
-              [hierarchicalFacetName]: path,
-            },
-          },
-          hierarchicalFacetName
-        );
-      },
-
-      getWidgetSearchParameters(searchParameters, { uiState }) {
-        const values =
-          uiState.hierarchicalMenu &&
-          uiState.hierarchicalMenu[hierarchicalFacetName];
-
-        if (
-          searchParameters.isConjunctiveFacet(hierarchicalFacetName) ||
-          searchParameters.isDisjunctiveFacet(hierarchicalFacetName)
-        ) {
-          warning(
-            false,
-            `HierarchicalMenu: Attribute "${hierarchicalFacetName}" is already used by another widget applying conjunctive or disjunctive faceting.
-As this is not supported, please make sure to remove this other widget or this HierarchicalMenu widget will not work at all.`
-          );
-
-          return searchParameters;
-        }
-
-        if (searchParameters.isHierarchicalFacet(hierarchicalFacetName)) {
-          const facet = searchParameters.getHierarchicalFacetByName(
-            hierarchicalFacetName
-          );
-
-          warning(
-            isEqual(facet.attributes, attributes) &&
-              facet.separator === separator &&
-              facet.rootPath === rootPath,
-            'Using Breadcrumb and HierarchicalMenu on the same facet with different options overrides the configuration of the HierarchicalMenu.'
-          );
-        }
-
-        const withFacetConfiguration = searchParameters
-          .removeHierarchicalFacet(hierarchicalFacetName)
-          .addHierarchicalFacet({
-            name: hierarchicalFacetName,
-            attributes,
-            separator,
-            rootPath,
-          });
-
-        if (!values) {
-          return withFacetConfiguration.setQueryParameters({
-            hierarchicalFacetsRefinements: {
-              ...withFacetConfiguration.hierarchicalFacetsRefinements,
-              [hierarchicalFacetName]: [],
-            },
-          });
-        }
-
-        return withFacetConfiguration.addHierarchicalFacetRefinement(
-          hierarchicalFacetName,
-          values.join(separator)
-        );
-      },
-    };
-  };
-};
-
-function prepareItems(data: SearchResults.HierarchicalFacet[]) {
-  return data.reduce<BreadcrumbConnectorParamsItem[]>((result, currentItem) => {
-    if (currentItem.isRefined) {
-      result.push({
-        label: currentItem.name,
-        value: currentItem.escapedValue,
-      });
-      if (Array.isArray(currentItem.data)) {
-        result = result.concat(prepareItems(currentItem.data));
-      }
-    }
-    return result;
-  }, []);
-}
-
-function shiftItemsValues(array: BreadcrumbConnectorParamsItem[]) {
-  return array.map((x, idx) => ({
-    label: x.label,
-    value: idx + 1 === array.length ? null : array[idx + 1].value,
-  }));
-}
-
-function removeEmptyRefinementsFromUiState(
-  indexUiState: IndexUiState,
-  attribute: string
-): IndexUiState {
-  if (!indexUiState.hierarchicalMenu) {
-    return indexUiState;
-  }
-
-  if (
-    !indexUiState.hierarchicalMenu[attribute] ||
-    !indexUiState.hierarchicalMenu[attribute].length
-  ) {
-    delete indexUiState.hierarchicalMenu[attribute];
-  }
-
-  if (Object.keys(indexUiState.hierarchicalMenu).length === 0) {
-    delete indexUiState.hierarchicalMenu;
-  }
-
-  return indexUiState;
-}
-
-export default connectBreadcrumb;
diff --git a/packages/instantsearch.js/src/connectors/frequently-bought-together/connectFrequentlyBoughtTogether.ts b/packages/instantsearch.js/src/connectors/frequently-bought-together/connectFrequentlyBoughtTogether.ts
deleted file mode 100644
index 9861fd375e..0000000000
--- a/packages/instantsearch.js/src/connectors/frequently-bought-together/connectFrequentlyBoughtTogether.ts
+++ /dev/null
@@ -1,227 +0,0 @@
-import {
-  createDocumentationMessageGenerator,
-  checkRendering,
-  noop,
-  escapeHits,
-  TAG_PLACEHOLDER,
-  createSendEventForHits,
-  addAbsolutePosition,
-  addQueryID,
-} from '../../lib/utils';
-
-import type { SendEventForHits } from '../../lib/utils';
-import type {
-  Connector,
-  TransformItems,
-  BaseHit,
-  Renderer,
-  Unmounter,
-  UnknownWidgetParams,
-  RecommendResponse,
-  Hit,
-  AlgoliaHit,
-} from '../../types';
-import type { PlainSearchParameters } from 'algoliasearch-helper';
-
-const withUsage = createDocumentationMessageGenerator({
-  name: 'frequently-bought-together',
-  connector: true,
-});
-
-export type FrequentlyBoughtTogetherRenderState<
-  THit extends NonNullable<object> = BaseHit
-> = {
-  /**
-   * The matched recommendations from Algolia API.
-   */
-  items: Array<Hit<THit>>;
-
-  /**
-   * Sends an event to the Insights middleware.
-   */
-  sendEvent: SendEventForHits;
-};
-
-export type FrequentlyBoughtTogetherConnectorParams<
-  THit extends NonNullable<object> = BaseHit
-> = {
-  /**
-   * The objectIDs of the items to get the frequently bought together items for.
-   */
-  objectIDs: string[];
-
-  /**
-   * Threshold for the recommendations confidence score (between 0 and 100). Only recommendations with a greater score are returned.
-   */
-  threshold?: number;
-
-  /**
-   * The maximum number of recommendations to return.
-   */
-  limit?: number;
-
-  /**
-   * Parameters to pass to the request.
-   */
-  queryParameters?: Omit<
-    PlainSearchParameters,
-    'page' | 'hitsPerPage' | 'offset' | 'length'
-  >;
-
-  /**
-   * Whether to escape HTML tags from items string values.
-   *
-   * @default true
-   */
-  escapeHTML?: boolean;
-
-  /**
-   * Function to transform the items passed to the templates.
-   */
-  transformItems?: TransformItems<
-    Hit<THit>,
-    { results: RecommendResponse<AlgoliaHit<THit>> }
-  >;
-};
-
-export type FrequentlyBoughtTogetherWidgetDescription<
-  THit extends NonNullable<object> = BaseHit
-> = {
-  $$type: 'ais.frequentlyBoughtTogether';
-  renderState: FrequentlyBoughtTogetherRenderState<THit>;
-};
-
-export type FrequentlyBoughtTogetherConnector<
-  THit extends NonNullable<object> = BaseHit
-> = Connector<
-  FrequentlyBoughtTogetherWidgetDescription<THit>,
-  FrequentlyBoughtTogetherConnectorParams<THit>
->;
-
-export default (function connectFrequentlyBoughtTogether<
-  TWidgetParams extends UnknownWidgetParams
->(
-  renderFn: Renderer<
-    FrequentlyBoughtTogetherRenderState,
-    TWidgetParams & FrequentlyBoughtTogetherConnectorParams
-  >,
-  unmountFn: Unmounter = noop
-) {
-  checkRendering(renderFn, withUsage());
-
-  return <THit extends NonNullable<object> = BaseHit>(
-    widgetParams: TWidgetParams & FrequentlyBoughtTogetherConnectorParams<THit>
-  ) => {
-    const {
-      // @MAJOR: this can default to false
-      escapeHTML = true,
-      transformItems = ((items) => items) as NonNullable<
-        FrequentlyBoughtTogetherConnectorParams<THit>['transformItems']
-      >,
-      objectIDs,
-      limit,
-      threshold,
-      queryParameters,
-    } = widgetParams || {};
-
-    if (!objectIDs || objectIDs.length === 0) {
-      throw new Error(withUsage('The `objectIDs` option is required.'));
-    }
-
-    let sendEvent: SendEventForHits;
-
-    return {
-      dependsOn: 'recommend',
-      $$type: 'ais.frequentlyBoughtTogether',
-
-      init(initOptions) {
-        renderFn(
-          {
-            ...this.getWidgetRenderState(initOptions),
-            instantSearchInstance: initOptions.instantSearchInstance,
-          },
-          true
-        );
-      },
-
-      render(renderOptions) {
-        const renderState = this.getWidgetRenderState(renderOptions);
-
-        renderFn(
-          {
-            ...renderState,
-            instantSearchInstance: renderOptions.instantSearchInstance,
-          },
-          false
-        );
-      },
-
-      getRenderState(renderState) {
-        return renderState;
-      },
-
-      getWidgetRenderState({ results, helper, instantSearchInstance }) {
-        if (!sendEvent) {
-          sendEvent = createSendEventForHits({
-            instantSearchInstance,
-            getIndex: () => helper.getIndex(),
-            widgetType: this.$$type,
-          });
-        }
-        if (results === null || results === undefined) {
-          return { items: [], widgetParams, sendEvent };
-        }
-
-        if (escapeHTML && results.hits.length > 0) {
-          results.hits = escapeHits(results.hits);
-        }
-
-        const itemsWithAbsolutePosition = addAbsolutePosition(
-          results.hits,
-          0,
-          1
-        );
-
-        const itemsWithAbsolutePositionAndQueryID = addQueryID(
-          itemsWithAbsolutePosition,
-          results.queryID
-        );
-
-        const transformedItems = transformItems(
-          itemsWithAbsolutePositionAndQueryID,
-          {
-            results: results as RecommendResponse<AlgoliaHit<THit>>,
-          }
-        );
-
-        return {
-          items: transformedItems,
-          widgetParams,
-          sendEvent,
-        };
-      },
-
-      dispose({ recommendState }) {
-        unmountFn();
-        return recommendState.removeParams(this.$$id!);
-      },
-
-      getWidgetParameters(state) {
-        return objectIDs.reduce(
-          (acc, objectID) =>
-            acc.addFrequentlyBoughtTogether({
-              objectID,
-              threshold,
-              maxRecommendations: limit,
-              queryParameters: {
-                ...queryParameters,
-                ...(escapeHTML ? TAG_PLACEHOLDER : {}),
-              },
-              $$id: this.$$id!,
-            }),
-          state.removeParams(this.$$id!)
-        );
-      },
-    };
-  };
-} satisfies FrequentlyBoughtTogetherConnector);
diff --git a/packages/instantsearch.js/src/connectors/hits-per-page/connectHitsPerPage.ts b/packages/instantsearch.js/src/connectors/hits-per-page/connectHitsPerPage.ts
deleted file mode 100644
index 28d7f12f0b..0000000000
--- a/packages/instantsearch.js/src/connectors/hits-per-page/connectHitsPerPage.ts
+++ /dev/null
@@ -1,311 +0,0 @@
-import {
-  checkRendering,
-  warning,
-  createDocumentationMessageGenerator,
-  noop,
-} from '../../lib/utils';
-
-import type {
-  Connector,
-  TransformItems,
-  CreateURL,
-  InitOptions,
-  RenderOptions,
-  WidgetRenderState,
-  Widget,
-} from '../../types';
-import type {
-  AlgoliaSearchHelper,
-  SearchParameters,
-} from 'algoliasearch-helper';
-
-const withUsage = createDocumentationMessageGenerator({
-  name: 'hits-per-page',
-  connector: true,
-});
-
-export type HitsPerPageRenderStateItem = {
-  /**
-   * Label to display in the option.
-   */
-  label: string;
-
-  /**
-   * Number of hits to display per page.
-   */
-  value: number;
-
-  /**
-   * Indicates if it's the current refined value.
-   */
-  isRefined: boolean;
-};
-
-export type HitsPerPageConnectorParamsItem = {
-  /**
-   * Label to display in the option.
-   */
-  label: string;
-
-  /**
-   * Number of hits to display per page.
-   */
-  value: number;
-
-  /**
-   * The default hits per page on first search.
-   *
-   * @default false
-   */
-  default?: boolean;
-};
-
-export type HitsPerPageConnectorParams = {
-  /**
-   * Array of objects defining the different values and labels.
-   */
-  items: HitsPerPageConnectorParamsItem[];
-
-  /**
-   * Function to transform the items passed to the templates.
-   */
-  transformItems?: TransformItems<HitsPerPageRenderStateItem>;
-};
-
-export type HitsPerPageRenderState = {
-  /**
-   * Array of objects defining the different values and labels.
-   */
-  items: HitsPerPageRenderStateItem[];
-
-  /**
-   * Creates the URL for a single item name in the list.
-   */
-  createURL: CreateURL<HitsPerPageConnectorParamsItem['value']>;
-
-  /**
-   * Sets the number of hits per page and triggers a search.
-   */
-  refine: (value: number) => void;
-
-  /**
-   * Indicates whether or not the search has results.
-   * @deprecated Use `canRefine` instead.
-   */
-  hasNoResults: boolean;
-
-  /**
-   * Indicates if search state can be refined.
-   */
-  canRefine: boolean;
-};
-
-export type HitsPerPageWidgetDescription = {
-  $$type: 'ais.hitsPerPage';
-  renderState: HitsPerPageRenderState;
-  indexRenderState: {
-    hitsPerPage: WidgetRenderState<
-      HitsPerPageRenderState,
-      HitsPerPageConnectorParams
-    >;
-  };
-  indexUiState: {
-    hitsPerPage: number;
-  };
-};
-
-export type HitsPerPageConnector = Connector<
-  HitsPerPageWidgetDescription,
-  HitsPerPageConnectorParams
->;
-
-const connectHitsPerPage: HitsPerPageConnector = function connectHitsPerPage(
-  renderFn,
-  unmountFn = noop
-) {
-  checkRendering(renderFn, withUsage());
-
-  return (widgetParams) => {
-    const {
-      items: userItems,
-      transformItems = ((items) => items) as NonNullable<
-        HitsPerPageConnectorParams['transformItems']
-      >,
-    } = widgetParams || {};
-
-    if (!Array.isArray(userItems)) {
-      throw new Error(
-        withUsage('The `items` option expects an array of objects.')
-      );
-    }
-
-    let items = userItems;
-
-    const defaultItems = items.filter((item) => item.default === true);
-
-    if (defaultItems.length === 0) {
-      throw new Error(
-        withUsage(`A default value must be specified in \`items\`.`)
-      );
-    }
-
-    if (defaultItems.length > 1) {
-      throw new Error(
-        withUsage('More than one default value is specified in `items`.')
-      );
-    }
-
-    const defaultItem = defaultItems[0];
-
-    const normalizeItems = ({ hitsPerPage }: SearchParameters) => {
-      return items.map((item) => ({
-        ...item,
-        isRefined: Number(item.value) === Number(hitsPerPage),
-      }));
-    };
-
-    type ConnectorState = {
-      getRefine: (
-        helper: AlgoliaSearchHelper
-      ) => (value: HitsPerPageConnectorParamsItem['value']) => any;
-      createURLFactory: (props: {
-        state: SearchParameters;
-        createURL: (InitOptions | RenderOptions)['createURL'];
-        getWidgetUiState: NonNullable<Widget['getWidgetUiState']>;
-        helper: AlgoliaSearchHelper;
-      }) => HitsPerPageRenderState['createURL'];
-    };
-
-    const connectorState: ConnectorState = {
-      getRefine: (helper) => (value) => {
-        return !value && value !== 0
-          ? helper.setQueryParameter('hitsPerPage', undefined).search()
-          : helper.setQueryParameter('hitsPerPage', value).search();
-      },
-      createURLFactory:
-        ({ state, createURL, getWidgetUiState, helper }) =>
-        (value) =>
-          createURL((uiState) =>
-            getWidgetUiState(uiState, {
-              searchParameters: state
-                .resetPage()
-                .setQueryParameter(
-                  'hitsPerPage',
-                  !value && value !== 0 ? undefined : value
-                ),
-              helper,
-            })
-          ),
-    };
-
-    return {
-      $$type: 'ais.hitsPerPage',
-
-      init(initOptions) {
-        const { state, instantSearchInstance } = initOptions;
-
-        const isCurrentInOptions = items.some(
-          (item) => Number(state.hitsPerPage) === Number(item.value)
-        );
-
-        if (!isCurrentInOptions) {
-          warning(
-            state.hitsPerPage !== undefined,
-            `
-\`hitsPerPage\` is not defined.
-The option \`hitsPerPage\` needs to be set using the \`configure\` widget.
-
-Learn more: https://www.algolia.com/doc/api-reference/widgets/hits-per-page/js/
-            `
-          );
-
-          warning(
-            false,
-            `
-The \`items\` option of \`hitsPerPage\` does not contain the "hits per page" value coming from the state: ${state.hitsPerPage}.
-
-You may want to add another entry to the \`items\` option with this value.`
-          );
-
-          items = [
-            // The helper will convert the empty string to `undefined`.
-            { value: '' as unknown as number, label: '' },
-            ...items,
-          ];
-        }
-
-        renderFn(
-          {
-            ...this.getWidgetRenderState(initOptions),
-            instantSearchInstance,
-          },
-          true
-        );
-      },
-
-      render(initOptions) {
-        const { instantSearchInstance } = initOptions;
-
-        renderFn(
-          {
-            ...this.getWidgetRenderState(initOptions),
-            instantSearchInstance,
-          },
-          false
-        );
-      },
-
-      dispose({ state }) {
-        unmountFn();
-
-        return state.setQueryParameter('hitsPerPage', undefined);
-      },
-
-      getRenderState(renderState, renderOptions) {
-        return {
-          ...renderState,
-          hitsPerPage: this.getWidgetRenderState(renderOptions),
-        };
-      },
-
-      getWidgetRenderState({ state, results, createURL, helper }) {
-        const canRefine = results ? results.nbHits > 0 : false;
-
-        return {
-          items: transformItems(normalizeItems(state), { results }),
-          refine: connectorState.getRefine(helper),
-          createURL: connectorState.createURLFactory({
-            state,
-            createURL,
-            getWidgetUiState: this.getWidgetUiState,
-            helper,
-          }),
-          hasNoResults: !canRefine,
-          canRefine,
-          widgetParams,
-        };
-      },
-
-      getWidgetUiState(uiState, { searchParameters }) {
-        const hitsPerPage = searchParameters.hitsPerPage;
-
-        if (hitsPerPage === undefined || hitsPerPage === defaultItem.value) {
-          return uiState;
-        }
-
-        return {
-          ...uiState,
-          hitsPerPage,
-        };
-      },
-
-      getWidgetSearchParameters(searchParameters, { uiState }) {
-        return searchParameters.setQueryParameters({
-          hitsPerPage: uiState.hitsPerPage || defaultItem.value,
-        });
-      },
-    };
-  };
-};
-
-export default connectHitsPerPage;
diff --git a/packages/instantsearch.js/src/connectors/index.ts b/packages/instantsearch.js/src/connectors/index.ts
index d31ac83b40..dacfa90f38 100644
--- a/packages/instantsearch.js/src/connectors/index.ts
+++ b/packages/instantsearch.js/src/connectors/index.ts
@@ -1,29 +1,249 @@
-export { default as connectDynamicWidgets } from './dynamic-widgets/connectDynamicWidgets';
-export { default as connectClearRefinements } from './clear-refinements/connectClearRefinements';
-export { default as connectCurrentRefinements } from './current-refinements/connectCurrentRefinements';
-export { default as connectHierarchicalMenu } from './hierarchical-menu/connectHierarchicalMenu';
-export { default as connectHits } from './hits/connectHits';
-export { default as connectHitsPerPage } from './hits-per-page/connectHitsPerPage';
-export { default as connectInfiniteHits } from './infinite-hits/connectInfiniteHits';
-export { default as connectMenu } from './menu/connectMenu';
-export { default as connectNumericMenu } from './numeric-menu/connectNumericMenu';
-export { default as connectPagination } from './pagination/connectPagination';
-export { default as connectRange } from './range/connectRange';
-export { default as connectRefinementList } from './refinement-list/connectRefinementList';
-export { default as connectRelatedProducts } from './related-products/connectRelatedProducts';
-export { default as connectSearchBox } from './search-box/connectSearchBox';
-export { default as connectSortBy } from './sort-by/connectSortBy';
-export { default as connectRatingMenu } from './rating-menu/connectRatingMenu';
-export { default as connectStats } from './stats/connectStats';
-export { default as connectToggleRefinement } from './toggle-refinement/connectToggleRefinement';
-export { default as connectTrendingItems } from './trending-items/connectTrendingItems';
-export { default as connectBreadcrumb } from './breadcrumb/connectBreadcrumb';
-export { default as connectGeoSearch } from './geo-search/connectGeoSearch';
-export { default as connectPoweredBy } from './powered-by/connectPoweredBy';
-export { default as connectConfigure } from './configure/connectConfigure';
-export { default as connectAutocomplete } from './autocomplete/connectAutocomplete';
-export { default as connectQueryRules } from './query-rules/connectQueryRules';
-export { default as connectVoiceSearch } from './voice-search/connectVoiceSearch';
-export { default as connectRelevantSort } from './relevant-sort/connectRelevantSort';
-export { default as connectFrequentlyBoughtTogether } from './frequently-bought-together/connectFrequentlyBoughtTogether';
-export { default as connectLookingSimilar } from './looking-similar/connectLookingSimilar';
+export { connectAutocomplete } from 'instantsearch-core';
+export type {
+  AutocompleteConnector,
+  AutocompleteRenderState,
+  AutocompleteWidgetDescription,
+  AutocompleteConnectorParams,
+} from 'instantsearch-core';
+
+export { connectBreadcrumb } from 'instantsearch-core';
+export type {
+  BreadcrumbConnector,
+  BreadcrumbRenderState,
+  BreadcrumbWidgetDescription,
+  BreadcrumbConnectorParams,
+  BreadcrumbConnectorParamsItem,
+} from 'instantsearch-core';
+
+export { connectClearRefinements } from 'instantsearch-core';
+export type {
+  ClearRefinementsConnector,
+  ClearRefinementsRenderState,
+  ClearRefinementsWidgetDescription,
+  ClearRefinementsConnectorParams,
+} from 'instantsearch-core';
+
+export { connectConfigure } from 'instantsearch-core';
+export type {
+  ConfigureConnector,
+  ConfigureRenderState,
+  ConfigureWidgetDescription,
+  ConfigureConnectorParams,
+} from 'instantsearch-core';
+
+export { connectCurrentRefinements } from 'instantsearch-core';
+export type {
+  CurrentRefinementsConnector,
+  CurrentRefinementsRenderState,
+  CurrentRefinementsWidgetDescription,
+  CurrentRefinementsConnectorParams,
+  CurrentRefinementsConnectorParamsItem,
+  CurrentRefinementsConnectorParamsRefinement,
+} from 'instantsearch-core';
+
+export { connectDynamicWidgets } from 'instantsearch-core';
+export type {
+  DynamicWidgetsConnector,
+  DynamicWidgetsRenderState,
+  DynamicWidgetsWidgetDescription,
+  DynamicWidgetsConnectorParams,
+} from 'instantsearch-core';
+
+export { connectFrequentlyBoughtTogether } from 'instantsearch-core';
+export type {
+  FrequentlyBoughtTogetherConnector,
+  FrequentlyBoughtTogetherRenderState,
+  FrequentlyBoughtTogetherWidgetDescription,
+  FrequentlyBoughtTogetherConnectorParams,
+} from 'instantsearch-core';
+
+export { connectGeoSearch } from 'instantsearch-core';
+export type {
+  GeoSearchConnector,
+  GeoSearchRenderState,
+  GeoSearchWidgetDescription,
+  GeoSearchConnectorParams,
+  GeoHit,
+} from 'instantsearch-core';
+
+export { connectHierarchicalMenu } from 'instantsearch-core';
+export type {
+  HierarchicalMenuConnector,
+  HierarchicalMenuRenderState,
+  HierarchicalMenuWidgetDescription,
+  HierarchicalMenuConnectorParams,
+  HierarchicalMenuItem,
+} from 'instantsearch-core';
+
+export { connectHitsPerPage } from 'instantsearch-core';
+export type {
+  HitsPerPageConnector,
+  HitsPerPageRenderState,
+  HitsPerPageWidgetDescription,
+  HitsPerPageConnectorParams,
+  HitsPerPageConnectorParamsItem,
+} from 'instantsearch-core';
+
+export { connectHits } from 'instantsearch-core';
+export type {
+  HitsConnector,
+  HitsRenderState,
+  HitsWidgetDescription,
+  HitsConnectorParams,
+} from 'instantsearch-core';
+
+export { connectInfiniteHits } from 'instantsearch-core';
+export type {
+  InfiniteHitsConnector,
+  InfiniteHitsRenderState,
+  InfiniteHitsWidgetDescription,
+  InfiniteHitsConnectorParams,
+  InfiniteHitsCache,
+  InfiniteHitsCachedHits,
+} from 'instantsearch-core';
+
+export { connectLookingSimilar } from 'instantsearch-core';
+export type {
+  LookingSimilarConnector,
+  LookingSimilarRenderState,
+  LookingSimilarWidgetDescription,
+  LookingSimilarConnectorParams,
+} from 'instantsearch-core';
+
+export { connectMenu } from 'instantsearch-core';
+export type {
+  MenuConnector,
+  MenuRenderState,
+  MenuWidgetDescription,
+  MenuConnectorParams,
+  MenuItem,
+} from 'instantsearch-core';
+
+export { connectNumericMenu } from 'instantsearch-core';
+export type {
+  NumericMenuConnector,
+  NumericMenuRenderState,
+  NumericMenuWidgetDescription,
+  NumericMenuConnectorParams,
+} from 'instantsearch-core';
+
+export { connectPagination } from 'instantsearch-core';
+export type {
+  PaginationConnector,
+  PaginationRenderState,
+  PaginationWidgetDescription,
+  PaginationConnectorParams,
+} from 'instantsearch-core';
+
+export { connectPoweredBy } from 'instantsearch-core';
+export type {
+  PoweredByConnector,
+  PoweredByRenderState,
+  PoweredByWidgetDescription,
+  PoweredByConnectorParams,
+} from 'instantsearch-core';
+
+export { connectQueryRules } from 'instantsearch-core';
+export type {
+  QueryRulesConnector,
+  QueryRulesRenderState,
+  QueryRulesWidgetDescription,
+  QueryRulesConnectorParams,
+  ParamTrackedFilters,
+  ParamTransformRuleContexts,
+} from 'instantsearch-core';
+
+export { connectRange } from 'instantsearch-core';
+export type {
+  RangeConnector,
+  RangeRenderState,
+  RangeWidgetDescription,
+  RangeConnectorParams,
+  Range,
+  RangeBoundaries,
+} from 'instantsearch-core';
+
+export { connectRatingMenu } from 'instantsearch-core';
+export type {
+  RatingMenuConnector,
+  RatingMenuRenderState,
+  RatingMenuWidgetDescription,
+  RatingMenuConnectorParams,
+} from 'instantsearch-core';
+
+export { connectRefinementList } from 'instantsearch-core';
+export type {
+  RefinementListConnector,
+  RefinementListRenderState,
+  RefinementListWidgetDescription,
+  RefinementListConnectorParams,
+  RefinementListItem,
+} from 'instantsearch-core';
+
+export { connectRelatedProducts } from 'instantsearch-core';
+export type {
+  RelatedProductsConnector,
+  RelatedProductsRenderState,
+  RelatedProductsWidgetDescription,
+  RelatedProductsConnectorParams,
+} from 'instantsearch-core';
+
+export { connectRelevantSort } from 'instantsearch-core';
+export type {
+  RelevantSortConnector,
+  RelevantSortRenderState,
+  RelevantSortWidgetDescription,
+  RelevantSortConnectorParams,
+} from 'instantsearch-core';
+
+export { connectSearchBox } from 'instantsearch-core';
+export type {
+  SearchBoxConnector,
+  SearchBoxRenderState,
+  SearchBoxWidgetDescription,
+  SearchBoxConnectorParams,
+} from 'instantsearch-core';
+
+export { connectSortBy } from 'instantsearch-core';
+export type {
+  SortByConnector,
+  SortByRenderState,
+  SortByWidgetDescription,
+  SortByConnectorParams,
+  SortByItem,
+} from 'instantsearch-core';
+
+export { connectStats } from 'instantsearch-core';
+export type {
+  StatsConnector,
+  StatsRenderState,
+  StatsWidgetDescription,
+  StatsConnectorParams,
+} from 'instantsearch-core';
+
+export { connectToggleRefinement } from 'instantsearch-core';
+export type {
+  ToggleRefinementConnector,
+  ToggleRefinementRenderState,
+  ToggleRefinementWidgetDescription,
+  ToggleRefinementConnectorParams,
+  ToggleRefinementValue,
+} from 'instantsearch-core';
+
+export { connectTrendingItems } from 'instantsearch-core';
+export type {
+  TrendingItemsConnector,
+  TrendingItemsRenderState,
+  TrendingItemsWidgetDescription,
+  TrendingItemsConnectorParams,
+} from 'instantsearch-core';
+
+export { connectVoiceSearch } from 'instantsearch-core';
+export type {
+  VoiceSearchConnector,
+  VoiceSearchRenderState,
+  VoiceSearchWidgetDescription,
+  VoiceSearchConnectorParams,
+  VoiceListeningState,
+  CreateVoiceSearchHelper,
+} from 'instantsearch-core';
diff --git a/packages/instantsearch.js/src/connectors/pagination/connectPagination.ts b/packages/instantsearch.js/src/connectors/pagination/connectPagination.ts
deleted file mode 100644
index 93294a34db..0000000000
--- a/packages/instantsearch.js/src/connectors/pagination/connectPagination.ts
+++ /dev/null
@@ -1,207 +0,0 @@
-import {
-  checkRendering,
-  createDocumentationMessageGenerator,
-  noop,
-} from '../../lib/utils';
-
-import Paginator from './Paginator';
-
-import type { Connector, CreateURL, WidgetRenderState } from '../../types';
-
-const withUsage = createDocumentationMessageGenerator({
-  name: 'pagination',
-  connector: true,
-});
-
-export type PaginationConnectorParams = {
-  /**
-   * The total number of pages to browse.
-   */
-  totalPages?: number;
-
-  /**
-   * The padding of pages to show around the current page
-   * @default 3
-   */
-  padding?: number;
-};
-
-export type PaginationRenderState = {
-  /** Creates URLs for the next state, the number is the page to generate the URL for. */
-  createURL: CreateURL<number>;
-
-  /** Sets the current page and triggers a search. */
-  refine: (page: number) => void;
-
-  /** true if this search returned more than one page */
-  canRefine: boolean;
-
-  /** The number of the page currently displayed. */
-  currentRefinement: number;
-
-  /** The number of hits computed for the last query (can be approximated). */
-  nbHits: number;
-
-  /** The number of pages for the result set. */
-  nbPages: number;
-
-  /** The actual pages relevant to the current situation and padding. */
-  pages: number[];
-
-  /** true if the current page is also the first page. */
-  isFirstPage: boolean;
-
-  /** true if the current page is also the last page. */
-  isLastPage: boolean;
-};
-
-export type PaginationWidgetDescription = {
-  $$type: 'ais.pagination';
-  renderState: PaginationRenderState;
-  indexRenderState: {
-    pagination: WidgetRenderState<
-      PaginationRenderState,
-      PaginationConnectorParams
-    >;
-  };
-  indexUiState: {
-    page: number;
-  };
-};
-
-export type PaginationConnector = Connector<
-  PaginationWidgetDescription,
-  PaginationConnectorParams
->;
-
-/**
- * **Pagination** connector provides the logic to build a widget that will let the user
- * choose the current page of the results.
- *
- * When using the pagination with Algolia, you should be aware that the engine won't provide you pages
- * beyond the 1000th hits by default. You can find more information on the [Algolia documentation](https://www.algolia.com/doc/guides/searching/pagination/#pagination-limitations).
- */
-const connectPagination: PaginationConnector = function connectPagination(
-  renderFn,
-  unmountFn = noop
-) {
-  checkRendering(renderFn, withUsage());
-
-  return (widgetParams) => {
-    const { totalPages, padding = 3 } = widgetParams || {};
-
-    const pager = new Paginator({
-      currentPage: 0,
-      total: 0,
-      padding,
-    });
-
-    type ConnectorState = {
-      refine?: (page: number) => void;
-      createURL?: (page: number) => string;
-    };
-
-    const connectorState: ConnectorState = {};
-
-    function getMaxPage({ nbPages }: { nbPages: number }) {
-      return totalPages !== undefined ? Math.min(totalPages, nbPages) : nbPages;
-    }
-
-    return {
-      $$type: 'ais.pagination',
-
-      init(initOptions) {
-        const { instantSearchInstance } = initOptions;
-
-        renderFn(
-          {
-            ...this.getWidgetRenderState(initOptions),
-            instantSearchInstance,
-          },
-          true
-        );
-      },
-
-      render(renderOptions) {
-        const { instantSearchInstance } = renderOptions;
-
-        renderFn(
-          {
-            ...this.getWidgetRenderState(renderOptions),
-            instantSearchInstance,
-          },
-          false
-        );
-      },
-
-      dispose({ state }) {
-        unmountFn();
-
-        return state.setQueryParameter('page', undefined);
-      },
-
-      getWidgetUiState(uiState, { searchParameters }) {
-        const page = searchParameters.page || 0;
-
-        if (!page) {
-          return uiState;
-        }
-
-        return {
-          ...uiState,
-          page: page + 1,
-        };
-      },
-
-      getWidgetSearchParameters(searchParameters, { uiState }) {
-        const page = uiState.page ? uiState.page - 1 : 0;
-
-        return searchParameters.setQueryParameter('page', page);
-      },
-
-      getWidgetRenderState({ results, helper, state, createURL }) {
-        if (!connectorState.refine) {
-          connectorState.refine = (page) => {
-            helper.setPage(page);
-            helper.search();
-          };
-        }
-
-        if (!connectorState.createURL) {
-          connectorState.createURL = (page) =>
-            createURL((uiState) => ({
-              ...uiState,
-              page: page + 1,
-            }));
-        }
-
-        const page = state.page || 0;
-        const nbPages = getMaxPage(results || { nbPages: 0 });
-        pager.currentPage = page;
-        pager.total = nbPages;
-
-        return {
-          createURL: connectorState.createURL,
-          refine: connectorState.refine,
-          canRefine: nbPages > 1,
-          currentRefinement: page,
-          nbHits: results?.nbHits || 0,
-          nbPages,
-          pages: results ? pager.pages() : [],
-          isFirstPage: pager.isFirstPage(),
-          isLastPage: pager.isLastPage(),
-          widgetParams,
-        };
-      },
-
-      getRenderState(renderState, renderOptions) {
-        return {
-          ...renderState,
-          pagination: this.getWidgetRenderState(renderOptions),
-        };
-      },
-    };
-  };
-};
-
-export default connectPagination;
diff --git a/packages/instantsearch.js/src/connectors/rating-menu/connectRatingMenu.ts b/packages/instantsearch.js/src/connectors/rating-menu/connectRatingMenu.ts
deleted file mode 100644
index 1d7d5c0627..0000000000
--- a/packages/instantsearch.js/src/connectors/rating-menu/connectRatingMenu.ts
+++ /dev/null
@@ -1,498 +0,0 @@
-import {
-  checkRendering,
-  createDocumentationLink,
-  createDocumentationMessageGenerator,
-  noop,
-  warning,
-} from '../../lib/utils';
-
-import type { InsightsEvent } from '../../middlewares';
-import type {
-  Connector,
-  InstantSearch,
-  CreateURL,
-  WidgetRenderState,
-  Widget,
-  InitOptions,
-  RenderOptions,
-  IndexUiState,
-} from '../../types';
-import type {
-  AlgoliaSearchHelper,
-  SearchParameters,
-  SearchResults,
-} from 'algoliasearch-helper';
-
-const withUsage = createDocumentationMessageGenerator({
-  name: 'rating-menu',
-  connector: true,
-});
-
-const $$type = 'ais.ratingMenu';
-
-const MAX_VALUES_PER_FACET_API_LIMIT = 1000;
-const STEP = 1;
-
-type SendEvent = (...args: [InsightsEvent] | [string, string, string?]) => void;
-
-type CreateSendEvent = (createSendEventArgs: {
-  instantSearchInstance: InstantSearch;
-  helper: AlgoliaSearchHelper;
-  getRefinedStar: () => number | number[] | undefined;
-  attribute: string;
-}) => SendEvent;
-
-const createSendEvent: CreateSendEvent =
-  ({ instantSearchInstance, helper, getRefinedStar, attribute }) =>
-  (...args) => {
-    if (args.length === 1) {
-      instantSearchInstance.sendEventToInsights(args[0]);
-      return;
-    }
-    const [, facetValue, eventName = 'Filter Applied'] = args;
-    const [eventType, eventModifier] = args[0].split(':');
-    if (eventType !== 'click') {
-      return;
-    }
-    const isRefined = getRefinedStar() === Number(facetValue);
-    if (!isRefined) {
-      instantSearchInstance.sendEventToInsights({
-        insightsMethod: 'clickedFilters',
-        widgetType: $$type,
-        eventType,
-        eventModifier,
-        payload: {
-          eventName,
-          index: helper.getIndex(),
-          filters: [`${attribute}>=${facetValue}`],
-        },
-        attribute,
-      });
-    }
-  };
-
-type StarRatingItems = {
-  /**
-   * Name corresponding to the number of stars.
-   */
-  name: string;
-  /**
-   * Human-readable name corresponding to the number of stars.
-   */
-  label: string;
-  /**
-   * Number of stars as string.
-   */
-  value: string;
-  /**
-   * Count of matched results corresponding to the number of stars.
-   */
-  count: number;
-  /**
-   *  Array of length of maximum rating value with stars to display or not.
-   */
-  stars: boolean[];
-  /**
-   * Indicates if star rating refinement is applied.
-   */
-  isRefined: boolean;
-};
-
-export type RatingMenuConnectorParams = {
-  /**
-   * Name of the attribute for faceting (eg. "free_shipping").
-   */
-  attribute: string;
-
-  /**
-   * The maximum rating value.
-   */
-  max?: number;
-};
-
-export type RatingMenuRenderState = {
-  /**
-   * Possible star ratings the user can apply.
-   */
-  items: StarRatingItems[];
-
-  /**
-   * Creates an URL for the next state (takes the item value as parameter). Takes the value of an item as parameter.
-   */
-  createURL: CreateURL<string>;
-
-  /**
-   *  Indicates if search state can be refined.
-   */
-  canRefine: boolean;
-
-  /**
-   * Selects a rating to filter the results (takes the filter value as parameter). Takes the value of an item as parameter.
-   */
-  refine: (value: string) => void;
-
-  /**
-   * `true` if the last search contains no result.
-   *
-   * @deprecated Use `canRefine` instead.
-   */
-  hasNoResults: boolean;
-
-  /**
-   * Send event to insights middleware
-   */
-  sendEvent: SendEvent;
-};
-
-export type RatingMenuWidgetDescription = {
-  $$type: 'ais.ratingMenu';
-  renderState: RatingMenuRenderState;
-  indexRenderState: {
-    ratingMenu: {
-      [attribute: string]: WidgetRenderState<
-        RatingMenuRenderState,
-        RatingMenuConnectorParams
-      >;
-    };
-  };
-  indexUiState: {
-    ratingMenu: {
-      [attribute: string]: number | undefined;
-    };
-  };
-};
-
-export type RatingMenuConnector = Connector<
-  RatingMenuWidgetDescription,
-  RatingMenuConnectorParams
->;
-
-/**
- * **StarRating** connector provides the logic to build a custom widget that will let
- * the user refine search results based on ratings.
- *
- * The connector provides to the rendering: `refine()` to select a value and
- * `items` that are the values that can be selected. `refine` should be used
- * with `items.value`.
- */
-const connectRatingMenu: RatingMenuConnector = function connectRatingMenu(
-  renderFn,
-  unmountFn = noop
-) {
-  checkRendering(renderFn, withUsage());
-
-  return (widgetParams) => {
-    const { attribute, max = 5 } = widgetParams || {};
-    let sendEvent: SendEvent;
-
-    if (!attribute) {
-      throw new Error(withUsage('The `attribute` option is required.'));
-    }
-
-    const getRefinedStar = (state: SearchParameters) => {
-      const values = state.getNumericRefinements(attribute);
-
-      if (!values['>=']?.length) {
-        return undefined;
-      }
-
-      return values['>='][0];
-    };
-
-    const getFacetsMaxDecimalPlaces = (
-      facetResults: SearchResults.FacetValue[]
-    ) => {
-      let maxDecimalPlaces = 0;
-      facetResults.forEach((facetResult) => {
-        const [, decimal = ''] = facetResult.name.split('.');
-        maxDecimalPlaces = Math.max(maxDecimalPlaces, decimal.length);
-      });
-      return maxDecimalPlaces;
-    };
-
-    const getFacetValuesWarningMessage = ({
-      maxDecimalPlaces,
-      maxFacets,
-      maxValuesPerFacet,
-    }: {
-      maxDecimalPlaces: number;
-      maxFacets: number;
-      maxValuesPerFacet: number;
-    }) => {
-      const maxDecimalPlacesInRange = Math.max(
-        0,
-        Math.floor(Math.log10(MAX_VALUES_PER_FACET_API_LIMIT / max))
-      );
-      const maxFacetsInRange = Math.min(
-        MAX_VALUES_PER_FACET_API_LIMIT,
-        Math.pow(10, maxDecimalPlacesInRange) * max
-      );
-
-      const solutions: string[] = [];
-
-      if (maxFacets > MAX_VALUES_PER_FACET_API_LIMIT) {
-        solutions.push(
-          `- Update your records to lower the precision of the values in the "${attribute}" attribute (for example: ${(5.123456789).toPrecision(
-            maxDecimalPlaces + 1
-          )} to ${(5.123456789).toPrecision(maxDecimalPlacesInRange + 1)})`
-        );
-      }
-      if (maxValuesPerFacet < maxFacetsInRange) {
-        solutions.push(
-          `- Increase the maximum number of facet values to ${maxFacetsInRange} using the "configure" widget ${createDocumentationLink(
-            { name: 'configure' }
-          )} and the "maxValuesPerFacet" parameter https://www.algolia.com/doc/api-reference/api-parameters/maxValuesPerFacet/`
-        );
-      }
-
-      return `The ${attribute} attribute can have ${maxFacets} different values (0 to ${max} with a maximum of ${maxDecimalPlaces} decimals = ${maxFacets}) but you retrieved only ${maxValuesPerFacet} facet values. Therefore the number of results that match the refinements can be incorrect.
-    ${
-      solutions.length
-        ? `To resolve this problem you can:\n${solutions.join('\n')}`
-        : ``
-    }`;
-    };
-
-    function getRefinedState(state: SearchParameters, facetValue: string) {
-      const isRefined = getRefinedStar(state) === Number(facetValue);
-
-      const emptyState = state.resetPage().removeNumericRefinement(attribute);
-
-      if (!isRefined) {
-        return emptyState
-          .addNumericRefinement(attribute, '<=', max)
-          .addNumericRefinement(attribute, '>=', Number(facetValue));
-      }
-      return emptyState;
-    }
-
-    const toggleRefinement = (
-      helper: AlgoliaSearchHelper,
-      facetValue: string
-    ) => {
-      sendEvent('click:internal', facetValue);
-      helper.setState(getRefinedState(helper.state, facetValue)).search();
-    };
-
-    type ConnectorState = {
-      toggleRefinementFactory: (
-        helper: AlgoliaSearchHelper
-      ) => (facetValue: string) => void;
-      createURLFactory: ({
-        state,
-        createURL,
-      }: {
-        state: SearchParameters;
-        createURL: (InitOptions | RenderOptions)['createURL'];
-        getWidgetUiState: NonNullable<Widget['getWidgetUiState']>;
-        helper: AlgoliaSearchHelper;
-      }) => (value: string) => string;
-    };
-
-    const connectorState: ConnectorState = {
-      toggleRefinementFactory: (helper) => toggleRefinement.bind(null, helper),
-      createURLFactory:
-        ({ state, createURL, getWidgetUiState, helper }) =>
-        (value) =>
-          createURL((uiState) =>
-            getWidgetUiState(uiState, {
-              searchParameters: getRefinedState(state, value),
-              helper,
-            })
-          ),
-    };
-
-    return {
-      $$type,
-
-      init(initOptions) {
-        const { instantSearchInstance } = initOptions;
-
-        renderFn(
-          {
-            ...this.getWidgetRenderState(initOptions),
-            instantSearchInstance,
-          },
-          true
-        );
-      },
-
-      render(renderOptions) {
-        const { instantSearchInstance } = renderOptions;
-
-        renderFn(
-          {
-            ...this.getWidgetRenderState(renderOptions),
-            instantSearchInstance,
-          },
-          false
-        );
-      },
-
-      getRenderState(renderState, renderOptions) {
-        return {
-          ...renderState,
-          ratingMenu: {
-            ...renderState.ratingMenu,
-            [attribute]: this.getWidgetRenderState(renderOptions),
-          },
-        };
-      },
-
-      getWidgetRenderState({
-        helper,
-        results,
-        state,
-        instantSearchInstance,
-        createURL,
-      }) {
-        let facetValues: StarRatingItems[] = [];
-
-        if (!sendEvent) {
-          sendEvent = createSendEvent({
-            instantSearchInstance,
-            helper,
-            getRefinedStar: () => getRefinedStar(helper.state),
-            attribute,
-          });
-        }
-
-        let refinementIsApplied = false;
-        let totalCount = 0;
-
-        const facetResults = results?.getFacetValues(attribute, {}) as
-          | SearchResults.FacetValue[]
-          | undefined;
-
-        if (results && facetResults) {
-          const maxValuesPerFacet = facetResults.length;
-          const maxDecimalPlaces = getFacetsMaxDecimalPlaces(facetResults);
-          const maxFacets = Math.pow(10, maxDecimalPlaces) * max;
-
-          warning(
-            maxFacets <= maxValuesPerFacet || Boolean(results.__isArtificial),
-            getFacetValuesWarningMessage({
-              maxDecimalPlaces,
-              maxFacets,
-              maxValuesPerFacet,
-            })
-          );
-
-          const refinedStar = getRefinedStar(state);
-
-          for (let star = STEP; star < max; star += STEP) {
-            const isRefined = refinedStar === star;
-            refinementIsApplied = refinementIsApplied || isRefined;
-
-            const count = facetResults
-              .filter((f) => Number(f.name) >= star && Number(f.name) <= max)
-              .map((f) => f.count)
-              .reduce((sum, current) => sum + current, 0);
-            totalCount += count;
-
-            if (refinedStar && !isRefined && count === 0) {
-              // skip count==0 when at least 1 refinement is enabled
-              // eslint-disable-next-line no-continue
-              continue;
-            }
-
-            const stars = [...new Array(Math.floor(max / STEP))].map(
-              (_v, i) => i * STEP < star
-            );
-
-            facetValues.push({
-              stars,
-              name: String(star),
-              label: String(star),
-              value: String(star),
-              count,
-              isRefined,
-            });
-          }
-        }
-        facetValues = facetValues.reverse();
-
-        const hasNoResults = results ? results.nbHits === 0 : true;
-
-        return {
-          items: facetValues,
-          hasNoResults,
-          canRefine: (!hasNoResults || refinementIsApplied) && totalCount > 0,
-          refine: connectorState.toggleRefinementFactory(helper),
-          sendEvent,
-          createURL: connectorState.createURLFactory({
-            state,
-            createURL,
-            helper,
-            getWidgetUiState: this.getWidgetUiState,
-          }),
-          widgetParams,
-        };
-      },
-
-      dispose({ state }) {
-        unmountFn();
-
-        return state.removeNumericRefinement(attribute);
-      },
-
-      getWidgetUiState(uiState, { searchParameters }) {
-        const value = getRefinedStar(searchParameters);
-
-        return removeEmptyRefinementsFromUiState(
-          {
-            ...uiState,
-            ratingMenu: {
-              ...uiState.ratingMenu,
-              [attribute]: typeof value === 'number' ? value : undefined,
-            },
-          },
-          attribute
-        );
-      },
-
-      getWidgetSearchParameters(searchParameters, { uiState }) {
-        const value = uiState.ratingMenu && uiState.ratingMenu[attribute];
-
-        const withDisjunctiveFacet = searchParameters
-          .addDisjunctiveFacet(attribute)
-          .removeNumericRefinement(attribute)
-          .removeDisjunctiveFacetRefinement(attribute);
-
-        if (!value) {
-          return withDisjunctiveFacet.setQueryParameters({
-            numericRefinements: {
-              ...withDisjunctiveFacet.numericRefinements,
-              [attribute]: {},
-            },
-          });
-        }
-
-        return withDisjunctiveFacet
-          .addNumericRefinement(attribute, '<=', max)
-          .addNumericRefinement(attribute, '>=', value);
-      },
-    };
-  };
-};
-
-function removeEmptyRefinementsFromUiState(
-  indexUiState: IndexUiState,
-  attribute: string
-): IndexUiState {
-  if (!indexUiState.ratingMenu) {
-    return indexUiState;
-  }
-
-  if (typeof indexUiState.ratingMenu[attribute] !== 'number') {
-    delete indexUiState.ratingMenu[attribute];
-  }
-
-  if (Object.keys(indexUiState.ratingMenu).length === 0) {
-    delete indexUiState.ratingMenu;
-  }
-
-  return indexUiState;
-}
-
-export default connectRatingMenu;
diff --git a/packages/instantsearch.js/src/connectors/relevant-sort/connectRelevantSort.ts b/packages/instantsearch.js/src/connectors/relevant-sort/connectRelevantSort.ts
deleted file mode 100644
index e118b10555..0000000000
--- a/packages/instantsearch.js/src/connectors/relevant-sort/connectRelevantSort.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-import { noop } from '../../lib/utils';
-
-import type { Connector, WidgetRenderState } from '../../types';
-
-export type RelevantSortConnectorParams = Record<string, unknown>;
-
-type Refine = (relevancyStrictness: number | undefined) => void;
-
-export type RelevantSortRenderState = {
-  /**
-   * Indicates if it has appliedRelevancyStrictness greater than zero
-   */
-  isRelevantSorted: boolean;
-
-  /**
-   * Indicates if the results come from a virtual replica
-   */
-  isVirtualReplica: boolean;
-
-  /**
-   * Indicates if search state can be refined
-   */
-  canRefine: boolean;
-
-  /**
-   * Sets the value as relevancyStrictness and trigger a new search
-   */
-  refine: Refine;
-};
-
-export type RelevantSortWidgetDescription = {
-  $$type: 'ais.relevantSort';
-  renderState: RelevantSortRenderState;
-  indexRenderState: {
-    relevantSort: WidgetRenderState<
-      RelevantSortRenderState,
-      RelevantSortConnectorParams
-    >;
-  };
-  indexUiState: {
-    relevantSort: number;
-  };
-};
-
-export type RelevantSortConnector = Connector<
-  RelevantSortWidgetDescription,
-  RelevantSortConnectorParams
->;
-
-const connectRelevantSort: RelevantSortConnector = function connectRelevantSort(
-  renderFn = noop,
-  unmountFn = noop
-) {
-  return (widgetParams) => {
-    type ConnectorState = {
-      refine?: Refine;
-    };
-
-    const connectorState: ConnectorState = {};
-
-    return {
-      $$type: 'ais.relevantSort',
-
-      init(initOptions) {
-        const { instantSearchInstance } = initOptions;
-        renderFn(
-          {
-            ...this.getWidgetRenderState(initOptions),
-            instantSearchInstance,
-          },
-          true
-        );
-      },
-
-      render(renderOptions) {
-        const { instantSearchInstance } = renderOptions;
-
-        renderFn(
-          {
-            ...this.getWidgetRenderState(renderOptions),
-            instantSearchInstance,
-          },
-          false
-        );
-      },
-
-      dispose({ state }) {
-        unmountFn();
-
-        return state.setQueryParameter('relevancyStrictness', undefined);
-      },
-
-      getRenderState(renderState, renderOptions) {
-        return {
-          ...renderState,
-          relevantSort: this.getWidgetRenderState(renderOptions),
-        };
-      },
-
-      getWidgetRenderState({ results, helper }) {
-        if (!connectorState.refine) {
-          connectorState.refine = (relevancyStrictness) => {
-            helper
-              .setQueryParameter('relevancyStrictness', relevancyStrictness)
-              .search();
-          };
-        }
-
-        const { appliedRelevancyStrictness } = results || {};
-
-        const isVirtualReplica = appliedRelevancyStrictness !== undefined;
-
-        return {
-          isRelevantSorted:
-            typeof appliedRelevancyStrictness !== 'undefined' &&
-            appliedRelevancyStrictness > 0,
-          isVirtualReplica,
-          canRefine: isVirtualReplica,
-          refine: connectorState.refine,
-          widgetParams,
-        };
-      },
-
-      getWidgetSearchParameters(state, { uiState }) {
-        return state.setQueryParameter(
-          'relevancyStrictness',
-          uiState.relevantSort ?? state.relevancyStrictness
-        );
-      },
-
-      getWidgetUiState(uiState, { searchParameters }) {
-        return {
-          ...uiState,
-          relevantSort:
-            searchParameters.relevancyStrictness || uiState.relevantSort,
-        };
-      },
-    };
-  };
-};
-
-export default connectRelevantSort;
diff --git a/packages/instantsearch.js/src/connectors/toggle-refinement/types.ts b/packages/instantsearch.js/src/connectors/toggle-refinement/types.ts
deleted file mode 100644
index 5ebbd8461b..0000000000
--- a/packages/instantsearch.js/src/connectors/toggle-refinement/types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export type {
-  /** @deprecated import from connectToggleRefinement directly */
-  ToggleRefinementConnector,
-  /** @deprecated import from connectToggleRefinement directly */
-  ToggleRefinementWidgetDescription,
-} from './connectToggleRefinement';
diff --git a/packages/instantsearch.js/src/connectors/voice-search/connectVoiceSearch.ts b/packages/instantsearch.js/src/connectors/voice-search/connectVoiceSearch.ts
deleted file mode 100644
index ad252d07f7..0000000000
--- a/packages/instantsearch.js/src/connectors/voice-search/connectVoiceSearch.ts
+++ /dev/null
@@ -1,222 +0,0 @@
-import {
-  checkRendering,
-  createDocumentationMessageGenerator,
-  noop,
-} from '../../lib/utils';
-import builtInCreateVoiceSearchHelper from '../../lib/voiceSearchHelper';
-
-import type {
-  CreateVoiceSearchHelper,
-  VoiceListeningState,
-} from '../../lib/voiceSearchHelper/types';
-import type { Connector, WidgetRenderState } from '../../types';
-import type { PlainSearchParameters } from 'algoliasearch-helper';
-
-const withUsage = createDocumentationMessageGenerator({
-  name: 'voice-search',
-  connector: true,
-});
-
-export type VoiceSearchConnectorParams = {
-  searchAsYouSpeak?: boolean;
-  language?: string;
-  additionalQueryParameters?: (params: {
-    query: string;
-  }) => PlainSearchParameters | void;
-  createVoiceSearchHelper?: CreateVoiceSearchHelper;
-};
-
-export type VoiceSearchRenderState = {
-  isBrowserSupported: boolean;
-  isListening: boolean;
-  toggleListening: () => void;
-  voiceListeningState: VoiceListeningState;
-};
-
-export type VoiceSearchWidgetDescription = {
-  $$type: 'ais.voiceSearch';
-  renderState: VoiceSearchRenderState;
-  indexRenderState: {
-    voiceSearch: WidgetRenderState<
-      VoiceSearchRenderState,
-      VoiceSearchConnectorParams
-    >;
-  };
-  indexUiState: {
-    query: string;
-  };
-};
-
-export type VoiceSearchConnector = Connector<
-  VoiceSearchWidgetDescription,
-  VoiceSearchConnectorParams
->;
-
-const connectVoiceSearch: VoiceSearchConnector = function connectVoiceSearch(
-  renderFn,
-  unmountFn = noop
-) {
-  checkRendering(renderFn, withUsage());
-
-  return (widgetParams) => {
-    const {
-      searchAsYouSpeak = false,
-      language,
-      additionalQueryParameters,
-      createVoiceSearchHelper = builtInCreateVoiceSearchHelper,
-    } = widgetParams;
-
-    return {
-      $$type: 'ais.voiceSearch',
-
-      init(initOptions) {
-        const { instantSearchInstance } = initOptions;
-        renderFn(
-          {
-            ...this.getWidgetRenderState(initOptions),
-            instantSearchInstance,
-          },
-          true
-        );
-      },
-
-      render(renderOptions) {
-        const { instantSearchInstance } = renderOptions;
-        renderFn(
-          {
-            ...this.getWidgetRenderState(renderOptions),
-            instantSearchInstance,
-          },
-          false
-        );
-      },
-
-      getRenderState(renderState, renderOptions) {
-        return {
-          ...renderState,
-          voiceSearch: this.getWidgetRenderState(renderOptions),
-        };
-      },
-
-      getWidgetRenderState(renderOptions) {
-        const { helper, instantSearchInstance } = renderOptions;
-        if (!(this as any)._refine) {
-          (this as any)._refine = (query: string): void => {
-            if (query !== helper.state.query) {
-              const queryLanguages = language
-                ? [language.split('-')[0]]
-                : undefined;
-              // @ts-ignore queryLanguages is allowed to be a string, not just an array
-              helper.setQueryParameter('queryLanguages', queryLanguages);
-
-              if (typeof additionalQueryParameters === 'function') {
-                helper.setState(
-                  helper.state.setQueryParameters({
-                    ignorePlurals: true,
-                    removeStopWords: true,
-                    // @ts-ignore optionalWords is allowed to be a string too
-                    optionalWords: query,
-                    ...additionalQueryParameters({ query }),
-                  })
-                );
-              }
-
-              helper.setQuery(query).search();
-            }
-          };
-        }
-
-        if (!(this as any)._voiceSearchHelper) {
-          (this as any)._voiceSearchHelper = createVoiceSearchHelper({
-            searchAsYouSpeak,
-            language,
-            onQueryChange: (query) => (this as any)._refine(query),
-            onStateChange: () => {
-              renderFn(
-                {
-                  ...this.getWidgetRenderState(renderOptions),
-                  instantSearchInstance,
-                },
-                false
-              );
-            },
-          });
-        }
-
-        const {
-          isBrowserSupported,
-          isListening,
-          startListening,
-          stopListening,
-          getState,
-        } = (this as any)._voiceSearchHelper;
-
-        return {
-          isBrowserSupported: isBrowserSupported(),
-          isListening: isListening(),
-          toggleListening() {
-            if (!isBrowserSupported()) {
-              return;
-            }
-            if (isListening()) {
-              stopListening();
-            } else {
-              startListening();
-            }
-          },
-          voiceListeningState: getState(),
-          widgetParams,
-        };
-      },
-
-      dispose({ state }) {
-        (this as any)._voiceSearchHelper.dispose();
-
-        unmountFn();
-
-        let newState = state;
-        if (typeof additionalQueryParameters === 'function') {
-          const additional = additionalQueryParameters({ query: '' });
-          const toReset = additional
-            ? (
-                Object.keys(additional) as Array<keyof PlainSearchParameters>
-              ).reduce<PlainSearchParameters>((acc, current) => {
-                // @ts-ignore search parameters is typed as readonly in v4
-                acc[current] = undefined;
-                return acc;
-              }, {})
-            : {};
-          newState = state.setQueryParameters({
-            // @ts-ignore (queryLanguages is not added to algoliasearch v3)
-            queryLanguages: undefined,
-            ignorePlurals: undefined,
-            removeStopWords: undefined,
-            optionalWords: undefined,
-            ...toReset,
-          });
-        }
-
-        return newState.setQueryParameter('query', undefined);
-      },
-
-      getWidgetUiState(uiState, { searchParameters }) {
-        const query = searchParameters.query || '';
-
-        if (!query) {
-          return uiState;
-        }
-
-        return {
-          ...uiState,
-          query,
-        };
-      },
-
-      getWidgetSearchParameters(searchParameters, { uiState }) {
-        return searchParameters.setQueryParameter('query', uiState.query || '');
-      },
-    };
-  };
-};
-
-export default connectVoiceSearch;
diff --git a/packages/instantsearch.js/src/helpers/components/__tests__/Highlight.test.tsx b/packages/instantsearch.js/src/helpers/components/__tests__/Highlight.test.tsx
index 71bc65d341..6559472398 100644
--- a/packages/instantsearch.js/src/helpers/components/__tests__/Highlight.test.tsx
+++ b/packages/instantsearch.js/src/helpers/components/__tests__/Highlight.test.tsx
@@ -343,7 +343,7 @@ describe('Highlight', () => {
         />
       );
     })
-      .toWarnDev(`[InstantSearch.js]: Could not enable highlight for "does.not.exist", will display an empty string.
+      .toWarnDev(`[InstantSearch]: Could not enable highlight for "does.not.exist", will display an empty string.
 Please check whether this attribute exists and is either searchable or specified in \`attributesToHighlight\`.
 
 See: https://alg.li/highlighting`);
@@ -370,7 +370,7 @@ See: https://alg.li/highlighting`);
         />
       );
     })
-      .toWarnDev(`[InstantSearch.js]: Could not enable highlight for "title", will display an empty string.
+      .toWarnDev(`[InstantSearch]: Could not enable highlight for "title", will display an empty string.
 Please check whether this attribute exists and is either searchable or specified in \`attributesToHighlight\`.
 
 See: https://alg.li/highlighting`);
diff --git a/packages/instantsearch.js/src/helpers/components/__tests__/ReverseHighlight.test.tsx b/packages/instantsearch.js/src/helpers/components/__tests__/ReverseHighlight.test.tsx
index 5de478a4cb..dc7c94ceaa 100644
--- a/packages/instantsearch.js/src/helpers/components/__tests__/ReverseHighlight.test.tsx
+++ b/packages/instantsearch.js/src/helpers/components/__tests__/ReverseHighlight.test.tsx
@@ -343,7 +343,7 @@ describe('ReverseHighlight', () => {
         />
       );
     })
-      .toWarnDev(`[InstantSearch.js]: Could not enable highlight for "does.not.exist", will display an empty string.
+      .toWarnDev(`[InstantSearch]: Could not enable highlight for "does.not.exist", will display an empty string.
 Please check whether this attribute exists and is either searchable or specified in \`attributesToHighlight\`.
 
 See: https://alg.li/highlighting`);
@@ -370,7 +370,7 @@ See: https://alg.li/highlighting`);
         />
       );
     })
-      .toWarnDev(`[InstantSearch.js]: Could not enable highlight for "title", will display an empty string.
+      .toWarnDev(`[InstantSearch]: Could not enable highlight for "title", will display an empty string.
 Please check whether this attribute exists and is either searchable or specified in \`attributesToHighlight\`.
 
 See: https://alg.li/highlighting`);
diff --git a/packages/instantsearch.js/src/helpers/components/__tests__/ReverseSnippet.test.tsx b/packages/instantsearch.js/src/helpers/components/__tests__/ReverseSnippet.test.tsx
index b364cb542f..cbb93bfd75 100644
--- a/packages/instantsearch.js/src/helpers/components/__tests__/ReverseSnippet.test.tsx
+++ b/packages/instantsearch.js/src/helpers/components/__tests__/ReverseSnippet.test.tsx
@@ -337,7 +337,7 @@ describe('Snippet', () => {
         />
       );
     })
-      .toWarnDev(`[InstantSearch.js]: Could not enable snippet for "does.not.exist", will display an empty string.
+      .toWarnDev(`[InstantSearch]: Could not enable snippet for "does.not.exist", will display an empty string.
 Please check whether this attribute exists and is specified in \`attributesToSnippet\`.
 
 See: https://alg.li/highlighting`);
@@ -363,7 +363,7 @@ See: https://alg.li/highlighting`);
         />
       );
     })
-      .toWarnDev(`[InstantSearch.js]: Could not enable snippet for "title", will display an empty string.
+      .toWarnDev(`[InstantSearch]: Could not enable snippet for "title", will display an empty string.
 Please check whether this attribute exists and is specified in \`attributesToSnippet\`.
 
 See: https://alg.li/highlighting`);
diff --git a/packages/instantsearch.js/src/helpers/components/__tests__/Snippet.test.tsx b/packages/instantsearch.js/src/helpers/components/__tests__/Snippet.test.tsx
index 8dddd1b04c..701062926e 100644
--- a/packages/instantsearch.js/src/helpers/components/__tests__/Snippet.test.tsx
+++ b/packages/instantsearch.js/src/helpers/components/__tests__/Snippet.test.tsx
@@ -337,7 +337,7 @@ describe('Snippet', () => {
         />
       );
     })
-      .toWarnDev(`[InstantSearch.js]: Could not enable snippet for "does.not.exist", will display an empty string.
+      .toWarnDev(`[InstantSearch]: Could not enable snippet for "does.not.exist", will display an empty string.
 Please check whether this attribute exists and is specified in \`attributesToSnippet\`.
 
 See: https://alg.li/highlighting`);
@@ -363,7 +363,7 @@ See: https://alg.li/highlighting`);
         />
       );
     })
-      .toWarnDev(`[InstantSearch.js]: Could not enable snippet for "title", will display an empty string.
+      .toWarnDev(`[InstantSearch]: Could not enable snippet for "title", will display an empty string.
 Please check whether this attribute exists and is specified in \`attributesToSnippet\`.
 
 See: https://alg.li/highlighting`);
diff --git a/packages/instantsearch.js/src/index.es.ts b/packages/instantsearch.js/src/index.es.ts
index e81b32637b..e5d6580c60 100644
--- a/packages/instantsearch.js/src/index.es.ts
+++ b/packages/instantsearch.js/src/index.es.ts
@@ -1,8 +1,7 @@
 import InstantSearch from './lib/InstantSearch';
 import version from './lib/version';
 
-import type { InstantSearchOptions } from './lib/InstantSearch';
-import type { Expand, UiState } from './types';
+import type { Expand, InstantSearchOptions, UiState } from 'instantsearch-core';
 
 type InstantSearchModule = {
   <TUiState = Record<string, unknown>, TRouteState = TUiState>(
@@ -26,9 +25,9 @@ type InstantSearchModule = {
  * If you want to get up and running quickly with InstantSearch.js, have a
  * look at the [getting started](https://www.algolia.com/doc/guides/building-search-ui/getting-started/js/).
  */
-const instantsearch: InstantSearchModule = (options) =>
-  new InstantSearch(options);
-
+const instantsearch: InstantSearchModule = function instantsearch(options) {
+  return new InstantSearch(options);
+};
 instantsearch.version = version;
 
 Object.defineProperty(instantsearch, 'widgets', {
@@ -69,4 +68,4 @@ import { carousel } from 'instantsearch.js/es/templates'`
 
 export default instantsearch;
 
-export * from './types';
+export type * from './types';
diff --git a/packages/instantsearch.js/src/index.ts b/packages/instantsearch.js/src/index.ts
index f85fa58b3a..0d20530e13 100644
--- a/packages/instantsearch.js/src/index.ts
+++ b/packages/instantsearch.js/src/index.ts
@@ -1,15 +1,14 @@
-import * as connectors from './connectors/index';
+import * as connectors from './connectors';
 import { createInfiniteHitsSessionStorageCache } from './lib/infiniteHitsCache/index';
 import InstantSearch from './lib/InstantSearch';
 import * as routers from './lib/routers/index';
 import * as stateMappings from './lib/stateMappings/index';
 import version from './lib/version';
-import * as middlewares from './middlewares/index';
+import * as middlewares from './middlewares';
 import * as templates from './templates/index';
 import * as widgets from './widgets/index';
 
-import type { InstantSearchOptions } from './lib/InstantSearch';
-import type { Expand, UiState } from './types';
+import type { Expand, UiState, InstantSearchOptions } from 'instantsearch-core';
 
 type InstantSearchModule = {
   <TUiState = Record<string, unknown>, TRouteState = TUiState>(
@@ -43,19 +42,16 @@ type InstantSearchModule = {
  * If you want to get up and running quickly with InstantSearch.js, have a
  * look at the [getting started](https://www.algolia.com/doc/guides/building-search-ui/getting-started/js/).
  */
-const instantsearch: InstantSearchModule = (options) =>
-  new InstantSearch(options);
-
+const instantsearch: InstantSearchModule = function instantsearch(options) {
+  return new InstantSearch(options);
+};
 instantsearch.version = version;
-
 instantsearch.connectors = connectors;
 instantsearch.widgets = widgets;
 instantsearch.middlewares = middlewares;
-
 instantsearch.routers = routers;
 instantsearch.stateMappings = stateMappings;
 instantsearch.templates = templates;
-
 instantsearch.createInfiniteHitsSessionStorageCache =
   createInfiniteHitsSessionStorageCache;
 
diff --git a/packages/instantsearch.js/src/lib/InstantSearch.ts b/packages/instantsearch.js/src/lib/InstantSearch.ts
index 0ddb0cfe8a..bbcb13c4e1 100644
--- a/packages/instantsearch.js/src/lib/InstantSearch.ts
+++ b/packages/instantsearch.js/src/lib/InstantSearch.ts
@@ -1,887 +1,16 @@
-import EventEmitter from '@algolia/events';
-import algoliasearchHelper from 'algoliasearch-helper';
+export { INSTANTSEARCH_FUTURE_DEFAULTS } from 'instantsearch-core';
+import { InstantSearch as _InstantSearchClass } from 'instantsearch-core';
 
-import { createInsightsMiddleware } from '../middlewares/createInsightsMiddleware';
-import {
-  createMetadataMiddleware,
-  isMetadataEnabled,
-} from '../middlewares/createMetadataMiddleware';
-import { createRouterMiddleware } from '../middlewares/createRouterMiddleware';
-import index from '../widgets/index/index';
-
-import {
-  createDocumentationMessageGenerator,
-  createDocumentationLink,
-  defer,
-  hydrateRecommendCache,
-  hydrateSearchClient,
-  noop,
-  warning,
-  setIndexHelperState,
-  isIndexWidget,
-} from './utils';
 import version from './version';
 
-import type {
-  InsightsEvent,
-  InsightsProps,
-} from '../middlewares/createInsightsMiddleware';
-import type { RouterProps } from '../middlewares/createRouterMiddleware';
-import type {
-  InsightsClient as AlgoliaInsightsClient,
-  SearchClient,
-  Widget,
-  IndexWidget,
-  UiState,
-  CreateURL,
-  Middleware,
-  MiddlewareDefinition,
-  RenderState,
-  InitialResults,
-  CompositionClient,
-} from '../types';
-import type { AlgoliaSearchHelper } from 'algoliasearch-helper';
-
-const withUsage = createDocumentationMessageGenerator({
-  name: 'instantsearch',
-});
-
-function defaultCreateURL() {
-  return '#';
-}
-
-// this purposely breaks typescript's type inference to ensure it's not used
-// as it's used for a default parameter for example
-// source: https://github.com/Microsoft/TypeScript/issues/14829#issuecomment-504042546
-type NoInfer<T> = T extends infer S ? S : never;
+import type { InstantSearchOptions, UiState } from 'instantsearch-core';
 
-/**
- * Global options for an InstantSearch instance.
- */
-export type InstantSearchOptions<
+export default class InstantSearch<
   TUiState extends UiState = UiState,
   TRouteState = TUiState
-> = {
-  /**
-   * The name of the main index. If no indexName is provided, you have to manually add an index widget.
-   */
-  indexName?: string;
-
-  /**
-   * The objectID of the composition.
-   * If this is passed, the composition API will be used for search.
-   * Multi-index search is not supported with this option.
-   */
-  compositionID?: string;
-
-  /**
-   * The search client to plug to InstantSearch.js
-   *
-   * Usage:
-   * ```javascript
-   * // Using the default Algolia search client
-   * instantsearch({
-   *   indexName: 'indexName',
-   *   searchClient: algoliasearch('appId', 'apiKey')
-   * });
-   *
-   * // Using a custom search client
-   * instantsearch({
-   *   indexName: 'indexName',
-   *   searchClient: {
-   *     search(requests) {
-   *       // fetch response based on requests
-   *       return response;
-   *     },
-   *     searchForFacetValues(requests) {
-   *       // fetch response based on requests
-   *       return response;
-   *     }
-   *   }
-   * });
-   * ```
-   */
-  searchClient: SearchClient | CompositionClient;
-
-  /**
-   * The locale used to display numbers. This will be passed
-   * to `Number.prototype.toLocaleString()`
-   */
-  numberLocale?: string;
-
-  /**
-   * A hook that will be called each time a search needs to be done, with the
-   * helper as a parameter. It's your responsibility to call `helper.search()`.
-   * This option allows you to avoid doing searches at page load for example.
-   * @deprecated use onStateChange instead
-   */
-  searchFunction?: (helper: AlgoliaSearchHelper) => void;
-
-  /**
-   * Function called when the state changes.
-   *
-   * Using this function makes the instance controlled. This means that you
-   * become in charge of updating the UI state with the `setUiState` function.
-   */
-  onStateChange?: (params: {
-    uiState: TUiState;
-    setUiState: (
-      uiState: TUiState | ((previousUiState: TUiState) => TUiState)
-    ) => void;
-  }) => void;
-
-  /**
-   * Injects a `uiState` to the `instantsearch` instance. You can use this option
-   * to provide an initial state to a widget. Note that the state is only used
-   * for the first search. To unconditionally pass additional parameters to the
-   * Algolia API, take a look at the `configure` widget.
-   */
-  initialUiState?: NoInfer<TUiState>;
-
-  /**
-   * Time before a search is considered stalled. The default is 200ms
-   */
-  stalledSearchDelay?: number;
-
-  /**
-   * Router configuration used to save the UI State into the URL or any other
-   * client side persistence. Passing `true` will use the default URL options.
-   */
-  routing?: RouterProps<TUiState, TRouteState> | boolean;
-
-  /**
-   * Enables the Insights middleware and loads the Insights library
-   * if not already loaded.
-   *
-   * The Insights middleware sends view and click events automatically, and lets
-   * you set up your own events.
-   *
-   * @default false
-   */
-  insights?: InsightsProps | boolean;
-
-  /**
-   * the instance of search-insights to use for sending insights events inside
-   * widgets like `hits`.
-   *
-   * @deprecated This property will be still supported in 4.x releases, but not further. It is replaced by the `insights` middleware. For more information, visit https://www.algolia.com/doc/guides/getting-insights-and-analytics/search-analytics/click-through-and-conversions/how-to/send-click-and-conversion-events-with-instantsearch/js/
-   */
-  insightsClient?: AlgoliaInsightsClient;
-  future?: {
-    /**
-     * Changes the way `dispose` is used in InstantSearch lifecycle.
-     *
-     * If `false` (by default), each widget unmounting will remove its state as well, even if there are multiple widgets reading that UI State.
-     *
-     * If `true`, each widget unmounting will only remove its own state if it's the last of its type. This allows for dynamically adding and removing widgets without losing their state.
-     *
-     * @default false
-     */
-    // @MAJOR: Remove legacy behaviour
-    preserveSharedStateOnUnmount?: boolean;
-    /**
-     * Changes the way root levels of hierarchical facets have their count displayed.
-     *
-     * If `false` (by default), the count of the refined root level is updated to match the count of the actively refined parent level.
-     *
-     * If `true`, the count of the root level stays the same as the count of all children levels.
-     *
-     * @default false
-     */
-    // @MAJOR: Remove legacy behaviour here and in algoliasearch-helper
-    persistHierarchicalRootCount?: boolean;
-  };
-};
-
-export type InstantSearchStatus = 'idle' | 'loading' | 'stalled' | 'error';
-
-export const INSTANTSEARCH_FUTURE_DEFAULTS: Required<
-  InstantSearchOptions['future']
-> = {
-  preserveSharedStateOnUnmount: false,
-  persistHierarchicalRootCount: false,
-};
-
-/**
- * The actual implementation of the InstantSearch. This is
- * created using the `instantsearch` factory function.
- * It emits the 'render' event every time a search is done
- */
-class InstantSearch<
-  TUiState extends UiState = UiState,
-  TRouteState = TUiState
-> extends EventEmitter {
-  public client: InstantSearchOptions['searchClient'];
-  public indexName: string;
-  public compositionID?: string;
-  public insightsClient: AlgoliaInsightsClient | null;
-  public onStateChange: InstantSearchOptions<TUiState>['onStateChange'] | null =
-    null;
-  public future: NonNullable<InstantSearchOptions<TUiState>['future']>;
-  public helper: AlgoliaSearchHelper | null;
-  public mainHelper: AlgoliaSearchHelper | null;
-  public mainIndex: IndexWidget;
-  public started: boolean;
-  public renderState: RenderState = {};
-  public _stalledSearchDelay: number;
-  public _searchStalledTimer: any;
-  public _initialUiState: TUiState;
-  public _initialResults: InitialResults | null;
-  public _createURL: CreateURL<TUiState>;
-  public _searchFunction?: InstantSearchOptions['searchFunction'];
-  public _mainHelperSearch?: AlgoliaSearchHelper['search'];
-  public _hasSearchWidget: boolean = false;
-  public _hasRecommendWidget: boolean = false;
-  public _insights: InstantSearchOptions['insights'];
-  public middleware: Array<{
-    creator: Middleware<TUiState>;
-    instance: MiddlewareDefinition<TUiState>;
-  }> = [];
-  public sendEventToInsights: (event: InsightsEvent) => void;
-  /**
-   * The status of the search. Can be "idle", "loading", "stalled", or "error".
-   */
-  public status: InstantSearchStatus = 'idle';
-  /**
-   * The last returned error from the Search API.
-   * The error gets cleared when the next valid search response is rendered.
-   */
-  public error: Error | undefined = undefined;
-
-  /**
-   * @deprecated use `status === 'stalled'` instead
-   */
-  public get _isSearchStalled(): boolean {
-    warning(
-      false,
-      `\`InstantSearch._isSearchStalled\` is deprecated and will be removed in InstantSearch.js 5.0.
-
-Use \`InstantSearch.status === "stalled"\` instead.`
-    );
-
-    return this.status === 'stalled';
-  }
-
-  public constructor(options: InstantSearchOptions<TUiState, TRouteState>) {
-    super();
-
-    // prevent `render` event listening from causing a warning
-    this.setMaxListeners(100);
-
-    const {
-      indexName = '',
-      compositionID,
-      initialUiState = {} as TUiState,
-      routing = null,
-      insights = undefined,
-      searchFunction,
-      stalledSearchDelay = 200,
-      searchClient = null,
-      insightsClient = null,
-      onStateChange = null,
-      future = {
-        ...INSTANTSEARCH_FUTURE_DEFAULTS,
-        ...(options.future || {}),
-      },
-    } = options;
-
-    if (searchClient === null) {
-      throw new Error(withUsage('The `searchClient` option is required.'));
-    }
-
-    if (typeof searchClient.search !== 'function') {
-      throw new Error(
-        `The \`searchClient\` must implement a \`search\` method.
-
-See: https://www.algolia.com/doc/guides/building-search-ui/going-further/backend-search/in-depth/backend-instantsearch/js/`
-      );
-    }
-
-    if (typeof searchClient.addAlgoliaAgent === 'function') {
-      searchClient.addAlgoliaAgent(`instantsearch.js (${version})`);
-    }
-
-    warning(
-      insightsClient === null,
-      `\`insightsClient\` property has been deprecated. It is still supported in 4.x releases, but not further. It is replaced by the \`insights\` middleware.
-
-For more information, visit https://www.algolia.com/doc/guides/getting-insights-and-analytics/search-analytics/click-through-and-conversions/how-to/send-click-and-conversion-events-with-instantsearch/js/`
-    );
-
-    if (insightsClient && typeof insightsClient !== 'function') {
-      throw new Error(
-        withUsage('The `insightsClient` option should be a function.')
-      );
-    }
-
-    warning(
-      !(options as any).searchParameters,
-      `The \`searchParameters\` option is deprecated and will not be supported in InstantSearch.js 4.x.
-
-You can replace it with the \`configure\` widget:
-
-\`\`\`
-search.addWidgets([
-  configure(${JSON.stringify((options as any).searchParameters, null, 2)})
-]);
-\`\`\`
-
-See ${createDocumentationLink({
-        name: 'configure',
-      })}`
-    );
-
-    if (__DEV__ && options.future?.preserveSharedStateOnUnmount === undefined) {
-      // eslint-disable-next-line no-console
-      console.info(`Starting from the next major version, InstantSearch will change how widgets state is preserved when they are removed. InstantSearch will keep the state of unmounted widgets to be usable by other widgets with the same attribute.
-
-We recommend setting \`future.preserveSharedStateOnUnmount\` to true to adopt this change today.
-To stay with the current behaviour and remove this warning, set the option to false.
-
-See documentation: ${createDocumentationLink({
-        name: 'instantsearch',
-      })}#widget-param-future
-          `);
-    }
-
-    this.client = searchClient;
-    this.future = future;
-    this.insightsClient = insightsClient;
-    this.indexName = indexName;
-    this.compositionID = compositionID;
-    this.helper = null;
-    this.mainHelper = null;
-    this.mainIndex = index({
-      // we use an index widget to render compositions
-      // this only works because there's only one composition index allow for now
-      indexName: this.compositionID || this.indexName,
-    });
-    this.onStateChange = onStateChange;
-
-    this.started = false;
-
-    this._stalledSearchDelay = stalledSearchDelay;
-    this._searchStalledTimer = null;
-
-    this._createURL = defaultCreateURL;
-    this._initialUiState = initialUiState as TUiState;
-    this._initialResults = null;
-
-    this._insights = insights;
-
-    if (searchFunction) {
-      warning(
-        false,
-        `The \`searchFunction\` option is deprecated. Use \`onStateChange\` instead.`
-      );
-      this._searchFunction = searchFunction;
-    }
-
-    this.sendEventToInsights = noop;
-
-    if (routing) {
-      const routerOptions = typeof routing === 'boolean' ? {} : routing;
-      routerOptions.$$internal = true;
-      this.use(createRouterMiddleware(routerOptions));
-    }
-
-    // This is the default Insights middleware,
-    // added when `insights` is set to true by the user.
-    // Any user-provided middleware will be added later and override this one.
-    if (insights) {
-      const insightsOptions = typeof insights === 'boolean' ? {} : insights;
-      insightsOptions.$$internal = true;
-      this.use(createInsightsMiddleware(insightsOptions));
-    }
-
-    if (isMetadataEnabled()) {
-      this.use(createMetadataMiddleware({ $$internal: true }));
-    }
-  }
-
-  /**
-   * Hooks a middleware into the InstantSearch lifecycle.
-   */
-  public use(...middleware: Array<Middleware<TUiState>>): this {
-    const newMiddlewareList = middleware.map((fn) => {
-      const newMiddleware = {
-        $$type: '__unknown__',
-        $$internal: false,
-        subscribe: noop,
-        started: noop,
-        unsubscribe: noop,
-        onStateChange: noop,
-        ...fn({
-          instantSearchInstance: this as unknown as InstantSearch<
-            UiState,
-            UiState
-          >,
-        }),
-      };
-      this.middleware.push({
-        creator: fn,
-        instance: newMiddleware,
-      });
-      return newMiddleware;
-    });
-
-    // If the instance has already started, we directly subscribe the
-    // middleware so they're notified of changes.
-    if (this.started) {
-      newMiddlewareList.forEach((m) => {
-        m.subscribe();
-        m.started();
-      });
-    }
-
-    return this;
-  }
-
-  /**
-   * Removes a middleware from the InstantSearch lifecycle.
-   */
-  public unuse(...middlewareToUnuse: Array<Middleware<TUiState>>): this {
-    this.middleware
-      .filter((m) => middlewareToUnuse.includes(m.creator))
-      .forEach((m) => m.instance.unsubscribe());
-
-    this.middleware = this.middleware.filter(
-      (m) => !middlewareToUnuse.includes(m.creator)
-    );
-
-    return this;
-  }
-
-  /**
-   * Adds a widget to the search instance.
-   * A widget can be added either before or after InstantSearch has started.
-   * @param widget The widget to add to InstantSearch.
-   *
-   * @deprecated This method will still be supported in 4.x releases, but not further. It is replaced by `addWidgets([widget])`.
-   */
-  public addWidget(widget: Widget) {
-    warning(
-      false,
-      'addWidget will still be supported in 4.x releases, but not further. It is replaced by `addWidgets([widget])`'
-    );
-
-    return this.addWidgets([widget]);
-  }
-
-  /**
-   * Adds multiple widgets to the search instance.
-   * Widgets can be added either before or after InstantSearch has started.
-   * @param widgets The array of widgets to add to InstantSearch.
-   */
-  public addWidgets(widgets: Array<Widget | IndexWidget>) {
-    if (!Array.isArray(widgets)) {
-      throw new Error(
-        withUsage(
-          'The `addWidgets` method expects an array of widgets. Please use `addWidget`.'
-        )
-      );
-    }
-
-    if (
-      widgets.some(
-        (widget) =>
-          typeof widget.init !== 'function' &&
-          typeof widget.render !== 'function'
-      )
-    ) {
-      throw new Error(
-        withUsage(
-          'The widget definition expects a `render` and/or an `init` method.'
-        )
-      );
-    }
-
-    if (this.compositionID && widgets.some(isIndexWidget)) {
-      throw new Error(
-        withUsage(
-          'The `index` widget cannot be used with a composition-based InstantSearch implementation.'
-        )
-      );
-    }
-
-    this.mainIndex.addWidgets(widgets);
-
-    return this;
-  }
-
-  /**
-   * Removes a widget from the search instance.
-   * @deprecated This method will still be supported in 4.x releases, but not further. It is replaced by `removeWidgets([widget])`
-   * @param widget The widget instance to remove from InstantSearch.
-   *
-   * The widget must implement a `dispose()` method to clear its state.
-   */
-  public removeWidget(widget: Widget | IndexWidget) {
-    warning(
-      false,
-      'removeWidget will still be supported in 4.x releases, but not further. It is replaced by `removeWidgets([widget])`'
-    );
-
-    return this.removeWidgets([widget]);
-  }
-
-  /**
-   * Removes multiple widgets from the search instance.
-   * @param widgets Array of widgets instances to remove from InstantSearch.
-   *
-   * The widgets must implement a `dispose()` method to clear their states.
-   */
-  public removeWidgets(widgets: Array<Widget | IndexWidget>) {
-    if (!Array.isArray(widgets)) {
-      throw new Error(
-        withUsage(
-          'The `removeWidgets` method expects an array of widgets. Please use `removeWidget`.'
-        )
-      );
-    }
-
-    if (widgets.some((widget) => typeof widget.dispose !== 'function')) {
-      throw new Error(
-        withUsage('The widget definition expects a `dispose` method.')
-      );
-    }
-
-    this.mainIndex.removeWidgets(widgets);
-
-    return this;
-  }
-
-  /**
-   * Ends the initialization of InstantSearch.js and triggers the
-   * first search.
-   */
-  public start() {
-    if (this.started) {
-      throw new Error(
-        withUsage('The `start` method has already been called once.')
-      );
-    }
-
-    // This Helper is used for the queries, we don't care about its state. The
-    // states are managed at the `index` level. We use this Helper to create
-    // DerivedHelper scoped into the `index` widgets.
-    // In Vue InstantSearch' hydrate, a main helper gets set before start, so
-    // we need to respect this helper as a way to keep all listeners correct.
-    const mainHelper =
-      this.mainHelper ||
-      algoliasearchHelper(this.client, this.indexName, undefined, {
-        persistHierarchicalRootCount: this.future.persistHierarchicalRootCount,
-      });
-
-    if (this.compositionID) {
-      mainHelper.searchForFacetValues =
-        mainHelper.searchForCompositionFacetValues.bind(mainHelper);
-    }
-
-    mainHelper.search = () => {
-      this.status = 'loading';
-      this.scheduleRender(false);
-
-      warning(
-        Boolean(this.indexName) ||
-          Boolean(this.compositionID) ||
-          this.mainIndex.getWidgets().some(isIndexWidget),
-        'No indexName provided, nor an explicit index widget in the widgets tree. This is required to be able to display results.'
-      );
-
-      // This solution allows us to keep the exact same API for the users but
-      // under the hood, we have a different implementation. It should be
-      // completely transparent for the rest of the codebase. Only this module
-      // is impacted.
-      if (this._hasSearchWidget) {
-        if (this.compositionID) {
-          mainHelper.searchWithComposition();
-        } else {
-          mainHelper.searchOnlyWithDerivedHelpers();
-        }
-      }
-
-      if (this._hasRecommendWidget) {
-        mainHelper.recommend();
-      }
-
-      return mainHelper;
-    };
-
-    if (this._searchFunction) {
-      // this client isn't used to actually search, but required for the helper
-      // to not throw errors
-      const fakeClient = {
-        search: () => new Promise(noop),
-      } as any as SearchClient;
-
-      this._mainHelperSearch = mainHelper.search.bind(mainHelper);
-      mainHelper.search = () => {
-        const mainIndexHelper = this.mainIndex.getHelper();
-        const searchFunctionHelper = algoliasearchHelper(
-          fakeClient,
-          mainIndexHelper!.state.index,
-          mainIndexHelper!.state
-        );
-        searchFunctionHelper.once('search', ({ state }) => {
-          mainIndexHelper!.overrideStateWithoutTriggeringChangeEvent(state);
-          this._mainHelperSearch!();
-        });
-        // Forward state changes from `searchFunctionHelper` to `mainIndexHelper`
-        searchFunctionHelper.on('change', ({ state }) => {
-          mainIndexHelper!.setState(state);
-        });
-        this._searchFunction!(searchFunctionHelper);
-        return mainHelper;
-      };
-    }
-
-    // Only the "main" Helper emits the `error` event vs the one for `search`
-    // and `results` that are also emitted on the derived one.
-    mainHelper.on('error', ({ error }) => {
-      if (!(error instanceof Error)) {
-        // typescript lies here, error is in some cases { name: string, message: string }
-        const err = error as Record<string, any>;
-        error = Object.keys(err).reduce((acc, key) => {
-          (acc as any)[key] = err[key];
-          return acc;
-        }, new Error(err.message));
-      }
-      // If an error is emitted, it is re-thrown by events. In previous versions
-      // we emitted {error}, which is thrown as:
-      // "Uncaught, unspecified \"error\" event. ([object Object])"
-      // To avoid breaking changes, we make the error available in both
-      // `error` and `error.error`
-      // @MAJOR emit only error
-      (error as any).error = error;
-      this.error = error;
-      this.status = 'error';
-      this.scheduleRender(false);
-
-      // This needs to execute last because it throws the error.
-      this.emit('error', error);
-    });
-
-    this.mainHelper = mainHelper;
-
-    this.middleware.forEach(({ instance }) => {
-      instance.subscribe();
-    });
-
-    this.mainIndex.init({
-      instantSearchInstance: this as unknown as InstantSearch<UiState, UiState>,
-      parent: null,
-      uiState: this._initialUiState,
-    });
-
-    if (this._initialResults) {
-      hydrateSearchClient(this.client, this._initialResults);
-      hydrateRecommendCache(this.mainHelper, this._initialResults);
-
-      const originalScheduleSearch = this.scheduleSearch;
-      // We don't schedule a first search when initial results are provided
-      // because we already have the results to render. This skips the initial
-      // network request on the browser on `start`.
-      this.scheduleSearch = defer(noop);
-      // We also skip the initial network request when widgets are dynamically
-      // added in the first tick (that's the case in all the framework-based flavors).
-      // When we add a widget to `index`, it calls `scheduleSearch`. We can rely
-      // on our `defer` util to restore the original `scheduleSearch` value once
-      // widgets are added to hook back to the regular lifecycle.
-      defer(() => {
-        this.scheduleSearch = originalScheduleSearch;
-      })();
-    }
-    // We only schedule a search when widgets have been added before `start()`
-    // because there are listeners that can use these results.
-    // This is especially useful in framework-based flavors that wait for
-    // dynamically-added widgets to trigger a network request. It avoids
-    // having to batch this initial network request with the one coming from
-    // `addWidgets()`.
-    // Later, we could also skip `index()` widgets and widgets that don't read
-    // the results, but this is an optimization that has a very low impact for now.
-    else if (this.mainIndex.getWidgets().length > 0) {
-      this.scheduleSearch();
-    }
-
-    // Keep the previous reference for legacy purpose, some pattern use
-    // the direct Helper access `search.helper` (e.g multi-index).
-    this.helper = this.mainIndex.getHelper();
-
-    // track we started the search if we add more widgets,
-    // to init them directly after add
-    this.started = true;
-
-    this.middleware.forEach(({ instance }) => {
-      instance.started();
-    });
-
-    // This is the automatic Insights middleware,
-    // added when `insights` is unset and the initial results possess `queryID`.
-    // Any user-provided middleware will be added later and override this one.
-    if (typeof this._insights === 'undefined') {
-      mainHelper.derivedHelpers[0].once('result', () => {
-        const hasAutomaticInsights = this.mainIndex
-          .getScopedResults()
-          .some(({ results }) => results?._automaticInsights);
-        if (hasAutomaticInsights) {
-          this.use(
-            createInsightsMiddleware({
-              $$internal: true,
-              $$automatic: true,
-            })
-          );
-        }
-      });
-    }
-  }
-
-  /**
-   * Removes all widgets without triggering a search afterwards.
-   * @return {undefined} This method does not return anything
-   */
-  public dispose(): void {
-    this.scheduleSearch.cancel();
-    this.scheduleRender.cancel();
-    clearTimeout(this._searchStalledTimer);
-
-    this.removeWidgets(this.mainIndex.getWidgets());
-    this.mainIndex.dispose();
-
-    // You can not start an instance two times, therefore a disposed instance
-    // needs to set started as false otherwise this can not be restarted at a
-    // later point.
-    this.started = false;
-
-    // The helper needs to be reset to perform the next search from a fresh state.
-    // If not reset, it would use the state stored before calling `dispose()`.
-    this.removeAllListeners();
-    this.mainHelper?.removeAllListeners();
-    this.mainHelper = null;
-    this.helper = null;
-
-    this.middleware.forEach(({ instance }) => {
-      instance.unsubscribe();
-    });
-  }
-
-  public scheduleSearch = defer(() => {
-    if (this.started) {
-      this.mainHelper!.search();
-    }
-  });
-
-  public scheduleRender = defer((shouldResetStatus: boolean = true) => {
-    if (!this.mainHelper?.hasPendingRequests()) {
-      clearTimeout(this._searchStalledTimer);
-      this._searchStalledTimer = null;
-
-      if (shouldResetStatus) {
-        this.status = 'idle';
-        this.error = undefined;
-      }
-    }
-
-    this.mainIndex.render({
-      instantSearchInstance: this as unknown as InstantSearch<UiState, UiState>,
-    });
-
-    this.emit('render');
-  });
-
-  public scheduleStalledRender() {
-    if (!this._searchStalledTimer) {
-      this._searchStalledTimer = setTimeout(() => {
-        this.status = 'stalled';
-        this.scheduleRender();
-      }, this._stalledSearchDelay);
-    }
-  }
-
-  /**
-   * Set the UI state and trigger a search.
-   * @param uiState The next UI state or a function computing it from the current state
-   * @param callOnStateChange private parameter used to know if the method is called from a state change
-   */
-  public setUiState(
-    uiState: TUiState | ((previousUiState: TUiState) => TUiState),
-    callOnStateChange: boolean = true
-  ): void {
-    if (!this.mainHelper) {
-      throw new Error(
-        withUsage('The `start` method needs to be called before `setUiState`.')
-      );
-    }
-
-    // We refresh the index UI state to update the local UI state that the
-    // main index passes to the function form of `setUiState`.
-    this.mainIndex.refreshUiState();
-    const nextUiState =
-      typeof uiState === 'function'
-        ? uiState(this.mainIndex.getWidgetUiState({}) as TUiState)
-        : uiState;
-
-    if (this.onStateChange && callOnStateChange) {
-      this.onStateChange({
-        uiState: nextUiState,
-        setUiState: (finalUiState) => {
-          setIndexHelperState(
-            typeof finalUiState === 'function'
-              ? finalUiState(nextUiState)
-              : finalUiState,
-            this.mainIndex
-          );
-
-          this.scheduleSearch();
-          this.onInternalStateChange();
-        },
-      });
-    } else {
-      setIndexHelperState(nextUiState, this.mainIndex);
-
-      this.scheduleSearch();
-      this.onInternalStateChange();
-    }
-  }
-
-  public getUiState(): TUiState {
-    if (this.started) {
-      // We refresh the index UI state to make sure changes from `refine` are taken in account
-      this.mainIndex.refreshUiState();
-    }
-
-    return this.mainIndex.getWidgetUiState({}) as TUiState;
-  }
-
-  public onInternalStateChange = defer(() => {
-    const nextUiState = this.mainIndex.getWidgetUiState({}) as TUiState;
-
-    this.middleware.forEach(({ instance }) => {
-      instance.onStateChange({
-        uiState: nextUiState,
-      });
-    });
-  });
-
-  public createURL(nextState: TUiState = {} as TUiState): string {
-    if (!this.started) {
-      throw new Error(
-        withUsage('The `start` method needs to be called before `createURL`.')
-      );
-    }
-
-    return this._createURL(nextState);
-  }
-
-  public refresh() {
-    if (!this.mainHelper) {
-      throw new Error(
-        withUsage('The `start` method needs to be called before `refresh`.')
-      );
-    }
-
-    this.mainHelper.clearCache().search();
+> extends _InstantSearchClass<TUiState, TRouteState> {
+  constructor(options: InstantSearchOptions<TUiState, TRouteState>) {
+    super(options);
+    this.client.addAlgoliaAgent?.(`instantsearch.js (${version})`);
   }
 }
-
-export default InstantSearch;
diff --git a/packages/instantsearch.js/src/lib/__tests__/InstantSearch-test.ts b/packages/instantsearch.js/src/lib/__tests__/InstantSearch-test.ts
new file mode 100644
index 0000000000..d80af3d620
--- /dev/null
+++ b/packages/instantsearch.js/src/lib/__tests__/InstantSearch-test.ts
@@ -0,0 +1,24 @@
+import { createSearchClient } from '@instantsearch/mocks';
+
+import InstantSearch from '../InstantSearch';
+import version from '../version';
+
+it('calls addAlgoliaAgent', () => {
+  const searchClient = createSearchClient({
+    addAlgoliaAgent: jest.fn(),
+  });
+
+  // eslint-disable-next-line no-new
+  new InstantSearch({
+    indexName: 'indexName',
+    searchClient,
+  });
+
+  expect(searchClient.addAlgoliaAgent).toHaveBeenCalledTimes(2);
+  expect(searchClient.addAlgoliaAgent).toHaveBeenCalledWith(
+    expect.stringMatching(/^instantsearch-core \(.*\)$/)
+  );
+  expect(searchClient.addAlgoliaAgent).toHaveBeenCalledWith(
+    `instantsearch.js (${version})`
+  );
+});
diff --git a/packages/instantsearch.js/src/lib/infiniteHitsCache/sessionStorage.ts b/packages/instantsearch.js/src/lib/infiniteHitsCache/sessionStorage.ts
index af4d74d6fb..19f8aeccdc 100644
--- a/packages/instantsearch.js/src/lib/infiniteHitsCache/sessionStorage.ts
+++ b/packages/instantsearch.js/src/lib/infiniteHitsCache/sessionStorage.ts
@@ -1,74 +1 @@
-import { isEqual, safelyRunOnBrowser } from '../utils';
-
-import type { InfiniteHitsCache } from '../../connectors/infinite-hits/connectInfiniteHits';
-import type { PlainSearchParameters } from 'algoliasearch-helper';
-
-function getStateWithoutPage(state: PlainSearchParameters) {
-  const { page, ...rest } = state || {};
-  return rest;
-}
-
-export default function createInfiniteHitsSessionStorageCache({
-  key,
-}: {
-  /**
-   * If you display multiple instances of infiniteHits on the same page,
-   * you must provide a unique key for each instance.
-   */
-  key?: string;
-} = {}): InfiniteHitsCache {
-  const KEY = ['ais.infiniteHits', key].filter(Boolean).join(':');
-
-  return {
-    read({ state }) {
-      const sessionStorage = safelyRunOnBrowser<Storage | undefined>(
-        ({ window }) => window.sessionStorage
-      );
-
-      if (!sessionStorage) {
-        return null;
-      }
-
-      try {
-        const cache = JSON.parse(
-          // @ts-expect-error JSON.parse() requires a string, but it actually accepts null, too.
-          sessionStorage.getItem(KEY)
-        );
-
-        return cache && isEqual(cache.state, getStateWithoutPage(state))
-          ? cache.hits
-          : null;
-      } catch (error) {
-        if (error instanceof SyntaxError) {
-          try {
-            sessionStorage.removeItem(KEY);
-          } catch (err) {
-            // do nothing
-          }
-        }
-        return null;
-      }
-    },
-    write({ state, hits }) {
-      const sessionStorage = safelyRunOnBrowser<Storage | undefined>(
-        ({ window }) => window.sessionStorage
-      );
-
-      if (!sessionStorage) {
-        return;
-      }
-
-      try {
-        sessionStorage.setItem(
-          KEY,
-          JSON.stringify({
-            state: getStateWithoutPage(state),
-            hits,
-          })
-        );
-      } catch (error) {
-        // do nothing
-      }
-    },
-  };
-}
+export { createInfiniteHitsSessionStorageCache as default } from 'instantsearch-core';
diff --git a/packages/instantsearch.js/src/lib/routers/history.ts b/packages/instantsearch.js/src/lib/routers/history.ts
index 8286608fd1..3118f8d9c4 100644
--- a/packages/instantsearch.js/src/lib/routers/history.ts
+++ b/packages/instantsearch.js/src/lib/routers/history.ts
@@ -1,369 +1,2 @@
-import qs from 'qs';
-
-import { createDocumentationLink, safelyRunOnBrowser, warning } from '../utils';
-
-import type { Router, UiState } from '../../types';
-
-type CreateURL<TRouteState> = (args: {
-  qsModule: typeof qs;
-  routeState: TRouteState;
-  location: Location;
-}) => string;
-
-type ParseURL<TRouteState> = (args: {
-  qsModule: typeof qs;
-  location: Location;
-}) => TRouteState;
-
-export type BrowserHistoryArgs<TRouteState> = {
-  windowTitle?: (routeState: TRouteState) => string;
-  writeDelay: number;
-  createURL: CreateURL<TRouteState>;
-  parseURL: ParseURL<TRouteState>;
-  // @MAJOR: The `Location` type is hard to simulate in non-browser environments
-  // so we should accept a subset of it that is easier to work with in any
-  // environments.
-  getLocation: () => Location;
-  start?: (onUpdate: () => void) => void;
-  dispose?: () => void;
-  push?: (url: string) => void;
-  /**
-   * Whether the URL should be cleaned up when the router is disposed.
-   * This can be useful when closing a modal containing InstantSearch, to
-   * remove active refinements from the URL.
-   * @default true
-   */
-  // @MAJOR: Switch the default to `false` and remove the console info in the next major version.
-  cleanUrlOnDispose?: boolean;
-};
-
-const setWindowTitle = (title?: string): void => {
-  if (title) {
-    // This function is only executed on browsers so we can disable this check.
-    // eslint-disable-next-line no-restricted-globals
-    window.document.title = title;
-  }
-};
-
-class BrowserHistory<TRouteState> implements Router<TRouteState> {
-  public $$type = 'ais.browser';
-  /**
-   * Transforms a UI state into a title for the page.
-   */
-  private readonly windowTitle?: BrowserHistoryArgs<TRouteState>['windowTitle'];
-  /**
-   * Time in milliseconds before performing a write in the history.
-   * It prevents from adding too many entries in the history and
-   * makes the back button more usable.
-   *
-   * @default 400
-   */
-  private readonly writeDelay: Required<
-    BrowserHistoryArgs<TRouteState>
-  >['writeDelay'];
-  /**
-   * Creates a full URL based on the route state.
-   * The storage adaptor maps all syncable keys to the query string of the URL.
-   */
-  private readonly _createURL: Required<
-    BrowserHistoryArgs<TRouteState>
-  >['createURL'];
-  /**
-   * Parses the URL into a route state.
-   * It should be symmetrical to `createURL`.
-   */
-  private readonly parseURL: Required<
-    BrowserHistoryArgs<TRouteState>
-  >['parseURL'];
-  /**
-   * Returns the location to store in the history.
-   * @default () => window.location
-   */
-  private readonly getLocation: Required<
-    BrowserHistoryArgs<TRouteState>
-  >['getLocation'];
-
-  private writeTimer?: ReturnType<typeof setTimeout>;
-  private _onPopState?: (event: PopStateEvent) => void;
-
-  /**
-   * Indicates if last action was back/forward in the browser.
-   */
-  private inPopState: boolean = false;
-
-  /**
-   * Indicates whether the history router is disposed or not.
-   */
-  protected isDisposed: boolean = false;
-
-  /**
-   * Indicates the window.history.length before the last call to
-   * window.history.pushState (called in `write`).
-   * It allows to determine if a `pushState` has been triggered elsewhere,
-   * and thus to prevent the `write` method from calling `pushState`.
-   */
-  private latestAcknowledgedHistory: number = 0;
-
-  private _start?: (onUpdate: () => void) => void;
-  private _dispose?: () => void;
-  private _push?: (url: string) => void;
-  private _cleanUrlOnDispose: boolean;
-
-  /**
-   * Initializes a new storage provider that syncs the search state to the URL
-   * using web APIs (`window.location.pushState` and `onpopstate` event).
-   */
-  public constructor({
-    windowTitle,
-    writeDelay = 400,
-    createURL,
-    parseURL,
-    getLocation,
-    start,
-    dispose,
-    push,
-    cleanUrlOnDispose,
-  }: BrowserHistoryArgs<TRouteState>) {
-    this.windowTitle = windowTitle;
-    this.writeTimer = undefined;
-    this.writeDelay = writeDelay;
-    this._createURL = createURL;
-    this.parseURL = parseURL;
-    this.getLocation = getLocation;
-    this._start = start;
-    this._dispose = dispose;
-    this._push = push;
-    this._cleanUrlOnDispose =
-      typeof cleanUrlOnDispose === 'undefined' ? true : cleanUrlOnDispose;
-
-    if (__DEV__ && typeof cleanUrlOnDispose === 'undefined') {
-      // eslint-disable-next-line no-console
-      console.info(`Starting from the next major version, InstantSearch will not clean up the URL from active refinements when it is disposed.
-
-We recommend setting \`cleanUrlOnDispose\` to false to adopt this change today.
-To stay with the current behaviour and remove this warning, set the option to true.
-
-See documentation: ${createDocumentationLink({
-        name: 'history-router',
-      })}#widget-param-cleanurlondispose`);
-    }
-
-    safelyRunOnBrowser(({ window }) => {
-      const title = this.windowTitle && this.windowTitle(this.read());
-      setWindowTitle(title);
-
-      this.latestAcknowledgedHistory = window.history.length;
-    });
-  }
-
-  /**
-   * Reads the URL and returns a syncable UI search state.
-   */
-  public read(): TRouteState {
-    return this.parseURL({ qsModule: qs, location: this.getLocation() });
-  }
-
-  /**
-   * Pushes a search state into the URL.
-   */
-  public write(routeState: TRouteState): void {
-    safelyRunOnBrowser(({ window }) => {
-      const url = this.createURL(routeState);
-      const title = this.windowTitle && this.windowTitle(routeState);
-
-      if (this.writeTimer) {
-        clearTimeout(this.writeTimer);
-      }
-
-      this.writeTimer = setTimeout(() => {
-        setWindowTitle(title);
-
-        if (this.shouldWrite(url)) {
-          if (this._push) {
-            this._push(url);
-          } else {
-            window.history.pushState(routeState, title || '', url);
-          }
-          this.latestAcknowledgedHistory = window.history.length;
-        }
-        this.inPopState = false;
-        this.writeTimer = undefined;
-      }, this.writeDelay);
-    });
-  }
-
-  /**
-   * Sets a callback on the `onpopstate` event of the history API of the current page.
-   * It enables the URL sync to keep track of the changes.
-   */
-  public onUpdate(callback: (routeState: TRouteState) => void): void {
-    if (this._start) {
-      this._start(() => {
-        callback(this.read());
-      });
-    }
-
-    this._onPopState = () => {
-      if (this.writeTimer) {
-        clearTimeout(this.writeTimer);
-        this.writeTimer = undefined;
-      }
-
-      this.inPopState = true;
-
-      // We always read the state from the URL because the state of the history
-      // can be incorect in some cases (e.g. using React Router).
-      callback(this.read());
-    };
-
-    safelyRunOnBrowser(({ window }) => {
-      window.addEventListener('popstate', this._onPopState!);
-    });
-  }
-
-  /**
-   * Creates a complete URL from a given syncable UI state.
-   *
-   * It always generates the full URL, not a relative one.
-   * This allows to handle cases like using a <base href>.
-   * See: https://github.com/algolia/instantsearch/issues/790
-   */
-  public createURL(routeState: TRouteState): string {
-    const url = this._createURL({
-      qsModule: qs,
-      routeState,
-      location: this.getLocation(),
-    });
-
-    if (__DEV__) {
-      try {
-        // We just want to check if the URL is valid.
-        // eslint-disable-next-line no-new
-        new URL(url);
-      } catch (e) {
-        warning(
-          false,
-          `The URL returned by the \`createURL\` function is invalid.
-Please make sure it returns an absolute URL to avoid issues, e.g: \`https://algolia.com/search?query=iphone\`.`
-        );
-      }
-    }
-
-    return url;
-  }
-
-  /**
-   * Removes the event listener and cleans up the URL.
-   */
-  public dispose(): void {
-    if (this._dispose) {
-      this._dispose();
-    }
-
-    this.isDisposed = true;
-
-    safelyRunOnBrowser(({ window }) => {
-      if (this._onPopState) {
-        window.removeEventListener('popstate', this._onPopState);
-      }
-    });
-
-    if (this.writeTimer) {
-      clearTimeout(this.writeTimer);
-    }
-
-    if (this._cleanUrlOnDispose) {
-      this.write({} as TRouteState);
-    }
-  }
-
-  public start() {
-    this.isDisposed = false;
-  }
-
-  private shouldWrite(url: string): boolean {
-    return safelyRunOnBrowser(({ window }) => {
-      // When disposed and the cleanUrlOnDispose is set to false, we do not want to write the URL.
-      if (this.isDisposed && !this._cleanUrlOnDispose) {
-        return false;
-      }
-
-      // We do want to `pushState` if:
-      // - the router is not disposed, IS.js needs to update the URL
-      // OR
-      // - the last write was from InstantSearch.js
-      // (unlike a SPA, where it would have last written)
-      const lastPushWasByISAfterDispose = !(
-        this.isDisposed &&
-        this.latestAcknowledgedHistory !== window.history.length
-      );
-
-      return (
-        // When the last state change was through popstate, the IS.js state changes,
-        // but that should not write the URL.
-        !this.inPopState &&
-        // When the previous pushState after dispose was by IS.js, we want to write the URL.
-        lastPushWasByISAfterDispose &&
-        // When the URL is the same as the current one, we do not want to write it.
-        url !== window.location.href
-      );
-    });
-  }
-}
-
-export default function historyRouter<TRouteState = UiState>({
-  createURL = ({ qsModule, routeState, location }) => {
-    const { protocol, hostname, port = '', pathname, hash } = location;
-    const queryString = qsModule.stringify(routeState);
-    const portWithPrefix = port === '' ? '' : `:${port}`;
-
-    // IE <= 11 has no proper `location.origin` so we cannot rely on it.
-    if (!queryString) {
-      return `${protocol}//${hostname}${portWithPrefix}${pathname}${hash}`;
-    }
-
-    return `${protocol}//${hostname}${portWithPrefix}${pathname}?${queryString}${hash}`;
-  },
-  parseURL = ({ qsModule, location }) => {
-    // `qs` by default converts arrays with more than 20 items to an object.
-    // We want to avoid this because the data structure manipulated can therefore vary.
-    // Setting the limit to `100` seems a good number because the engine's default is 100
-    // (it can go up to 1000 but it is very unlikely to select more than 100 items in the UI).
-    //
-    // Using an `arrayLimit` of `n` allows `n + 1` items.
-    //
-    // See:
-    //   - https://github.com/ljharb/qs#parsing-arrays
-    //   - https://www.algolia.com/doc/api-reference/api-parameters/maxValuesPerFacet/
-    return qsModule.parse(location.search.slice(1), {
-      arrayLimit: 99,
-    }) as unknown as TRouteState;
-  },
-  writeDelay = 400,
-  windowTitle,
-  getLocation = () => {
-    return safelyRunOnBrowser<Location>(({ window }) => window.location, {
-      fallback: () => {
-        throw new Error(
-          'You need to provide `getLocation` to the `history` router in environments where `window` does not exist.'
-        );
-      },
-    });
-  },
-  start,
-  dispose,
-  push,
-  cleanUrlOnDispose,
-}: Partial<BrowserHistoryArgs<TRouteState>> = {}): BrowserHistory<TRouteState> {
-  return new BrowserHistory({
-    createURL,
-    parseURL,
-    writeDelay,
-    windowTitle,
-    getLocation,
-    start,
-    dispose,
-    push,
-    cleanUrlOnDispose,
-  });
-}
+export { historyRouter as default } from 'instantsearch-core';
+export type { BrowserHistoryArgs } from 'instantsearch-core';
diff --git a/packages/instantsearch.js/src/lib/server.ts b/packages/instantsearch.js/src/lib/server.ts
index 098ec68935..e92d742e96 100644
--- a/packages/instantsearch.js/src/lib/server.ts
+++ b/packages/instantsearch.js/src/lib/server.ts
@@ -1,143 +1 @@
-import { walkIndex } from './utils';
-
-import type {
-  SearchClient,
-  CompositionClient,
-  IndexWidget,
-  InitialResults,
-  InstantSearch,
-  SearchOptions,
-} from '../types';
-
-/**
- * Waits for the results from the search instance to coordinate the next steps
- * in `getServerState()`.
- */
-export function waitForResults(
-  search: InstantSearch,
-  skipRecommend: boolean = false
-): Promise<SearchOptions[]> {
-  const helper = search.mainHelper!;
-
-  // Extract search parameters from the search client to use them
-  // later during hydration.
-  let requestParamsList: SearchOptions[];
-  const client = helper.getClient();
-  if (search.compositionID) {
-    helper.setClient({
-      ...client,
-      search(query) {
-        requestParamsList = [query.requestBody.params];
-        return (client as CompositionClient).search(query);
-      },
-    } as CompositionClient);
-  } else {
-    helper.setClient({
-      ...client,
-      search(queries) {
-        requestParamsList = queries.map(({ params }) => params);
-        return (client as SearchClient).search(queries);
-      },
-    } as SearchClient);
-  }
-
-  if (search._hasSearchWidget) {
-    if (search.compositionID) {
-      helper.searchWithComposition();
-    } else {
-      helper.searchOnlyWithDerivedHelpers();
-    }
-  }
-  !skipRecommend && search._hasRecommendWidget && helper.recommend();
-
-  return new Promise((resolve, reject) => {
-    let searchResultsReceived = !search._hasSearchWidget;
-    let recommendResultsReceived = !search._hasRecommendWidget || skipRecommend;
-    // All derived helpers resolve in the same tick so we're safe only relying
-    // on the first one.
-    helper.derivedHelpers[0].on('result', () => {
-      searchResultsReceived = true;
-      if (recommendResultsReceived) {
-        resolve(requestParamsList!);
-      }
-    });
-    helper.derivedHelpers[0].on('recommend:result', () => {
-      recommendResultsReceived = true;
-      if (searchResultsReceived) {
-        resolve(requestParamsList!);
-      }
-    });
-
-    // However, we listen to errors that can happen on any derived helper because
-    // any error is critical.
-    helper.on('error', (error) => {
-      reject(error);
-    });
-    search.on('error', (error) => {
-      reject(error);
-    });
-    helper.derivedHelpers.forEach((derivedHelper) =>
-      derivedHelper.on('error', (error) => {
-        reject(error);
-      })
-    );
-  });
-}
-
-/**
- * Walks the InstantSearch root index to construct the initial results.
- */
-export function getInitialResults(
-  rootIndex: IndexWidget,
-  /**
-   * Search parameters sent to the search client,
-   * returned by `waitForResults()`.
-   */
-  requestParamsList?: SearchOptions[]
-): InitialResults {
-  const initialResults: InitialResults = {};
-
-  let requestParamsIndex = 0;
-  walkIndex(rootIndex, (widget) => {
-    const searchResults = widget.getResults();
-    const recommendResults = widget.getHelper()?.lastRecommendResults;
-    if (searchResults || recommendResults) {
-      const resultsCount = searchResults?._rawResults?.length || 0;
-      const requestParams = resultsCount
-        ? requestParamsList?.slice(
-            requestParamsIndex,
-            requestParamsIndex + resultsCount
-          )
-        : [];
-      requestParamsIndex += resultsCount;
-      initialResults[widget.getIndexId()] = {
-        // We convert the Helper state to a plain object to pass parsable data
-        // structures from server to client.
-        ...(searchResults && {
-          state: {
-            ...searchResults._state,
-            clickAnalytics: requestParams?.[0]?.clickAnalytics,
-            userToken: requestParams?.[0]?.userToken,
-          },
-          results: searchResults._rawResults,
-        }),
-        ...(recommendResults && {
-          recommendResults: {
-            // We have to stringify + parse because of some explicitly undefined values.
-            params: JSON.parse(JSON.stringify(recommendResults._state.params)),
-            results: recommendResults._rawResults,
-          },
-        }),
-        ...(requestParams && { requestParams }),
-      };
-    }
-  });
-
-  if (Object.keys(initialResults).length === 0) {
-    throw new Error(
-      'The root index does not have any results. Make sure you have at least one widget that provides results.'
-    );
-  }
-
-  return initialResults;
-}
+export { waitForResults, getInitialResults } from 'instantsearch-core';
diff --git a/packages/instantsearch.js/src/lib/stateMappings/simple.ts b/packages/instantsearch.js/src/lib/stateMappings/simple.ts
index 11e2f405b6..6c54b07684 100644
--- a/packages/instantsearch.js/src/lib/stateMappings/simple.ts
+++ b/packages/instantsearch.js/src/lib/stateMappings/simple.ts
@@ -1,39 +1 @@
-import type { UiState, IndexUiState, StateMapping } from '../../types';
-
-function getIndexStateWithoutConfigure<TIndexUiState extends IndexUiState>(
-  uiState: TIndexUiState
-): Omit<TIndexUiState, 'configure'> {
-  const { configure, ...trackedUiState } = uiState;
-  return trackedUiState;
-}
-
-// technically a URL could contain any key, since users provide it,
-// which is why the input to this function is UiState, not something
-// which excludes "configure" as this function does.
-export default function simpleStateMapping<
-  TUiState extends UiState = UiState
->(): StateMapping<TUiState, TUiState> {
-  return {
-    $$type: 'ais.simple',
-
-    stateToRoute(uiState) {
-      return Object.keys(uiState).reduce(
-        (state, indexId) => ({
-          ...state,
-          [indexId]: getIndexStateWithoutConfigure(uiState[indexId]),
-        }),
-        {} as TUiState
-      );
-    },
-
-    routeToState(routeState = {} as TUiState) {
-      return Object.keys(routeState).reduce(
-        (state, indexId) => ({
-          ...state,
-          [indexId]: getIndexStateWithoutConfigure(routeState[indexId]),
-        }),
-        {} as TUiState
-      );
-    },
-  };
-}
+export { simpleStateMapping as default } from 'instantsearch-core';
diff --git a/packages/instantsearch.js/src/lib/stateMappings/singleIndex.ts b/packages/instantsearch.js/src/lib/stateMappings/singleIndex.ts
index 0ad943877f..b038e86a64 100644
--- a/packages/instantsearch.js/src/lib/stateMappings/singleIndex.ts
+++ b/packages/instantsearch.js/src/lib/stateMappings/singleIndex.ts
@@ -1,26 +1 @@
-import type { StateMapping, IndexUiState, UiState } from '../../types';
-
-function getIndexStateWithoutConfigure<TIndexUiState extends IndexUiState>(
-  uiState: TIndexUiState
-): TIndexUiState {
-  const { configure, ...trackedUiState } = uiState;
-  return trackedUiState as TIndexUiState;
-}
-
-export default function singleIndexStateMapping<
-  TUiState extends UiState = UiState
->(
-  indexName: keyof TUiState
-): StateMapping<TUiState, TUiState[typeof indexName]> {
-  return {
-    $$type: 'ais.singleIndex',
-    stateToRoute(uiState) {
-      return getIndexStateWithoutConfigure(uiState[indexName] || {});
-    },
-    routeToState(routeState = {} as TUiState[typeof indexName]) {
-      return {
-        [indexName]: getIndexStateWithoutConfigure(routeState),
-      } as unknown as TUiState;
-    },
-  };
-}
+export { singleIndexStateMapping as default } from 'instantsearch-core';
diff --git a/packages/instantsearch.js/src/lib/templating/renderTemplate.ts b/packages/instantsearch.js/src/lib/templating/renderTemplate.ts
index e730d86e4c..24ac96ba49 100644
--- a/packages/instantsearch.js/src/lib/templating/renderTemplate.ts
+++ b/packages/instantsearch.js/src/lib/templating/renderTemplate.ts
@@ -9,7 +9,7 @@ import {
 import { warning } from '../utils';
 
 import type { Templates } from '../../types';
-import type { SendEventForHits } from '../utils/createSendEventForHits';
+import type { SendEventForHits } from 'instantsearch-core';
 
 export function renderTemplate({
   templates,
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/concatHighlightedParts-test.ts b/packages/instantsearch.js/src/lib/utils/__tests__/concatHighlightedParts-test.ts
deleted file mode 100644
index 3e08a0deb9..0000000000
--- a/packages/instantsearch.js/src/lib/utils/__tests__/concatHighlightedParts-test.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { concatHighlightedParts } from '../concatHighlightedParts';
-
-describe('concatHighlightedParts', () => {
-  test('returns a concatenated string from HighlightedParts with a single match', () => {
-    expect(
-      concatHighlightedParts([
-        { isHighlighted: false, value: 'Amazon' },
-        {
-          isHighlighted: true,
-          value: ' - Fire HD8 - 8&quot; - Tablet - 16GB - Wi-Fi - Black',
-        },
-      ])
-    ).toMatchInlineSnapshot(
-      `"Amazon<mark> - Fire HD8 - 8&quot; - Tablet - 16GB - Wi-Fi - Black</mark>"`
-    );
-  });
-
-  test('returns a concatenated string from HighlightedParts with multiple matches', () => {
-    expect(
-      concatHighlightedParts([
-        { isHighlighted: false, value: 'Amazon' },
-        {
-          isHighlighted: true,
-          value: ' - Fire HD8 - 8&quot; - Tablet - 16GB - Wi-',
-        },
-        { isHighlighted: false, value: 'Fi' },
-        { isHighlighted: false, value: ' - ' },
-        { isHighlighted: false, value: 'Black' },
-      ])
-    ).toMatchInlineSnapshot(
-      `"Amazon<mark> - Fire HD8 - 8&quot; - Tablet - 16GB - Wi-</mark>Fi - Black"`
-    );
-  });
-});
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/debounce-test.ts b/packages/instantsearch.js/src/lib/utils/__tests__/debounce-test.ts
deleted file mode 100644
index c6d0cb502e..0000000000
--- a/packages/instantsearch.js/src/lib/utils/__tests__/debounce-test.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { wait } from '@instantsearch/testutils/wait';
-
-import { debounce } from '../debounce';
-
-describe('debounce', () => {
-  it('debounces the function', async () => {
-    const originalFunction = jest.fn();
-    const debouncedFunction = debounce(originalFunction, 100);
-    debouncedFunction('a');
-    debouncedFunction('b');
-
-    await wait(100);
-
-    expect(originalFunction).toHaveBeenCalledTimes(1);
-    expect(originalFunction).toHaveBeenLastCalledWith('b');
-  });
-
-  it('executes all the calls if they are not within the debounce time', async () => {
-    const originalFunction = jest.fn();
-    const debouncedFunction = debounce(originalFunction, 100);
-
-    debouncedFunction('a');
-
-    setTimeout(() => {
-      debouncedFunction('b');
-    }, 100);
-
-    await wait(250);
-
-    expect(originalFunction).toHaveBeenCalledTimes(2);
-    expect(originalFunction).toHaveBeenLastCalledWith('b');
-  });
-
-  it('returns a promise', async () => {
-    const originalFunction = jest.fn((x) => Promise.resolve(x));
-    const debouncedFunction = debounce(originalFunction, 100);
-
-    debouncedFunction('a');
-
-    const promise = debouncedFunction('b');
-    await expect(promise).resolves.toEqual('b');
-
-    expect(originalFunction).toHaveBeenCalledTimes(1);
-    expect(originalFunction).toHaveBeenLastCalledWith('b');
-  });
-
-  it('returns a promise with a resolved data', async () => {
-    type OriginalFunction = () => Promise<'abc'>;
-    const originalFunction: OriginalFunction = () => Promise.resolve('abc');
-
-    const debouncedFunction = debounce<OriginalFunction>(originalFunction, 100);
-    const promise = debouncedFunction();
-    const ret = await promise;
-    expect(ret).toEqual('abc');
-  });
-
-  it('accepts synchronous function as well', async () => {
-    const originalFunction = jest.fn((x) => x);
-    const debouncedFunction = debounce(originalFunction, 100);
-    const promise = debouncedFunction('a');
-
-    await expect(promise).resolves.toEqual('a');
-  });
-});
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/find-test.ts b/packages/instantsearch.js/src/lib/utils/__tests__/find-test.ts
deleted file mode 100644
index 7efbd88678..0000000000
--- a/packages/instantsearch.js/src/lib/utils/__tests__/find-test.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { find } from '../find';
-
-describe('find', () => {
-  describe('with native array method', () => {
-    test('with empty array', () => {
-      const items: never[] = [];
-      const actual = find(items, (item) => item === 'hello');
-
-      expect(actual).toEqual(undefined);
-    });
-
-    test('with unknown item in array', () => {
-      const items = ['hey'];
-      const actual = find(items, (item) => item === 'hello');
-
-      expect(actual).toEqual(undefined);
-    });
-
-    test('with an array of strings', () => {
-      const items = ['hello', 'goodbye'];
-      const actual = find(items, (item) => item === 'hello');
-
-      expect(actual).toEqual('hello');
-    });
-
-    test('with an array of objects', () => {
-      const items = [{ name: 'John' }, { name: 'Jane' }];
-      const actual = find(items, (item) => item.name === 'John');
-
-      expect(actual).toEqual(items[0]);
-    });
-  });
-
-  describe('with polyfill', () => {
-    // eslint-disable-next-line jest/unbound-method
-    const originalArrayFind = Array.prototype.find;
-
-    beforeAll(() => {
-      // @ts-expect-error
-      delete Array.prototype.find;
-    });
-
-    afterAll(() => {
-      // eslint-disable-next-line no-extend-native
-      Array.prototype.find = originalArrayFind;
-    });
-
-    test('with empty array', () => {
-      const items: never[] = [];
-      const actual = find(items, (item) => item === 'hello');
-
-      expect(actual).toEqual(undefined);
-    });
-
-    test('with unknown item in array', () => {
-      const items = ['hey'];
-      const actual = find(items, (item) => item === 'hello');
-
-      expect(actual).toEqual(undefined);
-    });
-
-    test('with an array of strings', () => {
-      const items = ['hello', 'goodbye'];
-      const actual = find(items, (item) => item === 'hello');
-
-      expect(actual).toEqual('hello');
-    });
-
-    test('with an array of objects', () => {
-      const items = [{ name: 'John' }, { name: 'Jane' }];
-      const actual = find(items, (item) => item.name === 'John');
-
-      expect(actual).toEqual(items[0]);
-    });
-  });
-});
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/findIndex-test.ts b/packages/instantsearch.js/src/lib/utils/__tests__/findIndex-test.ts
deleted file mode 100644
index bd69d3c377..0000000000
--- a/packages/instantsearch.js/src/lib/utils/__tests__/findIndex-test.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { findIndex } from '../findIndex';
-
-describe('findIndex', () => {
-  describe('with polyfill', () => {
-    test('with empty array', () => {
-      const items: never[] = [];
-      const actual = findIndex(items, (item) => item === 'hello');
-
-      expect(actual).toEqual(-1);
-    });
-
-    test('with unknown item in array', () => {
-      const items = ['hey'];
-      const actual = findIndex(items, (item) => item === 'hello');
-
-      expect(actual).toEqual(-1);
-    });
-
-    test('with an array of strings', () => {
-      const items = ['hello', 'goodbye'];
-      const actual = findIndex(items, (item) => item === 'hello');
-
-      expect(actual).toEqual(0);
-    });
-
-    test('with an array of objects', () => {
-      const items = [{ name: 'John' }, { name: 'Jane' }];
-      const actual = findIndex(items, (item) => item.name === 'John');
-
-      expect(actual).toEqual(0);
-    });
-  });
-});
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/getContainerNode-test.ts b/packages/instantsearch.js/src/lib/utils/__tests__/getContainerNode.test.ts
similarity index 94%
rename from packages/instantsearch.js/src/lib/utils/__tests__/getContainerNode-test.ts
rename to packages/instantsearch.js/src/lib/utils/__tests__/getContainerNode.test.ts
index cc49b8592c..77c883a193 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/getContainerNode-test.ts
+++ b/packages/instantsearch.js/src/lib/utils/__tests__/getContainerNode.test.ts
@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 
-import { getContainerNode } from '../getContainerNode';
+import { getContainerNode } from '..';
 
 describe('getContainerNode', () => {
   it('should be able to get a node from a node', () => {
diff --git a/packages/instantsearch.js/src/lib/utils/__tests__/isDomElement-test.ts b/packages/instantsearch.js/src/lib/utils/__tests__/isDomElement.test.ts
similarity index 92%
rename from packages/instantsearch.js/src/lib/utils/__tests__/isDomElement-test.ts
rename to packages/instantsearch.js/src/lib/utils/__tests__/isDomElement.test.ts
index 015b6e6176..b2b1f69fe8 100644
--- a/packages/instantsearch.js/src/lib/utils/__tests__/isDomElement-test.ts
+++ b/packages/instantsearch.js/src/lib/utils/__tests__/isDomElement.test.ts
@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 
-import { isDomElement } from '../isDomElement';
+import { isDomElement } from '..';
 
 describe('isDomElement', () => {
   it('should return true for dom element', () => {
diff --git a/packages/instantsearch.js/src/lib/utils/concatHighlightedParts.ts b/packages/instantsearch.js/src/lib/utils/concatHighlightedParts.ts
deleted file mode 100644
index fd6d97fe6c..0000000000
--- a/packages/instantsearch.js/src/lib/utils/concatHighlightedParts.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { TAG_REPLACEMENT } from './escape-highlight';
-
-import type { HighlightedParts } from '../../types';
-
-export function concatHighlightedParts(parts: HighlightedParts[]) {
-  const { highlightPreTag, highlightPostTag } = TAG_REPLACEMENT;
-
-  return parts
-    .map((part) =>
-      part.isHighlighted
-        ? highlightPreTag + part.value + highlightPostTag
-        : part.value
-    )
-    .join('');
-}
diff --git a/packages/instantsearch.js/src/lib/utils/createConcurrentSafePromise.ts b/packages/instantsearch.js/src/lib/utils/createConcurrentSafePromise.ts
deleted file mode 100644
index 200ccb5cc6..0000000000
--- a/packages/instantsearch.js/src/lib/utils/createConcurrentSafePromise.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-export type MaybePromise<TResolution> =
-  | Readonly<Promise<TResolution>>
-  | Promise<TResolution>
-  | TResolution;
-
-// copied from
-// https://github.com/algolia/autocomplete.js/blob/307a7acc4283e10a19cb7d067f04f1bea79dc56f/packages/autocomplete-core/src/utils/createConcurrentSafePromise.ts#L1:L1
-/**
- * Creates a runner that executes promises in a concurrent-safe way.
- *
- * This is useful to prevent older promises to resolve after a newer promise,
- * otherwise resulting in stale resolved values.
- */
-export function createConcurrentSafePromise<TValue>() {
-  let basePromiseId = -1;
-  let latestResolvedId = -1;
-  let latestResolvedValue: TValue | undefined = undefined;
-
-  return function runConcurrentSafePromise(promise: MaybePromise<TValue>) {
-    const currentPromiseId = ++basePromiseId;
-
-    return Promise.resolve(promise).then((x) => {
-      // The promise might take too long to resolve and get outdated. This would
-      // result in resolving stale values.
-      // When this happens, we ignore the promise value and return the one
-      // coming from the latest resolved value.
-      //
-      // +----------------------------------+
-      // |        100ms                     |
-      // | run(1) +--->  R1                 |
-      // |        300ms                     |
-      // | run(2) +-------------> R2 (SKIP) |
-      // |        200ms                     |
-      // | run(3) +--------> R3             |
-      // +----------------------------------+
-      if (latestResolvedValue && currentPromiseId < latestResolvedId) {
-        return latestResolvedValue;
-      }
-
-      latestResolvedId = currentPromiseId;
-      latestResolvedValue = x;
-
-      return x;
-    });
-  };
-}
diff --git a/packages/instantsearch.js/src/lib/utils/debounce.ts b/packages/instantsearch.js/src/lib/utils/debounce.ts
deleted file mode 100644
index ddb140242f..0000000000
--- a/packages/instantsearch.js/src/lib/utils/debounce.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import type { Awaited } from '../../types';
-
-type Func = (...args: any[]) => any;
-
-export type DebouncedFunction<TFunction extends Func> = (
-  this: ThisParameterType<TFunction>,
-  ...args: Parameters<TFunction>
-) => Promise<Awaited<ReturnType<TFunction>>>;
-
-// Debounce a function call to the trailing edge.
-// The debounced function returns a promise.
-export function debounce<TFunction extends Func>(
-  func: TFunction,
-  wait: number
-): DebouncedFunction<TFunction> {
-  let lastTimeout: ReturnType<typeof setTimeout> | null = null;
-  return function (...args) {
-    return new Promise((resolve, reject) => {
-      if (lastTimeout) {
-        clearTimeout(lastTimeout);
-      }
-      lastTimeout = setTimeout(() => {
-        lastTimeout = null;
-        Promise.resolve(func(...args))
-          .then(resolve)
-          .catch(reject);
-      }, wait);
-    });
-  };
-}
diff --git a/packages/instantsearch.js/src/lib/utils/find.ts b/packages/instantsearch.js/src/lib/utils/find.ts
deleted file mode 100644
index 33a9ebb3c1..0000000000
--- a/packages/instantsearch.js/src/lib/utils/find.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// We aren't using the native `Array.prototype.find` because the refactor away from Lodash is not
-// published as a major version.
-// Relying on the `find` polyfill on user-land, which before was only required for niche use-cases,
-// was decided as too risky.
-// @MAJOR Replace with the native `Array.prototype.find` method
-// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/find
-export function find<TItem>(
-  items: TItem[],
-  predicate: (value: TItem, index: number, obj: TItem[]) => boolean
-): TItem | undefined {
-  let value: TItem;
-  for (let i = 0; i < items.length; i++) {
-    value = items[i];
-    // inlined for performance: if (Call(predicate, thisArg, [value, i, list])) {
-    if (predicate(value, i, items)) {
-      return value;
-    }
-  }
-
-  return undefined;
-}
diff --git a/packages/instantsearch.js/src/lib/utils/findIndex.ts b/packages/instantsearch.js/src/lib/utils/findIndex.ts
deleted file mode 100644
index efc19ad5c4..0000000000
--- a/packages/instantsearch.js/src/lib/utils/findIndex.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// We aren't using the native `Array.prototype.findIndex` because the refactor away from Lodash is not
-// published as a major version.
-// Relying on the `findIndex` polyfill on user-land, which before was only required for niche use-cases,
-// was decided as too risky.
-// @MAJOR Replace with the native `Array.prototype.findIndex` method
-// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/findIndex
-export function findIndex<TItem>(
-  array: TItem[],
-  comparator: (value: TItem) => boolean
-): number {
-  if (!Array.isArray(array)) {
-    return -1;
-  }
-
-  for (let i = 0; i < array.length; i++) {
-    if (comparator(array[i])) {
-      return i;
-    }
-  }
-  return -1;
-}
diff --git a/packages/instantsearch.js/src/lib/utils/index.ts b/packages/instantsearch.js/src/lib/utils/index.ts
index 8016765778..9d0478e7ad 100644
--- a/packages/instantsearch.js/src/lib/utils/index.ts
+++ b/packages/instantsearch.js/src/lib/utils/index.ts
@@ -1,53 +1,40 @@
-export * from './addWidgetId';
-export * from './capitalize';
-export * from './checkIndexUiState';
-export * from './checkRendering';
-export * from './clearRefinements';
-export * from './concatHighlightedParts';
-export * from './createConcurrentSafePromise';
-export * from './createSendEventForFacet';
-export * from './createSendEventForHits';
-export * from './debounce';
-export * from './defer';
-export * from './documentation';
-export * from './escape-highlight';
-export * from './escape-html';
-export * from './escapeFacetValue';
-export * from './find';
-export * from './findIndex';
-export * from './geo-search';
-export * from './getAppIdAndApiKey';
 export * from './getContainerNode';
-export * from './getHighlightedParts';
-export * from './getHighlightFromSiblings';
-export * from './getInsightsAnonymousUserToken';
-export * from './getObjectType';
-export * from './getPropertyByPath';
-export * from './getRefinements';
-export * from './getWidgetAttribute';
-export * from './hits-absolute-position';
-export * from './hits-query-id';
-export * from './hydrateRecommendCache';
-export * from './hydrateSearchClient';
 export * from './isDomElement';
-export * from './isEqual';
-export * from './isFacetRefined';
-export * from './isFiniteNumber';
-export * from './isIndexWidget';
-export * from './isPlainObject';
-export * from './isSpecialClick';
-export * from './logger';
-export * from './mergeSearchParameters';
-export * from './noop';
-export * from './omit';
-export * from './range';
-export * from './render-args';
-export * from './resolveSearchParameters';
-export * from './reverseHighlightedParts';
-export * from './safelyRunOnBrowser';
-export * from './serializer';
-export * from './setIndexHelperState';
-export * from './toArray';
-export * from './uniq';
-export * from './uuid';
-export * from './walkIndex';
+export {
+  addWidgetId,
+  resetWidgetId,
+  capitalize,
+  defer,
+  createDocumentationLink,
+  createDocumentationMessageGenerator,
+  TAG_PLACEHOLDER,
+  TAG_REPLACEMENT,
+  escapeHits,
+  escapeFacets,
+  escape,
+  unescape,
+  getHighlightedParts,
+  getHighlightFromSiblings,
+  getObjectType,
+  getPropertyByPath,
+  getWidgetAttribute,
+  isEqual,
+  isFacetRefined,
+  isIndexWidget,
+  isPlainObject,
+  isSpecialClick,
+  warnCache,
+  deprecate,
+  warning,
+  noop,
+  range,
+  createInitArgs,
+  createRenderArgs,
+  reverseHighlightedParts,
+  safelyRunOnBrowser,
+  toArray,
+  keys,
+  uniq,
+  createUUID,
+  walkIndex,
+} from 'instantsearch-core';
diff --git a/packages/instantsearch.js/src/lib/utils/isFiniteNumber.ts b/packages/instantsearch.js/src/lib/utils/isFiniteNumber.ts
deleted file mode 100644
index fb6c2fd47d..0000000000
--- a/packages/instantsearch.js/src/lib/utils/isFiniteNumber.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// This is the `Number.isFinite()` polyfill recommended by MDN.
-// We do not provide any tests for this function.
-// See: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/isFinite#Polyfill
-// @MAJOR Replace with the native `Number.isFinite` method
-export function isFiniteNumber(value: any): value is number {
-  return typeof value === 'number' && isFinite(value);
-}
diff --git a/packages/instantsearch.js/src/lib/utils/omit.ts b/packages/instantsearch.js/src/lib/utils/omit.ts
deleted file mode 100644
index 81e58b4ce8..0000000000
--- a/packages/instantsearch.js/src/lib/utils/omit.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Creates a new object with the same keys as the original object, but without the excluded keys.
- * @param source original object
- * @param excluded keys to remove from the original object
- * @returns the new object
- */
-export function omit<
-  TSource extends Record<string, unknown>,
-  TExcluded extends keyof TSource
->(source: TSource, excluded: TExcluded[]): Omit<TSource, TExcluded> {
-  if (source === null || source === undefined) {
-    return source;
-  }
-
-  type Output = Omit<TSource, TExcluded>;
-  return Object.keys(source).reduce((target, key) => {
-    if ((excluded as Array<keyof TSource>).indexOf(key) >= 0) {
-      return target;
-    }
-
-    const validKey = key as keyof Output;
-    target[validKey] = source[validKey];
-
-    return target;
-  }, {} as unknown as Output);
-}
diff --git a/packages/instantsearch.js/src/middlewares/index.ts b/packages/instantsearch.js/src/middlewares/index.ts
index a44215a78b..129e8d678f 100644
--- a/packages/instantsearch.js/src/middlewares/index.ts
+++ b/packages/instantsearch.js/src/middlewares/index.ts
@@ -1,3 +1,14 @@
-export * from './createInsightsMiddleware';
-export * from './createRouterMiddleware';
-export * from './createMetadataMiddleware';
+export { createInsightsMiddleware } from 'instantsearch-core';
+export type {
+  InsightsClient,
+  InsightsMethod,
+  InsightsEvent,
+  InsightsProps,
+  InsightsClientWithGlobals,
+  CreateInsightsMiddleware,
+} from 'instantsearch-core';
+
+export { createRouterMiddleware } from 'instantsearch-core';
+export type { RouterProps } from 'instantsearch-core';
+
+export { createMetadataMiddleware } from 'instantsearch-core';
diff --git a/packages/instantsearch.js/src/types/algoliasearch.ts b/packages/instantsearch.js/src/types/algoliasearch.ts
deleted file mode 100644
index ac04a682a8..0000000000
--- a/packages/instantsearch.js/src/types/algoliasearch.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// eslint-disable-next-line import/extensions
-export * from 'algoliasearch-helper/types/algoliasearch.js';
-
-export {};
diff --git a/packages/instantsearch.js/src/types/index.ts b/packages/instantsearch.js/src/types/index.ts
index 46af57f9f5..2e3df1fe57 100644
--- a/packages/instantsearch.js/src/types/index.ts
+++ b/packages/instantsearch.js/src/types/index.ts
@@ -1,24 +1,10 @@
-// internal
-export * from './utils';
-
-// Algolia-related
-// eslint-disable-next-line import/export
-export * from './algoliasearch';
-export * from './results';
+export type * from 'instantsearch-core';
 
 // component-related
-export * from './component';
-
-// instantsearch-related
-export * from './instantsearch';
-export * from './middleware';
-export * from './router';
-export * from './insights';
+export type * from './component';
 
 // widget-related
-export * from './connector';
-export * from './widget-factory';
-export * from './widget';
-export * from './ui-state';
-export * from './render-state';
-export * from './templates';
+export type * from './widget-factory';
+export type * from './templates';
+
+export {};
diff --git a/packages/instantsearch.js/src/types/instantsearch.ts b/packages/instantsearch.js/src/types/instantsearch.ts
deleted file mode 100644
index c19da2d6d2..0000000000
--- a/packages/instantsearch.js/src/types/instantsearch.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export type {
-  default as InstantSearch,
-  InstantSearchOptions,
-  InstantSearchStatus,
-} from '../lib/InstantSearch';
diff --git a/packages/instantsearch.js/src/types/render-state.ts b/packages/instantsearch.js/src/types/render-state.ts
deleted file mode 100644
index e1e5ae7889..0000000000
--- a/packages/instantsearch.js/src/types/render-state.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import type { AutocompleteWidgetDescription } from '../connectors/autocomplete/connectAutocomplete';
-import type { BreadcrumbWidgetDescription } from '../connectors/breadcrumb/connectBreadcrumb';
-import type { ClearRefinementsWidgetDescription } from '../connectors/clear-refinements/connectClearRefinements';
-import type { ConfigureWidgetDescription } from '../connectors/configure/connectConfigure';
-import type { CurrentRefinementsWidgetDescription } from '../connectors/current-refinements/connectCurrentRefinements';
-import type { GeoSearchWidgetDescription } from '../connectors/geo-search/connectGeoSearch';
-import type { HierarchicalMenuWidgetDescription } from '../connectors/hierarchical-menu/connectHierarchicalMenu';
-import type { HitsPerPageWidgetDescription } from '../connectors/hits-per-page/connectHitsPerPage';
-import type { HitsWidgetDescription } from '../connectors/hits/connectHits';
-import type { InfiniteHitsWidgetDescription } from '../connectors/infinite-hits/connectInfiniteHits';
-import type { MenuWidgetDescription } from '../connectors/menu/connectMenu';
-import type { NumericMenuWidgetDescription } from '../connectors/numeric-menu/connectNumericMenu';
-import type { PaginationWidgetDescription } from '../connectors/pagination/connectPagination';
-import type { PoweredByWidgetDescription } from '../connectors/powered-by/connectPoweredBy';
-import type { QueryRulesWidgetDescription } from '../connectors/query-rules/connectQueryRules';
-import type { RangeWidgetDescription } from '../connectors/range/connectRange';
-import type { RatingMenuWidgetDescription } from '../connectors/rating-menu/connectRatingMenu';
-import type { RefinementListWidgetDescription } from '../connectors/refinement-list/connectRefinementList';
-import type { RelevantSortWidgetDescription } from '../connectors/relevant-sort/connectRelevantSort';
-import type { SearchBoxWidgetDescription } from '../connectors/search-box/connectSearchBox';
-import type { SortByWidgetDescription } from '../connectors/sort-by/connectSortBy';
-import type { StatsWidgetDescription } from '../connectors/stats/connectStats';
-import type { ToggleRefinementWidgetDescription } from '../connectors/toggle-refinement/connectToggleRefinement';
-import type { VoiceSearchWidgetDescription } from '../connectors/voice-search/connectVoiceSearch';
-
-type ConnectorRenderStates = AutocompleteWidgetDescription['indexRenderState'] &
-  BreadcrumbWidgetDescription['indexRenderState'] &
-  ClearRefinementsWidgetDescription['indexRenderState'] &
-  ConfigureWidgetDescription['indexRenderState'] &
-  CurrentRefinementsWidgetDescription['indexRenderState'] &
-  GeoSearchWidgetDescription['indexRenderState'] &
-  HierarchicalMenuWidgetDescription['indexRenderState'] &
-  HitsWidgetDescription['indexRenderState'] &
-  HitsPerPageWidgetDescription['indexRenderState'] &
-  InfiniteHitsWidgetDescription['indexRenderState'] &
-  MenuWidgetDescription['indexRenderState'] &
-  NumericMenuWidgetDescription['indexRenderState'] &
-  PaginationWidgetDescription['indexRenderState'] &
-  PoweredByWidgetDescription['indexRenderState'] &
-  QueryRulesWidgetDescription['indexRenderState'] &
-  RangeWidgetDescription['indexRenderState'] &
-  RatingMenuWidgetDescription['indexRenderState'] &
-  RefinementListWidgetDescription['indexRenderState'] &
-  RelevantSortWidgetDescription['indexRenderState'] &
-  SearchBoxWidgetDescription['indexRenderState'] &
-  SortByWidgetDescription['indexRenderState'] &
-  StatsWidgetDescription['indexRenderState'] &
-  ToggleRefinementWidgetDescription['indexRenderState'] &
-  VoiceSearchWidgetDescription['indexRenderState'];
-
-export type IndexRenderState = Partial<ConnectorRenderStates>;
-
-export type RenderState = {
-  [indexId: string]: IndexRenderState;
-};
-
-export type WidgetRenderState<TWidgetRenderState, TWidgetParams> =
-  TWidgetRenderState & {
-    widgetParams: TWidgetParams;
-  };
diff --git a/packages/instantsearch.js/src/types/templates.ts b/packages/instantsearch.js/src/types/templates.ts
index bf1ca934fd..762457b4d8 100644
--- a/packages/instantsearch.js/src/types/templates.ts
+++ b/packages/instantsearch.js/src/types/templates.ts
@@ -4,8 +4,8 @@ import type {
   ReverseSnippet,
   Snippet,
 } from '../helpers/components';
-import type { SendEventForHits } from '../lib/utils';
 import type { html } from 'htm/preact';
+import type { SendEventForHits } from 'instantsearch-core';
 import type { VNode } from 'preact';
 
 export type Template<TTemplateData = void> = (
diff --git a/packages/instantsearch.js/src/types/ui-state.ts b/packages/instantsearch.js/src/types/ui-state.ts
deleted file mode 100644
index cae6aa048a..0000000000
--- a/packages/instantsearch.js/src/types/ui-state.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import type { AutocompleteWidgetDescription } from '../connectors/autocomplete/connectAutocomplete';
-import type { ConfigureWidgetDescription } from '../connectors/configure/connectConfigure';
-import type { GeoSearchWidgetDescription } from '../connectors/geo-search/connectGeoSearch';
-import type { HierarchicalMenuWidgetDescription } from '../connectors/hierarchical-menu/connectHierarchicalMenu';
-import type { HitsPerPageWidgetDescription } from '../connectors/hits-per-page/connectHitsPerPage';
-import type { InfiniteHitsWidgetDescription } from '../connectors/infinite-hits/connectInfiniteHits';
-import type { MenuWidgetDescription } from '../connectors/menu/connectMenu';
-import type { NumericMenuWidgetDescription } from '../connectors/numeric-menu/connectNumericMenu';
-import type { PaginationWidgetDescription } from '../connectors/pagination/connectPagination';
-import type { RangeWidgetDescription } from '../connectors/range/connectRange';
-import type { RatingMenuWidgetDescription } from '../connectors/rating-menu/connectRatingMenu';
-import type { RefinementListWidgetDescription } from '../connectors/refinement-list/connectRefinementList';
-import type { RelevantSortWidgetDescription } from '../connectors/relevant-sort/connectRelevantSort';
-import type { SearchBoxWidgetDescription } from '../connectors/search-box/connectSearchBox';
-import type { SortByWidgetDescription } from '../connectors/sort-by/connectSortBy';
-import type { ToggleRefinementWidgetDescription } from '../connectors/toggle-refinement/connectToggleRefinement';
-import type { VoiceSearchWidgetDescription } from '../connectors/voice-search/connectVoiceSearch';
-
-type ConnectorUiStates = AutocompleteWidgetDescription['indexUiState'] &
-  ConfigureWidgetDescription['indexUiState'] &
-  GeoSearchWidgetDescription['indexUiState'] &
-  HierarchicalMenuWidgetDescription['indexUiState'] &
-  HitsPerPageWidgetDescription['indexUiState'] &
-  InfiniteHitsWidgetDescription['indexUiState'] &
-  MenuWidgetDescription['indexUiState'] &
-  NumericMenuWidgetDescription['indexUiState'] &
-  PaginationWidgetDescription['indexUiState'] &
-  RangeWidgetDescription['indexUiState'] &
-  RatingMenuWidgetDescription['indexUiState'] &
-  RefinementListWidgetDescription['indexUiState'] &
-  RelevantSortWidgetDescription['indexUiState'] &
-  SearchBoxWidgetDescription['indexUiState'] &
-  SortByWidgetDescription['indexUiState'] &
-  ToggleRefinementWidgetDescription['indexUiState'] &
-  VoiceSearchWidgetDescription['indexUiState'];
-
-export type IndexUiState = Partial<ConnectorUiStates>;
-
-export type UiState = {
-  [indexId: string]: IndexUiState;
-};
diff --git a/packages/instantsearch.js/src/types/widget-factory.ts b/packages/instantsearch.js/src/types/widget-factory.ts
index f55c13f7ae..34eebbf641 100644
--- a/packages/instantsearch.js/src/types/widget-factory.ts
+++ b/packages/instantsearch.js/src/types/widget-factory.ts
@@ -1,4 +1,8 @@
-import type { UnknownWidgetParams, Widget, WidgetDescription } from './widget';
+import type {
+  UnknownWidgetParams,
+  Widget,
+  WidgetDescription,
+} from 'instantsearch-core';
 
 /**
  * The function that creates a new widget.
diff --git a/packages/instantsearch.js/src/widgets/__tests__/index.test.ts b/packages/instantsearch.js/src/widgets/__tests__/index.test.ts
index 3683f64f42..c7f5886d04 100644
--- a/packages/instantsearch.js/src/widgets/__tests__/index.test.ts
+++ b/packages/instantsearch.js/src/widgets/__tests__/index.test.ts
@@ -4,8 +4,8 @@
 /* global google */
 import * as widgets from '..';
 
+import type { IndexWidget } from '..';
 import type { UnknownWidgetFactory, Widget } from '../../types';
-import type { IndexWidget } from '../index/index';
 
 /**
  * Checklist when adding a new widget
@@ -168,7 +168,7 @@ describe('widgets', () => {
       const widgetInstances = initiateAllWidgets();
 
       widgetInstances.forEach(([name, widget]) =>
-        expect([name, widget.$$widgetType!.substr(0, 4)]).toEqual([
+        expect([name, widget.$$widgetType?.substr(0, 4)]).toEqual([
           name,
           'ais.',
         ])
diff --git a/packages/instantsearch.js/src/widgets/breadcrumb/breadcrumb.tsx b/packages/instantsearch.js/src/widgets/breadcrumb/breadcrumb.tsx
index f7fa016ad0..4bc7f76f98 100644
--- a/packages/instantsearch.js/src/widgets/breadcrumb/breadcrumb.tsx
+++ b/packages/instantsearch.js/src/widgets/breadcrumb/breadcrumb.tsx
@@ -4,7 +4,7 @@ import { cx } from 'instantsearch-ui-components';
 import { h, render } from 'preact';
 
 import Breadcrumb from '../../components/Breadcrumb/Breadcrumb';
-import connectBreadcrumb from '../../connectors/breadcrumb/connectBreadcrumb';
+import { connectBreadcrumb } from '../../connectors';
 import { component } from '../../lib/suit';
 import { prepareTemplateProps } from '../../lib/templating';
 import {
@@ -22,7 +22,7 @@ import type {
   BreadcrumbWidgetDescription,
   BreadcrumbConnectorParams,
   BreadcrumbRenderState,
-} from '../../connectors/breadcrumb/connectBreadcrumb';
+} from '../../connectors';
 import type { PreparedTemplateProps } from '../../lib/templating';
 import type { WidgetFactory, Template, Renderer } from '../../types';
 
diff --git a/packages/instantsearch.js/src/widgets/clear-refinements/clear-refinements.tsx b/packages/instantsearch.js/src/widgets/clear-refinements/clear-refinements.tsx
index 1e4ab9d53a..63f08fb9bf 100644
--- a/packages/instantsearch.js/src/widgets/clear-refinements/clear-refinements.tsx
+++ b/packages/instantsearch.js/src/widgets/clear-refinements/clear-refinements.tsx
@@ -4,7 +4,7 @@ import { cx } from 'instantsearch-ui-components';
 import { h, render } from 'preact';
 
 import ClearRefinements from '../../components/ClearRefinements/ClearRefinements';
-import connectClearRefinements from '../../connectors/clear-refinements/connectClearRefinements';
+import { connectClearRefinements } from '../../connectors';
 import { component } from '../../lib/suit';
 import { prepareTemplateProps } from '../../lib/templating';
 import {
@@ -22,7 +22,7 @@ import type {
   ClearRefinementsConnectorParams,
   ClearRefinementsRenderState,
   ClearRefinementsWidgetDescription,
-} from '../../connectors/clear-refinements/connectClearRefinements';
+} from '../../connectors';
 import type { PreparedTemplateProps } from '../../lib/templating';
 import type { WidgetFactory, Template, Renderer } from '../../types';
 
diff --git a/packages/instantsearch.js/src/widgets/configure/configure.ts b/packages/instantsearch.js/src/widgets/configure/configure.ts
index 8024d6d67c..c5b41bb959 100644
--- a/packages/instantsearch.js/src/widgets/configure/configure.ts
+++ b/packages/instantsearch.js/src/widgets/configure/configure.ts
@@ -1,10 +1,10 @@
-import connectConfigure from '../../connectors/configure/connectConfigure';
+import { connectConfigure } from '../../connectors';
 import { noop } from '../../lib/utils';
 
 import type {
   ConfigureConnectorParams,
   ConfigureWidgetDescription,
-} from '../../connectors/configure/connectConfigure';
+} from '../../connectors';
 import type { Widget } from '../../types';
 
 /**
diff --git a/packages/instantsearch.js/src/widgets/current-refinements/current-refinements.tsx b/packages/instantsearch.js/src/widgets/current-refinements/current-refinements.tsx
index f9ecb3afe3..5b4aabcede 100644
--- a/packages/instantsearch.js/src/widgets/current-refinements/current-refinements.tsx
+++ b/packages/instantsearch.js/src/widgets/current-refinements/current-refinements.tsx
@@ -4,7 +4,7 @@ import { cx } from 'instantsearch-ui-components';
 import { h, render } from 'preact';
 
 import CurrentRefinements from '../../components/CurrentRefinements/CurrentRefinements';
-import connectCurrentRefinements from '../../connectors/current-refinements/connectCurrentRefinements';
+import { connectCurrentRefinements } from '../../connectors';
 import { component } from '../../lib/suit';
 import {
   getContainerNode,
@@ -15,7 +15,7 @@ import type {
   CurrentRefinementsConnectorParams,
   CurrentRefinementsRenderState,
   CurrentRefinementsWidgetDescription,
-} from '../../connectors/current-refinements/connectCurrentRefinements';
+} from '../../connectors';
 import type { ComponentCSSClasses, Renderer, WidgetFactory } from '../../types';
 
 export type CurrentRefinementsCSSClasses = Partial<{
diff --git a/packages/instantsearch.js/src/widgets/dynamic-widgets/__tests__/dynamic-widgets-test.ts b/packages/instantsearch.js/src/widgets/dynamic-widgets/__tests__/dynamic-widgets-test.ts
index 8d99533864..80e4220144 100644
--- a/packages/instantsearch.js/src/widgets/dynamic-widgets/__tests__/dynamic-widgets-test.ts
+++ b/packages/instantsearch.js/src/widgets/dynamic-widgets/__tests__/dynamic-widgets-test.ts
@@ -19,7 +19,7 @@ import {
 } from '../../../../test/createWidget';
 import refinementList from '../../refinement-list/refinement-list';
 
-import type { SearchResponse } from '../../../types/algoliasearch';
+import type { SearchResponse } from 'instantsearch-core';
 
 expect.addSnapshotSerializer(widgetSnapshotSerializer);
 
diff --git a/packages/instantsearch.js/src/widgets/dynamic-widgets/dynamic-widgets.ts b/packages/instantsearch.js/src/widgets/dynamic-widgets/dynamic-widgets.ts
index 76b2a8ff90..a7f07258f0 100644
--- a/packages/instantsearch.js/src/widgets/dynamic-widgets/dynamic-widgets.ts
+++ b/packages/instantsearch.js/src/widgets/dynamic-widgets/dynamic-widgets.ts
@@ -1,4 +1,4 @@
-import connectDynamicWidgets from '../../connectors/dynamic-widgets/connectDynamicWidgets';
+import { connectDynamicWidgets } from '../../connectors';
 import { component } from '../../lib/suit';
 import {
   createDocumentationMessageGenerator,
@@ -9,7 +9,7 @@ import {
 import type {
   DynamicWidgetsConnectorParams,
   DynamicWidgetsWidgetDescription,
-} from '../../connectors/dynamic-widgets/connectDynamicWidgets';
+} from '../../connectors';
 import type { Widget, WidgetFactory } from '../../types';
 
 const withUsage = createDocumentationMessageGenerator({
diff --git a/packages/instantsearch.js/src/widgets/frequently-bought-together/frequently-bought-together.tsx b/packages/instantsearch.js/src/widgets/frequently-bought-together/frequently-bought-together.tsx
index 7fecae817a..d267b69c82 100644
--- a/packages/instantsearch.js/src/widgets/frequently-bought-together/frequently-bought-together.tsx
+++ b/packages/instantsearch.js/src/widgets/frequently-bought-together/frequently-bought-together.tsx
@@ -4,7 +4,7 @@ import { createFrequentlyBoughtTogetherComponent } from 'instantsearch-ui-compon
 import { Fragment, h, render } from 'preact';
 
 import TemplateComponent from '../../components/Template/Template';
-import connectFrequentlyBoughtTogether from '../../connectors/frequently-bought-together/connectFrequentlyBoughtTogether';
+import { connectFrequentlyBoughtTogether } from '../../connectors';
 import { prepareTemplateProps } from '../../lib/templating';
 import {
   getContainerNode,
@@ -15,7 +15,7 @@ import type {
   FrequentlyBoughtTogetherWidgetDescription,
   FrequentlyBoughtTogetherConnectorParams,
   FrequentlyBoughtTogetherRenderState,
-} from '../../connectors/frequently-bought-together/connectFrequentlyBoughtTogether';
+} from '../../connectors';
 import type { PreparedTemplateProps } from '../../lib/templating';
 import type {
   Template,
@@ -24,7 +24,8 @@ import type {
   BaseHit,
   RecommendResponse,
   Hit,
-  TemplateWithBindEvent,
+  TemplateWithSendEvent,
+  Widget,
 } from '../../types';
 import type {
   RecommendClassNames,
@@ -188,7 +189,7 @@ export type FrequentlyBoughtTogetherTemplates<
   /**
    * Template to use for each result. This template will receive an object containing a single record.
    */
-  item: TemplateWithBindEvent<Hit<THit>>;
+  item: TemplateWithSendEvent<Hit<THit>>;
 
   /**
    * Template to use to wrap all items.
@@ -227,12 +228,14 @@ type FrequentlyBoughtTogetherWidgetParams<
   cssClasses?: FrequentlyBoughtTogetherCSSClasses;
 };
 
-export type FrequentlyBoughtTogetherWidget = WidgetFactory<
-  FrequentlyBoughtTogetherWidgetDescription & {
+export type FrequentlyBoughtTogetherWidget<
+  THit extends NonNullable<object> = BaseHit
+> = WidgetFactory<
+  FrequentlyBoughtTogetherWidgetDescription<THit> & {
     $$widgetType: 'ais.frequentlyBoughtTogether';
   },
-  FrequentlyBoughtTogetherConnectorParams,
-  FrequentlyBoughtTogetherWidgetParams
+  FrequentlyBoughtTogetherConnectorParams<THit>,
+  FrequentlyBoughtTogetherWidgetParams<THit>
 >;
 
 export default (function frequentlyBoughtTogether<
@@ -269,7 +272,8 @@ export default (function frequentlyBoughtTogether<
   const makeWidget = connectFrequentlyBoughtTogether(specializedRenderer, () =>
     render(null, containerNode)
   );
-  return {
+
+  const widget = {
     ...makeWidget({
       objectIDs,
       limit,
@@ -280,4 +284,12 @@ export default (function frequentlyBoughtTogether<
     }),
     $$widgetType: 'ais.frequentlyBoughtTogether',
   };
+
+  // explicitly cast this type to have a small type output.
+  return widget as Widget<
+    FrequentlyBoughtTogetherWidgetDescription & {
+      $$widgetType: 'ais.frequentlyBoughtTogether';
+      widgetParams: FrequentlyBoughtTogetherConnectorParams<THit>;
+    }
+  >;
 } satisfies FrequentlyBoughtTogetherWidget);
diff --git a/packages/instantsearch.js/src/widgets/geo-search/GeoSearchRenderer.d.ts b/packages/instantsearch.js/src/widgets/geo-search/GeoSearchRenderer.d.ts
index 60807160b6..c74ea27b78 100644
--- a/packages/instantsearch.js/src/widgets/geo-search/GeoSearchRenderer.d.ts
+++ b/packages/instantsearch.js/src/widgets/geo-search/GeoSearchRenderer.d.ts
@@ -2,7 +2,7 @@
 import type {
   GeoSearchConnectorParams,
   GeoSearchRenderState,
-} from '../../connectors/geo-search/connectGeoSearch';
+} from '../../connectors';
 import type { PreparedTemplateProps } from '../../lib/templating';
 import type { ComponentCSSClasses, Renderer } from '../../types';
 import type { HTMLMarkerArguments } from './createHTMLMarker';
diff --git a/packages/instantsearch.js/src/widgets/geo-search/__tests__/geo-search-test.ts b/packages/instantsearch.js/src/widgets/geo-search/__tests__/geo-search-test.ts
index 4b88db7fb3..c59bb68849 100644
--- a/packages/instantsearch.js/src/widgets/geo-search/__tests__/geo-search-test.ts
+++ b/packages/instantsearch.js/src/widgets/geo-search/__tests__/geo-search-test.ts
@@ -176,7 +176,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       container,
     });
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         instantSearchInstance,
         helper,
@@ -184,7 +184,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       })
     );
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         helper,
         instantSearchInstance,
@@ -225,7 +225,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       },
     });
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         helper,
         instantSearchInstance,
@@ -233,7 +233,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       })
     );
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         helper,
         instantSearchInstance,
@@ -267,7 +267,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       },
     });
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         helper,
         instantSearchInstance,
@@ -275,7 +275,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       })
     );
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         helper,
         instantSearchInstance,
@@ -308,7 +308,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       container,
     });
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         helper,
         instantSearchInstance,
@@ -346,7 +346,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       },
     });
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         helper,
         instantSearchInstance,
@@ -377,7 +377,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       container,
     });
 
-    widget.init(
+    widget.init!(
       createInitOptions({
         helper,
         instantSearchInstance,
@@ -385,7 +385,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       })
     );
 
-    widget.render(
+    widget.render!(
       createRenderOptions({
         helper,
         instantSearchInstance,
@@ -399,7 +399,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
     expect(render).toHaveBeenCalledTimes(1);
 
-    widget.dispose(
+    widget.dispose!(
       createDisposeOptions({
         helper,
         state: helper.state,
@@ -423,7 +423,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         container,
       });
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           helper,
           instantSearchInstance,
@@ -476,7 +476,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         container,
       });
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           helper,
           instantSearchInstance,
@@ -514,7 +514,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         container,
       });
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           helper,
           instantSearchInstance,
@@ -556,7 +556,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         container,
       });
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           helper,
           instantSearchInstance,
@@ -591,7 +591,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
           container,
         });
 
-        widget.init(
+        widget.init!(
           createInitOptions({
             helper,
             instantSearchInstance,
@@ -606,7 +606,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
           expect.any(Function)
         );
 
-        widget.render(
+        widget.render!(
           createRenderOptions({
             helper,
             instantSearchInstance,
@@ -639,7 +639,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
           container,
         });
 
-        widget.init(
+        widget.init!(
           createInitOptions({
             helper,
             instantSearchInstance,
@@ -654,7 +654,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
           expect.any(Function)
         );
 
-        widget.render(
+        widget.render!(
           createRenderOptions({
             helper,
             instantSearchInstance,
@@ -686,7 +686,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
           enableRefineOnMapMove: false,
         });
 
-        widget.init(
+        widget.init!(
           createInitOptions({
             helper,
             instantSearchInstance,
@@ -701,7 +701,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
           expect.any(Function)
         );
 
-        widget.render(
+        widget.render!(
           createRenderOptions({
             helper,
             instantSearchInstance,
@@ -732,7 +732,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
           container,
         });
 
-        widget.init(
+        widget.init!(
           createInitOptions({
             helper,
             instantSearchInstance,
@@ -776,7 +776,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
           enableRefine: false,
         });
 
-        widget.init(
+        widget.init!(
           createInitOptions({
             helper,
             instantSearchInstance,
@@ -818,7 +818,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         container,
       });
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           helper,
           instantSearchInstance,
@@ -826,7 +826,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         })
       );
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           helper,
           instantSearchInstance,
@@ -868,7 +868,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         },
       });
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           helper,
           instantSearchInstance,
@@ -876,7 +876,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         })
       );
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           helper,
           instantSearchInstance,
@@ -927,7 +927,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         },
       });
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           helper,
           instantSearchInstance,
@@ -935,7 +935,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         })
       );
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           helper,
           instantSearchInstance,
@@ -990,7 +990,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         customHTMLMarker: true,
       });
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           helper,
           instantSearchInstance,
@@ -998,7 +998,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         })
       );
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           helper,
           instantSearchInstance,
@@ -1076,7 +1076,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         },
       });
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           helper,
           instantSearchInstance,
@@ -1084,7 +1084,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         })
       );
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           helper,
           instantSearchInstance,
@@ -1154,7 +1154,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         },
       });
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           helper,
           instantSearchInstance,
@@ -1162,7 +1162,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         })
       );
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           helper,
           instantSearchInstance,
@@ -1231,7 +1231,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         },
       });
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           helper,
           instantSearchInstance,
@@ -1239,7 +1239,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         })
       );
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           helper,
           instantSearchInstance,
@@ -1326,7 +1326,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         },
       });
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           helper,
           instantSearchInstance,
@@ -1334,7 +1334,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         })
       );
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           helper,
           instantSearchInstance,
@@ -1390,7 +1390,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         container,
       });
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           helper,
           instantSearchInstance,
@@ -1398,7 +1398,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         })
       );
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           helper,
           instantSearchInstance,
@@ -1437,7 +1437,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         container,
       });
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           helper,
           instantSearchInstance,
@@ -1445,7 +1445,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         })
       );
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           helper,
           instantSearchInstance,
@@ -1474,7 +1474,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         container,
       });
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           helper,
           instantSearchInstance,
@@ -1482,7 +1482,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         })
       );
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           helper,
           instantSearchInstance,
@@ -1500,7 +1500,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
       (googleReference.maps.Marker as unknown as jest.Mock).mockClear();
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           helper,
           instantSearchInstance,
@@ -1541,7 +1541,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         container,
       });
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           helper,
           instantSearchInstance,
@@ -1549,7 +1549,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         })
       );
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           helper,
           instantSearchInstance,
@@ -1567,7 +1567,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
       (googleReference.maps.Marker as unknown as jest.Mock).mockClear();
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           helper,
           instantSearchInstance,
@@ -1600,7 +1600,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         container,
       });
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           helper,
           instantSearchInstance,
@@ -1608,7 +1608,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         })
       );
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           helper,
           instantSearchInstance,
@@ -1630,7 +1630,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       );
       expect(renderer).toHaveBeenCalledTimes(2);
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           helper,
           instantSearchInstance,
@@ -1683,7 +1683,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         container,
       });
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           helper,
           instantSearchInstance,
@@ -1693,7 +1693,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
       simulateMapReadyEvent(googleReference);
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           helper,
           instantSearchInstance,
@@ -1735,7 +1735,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       // Simulate refine
       simulateEvent(mapInstance, 'idle');
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           helper,
           instantSearchInstance,
@@ -1781,7 +1781,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         container,
       });
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           helper,
           instantSearchInstance,
@@ -1789,7 +1789,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         })
       );
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           helper,
           instantSearchInstance,
@@ -1812,7 +1812,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       );
       expect(renderer).toHaveBeenCalledTimes(2);
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           helper,
           instantSearchInstance,
@@ -1851,7 +1851,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         container,
       });
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           helper,
           instantSearchInstance,
@@ -1859,7 +1859,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         })
       );
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           helper,
           instantSearchInstance,
@@ -1877,7 +1877,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
       expect(renderer).toHaveBeenCalledTimes(2);
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           helper,
           instantSearchInstance,
@@ -1918,7 +1918,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         container,
       });
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           helper,
           instantSearchInstance,
@@ -1926,7 +1926,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         })
       );
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           helper,
           instantSearchInstance,
@@ -1943,7 +1943,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       expect(mapInstance.setCenter).toHaveBeenCalledTimes(0);
       expect(renderer).toHaveBeenCalledTimes(2);
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           helper,
           instantSearchInstance,
@@ -1981,7 +1981,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         container,
       });
 
-      widget.init(
+      widget.init!(
         createInitOptions({
           helper,
           instantSearchInstance,
@@ -1991,7 +1991,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
 
       simulateMapReadyEvent(googleReference);
 
-      widget.render(
+      widget.render!(
         createRenderOptions({
           helper,
           instantSearchInstance,
diff --git a/packages/instantsearch.js/src/widgets/geo-search/geo-search.ts b/packages/instantsearch.js/src/widgets/geo-search/geo-search.ts
index 1a3be91503..d374f4af5d 100644
--- a/packages/instantsearch.js/src/widgets/geo-search/geo-search.ts
+++ b/packages/instantsearch.js/src/widgets/geo-search/geo-search.ts
@@ -3,7 +3,7 @@
 import { cx } from 'instantsearch-ui-components';
 import { render } from 'preact';
 
-import connectGeoSearch from '../../connectors/geo-search/connectGeoSearch';
+import { connectGeoSearch } from '../../connectors';
 import { component } from '../../lib/suit';
 import { renderTemplate } from '../../lib/templating';
 import {
@@ -19,8 +19,8 @@ import type {
   GeoSearchConnectorParams,
   GeoSearchWidgetDescription,
   GeoHit,
-} from '../../connectors/geo-search/connectGeoSearch';
-import type { GeoLoc, Template, WidgetFactory } from '../../types';
+} from '../../connectors';
+import type { GeoLoc, Template, Widget, WidgetFactory } from '../../types';
 import type { HTMLMarkerArguments } from './createHTMLMarker';
 
 export type CreateMarker = (args: {
@@ -153,10 +153,10 @@ export type GeoSearchWidgetParams<THit extends GeoHit = GeoHit> = {
   googleReference: typeof window['google'];
 };
 
-export type GeoSearchWidget = WidgetFactory<
-  GeoSearchWidgetDescription & { $$widgetType: 'ais.geoSearch' },
-  GeoSearchConnectorParams,
-  GeoSearchWidgetParams
+export type GeoSearchWidget<THit extends GeoHit = GeoHit> = WidgetFactory<
+  GeoSearchWidgetDescription<THit> & { $$widgetType: 'ais.geoSearch' },
+  GeoSearchConnectorParams<THit>,
+  GeoSearchWidgetParams<THit>
 >;
 
 /**
@@ -287,7 +287,7 @@ export default (function geoSearch<THit extends GeoHit = GeoHit>(
     render(null, containerNode)
   );
 
-  return {
+  const widget = {
     ...makeWidget<THit>({
       ...otherWidgetParams,
       // @TODO: this type doesn't preserve the generic correctly,
@@ -307,4 +307,12 @@ export default (function geoSearch<THit extends GeoHit = GeoHit>(
     }),
     $$widgetType: 'ais.geoSearch',
   };
+
+  // explicitly cast this type to have a small type output.
+  return widget as Widget<
+    GeoSearchWidgetDescription & {
+      $$widgetType: 'ais.geoSearch';
+      widgetParams: GeoSearchConnectorParams<THit>;
+    }
+  >;
 } satisfies GeoSearchWidget);
diff --git a/packages/instantsearch.js/src/widgets/hierarchical-menu/hierarchical-menu.tsx b/packages/instantsearch.js/src/widgets/hierarchical-menu/hierarchical-menu.tsx
index 7a39da8eda..f061c135c0 100644
--- a/packages/instantsearch.js/src/widgets/hierarchical-menu/hierarchical-menu.tsx
+++ b/packages/instantsearch.js/src/widgets/hierarchical-menu/hierarchical-menu.tsx
@@ -4,7 +4,7 @@ import { cx } from 'instantsearch-ui-components';
 import { h, render } from 'preact';
 
 import RefinementList from '../../components/RefinementList/RefinementList';
-import connectHierarchicalMenu from '../../connectors/hierarchical-menu/connectHierarchicalMenu';
+import { connectHierarchicalMenu } from '../../connectors';
 import { component } from '../../lib/suit';
 import { prepareTemplateProps } from '../../lib/templating';
 import {
@@ -19,7 +19,7 @@ import type {
   HierarchicalMenuConnectorParams,
   HierarchicalMenuRenderState,
   HierarchicalMenuWidgetDescription,
-} from '../../connectors/hierarchical-menu/connectHierarchicalMenu';
+} from '../../connectors';
 import type { PreparedTemplateProps } from '../../lib/templating';
 import type {
   TransformItems,
diff --git a/packages/instantsearch.js/src/widgets/hits-per-page/hits-per-page.tsx b/packages/instantsearch.js/src/widgets/hits-per-page/hits-per-page.tsx
index 1ee3f6efec..3def309ff1 100644
--- a/packages/instantsearch.js/src/widgets/hits-per-page/hits-per-page.tsx
+++ b/packages/instantsearch.js/src/widgets/hits-per-page/hits-per-page.tsx
@@ -4,19 +4,18 @@ import { cx } from 'instantsearch-ui-components';
 import { h, render } from 'preact';
 
 import Selector from '../../components/Selector/Selector';
-import connectHitsPerPage from '../../connectors/hits-per-page/connectHitsPerPage';
+import { connectHitsPerPage } from '../../connectors';
 import { component } from '../../lib/suit';
 import {
   getContainerNode,
   createDocumentationMessageGenerator,
-  find,
 } from '../../lib/utils';
 
 import type {
   HitsPerPageConnectorParams,
   HitsPerPageRenderState,
   HitsPerPageWidgetDescription,
-} from '../../connectors/hits-per-page/connectHitsPerPage';
+} from '../../connectors';
 import type { ComponentCSSClasses, WidgetFactory } from '../../types';
 
 const withUsage = createDocumentationMessageGenerator({
@@ -36,7 +35,7 @@ const renderer =
     if (isFirstRendering) return;
 
     const { value: currentValue } =
-      find(items, ({ isRefined }) => isRefined) || {};
+      items.find(({ isRefined }) => isRefined) || {};
 
     render(
       <div className={cssClasses.root}>
diff --git a/packages/instantsearch.js/src/widgets/hits/__tests__/hits.test.tsx b/packages/instantsearch.js/src/widgets/hits/__tests__/hits.test.tsx
index 33abb7c996..391bfafc35 100644
--- a/packages/instantsearch.js/src/widgets/hits/__tests__/hits.test.tsx
+++ b/packages/instantsearch.js/src/widgets/hits/__tests__/hits.test.tsx
@@ -219,60 +219,22 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/"
               <li
                 class="ais-Hits-item"
               >
-                {
-          "objectID": "1",
-          "name": "Apple iPhone smartphone",
-          "description": "A smartphone by Apple.",
-          "_highlightResult": {
-            "name": {
-              "value": "Apple iPhone &lt;mark&gt;smartphone&lt;/mark&gt;",
-              "matchLevel": "full",
-              "matchedWords": [
-                "smartphone"
-              ]
-            }
-          },
-          "_snippetResult": {
-            "name": {
-              "value": "Apple iPhone &lt;mark&gt;smartphone&lt;/mark&gt;",
-              "matchLevel": "full"
-            },
-            "description": {
-              "value": "A &lt;mark&gt;smartphone&lt;/mark&gt; by Apple.",
-              "matchLevel": "full"
-            }
-          },
-          "__position": 1
-        }
+                <div
+                  style="word-break: break-all;"
+                >
+                  {"objectID":"1","name":"Apple iPhone smartphone","description":"A smartphone by Apple.","_highlightR
+                  …
+                </div>
               </li>
               <li
                 class="ais-Hits-item"
               >
-                {
-          "objectID": "2",
-          "name": "Samsung Galaxy smartphone",
-          "description": "A smartphone by Samsung.",
-          "_highlightResult": {
-            "name": {
-              "value": "Samsung Galaxy &lt;mark&gt;smartphone&lt;/mark&gt;",
-              "matchLevel": "full",
-              "matchedWords": [
-                "smartphone"
-              ]
-            }
-          },
-          "_snippetResult": {
-            "name": {
-              "value": "Samsung Galaxy &lt;mark&gt;smartphone&lt;/mark&gt;",
-              "matchLevel": "full"
-            },
-            "description": {
-              "value": "A &lt;mark&gt;smartphone&lt;/mark&gt; by Samsung.",
-              "matchLevel": "full"
-            }
-          },
-          "__position": 2
-        }
+                <div
+                  style="word-break: break-all;"
+                >
+                  {"objectID":"2","name":"Samsung Galaxy smartphone","description":"A smartphone by Samsung.","_highli
+                  …
+                </div>
               </li>
             </ol>
           </div>
@@ -794,41 +756,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/"
       `);
     });
 
-    test('provides __hitIndex in the list to each item', async () => {
-      const container = document.createElement('div');
-      const searchBoxContainer = document.createElement('div');
-      const searchClient = createMockedSearchClient();
-
-      const search = instantsearch({ indexName: 'indexName', searchClient });
-
-      search.addWidgets([
-        searchBox({ container: searchBoxContainer }),
-        hits({
-          container,
-          templates: {
-            item(hit, { html }) {
-              return html`${hit.__hitIndex.toString()}`;
-            },
-          },
-        }),
-      ]);
-
-      search.start();
-
-      await wait(0);
-
-      expect(
-        [...container.querySelectorAll('.ais-Hits-item')].map(
-          (item) => item.textContent
-        )
-      ).toMatchInlineSnapshot(`
-        [
-          "0",
-          "1",
-        ]
-      `);
-    });
-
     type CustomHit = { name: string; description: string };
 
     function createMockedSearchClient(
@@ -1043,7 +970,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/"
         eventType: 'click',
         hits: [
           {
-            __hitIndex: 0,
             __position: 1,
             objectID: '1',
             name: 'Name 1',
@@ -1103,7 +1029,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/"
         eventType: 'conversion',
         hits: [
           {
-            __hitIndex: 1,
             __position: 2,
             objectID: '2',
             name: 'Name 2',
diff --git a/packages/instantsearch.js/src/widgets/hits/defaultTemplates.ts b/packages/instantsearch.js/src/widgets/hits/defaultTemplates.ts
index a2f32d90cd..3f6823e7d8 100644
--- a/packages/instantsearch.js/src/widgets/hits/defaultTemplates.ts
+++ b/packages/instantsearch.js/src/widgets/hits/defaultTemplates.ts
@@ -1,16 +1,14 @@
-import { omit } from '../../lib/utils';
-
-// false positive lint error
-// eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import type { HitsTemplates } from './hits';
 
-const defaultTemplates = {
+const defaultTemplates: HitsTemplates = {
   empty() {
     return 'No results';
   },
-  item(data) {
-    return JSON.stringify(omit(data, ['__hitIndex']), null, 2);
+  item(data, { html }) {
+    return html`<div style="word-break: break-all;">
+      ${JSON.stringify(data).slice(0, 100)}…
+    </div>`;
   },
-} satisfies HitsTemplates;
+};
 
 export default defaultTemplates;
diff --git a/packages/instantsearch.js/src/widgets/hits/hits.tsx b/packages/instantsearch.js/src/widgets/hits/hits.tsx
index 849da60707..5bedc34b01 100644
--- a/packages/instantsearch.js/src/widgets/hits/hits.tsx
+++ b/packages/instantsearch.js/src/widgets/hits/hits.tsx
@@ -4,12 +4,11 @@ import { createHitsComponent } from 'instantsearch-ui-components';
 import { Fragment, h, render } from 'preact';
 
 import TemplateComponent from '../../components/Template/Template';
-import connectHits from '../../connectors/hits/connectHits';
+import { connectHits } from '../../connectors';
 import { prepareTemplateProps } from '../../lib/templating';
 import {
   getContainerNode,
   createDocumentationMessageGenerator,
-  warning,
 } from '../../lib/utils';
 
 import defaultTemplates from './defaultTemplates';
@@ -18,7 +17,7 @@ import type {
   HitsConnectorParams,
   HitsRenderState,
   HitsWidgetDescription,
-} from '../../connectors/hits/connectHits';
+} from '../../connectors';
 import type { PreparedTemplateProps } from '../../lib/templating';
 import type {
   Template,
@@ -27,6 +26,7 @@ import type {
   Renderer,
   BaseHit,
   TemplateWithSendEvent,
+  Widget,
 } from '../../types';
 import type { SearchResults } from 'algoliasearch-helper';
 import type {
@@ -77,7 +77,6 @@ const renderer =
     // once flavour specificities are erased
     const itemComponent: HitsUiComponentProps<Hit>['itemComponent'] = ({
       hit,
-      index,
       ...rootProps
     }) => (
       <TemplateComponent
@@ -87,16 +86,7 @@ const renderer =
         rootProps={{
           ...rootProps,
         }}
-        data={{
-          ...hit,
-          get __hitIndex() {
-            warning(
-              false,
-              'The `__hitIndex` property is deprecated. Use the absolute `__position` instead.'
-            );
-            return index;
-          },
-        }}
+        data={hit}
         sendEvent={sendEvent}
       />
     );
@@ -142,12 +132,7 @@ export type HitsTemplates<THit extends NonNullable<object> = BaseHit> =
      *
      * @default ''
      */
-    item: TemplateWithSendEvent<
-      Hit<THit> & {
-        /** @deprecated the index in the hits array, use __position instead, which is the absolute position */
-        __hitIndex: number;
-      }
-    >;
+    item: TemplateWithSendEvent<Hit<THit>>;
 
     /**
      * Template to use for the banner.
@@ -175,11 +160,12 @@ export type HitsWidgetParams<THit extends NonNullable<object> = BaseHit> = {
   cssClasses?: HitsCSSClasses;
 };
 
-export type HitsWidget = WidgetFactory<
-  HitsWidgetDescription & { $$widgetType: 'ais.hits' },
-  HitsConnectorParams,
-  HitsWidgetParams
->;
+export type HitsWidget<THit extends NonNullable<object> = BaseHit> =
+  WidgetFactory<
+    HitsWidgetDescription<THit> & { $$widgetType: 'ais.hits' },
+    HitsConnectorParams<THit>,
+    HitsWidgetParams<THit>
+  >;
 
 export default (function hits<THit extends NonNullable<object> = BaseHit>(
   widgetParams: HitsWidgetParams<THit> & HitsConnectorParams<THit>
@@ -209,11 +195,19 @@ export default (function hits<THit extends NonNullable<object> = BaseHit>(
     render(null, containerNode)
   );
 
-  return {
+  const widget = {
     ...makeWidget({
       escapeHTML,
       transformItems,
     }),
     $$widgetType: 'ais.hits',
   };
+
+  // explicitly cast this type to have a small type output.
+  return widget as Widget<
+    HitsWidgetDescription & {
+      $$widgetType: 'ais.hits';
+      widgetParams: HitsConnectorParams<THit>;
+    }
+  >;
 } satisfies HitsWidget);
diff --git a/packages/instantsearch.js/src/widgets/index.ts b/packages/instantsearch.js/src/widgets/index.ts
index 6233de7043..04d3d5ff35 100644
--- a/packages/instantsearch.js/src/widgets/index.ts
+++ b/packages/instantsearch.js/src/widgets/index.ts
@@ -7,8 +7,8 @@ export { default as geoSearch } from './geo-search/geo-search';
 export { default as hierarchicalMenu } from './hierarchical-menu/hierarchical-menu';
 export { default as hits } from './hits/hits';
 export { default as hitsPerPage } from './hits-per-page/hits-per-page';
-export { default as index } from './index/index';
-export type { IndexWidget } from './index/index';
+export { index } from 'instantsearch-core';
+export type { IndexWidget } from 'instantsearch-core';
 export { default as infiniteHits } from './infinite-hits/infinite-hits';
 export { default as menu } from './menu/menu';
 export { default as menuSelect } from './menu-select/menu-select';
diff --git a/packages/instantsearch.js/src/widgets/index/__tests__/index-test.ts b/packages/instantsearch.js/src/widgets/index/__tests__/index-test.ts
index 82d51987e7..88ba45166c 100644
--- a/packages/instantsearch.js/src/widgets/index/__tests__/index-test.ts
+++ b/packages/instantsearch.js/src/widgets/index/__tests__/index-test.ts
@@ -29,7 +29,7 @@ import {
   connectSearchBox,
 } from '../../../connectors';
 import instantsearch from '../../../index.es';
-import { warning } from '../../../lib/utils';
+import { warnCache } from '../../../lib/utils';
 import index from '../index';
 
 import type { Widget } from '../../../types';
@@ -3254,19 +3254,19 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
 
   describe('getWidgetState', () => {
     test('warns when index has this method', () => {
-      warning.cache = {};
+      warnCache.current = {};
 
       const instance = index({ indexName: 'indexName' });
 
       expect(() => {
         instance.getWidgetState({});
       }).toWarnDev(
-        '[InstantSearch.js]: The `getWidgetState` method is renamed `getWidgetUiState` and will no longer exist under that name in InstantSearch.js 5.x. Please use `getWidgetUiState` instead.'
+        '[InstantSearch]: The `getWidgetState` method is renamed `getWidgetUiState` and will no longer exist under that name in InstantSearch.js 5.x. Please use `getWidgetUiState` instead.'
       );
     });
 
     test('warns when widget has this method', () => {
-      warning.cache = {};
+      warnCache.current = {};
 
       const createDeprecatedSearchBox = (args: Partial<Widget> = {}): Widget =>
         createWidget({
@@ -3311,12 +3311,12 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
           })
         );
       }).toWarnDev(
-        '[InstantSearch.js]: The `getWidgetState` method is renamed `getWidgetUiState` and will no longer exist under that name in InstantSearch.js 5.x. Please use `getWidgetUiState` instead.'
+        '[InstantSearch]: The `getWidgetState` method is renamed `getWidgetUiState` and will no longer exist under that name in InstantSearch.js 5.x. Please use `getWidgetUiState` instead.'
       );
     });
 
     test('does not warn for index itself', () => {
-      warning.cache = {};
+      warnCache.current = {};
 
       const instance = index({ indexName: 'indexName' });
       const searchClient = createSearchClient();
@@ -3335,7 +3335,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
           })
         );
       }).not.toWarnDev(
-        '[InstantSearch.js]: The `getWidgetState` method is renamed `getWidgetUiState` and will no longer exist under that name in InstantSearch.js 5.x. Please use `getWidgetUiState` instead.'
+        '[InstantSearch]: The `getWidgetState` method is renamed `getWidgetUiState` and will no longer exist under that name in InstantSearch.js 5.x. Please use `getWidgetUiState` instead.'
       );
     });
   });
diff --git a/packages/instantsearch.js/src/widgets/infinite-hits/__tests__/infinite-hits.test.tsx b/packages/instantsearch.js/src/widgets/infinite-hits/__tests__/infinite-hits.test.tsx
index 6fcf749518..22829b8ccb 100644
--- a/packages/instantsearch.js/src/widgets/infinite-hits/__tests__/infinite-hits.test.tsx
+++ b/packages/instantsearch.js/src/widgets/infinite-hits/__tests__/infinite-hits.test.tsx
@@ -212,60 +212,22 @@ describe('infiniteHits', () => {
               <li
                 class="ais-InfiniteHits-item"
               >
-                {
-          "objectID": "1",
-          "name": "Apple iPhone smartphone",
-          "description": "A smartphone by Apple.",
-          "_highlightResult": {
-            "name": {
-              "value": "Apple iPhone &lt;mark&gt;smartphone&lt;/mark&gt;",
-              "matchLevel": "full",
-              "matchedWords": [
-                "smartphone"
-              ]
-            }
-          },
-          "_snippetResult": {
-            "name": {
-              "value": "Apple iPhone &lt;mark&gt;smartphone&lt;/mark&gt;",
-              "matchLevel": "full"
-            },
-            "description": {
-              "value": "A &lt;mark&gt;smartphone&lt;/mark&gt; by Apple.",
-              "matchLevel": "full"
-            }
-          },
-          "__position": 1
-        }
+                <div
+                  style="word-break: break-all;"
+                >
+                  {"objectID":"1","name":"Apple iPhone smartphone","description":"A smartphone by Apple.","_highlightR
+                  …
+                </div>
               </li>
               <li
                 class="ais-InfiniteHits-item"
               >
-                {
-          "objectID": "2",
-          "name": "Samsung Galaxy smartphone",
-          "description": "A smartphone by Samsung.",
-          "_highlightResult": {
-            "name": {
-              "value": "Samsung Galaxy &lt;mark&gt;smartphone&lt;/mark&gt;",
-              "matchLevel": "full",
-              "matchedWords": [
-                "smartphone"
-              ]
-            }
-          },
-          "_snippetResult": {
-            "name": {
-              "value": "Samsung Galaxy &lt;mark&gt;smartphone&lt;/mark&gt;",
-              "matchLevel": "full"
-            },
-            "description": {
-              "value": "A &lt;mark&gt;smartphone&lt;/mark&gt; by Samsung.",
-              "matchLevel": "full"
-            }
-          },
-          "__position": 2
-        }
+                <div
+                  style="word-break: break-all;"
+                >
+                  {"objectID":"2","name":"Samsung Galaxy smartphone","description":"A smartphone by Samsung.","_highli
+                  …
+                </div>
               </li>
             </ol>
             <button
@@ -1049,7 +1011,6 @@ describe('infiniteHits', () => {
         eventType: 'click',
         hits: [
           {
-            __hitIndex: 0,
             __position: 1,
             objectID: '1',
             name: 'Name 1',
@@ -1109,7 +1070,6 @@ describe('infiniteHits', () => {
         eventType: 'conversion',
         hits: [
           {
-            __hitIndex: 1,
             __position: 2,
             objectID: '2',
             name: 'Name 2',
diff --git a/packages/instantsearch.js/src/widgets/infinite-hits/defaultTemplates.ts b/packages/instantsearch.js/src/widgets/infinite-hits/defaultTemplates.ts
index e442e4cbce..b37fbb61af 100644
--- a/packages/instantsearch.js/src/widgets/infinite-hits/defaultTemplates.ts
+++ b/packages/instantsearch.js/src/widgets/infinite-hits/defaultTemplates.ts
@@ -1,5 +1,3 @@
-import { omit } from '../../lib/utils';
-
 import type { InfiniteHitsComponentTemplates } from '../../components/InfiniteHits/InfiniteHits';
 
 const defaultTemplates: InfiniteHitsComponentTemplates = {
@@ -12,8 +10,10 @@ const defaultTemplates: InfiniteHitsComponentTemplates = {
   showMoreText() {
     return 'Show more results';
   },
-  item(data) {
-    return JSON.stringify(omit(data, ['__hitIndex']), null, 2);
+  item(data, { html }) {
+    return html`<div style="word-break: break-all;">
+      ${JSON.stringify(data).slice(0, 100)}…
+    </div>`;
   },
 };
 
diff --git a/packages/instantsearch.js/src/widgets/infinite-hits/infinite-hits.tsx b/packages/instantsearch.js/src/widgets/infinite-hits/infinite-hits.tsx
index 555138c41a..3273e95f9f 100644
--- a/packages/instantsearch.js/src/widgets/infinite-hits/infinite-hits.tsx
+++ b/packages/instantsearch.js/src/widgets/infinite-hits/infinite-hits.tsx
@@ -4,7 +4,7 @@ import { cx } from 'instantsearch-ui-components';
 import { h, render } from 'preact';
 
 import InfiniteHits from '../../components/InfiniteHits/InfiniteHits';
-import connectInfiniteHits from '../../connectors/infinite-hits/connectInfiniteHits';
+import { connectInfiniteHits } from '../../connectors';
 import { component } from '../../lib/suit';
 import { prepareTemplateProps } from '../../lib/templating';
 import {
@@ -23,7 +23,7 @@ import type {
   InfiniteHitsRenderState,
   InfiniteHitsCache,
   InfiniteHitsWidgetDescription,
-} from '../../connectors/infinite-hits/connectInfiniteHits';
+} from '../../connectors';
 import type { PreparedTemplateProps } from '../../lib/templating';
 import type {
   WidgetFactory,
@@ -33,6 +33,7 @@ import type {
   BaseHit,
   Hit,
   TemplateWithSendEvent,
+  Widget,
 } from '../../types';
 import type { SearchResults } from 'algoliasearch-helper';
 
@@ -118,12 +119,7 @@ export type InfiniteHitsTemplates<THit extends NonNullable<object> = BaseHit> =
     /**
      * The template to use for each result.
      */
-    item: TemplateWithSendEvent<
-      Hit<THit> & {
-        /** @deprecated the index in the hits array, use __position instead, which is the absolute position */
-        __hitIndex: number;
-      }
-    >;
+    item: TemplateWithSendEvent<Hit<THit>>;
 
     /**
      * Template to use for the banner.
@@ -160,11 +156,12 @@ export type InfiniteHitsWidgetParams<
   cache?: InfiniteHitsCache;
 };
 
-export type InfiniteHitsWidget = WidgetFactory<
-  InfiniteHitsWidgetDescription & { $$widgetType: 'ais.infiniteHits' },
-  InfiniteHitsConnectorParams,
-  InfiniteHitsWidgetParams
->;
+export type InfiniteHitsWidget<THit extends NonNullable<object> = BaseHit> =
+  WidgetFactory<
+    InfiniteHitsWidgetDescription<THit> & { $$widgetType: 'ais.infiniteHits' },
+    InfiniteHitsConnectorParams<THit>,
+    InfiniteHitsWidgetParams<THit>
+  >;
 
 const renderer =
   <THit extends NonNullable<object> = BaseHit>({
@@ -291,7 +288,7 @@ export default (function infiniteHits<
     render(null, containerNode)
   );
 
-  return {
+  const widget = {
     ...makeWidget({
       escapeHTML,
       transformItems,
@@ -300,4 +297,12 @@ export default (function infiniteHits<
     }),
     $$widgetType: 'ais.infiniteHits',
   };
+
+  // explicitly cast this type to have a small type output.
+  return widget as Widget<
+    InfiniteHitsWidgetDescription & {
+      $$widgetType: 'ais.infiniteHits';
+      widgetParams: InfiniteHitsConnectorParams<THit>;
+    }
+  >;
 } satisfies InfiniteHitsWidget);
diff --git a/packages/instantsearch.js/src/widgets/looking-similar/looking-similar.tsx b/packages/instantsearch.js/src/widgets/looking-similar/looking-similar.tsx
index fb231d1764..ddcb822ff3 100644
--- a/packages/instantsearch.js/src/widgets/looking-similar/looking-similar.tsx
+++ b/packages/instantsearch.js/src/widgets/looking-similar/looking-similar.tsx
@@ -4,7 +4,7 @@ import { createLookingSimilarComponent } from 'instantsearch-ui-components';
 import { Fragment, h, render } from 'preact';
 
 import TemplateComponent from '../../components/Template/Template';
-import connectLookingSimilar from '../../connectors/looking-similar/connectLookingSimilar';
+import { connectLookingSimilar } from '../../connectors';
 import { prepareTemplateProps } from '../../lib/templating';
 import {
   getContainerNode,
@@ -15,7 +15,7 @@ import type {
   LookingSimilarWidgetDescription,
   LookingSimilarConnectorParams,
   LookingSimilarRenderState,
-} from '../../connectors/looking-similar/connectLookingSimilar';
+} from '../../connectors';
 import type { PreparedTemplateProps } from '../../lib/templating';
 import type {
   Template,
@@ -24,7 +24,8 @@ import type {
   BaseHit,
   RecommendResponse,
   Hit,
-  TemplateWithBindEvent,
+  TemplateWithSendEvent,
+  Widget,
 } from '../../types';
 import type {
   RecommendClassNames,
@@ -186,7 +187,7 @@ export type LookingSimilarTemplates<
   /**
    * Template to use for each result. This template will receive an object containing a single record.
    */
-  item: TemplateWithBindEvent<Hit<THit>>;
+  item: TemplateWithSendEvent<Hit<THit>>;
 
   /**
    * Template to use to wrap all items.
@@ -221,13 +222,14 @@ type LookingSimilarWidgetParams<THit extends NonNullable<object> = BaseHit> = {
   cssClasses?: LookingSimilarCSSClasses;
 };
 
-export type LookingSimilarWidget = WidgetFactory<
-  LookingSimilarWidgetDescription & {
-    $$widgetType: 'ais.lookingSimilar';
-  },
-  LookingSimilarConnectorParams,
-  LookingSimilarWidgetParams
->;
+export type LookingSimilarWidget<THit extends NonNullable<object> = BaseHit> =
+  WidgetFactory<
+    LookingSimilarWidgetDescription<THit> & {
+      $$widgetType: 'ais.lookingSimilar';
+    },
+    LookingSimilarConnectorParams<THit>,
+    LookingSimilarWidgetParams<THit>
+  >;
 
 export default (function lookingSimilar<
   THit extends NonNullable<object> = BaseHit
@@ -264,7 +266,8 @@ export default (function lookingSimilar<
   const makeWidget = connectLookingSimilar(specializedRenderer, () =>
     render(null, containerNode)
   );
-  return {
+
+  const widget = {
     ...makeWidget({
       objectIDs,
       limit,
@@ -276,4 +279,12 @@ export default (function lookingSimilar<
     }),
     $$widgetType: 'ais.lookingSimilar',
   };
+
+  // explicitly cast this type to have a small type output.
+  return widget as Widget<
+    LookingSimilarWidgetDescription & {
+      $$widgetType: 'ais.lookingSimilar';
+      widgetParams: LookingSimilarConnectorParams<THit>;
+    }
+  >;
 } satisfies LookingSimilarWidget);
diff --git a/packages/instantsearch.js/src/widgets/menu-select/menu-select.tsx b/packages/instantsearch.js/src/widgets/menu-select/menu-select.tsx
index ccc08c30f3..a88ea3b7d5 100644
--- a/packages/instantsearch.js/src/widgets/menu-select/menu-select.tsx
+++ b/packages/instantsearch.js/src/widgets/menu-select/menu-select.tsx
@@ -4,7 +4,7 @@ import { cx } from 'instantsearch-ui-components';
 import { h, render } from 'preact';
 
 import MenuSelect from '../../components/MenuSelect/MenuSelect';
-import connectMenu from '../../connectors/menu/connectMenu';
+import { connectMenu } from '../../connectors';
 import { component } from '../../lib/suit';
 import { prepareTemplateProps } from '../../lib/templating';
 import {
@@ -22,7 +22,7 @@ import type {
   MenuConnectorParams,
   MenuRenderState,
   MenuWidgetDescription,
-} from '../../connectors/menu/connectMenu';
+} from '../../connectors';
 import type { PreparedTemplateProps } from '../../lib/templating';
 import type { RendererOptions, Template, WidgetFactory } from '../../types';
 
diff --git a/packages/instantsearch.js/src/widgets/menu/menu.tsx b/packages/instantsearch.js/src/widgets/menu/menu.tsx
index a7444d448e..99764afed6 100644
--- a/packages/instantsearch.js/src/widgets/menu/menu.tsx
+++ b/packages/instantsearch.js/src/widgets/menu/menu.tsx
@@ -4,7 +4,7 @@ import { cx } from 'instantsearch-ui-components';
 import { h, render } from 'preact';
 
 import RefinementList from '../../components/RefinementList/RefinementList';
-import connectMenu from '../../connectors/menu/connectMenu';
+import { connectMenu } from '../../connectors';
 import { component } from '../../lib/suit';
 import { prepareTemplateProps } from '../../lib/templating';
 import {
@@ -18,7 +18,7 @@ import type {
   MenuConnectorParams,
   MenuRenderState,
   MenuWidgetDescription,
-} from '../../connectors/menu/connectMenu';
+} from '../../connectors';
 import type { PreparedTemplateProps } from '../../lib/templating';
 import type {
   ComponentCSSClasses,
diff --git a/packages/instantsearch.js/src/widgets/numeric-menu/numeric-menu.tsx b/packages/instantsearch.js/src/widgets/numeric-menu/numeric-menu.tsx
index 8ef97fea07..4d76fe025c 100644
--- a/packages/instantsearch.js/src/widgets/numeric-menu/numeric-menu.tsx
+++ b/packages/instantsearch.js/src/widgets/numeric-menu/numeric-menu.tsx
@@ -4,7 +4,7 @@ import { cx } from 'instantsearch-ui-components';
 import { h, render } from 'preact';
 
 import RefinementList from '../../components/RefinementList/RefinementList';
-import connectNumericMenu from '../../connectors/numeric-menu/connectNumericMenu';
+import { connectNumericMenu } from '../../connectors';
 import { component } from '../../lib/suit';
 import { prepareTemplateProps } from '../../lib/templating';
 import {
@@ -18,7 +18,7 @@ import type {
   NumericMenuConnectorParams,
   NumericMenuRenderState,
   NumericMenuWidgetDescription,
-} from '../../connectors/numeric-menu/connectNumericMenu';
+} from '../../connectors';
 import type { PreparedTemplateProps } from '../../lib/templating';
 import type {
   ComponentCSSClasses,
diff --git a/packages/instantsearch.js/src/widgets/pagination/pagination.tsx b/packages/instantsearch.js/src/widgets/pagination/pagination.tsx
index 13264ac9c5..ebe00cd171 100644
--- a/packages/instantsearch.js/src/widgets/pagination/pagination.tsx
+++ b/packages/instantsearch.js/src/widgets/pagination/pagination.tsx
@@ -4,7 +4,7 @@ import { cx } from 'instantsearch-ui-components';
 import { h, render } from 'preact';
 
 import Pagination from '../../components/Pagination/Pagination';
-import connectPagination from '../../connectors/pagination/connectPagination';
+import { connectPagination } from '../../connectors';
 import { component } from '../../lib/suit';
 import {
   getContainerNode,
@@ -19,7 +19,7 @@ import type {
   PaginationConnectorParams,
   PaginationRenderState,
   PaginationWidgetDescription,
-} from '../../connectors/pagination/connectPagination';
+} from '../../connectors';
 import type { Renderer, Template, WidgetFactory } from '../../types';
 
 const suit = component('Pagination');
diff --git a/packages/instantsearch.js/src/widgets/panel/__tests__/panel-test.ts b/packages/instantsearch.js/src/widgets/panel/__tests__/panel-test.ts
index c7f996114a..e8a88b1ee6 100644
--- a/packages/instantsearch.js/src/widgets/panel/__tests__/panel-test.ts
+++ b/packages/instantsearch.js/src/widgets/panel/__tests__/panel-test.ts
@@ -68,7 +68,7 @@ describe('Usage', () => {
         hidden: true,
       });
     }).toWarnDev(
-      '[InstantSearch.js]: The `hidden` option in the "panel" widget expects a function returning a boolean (received type Boolean).'
+      '[InstantSearch]: The `hidden` option in the "panel" widget expects a function returning a boolean (received type Boolean).'
     );
   });
 
@@ -79,7 +79,7 @@ describe('Usage', () => {
         collapsed: true,
       });
     }).toWarnDev(
-      '[InstantSearch.js]: The `collapsed` option in the "panel" widget expects a function returning a boolean (received type Boolean).'
+      '[InstantSearch]: The `collapsed` option in the "panel" widget expects a function returning a boolean (received type Boolean).'
     );
   });
 
@@ -124,7 +124,7 @@ describe('Templates', () => {
       container: document.createElement('div'),
     });
 
-    widget.init(createInitOptions());
+    widget.init!(createInitOptions());
 
     const firstRender = render.mock.calls[0][0] as VNode<
       PanelProps<typeof widgetFactory>
@@ -148,7 +148,7 @@ describe('Templates', () => {
       container: document.createElement('div'),
     });
 
-    widget.init(createInitOptions());
+    widget.init!(createInitOptions());
 
     const firstRender = render.mock.calls[0][0] as VNode<
       PanelProps<typeof widgetFactory>
@@ -170,7 +170,7 @@ describe('Templates', () => {
       container: document.createElement('div'),
     });
 
-    widget.init(createInitOptions());
+    widget.init!(createInitOptions());
 
     const firstRender = render.mock.calls[0][0] as VNode<
       PanelProps<typeof widgetFactory>
@@ -192,7 +192,7 @@ describe('Templates', () => {
       container: document.createElement('div'),
     });
 
-    widget.init(createInitOptions());
+    widget.init!(createInitOptions());
 
     const firstRender = render.mock.calls[0][0] as VNode<
       PanelProps<typeof widgetFactory>
@@ -221,9 +221,9 @@ describe('Lifecycle', () => {
       container: document.createElement('div'),
     });
 
-    widgetWithPanel.init(createInitOptions());
-    widgetWithPanel.render(createRenderOptions());
-    widgetWithPanel.dispose(createDisposeOptions());
+    widgetWithPanel.init!(createInitOptions());
+    widgetWithPanel.render!(createRenderOptions());
+    widgetWithPanel.dispose!(createDisposeOptions());
 
     expect(widget.init).toHaveBeenCalledTimes(1);
     expect(widget.render).toHaveBeenCalledTimes(1);
@@ -244,7 +244,7 @@ describe('Lifecycle', () => {
 
       const initOptions = createInitOptions();
 
-      widgetWithPanel.init(initOptions);
+      widgetWithPanel.init!(initOptions);
 
       expect(widget.init).toHaveBeenCalledTimes(1);
       expect(widget.init).toHaveBeenCalledWith(initOptions);
@@ -278,7 +278,7 @@ describe('Lifecycle', () => {
 
       const initOptions = createInitOptions();
 
-      widgetWithPanel.init(initOptions);
+      widgetWithPanel.init!(initOptions);
 
       expect(hiddenFn).toHaveBeenCalledTimes(0);
       expect(collapsedFn).toHaveBeenCalledTimes(0);
@@ -306,7 +306,7 @@ describe('Lifecycle', () => {
 
       const initOptions = createInitOptions();
 
-      widgetWithPanel.init(initOptions);
+      widgetWithPanel.init!(initOptions);
 
       const firstRender = render.mock.calls[0][0] as VNode<
         PanelProps<typeof widgetFactory>
@@ -340,7 +340,7 @@ describe('Lifecycle', () => {
 
       const renderOptions = createRenderOptions();
 
-      widgetWithPanel.render(renderOptions);
+      widgetWithPanel.render!(renderOptions);
 
       expect(widget.render).toHaveBeenCalledTimes(1);
       expect(widget.render).toHaveBeenCalledWith(renderOptions);
@@ -374,7 +374,7 @@ describe('Lifecycle', () => {
 
       const renderOptions = createRenderOptions();
 
-      widgetWithPanel.render(renderOptions);
+      widgetWithPanel.render!(renderOptions);
 
       expect(hiddenFn).toHaveBeenCalledTimes(1);
       expect(hiddenFn).toHaveBeenCalledWith({
@@ -411,7 +411,7 @@ describe('Lifecycle', () => {
 
       const renderOptions = createRenderOptions();
 
-      widgetWithPanel.render(renderOptions);
+      widgetWithPanel.render!(renderOptions);
 
       const firstRender = render.mock.calls[0][0] as VNode<
         PanelProps<typeof widgetFactory>
@@ -447,7 +447,7 @@ describe('Lifecycle', () => {
         container: document.createElement('div'),
       });
 
-      const nextState = widgetWithPanel.dispose(createDisposeOptions());
+      const nextState = widgetWithPanel.dispose!(createDisposeOptions());
 
       expect(nextState).toEqual(nextSearchParameters);
     });
diff --git a/packages/instantsearch.js/src/widgets/panel/panel.tsx b/packages/instantsearch.js/src/widgets/panel/panel.tsx
index 6da8dfed03..47413c6071 100644
--- a/packages/instantsearch.js/src/widgets/panel/panel.tsx
+++ b/packages/instantsearch.js/src/widgets/panel/panel.tsx
@@ -18,7 +18,6 @@ import type {
   RenderOptions,
   WidgetFactory,
   InitOptions,
-  Widget,
 } from '../../types';
 
 export type PanelCSSClasses = Partial<{
@@ -178,22 +177,13 @@ const renderer =
     );
   };
 
-type AugmentedWidget<
-  TWidgetFactory extends AnyWidgetFactory,
-  TOverriddenKeys extends keyof Widget = 'init' | 'render' | 'dispose'
-> = Omit<
-  ReturnType<TWidgetFactory>,
-  TOverriddenKeys | 'dependsOn' | 'getWidgetParameters'
-> &
-  Pick<Required<Widget>, TOverriddenKeys>;
-
 export type PanelWidget = <TWidgetFactory extends AnyWidgetFactory>(
   panelWidgetParams?: PanelWidgetParams<TWidgetFactory>
 ) => (
   widgetFactory: TWidgetFactory
 ) => (
   widgetParams: Parameters<TWidgetFactory>[0]
-) => AugmentedWidget<TWidgetFactory>;
+) => ReturnType<TWidgetFactory>;
 
 /**
  * The panel widget wraps other widgets in a consistent panel design.
@@ -347,7 +337,7 @@ const panel: PanelWidget = (panelWidgetParams) => {
 
         return undefined;
       },
-    } as AugmentedWidget<typeof widgetFactory>;
+    } as ReturnType<typeof widgetFactory>;
   };
 };
 
diff --git a/packages/instantsearch.js/src/widgets/powered-by/powered-by.tsx b/packages/instantsearch.js/src/widgets/powered-by/powered-by.tsx
index dc5a12e756..dd4f17fae8 100644
--- a/packages/instantsearch.js/src/widgets/powered-by/powered-by.tsx
+++ b/packages/instantsearch.js/src/widgets/powered-by/powered-by.tsx
@@ -4,7 +4,7 @@ import { cx } from 'instantsearch-ui-components';
 import { h, render } from 'preact';
 
 import PoweredBy from '../../components/PoweredBy/PoweredBy';
-import connectPoweredBy from '../../connectors/powered-by/connectPoweredBy';
+import { connectPoweredBy } from '../../connectors';
 import { component } from '../../lib/suit';
 import {
   getContainerNode,
@@ -16,7 +16,7 @@ import type {
   PoweredByConnectorParams,
   PoweredByRenderState,
   PoweredByWidgetDescription,
-} from '../../connectors/powered-by/connectPoweredBy';
+} from '../../connectors';
 import type { Renderer, WidgetFactory } from '../../types';
 
 const suit = component('PoweredBy');
diff --git a/packages/instantsearch.js/src/widgets/query-rule-context/query-rule-context.tsx b/packages/instantsearch.js/src/widgets/query-rule-context/query-rule-context.tsx
index cca0d57174..6d15e365bc 100644
--- a/packages/instantsearch.js/src/widgets/query-rule-context/query-rule-context.tsx
+++ b/packages/instantsearch.js/src/widgets/query-rule-context/query-rule-context.tsx
@@ -1,4 +1,4 @@
-import connectQueryRules from '../../connectors/query-rules/connectQueryRules';
+import { connectQueryRules } from '../../connectors';
 import { createDocumentationMessageGenerator, noop } from '../../lib/utils';
 
 import type {
@@ -6,7 +6,7 @@ import type {
   ParamTransformRuleContexts,
   QueryRulesConnectorParams,
   QueryRulesWidgetDescription,
-} from '../../connectors/query-rules/connectQueryRules';
+} from '../../connectors';
 import type { WidgetFactory } from '../../types';
 
 export type QueryRuleContextWidgetParams = {
diff --git a/packages/instantsearch.js/src/widgets/query-rule-custom-data/query-rule-custom-data.tsx b/packages/instantsearch.js/src/widgets/query-rule-custom-data/query-rule-custom-data.tsx
index 649c84d2aa..1b3690367a 100644
--- a/packages/instantsearch.js/src/widgets/query-rule-custom-data/query-rule-custom-data.tsx
+++ b/packages/instantsearch.js/src/widgets/query-rule-custom-data/query-rule-custom-data.tsx
@@ -4,7 +4,7 @@ import { cx } from 'instantsearch-ui-components';
 import { h, render } from 'preact';
 
 import CustomData from '../../components/QueryRuleCustomData/QueryRuleCustomData';
-import connectQueryRules from '../../connectors/query-rules/connectQueryRules';
+import { connectQueryRules } from '../../connectors';
 import { component } from '../../lib/suit';
 import {
   getContainerNode,
@@ -19,7 +19,7 @@ import type {
   QueryRulesConnectorParams,
   QueryRulesRenderState,
   QueryRulesWidgetDescription,
-} from '../../connectors/query-rules/connectQueryRules';
+} from '../../connectors';
 import type { PreparedTemplateProps } from '../../lib/templating';
 import type { WidgetFactory, Template } from '../../types';
 
diff --git a/packages/instantsearch.js/src/widgets/range-input/range-input.tsx b/packages/instantsearch.js/src/widgets/range-input/range-input.tsx
index 477322b4c7..e3017c93a1 100644
--- a/packages/instantsearch.js/src/widgets/range-input/range-input.tsx
+++ b/packages/instantsearch.js/src/widgets/range-input/range-input.tsx
@@ -4,7 +4,7 @@ import { cx } from 'instantsearch-ui-components';
 import { h, render } from 'preact';
 
 import RangeInput from '../../components/RangeInput/RangeInput';
-import connectRange from '../../connectors/range/connectRange';
+import { connectRange } from '../../connectors';
 import { component } from '../../lib/suit';
 import { prepareTemplateProps } from '../../lib/templating';
 import {
@@ -20,7 +20,7 @@ import type {
   RangeConnectorParams,
   RangeRenderState,
   RangeWidgetDescription,
-} from '../../connectors/range/connectRange';
+} from '../../connectors';
 import type { PreparedTemplateProps } from '../../lib/templating';
 import type { Renderer, Template, WidgetFactory } from '../../types';
 
diff --git a/packages/instantsearch.js/src/widgets/range-slider/range-slider.tsx b/packages/instantsearch.js/src/widgets/range-slider/range-slider.tsx
index dcad777b7a..fa8569f2ff 100644
--- a/packages/instantsearch.js/src/widgets/range-slider/range-slider.tsx
+++ b/packages/instantsearch.js/src/widgets/range-slider/range-slider.tsx
@@ -4,7 +4,7 @@ import { cx } from 'instantsearch-ui-components';
 import { h, render } from 'preact';
 
 import Slider from '../../components/Slider/Slider';
-import connectRange from '../../connectors/range/connectRange';
+import { connectRange } from '../../connectors';
 import { component } from '../../lib/suit';
 import {
   getContainerNode,
@@ -17,7 +17,7 @@ import type {
   RangeConnectorParams,
   RangeRenderState,
   RangeWidgetDescription,
-} from '../../connectors/range/connectRange';
+} from '../../connectors';
 import type { Renderer, WidgetFactory } from '../../types';
 
 const withUsage = createDocumentationMessageGenerator({ name: 'range-slider' });
diff --git a/packages/instantsearch.js/src/widgets/rating-menu/rating-menu.tsx b/packages/instantsearch.js/src/widgets/rating-menu/rating-menu.tsx
index 12c4131c35..0925fa561a 100644
--- a/packages/instantsearch.js/src/widgets/rating-menu/rating-menu.tsx
+++ b/packages/instantsearch.js/src/widgets/rating-menu/rating-menu.tsx
@@ -4,7 +4,7 @@ import { cx } from 'instantsearch-ui-components';
 import { h, render } from 'preact';
 
 import RefinementList from '../../components/RefinementList/RefinementList';
-import connectRatingMenu from '../../connectors/rating-menu/connectRatingMenu';
+import { connectRatingMenu } from '../../connectors';
 import { component } from '../../lib/suit';
 import { prepareTemplateProps } from '../../lib/templating';
 import {
@@ -18,7 +18,7 @@ import type {
   RatingMenuWidgetDescription,
   RatingMenuConnectorParams,
   RatingMenuRenderState,
-} from '../../connectors/rating-menu/connectRatingMenu';
+} from '../../connectors';
 import type { PreparedTemplateProps } from '../../lib/templating';
 import type {
   ComponentCSSClasses,
diff --git a/packages/instantsearch.js/src/widgets/refinement-list/refinement-list.tsx b/packages/instantsearch.js/src/widgets/refinement-list/refinement-list.tsx
index 8c204c273d..4b454f1d17 100644
--- a/packages/instantsearch.js/src/widgets/refinement-list/refinement-list.tsx
+++ b/packages/instantsearch.js/src/widgets/refinement-list/refinement-list.tsx
@@ -4,7 +4,7 @@ import { cx } from 'instantsearch-ui-components';
 import { h, render } from 'preact';
 
 import RefinementList from '../../components/RefinementList/RefinementList';
-import connectRefinementList from '../../connectors/refinement-list/connectRefinementList';
+import { connectRefinementList } from '../../connectors';
 import { component } from '../../lib/suit';
 import { prepareTemplateProps } from '../../lib/templating';
 import {
@@ -21,7 +21,7 @@ import type {
   RefinementListRenderState,
   RefinementListConnectorParams,
   RefinementListWidgetDescription,
-} from '../../connectors/refinement-list/connectRefinementList';
+} from '../../connectors';
 import type { PreparedTemplateProps } from '../../lib/templating';
 import type { Template, WidgetFactory, Renderer } from '../../types';
 import type { SearchBoxTemplates } from '../search-box/search-box';
diff --git a/packages/instantsearch.js/src/widgets/related-products/related-products.tsx b/packages/instantsearch.js/src/widgets/related-products/related-products.tsx
index 1734b08f6e..e9a9c3ddca 100644
--- a/packages/instantsearch.js/src/widgets/related-products/related-products.tsx
+++ b/packages/instantsearch.js/src/widgets/related-products/related-products.tsx
@@ -4,7 +4,7 @@ import { createRelatedProductsComponent } from 'instantsearch-ui-components';
 import { Fragment, h, render } from 'preact';
 
 import TemplateComponent from '../../components/Template/Template';
-import connectRelatedProducts from '../../connectors/related-products/connectRelatedProducts';
+import { connectRelatedProducts } from '../../connectors';
 import { prepareTemplateProps } from '../../lib/templating';
 import {
   getContainerNode,
@@ -15,16 +15,17 @@ import type {
   RelatedProductsWidgetDescription,
   RelatedProductsConnectorParams,
   RelatedProductsRenderState,
-} from '../../connectors/related-products/connectRelatedProducts';
+} from '../../connectors';
 import type { PreparedTemplateProps } from '../../lib/templating';
 import type {
   Template,
   WidgetFactory,
-  Hit,
   Renderer,
   BaseHit,
   RecommendResponse,
-  TemplateWithBindEvent,
+  Hit,
+  TemplateWithSendEvent,
+  Widget,
 } from '../../types';
 import type {
   RecommendClassNames,
@@ -193,7 +194,7 @@ export type RelatedProductsTemplates<
   /**
    * Template to use for each result. This template will receive an object containing a single record.
    */
-  item: TemplateWithBindEvent<Hit<THit>>;
+  item: TemplateWithSendEvent<Hit<THit>>;
 
   /**
    * Template to use to wrap all items.
@@ -228,13 +229,14 @@ type RelatedProductsWidgetParams<THit extends NonNullable<object> = BaseHit> = {
   cssClasses?: RelatedProductsCSSClasses;
 };
 
-export type RelatedProductsWidget = WidgetFactory<
-  RelatedProductsWidgetDescription & {
-    $$widgetType: 'ais.relatedProducts';
-  },
-  RelatedProductsConnectorParams,
-  RelatedProductsWidgetParams
->;
+export type RelatedProductsWidget<THit extends NonNullable<object> = BaseHit> =
+  WidgetFactory<
+    RelatedProductsWidgetDescription<THit> & {
+      $$widgetType: 'ais.relatedProducts';
+    },
+    RelatedProductsConnectorParams<THit>,
+    RelatedProductsWidgetParams<THit>
+  >;
 
 export default (function relatedProducts<
   THit extends NonNullable<object> = BaseHit
@@ -272,7 +274,7 @@ export default (function relatedProducts<
     render(null, containerNode)
   );
 
-  return {
+  const widget = {
     ...makeWidget({
       objectIDs,
       limit,
@@ -284,4 +286,12 @@ export default (function relatedProducts<
     }),
     $$widgetType: 'ais.relatedProducts',
   };
+
+  // explicitly cast this type to have a small type output.
+  return widget as Widget<
+    RelatedProductsWidgetDescription & {
+      $$widgetType: 'ais.relatedProducts';
+      widgetParams: RelatedProductsConnectorParams<THit>;
+    }
+  >;
 } satisfies RelatedProductsWidget);
diff --git a/packages/instantsearch.js/src/widgets/relevant-sort/relevant-sort.tsx b/packages/instantsearch.js/src/widgets/relevant-sort/relevant-sort.tsx
index 870c5ee28e..7fa9313bbb 100644
--- a/packages/instantsearch.js/src/widgets/relevant-sort/relevant-sort.tsx
+++ b/packages/instantsearch.js/src/widgets/relevant-sort/relevant-sort.tsx
@@ -4,7 +4,7 @@ import { cx } from 'instantsearch-ui-components';
 import { h, render } from 'preact';
 
 import RelevantSort from '../../components/RelevantSort/RelevantSort';
-import connectRelevantSort from '../../connectors/relevant-sort/connectRelevantSort';
+import { connectRelevantSort } from '../../connectors';
 import { component } from '../../lib/suit';
 import {
   getContainerNode,
@@ -21,7 +21,7 @@ import type {
   RelevantSortConnectorParams,
   RelevantSortRenderState,
   RelevantSortWidgetDescription,
-} from '../../connectors/relevant-sort/connectRelevantSort';
+} from '../../connectors';
 import type { PreparedTemplateProps } from '../../lib/templating';
 import type { WidgetFactory, Template } from '../../types';
 
diff --git a/packages/instantsearch.js/src/widgets/search-box/search-box.tsx b/packages/instantsearch.js/src/widgets/search-box/search-box.tsx
index 4d13db48a8..35fb3fe3f2 100644
--- a/packages/instantsearch.js/src/widgets/search-box/search-box.tsx
+++ b/packages/instantsearch.js/src/widgets/search-box/search-box.tsx
@@ -4,7 +4,7 @@ import { cx } from 'instantsearch-ui-components';
 import { h, render } from 'preact';
 
 import SearchBox from '../../components/SearchBox/SearchBox';
-import connectSearchBox from '../../connectors/search-box/connectSearchBox';
+import { connectSearchBox } from '../../connectors';
 import { component } from '../../lib/suit';
 import {
   getContainerNode,
@@ -21,7 +21,7 @@ import type {
   SearchBoxConnectorParams,
   SearchBoxRenderState,
   SearchBoxWidgetDescription,
-} from '../../connectors/search-box/connectSearchBox';
+} from '../../connectors';
 import type { WidgetFactory, Template, RendererOptions } from '../../types';
 
 const withUsage = createDocumentationMessageGenerator({ name: 'search-box' });
diff --git a/packages/instantsearch.js/src/widgets/sort-by/sort-by.tsx b/packages/instantsearch.js/src/widgets/sort-by/sort-by.tsx
index 8eeb9328e2..fa55547658 100644
--- a/packages/instantsearch.js/src/widgets/sort-by/sort-by.tsx
+++ b/packages/instantsearch.js/src/widgets/sort-by/sort-by.tsx
@@ -4,7 +4,7 @@ import { cx } from 'instantsearch-ui-components';
 import { h, render } from 'preact';
 
 import Selector from '../../components/Selector/Selector';
-import connectSortBy from '../../connectors/sort-by/connectSortBy';
+import { connectSortBy } from '../../connectors';
 import { component } from '../../lib/suit';
 import {
   getContainerNode,
@@ -17,7 +17,7 @@ import type {
   SortByItem,
   SortByRenderState,
   SortByWidgetDescription,
-} from '../../connectors/sort-by/connectSortBy';
+} from '../../connectors';
 import type { Renderer, TransformItems, WidgetFactory } from '../../types';
 
 const withUsage = createDocumentationMessageGenerator({ name: 'sort-by' });
diff --git a/packages/instantsearch.js/src/widgets/stats/stats.tsx b/packages/instantsearch.js/src/widgets/stats/stats.tsx
index 2c69e88242..f119231192 100644
--- a/packages/instantsearch.js/src/widgets/stats/stats.tsx
+++ b/packages/instantsearch.js/src/widgets/stats/stats.tsx
@@ -4,7 +4,7 @@ import { cx } from 'instantsearch-ui-components';
 import { h, render } from 'preact';
 
 import Stats from '../../components/Stats/Stats';
-import connectStats from '../../connectors/stats/connectStats';
+import { connectStats } from '../../connectors';
 import { formatNumber } from '../../lib/formatNumber';
 import { component } from '../../lib/suit';
 import { prepareTemplateProps } from '../../lib/templating';
@@ -21,7 +21,7 @@ import type {
   StatsConnectorParams,
   StatsRenderState,
   StatsWidgetDescription,
-} from '../../connectors/stats/connectStats';
+} from '../../connectors';
 import type { PreparedTemplateProps } from '../../lib/templating';
 import type { Renderer, Template, WidgetFactory } from '../../types';
 
diff --git a/packages/instantsearch.js/src/widgets/toggle-refinement/toggle-refinement.tsx b/packages/instantsearch.js/src/widgets/toggle-refinement/toggle-refinement.tsx
index 846378bb2e..fcf27776b5 100644
--- a/packages/instantsearch.js/src/widgets/toggle-refinement/toggle-refinement.tsx
+++ b/packages/instantsearch.js/src/widgets/toggle-refinement/toggle-refinement.tsx
@@ -4,7 +4,7 @@ import { cx } from 'instantsearch-ui-components';
 import { h, render } from 'preact';
 
 import ToggleRefinement from '../../components/ToggleRefinement/ToggleRefinement';
-import connectToggleRefinement from '../../connectors/toggle-refinement/connectToggleRefinement';
+import { connectToggleRefinement } from '../../connectors';
 import { component } from '../../lib/suit';
 import { prepareTemplateProps } from '../../lib/templating';
 import {
@@ -22,7 +22,7 @@ import type {
   ToggleRefinementConnectorParams,
   ToggleRefinementWidgetDescription,
   ToggleRefinementRenderState,
-} from '../../connectors/toggle-refinement/connectToggleRefinement';
+} from '../../connectors';
 import type { PreparedTemplateProps } from '../../lib/templating';
 import type { RendererOptions, Template, WidgetFactory } from '../../types';
 
diff --git a/packages/instantsearch.js/src/widgets/trending-items/trending-items.tsx b/packages/instantsearch.js/src/widgets/trending-items/trending-items.tsx
index 9d033a9fab..6d6de2f471 100644
--- a/packages/instantsearch.js/src/widgets/trending-items/trending-items.tsx
+++ b/packages/instantsearch.js/src/widgets/trending-items/trending-items.tsx
@@ -4,7 +4,7 @@ import { createTrendingItemsComponent } from 'instantsearch-ui-components';
 import { Fragment, h, render } from 'preact';
 
 import TemplateComponent from '../../components/Template/Template';
-import connectTrendingItems from '../../connectors/trending-items/connectTrendingItems';
+import { connectTrendingItems } from '../../connectors';
 import { prepareTemplateProps } from '../../lib/templating';
 import {
   getContainerNode,
@@ -15,7 +15,7 @@ import type {
   TrendingItemsWidgetDescription,
   TrendingItemsConnectorParams,
   TrendingItemsRenderState,
-} from '../../connectors/trending-items/connectTrendingItems';
+} from '../../connectors';
 import type { PreparedTemplateProps } from '../../lib/templating';
 import type {
   Template,
@@ -24,7 +24,8 @@ import type {
   BaseHit,
   RecommendResponse,
   Hit,
-  TemplateWithBindEvent,
+  TemplateWithSendEvent,
+  Widget,
 } from '../../types';
 import type {
   RecommendClassNames,
@@ -192,7 +193,7 @@ export type TrendingItemsTemplates<THit extends NonNullable<object> = BaseHit> =
     /**
      * Template to use for each result. This template will receive an object containing a single record.
      */
-    item: TemplateWithBindEvent<Hit<THit>>;
+    item: TemplateWithSendEvent<Hit<THit>>;
 
     /**
      * Template to use to wrap all items.
@@ -227,13 +228,14 @@ type TrendingItemsWidgetParams<THit extends NonNullable<object> = BaseHit> = {
   cssClasses?: TrendingItemsCSSClasses;
 };
 
-export type TrendingItemsWidget = WidgetFactory<
-  TrendingItemsWidgetDescription & {
-    $$widgetType: 'ais.trendingItems';
-  },
-  TrendingItemsConnectorParams,
-  TrendingItemsWidgetParams
->;
+export type TrendingItemsWidget<THit extends NonNullable<object> = BaseHit> =
+  WidgetFactory<
+    TrendingItemsWidgetDescription<THit> & {
+      $$widgetType: 'ais.trendingItems';
+    },
+    TrendingItemsConnectorParams<THit>,
+    TrendingItemsWidgetParams<THit>
+  >;
 
 export default (function trendingItems<
   THit extends NonNullable<object> = BaseHit
@@ -275,7 +277,7 @@ export default (function trendingItems<
   const facetParameters =
     facetName && facetValue ? { facetName, facetValue } : {};
 
-  return {
+  const widget = {
     ...makeWidget({
       ...facetParameters,
       limit,
@@ -287,4 +289,12 @@ export default (function trendingItems<
     }),
     $$widgetType: 'ais.trendingItems',
   };
+
+  // explicitly cast this type to have a small type output.
+  return widget as Widget<
+    TrendingItemsWidgetDescription & {
+      $$widgetType: 'ais.trendingItems';
+      widgetParams: TrendingItemsConnectorParams<THit>;
+    }
+  >;
 } satisfies TrendingItemsWidget);
diff --git a/packages/instantsearch.js/src/widgets/voice-search/__tests__/voice-search-test.ts b/packages/instantsearch.js/src/widgets/voice-search/__tests__/voice-search-test.ts
index 210d147dc8..f3bdc5cf07 100644
--- a/packages/instantsearch.js/src/widgets/voice-search/__tests__/voice-search-test.ts
+++ b/packages/instantsearch.js/src/widgets/voice-search/__tests__/voice-search-test.ts
@@ -20,10 +20,10 @@ import {
 import voiceSearch from '../voice-search';
 
 import type { VoiceSearchProps } from '../../../components/VoiceSearch/VoiceSearch';
-import type { VoiceSearchHelper } from '../../../lib/voiceSearchHelper/types';
 import type { Widget } from '../../../types';
 import type { VoiceSearchWidgetParams } from '../voice-search';
 import type { AlgoliaSearchHelper as Helper } from 'algoliasearch-helper';
+import type { VoiceSearchHelper } from 'instantsearch-core/src/lib/voiceSearchHelper/types';
 import type { VNode } from 'preact';
 
 const render = castToJestMock(preactRender);
diff --git a/packages/instantsearch.js/src/widgets/voice-search/voice-search.tsx b/packages/instantsearch.js/src/widgets/voice-search/voice-search.tsx
index 469c8835a2..bddbb98d9f 100644
--- a/packages/instantsearch.js/src/widgets/voice-search/voice-search.tsx
+++ b/packages/instantsearch.js/src/widgets/voice-search/voice-search.tsx
@@ -4,7 +4,7 @@ import { cx } from 'instantsearch-ui-components';
 import { h, render } from 'preact';
 
 import VoiceSearchComponent from '../../components/VoiceSearch/VoiceSearch';
-import connectVoiceSearch from '../../connectors/voice-search/connectVoiceSearch';
+import { connectVoiceSearch } from '../../connectors';
 import { component } from '../../lib/suit';
 import {
   getContainerNode,
@@ -21,10 +21,10 @@ import type {
   VoiceSearchConnectorParams,
   VoiceSearchRenderState,
   VoiceSearchWidgetDescription,
-} from '../../connectors/voice-search/connectVoiceSearch';
-import type { CreateVoiceSearchHelper } from '../../lib/voiceSearchHelper/types';
+} from '../../connectors';
 import type { WidgetFactory, Template, Renderer } from '../../types';
 import type { PlainSearchParameters } from 'algoliasearch-helper';
+import type { CreateVoiceSearchHelper } from 'instantsearch-core';
 
 const withUsage = createDocumentationMessageGenerator({ name: 'voice-search' });
 const suit = component('VoiceSearch');
diff --git a/packages/instantsearch.js/test/createInstantSearch.ts b/packages/instantsearch.js/test/createInstantSearch.ts
index fdf4841649..43bfa16caa 100644
--- a/packages/instantsearch.js/test/createInstantSearch.ts
+++ b/packages/instantsearch.js/test/createInstantSearch.ts
@@ -21,7 +21,6 @@ export const createInstantSearch = (
     client,
     started: false,
     status: 'idle',
-    _isSearchStalled: false,
     error: undefined,
     start() {
       this.started = true;
diff --git a/packages/instantsearch.js/test/createWidget.ts b/packages/instantsearch.js/test/createWidget.ts
index c526d18e52..9f10e090e4 100644
--- a/packages/instantsearch.js/test/createWidget.ts
+++ b/packages/instantsearch.js/test/createWidget.ts
@@ -3,14 +3,14 @@ import algoliasearchHelper from 'algoliasearch-helper';
 
 import { createInstantSearch } from './createInstantSearch';
 
+import type { SearchResponse } from 'algoliasearch-helper/types/algoliasearch';
 import type {
   InitOptions,
   RenderOptions,
   DisposeOptions,
   Widget,
-} from '../src/types';
-import type { IndexInitOptions } from '../src/widgets/index/index';
-import type { SearchResponse } from 'algoliasearch-helper/types/algoliasearch';
+  IndexInitOptions,
+} from 'instantsearch-core';
 
 export const createInitOptions = (
   args: Partial<InitOptions> = {}
diff --git a/packages/react-instantsearch-core/package.json b/packages/react-instantsearch-core/package.json
index ac0a799aaf..a9c667717d 100644
--- a/packages/react-instantsearch-core/package.json
+++ b/packages/react-instantsearch-core/package.json
@@ -50,7 +50,7 @@
   "dependencies": {
     "@babel/runtime": "^7.1.2",
     "algoliasearch-helper": "3.24.1",
-    "instantsearch.js": "4.77.3",
+    "instantsearch-core": "0.1.0",
     "use-sync-external-store": "^1.0.0"
   },
   "devDependencies": {
diff --git a/packages/react-instantsearch-core/src/components/DynamicWidgets.tsx b/packages/react-instantsearch-core/src/components/DynamicWidgets.tsx
index f49a5a5c31..a9b5d80d7d 100644
--- a/packages/react-instantsearch-core/src/components/DynamicWidgets.tsx
+++ b/packages/react-instantsearch-core/src/components/DynamicWidgets.tsx
@@ -4,7 +4,7 @@ import { useDynamicWidgets } from '../connectors/useDynamicWidgets';
 import { invariant } from '../lib/invariant';
 import { warn } from '../lib/warn';
 
-import type { DynamicWidgetsConnectorParams } from 'instantsearch.js/es/connectors/dynamic-widgets/connectDynamicWidgets';
+import type { DynamicWidgetsConnectorParams } from 'instantsearch-core';
 import type { ReactElement, ComponentType, ReactNode } from 'react';
 
 function DefaultFallbackComponent() {
diff --git a/packages/react-instantsearch-core/src/components/InstantSearch.tsx b/packages/react-instantsearch-core/src/components/InstantSearch.tsx
index ebbe5c28a0..16ce3ad1a2 100644
--- a/packages/react-instantsearch-core/src/components/InstantSearch.tsx
+++ b/packages/react-instantsearch-core/src/components/InstantSearch.tsx
@@ -8,7 +8,7 @@ import type { UseInstantSearchApiProps } from '../lib/useInstantSearchApi';
 import type {
   InstantSearch as InstantSearchType,
   UiState,
-} from 'instantsearch.js';
+} from 'instantsearch-core';
 
 export type InstantSearchProps<
   TUiState extends UiState = UiState,
diff --git a/packages/react-instantsearch-core/src/components/InstantSearchSSRProvider.tsx b/packages/react-instantsearch-core/src/components/InstantSearchSSRProvider.tsx
index a179ce9860..13adddaad9 100644
--- a/packages/react-instantsearch-core/src/components/InstantSearchSSRProvider.tsx
+++ b/packages/react-instantsearch-core/src/components/InstantSearchSSRProvider.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { InstantSearchSSRContext } from '../lib/InstantSearchSSRContext';
 
 import type { InternalInstantSearch } from '../lib/useInstantSearchApi';
-import type { InitialResults, UiState } from 'instantsearch.js';
+import type { InitialResults, UiState } from 'instantsearch-core';
 import type { ReactNode } from 'react';
 
 export type InstantSearchServerState = {
diff --git a/packages/react-instantsearch-core/src/components/InstantSearchServerContext.ts b/packages/react-instantsearch-core/src/components/InstantSearchServerContext.ts
index 3f7d46a03f..5df00c85bc 100644
--- a/packages/react-instantsearch-core/src/components/InstantSearchServerContext.ts
+++ b/packages/react-instantsearch-core/src/components/InstantSearchServerContext.ts
@@ -1,6 +1,6 @@
 import { createContext } from 'react';
 
-import type { InstantSearch, UiState } from 'instantsearch.js';
+import type { InstantSearch, UiState } from 'instantsearch-core';
 
 export type InstantSearchServerContextApi<
   TUiState extends UiState,
diff --git a/packages/react-instantsearch-core/src/components/__tests__/DynamicWidgets.test.tsx b/packages/react-instantsearch-core/src/components/__tests__/DynamicWidgets.test.tsx
index a481cf5238..cb1574ebe5 100644
--- a/packages/react-instantsearch-core/src/components/__tests__/DynamicWidgets.test.tsx
+++ b/packages/react-instantsearch-core/src/components/__tests__/DynamicWidgets.test.tsx
@@ -21,7 +21,7 @@ import type { UseMenuProps } from '../../connectors/useMenu';
 import type { UsePaginationProps } from '../../connectors/usePagination';
 import type { UseRefinementListProps } from '../../connectors/useRefinementList';
 import type { InstantSearchProps } from '../InstantSearch';
-import type { IndexWidget } from 'instantsearch.js/es/widgets/index/index';
+import type { IndexWidget } from 'instantsearch-core';
 
 expect.addSnapshotSerializer(widgetSnapshotSerializer);
 
diff --git a/packages/react-instantsearch-core/src/components/__tests__/Index.test.tsx b/packages/react-instantsearch-core/src/components/__tests__/Index.test.tsx
index 6ba5f90c00..f858de018a 100644
--- a/packages/react-instantsearch-core/src/components/__tests__/Index.test.tsx
+++ b/packages/react-instantsearch-core/src/components/__tests__/Index.test.tsx
@@ -17,7 +17,7 @@ import { Index } from '../Index';
 import { InstantSearch } from '../InstantSearch';
 import { InstantSearchSSRProvider } from '../InstantSearchSSRProvider';
 
-import type { IndexWidget } from 'instantsearch.js/es/widgets/index/index';
+import type { IndexWidget } from 'instantsearch-core';
 
 describe('Index', () => {
   test('throws when used outside of <InstantSearch>', () => {
diff --git a/packages/react-instantsearch-core/src/components/__tests__/InstantSearch.test.tsx b/packages/react-instantsearch-core/src/components/__tests__/InstantSearch.test.tsx
index 18ba8bf051..f74ca119fc 100644
--- a/packages/react-instantsearch-core/src/components/__tests__/InstantSearch.test.tsx
+++ b/packages/react-instantsearch-core/src/components/__tests__/InstantSearch.test.tsx
@@ -6,8 +6,10 @@ import { createAlgoliaSearchClient } from '@instantsearch/mocks';
 import { createInstantSearchSpy, wait } from '@instantsearch/testutils';
 import { act, render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { history } from 'instantsearch.js/es/lib/routers';
-import { simple } from 'instantsearch.js/es/lib/stateMappings';
+import {
+  historyRouter as history,
+  simpleStateMapping as simple,
+} from 'instantsearch-core';
 import React, { StrictMode, Suspense, version as ReactVersion } from 'react';
 import { SearchBox } from 'react-instantsearch';
 
diff --git a/packages/react-instantsearch-core/src/components/__tests__/InstantSearchSSRProvider.test.tsx b/packages/react-instantsearch-core/src/components/__tests__/InstantSearchSSRProvider.test.tsx
index 8550583390..48953aa545 100644
--- a/packages/react-instantsearch-core/src/components/__tests__/InstantSearchSSRProvider.test.tsx
+++ b/packages/react-instantsearch-core/src/components/__tests__/InstantSearchSSRProvider.test.tsx
@@ -11,15 +11,17 @@ import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import algoliasearchV4 from 'algoliasearch-v4';
 import { algoliasearch as algoliasearchV5 } from 'algoliasearch-v5';
-import { history } from 'instantsearch.js/es/lib/routers';
-import { simple } from 'instantsearch.js/es/lib/stateMappings';
+import {
+  historyRouter as history,
+  simpleStateMapping as simple,
+} from 'instantsearch-core';
 import React, { StrictMode } from 'react';
 import { Hits, RefinementList, SearchBox } from 'react-instantsearch';
 
 import { InstantSearch } from '../InstantSearch';
 import { InstantSearchSSRProvider } from '../InstantSearchSSRProvider';
 
-import type { Hit as AlgoliaHit, SearchClient } from 'instantsearch.js';
+import type { Hit as AlgoliaHit, SearchClient } from 'instantsearch-core';
 
 function HitComponent({ hit }: { hit: AlgoliaHit }) {
   return <>{hit.objectID}</>;
diff --git a/packages/react-instantsearch-core/src/components/__tests__/routing/dispose-start.test.tsx b/packages/react-instantsearch-core/src/components/__tests__/routing/dispose-start.test.tsx
index 76831b2e3e..b0e855c3a7 100644
--- a/packages/react-instantsearch-core/src/components/__tests__/routing/dispose-start.test.tsx
+++ b/packages/react-instantsearch-core/src/components/__tests__/routing/dispose-start.test.tsx
@@ -4,7 +4,7 @@
 
 import { createSearchClient } from '@instantsearch/mocks';
 import { render, waitFor } from '@testing-library/react';
-import historyRouter from 'instantsearch.js/es/lib/routers/history';
+import { historyRouter } from 'instantsearch-core';
 import React, { useEffect } from 'react';
 import { InstantSearch, SearchBox, useSearchBox } from 'react-instantsearch';
 
diff --git a/packages/react-instantsearch-core/src/components/__tests__/routing/external-influence.test.tsx b/packages/react-instantsearch-core/src/components/__tests__/routing/external-influence.test.tsx
index 3b435b91d9..1cb5b63b4e 100644
--- a/packages/react-instantsearch-core/src/components/__tests__/routing/external-influence.test.tsx
+++ b/packages/react-instantsearch-core/src/components/__tests__/routing/external-influence.test.tsx
@@ -4,7 +4,7 @@
 
 import { createSearchClient } from '@instantsearch/mocks';
 import { render, waitFor } from '@testing-library/react';
-import historyRouter from 'instantsearch.js/es/lib/routers/history';
+import { historyRouter } from 'instantsearch-core';
 import React, { useEffect } from 'react';
 import { InstantSearch, SearchBox, useSearchBox } from 'react-instantsearch';
 
diff --git a/packages/react-instantsearch-core/src/components/__tests__/routing/modal.test.tsx b/packages/react-instantsearch-core/src/components/__tests__/routing/modal.test.tsx
index a11e775927..2b9446ab2d 100644
--- a/packages/react-instantsearch-core/src/components/__tests__/routing/modal.test.tsx
+++ b/packages/react-instantsearch-core/src/components/__tests__/routing/modal.test.tsx
@@ -5,7 +5,7 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import historyRouter from 'instantsearch.js/es/lib/routers/history';
+import { historyRouter } from 'instantsearch-core';
 import React from 'react';
 import { InstantSearch, SearchBox } from 'react-instantsearch';
 
diff --git a/packages/react-instantsearch-core/src/components/__tests__/routing/spa-debounced.test.tsx b/packages/react-instantsearch-core/src/components/__tests__/routing/spa-debounced.test.tsx
index 3ec72830d8..b67ebe9d46 100644
--- a/packages/react-instantsearch-core/src/components/__tests__/routing/spa-debounced.test.tsx
+++ b/packages/react-instantsearch-core/src/components/__tests__/routing/spa-debounced.test.tsx
@@ -5,7 +5,7 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import historyRouter from 'instantsearch.js/es/lib/routers/history';
+import { historyRouter } from 'instantsearch-core';
 import React from 'react';
 import { InstantSearch, SearchBox } from 'react-instantsearch';
 
diff --git a/packages/react-instantsearch-core/src/components/__tests__/routing/spa-replace-state.test.tsx b/packages/react-instantsearch-core/src/components/__tests__/routing/spa-replace-state.test.tsx
index 4c96c520f1..9605d02c62 100644
--- a/packages/react-instantsearch-core/src/components/__tests__/routing/spa-replace-state.test.tsx
+++ b/packages/react-instantsearch-core/src/components/__tests__/routing/spa-replace-state.test.tsx
@@ -5,7 +5,7 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import historyRouter from 'instantsearch.js/es/lib/routers/history';
+import { historyRouter } from 'instantsearch-core';
 import React from 'react';
 import { InstantSearch, SearchBox } from 'react-instantsearch';
 
diff --git a/packages/react-instantsearch-core/src/components/__tests__/routing/spa.test.tsx b/packages/react-instantsearch-core/src/components/__tests__/routing/spa.test.tsx
index 1c43580225..ecdb1d264d 100644
--- a/packages/react-instantsearch-core/src/components/__tests__/routing/spa.test.tsx
+++ b/packages/react-instantsearch-core/src/components/__tests__/routing/spa.test.tsx
@@ -5,7 +5,7 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import historyRouter from 'instantsearch.js/es/lib/routers/history';
+import { historyRouter } from 'instantsearch-core';
 import React from 'react';
 import { InstantSearch, SearchBox } from 'react-instantsearch';
 
diff --git a/packages/react-instantsearch-core/src/connectors/useBreadcrumb.ts b/packages/react-instantsearch-core/src/connectors/useBreadcrumb.ts
index 9e61d459a7..5eafae9d1d 100644
--- a/packages/react-instantsearch-core/src/connectors/useBreadcrumb.ts
+++ b/packages/react-instantsearch-core/src/connectors/useBreadcrumb.ts
@@ -1,4 +1,4 @@
-import connectBreadcrumb from 'instantsearch.js/es/connectors/breadcrumb/connectBreadcrumb';
+import { connectBreadcrumb } from 'instantsearch-core';
 
 import { useConnector } from '../hooks/useConnector';
 
@@ -6,7 +6,7 @@ import type { AdditionalWidgetProperties } from '../hooks/useConnector';
 import type {
   BreadcrumbConnectorParams,
   BreadcrumbWidgetDescription,
-} from 'instantsearch.js/es/connectors/breadcrumb/connectBreadcrumb';
+} from 'instantsearch-core';
 
 export type UseBreadcrumbProps = BreadcrumbConnectorParams;
 
diff --git a/packages/react-instantsearch-core/src/connectors/useClearRefinements.ts b/packages/react-instantsearch-core/src/connectors/useClearRefinements.ts
index 4c71e8ec4c..20bc8cca5a 100644
--- a/packages/react-instantsearch-core/src/connectors/useClearRefinements.ts
+++ b/packages/react-instantsearch-core/src/connectors/useClearRefinements.ts
@@ -1,4 +1,4 @@
-import connectClearRefinements from 'instantsearch.js/es/connectors/clear-refinements/connectClearRefinements';
+import { connectClearRefinements } from 'instantsearch-core';
 
 import { useConnector } from '../hooks/useConnector';
 
@@ -6,7 +6,7 @@ import type { AdditionalWidgetProperties } from '../hooks/useConnector';
 import type {
   ClearRefinementsConnectorParams,
   ClearRefinementsWidgetDescription,
-} from 'instantsearch.js/es/connectors/clear-refinements/connectClearRefinements';
+} from 'instantsearch-core';
 
 export type UseClearRefinementsProps = ClearRefinementsConnectorParams;
 
diff --git a/packages/react-instantsearch-core/src/connectors/useConfigure.ts b/packages/react-instantsearch-core/src/connectors/useConfigure.ts
index 20306b05df..3dadcefbc4 100644
--- a/packages/react-instantsearch-core/src/connectors/useConfigure.ts
+++ b/packages/react-instantsearch-core/src/connectors/useConfigure.ts
@@ -1,4 +1,4 @@
-import connectConfigure from 'instantsearch.js/es/connectors/configure/connectConfigure';
+import { connectConfigure } from 'instantsearch-core';
 
 import { useConnector } from '../hooks/useConnector';
 
@@ -6,7 +6,7 @@ import type { AdditionalWidgetProperties } from '../hooks/useConnector';
 import type {
   ConfigureConnectorParams,
   ConfigureWidgetDescription,
-} from 'instantsearch.js/es/connectors/configure/connectConfigure';
+} from 'instantsearch-core';
 
 export type UseConfigureProps = ConfigureConnectorParams['searchParameters'];
 
diff --git a/packages/react-instantsearch-core/src/connectors/useCurrentRefinements.ts b/packages/react-instantsearch-core/src/connectors/useCurrentRefinements.ts
index 02f3765d57..6f90031b12 100644
--- a/packages/react-instantsearch-core/src/connectors/useCurrentRefinements.ts
+++ b/packages/react-instantsearch-core/src/connectors/useCurrentRefinements.ts
@@ -1,4 +1,4 @@
-import connectCurrentRefinements from 'instantsearch.js/es/connectors/current-refinements/connectCurrentRefinements';
+import { connectCurrentRefinements } from 'instantsearch-core';
 
 import { useConnector } from '../hooks/useConnector';
 
@@ -6,7 +6,7 @@ import type { AdditionalWidgetProperties } from '../hooks/useConnector';
 import type {
   CurrentRefinementsConnectorParams,
   CurrentRefinementsWidgetDescription,
-} from 'instantsearch.js/es/connectors/current-refinements/connectCurrentRefinements';
+} from 'instantsearch-core';
 
 export type UseCurrentRefinementsProps = CurrentRefinementsConnectorParams;
 
diff --git a/packages/react-instantsearch-core/src/connectors/useDynamicWidgets.ts b/packages/react-instantsearch-core/src/connectors/useDynamicWidgets.ts
index 6735c048b3..0a2b876ff8 100644
--- a/packages/react-instantsearch-core/src/connectors/useDynamicWidgets.ts
+++ b/packages/react-instantsearch-core/src/connectors/useDynamicWidgets.ts
@@ -1,4 +1,4 @@
-import connectDynamicWidgets from 'instantsearch.js/es/connectors/dynamic-widgets/connectDynamicWidgets';
+import { connectDynamicWidgets } from 'instantsearch-core';
 
 import { useConnector } from '../hooks/useConnector';
 
@@ -6,7 +6,7 @@ import type { AdditionalWidgetProperties } from '../hooks/useConnector';
 import type {
   DynamicWidgetsConnectorParams,
   DynamicWidgetsWidgetDescription,
-} from 'instantsearch.js/es/connectors/dynamic-widgets/connectDynamicWidgets';
+} from 'instantsearch-core';
 
 export type UseDynamicWidgetsProps = Omit<
   DynamicWidgetsConnectorParams,
diff --git a/packages/react-instantsearch-core/src/connectors/useFrequentlyBoughtTogether.ts b/packages/react-instantsearch-core/src/connectors/useFrequentlyBoughtTogether.ts
index 34a95accc1..d6f9057587 100644
--- a/packages/react-instantsearch-core/src/connectors/useFrequentlyBoughtTogether.ts
+++ b/packages/react-instantsearch-core/src/connectors/useFrequentlyBoughtTogether.ts
@@ -1,14 +1,14 @@
-import connectFrequentlyBoughtTogether from 'instantsearch.js/es/connectors/frequently-bought-together/connectFrequentlyBoughtTogether';
+import { connectFrequentlyBoughtTogether } from 'instantsearch-core';
 
 import { useConnector } from '../hooks/useConnector';
 
 import type { AdditionalWidgetProperties } from '../hooks/useConnector';
-import type { BaseHit } from 'instantsearch.js';
 import type {
+  BaseHit,
   FrequentlyBoughtTogetherConnector,
   FrequentlyBoughtTogetherConnectorParams,
   FrequentlyBoughtTogetherWidgetDescription,
-} from 'instantsearch.js/es/connectors/frequently-bought-together/connectFrequentlyBoughtTogether';
+} from 'instantsearch-core';
 
 export type UseFrequentlyBoughtTogetherProps<THit extends BaseHit = BaseHit> =
   FrequentlyBoughtTogetherConnectorParams<THit>;
diff --git a/packages/react-instantsearch-core/src/connectors/useGeoSearch.ts b/packages/react-instantsearch-core/src/connectors/useGeoSearch.ts
index 57b69fb7dc..aab3328d62 100644
--- a/packages/react-instantsearch-core/src/connectors/useGeoSearch.ts
+++ b/packages/react-instantsearch-core/src/connectors/useGeoSearch.ts
@@ -1,14 +1,14 @@
-import connectGeoSearch from 'instantsearch.js/es/connectors/geo-search/connectGeoSearch';
+import { connectGeoSearch } from 'instantsearch-core';
 
 import { useConnector } from '../hooks/useConnector';
 
 import type { AdditionalWidgetProperties } from '../hooks/useConnector';
-import type { GeoHit } from 'instantsearch.js';
 import type {
+  GeoHit,
   GeoSearchConnector,
   GeoSearchConnectorParams,
   GeoSearchWidgetDescription,
-} from 'instantsearch.js/es/connectors/geo-search/connectGeoSearch';
+} from 'instantsearch-core';
 
 export type UseGeoSearchProps<THit extends GeoHit = GeoHit> =
   GeoSearchConnectorParams<THit>;
diff --git a/packages/react-instantsearch-core/src/connectors/useHierarchicalMenu.ts b/packages/react-instantsearch-core/src/connectors/useHierarchicalMenu.ts
index b10cd55d48..dab8f94d4f 100644
--- a/packages/react-instantsearch-core/src/connectors/useHierarchicalMenu.ts
+++ b/packages/react-instantsearch-core/src/connectors/useHierarchicalMenu.ts
@@ -1,4 +1,4 @@
-import connectHierarchicalMenu from 'instantsearch.js/es/connectors/hierarchical-menu/connectHierarchicalMenu';
+import { connectHierarchicalMenu } from 'instantsearch-core';
 
 import { useConnector } from '../hooks/useConnector';
 
@@ -6,7 +6,7 @@ import type { AdditionalWidgetProperties } from '../hooks/useConnector';
 import type {
   HierarchicalMenuConnectorParams,
   HierarchicalMenuWidgetDescription,
-} from 'instantsearch.js/es/connectors/hierarchical-menu/connectHierarchicalMenu';
+} from 'instantsearch-core';
 
 export type UseHierarchicalMenuProps = HierarchicalMenuConnectorParams;
 
diff --git a/packages/react-instantsearch-core/src/connectors/useHits.ts b/packages/react-instantsearch-core/src/connectors/useHits.ts
index a24b439f2c..3006d9b7a4 100644
--- a/packages/react-instantsearch-core/src/connectors/useHits.ts
+++ b/packages/react-instantsearch-core/src/connectors/useHits.ts
@@ -1,14 +1,14 @@
-import connectHits from 'instantsearch.js/es/connectors/hits/connectHits';
+import { connectHits } from 'instantsearch-core';
 
 import { useConnector } from '../hooks/useConnector';
 
 import type { AdditionalWidgetProperties } from '../hooks/useConnector';
-import type { BaseHit } from 'instantsearch.js';
 import type {
+  BaseHit,
   HitsConnectorParams,
   HitsWidgetDescription,
   HitsConnector,
-} from 'instantsearch.js/es/connectors/hits/connectHits';
+} from 'instantsearch-core';
 
 export type UseHitsProps<THit extends BaseHit = BaseHit> =
   HitsConnectorParams<THit>;
diff --git a/packages/react-instantsearch-core/src/connectors/useHitsPerPage.ts b/packages/react-instantsearch-core/src/connectors/useHitsPerPage.ts
index dafa5260d2..daddad9833 100644
--- a/packages/react-instantsearch-core/src/connectors/useHitsPerPage.ts
+++ b/packages/react-instantsearch-core/src/connectors/useHitsPerPage.ts
@@ -1,4 +1,4 @@
-import connectHitsPerPage from 'instantsearch.js/es/connectors/hits-per-page/connectHitsPerPage';
+import { connectHitsPerPage } from 'instantsearch-core';
 
 import { useConnector } from '../hooks/useConnector';
 
@@ -6,7 +6,7 @@ import type { AdditionalWidgetProperties } from '../hooks/useConnector';
 import type {
   HitsPerPageConnectorParams,
   HitsPerPageWidgetDescription,
-} from 'instantsearch.js/es/connectors/hits-per-page/connectHitsPerPage';
+} from 'instantsearch-core';
 
 export type UseHitsPerPageProps = HitsPerPageConnectorParams;
 
diff --git a/packages/react-instantsearch-core/src/connectors/useInfiniteHits.ts b/packages/react-instantsearch-core/src/connectors/useInfiniteHits.ts
index f5bb0454ab..0c706d58c6 100644
--- a/packages/react-instantsearch-core/src/connectors/useInfiniteHits.ts
+++ b/packages/react-instantsearch-core/src/connectors/useInfiniteHits.ts
@@ -1,14 +1,14 @@
-import connectInfiniteHits from 'instantsearch.js/es/connectors/infinite-hits/connectInfiniteHits';
+import { connectInfiniteHits } from 'instantsearch-core';
 
 import { useConnector } from '../hooks/useConnector';
 
 import type { AdditionalWidgetProperties } from '../hooks/useConnector';
-import type { BaseHit } from 'instantsearch.js';
 import type {
+  BaseHit,
   InfiniteHitsConnectorParams,
   InfiniteHitsWidgetDescription,
   InfiniteHitsConnector,
-} from 'instantsearch.js/es/connectors/infinite-hits/connectInfiniteHits';
+} from 'instantsearch-core';
 
 export type UseInfiniteHitsProps<THit extends BaseHit = BaseHit> =
   InfiniteHitsConnectorParams<THit>;
diff --git a/packages/react-instantsearch-core/src/connectors/useLookingSimilar.ts b/packages/react-instantsearch-core/src/connectors/useLookingSimilar.ts
index ddd4efd3d3..2027991ec4 100644
--- a/packages/react-instantsearch-core/src/connectors/useLookingSimilar.ts
+++ b/packages/react-instantsearch-core/src/connectors/useLookingSimilar.ts
@@ -1,14 +1,14 @@
-import connectLookingSimilar from 'instantsearch.js/es/connectors/looking-similar/connectLookingSimilar';
+import { connectLookingSimilar } from 'instantsearch-core';
 
 import { useConnector } from '../hooks/useConnector';
 
 import type { AdditionalWidgetProperties } from '../hooks/useConnector';
-import type { BaseHit } from 'instantsearch.js';
 import type {
+  BaseHit,
   LookingSimilarConnector,
   LookingSimilarConnectorParams,
   LookingSimilarWidgetDescription,
-} from 'instantsearch.js/es/connectors/looking-similar/connectLookingSimilar';
+} from 'instantsearch-core';
 
 export type UseLookingSimilarProps<THit extends BaseHit = BaseHit> =
   LookingSimilarConnectorParams<THit>;
diff --git a/packages/react-instantsearch-core/src/connectors/useMenu.ts b/packages/react-instantsearch-core/src/connectors/useMenu.ts
index d8485060fb..dc78f02977 100644
--- a/packages/react-instantsearch-core/src/connectors/useMenu.ts
+++ b/packages/react-instantsearch-core/src/connectors/useMenu.ts
@@ -1,4 +1,4 @@
-import connectMenu from 'instantsearch.js/es/connectors/menu/connectMenu';
+import { connectMenu } from 'instantsearch-core';
 
 import { useConnector } from '../hooks/useConnector';
 
@@ -6,7 +6,7 @@ import type { AdditionalWidgetProperties } from '../hooks/useConnector';
 import type {
   MenuConnectorParams,
   MenuWidgetDescription,
-} from 'instantsearch.js/es/connectors/menu/connectMenu';
+} from 'instantsearch-core';
 
 export type UseMenuProps = MenuConnectorParams;
 
diff --git a/packages/react-instantsearch-core/src/connectors/useNumericMenu.ts b/packages/react-instantsearch-core/src/connectors/useNumericMenu.ts
index b732020772..78143f47a8 100644
--- a/packages/react-instantsearch-core/src/connectors/useNumericMenu.ts
+++ b/packages/react-instantsearch-core/src/connectors/useNumericMenu.ts
@@ -1,4 +1,4 @@
-import connectNumericMenu from 'instantsearch.js/es/connectors/numeric-menu/connectNumericMenu';
+import { connectNumericMenu } from 'instantsearch-core';
 
 import { useConnector } from '../hooks/useConnector';
 
@@ -6,7 +6,7 @@ import type { AdditionalWidgetProperties } from '../hooks/useConnector';
 import type {
   NumericMenuConnectorParams,
   NumericMenuWidgetDescription,
-} from 'instantsearch.js/es/connectors/numeric-menu/connectNumericMenu';
+} from 'instantsearch-core';
 
 export type UseNumericMenuProps = NumericMenuConnectorParams;
 
diff --git a/packages/react-instantsearch-core/src/connectors/usePagination.ts b/packages/react-instantsearch-core/src/connectors/usePagination.ts
index 3e9ca5b995..1e84990139 100644
--- a/packages/react-instantsearch-core/src/connectors/usePagination.ts
+++ b/packages/react-instantsearch-core/src/connectors/usePagination.ts
@@ -1,4 +1,4 @@
-import connectPagination from 'instantsearch.js/es/connectors/pagination/connectPagination';
+import { connectPagination } from 'instantsearch-core';
 
 import { useConnector } from '../hooks/useConnector';
 
@@ -6,7 +6,7 @@ import type { AdditionalWidgetProperties } from '../hooks/useConnector';
 import type {
   PaginationConnectorParams,
   PaginationWidgetDescription,
-} from 'instantsearch.js/es/connectors/pagination/connectPagination';
+} from 'instantsearch-core';
 
 export type UsePaginationProps = PaginationConnectorParams;
 
diff --git a/packages/react-instantsearch-core/src/connectors/usePoweredBy.ts b/packages/react-instantsearch-core/src/connectors/usePoweredBy.ts
index 1819eb3759..5b11c76b77 100644
--- a/packages/react-instantsearch-core/src/connectors/usePoweredBy.ts
+++ b/packages/react-instantsearch-core/src/connectors/usePoweredBy.ts
@@ -1,6 +1,6 @@
-import { safelyRunOnBrowser } from 'instantsearch.js/es/lib/utils';
+import { safelyRunOnBrowser } from 'instantsearch-core';
 
-import type { PoweredByRenderState } from 'instantsearch.js/es/connectors/powered-by/connectPoweredBy';
+import type { PoweredByRenderState } from 'instantsearch-core';
 
 export function usePoweredBy(): PoweredByRenderState {
   const hostname = safelyRunOnBrowser(
diff --git a/packages/react-instantsearch-core/src/connectors/useQueryRules.ts b/packages/react-instantsearch-core/src/connectors/useQueryRules.ts
index fe5195412d..46a27e913b 100644
--- a/packages/react-instantsearch-core/src/connectors/useQueryRules.ts
+++ b/packages/react-instantsearch-core/src/connectors/useQueryRules.ts
@@ -1,4 +1,4 @@
-import connectQueryRules from 'instantsearch.js/es/connectors/query-rules/connectQueryRules';
+import { connectQueryRules } from 'instantsearch-core';
 
 import { useConnector } from '../hooks/useConnector';
 
@@ -6,7 +6,7 @@ import type { AdditionalWidgetProperties } from '../hooks/useConnector';
 import type {
   QueryRulesConnectorParams,
   QueryRulesWidgetDescription,
-} from 'instantsearch.js/es/connectors/query-rules/connectQueryRules';
+} from 'instantsearch-core';
 
 export type UseQueryRulesProps = QueryRulesConnectorParams;
 
diff --git a/packages/react-instantsearch-core/src/connectors/useRange.ts b/packages/react-instantsearch-core/src/connectors/useRange.ts
index a35501616a..18d2cba84b 100644
--- a/packages/react-instantsearch-core/src/connectors/useRange.ts
+++ b/packages/react-instantsearch-core/src/connectors/useRange.ts
@@ -1,4 +1,4 @@
-import connectRange from 'instantsearch.js/es/connectors/range/connectRange';
+import { connectRange } from 'instantsearch-core';
 
 import { useConnector } from '../hooks/useConnector';
 
@@ -6,7 +6,7 @@ import type { AdditionalWidgetProperties } from '../hooks/useConnector';
 import type {
   RangeConnectorParams,
   RangeWidgetDescription,
-} from 'instantsearch.js/es/connectors/range/connectRange';
+} from 'instantsearch-core';
 
 export type UseRangeProps = RangeConnectorParams;
 
diff --git a/packages/react-instantsearch-core/src/connectors/useRefinementList.ts b/packages/react-instantsearch-core/src/connectors/useRefinementList.ts
index 71e4405448..6b773e72be 100644
--- a/packages/react-instantsearch-core/src/connectors/useRefinementList.ts
+++ b/packages/react-instantsearch-core/src/connectors/useRefinementList.ts
@@ -1,4 +1,4 @@
-import connectRefinementList from 'instantsearch.js/es/connectors/refinement-list/connectRefinementList';
+import { connectRefinementList } from 'instantsearch-core';
 
 import { useConnector } from '../hooks/useConnector';
 
@@ -6,7 +6,7 @@ import type { AdditionalWidgetProperties } from '../hooks/useConnector';
 import type {
   RefinementListConnectorParams,
   RefinementListWidgetDescription,
-} from 'instantsearch.js/es/connectors/refinement-list/connectRefinementList';
+} from 'instantsearch-core';
 
 export type UseRefinementListProps = RefinementListConnectorParams;
 
diff --git a/packages/react-instantsearch-core/src/connectors/useRelatedProducts.ts b/packages/react-instantsearch-core/src/connectors/useRelatedProducts.ts
index 653a554e75..b95939882c 100644
--- a/packages/react-instantsearch-core/src/connectors/useRelatedProducts.ts
+++ b/packages/react-instantsearch-core/src/connectors/useRelatedProducts.ts
@@ -1,14 +1,14 @@
-import connectRelatedProducts from 'instantsearch.js/es/connectors/related-products/connectRelatedProducts';
+import { connectRelatedProducts } from 'instantsearch-core';
 
 import { useConnector } from '../hooks/useConnector';
 
 import type { AdditionalWidgetProperties } from '../hooks/useConnector';
-import type { BaseHit } from 'instantsearch.js';
 import type {
+  BaseHit,
   RelatedProductsConnector,
   RelatedProductsConnectorParams,
   RelatedProductsWidgetDescription,
-} from 'instantsearch.js/es/connectors/related-products/connectRelatedProducts';
+} from 'instantsearch-core';
 
 export type UseRelatedProductsProps<THit extends BaseHit = BaseHit> =
   RelatedProductsConnectorParams<THit>;
diff --git a/packages/react-instantsearch-core/src/connectors/useSearchBox.ts b/packages/react-instantsearch-core/src/connectors/useSearchBox.ts
index a9b242c9eb..d05c014ea8 100644
--- a/packages/react-instantsearch-core/src/connectors/useSearchBox.ts
+++ b/packages/react-instantsearch-core/src/connectors/useSearchBox.ts
@@ -1,4 +1,4 @@
-import connectSearchBox from 'instantsearch.js/es/connectors/search-box/connectSearchBox';
+import { connectSearchBox } from 'instantsearch-core';
 
 import { useConnector } from '../hooks/useConnector';
 
@@ -6,7 +6,7 @@ import type { AdditionalWidgetProperties } from '../hooks/useConnector';
 import type {
   SearchBoxConnectorParams,
   SearchBoxWidgetDescription,
-} from 'instantsearch.js/es/connectors/search-box/connectSearchBox';
+} from 'instantsearch-core';
 
 export type UseSearchBoxProps = SearchBoxConnectorParams;
 
diff --git a/packages/react-instantsearch-core/src/connectors/useSortBy.ts b/packages/react-instantsearch-core/src/connectors/useSortBy.ts
index ee9c2a0970..b74851dc36 100644
--- a/packages/react-instantsearch-core/src/connectors/useSortBy.ts
+++ b/packages/react-instantsearch-core/src/connectors/useSortBy.ts
@@ -1,4 +1,4 @@
-import connectSortBy from 'instantsearch.js/es/connectors/sort-by/connectSortBy';
+import { connectSortBy } from 'instantsearch-core';
 
 import { useConnector } from '../hooks/useConnector';
 
@@ -6,7 +6,7 @@ import type { AdditionalWidgetProperties } from '../hooks/useConnector';
 import type {
   SortByConnectorParams,
   SortByWidgetDescription,
-} from 'instantsearch.js/es/connectors/sort-by/connectSortBy';
+} from 'instantsearch-core';
 
 export type UseSortByProps = SortByConnectorParams;
 
diff --git a/packages/react-instantsearch-core/src/connectors/useStats.ts b/packages/react-instantsearch-core/src/connectors/useStats.ts
index ac5bd659c9..419499e682 100644
--- a/packages/react-instantsearch-core/src/connectors/useStats.ts
+++ b/packages/react-instantsearch-core/src/connectors/useStats.ts
@@ -1,4 +1,4 @@
-import connectStats from 'instantsearch.js/es/connectors/stats/connectStats';
+import { connectStats } from 'instantsearch-core';
 
 import { useConnector } from '../hooks/useConnector';
 
@@ -6,7 +6,7 @@ import type { AdditionalWidgetProperties } from '../hooks/useConnector';
 import type {
   StatsConnectorParams,
   StatsWidgetDescription,
-} from 'instantsearch.js/es/connectors/stats/connectStats';
+} from 'instantsearch-core';
 
 export type UseStatsProps = StatsConnectorParams;
 
diff --git a/packages/react-instantsearch-core/src/connectors/useToggleRefinement.ts b/packages/react-instantsearch-core/src/connectors/useToggleRefinement.ts
index 33830749ad..0e4c372fbd 100644
--- a/packages/react-instantsearch-core/src/connectors/useToggleRefinement.ts
+++ b/packages/react-instantsearch-core/src/connectors/useToggleRefinement.ts
@@ -1,4 +1,4 @@
-import connectToggleRefinement from 'instantsearch.js/es/connectors/toggle-refinement/connectToggleRefinement';
+import { connectToggleRefinement } from 'instantsearch-core';
 
 import { useConnector } from '../hooks/useConnector';
 
@@ -6,7 +6,7 @@ import type { AdditionalWidgetProperties } from '../hooks/useConnector';
 import type {
   ToggleRefinementConnectorParams,
   ToggleRefinementWidgetDescription,
-} from 'instantsearch.js/es/connectors/toggle-refinement/connectToggleRefinement';
+} from 'instantsearch-core';
 
 export type UseToggleRefinementProps = ToggleRefinementConnectorParams;
 
diff --git a/packages/react-instantsearch-core/src/connectors/useTrendingItems.ts b/packages/react-instantsearch-core/src/connectors/useTrendingItems.ts
index 37543adf50..f1af742a23 100644
--- a/packages/react-instantsearch-core/src/connectors/useTrendingItems.ts
+++ b/packages/react-instantsearch-core/src/connectors/useTrendingItems.ts
@@ -1,14 +1,14 @@
-import connectTrendingItems from 'instantsearch.js/es/connectors/trending-items/connectTrendingItems';
+import { connectTrendingItems } from 'instantsearch-core';
 
 import { useConnector } from '../hooks/useConnector';
 
 import type { AdditionalWidgetProperties } from '../hooks/useConnector';
-import type { BaseHit } from 'instantsearch.js';
 import type {
+  BaseHit,
   TrendingItemsConnector,
   TrendingItemsConnectorParams,
   TrendingItemsWidgetDescription,
-} from 'instantsearch.js/es/connectors/trending-items/connectTrendingItems';
+} from 'instantsearch-core';
 
 export type UseTrendingItemsProps<THit extends BaseHit = BaseHit> =
   TrendingItemsConnectorParams<THit>;
diff --git a/packages/react-instantsearch-core/src/hooks/__tests__/useConnector.test.tsx b/packages/react-instantsearch-core/src/hooks/__tests__/useConnector.test.tsx
index 23b0df3246..2cd107ea3d 100644
--- a/packages/react-instantsearch-core/src/hooks/__tests__/useConnector.test.tsx
+++ b/packages/react-instantsearch-core/src/hooks/__tests__/useConnector.test.tsx
@@ -12,7 +12,7 @@ import {
 } from '@instantsearch/testutils';
 import { render, waitFor, renderHook } from '@testing-library/react';
 import { SearchParameters, SearchResults } from 'algoliasearch-helper';
-import connectHits from 'instantsearch.js/es/connectors/hits/connectHits';
+import { connectHits } from 'instantsearch-core';
 import React, { StrictMode, useState } from 'react';
 
 import { Index } from '../../components/Index';
@@ -24,11 +24,11 @@ import { noop } from '../../lib/noop';
 import { useConnector } from '../useConnector';
 
 import type { UseHitsProps } from '../../connectors/useHits';
-import type { Connector } from 'instantsearch.js';
 import type {
+  Connector,
   HitsConnectorParams,
   HitsWidgetDescription,
-} from 'instantsearch.js/es/connectors/hits/connectHits';
+} from 'instantsearch-core';
 
 type CustomSearchBoxWidgetDescription = {
   $$type: 'test.searchBox';
diff --git a/packages/react-instantsearch-core/src/hooks/useConnector.ts b/packages/react-instantsearch-core/src/hooks/useConnector.ts
index 55b05e1d8a..4ca5aa8731 100644
--- a/packages/react-instantsearch-core/src/hooks/useConnector.ts
+++ b/packages/react-instantsearch-core/src/hooks/useConnector.ts
@@ -15,7 +15,7 @@ import type {
   UiState,
   Widget,
   WidgetDescription,
-} from 'instantsearch.js';
+} from 'instantsearch-core';
 
 export type AdditionalWidgetProperties = Partial<Widget<WidgetDescription>>;
 
diff --git a/packages/react-instantsearch-core/src/hooks/useInstantSearch.ts b/packages/react-instantsearch-core/src/hooks/useInstantSearch.ts
index 55cb997af1..042886ce0a 100644
--- a/packages/react-instantsearch-core/src/hooks/useInstantSearch.ts
+++ b/packages/react-instantsearch-core/src/hooks/useInstantSearch.ts
@@ -7,7 +7,7 @@ import { useSearchState } from '../lib/useSearchState';
 
 import type { SearchResultsApi } from '../lib/useSearchResults';
 import type { SearchStateApi } from '../lib/useSearchState';
-import type { InstantSearch, Middleware, UiState } from 'instantsearch.js';
+import type { InstantSearch, Middleware, UiState } from 'instantsearch-core';
 
 export type InstantSearchApi<TUiState extends UiState = UiState> =
   SearchStateApi<TUiState> &
diff --git a/packages/react-instantsearch-core/src/lib/IndexContext.ts b/packages/react-instantsearch-core/src/lib/IndexContext.ts
index 5e1b3ce7ca..a0831c4fac 100644
--- a/packages/react-instantsearch-core/src/lib/IndexContext.ts
+++ b/packages/react-instantsearch-core/src/lib/IndexContext.ts
@@ -1,6 +1,6 @@
 import { createContext } from 'react';
 
-import type { IndexWidget } from 'instantsearch.js/es/widgets/index/index';
+import type { IndexWidget } from 'instantsearch-core';
 
 export const IndexContext = createContext<IndexWidget | null>(null);
 
diff --git a/packages/react-instantsearch-core/src/lib/InstantSearchContext.ts b/packages/react-instantsearch-core/src/lib/InstantSearchContext.ts
index b5342b5472..c4222c0354 100644
--- a/packages/react-instantsearch-core/src/lib/InstantSearchContext.ts
+++ b/packages/react-instantsearch-core/src/lib/InstantSearchContext.ts
@@ -1,6 +1,6 @@
 import { createContext } from 'react';
 
-import type { InstantSearch } from 'instantsearch.js';
+import type { InstantSearch } from 'instantsearch-core';
 
 export const InstantSearchContext = createContext<InstantSearch | null>(null);
 
diff --git a/packages/react-instantsearch-core/src/lib/InstantSearchSSRContext.ts b/packages/react-instantsearch-core/src/lib/InstantSearchSSRContext.ts
index a76c8b8767..12914d7651 100644
--- a/packages/react-instantsearch-core/src/lib/InstantSearchSSRContext.ts
+++ b/packages/react-instantsearch-core/src/lib/InstantSearchSSRContext.ts
@@ -2,7 +2,7 @@ import { createContext } from 'react';
 
 import type { InstantSearchServerState } from '../components/InstantSearchSSRProvider';
 import type { InternalInstantSearch } from './useInstantSearchApi';
-import type { UiState } from 'instantsearch.js';
+import type { UiState } from 'instantsearch-core';
 import type { MutableRefObject } from 'react';
 
 export type InstantSearchSSRContextApi<
diff --git a/packages/react-instantsearch-core/src/lib/getIndexSearchResults.ts b/packages/react-instantsearch-core/src/lib/getIndexSearchResults.ts
index f8845751a5..fe7cf82cef 100644
--- a/packages/react-instantsearch-core/src/lib/getIndexSearchResults.ts
+++ b/packages/react-instantsearch-core/src/lib/getIndexSearchResults.ts
@@ -1,6 +1,6 @@
 import { createSearchResults } from './createSearchResults';
 
-import type { IndexWidget } from 'instantsearch.js/es/widgets/index/index';
+import type { IndexWidget } from 'instantsearch-core';
 
 export function getIndexSearchResults(indexWidget: IndexWidget) {
   const helper = indexWidget.getHelper()!;
diff --git a/packages/react-instantsearch-core/src/lib/useIndex.ts b/packages/react-instantsearch-core/src/lib/useIndex.ts
index 87ae324bca..ce6eb0df20 100644
--- a/packages/react-instantsearch-core/src/lib/useIndex.ts
+++ b/packages/react-instantsearch-core/src/lib/useIndex.ts
@@ -1,4 +1,4 @@
-import index from 'instantsearch.js/es/widgets/index/index';
+import { index } from 'instantsearch-core';
 import { useMemo } from 'react';
 
 import { useForceUpdate } from './useForceUpdate';
@@ -9,7 +9,7 @@ import { useIsomorphicLayoutEffect } from './useIsomorphicLayoutEffect';
 import { useStableValue } from './useStableValue';
 import { useWidget } from './useWidget';
 
-import type { IndexWidgetParams } from 'instantsearch.js/es/widgets/index/index';
+import type { IndexWidgetParams } from 'instantsearch-core';
 
 export type UseIndexProps = IndexWidgetParams;
 
diff --git a/packages/react-instantsearch-core/src/lib/useIndexContext.ts b/packages/react-instantsearch-core/src/lib/useIndexContext.ts
index 2a8edce4ac..869c26193a 100644
--- a/packages/react-instantsearch-core/src/lib/useIndexContext.ts
+++ b/packages/react-instantsearch-core/src/lib/useIndexContext.ts
@@ -3,7 +3,7 @@ import { useContext } from 'react';
 import { IndexContext } from './IndexContext';
 import { invariant } from './invariant';
 
-import type { IndexWidget, UiState } from 'instantsearch.js';
+import type { IndexWidget, UiState } from 'instantsearch-core';
 import type { Context } from 'react';
 
 export function useIndexContext<TUiState extends UiState = UiState>() {
diff --git a/packages/react-instantsearch-core/src/lib/useInstantSearchApi.ts b/packages/react-instantsearch-core/src/lib/useInstantSearchApi.ts
index fb9ab305f7..ddab5a5495 100644
--- a/packages/react-instantsearch-core/src/lib/useInstantSearchApi.ts
+++ b/packages/react-instantsearch-core/src/lib/useInstantSearchApi.ts
@@ -1,6 +1,7 @@
-import InstantSearch, {
+import {
+  InstantSearch,
   INSTANTSEARCH_FUTURE_DEFAULTS,
-} from 'instantsearch.js/es/lib/InstantSearch';
+} from 'instantsearch-core';
 import { useCallback, useRef, version as ReactVersion } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
@@ -18,7 +19,7 @@ import type {
   InstantSearchOptions,
   SearchClient,
   UiState,
-} from 'instantsearch.js';
+} from 'instantsearch-core';
 
 const defaultUserAgents = [
   `react (${ReactVersion})`,
diff --git a/packages/react-instantsearch-core/src/lib/useInstantSearchContext.ts b/packages/react-instantsearch-core/src/lib/useInstantSearchContext.ts
index ef2a7126f1..becfc9a5cd 100644
--- a/packages/react-instantsearch-core/src/lib/useInstantSearchContext.ts
+++ b/packages/react-instantsearch-core/src/lib/useInstantSearchContext.ts
@@ -4,7 +4,7 @@ import { InstantSearchContext } from './InstantSearchContext';
 import { invariant } from './invariant';
 
 import type { InternalInstantSearch } from './useInstantSearchApi';
-import type { UiState } from 'instantsearch.js';
+import type { UiState } from 'instantsearch-core';
 import type { Context } from 'react';
 
 export function useInstantSearchContext<
diff --git a/packages/react-instantsearch-core/src/lib/useInstantSearchSSRContext.ts b/packages/react-instantsearch-core/src/lib/useInstantSearchSSRContext.ts
index 70780d79e5..3cc773f8bb 100644
--- a/packages/react-instantsearch-core/src/lib/useInstantSearchSSRContext.ts
+++ b/packages/react-instantsearch-core/src/lib/useInstantSearchSSRContext.ts
@@ -3,7 +3,7 @@ import { useContext } from 'react';
 import { InstantSearchSSRContext } from './InstantSearchSSRContext';
 
 import type { InstantSearchSSRContextApi } from './InstantSearchSSRContext';
-import type { UiState } from 'instantsearch.js';
+import type { UiState } from 'instantsearch-core';
 import type { Context } from 'react';
 
 export function useInstantSearchSSRContext<
diff --git a/packages/react-instantsearch-core/src/lib/useInstantSearchServerContext.ts b/packages/react-instantsearch-core/src/lib/useInstantSearchServerContext.ts
index 3665707e36..4811a7b330 100644
--- a/packages/react-instantsearch-core/src/lib/useInstantSearchServerContext.ts
+++ b/packages/react-instantsearch-core/src/lib/useInstantSearchServerContext.ts
@@ -3,7 +3,7 @@ import { useContext } from 'react';
 import { InstantSearchServerContext } from '../components/InstantSearchServerContext';
 
 import type { InstantSearchServerContextApi } from '../components/InstantSearchServerContext';
-import type { UiState } from 'instantsearch.js';
+import type { UiState } from 'instantsearch-core';
 import type { Context } from 'react';
 
 export function useInstantSearchServerContext<
diff --git a/packages/react-instantsearch-core/src/lib/useSearchResults.ts b/packages/react-instantsearch-core/src/lib/useSearchResults.ts
index d91d69d8dc..ca1e7e3c6c 100644
--- a/packages/react-instantsearch-core/src/lib/useSearchResults.ts
+++ b/packages/react-instantsearch-core/src/lib/useSearchResults.ts
@@ -1,4 +1,4 @@
-import { isIndexWidget } from 'instantsearch.js/es/lib/utils';
+import { isIndexWidget } from 'instantsearch-core';
 import { useEffect, useState } from 'react';
 
 import { getIndexSearchResults } from './getIndexSearchResults';
@@ -6,7 +6,7 @@ import { useIndexContext } from './useIndexContext';
 import { useInstantSearchContext } from './useInstantSearchContext';
 
 import type { SearchResults } from 'algoliasearch-helper';
-import type { ScopedResult } from 'instantsearch.js';
+import type { ScopedResult } from 'instantsearch-core';
 
 export type SearchResultsApi = {
   results: SearchResults<any>;
diff --git a/packages/react-instantsearch-core/src/lib/useSearchState.ts b/packages/react-instantsearch-core/src/lib/useSearchState.ts
index 030e846796..a597dabaa6 100644
--- a/packages/react-instantsearch-core/src/lib/useSearchState.ts
+++ b/packages/react-instantsearch-core/src/lib/useSearchState.ts
@@ -3,7 +3,7 @@ import { useCallback, useEffect, useState } from 'react';
 import { useIndexContext } from './useIndexContext';
 import { useInstantSearchContext } from './useInstantSearchContext';
 
-import type { InstantSearch, UiState, IndexWidget } from 'instantsearch.js';
+import type { InstantSearch, UiState, IndexWidget } from 'instantsearch-core';
 
 export type SearchStateApi<TUiState extends UiState> = {
   uiState: TUiState;
diff --git a/packages/react-instantsearch-core/src/lib/useWidget.ts b/packages/react-instantsearch-core/src/lib/useWidget.ts
index 893968a2c2..abdcbe750d 100644
--- a/packages/react-instantsearch-core/src/lib/useWidget.ts
+++ b/packages/react-instantsearch-core/src/lib/useWidget.ts
@@ -6,8 +6,7 @@ import { useInstantSearchContext } from './useInstantSearchContext';
 import { useIsomorphicLayoutEffect } from './useIsomorphicLayoutEffect';
 import { useRSCContext } from './useRSCContext';
 
-import type { Widget } from 'instantsearch.js';
-import type { IndexWidget } from 'instantsearch.js/es/widgets/index/index';
+import type { Widget, IndexWidget } from 'instantsearch-core';
 
 export function useWidget<TWidget extends Widget | IndexWidget, TProps>({
   widget,
diff --git a/packages/react-instantsearch-core/src/server/__tests__/getServerState.test.tsx b/packages/react-instantsearch-core/src/server/__tests__/getServerState.test.tsx
index a7751c1fdd..9bd1bd0146 100644
--- a/packages/react-instantsearch-core/src/server/__tests__/getServerState.test.tsx
+++ b/packages/react-instantsearch-core/src/server/__tests__/getServerState.test.tsx
@@ -8,6 +8,7 @@ import {
   createAlgoliaSearchClient,
   createSingleSearchResponse,
   defaultRenderingContent,
+  createSingleRecommendResponse,
 } from '@instantsearch/mocks';
 import React, { version as ReactVersion } from 'react';
 import { renderToString } from 'react-dom/server';
@@ -24,7 +25,7 @@ import {
 import { getServerState } from '../getServerState';
 
 import type { MockSearchClient } from '@instantsearch/mocks';
-import type { Hit as AlgoliaHit } from 'instantsearch.js';
+import type { Hit as AlgoliaHit } from 'instantsearch-core';
 import type {
   InstantSearchServerState,
   InstantSearchProps,
@@ -509,8 +510,14 @@ describe('getServerState', () => {
           )
         )
       ) as MockSearchClient['search'],
-      getRecommendations: jest.fn().mockResolvedValue({
-        results: [createSingleSearchResponse({ hits: [{ objectID: '3' }] })],
+      getRecommendations: jest.fn(() => {
+        return Promise.resolve({
+          results: [
+            createSingleRecommendResponse({
+              hits: [{ objectID: '3', _score: 1 }],
+            }),
+          ],
+        });
       }),
     });
     const { App } = createTestEnvironment({ searchClient });
diff --git a/packages/react-instantsearch-core/src/server/getServerState.tsx b/packages/react-instantsearch-core/src/server/getServerState.tsx
index 05e916c462..edcfa214b8 100644
--- a/packages/react-instantsearch-core/src/server/getServerState.tsx
+++ b/packages/react-instantsearch-core/src/server/getServerState.tsx
@@ -1,8 +1,9 @@
 import {
   getInitialResults,
   waitForResults,
-} from 'instantsearch.js/es/lib/server';
-import { walkIndex, resetWidgetId } from 'instantsearch.js/es/lib/utils';
+  walkIndex,
+  resetWidgetId,
+} from 'instantsearch-core';
 import React from 'react';
 
 import { InstantSearchServerContext } from '../components/InstantSearchServerContext';
@@ -10,8 +11,8 @@ import { InstantSearchSSRProvider } from '../components/InstantSearchSSRProvider
 
 import type { InstantSearchServerContextApi } from '../components/InstantSearchServerContext';
 import type { InstantSearchServerState } from '../components/InstantSearchSSRProvider';
-import type { InstantSearch, UiState } from 'instantsearch.js';
-import type { ReactNode } from 'react';
+import type { InstantSearch, UiState } from 'instantsearch-core';
+import type { ReactNode, JSX } from 'react';
 
 type SearchRef = { current: InstantSearch | undefined };
 
diff --git a/packages/react-instantsearch-nextjs/package.json b/packages/react-instantsearch-nextjs/package.json
index cbb0834754..d165dd4d32 100644
--- a/packages/react-instantsearch-nextjs/package.json
+++ b/packages/react-instantsearch-nextjs/package.json
@@ -49,7 +49,7 @@
     "watch:es": "yarn --silent build:es:base --watch"
   },
   "devDependencies": {
-    "instantsearch.js": "4.77.3",
+    "instantsearch-core": "0.1.0",
     "next": "15.1.4",
     "react-instantsearch-core": "7.15.3"
   },
diff --git a/packages/react-instantsearch-nextjs/src/InitializePromise.tsx b/packages/react-instantsearch-nextjs/src/InitializePromise.tsx
index a139f69b08..d492eebd7e 100644
--- a/packages/react-instantsearch-nextjs/src/InitializePromise.tsx
+++ b/packages/react-instantsearch-nextjs/src/InitializePromise.tsx
@@ -1,5 +1,8 @@
-import { getInitialResults } from 'instantsearch.js/es/lib/server';
-import { resetWidgetId, walkIndex } from 'instantsearch.js/es/lib/utils';
+import {
+  getInitialResults,
+  resetWidgetId,
+  walkIndex,
+} from 'instantsearch-core';
 import { ServerInsertedHTMLContext } from 'next/navigation';
 import React, { useContext } from 'react';
 import {
@@ -15,7 +18,7 @@ import type {
   SearchOptions,
   CompositionClient,
   SearchClient,
-} from 'instantsearch.js';
+} from 'instantsearch-core';
 
 type InitializePromiseProps = {
   /**
diff --git a/packages/react-instantsearch-nextjs/src/InstantSearchNext.tsx b/packages/react-instantsearch-nextjs/src/InstantSearchNext.tsx
index 7b37447ab1..2814cc2946 100644
--- a/packages/react-instantsearch-nextjs/src/InstantSearchNext.tsx
+++ b/packages/react-instantsearch-nextjs/src/InstantSearchNext.tsx
@@ -1,4 +1,4 @@
-import { safelyRunOnBrowser } from 'instantsearch.js/es/lib/utils';
+import { safelyRunOnBrowser } from 'instantsearch-core';
 import React, { useEffect, useRef } from 'react';
 import {
   InstantSearch,
@@ -12,8 +12,12 @@ import { useInstantSearchRouting } from './useInstantSearchRouting';
 import { useNextHeaders } from './useNextHeaders';
 import { warn } from './warn';
 
-import type { InitialResults, StateMapping, UiState } from 'instantsearch.js';
-import type { BrowserHistoryArgs } from 'instantsearch.js/es/lib/routers/history';
+import type {
+  InitialResults,
+  StateMapping,
+  UiState,
+  BrowserHistoryArgs,
+} from 'instantsearch-core';
 import type {
   InstantSearchProps,
   PromiseWithState,
diff --git a/packages/react-instantsearch-nextjs/src/__tests__/InitializePromise.test.tsx b/packages/react-instantsearch-nextjs/src/__tests__/InitializePromise.test.tsx
index 8841b26782..f7cac10210 100644
--- a/packages/react-instantsearch-nextjs/src/__tests__/InitializePromise.test.tsx
+++ b/packages/react-instantsearch-nextjs/src/__tests__/InitializePromise.test.tsx
@@ -7,7 +7,7 @@ import {
   createSingleSearchResponse,
 } from '@instantsearch/mocks';
 import { act, render } from '@testing-library/react';
-import * as utils from 'instantsearch.js/es/lib/utils';
+import { addWidgetId } from 'instantsearch-core';
 import { ServerInsertedHTMLContext } from 'next/navigation';
 import React from 'react';
 import { SearchBox, TrendingItems } from 'react-instantsearch';
@@ -20,13 +20,9 @@ import {
 import { InitializePromise } from '../InitializePromise';
 import { TriggerSearch } from '../TriggerSearch';
 
+import type { Widget } from 'instantsearch-core';
 import type { PromiseWithState } from 'react-instantsearch-core';
 
-jest.mock('instantsearch.js/es/lib/utils', () => ({
-  ...jest.requireActual('instantsearch.js/es/lib/utils'),
-  resetWidgetId: jest.fn(),
-}));
-
 const renderComponent = ({
   children,
   ref = { current: null },
@@ -63,10 +59,22 @@ const renderComponent = ({
   return client;
 };
 
-test('it calls resetWidgetId', () => {
+test('resets the widgetId', () => {
+  const widget = { dependsOn: 'recommend' } as Widget;
+
+  // increments correctly
+  addWidgetId(widget);
+  expect(widget.$$id).toBe(0);
+  addWidgetId(widget);
+  expect(widget.$$id).toBe(1);
+
   renderComponent();
 
-  expect(utils.resetWidgetId).toHaveBeenCalledTimes(1);
+  // starts back from 0
+  addWidgetId(widget);
+  expect(widget.$$id).toBe(0);
+  addWidgetId(widget);
+  expect(widget.$$id).toBe(1);
 });
 
 test('it applies provided nonce on the injected script tag', async () => {
diff --git a/packages/react-instantsearch-nextjs/src/useInstantSearchRouting.ts b/packages/react-instantsearch-nextjs/src/useInstantSearchRouting.ts
index 05e72c3cdc..4df7e195ee 100644
--- a/packages/react-instantsearch-nextjs/src/useInstantSearchRouting.ts
+++ b/packages/react-instantsearch-nextjs/src/useInstantSearchRouting.ts
@@ -1,12 +1,11 @@
-import historyRouter from 'instantsearch.js/es/lib/routers/history';
+import { historyRouter } from 'instantsearch-core';
 import { usePathname, useSearchParams } from 'next/navigation';
 import { useRef, useEffect } from 'react';
 
 import { useNextHeaders } from './useNextHeaders';
 
 import type { InstantSearchNextProps } from './InstantSearchNext';
-import type { UiState } from 'instantsearch.js';
-import type { BrowserHistoryArgs } from 'instantsearch.js/es/lib/routers/history';
+import type { UiState, BrowserHistoryArgs } from 'instantsearch-core';
 import type { InstantSearchProps } from 'react-instantsearch-core';
 
 export function useInstantSearchRouting<
diff --git a/packages/react-instantsearch-router-nextjs/package.json b/packages/react-instantsearch-router-nextjs/package.json
index 98c0a0b6c8..9d3a51ddc6 100644
--- a/packages/react-instantsearch-router-nextjs/package.json
+++ b/packages/react-instantsearch-router-nextjs/package.json
@@ -50,7 +50,7 @@
     "watch:es": "yarn --silent build:es:base --watch"
   },
   "dependencies": {
-    "instantsearch.js": "4.77.3",
+    "instantsearch-core": "0.1.0",
     "react-instantsearch-core": "7.15.3"
   },
   "devDependencies": {
diff --git a/packages/react-instantsearch-router-nextjs/src/index.ts b/packages/react-instantsearch-router-nextjs/src/index.ts
index 6583138c34..55c640395a 100644
--- a/packages/react-instantsearch-router-nextjs/src/index.ts
+++ b/packages/react-instantsearch-router-nextjs/src/index.ts
@@ -1,9 +1,8 @@
-import history from 'instantsearch.js/es/lib/routers/history';
+import { historyRouter as history } from 'instantsearch-core';
 
 import { stripLocaleFromUrl } from './utils/stripLocaleFromUrl';
 
-import type { Router, UiState } from 'instantsearch.js';
-import type { BrowserHistoryArgs } from 'instantsearch.js/es/lib/routers/history';
+import type { Router, UiState, BrowserHistoryArgs } from 'instantsearch-core';
 import type { Router as NextRouter, SingletonRouter } from 'next/router';
 
 type BeforePopStateCallback = NonNullable<NextRouter['_bps']>;
diff --git a/packages/react-instantsearch/package.json b/packages/react-instantsearch/package.json
index 7dae791b58..9ec784371f 100644
--- a/packages/react-instantsearch/package.json
+++ b/packages/react-instantsearch/package.json
@@ -47,9 +47,9 @@
     "watch:es": "yarn --silent build:es:base --watch"
   },
   "dependencies": {
-    "@babel/runtime": "^7.1.2",
+    "@babel/runtime": "^7.25.9",
+    "instantsearch-core": "0.1.0",
     "instantsearch-ui-components": "0.11.1",
-    "instantsearch.js": "4.77.3",
     "react-instantsearch-core": "7.15.3"
   },
   "peerDependencies": {
diff --git a/packages/react-instantsearch/src/__tests__/common-connectors.test.tsx b/packages/react-instantsearch/src/__tests__/common-connectors.test.tsx
index 6af30f7d28..87edfe8b0f 100644
--- a/packages/react-instantsearch/src/__tests__/common-connectors.test.tsx
+++ b/packages/react-instantsearch/src/__tests__/common-connectors.test.tsx
@@ -4,7 +4,7 @@
 import { runTestSuites } from '@instantsearch/tests';
 import * as suites from '@instantsearch/tests/connectors';
 import { act, render } from '@testing-library/react';
-import { connectRatingMenu } from 'instantsearch.js/es/connectors';
+import { connectRatingMenu } from 'instantsearch-core';
 import React, { useState } from 'react';
 
 import {
@@ -45,7 +45,7 @@ import type { TestOptionsMap, TestSetupsMap } from '@instantsearch/tests';
 import type {
   RatingMenuConnectorParams,
   RatingMenuWidgetDescription,
-} from 'instantsearch.js/es/connectors/rating-menu/connectRatingMenu';
+} from 'instantsearch-core';
 
 type TestSuites = typeof suites;
 const testSuites: TestSuites = suites;
diff --git a/packages/react-instantsearch/src/__tests__/common-widgets.test.tsx b/packages/react-instantsearch/src/__tests__/common-widgets.test.tsx
index 65a8b8797d..ce0cb3ffbf 100644
--- a/packages/react-instantsearch/src/__tests__/common-widgets.test.tsx
+++ b/packages/react-instantsearch/src/__tests__/common-widgets.test.tsx
@@ -34,8 +34,7 @@ import {
 } from '..';
 
 import type { TestOptionsMap, TestSetupsMap } from '@instantsearch/tests';
-import type { Hit } from 'instantsearch.js';
-import type { SendEventForHits } from 'instantsearch.js/es/lib/utils';
+import type { SendEventForHits, Hit } from 'instantsearch-core';
 
 type TestSuites = typeof suites;
 const testSuites: TestSuites = suites;
@@ -223,8 +222,8 @@ const testSetups: TestSetupsMap<TestSuites> = {
 
     return {
       algoliaAgents: [
-        `instantsearch.js (${
-          require('../../../instantsearch.js/package.json').version
+        `instantsearch-core (${
+          require('../../../instantsearch-core/package.json').version
         })`,
         `react-instantsearch (${
           require('../../../react-instantsearch-core/package.json').version
diff --git a/packages/react-instantsearch/src/ui/CurrentRefinements.tsx b/packages/react-instantsearch/src/ui/CurrentRefinements.tsx
index 1493d12b63..8aa49e1613 100644
--- a/packages/react-instantsearch/src/ui/CurrentRefinements.tsx
+++ b/packages/react-instantsearch/src/ui/CurrentRefinements.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 
 import { capitalize, isModifierClick } from './lib';
 
-import type { CurrentRefinementsConnectorParamsItem } from 'instantsearch.js/es/connectors/current-refinements/connectCurrentRefinements';
+import type { CurrentRefinementsConnectorParamsItem } from 'instantsearch-core';
 
 export type CurrentRefinementsProps = React.ComponentProps<'div'> & {
   classNames?: Partial<CurrentRefinementsClassNames>;
diff --git a/packages/react-instantsearch/src/ui/HitsPerPage.tsx b/packages/react-instantsearch/src/ui/HitsPerPage.tsx
index 2aa8750617..27b67a05a8 100644
--- a/packages/react-instantsearch/src/ui/HitsPerPage.tsx
+++ b/packages/react-instantsearch/src/ui/HitsPerPage.tsx
@@ -1,7 +1,7 @@
 import { cx } from 'instantsearch-ui-components';
 import React from 'react';
 
-import type { HitsPerPageConnectorParamsItem as HitsPerPageItem } from 'instantsearch.js/es/connectors/hits-per-page/connectHitsPerPage';
+import type { HitsPerPageConnectorParamsItem as HitsPerPageItem } from 'instantsearch-core';
 
 export type HitsPerPageProps = Omit<React.ComponentProps<'div'>, 'onChange'> & {
   items: HitsPerPageItem[];
diff --git a/packages/react-instantsearch/src/ui/InfiniteHits.tsx b/packages/react-instantsearch/src/ui/InfiniteHits.tsx
index b2610f8bf0..b96c189a10 100644
--- a/packages/react-instantsearch/src/ui/InfiniteHits.tsx
+++ b/packages/react-instantsearch/src/ui/InfiniteHits.tsx
@@ -2,8 +2,7 @@ import { cx } from 'instantsearch-ui-components';
 import React from 'react';
 
 import type { Banner } from 'algoliasearch-helper';
-import type { Hit } from 'instantsearch.js';
-import type { SendEventForHits } from 'instantsearch.js/es/lib/utils';
+import type { SendEventForHits, Hit } from 'instantsearch-core';
 
 export type InfiniteHitsProps<THit> = React.ComponentProps<'div'> & {
   hits: THit[];
diff --git a/packages/react-instantsearch/src/ui/Menu.tsx b/packages/react-instantsearch/src/ui/Menu.tsx
index 934d4f5276..e5fd2c8f0d 100644
--- a/packages/react-instantsearch/src/ui/Menu.tsx
+++ b/packages/react-instantsearch/src/ui/Menu.tsx
@@ -5,8 +5,7 @@ import { isModifierClick } from './lib/isModifierClick';
 import { ShowMoreButton } from './ShowMoreButton';
 
 import type { ShowMoreButtonTranslations } from './ShowMoreButton';
-import type { CreateURL } from 'instantsearch.js';
-import type { MenuItem } from 'instantsearch.js/es/connectors/menu/connectMenu';
+import type { CreateURL, MenuItem } from 'instantsearch-core';
 
 export type MenuProps = React.ComponentProps<'div'> & {
   items: MenuItem[];
diff --git a/packages/react-instantsearch/src/ui/Pagination.tsx b/packages/react-instantsearch/src/ui/Pagination.tsx
index 17fd94395d..eac0280f13 100644
--- a/packages/react-instantsearch/src/ui/Pagination.tsx
+++ b/packages/react-instantsearch/src/ui/Pagination.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 
 import { isModifierClick } from './lib/isModifierClick';
 
-import type { CreateURL } from 'instantsearch.js';
+import type { CreateURL } from 'instantsearch-core';
 
 export type PageItemTextOptions = {
   /**
diff --git a/packages/react-instantsearch/src/ui/RefinementList.tsx b/packages/react-instantsearch/src/ui/RefinementList.tsx
index 95e7242fce..a83a4d9f74 100644
--- a/packages/react-instantsearch/src/ui/RefinementList.tsx
+++ b/packages/react-instantsearch/src/ui/RefinementList.tsx
@@ -1,12 +1,12 @@
+import { getHighlightedParts, unescape } from 'instantsearch-core';
 import { cx } from 'instantsearch-ui-components';
-import { getHighlightedParts, unescape } from 'instantsearch.js/es/lib/utils';
 import React from 'react';
 
 import { Highlight } from './Highlight';
 import { ShowMoreButton } from './ShowMoreButton';
 
 import type { ShowMoreButtonTranslations } from './ShowMoreButton';
-import type { RefinementListItem } from 'instantsearch.js/es/connectors/refinement-list/connectRefinementList';
+import type { RefinementListItem } from 'instantsearch-core';
 
 export type RefinementListProps = React.ComponentProps<'div'> & {
   canRefine: boolean;
diff --git a/packages/react-instantsearch/src/ui/__tests__/InfiniteHits.test.tsx b/packages/react-instantsearch/src/ui/__tests__/InfiniteHits.test.tsx
index c6f6fa4cc6..85503817d8 100644
--- a/packages/react-instantsearch/src/ui/__tests__/InfiniteHits.test.tsx
+++ b/packages/react-instantsearch/src/ui/__tests__/InfiniteHits.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { InfiniteHits } from '../InfiniteHits';
 
 import type { InfiniteHitsProps } from '../InfiniteHits';
-import type { Hit } from 'instantsearch.js';
+import type { Hit } from 'instantsearch-core';
 
 describe('InfiniteHits', () => {
   function createProps<THit extends Hit = Hit>(
diff --git a/packages/react-instantsearch/src/widgets/FrequentlyBoughtTogether.tsx b/packages/react-instantsearch/src/widgets/FrequentlyBoughtTogether.tsx
index 95bf313c50..196ada83cd 100644
--- a/packages/react-instantsearch/src/widgets/FrequentlyBoughtTogether.tsx
+++ b/packages/react-instantsearch/src/widgets/FrequentlyBoughtTogether.tsx
@@ -5,11 +5,11 @@ import {
   useInstantSearch,
 } from 'react-instantsearch-core';
 
+import type { BaseHit, Hit } from 'instantsearch-core';
 import type {
   FrequentlyBoughtTogetherProps as FrequentlyBoughtTogetherPropsUiComponentProps,
   Pragma,
 } from 'instantsearch-ui-components';
-import type { Hit, BaseHit } from 'instantsearch.js';
 import type { UseFrequentlyBoughtTogetherProps } from 'react-instantsearch-core';
 
 type UiProps<THit extends BaseHit> = Pick<
diff --git a/packages/react-instantsearch/src/widgets/Highlight.tsx b/packages/react-instantsearch/src/widgets/Highlight.tsx
index 48cefa9214..807ff8c1e2 100644
--- a/packages/react-instantsearch/src/widgets/Highlight.tsx
+++ b/packages/react-instantsearch/src/widgets/Highlight.tsx
@@ -2,14 +2,14 @@ import {
   getHighlightedParts,
   getPropertyByPath,
   unescape,
-} from 'instantsearch.js/es/lib/utils';
+} from 'instantsearch-core';
 import React from 'react';
 
 import { Highlight as HighlightUiComponent } from '../ui/Highlight';
 
 import type { PartialKeys } from '../types';
 import type { HighlightProps as HighlightUiComponentProps } from '../ui/Highlight';
-import type { BaseHit, Hit } from 'instantsearch.js';
+import type { BaseHit, Hit } from 'instantsearch-core';
 
 export type HighlightProps<THit extends Hit<BaseHit>> = {
   hit: THit;
diff --git a/packages/react-instantsearch/src/widgets/Hits.tsx b/packages/react-instantsearch/src/widgets/Hits.tsx
index a33b973b0a..0e6419dd4e 100644
--- a/packages/react-instantsearch/src/widgets/Hits.tsx
+++ b/packages/react-instantsearch/src/widgets/Hits.tsx
@@ -2,12 +2,11 @@ import { createHitsComponent } from 'instantsearch-ui-components';
 import React, { createElement, Fragment, useMemo } from 'react';
 import { useHits } from 'react-instantsearch-core';
 
+import type { SendEventForHits, Hit, BaseHit } from 'instantsearch-core';
 import type {
   HitsProps as HitsUiComponentProps,
   Pragma,
 } from 'instantsearch-ui-components';
-import type { Hit, BaseHit } from 'instantsearch.js';
-import type { SendEventForHits } from 'instantsearch.js/es/lib/utils';
 import type { UseHitsProps } from 'react-instantsearch-core';
 
 type UiProps<THit extends BaseHit> = Pick<
@@ -63,7 +62,7 @@ export function Hits<THit extends BaseHit = BaseHit>({
   bannerComponent: BannerComponent,
   ...props
 }: HitsProps<THit>) {
-  const { hits, banner, sendEvent } = useHits<THit>(
+  const { items, banner, sendEvent } = useHits<THit>(
     { escapeHTML, transformItems },
     { $$widgetType: 'ais.hits' }
   );
@@ -71,7 +70,7 @@ export function Hits<THit extends BaseHit = BaseHit>({
   const itemComponent: HitsUiComponentProps<Hit<THit>>['itemComponent'] =
     useMemo(
       () =>
-        ({ hit, index, ...itemProps }) =>
+        ({ hit, ...itemProps }) =>
           (
             <li key={hit.objectID} {...itemProps}>
               <HitComponent hit={hit} sendEvent={sendEvent} />
@@ -85,7 +84,7 @@ export function Hits<THit extends BaseHit = BaseHit>({
   ) as HitsUiComponentProps<Hit<THit>>['bannerComponent'];
 
   const uiProps: UiProps<THit> = {
-    hits,
+    hits: items,
     sendEvent,
     itemComponent,
     banner,
diff --git a/packages/react-instantsearch/src/widgets/InfiniteHits.tsx b/packages/react-instantsearch/src/widgets/InfiniteHits.tsx
index 37bae66781..9f43daf145 100644
--- a/packages/react-instantsearch/src/widgets/InfiniteHits.tsx
+++ b/packages/react-instantsearch/src/widgets/InfiniteHits.tsx
@@ -4,7 +4,7 @@ import { useInfiniteHits } from 'react-instantsearch-core';
 import { InfiniteHits as InfiniteHitsUiComponent } from '../ui/InfiniteHits';
 
 import type { InfiniteHitsProps as InfiniteHitsUiComponentProps } from '../ui/InfiniteHits';
-import type { BaseHit, Hit } from 'instantsearch.js';
+import type { BaseHit, Hit } from 'instantsearch-core';
 import type { UseInfiniteHitsProps } from 'react-instantsearch-core';
 
 type UiProps<THit extends BaseHit = BaseHit> = Pick<
@@ -51,7 +51,7 @@ export function InfiniteHits<THit extends BaseHit = BaseHit>({
   ...props
 }: InfiniteHitsProps<THit>) {
   const {
-    hits,
+    items,
     banner,
     sendEvent,
     showPrevious,
@@ -68,7 +68,7 @@ export function InfiniteHits<THit extends BaseHit = BaseHit>({
   ) as InfiniteHitsUiComponentProps<THit>['bannerComponent'];
 
   const uiProps: UiProps<THit> = {
-    hits,
+    hits: items,
     banner,
     bannerComponent,
     sendEvent,
diff --git a/packages/react-instantsearch/src/widgets/LookingSimilar.tsx b/packages/react-instantsearch/src/widgets/LookingSimilar.tsx
index 16174432fc..d0a5f5bccb 100644
--- a/packages/react-instantsearch/src/widgets/LookingSimilar.tsx
+++ b/packages/react-instantsearch/src/widgets/LookingSimilar.tsx
@@ -2,11 +2,11 @@ import { createLookingSimilarComponent } from 'instantsearch-ui-components';
 import React, { createElement, Fragment, useMemo } from 'react';
 import { useLookingSimilar, useInstantSearch } from 'react-instantsearch-core';
 
+import type { Hit, BaseHit } from 'instantsearch-core';
 import type {
   LookingSimilarProps as LookingSimilarPropsUiComponentProps,
   Pragma,
 } from 'instantsearch-ui-components';
-import type { Hit, BaseHit } from 'instantsearch.js';
 import type { UseLookingSimilarProps } from 'react-instantsearch-core';
 
 type UiProps<THit extends BaseHit> = Pick<
diff --git a/packages/react-instantsearch/src/widgets/RefinementList.tsx b/packages/react-instantsearch/src/widgets/RefinementList.tsx
index 72160c3be1..2b46dba60c 100644
--- a/packages/react-instantsearch/src/widgets/RefinementList.tsx
+++ b/packages/react-instantsearch/src/widgets/RefinementList.tsx
@@ -6,8 +6,7 @@ import { SearchBox as SearchBoxUiComponent } from '../ui/SearchBox';
 
 import type { RefinementListProps as RefinementListUiComponentProps } from '../ui/RefinementList';
 import type { SearchBoxProps, SearchBoxTranslations } from '../ui/SearchBox';
-import type { RefinementListItem } from 'instantsearch.js/es/connectors/refinement-list/connectRefinementList';
-import type { RefinementListWidgetParams } from 'instantsearch.js/es/widgets/refinement-list/refinement-list';
+import type { RefinementListItem } from 'instantsearch-core';
 import type { UseRefinementListProps } from 'react-instantsearch-core';
 
 type UiProps = Pick<
@@ -28,8 +27,18 @@ export type RefinementListProps = Omit<
   RefinementListUiComponentProps,
   keyof UiProps
 > &
-  UseRefinementListProps &
-  Pick<RefinementListWidgetParams, 'searchable' | 'searchablePlaceholder'> & {
+  UseRefinementListProps & {
+    /**
+     * Add a search input to let the user search for more facet values. In order
+     * to make this feature work, you need to make the attribute searchable
+     * [using the API](https://www.algolia.com/doc/guides/searching/faceting/?language=js#declaring-a-searchable-attribute-for-faceting)
+     * or [the dashboard](https://www.algolia.com/explorer/display/)
+     */
+    searchable?: boolean;
+    /**
+     * Value of the search field placeholder.
+     */
+    searchablePlaceholder?: string;
     translations?: Partial<
       UiProps['translations'] &
         SearchBoxTranslations & {
diff --git a/packages/react-instantsearch/src/widgets/RelatedProducts.tsx b/packages/react-instantsearch/src/widgets/RelatedProducts.tsx
index 009714ad12..f02bb57245 100644
--- a/packages/react-instantsearch/src/widgets/RelatedProducts.tsx
+++ b/packages/react-instantsearch/src/widgets/RelatedProducts.tsx
@@ -2,15 +2,15 @@ import { createRelatedProductsComponent } from 'instantsearch-ui-components';
 import React, { createElement, Fragment, useMemo } from 'react';
 import { useInstantSearch, useRelatedProducts } from 'react-instantsearch-core';
 
+import type { Hit, BaseHit } from 'instantsearch-core';
 import type {
   RelatedProductsProps as RelatedProductsUiComponentProps,
   Pragma,
 } from 'instantsearch-ui-components';
-import type { BaseHit, Hit } from 'instantsearch.js';
 import type { UseRelatedProductsProps } from 'react-instantsearch-core';
 
 type UiProps<TItem extends BaseHit> = Pick<
-  RelatedProductsUiComponentProps<TItem>,
+  RelatedProductsUiComponentProps<Hit<TItem>>,
   | 'items'
   | 'itemComponent'
   | 'headerComponent'
@@ -21,7 +21,7 @@ type UiProps<TItem extends BaseHit> = Pick<
 >;
 
 export type RelatedProductsProps<TItem extends BaseHit> = Omit<
-  RelatedProductsUiComponentProps<TItem>,
+  RelatedProductsUiComponentProps<Hit<TItem>>,
   keyof UiProps<TItem>
 > &
   UseRelatedProductsProps & {
diff --git a/packages/react-instantsearch/src/widgets/Snippet.tsx b/packages/react-instantsearch/src/widgets/Snippet.tsx
index d583448e22..f227801d88 100644
--- a/packages/react-instantsearch/src/widgets/Snippet.tsx
+++ b/packages/react-instantsearch/src/widgets/Snippet.tsx
@@ -2,14 +2,14 @@ import {
   getHighlightedParts,
   getPropertyByPath,
   unescape,
-} from 'instantsearch.js/es/lib/utils';
+} from 'instantsearch-core';
 import React from 'react';
 
 import { Snippet as SnippetUiComponent } from '../ui/Snippet';
 
 import type { PartialKeys } from '../types';
 import type { SnippetProps as SnippetUiComponentProps } from '../ui/Snippet';
-import type { BaseHit, Hit } from 'instantsearch.js';
+import type { BaseHit, Hit } from 'instantsearch-core';
 
 export type SnippetProps<THit extends Hit<BaseHit>> = {
   hit: THit;
diff --git a/packages/react-instantsearch/src/widgets/TrendingItems.tsx b/packages/react-instantsearch/src/widgets/TrendingItems.tsx
index 8fc23a4411..2276dd3700 100644
--- a/packages/react-instantsearch/src/widgets/TrendingItems.tsx
+++ b/packages/react-instantsearch/src/widgets/TrendingItems.tsx
@@ -2,15 +2,15 @@ import { createTrendingItemsComponent } from 'instantsearch-ui-components';
 import React, { createElement, Fragment, useMemo } from 'react';
 import { useInstantSearch, useTrendingItems } from 'react-instantsearch-core';
 
+import type { Hit, BaseHit } from 'instantsearch-core';
 import type {
   TrendingItemsProps as TrendingItemsUiComponentProps,
   Pragma,
 } from 'instantsearch-ui-components';
-import type { BaseHit, Hit } from 'instantsearch.js';
 import type { UseTrendingItemsProps } from 'react-instantsearch-core';
 
 type UiProps<TItem extends BaseHit> = Pick<
-  TrendingItemsUiComponentProps<TItem>,
+  TrendingItemsUiComponentProps<Hit<TItem>>,
   | 'items'
   | 'itemComponent'
   | 'headerComponent'
@@ -21,7 +21,7 @@ type UiProps<TItem extends BaseHit> = Pick<
 >;
 
 export type TrendingItemsProps<TItem extends BaseHit> = Omit<
-  TrendingItemsUiComponentProps<TItem>,
+  TrendingItemsUiComponentProps<Hit<TItem>>,
   keyof UiProps<TItem>
 > &
   UseTrendingItemsProps & {
diff --git a/packages/react-instantsearch/src/widgets/__tests__/Hits.test.tsx b/packages/react-instantsearch/src/widgets/__tests__/Hits.test.tsx
index cc7e6df52e..ab67c54924 100644
--- a/packages/react-instantsearch/src/widgets/__tests__/Hits.test.tsx
+++ b/packages/react-instantsearch/src/widgets/__tests__/Hits.test.tsx
@@ -14,7 +14,7 @@ import React from 'react';
 import { Hits } from '../Hits';
 
 import type { MockSearchClient } from '@instantsearch/mocks';
-import type { AlgoliaHit } from 'instantsearch.js';
+import type { AlgoliaHit } from 'instantsearch-core';
 
 type CustomRecord = {
   somethingSpecial: string;
diff --git a/packages/react-instantsearch/src/widgets/__tests__/InfiniteHits.test.tsx b/packages/react-instantsearch/src/widgets/__tests__/InfiniteHits.test.tsx
index a48fed3e77..3bdfd6a111 100644
--- a/packages/react-instantsearch/src/widgets/__tests__/InfiniteHits.test.tsx
+++ b/packages/react-instantsearch/src/widgets/__tests__/InfiniteHits.test.tsx
@@ -14,7 +14,7 @@ import React from 'react';
 import { InfiniteHits } from '../InfiniteHits';
 
 import type { MockSearchClient } from '@instantsearch/mocks';
-import type { AlgoliaHit } from 'instantsearch.js';
+import type { AlgoliaHit } from 'instantsearch-core';
 
 type CustomHit = { somethingSpecial: string };
 
diff --git a/packages/react-instantsearch/src/widgets/__tests__/Pagination.test.tsx b/packages/react-instantsearch/src/widgets/__tests__/Pagination.test.tsx
index 259b09ecf8..c942ad6c7d 100644
--- a/packages/react-instantsearch/src/widgets/__tests__/Pagination.test.tsx
+++ b/packages/react-instantsearch/src/widgets/__tests__/Pagination.test.tsx
@@ -15,7 +15,7 @@ import React from 'react';
 import { Pagination } from '../Pagination';
 
 import type { MockSearchClient } from '@instantsearch/mocks';
-import type { SearchClient } from 'instantsearch.js';
+import type { SearchClient } from 'instantsearch-core';
 
 function createMockedSearchClient({ nbPages }: { nbPages?: number } = {}) {
   return createAlgoliaSearchClient({
diff --git a/packages/react-instantsearch/src/widgets/__tests__/SearchBox.test.tsx b/packages/react-instantsearch/src/widgets/__tests__/SearchBox.test.tsx
index 4d6c137b9d..bd1a7c6088 100644
--- a/packages/react-instantsearch/src/widgets/__tests__/SearchBox.test.tsx
+++ b/packages/react-instantsearch/src/widgets/__tests__/SearchBox.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import { SearchBox } from '../SearchBox';
 
-import type { UiState } from 'instantsearch.js';
+import type { UiState } from 'instantsearch-core';
 
 describe('SearchBox', () => {
   test('forwards custom class names and `div` props to the root element', () => {
diff --git a/packages/react-instantsearch/src/widgets/__tests__/__utils__/all-widgets.tsx b/packages/react-instantsearch/src/widgets/__tests__/__utils__/all-widgets.tsx
index ea4b7ecdfe..6e1537bdf1 100644
--- a/packages/react-instantsearch/src/widgets/__tests__/__utils__/all-widgets.tsx
+++ b/packages/react-instantsearch/src/widgets/__tests__/__utils__/all-widgets.tsx
@@ -8,7 +8,7 @@ import {
 
 import * as widgets from '../..';
 
-import type { InstantSearch as InstantSearchClass } from 'instantsearch.js';
+import type { InstantSearch as InstantSearchClass } from 'instantsearch-core';
 import type { ComponentProps } from 'react';
 
 type AllWidgets = typeof widgets;
diff --git a/packages/vue-instantsearch/__mocks__/instantsearch.js/es.js b/packages/vue-instantsearch/__mocks__/instantsearch.js/es.js
deleted file mode 100644
index 2fc3c6b222..0000000000
--- a/packages/vue-instantsearch/__mocks__/instantsearch.js/es.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/* eslint-disable import/no-commonjs */
-const isPlainObject = require('lodash/isPlainObject');
-
-class RoutingManager {
-  constructor(routing) {
-    this._routing = routing;
-  }
-}
-
-class Helper {
-  constructor() {
-    this.search = jest.fn();
-    this.setClient = jest.fn(() => this);
-    this.setIndex = jest.fn(() => this);
-  }
-}
-
-const fakeInstantSearch = jest.fn(
-  ({
-    indexName,
-    searchClient,
-    routing,
-    stalledSearchDelay,
-    searchFunction,
-  }) => {
-    if (!searchClient && !isPlainObject(searchClient)) {
-      throw new Error('need searchClient to be a plain object');
-    }
-    if (!indexName) {
-      throw new Error('need indexName to be a string');
-    }
-
-    const instantsearchInstance = {
-      _stalledSearchDelay: stalledSearchDelay || 200,
-      _searchFunction: searchFunction,
-      routing: new RoutingManager(routing),
-      helper: new Helper(),
-      client: searchClient,
-      start: jest.fn(() => {
-        instantsearchInstance.started = true;
-      }),
-      dispose: jest.fn(() => {
-        instantsearchInstance.started = false;
-      }),
-      mainIndex: {
-        $$type: 'ais.index',
-        _widgets: [],
-        addWidgets(widgets) {
-          this._widgets.push(...widgets);
-        },
-        getWidgets() {
-          return this._widgets;
-        },
-      },
-      addWidgets(widgets) {
-        instantsearchInstance.mainIndex.addWidgets(widgets);
-      },
-      removeWidgets(widgets) {
-        widgets.forEach((widget) => {
-          const i = instantsearchInstance.mainIndex._widgets.findIndex(widget);
-          if (i === -1) {
-            return;
-          }
-          instantsearchInstance.mainIndex._widgets.splice(i, 1);
-        });
-      },
-    };
-
-    return instantsearchInstance;
-  }
-);
-
-module.exports = fakeInstantSearch;
diff --git a/packages/vue-instantsearch/package.json b/packages/vue-instantsearch/package.json
index fd21b961e4..633e8f50df 100644
--- a/packages/vue-instantsearch/package.json
+++ b/packages/vue-instantsearch/package.json
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "instantsearch-ui-components": "0.11.1",
-    "instantsearch.js": "4.77.3",
+    "instantsearch-core": "0.1.0",
     "mitt": "^2.1.0"
   },
   "peerDependencies": {
diff --git a/packages/vue-instantsearch/rollup.config.js b/packages/vue-instantsearch/rollup.config.js
index eb0467ae0f..d81e289ded 100644
--- a/packages/vue-instantsearch/rollup.config.js
+++ b/packages/vue-instantsearch/rollup.config.js
@@ -70,6 +70,7 @@ function outputs(vueVersion) {
     [
       'algoliasearch-helper',
       'instantsearch.js',
+      'instantsearch-core',
       'instantsearch-ui-components',
       'vue',
       'mitt',
diff --git a/packages/vue-instantsearch/src/__tests__/common-connectors.test.js b/packages/vue-instantsearch/src/__tests__/common-connectors.test.js
index 85f6b82527..9d693a5265 100644
--- a/packages/vue-instantsearch/src/__tests__/common-connectors.test.js
+++ b/packages/vue-instantsearch/src/__tests__/common-connectors.test.js
@@ -14,7 +14,7 @@ import {
   connectRatingMenu,
   connectRefinementList,
   connectToggleRefinement,
-} from 'instantsearch.js/es/connectors';
+} from 'instantsearch-core';
 
 import { nextTick, mountApp } from '../../test/utils';
 import {
@@ -24,7 +24,6 @@ import {
   createWidgetMixin,
 } from '../instantsearch';
 import { renderCompat } from '../util/vue-compat';
-jest.unmock('instantsearch.js/es');
 
 const testSetups = {
   async createRefinementListConnectorTests({
diff --git a/packages/vue-instantsearch/src/__tests__/common-shared.test.js b/packages/vue-instantsearch/src/__tests__/common-shared.test.js
index f85d0b9667..087bc986ec 100644
--- a/packages/vue-instantsearch/src/__tests__/common-shared.test.js
+++ b/packages/vue-instantsearch/src/__tests__/common-shared.test.js
@@ -3,7 +3,7 @@
  */
 import { runTestSuites } from '@instantsearch/tests/common';
 import * as testSuites from '@instantsearch/tests/shared';
-import { connectMenu, connectPagination } from 'instantsearch.js/es/connectors';
+import { connectMenu, connectPagination } from 'instantsearch-core';
 
 import { nextTick, mountApp } from '../../test/utils';
 import {
@@ -14,7 +14,6 @@ import {
   createWidgetMixin,
 } from '../instantsearch';
 import { renderCompat } from '../util/vue-compat';
-jest.unmock('instantsearch.js/es');
 
 const testSetups = {
   async createSharedTests({ instantSearchOptions, widgetParams }) {
diff --git a/packages/vue-instantsearch/src/__tests__/common-widgets.test.js b/packages/vue-instantsearch/src/__tests__/common-widgets.test.js
index 65eda916e4..549e2f8f5d 100644
--- a/packages/vue-instantsearch/src/__tests__/common-widgets.test.js
+++ b/packages/vue-instantsearch/src/__tests__/common-widgets.test.js
@@ -32,8 +32,6 @@ import {
 } from '../instantsearch';
 import { renderCompat } from '../util/vue-compat';
 
-jest.unmock('instantsearch.js/es');
-
 /**
  * prevent rethrowing InstantSearch errors, so tests can be asserted.
  * IRL this isn't needed, as the error doesn't stop execution.
@@ -327,8 +325,8 @@ const testSetups = {
 
     return {
       algoliaAgents: [
-        `instantsearch.js (${
-          require('../../../instantsearch.js/package.json').version
+        `instantsearch-core (${
+          require('../../../instantsearch-core/package.json').version
         })`,
         `Vue InstantSearch (${
           require('../../../vue-instantsearch/package.json').version
diff --git a/packages/vue-instantsearch/src/__tests__/index.js b/packages/vue-instantsearch/src/__tests__/index.js
index 2c9ab777ed..b2a3f0e7b7 100644
--- a/packages/vue-instantsearch/src/__tests__/index.js
+++ b/packages/vue-instantsearch/src/__tests__/index.js
@@ -3,6 +3,7 @@
  */
 
 /* eslint-disable jest/no-conditional-expect */
+import { createSearchClient } from '@instantsearch/mocks';
 
 import { mount } from '../../test/utils';
 import InstantSearch from '../instantsearch';
@@ -86,11 +87,7 @@ function getAllComponents() {
             {
               props: {
                 indexName: 'instant_search',
-                searchClient: {
-                  search() {
-                    return new Promise({ results: [] });
-                  },
-                },
+                searchClient: createSearchClient(),
               },
             },
             [
diff --git a/packages/vue-instantsearch/src/components/Autocomplete.vue b/packages/vue-instantsearch/src/components/Autocomplete.vue
index accf72f0f9..fcbcd52ff6 100644
--- a/packages/vue-instantsearch/src/components/Autocomplete.vue
+++ b/packages/vue-instantsearch/src/components/Autocomplete.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script>
-import { connectAutocomplete } from 'instantsearch.js/es/connectors';
+import { connectAutocomplete } from 'instantsearch-core';
 
 import { createSuitMixin } from '../mixins/suit';
 import { createWidgetMixin } from '../mixins/widget';
diff --git a/packages/vue-instantsearch/src/components/Breadcrumb.vue b/packages/vue-instantsearch/src/components/Breadcrumb.vue
index 8f718a6db5..3087d16dc8 100644
--- a/packages/vue-instantsearch/src/components/Breadcrumb.vue
+++ b/packages/vue-instantsearch/src/components/Breadcrumb.vue
@@ -55,7 +55,7 @@
 </template>
 
 <script>
-import { connectBreadcrumb } from 'instantsearch.js/es/connectors';
+import { connectBreadcrumb } from 'instantsearch-core';
 
 import { createPanelConsumerMixin } from '../mixins/panel';
 import { createSuitMixin } from '../mixins/suit';
diff --git a/packages/vue-instantsearch/src/components/ClearRefinements.vue b/packages/vue-instantsearch/src/components/ClearRefinements.vue
index 15d09e35d7..066d9ae51a 100644
--- a/packages/vue-instantsearch/src/components/ClearRefinements.vue
+++ b/packages/vue-instantsearch/src/components/ClearRefinements.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import { connectClearRefinements } from 'instantsearch.js/es/connectors';
+import { connectClearRefinements } from 'instantsearch-core';
 
 import { createPanelConsumerMixin } from '../mixins/panel';
 import { createSuitMixin } from '../mixins/suit';
diff --git a/packages/vue-instantsearch/src/components/Configure.js b/packages/vue-instantsearch/src/components/Configure.js
index aac05c9d8a..b97be809d8 100644
--- a/packages/vue-instantsearch/src/components/Configure.js
+++ b/packages/vue-instantsearch/src/components/Configure.js
@@ -1,4 +1,4 @@
-import { connectConfigure } from 'instantsearch.js/es/connectors';
+import { connectConfigure } from 'instantsearch-core';
 
 import { createSuitMixin } from '../mixins/suit';
 import { createWidgetMixin } from '../mixins/widget';
diff --git a/packages/vue-instantsearch/src/components/CurrentRefinements.vue b/packages/vue-instantsearch/src/components/CurrentRefinements.vue
index 5c201c2801..b0f2b7b0d7 100644
--- a/packages/vue-instantsearch/src/components/CurrentRefinements.vue
+++ b/packages/vue-instantsearch/src/components/CurrentRefinements.vue
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { connectCurrentRefinements } from 'instantsearch.js/es/connectors';
+import { connectCurrentRefinements } from 'instantsearch-core';
 
 import { createPanelConsumerMixin } from '../mixins/panel';
 import { createSuitMixin } from '../mixins/suit';
diff --git a/packages/vue-instantsearch/src/components/DynamicWidgets.js b/packages/vue-instantsearch/src/components/DynamicWidgets.js
index 802c43cd12..69a90c4af1 100644
--- a/packages/vue-instantsearch/src/components/DynamicWidgets.js
+++ b/packages/vue-instantsearch/src/components/DynamicWidgets.js
@@ -1,4 +1,4 @@
-import { connectDynamicWidgets } from 'instantsearch.js/es/connectors';
+import { connectDynamicWidgets } from 'instantsearch-core';
 
 import { createSuitMixin } from '../mixins/suit';
 import { createWidgetMixin } from '../mixins/widget';
diff --git a/packages/vue-instantsearch/src/components/HierarchicalMenu.vue b/packages/vue-instantsearch/src/components/HierarchicalMenu.vue
index 5be40a76ab..94e37638c2 100644
--- a/packages/vue-instantsearch/src/components/HierarchicalMenu.vue
+++ b/packages/vue-instantsearch/src/components/HierarchicalMenu.vue
@@ -39,7 +39,7 @@
 </template>
 
 <script>
-import { connectHierarchicalMenu } from 'instantsearch.js/es/connectors';
+import { connectHierarchicalMenu } from 'instantsearch-core';
 
 import { createPanelConsumerMixin } from '../mixins/panel';
 import { createSuitMixin } from '../mixins/suit';
diff --git a/packages/vue-instantsearch/src/components/Highlighter.js b/packages/vue-instantsearch/src/components/Highlighter.js
index 96a0579509..88abab9af2 100644
--- a/packages/vue-instantsearch/src/components/Highlighter.js
+++ b/packages/vue-instantsearch/src/components/Highlighter.js
@@ -1,9 +1,9 @@
-import { createHighlightComponent } from 'instantsearch-ui-components';
 import {
   getHighlightedParts,
   getPropertyByPath,
   unescape,
-} from 'instantsearch.js/es/lib/utils';
+} from 'instantsearch-core';
+import { createHighlightComponent } from 'instantsearch-ui-components';
 
 import { createElement, Fragment } from '../util/pragma';
 
diff --git a/packages/vue-instantsearch/src/components/Hits.js b/packages/vue-instantsearch/src/components/Hits.js
index 3860cd505a..7d30f6dacd 100644
--- a/packages/vue-instantsearch/src/components/Hits.js
+++ b/packages/vue-instantsearch/src/components/Hits.js
@@ -1,5 +1,5 @@
+import { connectHits } from 'instantsearch-core';
 import { createHitsComponent } from 'instantsearch-ui-components';
-import { connectHits } from 'instantsearch.js/es/connectors';
 
 import { createSuitMixin } from '../mixins/suit';
 import { createWidgetMixin } from '../mixins/widget';
@@ -52,7 +52,6 @@ export default {
 
     const itemComponent = ({
       hit,
-      index,
       onClick,
       onAuxClick,
       // We don't want to pass the Preact key as a prop
@@ -73,10 +72,17 @@ export default {
           (itemSlot &&
             itemSlot({
               item: hit,
-              index,
               sendEvent: this.state.sendEvent,
             })) ||
-            `objectID: ${hit.objectID}, index: ${index}`,
+            h(
+              'div',
+              {
+                style: {
+                  wordBreak: 'break-all',
+                },
+              },
+              [`${JSON.stringify(hit).slice(0, 100)}…`]
+            ),
         ]
       );
     };
diff --git a/packages/vue-instantsearch/src/components/HitsPerPage.vue b/packages/vue-instantsearch/src/components/HitsPerPage.vue
index 827dbef966..2a908a9eb1 100644
--- a/packages/vue-instantsearch/src/components/HitsPerPage.vue
+++ b/packages/vue-instantsearch/src/components/HitsPerPage.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script>
-import { connectHitsPerPage } from 'instantsearch.js/es/connectors';
+import { connectHitsPerPage } from 'instantsearch-core';
 
 import { createPanelConsumerMixin } from '../mixins/panel';
 import { createSuitMixin } from '../mixins/suit';
diff --git a/packages/vue-instantsearch/src/components/Index.js b/packages/vue-instantsearch/src/components/Index.js
index a9ef675a25..2aa532a924 100644
--- a/packages/vue-instantsearch/src/components/Index.js
+++ b/packages/vue-instantsearch/src/components/Index.js
@@ -1,4 +1,4 @@
-import indexWidget from 'instantsearch.js/es/widgets/index/index';
+import { index as indexWidget } from 'instantsearch-core';
 
 import { createSuitMixin } from '../mixins/suit';
 import { createWidgetMixin } from '../mixins/widget';
diff --git a/packages/vue-instantsearch/src/components/InfiniteHits.vue b/packages/vue-instantsearch/src/components/InfiniteHits.vue
index f36d6222bd..d938d1a0a2 100644
--- a/packages/vue-instantsearch/src/components/InfiniteHits.vue
+++ b/packages/vue-instantsearch/src/components/InfiniteHits.vue
@@ -69,7 +69,10 @@
             :index="index"
             :send-event="state.sendEvent"
           >
-            objectID: {{ item.objectID }}, index: {{ index }}
+            <!-- prettier-ignore -->
+            <div style="word-break: break-all">{{
+              defaultItemComponent(item)
+            }}</div>
           </slot>
         </li>
       </ol>
@@ -97,7 +100,7 @@
 </template>
 
 <script>
-import { connectInfiniteHits } from 'instantsearch.js/es/connectors';
+import { connectInfiniteHits } from 'instantsearch-core';
 
 import { createSuitMixin } from '../mixins/suit';
 import { createWidgetMixin } from '../mixins/widget';
@@ -155,6 +158,9 @@ export default {
     refineNext() {
       this.state.showMore();
     },
+    defaultItemComponent(hit) {
+      return `${JSON.stringify(hit).slice(0, 100)}…`;
+    },
   },
 };
 </script>
diff --git a/packages/vue-instantsearch/src/components/InstantSearch.js b/packages/vue-instantsearch/src/components/InstantSearch.js
index ad7ec32afa..5077001510 100644
--- a/packages/vue-instantsearch/src/components/InstantSearch.js
+++ b/packages/vue-instantsearch/src/components/InstantSearch.js
@@ -1,4 +1,4 @@
-import instantsearch from 'instantsearch.js/es';
+import { instantsearch } from 'instantsearch-core';
 
 import { createInstantSearchComponent } from '../util/createInstantSearchComponent';
 import { renderCompat, getDefaultSlot } from '../util/vue-compat';
diff --git a/packages/vue-instantsearch/src/components/Menu.vue b/packages/vue-instantsearch/src/components/Menu.vue
index 9fafc714ef..1f149de896 100644
--- a/packages/vue-instantsearch/src/components/Menu.vue
+++ b/packages/vue-instantsearch/src/components/Menu.vue
@@ -48,7 +48,7 @@
 </template>
 
 <script>
-import { connectMenu } from 'instantsearch.js/es/connectors';
+import { connectMenu } from 'instantsearch-core';
 
 import { createPanelConsumerMixin } from '../mixins/panel';
 import { createSuitMixin } from '../mixins/suit';
diff --git a/packages/vue-instantsearch/src/components/MenuSelect.vue b/packages/vue-instantsearch/src/components/MenuSelect.vue
index 90b4f1ddc4..0afffeefde 100644
--- a/packages/vue-instantsearch/src/components/MenuSelect.vue
+++ b/packages/vue-instantsearch/src/components/MenuSelect.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-import { connectMenu } from 'instantsearch.js/es/connectors';
+import { connectMenu } from 'instantsearch-core';
 
 import { createPanelConsumerMixin } from '../mixins/panel';
 import { createSuitMixin } from '../mixins/suit';
diff --git a/packages/vue-instantsearch/src/components/NumericMenu.vue b/packages/vue-instantsearch/src/components/NumericMenu.vue
index d619aee4ee..97e6f72218 100644
--- a/packages/vue-instantsearch/src/components/NumericMenu.vue
+++ b/packages/vue-instantsearch/src/components/NumericMenu.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-import { connectNumericMenu } from 'instantsearch.js/es/connectors';
+import { connectNumericMenu } from 'instantsearch-core';
 
 import { createPanelConsumerMixin } from '../mixins/panel';
 import { createSuitMixin } from '../mixins/suit';
diff --git a/packages/vue-instantsearch/src/components/Pagination.vue b/packages/vue-instantsearch/src/components/Pagination.vue
index bd5c33931e..6c7cb2b186 100644
--- a/packages/vue-instantsearch/src/components/Pagination.vue
+++ b/packages/vue-instantsearch/src/components/Pagination.vue
@@ -165,7 +165,7 @@
 </template>
 
 <script>
-import { connectPagination } from 'instantsearch.js/es/connectors';
+import { connectPagination } from 'instantsearch-core';
 
 import { createPanelConsumerMixin } from '../mixins/panel';
 import { createSuitMixin } from '../mixins/suit';
diff --git a/packages/vue-instantsearch/src/components/QueryRuleContext.js b/packages/vue-instantsearch/src/components/QueryRuleContext.js
index f36b60bd0b..2c829ba706 100644
--- a/packages/vue-instantsearch/src/components/QueryRuleContext.js
+++ b/packages/vue-instantsearch/src/components/QueryRuleContext.js
@@ -1,4 +1,4 @@
-import { connectQueryRules } from 'instantsearch.js/es/connectors';
+import { connectQueryRules } from 'instantsearch-core';
 
 import { createSuitMixin } from '../mixins/suit';
 import { createWidgetMixin } from '../mixins/widget';
diff --git a/packages/vue-instantsearch/src/components/QueryRuleCustomData.vue b/packages/vue-instantsearch/src/components/QueryRuleCustomData.vue
index 402769c482..0a77be5ab3 100644
--- a/packages/vue-instantsearch/src/components/QueryRuleCustomData.vue
+++ b/packages/vue-instantsearch/src/components/QueryRuleCustomData.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import { connectQueryRules } from 'instantsearch.js/es/connectors';
+import { connectQueryRules } from 'instantsearch-core';
 
 import { createSuitMixin } from '../mixins/suit';
 import { createWidgetMixin } from '../mixins/widget';
diff --git a/packages/vue-instantsearch/src/components/RangeInput.vue b/packages/vue-instantsearch/src/components/RangeInput.vue
index 6424557ae0..3e18bfa2d4 100644
--- a/packages/vue-instantsearch/src/components/RangeInput.vue
+++ b/packages/vue-instantsearch/src/components/RangeInput.vue
@@ -57,7 +57,7 @@
 </template>
 
 <script>
-import { connectRange } from 'instantsearch.js/es/connectors';
+import { connectRange } from 'instantsearch-core';
 
 import { createPanelConsumerMixin } from '../mixins/panel';
 import { createSuitMixin } from '../mixins/suit';
diff --git a/packages/vue-instantsearch/src/components/RatingMenu.vue b/packages/vue-instantsearch/src/components/RatingMenu.vue
index d7586982d4..b073cdf7a3 100644
--- a/packages/vue-instantsearch/src/components/RatingMenu.vue
+++ b/packages/vue-instantsearch/src/components/RatingMenu.vue
@@ -70,7 +70,7 @@
 </template>
 
 <script>
-import { connectRatingMenu } from 'instantsearch.js/es/connectors';
+import { connectRatingMenu } from 'instantsearch-core';
 
 import { createPanelConsumerMixin } from '../mixins/panel';
 import { createSuitMixin } from '../mixins/suit';
diff --git a/packages/vue-instantsearch/src/components/RefinementList.vue b/packages/vue-instantsearch/src/components/RefinementList.vue
index 40da989086..45b070d712 100644
--- a/packages/vue-instantsearch/src/components/RefinementList.vue
+++ b/packages/vue-instantsearch/src/components/RefinementList.vue
@@ -80,7 +80,7 @@
 </template>
 
 <script>
-import { connectRefinementList } from 'instantsearch.js/es/connectors';
+import { connectRefinementList } from 'instantsearch-core';
 
 import { createPanelConsumerMixin } from '../mixins/panel';
 import { createSuitMixin } from '../mixins/suit';
diff --git a/packages/vue-instantsearch/src/components/RelevantSort.vue b/packages/vue-instantsearch/src/components/RelevantSort.vue
index a832df93f5..1a8b4a69c7 100644
--- a/packages/vue-instantsearch/src/components/RelevantSort.vue
+++ b/packages/vue-instantsearch/src/components/RelevantSort.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import { connectRelevantSort } from 'instantsearch.js/es/connectors';
+import { connectRelevantSort } from 'instantsearch-core';
 
 import { createSuitMixin } from '../mixins/suit';
 import { createWidgetMixin } from '../mixins/widget';
diff --git a/packages/vue-instantsearch/src/components/SearchBox.vue b/packages/vue-instantsearch/src/components/SearchBox.vue
index 0467af0282..92e46f55a6 100644
--- a/packages/vue-instantsearch/src/components/SearchBox.vue
+++ b/packages/vue-instantsearch/src/components/SearchBox.vue
@@ -40,7 +40,7 @@
 </template>
 
 <script>
-import { connectSearchBox } from 'instantsearch.js/es/connectors';
+import { connectSearchBox } from 'instantsearch-core';
 
 import { createSuitMixin } from '../mixins/suit';
 import { createWidgetMixin } from '../mixins/widget';
diff --git a/packages/vue-instantsearch/src/components/SortBy.vue b/packages/vue-instantsearch/src/components/SortBy.vue
index 3af4721188..ac123a8358 100644
--- a/packages/vue-instantsearch/src/components/SortBy.vue
+++ b/packages/vue-instantsearch/src/components/SortBy.vue
@@ -27,7 +27,7 @@
 </template>
 
 <script>
-import { connectSortBy } from 'instantsearch.js/es/connectors';
+import { connectSortBy } from 'instantsearch-core';
 
 import { createPanelConsumerMixin } from '../mixins/panel';
 import { createSuitMixin } from '../mixins/suit';
diff --git a/packages/vue-instantsearch/src/components/Stats.vue b/packages/vue-instantsearch/src/components/Stats.vue
index aaac0446c4..e65ce20761 100644
--- a/packages/vue-instantsearch/src/components/Stats.vue
+++ b/packages/vue-instantsearch/src/components/Stats.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import { connectStats } from 'instantsearch.js/es/connectors';
+import { connectStats } from 'instantsearch-core';
 
 import { createSuitMixin } from '../mixins/suit';
 import { createWidgetMixin } from '../mixins/widget';
diff --git a/packages/vue-instantsearch/src/components/ToggleRefinement.vue b/packages/vue-instantsearch/src/components/ToggleRefinement.vue
index e06cea9ecb..86cc2f6150 100644
--- a/packages/vue-instantsearch/src/components/ToggleRefinement.vue
+++ b/packages/vue-instantsearch/src/components/ToggleRefinement.vue
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import { connectToggleRefinement } from 'instantsearch.js/es/connectors';
+import { connectToggleRefinement } from 'instantsearch-core';
 
 import { createPanelConsumerMixin } from '../mixins/panel';
 import { createSuitMixin } from '../mixins/suit';
diff --git a/packages/vue-instantsearch/src/components/VoiceSearch.vue b/packages/vue-instantsearch/src/components/VoiceSearch.vue
index 58a6f54d03..c12cb3ebfe 100644
--- a/packages/vue-instantsearch/src/components/VoiceSearch.vue
+++ b/packages/vue-instantsearch/src/components/VoiceSearch.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script>
-import { connectVoiceSearch } from 'instantsearch.js/es/connectors';
+import { connectVoiceSearch } from 'instantsearch-core';
 
 import { createSuitMixin } from '../mixins/suit';
 import { createWidgetMixin } from '../mixins/widget';
diff --git a/packages/vue-instantsearch/src/components/__Template.vue b/packages/vue-instantsearch/src/components/__Template.vue
index 5442fc31de..c5a17aeb48 100644
--- a/packages/vue-instantsearch/src/components/__Template.vue
+++ b/packages/vue-instantsearch/src/components/__Template.vue
@@ -12,7 +12,7 @@
 import { createSuitMixin } from '../mixins/suit';
 import { createWidgetMixin } from '../mixins/widget';
 // Uncomment and change here ⬇️
-// import { connectorName } from 'instantsearch.js/es/connectors';
+// import { connectorName } from 'instantsearch-core';
 
 /* eslint-disable @typescript-eslint/no-unused-vars,no-unused-vars */
 // Remove this part ⬇,️ only here for testing the template
diff --git a/packages/vue-instantsearch/src/components/__tests__/Highlight.js b/packages/vue-instantsearch/src/components/__tests__/Highlight.js
index e6135a844d..4caa55d53e 100644
--- a/packages/vue-instantsearch/src/components/__tests__/Highlight.js
+++ b/packages/vue-instantsearch/src/components/__tests__/Highlight.js
@@ -6,8 +6,6 @@ import { mount } from '../../../test/utils';
 import Highlight from '../Highlight.vue';
 import '../../../test/utils/sortedHtmlSerializer';
 
-jest.unmock('instantsearch.js/es');
-
 test('renders proper HTML', () => {
   const hit = {
     _highlightResult: {
diff --git a/packages/vue-instantsearch/src/components/__tests__/Index-integration.js b/packages/vue-instantsearch/src/components/__tests__/Index-integration.js
index a789063357..47ae5e4f57 100644
--- a/packages/vue-instantsearch/src/components/__tests__/Index-integration.js
+++ b/packages/vue-instantsearch/src/components/__tests__/Index-integration.js
@@ -1,9 +1,7 @@
 /**
  * @jest-environment jsdom
  */
-
-jest.unmock('instantsearch.js/es');
-import instantsearch from 'instantsearch.js/es';
+import { instantsearch } from 'instantsearch-core';
 
 import { mount } from '../../../test/utils';
 import { createWidgetMixin } from '../../mixins/widget';
diff --git a/packages/vue-instantsearch/src/components/__tests__/InstantSearch-integration.js b/packages/vue-instantsearch/src/components/__tests__/InstantSearch-integration.js
index 3dc3510de7..850215ab41 100644
--- a/packages/vue-instantsearch/src/components/__tests__/InstantSearch-integration.js
+++ b/packages/vue-instantsearch/src/components/__tests__/InstantSearch-integration.js
@@ -7,7 +7,6 @@ import { createWidgetMixin } from '../../mixins/widget';
 import { createFakeClient } from '../../util/testutils/client';
 import InstantSearch from '../InstantSearch';
 import SearchBox from '../SearchBox.vue';
-jest.unmock('instantsearch.js/es');
 import '../../../test/utils/sortedHtmlSerializer';
 
 const wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
diff --git a/packages/vue-instantsearch/src/components/__tests__/InstantSearch.js b/packages/vue-instantsearch/src/components/__tests__/InstantSearch.js
index fb60470508..878aa52630 100644
--- a/packages/vue-instantsearch/src/components/__tests__/InstantSearch.js
+++ b/packages/vue-instantsearch/src/components/__tests__/InstantSearch.js
@@ -2,36 +2,59 @@
  * @jest-environment jsdom
  */
 
-import { createAlgoliaSearchClient } from '@instantsearch/mocks';
-import instantsearch from 'instantsearch.js/es';
+import {
+  createAlgoliaSearchClient,
+  createSearchClient,
+} from '@instantsearch/mocks';
+import { wait } from '@instantsearch/testutils';
+import {
+  historyRouter,
+  instantsearch,
+  simpleStateMapping,
+} from 'instantsearch-core';
 
 import { version } from '../../../package.json';
 import { mount, nextTick } from '../../../test/utils';
-import { isVue3, version as vueVersion } from '../../util/vue-compat';
+import {
+  isVue3,
+  renderCompat,
+  version as vueVersion,
+} from '../../util/vue-compat';
 import { warn } from '../../util/warn';
+import { AisSearchBox } from '../../widgets';
 import InstantSearch from '../InstantSearch';
 import '../../../test/utils/sortedHtmlSerializer';
 
 jest.mock('../../util/warn');
 
+jest.mock('instantsearch-core', () => {
+  const actual = jest.requireActual('instantsearch-core');
+
+  return {
+    ...actual,
+    instantsearch: jest.fn(actual.instantsearch),
+  };
+});
+
 beforeEach(() => {
   jest.clearAllMocks();
 });
 
 it('passes props to InstantSearch.js', () => {
-  const searchClient = {};
+  const searchClient = createSearchClient();
   const insightsClient = jest.fn();
   const searchFunction = (helper) => helper.search();
+  const routing = {
+    router: historyRouter(),
+    stateMapping: simpleStateMapping(),
+  };
 
   mount(InstantSearch, {
     propsData: {
       searchClient,
       insightsClient,
       indexName: 'something',
-      routing: {
-        router: {},
-        stateMapping: {},
-      },
+      routing,
       stalledSearchDelay: 250,
       searchFunction,
     },
@@ -39,10 +62,7 @@ it('passes props to InstantSearch.js', () => {
 
   expect(instantsearch).toHaveBeenCalledWith({
     indexName: 'something',
-    routing: {
-      router: {},
-      stateMapping: {},
-    },
+    routing,
     searchClient,
     insightsClient,
     searchFunction,
@@ -56,7 +76,7 @@ it('throws on usage of appId or apiKey', () => {
 
   mount(InstantSearch, {
     propsData: {
-      searchClient: {},
+      searchClient: createSearchClient(),
       apiKey: 'bla',
       appId: 'blabla',
       indexName: 'something',
@@ -105,11 +125,13 @@ found in
 it('calls `start` on the next tick', async () => {
   const wrapper = mount(InstantSearch, {
     propsData: {
-      searchClient: {},
+      searchClient: createSearchClient(),
       indexName: 'something',
     },
   });
 
+  jest.spyOn(wrapper.vm.instantSearchInstance, 'start');
+
   await nextTick();
   expect(wrapper.vm.instantSearchInstance.start).toHaveBeenCalledTimes(1);
 });
@@ -117,7 +139,7 @@ it('calls `start` on the next tick', async () => {
 it('renders correctly (empty)', () => {
   const wrapper = mount(InstantSearch, {
     propsData: {
-      searchClient: {},
+      searchClient: createSearchClient(),
       indexName: 'bla',
     },
   });
@@ -128,7 +150,7 @@ it('renders correctly (empty)', () => {
 it('renders correctly (with slot used)', () => {
   const wrapper = mount(InstantSearch, {
     propsData: {
-      searchClient: {},
+      searchClient: createSearchClient(),
       indexName: 'bla',
     },
     slots: {
@@ -140,43 +162,61 @@ it('renders correctly (with slot used)', () => {
 });
 
 it('Allows a change in `index-name`', async () => {
+  const searchClient = createSearchClient();
   const wrapper = mount(InstantSearch, {
     propsData: {
-      searchClient: {},
-      indexName: 'bla',
+      searchClient,
+      indexName: 'before',
+    },
+    slots: {
+      default: { render: renderCompat((h) => h(AisSearchBox)) },
+    },
+    components: {
+      AisSearchBox,
     },
   });
 
+  await wait(0);
+
+  expect(searchClient.search).toHaveBeenCalledTimes(1);
+  expect(searchClient.search).toHaveBeenCalledWith([
+    { indexName: 'before', params: { query: '' } },
+  ]);
+
   await wrapper.setProps({
-    indexName: 'doggie_bowl',
+    indexName: 'after',
   });
 
-  const helper = wrapper.vm.instantSearchInstance.helper;
-
-  expect(helper.setIndex).toHaveBeenCalledTimes(1);
-  expect(helper.setIndex).toHaveBeenCalledWith('doggie_bowl');
-  expect(helper.search).toHaveBeenCalledTimes(1);
+  expect(searchClient.search).toHaveBeenCalledTimes(2);
+  expect(searchClient.search).toHaveBeenCalledWith([
+    { indexName: 'after', params: { query: '' } },
+  ]);
 });
 
 it('Allows a change in `search-client`', async () => {
+  const searchClient = createSearchClient();
   const wrapper = mount(InstantSearch, {
     propsData: {
-      searchClient: {},
-      indexName: 'bla',
+      searchClient,
+      indexName: 'indexName',
+    },
+    components: { AisSearchBox },
+    slots: {
+      default: { render: renderCompat((h) => h(AisSearchBox)) },
     },
   });
 
-  const newClient = { cats: 'rule', dogs: 'drool' };
+  await wait(0);
+
+  expect(searchClient.search).toHaveBeenCalledTimes(1);
 
+  const newClient = createSearchClient();
   await wrapper.setProps({
     searchClient: newClient,
   });
 
-  const helper = wrapper.vm.instantSearchInstance.helper;
-
-  expect(helper.setClient).toHaveBeenCalledTimes(1);
-  expect(helper.setClient).toHaveBeenCalledWith(newClient);
-  expect(helper.search).toHaveBeenCalledTimes(1);
+  expect(newClient.search).toHaveBeenCalledTimes(1);
+  expect(searchClient.search).toHaveBeenCalledTimes(1);
 });
 
 it('warns when the `search-client` changes', async () => {
@@ -216,7 +256,7 @@ it('Allows a change in `search-function`', async () => {
 
   const wrapper = mount(InstantSearch, {
     propsData: {
-      searchClient: {},
+      searchClient: createSearchClient(),
       indexName: 'bla',
       searchFunction: oldValue,
     },
@@ -234,7 +274,7 @@ it('Allows a change in `search-function`', async () => {
 it('Allows a change in `stalled-search-delay`', async () => {
   const wrapper = mount(InstantSearch, {
     propsData: {
-      searchClient: {},
+      searchClient: createSearchClient(),
       indexName: 'bla',
       searchFunction: () => {},
       stalledSearchDelay: 200,
@@ -255,7 +295,7 @@ it('does not allow `routing` to be a boolean', () => {
   global.console.warn = jest.fn();
   mount(InstantSearch, {
     propsData: {
-      searchClient: {},
+      searchClient: createSearchClient(),
       indexName: 'bla',
       routing: true,
     },
@@ -287,7 +327,7 @@ See https://www.algolia.com/doc/api-reference/widgets/instantsearch/vue/#widget-
 it('warns when `routing` does not have `router` or `stateMapping`', () => {
   mount(InstantSearch, {
     propsData: {
-      searchClient: {},
+      searchClient: createSearchClient(),
       indexName: 'indexName',
       routing: {},
     },
@@ -302,16 +342,16 @@ See https://www.algolia.com/doc/api-reference/widgets/instantsearch/vue/#widget-
 it('does not warn when `routing` have either `router` or `stateMapping`', () => {
   mount(InstantSearch, {
     propsData: {
-      searchClient: {},
+      searchClient: createSearchClient(),
       indexName: 'indexName',
-      routing: { router: {} },
+      routing: { router: historyRouter() },
     },
   });
   mount(InstantSearch, {
     propsData: {
-      searchClient: {},
+      searchClient: createSearchClient(),
       indexName: 'indexName',
-      routing: { stateMapping: {} },
+      routing: { stateMapping: simpleStateMapping() },
     },
   });
 
@@ -322,7 +362,7 @@ it('does not warn when `routing` have either `router` or `stateMapping`', () =>
 it.skip('Does not allow a change in `routing`', async () => {
   const wrapper = mount(InstantSearch, {
     propsData: {
-      searchClient: {},
+      searchClient: createSearchClient(),
       indexName: 'bla',
     },
   });
@@ -339,7 +379,7 @@ Please open a new issue: https://github.com/algolia/instantsearch/discussions/ne
 });
 
 it('will call client.addAlgoliaAgent if present', () => {
-  const client = { addAlgoliaAgent: jest.fn() };
+  const client = createAlgoliaSearchClient({});
 
   mount(InstantSearch, {
     propsData: {
@@ -348,7 +388,10 @@ it('will call client.addAlgoliaAgent if present', () => {
     },
   });
 
-  expect(client.addAlgoliaAgent).toHaveBeenCalledTimes(2);
+  expect(client.addAlgoliaAgent).toHaveBeenCalledTimes(3);
+  expect(client.addAlgoliaAgent).toHaveBeenCalledWith(
+    expect.stringMatching(/instantsearch-core \(.*\)/)
+  );
   expect(client.addAlgoliaAgent).toHaveBeenCalledWith(`Vue (${vueVersion})`);
   expect(client.addAlgoliaAgent).toHaveBeenCalledWith(
     `Vue InstantSearch (${version})`
@@ -359,7 +402,9 @@ it('will not call client.addAlgoliaAgent if not function (so nothing to assert)'
   expect(() =>
     mount(InstantSearch, {
       propsData: {
-        searchClient: { addAlgoliaAgent: true },
+        searchClient: createSearchClient({
+          addAlgoliaAgent: false,
+        }),
         indexName: 'bla',
       },
     })
@@ -369,11 +414,13 @@ it('will not call client.addAlgoliaAgent if not function (so nothing to assert)'
 it('disposes the instantsearch instance on unmount', async () => {
   const wrapper = mount(InstantSearch, {
     propsData: {
-      searchClient: {},
+      searchClient: createSearchClient(),
       indexName: 'something',
     },
   });
 
+  jest.spyOn(wrapper.vm.instantSearchInstance, 'dispose');
+
   await nextTick();
 
   expect(wrapper.vm.instantSearchInstance.started).toBe(true);
@@ -414,7 +461,7 @@ it('provides the instantsearch instance', (done) => {
     data() {
       return {
         props: {
-          searchClient: {},
+          searchClient: createSearchClient(),
           indexName: 'something',
         },
       };
diff --git a/packages/vue-instantsearch/src/components/__tests__/InstantSearchSsr.js b/packages/vue-instantsearch/src/components/__tests__/InstantSearchSsr.js
index 63cedf6c48..7cdb665ce3 100644
--- a/packages/vue-instantsearch/src/components/__tests__/InstantSearchSsr.js
+++ b/packages/vue-instantsearch/src/components/__tests__/InstantSearchSsr.js
@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 
-import instantsearch from 'instantsearch.js/es';
+import { instantsearch } from 'instantsearch-core';
 
 import { mount, nextTick } from '../../../test/utils';
 import { createFakeClient } from '../../util/testutils/client';
@@ -11,8 +11,6 @@ import InstantSearchSsr from '../InstantSearchSsr';
 import SearchBox from '../SearchBox.vue';
 import '../../../test/utils/sortedHtmlSerializer';
 
-jest.unmock('instantsearch.js/es');
-
 it('requires an injected instantsearch instance ($_ais)', () => {
   expect(() => mount(InstantSearchSsr)).toThrowErrorMatchingInlineSnapshot(
     `"\`createServerRootMixin\` is required when using SSR."`
diff --git a/packages/vue-instantsearch/src/components/__tests__/Snippet.js b/packages/vue-instantsearch/src/components/__tests__/Snippet.js
index 2f1ab2afe4..bfef670a40 100644
--- a/packages/vue-instantsearch/src/components/__tests__/Snippet.js
+++ b/packages/vue-instantsearch/src/components/__tests__/Snippet.js
@@ -6,8 +6,6 @@ import { mount } from '../../../test/utils';
 import Snippet from '../Snippet.vue';
 import '../../../test/utils/sortedHtmlSerializer';
 
-jest.unmock('instantsearch.js/es');
-
 test('renders proper HTML', () => {
   const hit = {
     _snippetResult: {
diff --git a/packages/vue-instantsearch/src/components/__tests__/__snapshots__/InfiniteHits.js.snap b/packages/vue-instantsearch/src/components/__tests__/__snapshots__/InfiniteHits.js.snap
index f61003fd1e..e4936b2f6f 100644
--- a/packages/vue-instantsearch/src/components/__tests__/__snapshots__/InfiniteHits.js.snap
+++ b/packages/vue-instantsearch/src/components/__tests__/__snapshots__/InfiniteHits.js.snap
@@ -13,19 +13,29 @@ exports[`does not render a banner when showBanner is false 1`] = `
   </aside>
   <ol class="ais-InfiniteHits-list">
     <li class="ais-InfiniteHits-item">
-      objectID: 00001, index: 0
+      <div style="word-break: break-all;">
+        {"objectID":"00001"}…
+      </div>
     </li>
     <li class="ais-InfiniteHits-item">
-      objectID: 00002, index: 1
+      <div style="word-break: break-all;">
+        {"objectID":"00002"}…
+      </div>
     </li>
     <li class="ais-InfiniteHits-item">
-      objectID: 00003, index: 2
+      <div style="word-break: break-all;">
+        {"objectID":"00003"}…
+      </div>
     </li>
     <li class="ais-InfiniteHits-item">
-      objectID: 00004, index: 3
+      <div style="word-break: break-all;">
+        {"objectID":"00004"}…
+      </div>
     </li>
     <li class="ais-InfiniteHits-item">
-      objectID: 00005, index: 4
+      <div style="word-break: break-all;">
+        {"objectID":"00005"}…
+      </div>
     </li>
   </ol>
   <button class="ais-InfiniteHits-loadMore">
@@ -104,19 +114,29 @@ exports[`renders correctly with banner data 1`] = `
   </aside>
   <ol class="ais-InfiniteHits-list">
     <li class="ais-InfiniteHits-item">
-      objectID: 00001, index: 0
+      <div style="word-break: break-all;">
+        {"objectID":"00001"}…
+      </div>
     </li>
     <li class="ais-InfiniteHits-item">
-      objectID: 00002, index: 1
+      <div style="word-break: break-all;">
+        {"objectID":"00002"}…
+      </div>
     </li>
     <li class="ais-InfiniteHits-item">
-      objectID: 00003, index: 2
+      <div style="word-break: break-all;">
+        {"objectID":"00003"}…
+      </div>
     </li>
     <li class="ais-InfiniteHits-item">
-      objectID: 00004, index: 3
+      <div style="word-break: break-all;">
+        {"objectID":"00004"}…
+      </div>
     </li>
     <li class="ais-InfiniteHits-item">
-      objectID: 00005, index: 4
+      <div style="word-break: break-all;">
+        {"objectID":"00005"}…
+      </div>
     </li>
   </ol>
   <button class="ais-InfiniteHits-loadMore">
@@ -130,19 +150,29 @@ exports[`renders correctly with banner data and custom banner rendering 1`] = `
   <img src="https://via.placeholder.com/550x250">
   <ol class="ais-InfiniteHits-list">
     <li class="ais-InfiniteHits-item">
-      objectID: 00001, index: 0
+      <div style="word-break: break-all;">
+        {"objectID":"00001"}…
+      </div>
     </li>
     <li class="ais-InfiniteHits-item">
-      objectID: 00002, index: 1
+      <div style="word-break: break-all;">
+        {"objectID":"00002"}…
+      </div>
     </li>
     <li class="ais-InfiniteHits-item">
-      objectID: 00003, index: 2
+      <div style="word-break: break-all;">
+        {"objectID":"00003"}…
+      </div>
     </li>
     <li class="ais-InfiniteHits-item">
-      objectID: 00004, index: 3
+      <div style="word-break: break-all;">
+        {"objectID":"00004"}…
+      </div>
     </li>
     <li class="ais-InfiniteHits-item">
-      objectID: 00005, index: 4
+      <div style="word-break: break-all;">
+        {"objectID":"00005"}…
+      </div>
     </li>
   </ol>
   <button class="ais-InfiniteHits-loadMore">
diff --git a/packages/vue-instantsearch/src/util/__tests__/createServerRootMixin.test.js b/packages/vue-instantsearch/src/util/__tests__/createServerRootMixin.test.js
index 9f28b39372..119ea289a1 100644
--- a/packages/vue-instantsearch/src/util/__tests__/createServerRootMixin.test.js
+++ b/packages/vue-instantsearch/src/util/__tests__/createServerRootMixin.test.js
@@ -25,8 +25,6 @@ import { createFakeClient } from '../testutils/client';
 import { createSerializedState } from '../testutils/helper';
 import { isVue3, isVue2, Vue2, renderCompat } from '../vue-compat';
 
-jest.unmock('instantsearch.js/es');
-
 function renderToString(app) {
   if (isVue3) {
     return require('@vue/server-renderer').renderToString(app);
diff --git a/packages/vue-instantsearch/src/util/createInstantSearchComponent.js b/packages/vue-instantsearch/src/util/createInstantSearchComponent.js
index 5709f1e1dc..7b9c1cd041 100644
--- a/packages/vue-instantsearch/src/util/createInstantSearchComponent.js
+++ b/packages/vue-instantsearch/src/util/createInstantSearchComponent.js
@@ -1,4 +1,4 @@
-import { INSTANTSEARCH_FUTURE_DEFAULTS } from 'instantsearch.js/es/lib/InstantSearch';
+import { INSTANTSEARCH_FUTURE_DEFAULTS } from 'instantsearch-core';
 
 import { version } from '../../package.json'; // rollup does pick only what needed from json
 import { createSuitMixin } from '../mixins/suit';
@@ -23,10 +23,23 @@ export const createInstantSearchComponent = (component) =>
             'The `search-client` prop of `<ais-instant-search>` changed between renders, which may cause more search requests than necessary. If this is an unwanted behavior, please provide a stable reference: https://www.algolia.com/doc/api-reference/widgets/instantsearch/vue/#widget-param-search-client'
           );
 
-          this.instantSearchInstance.helper.setClient(searchClient).search();
+          this.instantSearchInstance.client = searchClient;
+          if (this.instantSearchInstance.mainHelper) {
+            this.instantSearchInstance.mainHelper
+              .setClient(searchClient)
+              .search();
+          }
         },
         indexName(indexName) {
-          this.instantSearchInstance.helper.setIndex(indexName || '').search();
+          if (
+            this.instantSearchInstance.helper &&
+            this.instantSearchInstance.mainHelper
+          ) {
+            this.instantSearchInstance.helper.setIndex(indexName || '');
+            this.instantSearchInstance.mainHelper
+              .setIndex(indexName || '')
+              .search();
+          }
         },
         compositionID(compositionID) {
           this.instantSearchInstance.helper
diff --git a/packages/vue-instantsearch/src/util/createServerRootMixin.js b/packages/vue-instantsearch/src/util/createServerRootMixin.js
index 79e1b4547c..bca2b21c6c 100644
--- a/packages/vue-instantsearch/src/util/createServerRootMixin.js
+++ b/packages/vue-instantsearch/src/util/createServerRootMixin.js
@@ -1,8 +1,8 @@
-import instantsearch from 'instantsearch.js/es';
 import {
+  instantsearch,
   waitForResults,
   getInitialResults,
-} from 'instantsearch.js/es/lib/server';
+} from 'instantsearch-core';
 
 import { isVue3, isVue2, Vue2, createSSRApp } from './vue-compat';
 import { warn } from './warn';
diff --git a/packages/vue-instantsearch/src/util/parseAlgoliaHit.js b/packages/vue-instantsearch/src/util/parseAlgoliaHit.js
index 7580898b01..197fa57513 100644
--- a/packages/vue-instantsearch/src/util/parseAlgoliaHit.js
+++ b/packages/vue-instantsearch/src/util/parseAlgoliaHit.js
@@ -1,5 +1,5 @@
 // copied from React InstantSearch
-import { getPropertyByPath } from 'instantsearch.js/es/lib/utils';
+import { getPropertyByPath } from 'instantsearch-core';
 
 import { unescape } from '../util/unescape';
 
diff --git a/tests/common/common.ts b/tests/common/common.ts
index 747f2184ef..2613d76d7e 100644
--- a/tests/common/common.ts
+++ b/tests/common/common.ts
@@ -1,4 +1,4 @@
-import type { InstantSearchOptions } from 'instantsearch.js';
+import type { InstantSearchOptions } from 'instantsearch-core';
 
 type MaybePromise<TResolution> = Promise<TResolution> | TResolution;
 
diff --git a/tests/common/connectors/frequently-bought-together/index.ts b/tests/common/connectors/frequently-bought-together/index.ts
index e9bdfa8632..1843dc2cb9 100644
--- a/tests/common/connectors/frequently-bought-together/index.ts
+++ b/tests/common/connectors/frequently-bought-together/index.ts
@@ -4,7 +4,7 @@ import { createOptionsTests } from './options';
 import { createStateTests } from './state';
 
 import type { TestOptions, TestSetup } from '../../common';
-import type { FrequentlyBoughtTogetherConnectorParams } from 'instantsearch.js/es/connectors/frequently-bought-together/connectFrequentlyBoughtTogether';
+import type { FrequentlyBoughtTogetherConnectorParams } from 'instantsearch-core';
 
 export type FrequentlyBoughtTogetherConnectorSetup = TestSetup<{
   widgetParams: FrequentlyBoughtTogetherConnectorParams;
diff --git a/tests/common/connectors/looking-similar/index.ts b/tests/common/connectors/looking-similar/index.ts
index 5c1dbc2225..0f5610f0a8 100644
--- a/tests/common/connectors/looking-similar/index.ts
+++ b/tests/common/connectors/looking-similar/index.ts
@@ -4,7 +4,7 @@ import { createOptionsTests } from './options';
 import { createStateTests } from './state';
 
 import type { TestOptions, TestSetup } from '../../common';
-import type { LookingSimilarConnectorParams } from 'instantsearch.js/src/connectors/looking-similar/connectLookingSimilar';
+import type { LookingSimilarConnectorParams } from 'instantsearch-core';
 
 export type LookingSimilarConnectorSetup = TestSetup<{
   widgetParams: LookingSimilarConnectorParams;
diff --git a/tests/common/connectors/related-products/index.ts b/tests/common/connectors/related-products/index.ts
index f79210434b..0023eca0d2 100644
--- a/tests/common/connectors/related-products/index.ts
+++ b/tests/common/connectors/related-products/index.ts
@@ -4,7 +4,7 @@ import { createOptionsTests } from './options';
 import { createStateTests } from './state';
 
 import type { TestOptions, TestSetup } from '../../common';
-import type { RelatedProductsConnectorParams } from 'instantsearch.js/src/connectors/related-products/connectRelatedProducts';
+import type { RelatedProductsConnectorParams } from 'instantsearch-core';
 
 export type RelatedProductsConnectorSetup = TestSetup<{
   widgetParams: RelatedProductsConnectorParams;
diff --git a/tests/common/connectors/trending-items/index.ts b/tests/common/connectors/trending-items/index.ts
index 66b53e408c..77d113d577 100644
--- a/tests/common/connectors/trending-items/index.ts
+++ b/tests/common/connectors/trending-items/index.ts
@@ -4,7 +4,7 @@ import { createOptionsTests } from './options';
 import { createStateTests } from './state';
 
 import type { TestOptions, TestSetup } from '../../common';
-import type { TrendingItemsConnectorParams } from 'instantsearch.js/src/connectors/trending-items/connectTrendingItems';
+import type { TrendingItemsConnectorParams } from 'instantsearch-core';
 
 export type TrendingItemsConnectorSetup = TestSetup<{
   widgetParams: TrendingItemsConnectorParams;
diff --git a/tests/common/package.json b/tests/common/package.json
index 42f4f0cd10..4e6397680d 100644
--- a/tests/common/package.json
+++ b/tests/common/package.json
@@ -4,6 +4,7 @@
   "version": "1.70.0",
   "description": "Common tests for all InstantSearch flavors.",
   "dependencies": {
-    "instantsearch.js": "4.77.3"
+    "instantsearch.js": "4.77.3",
+    "instantsearch-core": "0.1.0"
   }
 }
diff --git a/tests/common/widgets/hits/options.ts b/tests/common/widgets/hits/options.ts
index 0a21bbd1ce..bce01b1bca 100644
--- a/tests/common/widgets/hits/options.ts
+++ b/tests/common/widgets/hits/options.ts
@@ -19,18 +19,7 @@ import type { Hit, SearchResponse } from 'instantsearch.js';
 function normalizeSnapshot(html: string) {
   // Each flavor has its own way to render the hit by default.
   // @MAJOR: Remove this once all flavors are aligned.
-  return commonNormalizeSnapshot(html)
-    .replace(
-      /(?:<div\s+style="word-break: break-all;"\s*?>)?\s*?({.+?})…?\s*?(?:<\/div>)?/gs,
-      (_, captured) => {
-        return (captured as string)
-          .replace(/\s/g, '')
-          .replace(/,"__position":\d/, '');
-      }
-    )
-    .replace(/\s{0,}(objectID): (.+?), index: \d\s{0,}/gs, (_, ...captured) => {
-      return `{"objectID":"${captured[1]}"}`;
-    });
+  return commonNormalizeSnapshot(html);
 }
 
 export function createOptionsTests(
@@ -67,12 +56,20 @@ export function createOptionsTests(
             <li
               class="ais-Hits-item"
             >
-              {"objectID":"1"}
+              <div
+                style="word-break: break-all;"
+              >
+                {"objectID":"1","__position":1}…
+              </div>
             </li>
             <li
               class="ais-Hits-item"
             >
-              {"objectID":"2"}
+              <div
+                style="word-break: break-all;"
+              >
+                {"objectID":"2","__position":2}…
+              </div>
             </li>
           </ol>
         </div>
@@ -118,12 +115,20 @@ export function createOptionsTests(
             <li
               class="ais-Hits-item"
             >
-              {"objectID":"(1)"}
+              <div
+                style="word-break: break-all;"
+              >
+                {"objectID":"(1)","__position":1}…
+              </div>
             </li>
             <li
               class="ais-Hits-item"
             >
-              {"objectID":"(2)"}
+              <div
+                style="word-break: break-all;"
+              >
+                {"objectID":"(2)","__position":2}…
+              </div>
             </li>
           </ol>
         </div>
@@ -209,38 +214,46 @@ export function createOptionsTests(
       ).toMatchNormalizedInlineSnapshot(
         normalizeSnapshot,
         `
-          <div
-            class="ais-Hits"
+        <div
+          class="ais-Hits"
+        >
+          <aside
+            class="ais-Hits-banner"
           >
-            <aside
-              class="ais-Hits-banner"
+            <a
+              class="ais-Hits-banner-link"
+              href="https://www.algolia.com"
             >
-              <a
-                class="ais-Hits-banner-link"
-                href="https://www.algolia.com"
-              >
-                <img
-                  class="ais-Hits-banner-image"
-                  src="https://via.placeholder.com/550x250"
-                />
-              </a>
-            </aside>
-            <ol
-              class="ais-Hits-list"
+              <img
+                class="ais-Hits-banner-image"
+                src="https://via.placeholder.com/550x250"
+              />
+            </a>
+          </aside>
+          <ol
+            class="ais-Hits-list"
+          >
+            <li
+              class="ais-Hits-item"
             >
-              <li
-                class="ais-Hits-item"
+              <div
+                style="word-break: break-all;"
               >
-                {"objectID":"1"}
-              </li>
-              <li
-                class="ais-Hits-item"
+                {"objectID":"1","__position":1}…
+              </div>
+            </li>
+            <li
+              class="ais-Hits-item"
+            >
+              <div
+                style="word-break: break-all;"
               >
-                {"objectID":"2"}
-              </li>
-            </ol>
-          </div>
-          `
+                {"objectID":"2","__position":2}…
+              </div>
+            </li>
+          </ol>
+        </div>
+      `
       );
     });
   });
diff --git a/tests/common/widgets/infinite-hits/options.ts b/tests/common/widgets/infinite-hits/options.ts
index 2ea845b4f4..d73f01a355 100644
--- a/tests/common/widgets/infinite-hits/options.ts
+++ b/tests/common/widgets/infinite-hits/options.ts
@@ -13,41 +13,25 @@ import type { InfiniteHitsWidgetSetup } from '.';
 import type { TestOptions } from '../../common';
 import type { MockSearchClient } from '@instantsearch/mocks';
 import type { PlainSearchParameters } from 'algoliasearch-helper';
-import type { BaseHit, SearchResponse } from 'instantsearch.js';
 import type {
   InfiniteHitsCache,
   InfiniteHitsCachedHits,
-} from 'instantsearch.js/es/connectors/infinite-hits/connectInfiniteHits';
+} from 'instantsearch-core';
+import type { BaseHit, SearchResponse } from 'instantsearch.js';
 
 function normalizeSnapshot(html: string) {
   // Each flavor has its own way to render the hit by default.
   // @MAJOR: Remove this once all flavors are aligned.
   return (
     commonNormalizeSnapshot(html)
-      .replace(
-        /(?:<div\s+style="word-break: break-all;"\s*?>)?\s*?({.+?})…?\s*?(?:<\/div>)?/gs,
-        (_, captured) => {
-          return (captured as string)
-            .replace(/\s/g, '')
-            .replace(/,"__position":\d/, '');
-        }
-      )
       // React InstantSearch shows the "Load Previous" button by default, unlike
       // the other flavors
       .replace(
         /<button class="ais-InfiniteHits-loadPrevious .*?">.*?<\/button>/,
         ''
       )
-      // Vue InstantSearch doesn't render defaults hits like the other flavors
-      .replace(
-        /\s{0,}(objectID): (.+?), index: \d\s{0,}/gs,
-        (_, ...captured) => {
-          return `{"objectID":"${captured[1]}"}`;
-        }
-      )
       // Vue InstantSearch adds new line between banner and hits
       .replace(/>\s*</g, '><')
-      .replace(/"__position":\d,/g, '')
   );
 }
 
@@ -85,17 +69,29 @@ export function createOptionsTests(
             <li
               class="ais-InfiniteHits-item"
             >
-              {"objectID":"0"}
+              <div
+                style="word-break: break-all;"
+              >
+                {"objectID":"0","__position":1}…
+              </div>
             </li>
             <li
               class="ais-InfiniteHits-item"
             >
-              {"objectID":"1"}
+              <div
+                style="word-break: break-all;"
+              >
+                {"objectID":"1","__position":2}…
+              </div>
             </li>
             <li
               class="ais-InfiniteHits-item"
             >
-              {"objectID":"2"}
+              <div
+                style="word-break: break-all;"
+              >
+                {"objectID":"2","__position":3}…
+              </div>
             </li>
           </ol>
           <button
@@ -167,17 +163,29 @@ export function createOptionsTests(
             <li
               class="ais-InfiniteHits-item"
             >
-              {"objectID":"0"}
+              <div
+                style="word-break: break-all;"
+              >
+                {"objectID":"0","__position":1}…
+              </div>
             </li>
             <li
               class="ais-InfiniteHits-item"
             >
-              {"objectID":"1"}
+              <div
+                style="word-break: break-all;"
+              >
+                {"objectID":"1","__position":2}…
+              </div>
             </li>
             <li
               class="ais-InfiniteHits-item"
             >
-              {"objectID":"2"}
+              <div
+                style="word-break: break-all;"
+              >
+                {"objectID":"2","__position":3}…
+              </div>
             </li>
           </ol>
           <button
@@ -186,7 +194,7 @@ export function createOptionsTests(
             Show more results
           </button>
         </div>
-        `
+      `
       );
     });
 
@@ -226,17 +234,29 @@ export function createOptionsTests(
             <li
               class="ais-InfiniteHits-item"
             >
-              {"objectID":"(0)"}
+              <div
+                style="word-break: break-all;"
+              >
+                {"objectID":"(0)","__position":1}…
+              </div>
             </li>
             <li
               class="ais-InfiniteHits-item"
             >
-              {"objectID":"(1)"}
+              <div
+                style="word-break: break-all;"
+              >
+                {"objectID":"(1)","__position":2}…
+              </div>
             </li>
             <li
               class="ais-InfiniteHits-item"
             >
-              {"objectID":"(2)"}
+              <div
+                style="word-break: break-all;"
+              >
+                {"objectID":"(2)","__position":3}…
+              </div>
             </li>
           </ol>
           <button
@@ -567,17 +587,29 @@ export function createOptionsTests(
             <li
               class="ais-InfiniteHits-item"
             >
-              {"objectID":"one"}
+              <div
+                style="word-break: break-all;"
+              >
+                {"__position":1,"objectID":"one"}…
+              </div>
             </li>
             <li
               class="ais-InfiniteHits-item"
             >
-              {"objectID":"two"}
+              <div
+                style="word-break: break-all;"
+              >
+                {"__position":2,"objectID":"two"}…
+              </div>
             </li>
             <li
               class="ais-InfiniteHits-item"
             >
-              {"objectID":"three"}
+              <div
+                style="word-break: break-all;"
+              >
+                {"__position":3,"objectID":"three"}…
+              </div>
             </li>
           </ol>
           <button
diff --git a/tests/mocks/createAPIResponse.ts b/tests/mocks/createAPIResponse.ts
index 5a34ab1f34..774f6e6bc1 100644
--- a/tests/mocks/createAPIResponse.ts
+++ b/tests/mocks/createAPIResponse.ts
@@ -4,7 +4,7 @@ import type {
   SearchForFacetValuesResponse,
   RecommendResponse,
   RecommendResponses,
-} from 'instantsearch.js';
+} from 'instantsearch-core';
 
 export const defaultRenderingContent: SearchResponse<any>['renderingContent'] =
   {
diff --git a/tests/mocks/createInsightsClient.ts b/tests/mocks/createInsightsClient.ts
index 3aa6285635..24a11c2932 100644
--- a/tests/mocks/createInsightsClient.ts
+++ b/tests/mocks/createInsightsClient.ts
@@ -5,7 +5,7 @@ import {
   getFunctionalInterface,
 } from 'search-insights';
 
-import type { InsightsClient } from 'instantsearch.js';
+import type { InsightsClient } from 'instantsearch-core';
 
 /**
  * Tests that rely on this mock interface have side effects caused by
diff --git a/tests/mocks/createSearchClient.ts b/tests/mocks/createSearchClient.ts
index 0df3eea977..ff87042767 100644
--- a/tests/mocks/createSearchClient.ts
+++ b/tests/mocks/createSearchClient.ts
@@ -5,7 +5,7 @@ import {
   createSFFVResponse,
 } from './createAPIResponse';
 
-import type { SearchClient, SearchResponses } from 'instantsearch.js';
+import type { SearchClient, SearchResponses } from 'instantsearch-core';
 
 export const createSearchClient = (
   args: Partial<SearchClient> = {}
diff --git a/tests/mocks/package.json b/tests/mocks/package.json
index 3bf4351668..569ad30179 100644
--- a/tests/mocks/package.json
+++ b/tests/mocks/package.json
@@ -4,6 +4,6 @@
   "private": true,
   "dependencies": {
     "algoliasearch-helper": "3.24.1",
-    "instantsearch.js": "4.77.3"
+    "instantsearch-core": "0.1.0"
   }
 }
diff --git a/tests/utils/createInstantSearchSpy.tsx b/tests/utils/createInstantSearchSpy.tsx
index 5a98f5e44a..b54f8439dd 100644
--- a/tests/utils/createInstantSearchSpy.tsx
+++ b/tests/utils/createInstantSearchSpy.tsx
@@ -5,8 +5,10 @@ import { IndexContext } from '../../packages/react-instantsearch-core/src/lib/In
 import { InstantSearchContext } from '../../packages/react-instantsearch-core/src/lib/InstantSearchContext';
 
 import type { InstantSearchProps } from '../../packages/react-instantsearch-core/src';
-import type { InstantSearch as InstantSearchType } from 'instantsearch.js';
-import type { IndexWidget } from 'instantsearch.js/es/widgets/index/index';
+import type {
+  InstantSearch as InstantSearchType,
+  IndexWidget,
+} from 'instantsearch-core';
 
 export function createInstantSearchSpy() {
   const searchContext = createRef<InstantSearchType>();
diff --git a/tests/utils/matchers/toWarnDev.ts b/tests/utils/matchers/toWarnDev.ts
index 9908d1f66f..7a199fcd6f 100644
--- a/tests/utils/matchers/toWarnDev.ts
+++ b/tests/utils/matchers/toWarnDev.ts
@@ -63,6 +63,13 @@ export const toWarnDev: jest.CustomMatcher = (
       };
     }
 
+    if (!actualWarning) {
+      return {
+        pass: false,
+        message: () => 'No warning recorded.',
+      };
+    }
+
     // Expectation with a message.
     if (expectedMessage !== undefined && actualWarning !== expectedMessage) {
       return {
diff --git a/tests/utils/package.json b/tests/utils/package.json
index 3dc72cc3ad..3eaf9b8979 100644
--- a/tests/utils/package.json
+++ b/tests/utils/package.json
@@ -7,7 +7,7 @@
     "enzyme": "3.11.0",
     "enzyme-adapter-preact-pure": "2.2.0",
     "enzyme-to-json": "3.6.2",
-    "instantsearch.js": "4.77.3",
+    "instantsearch-core": "0.1.0",
     "jest-serializer-html": "7.1.0",
     "preact": "^10.10.0"
   }
diff --git a/tests/utils/setupTests.ts b/tests/utils/setupTests.ts
index 55c4d32916..6b6dda6762 100644
--- a/tests/utils/setupTests.ts
+++ b/tests/utils/setupTests.ts
@@ -4,7 +4,8 @@ import { createSerializer } from 'enzyme-to-json';
 import htmlSerializer from 'jest-serializer-html/createSerializer';
 
 import '@testing-library/jest-dom/extend-expect';
-import { warnCache } from '../../packages/react-instantsearch-core/src/lib/warn';
+import { warnCache as coreLoggerCache } from '../../packages/instantsearch-core/src/lib/public/logger';
+import { warnCache as reactCoreLoggerCache } from '../../packages/react-instantsearch-core/src/lib/warn';
 import {
   Vue2,
   isVue2,
@@ -29,7 +30,8 @@ if (typeof window !== 'undefined') {
 
 beforeEach(() => {
   // We reset the log's cache for our log assertions to be isolated in each test.
-  warnCache.current = {};
+  coreLoggerCache.current = {};
+  reactCoreLoggerCache.current = {};
 });
 
 if (isVue2) {
diff --git a/tests/utils/widgetSnapshotSerializer.ts b/tests/utils/widgetSnapshotSerializer.ts
index d097545073..c0cc225a28 100644
--- a/tests/utils/widgetSnapshotSerializer.ts
+++ b/tests/utils/widgetSnapshotSerializer.ts
@@ -1,11 +1,7 @@
-import {
-  getWidgetAttribute,
-  isIndexWidget,
-} from 'instantsearch.js/es/lib/utils';
-import { createInitOptions } from 'instantsearch.js/test/createWidget';
+import { isIndexWidget, getWidgetAttribute } from 'instantsearch-core';
+import { createInitOptions } from 'instantsearch-core/test/createWidget';
 
-import type { InitOptions, Widget } from 'instantsearch.js';
-import type { IndexWidget } from 'instantsearch.js/es/widgets/index/index';
+import type { InitOptions, Widget, IndexWidget } from 'instantsearch-core';
 
 function getAttribute(widget: Widget | IndexWidget) {
   try {
diff --git a/tsconfig.v3.json b/tsconfig.v3.json
index d08df32654..65b1d02578 100644
--- a/tsconfig.v3.json
+++ b/tsconfig.v3.json
@@ -8,24 +8,24 @@
     "packages/algolia-experiences",
 
     // this test has specific code for v3 and v4, so already checked in the v4 test
-    "packages/instantsearch.js/src/middlewares/__tests__/createMetadataMiddleware.ts",
+    "packages/instantsearch-core/src/middlewares/__tests__/createMetadataMiddleware.ts",
     // these two files are temporarily excluded because
     // they import files from node_modules/search-insights directly
     // and it causes the type-checking to fail.
-    "packages/instantsearch.js/src/middlewares/__tests__/createInsightsMiddleware.ts",
+    "packages/instantsearch-core/src/middlewares/__tests__/createInsightsMiddleware.ts",
     "test/mock/createInsightsClient.ts",
     // v3 has a wrong definition for optionalWords (only accepts string[])
-    "packages/instantsearch.js/src/connectors/voice-search/__tests__/connectVoiceSearch-test.ts",
+    "packages/instantsearch-core/src/connectors/__tests__/connectVoiceSearch.test.ts",
     // v3 does not have renderingContent (only errors in the test)
-    "packages/instantSearch.js/src/connectors/hits/__tests__/connectHits-test.ts",
-    "packages/instantsearch.js/src/connectors/dynamic-widgets/__tests__/connectDynamicWidgets-test.ts",
-    "packages/instantsearch.js/src/connectors/hierarchical-menu/__tests__/connectHierarchicalMenu-test.ts",
-    "packages/instantsearch.js/src/connectors/menu/__tests__/connectMenu-test.ts",
-    "packages/instantsearch.js/src/connectors/refinement-list/__tests__/connectRefinementList-test.ts",
+    "packages/instantSearch-core/src/connectors/__tests__/connectHits.test.ts",
+    "packages/instantsearch-core/src/connectors/__tests__/connectDynamicWidgets.test.ts",
+    "packages/instantsearch-core/src/connectors/__tests__/connectHierarchicalMenu.test.ts",
+    "packages/instantsearch-core/src/connectors/__tests__/connectMenu.test.ts",
+    "packages/instantsearch-core/src/connectors/__tests__/connectRefinementList.test.ts",
     // this test has specific code for v4
     "packages/react-instantsearch-core/src/components/__tests__/InstantSearchSSRProvider.test.tsx",
     "packages/react-instantsearch-core/src/server/__tests__/getServerState.test.tsx",
     // test relies on v4, v3 and v5 at once
-    "packages/instantsearch.js/src/lib/utils/__tests__/getAppIdAndApiKey-test.ts"
+    "packages/instantsearch-core/src/lib/utils/__tests__/getAppIdAndApiKey.test.ts"
   ]
 }
diff --git a/yarn.lock b/yarn.lock
index d12510fca4..5360067780 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -198,10 +198,10 @@
     js-tokens "^4.0.0"
     picocolors "^1.0.0"
 
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.0", "@babel/compat-data@^7.15.0", "@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.1", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98"
-  integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.0", "@babel/compat-data@^7.15.0", "@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.1", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.25.9":
+  version "7.26.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.5.tgz#df93ac37f4417854130e21d72c66ff3d4b897fc7"
+  integrity sha512-XvcZi1KWf88RVbF9wn8MN6tYFloU5qX8KjuF3E1PVBmJ9eypXfs4GRiJwLuTZL0iSnJUKn1BFPa5BPZZJyFzPg==
 
 "@babel/core@7.15.5":
   version "7.15.5"
@@ -278,12 +278,12 @@
     "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^3.0.2"
 
-"@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
-  integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==
+"@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.22.5", "@babel/helper-annotate-as-pure@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz#d8eac4d2dc0d7b6e11fa6e535332e0d3184f06b4"
+  integrity sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.25.9"
 
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6":
   version "7.18.9"
@@ -294,29 +294,27 @@
     "@babel/types" "^7.18.9"
 
 "@babel/helper-compilation-targets@^7.10.4", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.16", "@babel/helper-compilation-targets@^7.15.4", "@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.23.6":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991"
-  integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz#55af025ce365be3cdc0c1c1e56c6af617ce88875"
+  integrity sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==
   dependencies:
-    "@babel/compat-data" "^7.23.5"
-    "@babel/helper-validator-option" "^7.23.5"
-    browserslist "^4.22.2"
+    "@babel/compat-data" "^7.25.9"
+    "@babel/helper-validator-option" "^7.25.9"
+    browserslist "^4.24.0"
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.20.5", "@babel/helper-create-class-features-plugin@^7.20.7", "@babel/helper-create-class-features-plugin@^7.22.9":
-  version "7.22.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.9.tgz#c36ea240bb3348f942f08b0fbe28d6d979fab236"
-  integrity sha512-Pwyi89uO4YrGKxL/eNJ8lfEH55DnRloGPOseaA8NFNL6jAUnn+KccaISiFazCj5IolPPDjGSdzQzXVzODVRqUQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-function-name" "^7.22.5"
-    "@babel/helper-member-expression-to-functions" "^7.22.5"
-    "@babel/helper-optimise-call-expression" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.9"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
+"@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.20.5", "@babel/helper-create-class-features-plugin@^7.20.7", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.22.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz#7644147706bb90ff613297d49ed5266bde729f83"
+  integrity sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.25.9"
+    "@babel/helper-member-expression-to-functions" "^7.25.9"
+    "@babel/helper-optimise-call-expression" "^7.25.9"
+    "@babel/helper-replace-supers" "^7.25.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
     semver "^6.3.1"
 
 "@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5":
@@ -394,12 +392,13 @@
   dependencies:
     "@babel/types" "^7.24.7"
 
-"@babel/helper-member-expression-to-functions@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz#0a7c56117cad3372fbf8d2fb4bf8f8d64a1e76b2"
-  integrity sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==
+"@babel/helper-member-expression-to-functions@^7.22.5", "@babel/helper-member-expression-to-functions@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz#9dfffe46f727005a5ea29051ac835fb735e4c1a3"
+  integrity sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/traverse" "^7.25.9"
+    "@babel/types" "^7.25.9"
 
 "@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.13.12", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.22.15":
   version "7.22.15"
@@ -419,17 +418,17 @@
     "@babel/helper-split-export-declaration" "^7.22.6"
     "@babel/helper-validator-identifier" "^7.22.20"
 
-"@babel/helper-optimise-call-expression@^7.18.6", "@babel/helper-optimise-call-expression@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e"
-  integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==
+"@babel/helper-optimise-call-expression@^7.18.6", "@babel/helper-optimise-call-expression@^7.22.5", "@babel/helper-optimise-call-expression@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz#3324ae50bae7e2ab3c33f60c9a877b6a0146b54e"
+  integrity sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.25.9"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
-  integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.25.9", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.26.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz#18580d00c9934117ad719392c4f6585c9333cc35"
+  integrity sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==
 
 "@babel/helper-remap-async-to-generator@^7.18.9":
   version "7.18.9"
@@ -441,14 +440,14 @@
     "@babel/helper-wrap-function" "^7.18.9"
     "@babel/types" "^7.18.9"
 
-"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7", "@babel/helper-replace-supers@^7.22.9":
-  version "7.22.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz#cbdc27d6d8d18cd22c81ae4293765a5d9afd0779"
-  integrity sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==
+"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7", "@babel/helper-replace-supers@^7.22.9", "@babel/helper-replace-supers@^7.25.9":
+  version "7.26.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.26.5.tgz#6cb04e82ae291dae8e72335dfe438b0725f14c8d"
+  integrity sha512-bJ6iIVdYX1YooY2X7w1q6VITt+LnUILtNk7zT78ykuwStx8BauCzxvFqFaHjOpW1bVnSUM1PN1f0p5P21wHxvg==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-member-expression-to-functions" "^7.22.5"
-    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/helper-member-expression-to-functions" "^7.25.9"
+    "@babel/helper-optimise-call-expression" "^7.25.9"
+    "@babel/traverse" "^7.26.5"
 
 "@babel/helper-simple-access@^7.22.5":
   version "7.22.5"
@@ -457,12 +456,13 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.20.0", "@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847"
-  integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==
+"@babel/helper-skip-transparent-expression-wrappers@^7.20.0", "@babel/helper-skip-transparent-expression-wrappers@^7.22.5", "@babel/helper-skip-transparent-expression-wrappers@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz#0b2e1b62d560d6b1954893fd2b705dc17c91f0c9"
+  integrity sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/traverse" "^7.25.9"
+    "@babel/types" "^7.25.9"
 
 "@babel/helper-split-export-declaration@^7.18.6", "@babel/helper-split-export-declaration@^7.22.6":
   version "7.22.6"
@@ -481,10 +481,10 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7"
   integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==
 
-"@babel/helper-validator-option@^7.14.5", "@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.22.5", "@babel/helper-validator-option@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307"
-  integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
+"@babel/helper-validator-option@^7.14.5", "@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.22.5", "@babel/helper-validator-option@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz#86e45bd8a49ab7e03f276577f96179653d41da72"
+  integrity sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==
 
 "@babel/helper-wrap-function@^7.18.9":
   version "7.20.5"
@@ -497,13 +497,12 @@
     "@babel/types" "^7.20.5"
 
 "@babel/helpers@^7.15.4", "@babel/helpers@^7.23.6", "@babel/helpers@^7.9.0":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.6.tgz#d03af2ee5fb34691eec0cda90f5ecbb4d4da145a"
-  integrity sha512-wCfsbN4nBidDRhpDhvcKlzHWCTlgJYUUdSJfzXb2NuBssDSIjc3xcb+znA7l+zYsFljAcGM0aFkN40cR3lXiGA==
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.26.0.tgz#30e621f1eba5aa45fe6f4868d2e9154d884119a4"
+  integrity sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==
   dependencies:
-    "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.23.6"
-    "@babel/types" "^7.23.6"
+    "@babel/template" "^7.25.9"
+    "@babel/types" "^7.26.0"
 
 "@babel/highlight@^7.0.0", "@babel/highlight@^7.10.4":
   version "7.23.4"
@@ -675,13 +674,13 @@
     "@babel/helper-create-class-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-private-property-in-object@^7.15.4", "@babel/plugin-proposal-private-property-in-object@^7.18.6":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.20.5.tgz#309c7668f2263f1c711aa399b5a9a6291eef6135"
-  integrity sha512-Vq7b9dUA12ByzB4EjQTPo25sFhY+08pQDBSZRtUAkj7lb7jahaHR5igera16QZ+3my1nYR4dKsNdYj5IjPHilQ==
+"@babel/plugin-proposal-private-property-in-object@7.21.11", "@babel/plugin-proposal-private-property-in-object@^7.15.4", "@babel/plugin-proposal-private-property-in-object@^7.18.6":
+  version "7.21.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz#69d597086b6760c4126525cfa154f34631ff272c"
+  integrity sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-create-class-features-plugin" "^7.20.5"
+    "@babel/helper-create-class-features-plugin" "^7.21.0"
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
@@ -778,11 +777,11 @@
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.2.0", "@babel/plugin-syntax-jsx@^7.22.5", "@babel/plugin-syntax-jsx@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz#8f2e4f8a9b5f9aa16067e142c1ac9cd9f810f473"
-  integrity sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz#a34313a178ea56f1951599b929c1ceacee719290"
+  integrity sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.10.4"
@@ -1583,12 +1582,12 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.0.0-beta.46", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.16.3", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2", "@babel/runtime@^7.9.6":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.7.tgz#fcb41a5a70550e04a7b708037c7c32f7f356d8fd"
-  integrity sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.0.0-beta.46", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.16.3", "@babel/runtime@^7.25.9", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2", "@babel/runtime@^7.9.6":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.0.tgz#8600c2f595f277c60815256418b85356a65173c1"
+  integrity sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==
   dependencies:
-    regenerator-runtime "^0.13.11"
+    regenerator-runtime "^0.14.0"
 
 "@babel/template@^7.0.0", "@babel/template@^7.15.4", "@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.22.15", "@babel/template@^7.25.9", "@babel/template@^7.3.3", "@babel/template@^7.4.0", "@babel/template@^7.8.6":
   version "7.25.9"
@@ -1599,7 +1598,7 @@
     "@babel/parser" "^7.25.9"
     "@babel/types" "^7.25.9"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.11.5", "@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4", "@babel/traverse@^7.20.5", "@babel/traverse@^7.23.3", "@babel/traverse@^7.23.6", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2", "@babel/traverse@^7.9.0":
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.11.5", "@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4", "@babel/traverse@^7.20.5", "@babel/traverse@^7.23.3", "@babel/traverse@^7.23.6", "@babel/traverse@^7.25.9", "@babel/traverse@^7.26.5", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2", "@babel/traverse@^7.9.0":
   version "7.26.5"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.26.5.tgz#6d0be3e772ff786456c1a37538208286f6e79021"
   integrity sha512-rkOSPOw+AXbgtwUga3U4u8RpoK9FEFWBNAlTpcnkLFjL5CT+oyHNuUUC/xx6XefEJ16r38r8Bc/lfp6rYuHeJQ==
@@ -1612,7 +1611,7 @@
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.3", "@babel/types@^7.23.4", "@babel/types@^7.23.6", "@babel/types@^7.24.7", "@babel/types@^7.25.9", "@babel/types@^7.26.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0":
+"@babel/types@^7.0.0", "@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.3", "@babel/types@^7.23.4", "@babel/types@^7.23.6", "@babel/types@^7.24.7", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.26.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0":
   version "7.26.5"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.5.tgz#7a1e1c01d28e26d1fe7f8ec9567b3b92b9d07747"
   integrity sha512-L6mZmwFDK6Cjh1nRCLXpa6no13ZIioJDz7mdkzHv399pThrTa/k0nUlNaenOeh2kWu/iaOQYElEpKPUswUa9Vg==
@@ -6370,11 +6369,6 @@
   resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.3.tgz#856c99cdc1551d22c22b18b5402719affec9839a"
   integrity sha512-cS5owqtwzLN5kY+l+KgKdRJ/Cee8tlmQoGQuIE9tWnSmS3JMKzmxo2HIAk2wODMifGwO20d62xZQLYz+RLfXmw==
 
-"@types/html-escaper@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/html-escaper/-/html-escaper-3.0.0.tgz#97d7df443c0fc86e3abdd0971f4814a58e3ca762"
-  integrity sha512-OcJcvP3Yk8mjYwf/IdXZtTE1tb/u0WF0qa29ER07ZHCYUBZXSN29Z1mBS+/96+kNMGTFUAbSz9X+pHmHpZrTCw==
-
 "@types/html-minifier-terser@^5.0.0":
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz#693b316ad323ea97eed6b38ed1a3cc02b1672b57"
@@ -10095,15 +10089,15 @@ browserslist@4.7.0:
     electron-to-chromium "^1.3.247"
     node-releases "^1.1.29"
 
-browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.1, browserslist@^4.21.4, browserslist@^4.22.2, browserslist@^4.3.4, browserslist@^4.5.4, browserslist@^4.6.0, browserslist@^4.6.4, browserslist@^4.6.6:
-  version "4.22.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.2.tgz#704c4943072bd81ea18997f3bd2180e89c77874b"
-  integrity sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==
+browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.1, browserslist@^4.21.4, browserslist@^4.24.0, browserslist@^4.3.4, browserslist@^4.5.4, browserslist@^4.6.0, browserslist@^4.6.4, browserslist@^4.6.6:
+  version "4.24.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.4.tgz#c6b2865a3f08bcb860a0e827389003b9fe686e4b"
+  integrity sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==
   dependencies:
-    caniuse-lite "^1.0.30001565"
-    electron-to-chromium "^1.4.601"
-    node-releases "^2.0.14"
-    update-browserslist-db "^1.0.13"
+    caniuse-lite "^1.0.30001688"
+    electron-to-chromium "^1.5.73"
+    node-releases "^2.0.19"
+    update-browserslist-db "^1.1.1"
 
 bs-logger@0.x:
   version "0.2.6"
@@ -10612,7 +10606,7 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001179, caniuse-lite@^1.0.30001228, caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001565, caniuse-lite@^1.0.30001579:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001179, caniuse-lite@^1.0.30001228, caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001579, caniuse-lite@^1.0.30001688:
   version "1.0.30001692"
   resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001692.tgz"
   integrity sha512-A95VKan0kdtrsnMubMKxEKUKImOPSuCpYgxSQBo036P5YYgVIcOYJEgt/txJWqObiRQeISNCfef9nvlQ0vbV7A==
@@ -13457,10 +13451,10 @@ ejs@^3.0.0, ejs@^3.0.1, ejs@^3.1.7:
   dependencies:
     jake "^10.8.5"
 
-electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.564, electron-to-chromium@^1.4.601:
-  version "1.4.609"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.609.tgz#5790a70aaa96de232501b56e14b64d17aff93988"
-  integrity sha512-ihiCP7PJmjoGNuLpl7TjNA8pCQWu09vGyjlPYw1Rqww4gvNuCcmvl+44G+2QyJ6S2K4o+wbTS++Xz0YN8Q9ERw==
+electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.564, electron-to-chromium@^1.5.73:
+  version "1.5.83"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.83.tgz#3f74078f0c83e24bf7e692eaa855a998d1bec34f"
+  integrity sha512-LcUDPqSt+V0QmI47XLzZrz5OqILSMGsPFkDYus22rIbgorSvBYEFqq854ltTmUdHkY92FSdAAvsh4jWEULMdfQ==
 
 element-resize-detector@^1.2.1:
   version "1.2.4"
@@ -13857,10 +13851,10 @@ esbuild@^0.19.3, esbuild@^0.19.6:
     "@esbuild/win32-ia32" "0.19.9"
     "@esbuild/win32-x64" "0.19.9"
 
-escalade@^3.0.2, escalade@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
-  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+escalade@^3.0.2, escalade@^3.1.1, escalade@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
+  integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
 
 escape-html@^1.0.3, escape-html@~1.0.3:
   version "1.0.3"
@@ -22702,10 +22696,10 @@ node-releases@^1.1.29, node-releases@^1.1.61:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.77.tgz#50b0cfede855dd374e7585bf228ff34e57c1c32e"
   integrity sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ==
 
-node-releases@^2.0.14:
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
-  integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
+node-releases@^2.0.19:
+  version "2.0.19"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.19.tgz#9e445a52950951ec4d177d843af370b411caf314"
+  integrity sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==
 
 node-res@^5.0.1:
   version "5.0.1"
@@ -24204,10 +24198,10 @@ picocolors@^0.2.1:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
   integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
 
-picocolors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
-  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+picocolors@^1.0.0, picocolors@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
+  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
 
 picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
@@ -26743,6 +26737,11 @@ regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.2, regenerator-runtime@^
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
   integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
 
+regenerator-runtime@^0.14.0:
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
+  integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
+
 regenerator-transform@^0.15.1:
   version "0.15.1"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz#f6c4e99fc1b4591f780db2586328e4d9a9d8dc56"
@@ -31242,13 +31241,13 @@ upath@^2.0.1:
   resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b"
   integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==
 
-update-browserslist-db@^1.0.13:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
-  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
+update-browserslist-db@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz#97e9c96ab0ae7bcac08e9ae5151d26e6bc6b5580"
+  integrity sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==
   dependencies:
-    escalade "^3.1.1"
-    picocolors "^1.0.0"
+    escalade "^3.2.0"
+    picocolors "^1.1.1"
 
 update-check@1.5.3:
   version "1.5.3"

From 448a00e15297cb9846177b35de9c20c5000a6239 Mon Sep 17 00:00:00 2001
From: Dhaya <154633+dhayab@users.noreply.github.com>
Date: Tue, 29 Oct 2024 09:58:52 +0100
Subject: [PATCH 11/37] feat(tests): remove ie11 targeting tests (#6415)

---
 .circleci/config.yml                            |  4 ++--
 tests/e2e/CONTRIBUTING.md                       |  6 +++---
 tests/e2e/all-flavors.spec.ts                   |  2 +-
 tests/e2e/flavors.js                            | 17 +++++------------
 tests/e2e/helpers/clickClearRefinements.ts      |  1 -
 tests/e2e/helpers/clickHierarchicalMenuItem.ts  |  1 -
 tests/e2e/helpers/clickNextPage.ts              |  1 -
 tests/e2e/helpers/clickPage.ts                  |  1 -
 tests/e2e/helpers/clickPreviousPage.ts          |  1 -
 tests/e2e/helpers/clickRatingMenuItem.ts        |  1 -
 tests/e2e/helpers/clickRefinementListItem.ts    |  1 -
 tests/e2e/helpers/clickToggleRefinement.ts      |  1 -
 .../e2e/helpers/dragRangeSliderLowerBoundTo.ts  |  1 -
 .../e2e/helpers/dragRangeSliderUpperBoundTo.ts  |  1 -
 tests/e2e/helpers/setHitsPerPage.ts             |  1 -
 tests/e2e/helpers/setSearchBoxValue.ts          |  3 ---
 tests/e2e/helpers/setSortByValue.ts             |  1 -
 tests/e2e/wdio.saucelabs.conf.js                | 17 -----------------
 18 files changed, 11 insertions(+), 50 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a1538e6971..8e3b04a7e8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -80,7 +80,7 @@ workflows:
             - examples
           matrix:
             parameters:
-              browser: [chrome, firefox, internet explorer]
+              browser: [chrome, firefox]
           filters:
             branches:
               only:
@@ -137,7 +137,7 @@ workflows:
             - examples
           matrix:
             parameters:
-              browser: [chrome, firefox, internet explorer]
+              browser: [chrome, firefox]
       - e2e tests router nextjs:
           context: fx-libraries
           requires:
diff --git a/tests/e2e/CONTRIBUTING.md b/tests/e2e/CONTRIBUTING.md
index 72151c4d76..222505a7ce 100644
--- a/tests/e2e/CONTRIBUTING.md
+++ b/tests/e2e/CONTRIBUTING.md
@@ -25,8 +25,8 @@ E2E_FLAVOR="react" yarn test:e2e
 When using the Sauce Labs service, tests are run on multiple browsers. To run a Sauce Labs test on a single browser, you can set the `E2E_BROWSER` environment variable:
 
 ```sh
-E2E_BROWSER="internet explorer" yarn test:e2e:saucelabs
-# Possible values: chrome, firefox, internet explorer
+E2E_BROWSER="firefox" yarn test:e2e:saucelabs
+# Possible values: chrome, firefox
 ```
 
 > [!NOTE]
@@ -106,7 +106,7 @@ function createBrandAndQueryFilteringTestSuite(flavor: string) {
 Here are some general guidelines when writing end-to-end tests:
 
 - Each separate step should be in its own `it` function. This isn't a hard rule, but it helps make the scenario more readable and properly [separate each action in Sauce Labs reports](https://user-images.githubusercontent.com/13209/62311104-56217d80-b48b-11e9-94dc-3c18b9ddc2af.png).
-- All actions on the browser are asynchronous, so be sure to always `await` them. **Never run multiple asynchronous commands in parallel as it can confuse some browsers (Internet Explorer)**.
+- All actions on the browser are asynchronous, so be sure to always `await` them. **Never run multiple asynchronous commands in parallel as it can confuse some browsers**.
 - Use [helper](#helpers) functions whenever possible, for readability but also for maintainability—if one widget is updated, we only have to updates its helpers without touching the tests.
 - Only assert what you want to see on the page after an action—for example, is the checkbox selected, is the result list correct, etc.
 - Only assert what you want to see on the page after an action (Is this checkbox selected? Is the result list correct? etc.)
diff --git a/tests/e2e/all-flavors.spec.ts b/tests/e2e/all-flavors.spec.ts
index 32a0c4e3f2..7ea3aa3fe5 100644
--- a/tests/e2e/all-flavors.spec.ts
+++ b/tests/e2e/all-flavors.spec.ts
@@ -5,7 +5,7 @@ import { createInitialStateFromRouteTestSuite } from './specs/initial-state-from
 import { createPaginationTestSuite } from './specs/pagination.spec';
 import { createPriceRangeTestSuite } from './specs/price-range.spec';
 
-getFilteredFlavors(browser).forEach((flavor) => {
+getFilteredFlavors().forEach((flavor) => {
   describe(`${flavor}`, () => {
     createBrandAndQueryTestSuite(flavor);
     createCategoryTestSuite(flavor);
diff --git a/tests/e2e/flavors.js b/tests/e2e/flavors.js
index 2c3bab6f95..b74fa8b18c 100644
--- a/tests/e2e/flavors.js
+++ b/tests/e2e/flavors.js
@@ -5,20 +5,13 @@ module.exports = {
   /**
    * Returns the list of flavors to be tested on.
    * When E2E_FLAVOR is set, it only tests the requested flavor.
-   * When it is not set, it will tests all flavors, except on Internet Explorer
-   * where it will only test the JS flavors.
+   * When it is not set, it will tests all flavors.
    *
-   * @param {import("webdriverio").BrowserObject} browser The WebdriverIO browser object
    * @returns The list of flavors to be tested on
    */
-  getFilteredFlavors(browser) {
-    return ALL_FLAVORS.filter(
-      !process.env.E2E_FLAVOR
-        ? (flavor) =>
-            browser.capabilities.browserName !== 'internet explorer'
-              ? true
-              : flavor.startsWith('js')
-        : (flavor) => flavor === process.env.E2E_FLAVOR
-    );
+  getFilteredFlavors() {
+    return process.env.E2E_FLAVOR
+      ? ALL_FLAVORS.filter((flavor) => flavor === process.env.E2E_FLAVOR)
+      : ALL_FLAVORS;
   },
 };
diff --git a/tests/e2e/helpers/clickClearRefinements.ts b/tests/e2e/helpers/clickClearRefinements.ts
index b93235100b..864a3d1094 100644
--- a/tests/e2e/helpers/clickClearRefinements.ts
+++ b/tests/e2e/helpers/clickClearRefinements.ts
@@ -14,7 +14,6 @@ browser.addCommand('clickClearRefinements', async () => {
 
   await browser.waitForElement(`.ais-ClearRefinements-button--disabled`);
 
-  // Changing the URL will also change the page element IDs in Internet Explorer
   // Not waiting for the URL to be properly updated before continuing can make the next tests fail
   await browser.waitUntil(
     async () => (await browser.getUrl()) !== oldUrl,
diff --git a/tests/e2e/helpers/clickHierarchicalMenuItem.ts b/tests/e2e/helpers/clickHierarchicalMenuItem.ts
index dfd3bd00ae..4cf4e7c16b 100644
--- a/tests/e2e/helpers/clickHierarchicalMenuItem.ts
+++ b/tests/e2e/helpers/clickHierarchicalMenuItem.ts
@@ -12,7 +12,6 @@ browser.addCommand('clickHierarchicalMenuItem', async (label: string) => {
 
   await item.click();
 
-  // Changing the URL will also change the page element IDs in Internet Explorer
   // Not waiting for the URL to be properly updated before continuing can make the next tests fail
   await browser.waitUntil(
     async () => (await browser.getUrl()) !== oldUrl,
diff --git a/tests/e2e/helpers/clickNextPage.ts b/tests/e2e/helpers/clickNextPage.ts
index a1550f1010..8544b744d1 100644
--- a/tests/e2e/helpers/clickNextPage.ts
+++ b/tests/e2e/helpers/clickNextPage.ts
@@ -19,7 +19,6 @@ browser.addCommand('clickNextPage', async () => {
     `.ais-Pagination-item--selected=${pageNumber + 1}`
   );
 
-  // Changing the URL will also change the page element IDs in Internet Explorer
   // Not waiting for the URL to be properly updated before continuing can make the next tests fail
   await browser.waitUntil(
     async () => (await browser.getUrl()) !== oldUrl,
diff --git a/tests/e2e/helpers/clickPage.ts b/tests/e2e/helpers/clickPage.ts
index 2d55662ff7..56544d12af 100644
--- a/tests/e2e/helpers/clickPage.ts
+++ b/tests/e2e/helpers/clickPage.ts
@@ -14,7 +14,6 @@ browser.addCommand('clickPage', async (number: number) => {
 
   await browser.waitForElement(`.ais-Pagination-item--selected=${number}`);
 
-  // Changing the URL will also change the page element IDs in Internet Explorer
   // Not waiting for the URL to be properly updated before continuing can make the next tests fail
   await browser.waitUntil(
     async () => (await browser.getUrl()) !== oldUrl,
diff --git a/tests/e2e/helpers/clickPreviousPage.ts b/tests/e2e/helpers/clickPreviousPage.ts
index 612d5be0bd..e74a1f74d3 100644
--- a/tests/e2e/helpers/clickPreviousPage.ts
+++ b/tests/e2e/helpers/clickPreviousPage.ts
@@ -19,7 +19,6 @@ browser.addCommand('clickPreviousPage', async () => {
     `.ais-Pagination-item--selected=${pageNumber - 1}`
   );
 
-  // Changing the URL will also change the page element IDs in Internet Explorer
   // Not waiting for the URL to be properly updated before continuing can make the next tests fail
   await browser.waitUntil(
     async () => (await browser.getUrl()) !== oldUrl,
diff --git a/tests/e2e/helpers/clickRatingMenuItem.ts b/tests/e2e/helpers/clickRatingMenuItem.ts
index b94755d08c..8071fbae9c 100644
--- a/tests/e2e/helpers/clickRatingMenuItem.ts
+++ b/tests/e2e/helpers/clickRatingMenuItem.ts
@@ -16,7 +16,6 @@ browser.addCommand('clickRatingMenuItem', async (label: string) => {
     `.ais-RatingMenu-item--selected .ais-RatingMenu-link[aria-label="${label}"]`
   );
 
-  // Changing the URL will also change the page element IDs in Internet Explorer
   // Not waiting for the URL to be properly updated before continuing can make the next tests fail
   await browser.waitUntil(
     async () => (await browser.getUrl()) !== oldUrl,
diff --git a/tests/e2e/helpers/clickRefinementListItem.ts b/tests/e2e/helpers/clickRefinementListItem.ts
index ab3b0d8a58..a46635f580 100644
--- a/tests/e2e/helpers/clickRefinementListItem.ts
+++ b/tests/e2e/helpers/clickRefinementListItem.ts
@@ -12,7 +12,6 @@ browser.addCommand('clickRefinementListItem', async (label: string) => {
 
   await item.click();
 
-  // Changing the URL will also change the page element IDs in Internet Explorer
   // Not waiting for the URL to be properly updated before continuing can make the next tests fail
   await browser.waitUntil(
     async () => (await browser.getUrl()) !== oldUrl,
diff --git a/tests/e2e/helpers/clickToggleRefinement.ts b/tests/e2e/helpers/clickToggleRefinement.ts
index 2b5b911064..1d64f1fab8 100644
--- a/tests/e2e/helpers/clickToggleRefinement.ts
+++ b/tests/e2e/helpers/clickToggleRefinement.ts
@@ -12,7 +12,6 @@ browser.addCommand('clickToggleRefinement', async () => {
 
   await checkbox.click();
 
-  // Changing the URL will also change the page element IDs in Internet Explorer
   // Not waiting for the URL to be properly updated before continuing can make the next tests fail
   await browser.waitUntil(
     async () => (await browser.getUrl()) !== oldUrl,
diff --git a/tests/e2e/helpers/dragRangeSliderLowerBoundTo.ts b/tests/e2e/helpers/dragRangeSliderLowerBoundTo.ts
index b6e2f3e7a1..afdd8800ca 100644
--- a/tests/e2e/helpers/dragRangeSliderLowerBoundTo.ts
+++ b/tests/e2e/helpers/dragRangeSliderLowerBoundTo.ts
@@ -39,7 +39,6 @@ browser.addCommand('dragRangeSliderLowerBoundTo', async (value: number) => {
 
   await browser.waitForElement(RANGE_SLIDER_HANDLE_SELECTOR);
 
-  // Changing the URL will also change the page element IDs in Internet Explorer
   // Not waiting for the URL to be properly updated before continuing can make the next tests fail
   await browser.waitUntil(
     async () => (await browser.getUrl()) !== oldUrl,
diff --git a/tests/e2e/helpers/dragRangeSliderUpperBoundTo.ts b/tests/e2e/helpers/dragRangeSliderUpperBoundTo.ts
index ea530c41a2..974c63b811 100644
--- a/tests/e2e/helpers/dragRangeSliderUpperBoundTo.ts
+++ b/tests/e2e/helpers/dragRangeSliderUpperBoundTo.ts
@@ -39,7 +39,6 @@ browser.addCommand('dragRangeSliderUpperBoundTo', async (value: number) => {
 
   await browser.waitForElement(RANGE_SLIDER_HANDLE_SELECTOR);
 
-  // Changing the URL will also change the page element IDs in Internet Explorer
   // Not waiting for the URL to be properly updated before continuing can make the next tests fail
   await browser.waitUntil(
     async () => (await browser.getUrl()) !== oldUrl,
diff --git a/tests/e2e/helpers/setHitsPerPage.ts b/tests/e2e/helpers/setHitsPerPage.ts
index 0fc9a49d88..ecf06490d6 100644
--- a/tests/e2e/helpers/setHitsPerPage.ts
+++ b/tests/e2e/helpers/setHitsPerPage.ts
@@ -10,7 +10,6 @@ browser.addCommand('setHitsPerPage', async (label: string) => {
 
   await hitsPerPage.selectByVisibleText(label);
 
-  // Changing the URL will also change the page element IDs in Internet Explorer
   // Not waiting for the URL to be properly updated before continuing can make the next tests fail
   await browser.waitUntil(
     async () => (await browser.getUrl()) !== oldUrl,
diff --git a/tests/e2e/helpers/setSearchBoxValue.ts b/tests/e2e/helpers/setSearchBoxValue.ts
index c50d946a7a..7cfc9e360a 100644
--- a/tests/e2e/helpers/setSearchBoxValue.ts
+++ b/tests/e2e/helpers/setSearchBoxValue.ts
@@ -18,11 +18,8 @@ browser.addCommand('setSearchBoxValue', async (value: string) => {
     await resetButton.click();
   }
 
-  // In Internet Explorer the input must be focused before updating its value
-  await searchBox.click();
   await searchBox.setValue(value);
 
-  // Changing the URL will also change the page element IDs in Internet Explorer
   // Not waiting for the URL to be properly updated before continuing can make the next tests fail
   await browser.waitUntil(
     async () => {
diff --git a/tests/e2e/helpers/setSortByValue.ts b/tests/e2e/helpers/setSortByValue.ts
index cc85282116..deaafd0042 100644
--- a/tests/e2e/helpers/setSortByValue.ts
+++ b/tests/e2e/helpers/setSortByValue.ts
@@ -10,7 +10,6 @@ browser.addCommand('setSortByValue', async (label: string) => {
 
   await sortBy.selectByVisibleText(label);
 
-  // Changing the URL will also change the page element IDs in Internet Explorer
   // Not waiting for the URL to be properly updated before continuing can make the next tests fail
   await browser.waitUntil(
     async () => (await browser.getUrl()) !== oldUrl,
diff --git a/tests/e2e/wdio.saucelabs.conf.js b/tests/e2e/wdio.saucelabs.conf.js
index 62ac0ed8f2..c855b7fa83 100644
--- a/tests/e2e/wdio.saucelabs.conf.js
+++ b/tests/e2e/wdio.saucelabs.conf.js
@@ -107,23 +107,6 @@ module.exports = {
         seleniumVersion: '3.11.0',
       },
     },
-    {
-      browserName: 'internet explorer',
-      browserVersion: '11',
-      platformName: 'Windows 10',
-      /*
-       * Sauce Labs specific options
-       * https://wiki.saucelabs.com/display/DOCS/Test+Configuration+Options
-       */
-      'sauce:options': {
-        screenResolution: '1680x1050',
-      },
-      'se:ieOptions': {
-        // Required for drag and drop to work
-        // https://stackoverflow.com/questions/14299392/selenium-webdriver-draganddrop-for-ie9
-        requireWindowFocus: true,
-      },
-    },
   ].filter(
     !process.env.E2E_BROWSER
       ? Boolean

From f9e9d394014ad885137449119763abe0c3f1dd4c Mon Sep 17 00:00:00 2001
From: Aymeric Giraudet <aymeric.giraudet@algolia.com>
Date: Tue, 5 Nov 2024 11:33:20 +0100
Subject: [PATCH 12/37] feat(babel): upgrade and set newer browser targets
 (#6422)

* feat(babel): upgrade and set newer browser targets

* fix @babel/traverse security issue

* remove unused babel plugin

* dedupe lockfile

* add babel to vue-instantsearch

* exclude helper docs from eslint rule

---------

Co-authored-by: Haroen Viaene <hello@haroen.me>
---
 .eslintrc.js                                  |   27 +-
 babel.config.js                               |   42 +-
 examples/js/algolia-experiences/package.json  |    2 +-
 examples/js/calendar-widget/package.json      |    2 +-
 examples/js/e-commerce-umd/package.json       |    2 +-
 examples/js/e-commerce/package.json           |    2 +-
 examples/js/getting-started/package.json      |    2 +-
 examples/js/media/package.json                |    2 +-
 examples/js/tourism/package.json              |    2 +-
 examples/react/react-native/package.json      |    2 +-
 examples/react/ssr/package.json               |   10 +-
 package.json                                  |   33 +-
 packages/algolia-experiences/package.json     |    2 +-
 packages/algolia-experiences/src/render.tsx   |   38 +-
 .../src/lib/public/isEqual.ts                 |    2 -
 .../instantsearch-ui-components/package.json  |    2 +-
 packages/instantsearch.js/package.json        |    2 +-
 .../lib/templating/prepareTemplateProps.ts    |    9 +-
 .../react-instantsearch-core/package.json     |    2 +-
 packages/vue-instantsearch/package.json       |    3 +-
 packages/vue-instantsearch/rollup.config.js   |   41 +-
 yarn.lock                                     | 2649 +++++++++--------
 22 files changed, 1577 insertions(+), 1301 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 6f26cdb9c8..8faebfa40b 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -215,21 +215,11 @@ const config = {
       rules: {
         'no-restricted-syntax': [
           'error',
-          {
-            selector: '[async=true]',
-            message:
-              'The polyfill for async/await is very large, which is why we use promise chains',
-          },
           {
             selector: 'ForInStatement',
             message:
               'for..in loops iterate over the entire prototype chain, which is virtually never what you want. Use Object.{keys,values,entries}, and iterate over the resulting array.',
           },
-          {
-            selector: 'ForOfStatement',
-            message:
-              'iterators/generators require regenerator-runtime, which is too heavyweight for this guide to allow them. Separately, loops should be avoided in favor of array iterations.',
-          },
           {
             selector: 'LabeledStatement',
             message:
@@ -243,6 +233,23 @@ const config = {
         ],
       },
     },
+    {
+      files: 'packages/**/*',
+      excludedFiles: [
+        '*.test.*',
+        '**/__tests__/**',
+        '**/stories/**',
+        'packages/algoliasearch-helper/documentation-src/**',
+      ],
+      plugins: ['compat'],
+      extends: ['plugin:compat/recommended'],
+      env: {
+        browser: true,
+      },
+      settings: {
+        lintAllEsApis: true,
+      },
+    },
     // Disable stricter rules introduced for the next versions of the libraries.
     {
       files: [
diff --git a/babel.config.js b/babel.config.js
index 5a012f0f56..7e00e0f109 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -18,7 +18,7 @@ module.exports = (api) => {
   if (isTest) {
     targets.node = true;
   } else {
-    targets.browsers = ['last 2 versions', 'ie >= 9'];
+    targets.browsers = require('./package.json').browserslist;
   }
 
   const testPlugins = [
@@ -61,46 +61,6 @@ module.exports = (api) => {
         ],
       },
     ],
-    // this plugin is used to test if we need polyfills, not to actually insert them
-    // only UMD, since cjs & esm have false positives due to imports
-    isUMD && [
-      'polyfill-es-shims',
-      {
-        method: 'usage-global',
-        targets: {
-          ie: 11,
-        },
-        shouldInjectPolyfill(name, defaultShouldInject) {
-          const exclude = [
-            // false positives (we access these from objects only)
-            'Array.prototype.item',
-            'String.prototype.item',
-            'Array.prototype.values',
-            'Function.prototype.name',
-
-            // we require polyfills for this already
-            'Array.prototype.includes',
-
-            // false positive (babel doesn't know types)
-            // this is actually only called on arrays
-            'String.prototype.includes',
-
-            // false positive (spread)
-            'Object.getOwnPropertyDescriptors',
-
-            // @TODO: see when we remove IE11 support
-            'Object.fromEntries',
-            'Object.entries',
-          ];
-          if (defaultShouldInject && !exclude.includes(name)) {
-            throw new Error(
-              `Usage of a builtin which isn't allowed to be polyfilled: ${name}`
-            );
-          }
-          return false;
-        },
-      },
-    ],
   ]);
 
   return {
diff --git a/examples/js/algolia-experiences/package.json b/examples/js/algolia-experiences/package.json
index 4a360758ac..adef0717e9 100644
--- a/examples/js/algolia-experiences/package.json
+++ b/examples/js/algolia-experiences/package.json
@@ -13,7 +13,7 @@
     "instantsearch.css": "8.5.1"
   },
   "devDependencies": {
-    "@babel/core": "7.15.5",
+    "@babel/core": "7.25.9",
     "@parcel/core": "2.10.0",
     "@parcel/packager-raw-url": "2.10.0",
     "@parcel/transformer-webmanifest": "2.10.0",
diff --git a/examples/js/calendar-widget/package.json b/examples/js/calendar-widget/package.json
index d644397e30..4b50356a6d 100644
--- a/examples/js/calendar-widget/package.json
+++ b/examples/js/calendar-widget/package.json
@@ -13,7 +13,7 @@
     "instantsearch.js": "4.77.3"
   },
   "devDependencies": {
-    "@babel/core": "7.15.5",
+    "@babel/core": "7.25.9",
     "@parcel/packager-raw-url": "2.10.0",
     "@parcel/transformer-webmanifest": "2.10.0",
     "parcel": "2.10.0"
diff --git a/examples/js/e-commerce-umd/package.json b/examples/js/e-commerce-umd/package.json
index ff1fa451c7..fc6758ecfe 100644
--- a/examples/js/e-commerce-umd/package.json
+++ b/examples/js/e-commerce-umd/package.json
@@ -14,7 +14,7 @@
     "instantsearch.js": "4.77.3"
   },
   "devDependencies": {
-    "@babel/core": "7.15.5",
+    "@babel/core": "7.25.9",
     "@parcel/core": "2.10.0",
     "@parcel/packager-raw-url": "2.10.0",
     "@parcel/transformer-webmanifest": "2.10.0",
diff --git a/examples/js/e-commerce/package.json b/examples/js/e-commerce/package.json
index 5ad8f37478..37e35b39d6 100644
--- a/examples/js/e-commerce/package.json
+++ b/examples/js/e-commerce/package.json
@@ -14,7 +14,7 @@
     "instantsearch.js": "4.77.3"
   },
   "devDependencies": {
-    "@babel/core": "7.15.5",
+    "@babel/core": "7.25.9",
     "@parcel/core": "2.10.0",
     "@parcel/packager-raw-url": "2.10.0",
     "@parcel/transformer-webmanifest": "2.10.0",
diff --git a/examples/js/getting-started/package.json b/examples/js/getting-started/package.json
index c5330fbd91..7ab0f80943 100644
--- a/examples/js/getting-started/package.json
+++ b/examples/js/getting-started/package.json
@@ -14,7 +14,7 @@
     "instantsearch.js": "4.77.3"
   },
   "devDependencies": {
-    "@babel/core": "7.15.5",
+    "@babel/core": "7.25.9",
     "@parcel/core": "2.10.0",
     "@parcel/packager-raw-url": "2.10.0",
     "@parcel/transformer-webmanifest": "2.10.0",
diff --git a/examples/js/media/package.json b/examples/js/media/package.json
index 8b1f7c50f5..afe6d4976b 100644
--- a/examples/js/media/package.json
+++ b/examples/js/media/package.json
@@ -15,7 +15,7 @@
     "instantsearch.js": "4.77.3"
   },
   "devDependencies": {
-    "@babel/core": "7.15.5",
+    "@babel/core": "7.25.9",
     "@parcel/core": "2.10.0",
     "@parcel/packager-raw-url": "2.10.0",
     "@parcel/transformer-webmanifest": "2.10.0",
diff --git a/examples/js/tourism/package.json b/examples/js/tourism/package.json
index ee30c5f8ff..abb470c585 100644
--- a/examples/js/tourism/package.json
+++ b/examples/js/tourism/package.json
@@ -13,7 +13,7 @@
     "instantsearch.js": "4.77.3"
   },
   "devDependencies": {
-    "@babel/core": "7.15.5",
+    "@babel/core": "7.25.9",
     "@parcel/core": "2.10.0",
     "@parcel/packager-raw-url": "2.10.0",
     "@parcel/transformer-webmanifest": "2.10.0",
diff --git a/examples/react/react-native/package.json b/examples/react/react-native/package.json
index 368ef965cb..00329c397b 100644
--- a/examples/react/react-native/package.json
+++ b/examples/react/react-native/package.json
@@ -21,7 +21,7 @@
     "react-native-web": "0.17.1"
   },
   "devDependencies": {
-    "@babel/core": "7.15.5",
+    "@babel/core": "7.25.9",
     "@types/react": "~17.0.21",
     "@types/react-native": "~0.64.12",
     "expo-cli": "5.1.1",
diff --git a/examples/react/ssr/package.json b/examples/react/ssr/package.json
index 4462636124..540b177192 100644
--- a/examples/react/ssr/package.json
+++ b/examples/react/ssr/package.json
@@ -9,13 +9,13 @@
     "build": "webpack --mode=production"
   },
   "devDependencies": {
-    "@babel/core": "7.15.5",
-    "@babel/polyfill": "7.4.4",
-    "@babel/preset-env": "7.4.5",
-    "@babel/preset-react": "7.0.0",
+    "@babel/core": "7.25.9",
+    "@babel/polyfill": "7.12.1",
+    "@babel/preset-env": "7.25.9",
+    "@babel/preset-react": "7.25.9",
     "babel-core": "6.26.3",
     "babel-jest": "24.9.0",
-    "babel-loader": "8.2.2",
+    "babel-loader": "9.2.1",
     "nodemon": "1.19.3",
     "webpack": "4.47.0",
     "webpack-cli": "3.3.7",
diff --git a/package.json b/package.json
index dc744927b4..a9307fa1da 100644
--- a/package.json
+++ b/package.json
@@ -41,16 +41,17 @@
   "devDependencies": {
     "@algolia/client-common": "5.1.1",
     "@algolia/client-search": "5.1.1",
-    "@babel/cli": "7.15.4",
-    "@babel/core": "7.15.5",
-    "@babel/plugin-proposal-class-properties": "7.14.5",
+    "@babel/cli": "7.26.4",
+    "@babel/code-frame": "7.26.2",
+    "@babel/core": "7.26.0",
+    "@babel/plugin-proposal-class-properties": "7.18.6",
     "@babel/plugin-proposal-private-property-in-object": "7.21.11",
     "@babel/plugin-syntax-dynamic-import": "7.8.3",
-    "@babel/plugin-transform-react-constant-elements": "7.9.0",
-    "@babel/plugin-transform-runtime": "7.15.0",
-    "@babel/preset-env": "7.15.6",
-    "@babel/preset-react": "7.14.5",
-    "@babel/preset-typescript": "7.15.0",
+    "@babel/plugin-transform-react-constant-elements": "7.25.9",
+    "@babel/plugin-transform-runtime": "7.25.9",
+    "@babel/preset-env": "7.26.0",
+    "@babel/preset-react": "7.26.3",
+    "@babel/preset-typescript": "7.26.0",
     "@googlemaps/jest-mocks": "2.7.5",
     "@microsoft/api-extractor": "7.45.1",
     "@storybook/addon-actions": "5.3.9",
@@ -92,7 +93,6 @@
     "babel-eslint": "10.1.0",
     "babel-jest": "27.4.6",
     "babel-plugin-inline-replace-variables": "1.3.1",
-    "babel-plugin-polyfill-es-shims": "0.0.7",
     "babel-plugin-transform-react-pure-class-to-function": "1.0.1",
     "babel-plugin-transform-react-remove-prop-types": "0.4.24",
     "babel-preset-vue": "2.0.2",
@@ -103,6 +103,7 @@
     "eslint-config-algolia": "16.0.0",
     "eslint-config-prettier": "6.15.0",
     "eslint-import-resolver-typescript": "2.5.0",
+    "eslint-plugin-compat": "6.0.1",
     "eslint-plugin-deprecation": "1.3.2",
     "eslint-plugin-eslint-comments": "3.2.0",
     "eslint-plugin-import": "2.24.2",
@@ -129,10 +130,10 @@
     "react-dom": "19.0.0",
     "react-test-renderer": "19.0.0",
     "rheostat": "2.2.0",
-    "rollup": "1.29.1",
-    "rollup-plugin-babel": "4.3.3",
+    "rollup": "4.24.0",
+    "rollup-plugin-babel": "4.4.0",
     "rollup-plugin-commonjs": "10.1.0",
-    "rollup-plugin-filesize": "6.2.1",
+    "rollup-plugin-filesize": "10.0.0",
     "rollup-plugin-node-globals": "1.4.0",
     "rollup-plugin-node-resolve": "5.2.0",
     "rollup-plugin-replace": "2.2.0",
@@ -146,5 +147,11 @@
     "brotli-size": "4.0.0",
     "webpack": "4.47.0",
     "babel-loader": "8.2.2"
-  }
+  },
+  "browserslist": [
+    "chrome >= 60",
+    "firefox >= 55",
+    "safari >= 12.2",
+    "not op_mini all"
+  ]
 }
diff --git a/packages/algolia-experiences/package.json b/packages/algolia-experiences/package.json
index 4581510761..2087898ccf 100644
--- a/packages/algolia-experiences/package.json
+++ b/packages/algolia-experiences/package.json
@@ -17,6 +17,6 @@
     "@instantsearch/testutils": "1.59.0"
   },
   "scripts": {
-    "build": "rollup -c rollup.config.js"
+    "build": "rollup -c rollup.config.js --bundleConfigAsCjs"
   }
 }
diff --git a/packages/algolia-experiences/src/render.tsx b/packages/algolia-experiences/src/render.tsx
index 1d90d70924..1010bdb1a3 100644
--- a/packages/algolia-experiences/src/render.tsx
+++ b/packages/algolia-experiences/src/render.tsx
@@ -201,17 +201,14 @@ function blockToWidget(child: Block, container: HTMLElement): Widget[] {
                 children = ch.children.map(renderChild);
               }
 
-              const attributes = Object.fromEntries(
-                Object.entries(ch.parameters)
-                  .filter(
-                    (tuple): tuple is [string, TemplateAttribute] =>
-                      tuple[0] !== 'text'
-                  )
-                  .map(([key, value]) => [
-                    key,
-                    value.map((item) => renderAttribute(item, hit)).join(''),
-                  ])
-              );
+              const attributes: Record<string, string> = {};
+              for (const [key, value] of Object.entries(ch.parameters)) {
+                if (key !== 'text') {
+                  attributes[key] = (value as TemplateAttribute)
+                    .map((item) => renderAttribute(item, hit))
+                    .join('');
+                }
+              }
 
               return <Tag {...attributes}>{children}</Tag>;
             }
@@ -257,17 +254,14 @@ function blockToWidget(child: Block, container: HTMLElement): Widget[] {
                 children = ch.children.map(renderChild);
               }
 
-              const attributes = Object.fromEntries(
-                Object.entries(ch.parameters)
-                  .filter(
-                    (tuple): tuple is [string, TemplateAttribute] =>
-                      tuple[0] !== 'text'
-                  )
-                  .map(([key, value]) => [
-                    key,
-                    value.map((item) => renderAttribute(item, hit)).join(''),
-                  ])
-              );
+              const attributes: Record<string, string> = {};
+              for (const [key, value] of Object.entries(ch.parameters)) {
+                if (key !== 'text') {
+                  attributes[key] = (value as TemplateAttribute)
+                    .map((item) => renderAttribute(item, hit))
+                    .join('');
+                }
+              }
 
               return <Tag {...attributes}>{children}</Tag>;
             }
diff --git a/packages/instantsearch-core/src/lib/public/isEqual.ts b/packages/instantsearch-core/src/lib/public/isEqual.ts
index e5b72b3914..3883689c0c 100644
--- a/packages/instantsearch-core/src/lib/public/isEqual.ts
+++ b/packages/instantsearch-core/src/lib/public/isEqual.ts
@@ -20,8 +20,6 @@ export function isEqual(first: any, second: any): boolean {
     return false;
   }
 
-  // @TODO avoid for..of because of the large polyfill
-  // eslint-disable-next-line no-restricted-syntax
   for (const key of Object.keys(first)) {
     if (!(key in second)) {
       return false;
diff --git a/packages/instantsearch-ui-components/package.json b/packages/instantsearch-ui-components/package.json
index ba4e474bcb..510a0249db 100644
--- a/packages/instantsearch-ui-components/package.json
+++ b/packages/instantsearch-ui-components/package.json
@@ -47,6 +47,6 @@
     "watch:es": "yarn --silent build:es:base --watch"
   },
   "dependencies": {
-    "@babel/runtime": "^7.1.2"
+    "@babel/runtime": "^7.25.9"
   }
 }
diff --git a/packages/instantsearch.js/package.json b/packages/instantsearch.js/package.json
index b986d1dfc3..04f211d99c 100644
--- a/packages/instantsearch.js/package.json
+++ b/packages/instantsearch.js/package.json
@@ -39,7 +39,7 @@
   },
   "scripts": {
     "build": "yarn run build:cjs && yarn run build:es && yarn run build:umd && yarn run build:types",
-    "build:umd": "rm -rf dist && BABEL_ENV=umd rollup --config ./scripts/rollup/rollup.config.js",
+    "build:umd": "rm -rf dist && BABEL_ENV=umd rollup --config ./scripts/rollup/rollup.config.js --bundleConfigAsCjs",
     "build:cjs": "rm -rf cjs && BABEL_ENV=cjs babel --root-mode upward src --extensions '.js,.ts,.tsx' --out-dir cjs/ --ignore 'src/index.es.ts','**/__tests__','**/__mocks__' --quiet",
     "build:es:base": "BABEL_ENV=es babel --root-mode upward src --extensions '.js,.ts,.tsx' --out-dir es/ --ignore 'src/index.es.ts','**/__tests__','**/__mocks__'",
     "build:es": "rm -rf es && yarn build:es:base --quiet && BABEL_ENV=es babel --root-mode upward src/index.es.ts --out-file es/index.js --quiet && echo '{\"type\":\"module\",\"sideEffects\":false}' > es/package.json",
diff --git a/packages/instantsearch.js/src/lib/templating/prepareTemplateProps.ts b/packages/instantsearch.js/src/lib/templating/prepareTemplateProps.ts
index b652606b9c..ba299c0f30 100644
--- a/packages/instantsearch.js/src/lib/templating/prepareTemplateProps.ts
+++ b/packages/instantsearch.js/src/lib/templating/prepareTemplateProps.ts
@@ -14,9 +14,12 @@ export function prepareTemplateProps<TTemplates extends Templates>({
   defaultTemplates: TTemplates;
   templates?: Partial<TTemplates>;
 }): PreparedTemplateProps<TTemplates> {
-  const filteredTemplates = Object.fromEntries(
-    Object.entries(templates || {}).filter(([, value]) => Boolean(value))
-  );
+  const filteredTemplates: Templates = {};
+  for (const [key, value] of Object.entries(templates || {})) {
+    if (value) {
+      filteredTemplates[key] = value;
+    }
+  }
 
   return { templates: { ...defaultTemplates, ...filteredTemplates } };
 }
diff --git a/packages/react-instantsearch-core/package.json b/packages/react-instantsearch-core/package.json
index a9c667717d..e4eb1615ea 100644
--- a/packages/react-instantsearch-core/package.json
+++ b/packages/react-instantsearch-core/package.json
@@ -48,7 +48,7 @@
     "watch:es": "yarn --silent build:es:base --watch"
   },
   "dependencies": {
-    "@babel/runtime": "^7.1.2",
+    "@babel/runtime": "^7.25.9",
     "algoliasearch-helper": "3.24.1",
     "instantsearch-core": "0.1.0",
     "use-sync-external-store": "^1.0.0"
diff --git a/packages/vue-instantsearch/package.json b/packages/vue-instantsearch/package.json
index 633e8f50df..be696db8da 100644
--- a/packages/vue-instantsearch/package.json
+++ b/packages/vue-instantsearch/package.json
@@ -55,7 +55,7 @@
     }
   },
   "devDependencies": {
-    "@babel/core": "7.15.5",
+    "@babel/core": "7.25.9",
     "@storybook/vue": "5.3.9",
     "@vue/compiler-sfc": "3.2.47",
     "@vue/server-renderer": "3.2.47",
@@ -66,7 +66,6 @@
     "instantsearch.css": "8.5.1",
     "rollup": "1.32.1",
     "rollup-plugin-babel": "4.4.0",
-    "rollup-plugin-buble": "0.19.6",
     "rollup-plugin-commonjs": "10.0.1",
     "rollup-plugin-filesize": "9.0.0",
     "rollup-plugin-json": "3.1.0",
diff --git a/packages/vue-instantsearch/rollup.config.js b/packages/vue-instantsearch/rollup.config.js
index d81e289ded..5df198f443 100644
--- a/packages/vue-instantsearch/rollup.config.js
+++ b/packages/vue-instantsearch/rollup.config.js
@@ -1,7 +1,6 @@
 import path from 'path';
 
 import babel from 'rollup-plugin-babel';
-import buble from 'rollup-plugin-buble';
 import commonjs from 'rollup-plugin-commonjs';
 import filesize from 'rollup-plugin-filesize';
 import json from 'rollup-plugin-json';
@@ -52,13 +51,26 @@ function outputs(vueVersion) {
 
   const plugins = [
     vuePlugin({ compileTemplate: true, css: false }),
+    babel({
+      exclude: /node_modules|algoliasearch-helper/,
+      extensions: ['.js', '.jsx', '.es6', '.es', '.mjs', '.vue'],
+      rootMode: 'upward',
+      runtimeHelpers: true,
+      plugins: [
+        [
+          require('../../scripts/babel/extension-resolver'),
+          {
+            // For verification, see test/module/packages-are-es-modules.mjs
+            modulesToResolve: [
+              // InstantSearch.js/es is an ES Module, so needs complete paths,
+              'instantsearch.js',
+            ],
+          },
+        ],
+      ],
+    }),
     commonjs(),
     json(),
-    buble({
-      transforms: {
-        dangerousForOf: true,
-      },
-    }),
     replace(processEnv({ NODE_ENV: 'production' })),
     aliasVueCompat(vueVersion),
     terser({
@@ -122,23 +134,6 @@ export * from './src/instantsearch.js';`
         'package.json',
         JSON.stringify({ type: 'module', sideEffects: true })
       ),
-      babel({
-        exclude: /node_modules|algoliasearch-helper/,
-        extensions: ['.js', '.jsx', '.es6', '.es', '.mjs', '.vue'],
-        babelrc: false,
-        plugins: [
-          [
-            require('../../scripts/babel/extension-resolver'),
-            {
-              // For verification, see test/module/packages-are-es-modules.mjs
-              modulesToResolve: [
-                // InstantSearch.js/es is an ES Module, so needs complete paths,
-                'instantsearch.js',
-              ],
-            },
-          ],
-        ],
-      }),
     ],
   };
 
diff --git a/yarn.lock b/yarn.lock
index 5360067780..c04b8d607e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -159,21 +159,21 @@
     is-wsl "^3.0.0"
     which-pm-runs "^1.1.0"
 
-"@babel/cli@7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.15.4.tgz#00e21e192b738dec7900c8bb36270e377217c0a4"
-  integrity sha512-9RhhQ7tgKRcSO/jI3rNLxalLSk30cHqeM8bb+nGOJTyYBDpkoXw/A9QHZ2SYjlslAt4tr90pZQGIEobwWHSIDw==
+"@babel/cli@7.26.4":
+  version "7.26.4"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.26.4.tgz#4101ff8ee5de8447a6c395397a97921056411d20"
+  integrity sha512-+mORf3ezU3p3qr+82WvJSnQNE1GAYeoCfEv4fik6B5/2cvKZ75AX8oawWQdXtM9MmndooQj15Jr9kelRFWsuRw==
   dependencies:
-    commander "^4.0.1"
-    convert-source-map "^1.1.0"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    commander "^6.2.0"
+    convert-source-map "^2.0.0"
     fs-readdir-recursive "^1.1.0"
-    glob "^7.0.0"
+    glob "^7.2.0"
     make-dir "^2.1.0"
     slash "^2.0.0"
-    source-map "^0.5.0"
   optionalDependencies:
-    "@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents.2"
-    chokidar "^3.4.0"
+    "@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents.3"
+    chokidar "^3.6.0"
 
 "@babel/code-frame@7.10.4", "@babel/code-frame@~7.10.4":
   version "7.10.4"
@@ -182,6 +182,15 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
+"@babel/code-frame@7.26.2", "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.0", "@babel/code-frame@^7.26.2", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3":
+  version "7.26.2"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85"
+  integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.25.9"
+    js-tokens "^4.0.0"
+    picocolors "^1.0.0"
+
 "@babel/code-frame@7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d"
@@ -189,40 +198,52 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.23.5", "@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.2", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3":
-  version "7.26.2"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85"
-  integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==
+"@babel/compat-data@^7.14.0", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.25.9", "@babel/compat-data@^7.26.0":
+  version "7.26.3"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.3.tgz#99488264a56b2aded63983abd6a417f03b92ed02"
+  integrity sha512-nHIxvKPniQXpmQLb0vhY3VaFb3S0YrTAwpOWJZh1wn3oJPjJk9Asva204PsBdmAE8vpzfHudT8DB0scYvy9q0g==
+
+"@babel/core@7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.25.9.tgz#855a4cddcec4158f3f7afadacdab2a7de8af7434"
+  integrity sha512-WYvQviPw+Qyib0v92AwNIrdLISTp7RfDkM7bPqBvpbnhY4wq8HvHBZREVdYDXk98C8BkOIVnHAY3yvj7AVISxQ==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.25.9"
-    js-tokens "^4.0.0"
-    picocolors "^1.0.0"
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.25.9"
+    "@babel/generator" "^7.25.9"
+    "@babel/helper-compilation-targets" "^7.25.9"
+    "@babel/helper-module-transforms" "^7.25.9"
+    "@babel/helpers" "^7.25.9"
+    "@babel/parser" "^7.25.9"
+    "@babel/template" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
+    "@babel/types" "^7.25.9"
+    convert-source-map "^2.0.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.3"
+    semver "^6.3.1"
 
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.0", "@babel/compat-data@^7.15.0", "@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.1", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.25.9":
-  version "7.26.5"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.5.tgz#df93ac37f4417854130e21d72c66ff3d4b897fc7"
-  integrity sha512-XvcZi1KWf88RVbF9wn8MN6tYFloU5qX8KjuF3E1PVBmJ9eypXfs4GRiJwLuTZL0iSnJUKn1BFPa5BPZZJyFzPg==
-
-"@babel/core@7.15.5":
-  version "7.15.5"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.5.tgz#f8ed9ace730722544609f90c9bb49162dc3bf5b9"
-  integrity sha512-pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg==
-  dependencies:
-    "@babel/code-frame" "^7.14.5"
-    "@babel/generator" "^7.15.4"
-    "@babel/helper-compilation-targets" "^7.15.4"
-    "@babel/helper-module-transforms" "^7.15.4"
-    "@babel/helpers" "^7.15.4"
-    "@babel/parser" "^7.15.5"
-    "@babel/template" "^7.15.4"
-    "@babel/traverse" "^7.15.4"
-    "@babel/types" "^7.15.4"
-    convert-source-map "^1.7.0"
+"@babel/core@7.26.0", "@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.1.6", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.14.0", "@babel/core@^7.23.3", "@babel/core@^7.7.2", "@babel/core@^7.8.0":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.26.0.tgz#d78b6023cc8f3114ccf049eb219613f74a747b40"
+  integrity sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==
+  dependencies:
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.26.0"
+    "@babel/generator" "^7.26.0"
+    "@babel/helper-compilation-targets" "^7.25.9"
+    "@babel/helper-module-transforms" "^7.26.0"
+    "@babel/helpers" "^7.26.0"
+    "@babel/parser" "^7.26.0"
+    "@babel/template" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
+    "@babel/types" "^7.26.0"
+    convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
-    json5 "^2.1.2"
-    semver "^6.3.0"
-    source-map "^0.5.0"
+    json5 "^2.2.3"
+    semver "^6.3.1"
 
 "@babel/core@7.9.0":
   version "7.9.0"
@@ -246,28 +267,7 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.1.6", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.14.0", "@babel/core@^7.23.3", "@babel/core@^7.7.2", "@babel/core@^7.8.0":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.6.tgz#8be77cd77c55baadcc1eae1c33df90ab6d2151d4"
-  integrity sha512-FxpRyGjrMJXh7X3wGLGhNDCRiwpWEF74sKjTLDJSG5Kyvow3QZaG0Adbqzi9ZrVjTWpsX+2cxWXD71NMg93kdw==
-  dependencies:
-    "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.23.5"
-    "@babel/generator" "^7.23.6"
-    "@babel/helper-compilation-targets" "^7.23.6"
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helpers" "^7.23.6"
-    "@babel/parser" "^7.23.6"
-    "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.23.6"
-    "@babel/types" "^7.23.6"
-    convert-source-map "^2.0.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.2.3"
-    semver "^6.3.1"
-
-"@babel/generator@^7.15.4", "@babel/generator@^7.23.3", "@babel/generator@^7.23.6", "@babel/generator@^7.26.5", "@babel/generator@^7.4.0", "@babel/generator@^7.5.0", "@babel/generator@^7.7.2", "@babel/generator@^7.9.0":
+"@babel/generator@^7.23.3", "@babel/generator@^7.25.9", "@babel/generator@^7.26.0", "@babel/generator@^7.26.5", "@babel/generator@^7.4.0", "@babel/generator@^7.5.0", "@babel/generator@^7.7.2", "@babel/generator@^7.9.0":
   version "7.26.5"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.5.tgz#e44d4ab3176bbcaf78a5725da5f1dc28802a9458"
   integrity sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==
@@ -278,22 +278,22 @@
     "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^3.0.2"
 
-"@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.22.5", "@babel/helper-annotate-as-pure@^7.25.9":
+"@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.25.9":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz#d8eac4d2dc0d7b6e11fa6e535332e0d3184f06b4"
   integrity sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==
   dependencies:
     "@babel/types" "^7.25.9"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb"
-  integrity sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.9.tgz#f41752fe772a578e67286e6779a68a5a92de1ee9"
+  integrity sha512-C47lC7LIDCnz0h4vai/tpNOI95tCd5ZT3iBt/DBH5lXKHZsyNQv18yf1wIIg2ntiQNgmAvA+DgZ82iW8Qdym8g==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.18.6"
-    "@babel/types" "^7.18.9"
+    "@babel/traverse" "^7.25.9"
+    "@babel/types" "^7.25.9"
 
-"@babel/helper-compilation-targets@^7.10.4", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.16", "@babel/helper-compilation-targets@^7.15.4", "@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.23.6":
+"@babel/helper-compilation-targets@^7.13.16", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.25.9":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz#55af025ce365be3cdc0c1c1e56c6af617ce88875"
   integrity sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==
@@ -304,7 +304,7 @@
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.20.5", "@babel/helper-create-class-features-plugin@^7.20.7", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.22.9":
+"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.20.7", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.25.9":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz#7644147706bb90ff613297d49ed5266bde729f83"
   integrity sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==
@@ -317,82 +317,32 @@
     "@babel/traverse" "^7.25.9"
     semver "^6.3.1"
 
-"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.20.5.tgz#5ea79b59962a09ec2acf20a963a01ab4d076ccca"
-  integrity sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    regexpu-core "^5.2.1"
-
-"@babel/helper-define-polyfill-provider@^0.0.5":
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.0.5.tgz#a800224db85c562db2f31a1a6fe6e93d25b7b8d1"
-  integrity sha512-SjyoYnKgK5fXyIx9X5Fa02cCXJtkp17t0iQeSv0cKu3/rDhcA2DszStwx3ugFy+mdZeTm24ZwlDU1n3/LSN6Cg==
-  dependencies:
-    "@babel/helper-compilation-targets" "^7.10.4"
-    "@babel/helper-module-imports" "^7.10.4"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/traverse" "^7.11.5"
-    debug "^4.1.1"
-    lodash.debounce "^4.0.8"
-    resolve "^1.14.2"
-    semver "^6.1.2"
-
-"@babel/helper-define-polyfill-provider@^0.2.2":
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz#0525edec5094653a282688d34d846e4c75e9c0b6"
-  integrity sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==
+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.9.tgz#3e8999db94728ad2b2458d7a470e7770b7764e26"
+  integrity sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.13.0"
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/traverse" "^7.13.0"
-    debug "^4.1.1"
-    lodash.debounce "^4.0.8"
-    resolve "^1.14.2"
-    semver "^6.1.2"
+    "@babel/helper-annotate-as-pure" "^7.25.9"
+    regexpu-core "^6.1.1"
+    semver "^6.3.1"
 
-"@babel/helper-define-polyfill-provider@^0.3.3":
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a"
-  integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==
+"@babel/helper-define-polyfill-provider@^0.6.2":
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz#18594f789c3594acb24cfdb4a7f7b7d2e8bd912d"
+  integrity sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.17.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-compilation-targets" "^7.22.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
     debug "^4.1.1"
     lodash.debounce "^4.0.8"
     resolve "^1.14.2"
-    semver "^6.1.2"
 
-"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.22.20", "@babel/helper-environment-visitor@^7.22.5":
+"@babel/helper-environment-visitor@^7.18.9":
   version "7.22.20"
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
   integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
 
-"@babel/helper-explode-assignable-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096"
-  integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0", "@babel/helper-function-name@^7.22.5":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
-  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
-  dependencies:
-    "@babel/template" "^7.22.15"
-    "@babel/types" "^7.23.0"
-
-"@babel/helper-hoist-variables@^7.18.6":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz#b4ede1cde2fd89436397f30dc9376ee06b0f25ee"
-  integrity sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==
-  dependencies:
-    "@babel/types" "^7.24.7"
-
-"@babel/helper-member-expression-to-functions@^7.22.5", "@babel/helper-member-expression-to-functions@^7.25.9":
+"@babel/helper-member-expression-to-functions@^7.25.9":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz#9dfffe46f727005a5ea29051ac835fb735e4c1a3"
   integrity sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==
@@ -400,63 +350,62 @@
     "@babel/traverse" "^7.25.9"
     "@babel/types" "^7.25.9"
 
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.13.12", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0"
-  integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.13.12", "@babel/helper-module-imports@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz#e7f8d20602ebdbf9ebbea0a0751fb0f2a4141715"
+  integrity sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==
   dependencies:
-    "@babel/types" "^7.22.15"
+    "@babel/traverse" "^7.25.9"
+    "@babel/types" "^7.25.9"
 
-"@babel/helper-module-transforms@^7.15.4", "@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6", "@babel/helper-module-transforms@^7.20.7", "@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.23.3", "@babel/helper-module-transforms@^7.9.0":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
-  integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
+"@babel/helper-module-transforms@^7.25.9", "@babel/helper-module-transforms@^7.26.0", "@babel/helper-module-transforms@^7.9.0":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz#8ce54ec9d592695e58d84cd884b7b5c6a2fdeeae"
+  integrity sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-module-imports" "^7.22.15"
-    "@babel/helper-simple-access" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-module-imports" "^7.25.9"
+    "@babel/helper-validator-identifier" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
 
-"@babel/helper-optimise-call-expression@^7.18.6", "@babel/helper-optimise-call-expression@^7.22.5", "@babel/helper-optimise-call-expression@^7.25.9":
+"@babel/helper-optimise-call-expression@^7.25.9":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz#3324ae50bae7e2ab3c33f60c9a877b6a0146b54e"
   integrity sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==
   dependencies:
     "@babel/types" "^7.25.9"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.25.9", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.26.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz#18580d00c9934117ad719392c4f6585c9333cc35"
-  integrity sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.25.9", "@babel/helper-plugin-utils@^7.8.0":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz#9cbdd63a9443a2c92a725cca7ebca12cc8dd9f46"
+  integrity sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==
 
-"@babel/helper-remap-async-to-generator@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519"
-  integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==
+"@babel/helper-remap-async-to-generator@^7.18.9", "@babel/helper-remap-async-to-generator@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz#e53956ab3d5b9fb88be04b3e2f31b523afd34b92"
+  integrity sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-wrap-function" "^7.18.9"
-    "@babel/types" "^7.18.9"
+    "@babel/helper-annotate-as-pure" "^7.25.9"
+    "@babel/helper-wrap-function" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
 
-"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7", "@babel/helper-replace-supers@^7.22.9", "@babel/helper-replace-supers@^7.25.9":
-  version "7.26.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.26.5.tgz#6cb04e82ae291dae8e72335dfe438b0725f14c8d"
-  integrity sha512-bJ6iIVdYX1YooY2X7w1q6VITt+LnUILtNk7zT78ykuwStx8BauCzxvFqFaHjOpW1bVnSUM1PN1f0p5P21wHxvg==
+"@babel/helper-replace-supers@^7.20.7", "@babel/helper-replace-supers@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz#ba447224798c3da3f8713fc272b145e33da6a5c5"
+  integrity sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==
   dependencies:
     "@babel/helper-member-expression-to-functions" "^7.25.9"
     "@babel/helper-optimise-call-expression" "^7.25.9"
-    "@babel/traverse" "^7.26.5"
+    "@babel/traverse" "^7.25.9"
 
-"@babel/helper-simple-access@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
-  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
+"@babel/helper-simple-access@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.25.9.tgz#6d51783299884a2c74618d6ef0f86820ec2e7739"
+  integrity sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/traverse" "^7.25.9"
+    "@babel/types" "^7.25.9"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.20.0", "@babel/helper-skip-transparent-expression-wrappers@^7.22.5", "@babel/helper-skip-transparent-expression-wrappers@^7.25.9":
+"@babel/helper-skip-transparent-expression-wrappers@^7.20.0", "@babel/helper-skip-transparent-expression-wrappers@^7.25.9":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz#0b2e1b62d560d6b1954893fd2b705dc17c91f0c9"
   integrity sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==
@@ -464,39 +413,38 @@
     "@babel/traverse" "^7.25.9"
     "@babel/types" "^7.25.9"
 
-"@babel/helper-split-export-declaration@^7.18.6", "@babel/helper-split-export-declaration@^7.22.6":
-  version "7.22.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
-  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
+"@babel/helper-split-export-declaration@^7.18.6":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz#83949436890e07fa3d6873c61a96e3bbf692d856"
+  integrity sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.24.7"
 
 "@babel/helper-string-parser@^7.25.9":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c"
   integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==
 
-"@babel/helper-validator-identifier@^7.19.1", "@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.25.9":
+"@babel/helper-validator-identifier@^7.25.9":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7"
   integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==
 
-"@babel/helper-validator-option@^7.14.5", "@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.22.5", "@babel/helper-validator-option@^7.25.9":
+"@babel/helper-validator-option@^7.22.5", "@babel/helper-validator-option@^7.25.9":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz#86e45bd8a49ab7e03f276577f96179653d41da72"
   integrity sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==
 
-"@babel/helper-wrap-function@^7.18.9":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz#75e2d84d499a0ab3b31c33bcfe59d6b8a45f62e3"
-  integrity sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==
+"@babel/helper-wrap-function@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz#d99dfd595312e6c894bd7d237470025c85eea9d0"
+  integrity sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==
   dependencies:
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.20.5"
-    "@babel/types" "^7.20.5"
+    "@babel/template" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
+    "@babel/types" "^7.25.9"
 
-"@babel/helpers@^7.15.4", "@babel/helpers@^7.23.6", "@babel/helpers@^7.9.0":
+"@babel/helpers@^7.25.9", "@babel/helpers@^7.26.0", "@babel/helpers@^7.9.0":
   version "7.26.0"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.26.0.tgz#30e621f1eba5aa45fe6f4868d2e9154d884119a4"
   integrity sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==
@@ -505,38 +453,62 @@
     "@babel/types" "^7.26.0"
 
 "@babel/highlight@^7.0.0", "@babel/highlight@^7.10.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b"
-  integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.25.9.tgz#8141ce68fc73757946f983b343f1231f4691acc6"
+  integrity sha512-llL88JShoCsth8fF8R4SJnIn+WLvR6ccFxu1H3FlMhDontdcmZWf2HgIZ7AIqV3Xcck1idlohrN4EUBQz6klbw==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-validator-identifier" "^7.25.9"
     chalk "^2.4.2"
     js-tokens "^4.0.0"
+    picocolors "^1.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.13.16", "@babel/parser@^7.14.7", "@babel/parser@^7.15.5", "@babel/parser@^7.16.4", "@babel/parser@^7.18.4", "@babel/parser@^7.20.15", "@babel/parser@^7.20.7", "@babel/parser@^7.23.3", "@babel/parser@^7.23.6", "@babel/parser@^7.25.9", "@babel/parser@^7.26.5", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0":
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.13.16", "@babel/parser@^7.14.7", "@babel/parser@^7.16.4", "@babel/parser@^7.18.4", "@babel/parser@^7.20.15", "@babel/parser@^7.20.7", "@babel/parser@^7.23.3", "@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.5", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.9.0":
   version "7.26.5"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.5.tgz#6fec9aebddef25ca57a935c86dbb915ae2da3e1f"
   integrity sha512-SRJ4jYmXRqV1/Xc+TIVG84WjHBXKlxO9sHQnA2Pf12QQEAp1LOh6kDzNHXcUnbH1QI0FDoPPVOt+vyUDucxpaw==
   dependencies:
     "@babel/types" "^7.26.5"
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
-  integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==
+"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz#cc2e53ebf0a0340777fff5ed521943e253b4d8fe"
+  integrity sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.15.4", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz#d9c85589258539a22a901033853101a6198d4ef1"
-  integrity sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==
+"@babel/plugin-bugfix-safari-class-field-initializer-scope@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz#af9e4fb63ccb8abcb92375b2fcfe36b60c774d30"
+  integrity sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.20.7"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-proposal-async-generator-functions@^7.15.4", "@babel/plugin-proposal-async-generator-functions@^7.2.0", "@babel/plugin-proposal-async-generator-functions@^7.20.1":
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz#e8dc26fcd616e6c5bf2bd0d5a2c151d4f92a9137"
+  integrity sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.25.9"
+
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz#807a667f9158acac6f6164b4beb85ad9ebc9e1d1"
+  integrity sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9"
+    "@babel/plugin-transform-optional-chaining" "^7.25.9"
+
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz#de7093f1e7deaf68eadd7cc6b07f2ab82543269e"
+  integrity sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
+
+"@babel/plugin-proposal-async-generator-functions@^7.2.0":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326"
   integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==
@@ -546,15 +518,7 @@
     "@babel/helper-remap-async-to-generator" "^7.18.9"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-class-properties@7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz#40d1ee140c5b1e31a350f4f5eed945096559b42e"
-  integrity sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.14.5"
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-proposal-class-properties@^7.0.0", "@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.14.5", "@babel/plugin-proposal-class-properties@^7.18.6", "@babel/plugin-proposal-class-properties@^7.7.0":
+"@babel/plugin-proposal-class-properties@7.18.6", "@babel/plugin-proposal-class-properties@^7.0.0", "@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.7.0":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
   integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
@@ -562,15 +526,6 @@
     "@babel/helper-create-class-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-class-static-block@^7.15.4", "@babel/plugin-proposal-class-static-block@^7.18.6":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.20.7.tgz#92592e9029b13b15be0f7ce6a7aedc2879ca45a7"
-  integrity sha512-AveGOoi9DAjUYYuUAG//Ig69GlazLnoyzMw68VCDux+c1tsnnH/OkYcpz/5xzMkEFC6UxjR5Gw1c+iY2wOGVeQ==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.20.7"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
-
 "@babel/plugin-proposal-decorators@^7.1.0", "@babel/plugin-proposal-decorators@^7.12.9", "@babel/plugin-proposal-decorators@^7.13.15":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.20.7.tgz#05d37453c2ce818f3e47bbeda9468c8de947eecc"
@@ -582,14 +537,6 @@
     "@babel/helper-split-export-declaration" "^7.18.6"
     "@babel/plugin-syntax-decorators" "^7.19.0"
 
-"@babel/plugin-proposal-dynamic-import@^7.14.5", "@babel/plugin-proposal-dynamic-import@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94"
-  integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-
 "@babel/plugin-proposal-export-default-from@^7.0.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.2.0.tgz#737b0da44b9254b6152fe29bb99c64e5691f6f68"
@@ -598,15 +545,7 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-export-default-from" "^7.2.0"
 
-"@babel/plugin-proposal-export-namespace-from@^7.14.5", "@babel/plugin-proposal-export-namespace-from@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203"
-  integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-
-"@babel/plugin-proposal-json-strings@^7.14.5", "@babel/plugin-proposal-json-strings@^7.18.6", "@babel/plugin-proposal-json-strings@^7.2.0":
+"@babel/plugin-proposal-json-strings@^7.2.0":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b"
   integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==
@@ -614,15 +553,7 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-proposal-logical-assignment-operators@^7.14.5", "@babel/plugin-proposal-logical-assignment-operators@^7.18.9":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83"
-  integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.0.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.1.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8", "@babel/plugin-proposal-nullish-coalescing-operator@^7.14.5", "@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6":
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.0.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.1.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
   integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
@@ -630,15 +561,7 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-proposal-numeric-separator@^7.14.5", "@babel/plugin-proposal-numeric-separator@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
-  integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-
-"@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.15.6", "@babel/plugin-proposal-object-rest-spread@^7.20.2", "@babel/plugin-proposal-object-rest-spread@^7.3.4", "@babel/plugin-proposal-object-rest-spread@^7.4.4", "@babel/plugin-proposal-object-rest-spread@^7.6.2":
+"@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.3.4", "@babel/plugin-proposal-object-rest-spread@^7.6.2":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a"
   integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==
@@ -649,7 +572,7 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
     "@babel/plugin-transform-parameters" "^7.20.7"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.0.0", "@babel/plugin-proposal-optional-catch-binding@^7.14.5", "@babel/plugin-proposal-optional-catch-binding@^7.18.6", "@babel/plugin-proposal-optional-catch-binding@^7.2.0":
+"@babel/plugin-proposal-optional-catch-binding@^7.0.0", "@babel/plugin-proposal-optional-catch-binding@^7.2.0":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb"
   integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==
@@ -657,7 +580,7 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.0.0", "@babel/plugin-proposal-optional-chaining@^7.1.0", "@babel/plugin-proposal-optional-chaining@^7.13.12", "@babel/plugin-proposal-optional-chaining@^7.14.5", "@babel/plugin-proposal-optional-chaining@^7.18.9", "@babel/plugin-proposal-optional-chaining@^7.20.7":
+"@babel/plugin-proposal-optional-chaining@^7.0.0", "@babel/plugin-proposal-optional-chaining@^7.1.0", "@babel/plugin-proposal-optional-chaining@^7.13.12":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.20.7.tgz#49f2b372519ab31728cc14115bb0998b15bfda55"
   integrity sha512-T+A7b1kfjtRM51ssoOfS1+wbyCVqorfyZhT99TvxxLMirPShD8CzKMRepMlCBGM5RpHMbn8s+5MMHnPstJH6mQ==
@@ -666,7 +589,7 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.13.0", "@babel/plugin-proposal-private-methods@^7.14.5", "@babel/plugin-proposal-private-methods@^7.18.6":
+"@babel/plugin-proposal-private-methods@^7.13.0":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea"
   integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==
@@ -674,7 +597,12 @@
     "@babel/helper-create-class-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-private-property-in-object@7.21.11", "@babel/plugin-proposal-private-property-in-object@^7.15.4", "@babel/plugin-proposal-private-property-in-object@^7.18.6":
+"@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
+  version "7.21.0-placeholder-for-preset-env.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703"
+  integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==
+
+"@babel/plugin-proposal-private-property-in-object@7.21.11":
   version "7.21.11"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz#69d597086b6760c4126525cfa154f34631ff272c"
   integrity sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==
@@ -684,7 +612,7 @@
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.14.5", "@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.2.0", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+"@babel/plugin-proposal-unicode-property-regex@^7.2.0":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e"
   integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
@@ -706,20 +634,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-class-properties@^7.0.0", "@babel/plugin-syntax-class-properties@^7.12.13", "@babel/plugin-syntax-class-properties@^7.8.3":
+"@babel/plugin-syntax-class-properties@^7.0.0", "@babel/plugin-syntax-class-properties@^7.8.3":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
   integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-syntax-class-static-block@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
-  integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
 "@babel/plugin-syntax-decorators@^7.19.0":
   version "7.19.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.19.0.tgz#5f13d1d8fce96951bea01a10424463c9a5b3a599"
@@ -727,7 +648,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.19.0"
 
-"@babel/plugin-syntax-dynamic-import@7.8.3", "@babel/plugin-syntax-dynamic-import@^7.0.0", "@babel/plugin-syntax-dynamic-import@^7.2.0", "@babel/plugin-syntax-dynamic-import@^7.8.3":
+"@babel/plugin-syntax-dynamic-import@7.8.3", "@babel/plugin-syntax-dynamic-import@^7.0.0", "@babel/plugin-syntax-dynamic-import@^7.2.0":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
   integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
@@ -741,13 +662,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-export-namespace-from@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
-  integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-syntax-flow@^7.0.0", "@babel/plugin-syntax-flow@^7.2.0", "@babel/plugin-syntax-flow@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.22.5.tgz#163b820b9e7696ce134df3ee716d9c0c98035859"
@@ -755,12 +669,19 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-syntax-import-assertions@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4"
-  integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==
+"@babel/plugin-syntax-import-assertions@^7.25.9", "@babel/plugin-syntax-import-assertions@^7.26.0":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz#620412405058efa56e4a564903b79355020f445f"
+  integrity sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-plugin-utils" "^7.25.9"
+
+"@babel/plugin-syntax-import-attributes@^7.25.9", "@babel/plugin-syntax-import-attributes@^7.26.0":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz#3b1412847699eea739b4f2602c74ce36f6b0b0f7"
+  integrity sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.25.9"
 
 "@babel/plugin-syntax-import-meta@^7.8.3":
   version "7.10.4"
@@ -776,14 +697,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.2.0", "@babel/plugin-syntax-jsx@^7.22.5", "@babel/plugin-syntax-jsx@^7.23.3":
+"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.2.0", "@babel/plugin-syntax-jsx@^7.25.9":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz#a34313a178ea56f1951599b929c1ceacee719290"
   integrity sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
+"@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
   integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
@@ -797,7 +718,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-numeric-separator@^7.10.4", "@babel/plugin-syntax-numeric-separator@^7.8.3":
+"@babel/plugin-syntax-numeric-separator@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
   integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
@@ -832,102 +753,154 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-top-level-await@^7.14.5", "@babel/plugin-syntax-top-level-await@^7.8.3":
+"@babel/plugin-syntax-top-level-await@^7.8.3":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
   integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-typescript@^7.22.5", "@babel/plugin-syntax-typescript@^7.7.2":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz#aac8d383b062c5072c647a31ef990c1d0af90272"
-  integrity sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==
+"@babel/plugin-syntax-typescript@^7.25.9", "@babel/plugin-syntax-typescript@^7.7.2":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz#67dda2b74da43727cf21d46cf9afef23f4365399"
+  integrity sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-arrow-functions@^7.0.0", "@babel/plugin-transform-arrow-functions@^7.14.5", "@babel/plugin-transform-arrow-functions@^7.18.6", "@babel/plugin-transform-arrow-functions@^7.2.0":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz#bea332b0e8b2dab3dafe55a163d8227531ab0551"
-  integrity sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==
+"@babel/plugin-syntax-unicode-sets-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz#d49a3b3e6b52e5be6740022317580234a6a47357"
+  integrity sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-async-to-generator@^7.14.5", "@babel/plugin-transform-async-to-generator@^7.18.6", "@babel/plugin-transform-async-to-generator@^7.3.4", "@babel/plugin-transform-async-to-generator@^7.4.4":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz#dfee18623c8cb31deb796aa3ca84dda9cea94354"
-  integrity sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==
+"@babel/plugin-transform-arrow-functions@^7.0.0", "@babel/plugin-transform-arrow-functions@^7.2.0", "@babel/plugin-transform-arrow-functions@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz#7821d4410bee5daaadbb4cdd9a6649704e176845"
+  integrity sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==
   dependencies:
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-remap-async-to-generator" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-block-scoped-functions@^7.0.0", "@babel/plugin-transform-block-scoped-functions@^7.14.5", "@babel/plugin-transform-block-scoped-functions@^7.18.6", "@babel/plugin-transform-block-scoped-functions@^7.2.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8"
-  integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==
+"@babel/plugin-transform-async-generator-functions@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.9.tgz#1b18530b077d18a407c494eb3d1d72da505283a2"
+  integrity sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-remap-async-to-generator" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
 
-"@babel/plugin-transform-block-scoping@^7.0.0", "@babel/plugin-transform-block-scoping@^7.15.3", "@babel/plugin-transform-block-scoping@^7.20.2", "@babel/plugin-transform-block-scoping@^7.3.4", "@babel/plugin-transform-block-scoping@^7.4.4":
-  version "7.20.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.8.tgz#ad142bce04ae32225e2379ca54f06d5cea92fdb8"
-  integrity sha512-ztBCIWJvcWJvtxhMqIrItLmGlbxaa/5hl7HlZvV4f9oS08wWn/mEtf5D35qxFp3rTK8KjV9TePEoeal8z02gzA==
+"@babel/plugin-transform-async-to-generator@^7.25.9", "@babel/plugin-transform-async-to-generator@^7.3.4":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz#c80008dacae51482793e5a9c08b39a5be7e12d71"
+  integrity sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-module-imports" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-remap-async-to-generator" "^7.25.9"
 
-"@babel/plugin-transform-classes@^7.0.0", "@babel/plugin-transform-classes@^7.15.4", "@babel/plugin-transform-classes@^7.20.2", "@babel/plugin-transform-classes@^7.3.4", "@babel/plugin-transform-classes@^7.4.4":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.7.tgz#f438216f094f6bb31dc266ebfab8ff05aecad073"
-  integrity sha512-LWYbsiXTPKl+oBlXUGlwNlJZetXD5Am+CyBdqhPsDVjM9Jc8jwBJFrKhHf900Kfk2eZG1y9MAG3UNajol7A4VQ==
+"@babel/plugin-transform-block-scoped-functions@^7.0.0", "@babel/plugin-transform-block-scoped-functions@^7.2.0", "@babel/plugin-transform-block-scoped-functions@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.9.tgz#5700691dbd7abb93de300ca7be94203764fce458"
+  integrity sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-compilation-targets" "^7.20.7"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-replace-supers" "^7.20.7"
-    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.25.9"
+
+"@babel/plugin-transform-block-scoping@^7.0.0", "@babel/plugin-transform-block-scoping@^7.25.9", "@babel/plugin-transform-block-scoping@^7.3.4":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz#c33665e46b06759c93687ca0f84395b80c0473a1"
+  integrity sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.25.9"
+
+"@babel/plugin-transform-class-properties@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz#a8ce84fedb9ad512549984101fa84080a9f5f51f"
+  integrity sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+
+"@babel/plugin-transform-class-static-block@^7.25.9", "@babel/plugin-transform-class-static-block@^7.26.0":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz#6c8da219f4eb15cae9834ec4348ff8e9e09664a0"
+  integrity sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+
+"@babel/plugin-transform-classes@^7.0.0", "@babel/plugin-transform-classes@^7.25.9", "@babel/plugin-transform-classes@^7.3.4":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz#7152457f7880b593a63ade8a861e6e26a4469f52"
+  integrity sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.25.9"
+    "@babel/helper-compilation-targets" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-replace-supers" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.0.0", "@babel/plugin-transform-computed-properties@^7.14.5", "@babel/plugin-transform-computed-properties@^7.18.9", "@babel/plugin-transform-computed-properties@^7.2.0":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz#704cc2fd155d1c996551db8276d55b9d46e4d0aa"
-  integrity sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==
+"@babel/plugin-transform-computed-properties@^7.0.0", "@babel/plugin-transform-computed-properties@^7.2.0", "@babel/plugin-transform-computed-properties@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz#db36492c78460e534b8852b1d5befe3c923ef10b"
+  integrity sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/template" "^7.20.7"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/template" "^7.25.9"
 
-"@babel/plugin-transform-destructuring@^7.0.0", "@babel/plugin-transform-destructuring@^7.14.7", "@babel/plugin-transform-destructuring@^7.2.0", "@babel/plugin-transform-destructuring@^7.20.2", "@babel/plugin-transform-destructuring@^7.4.4":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.7.tgz#8bda578f71620c7de7c93af590154ba331415454"
-  integrity sha512-Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA==
+"@babel/plugin-transform-destructuring@^7.0.0", "@babel/plugin-transform-destructuring@^7.2.0", "@babel/plugin-transform-destructuring@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz#966ea2595c498224340883602d3cfd7a0c79cea1"
+  integrity sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-dotall-regex@^7.14.5", "@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.2.0", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8"
-  integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==
+"@babel/plugin-transform-dotall-regex@^7.2.0", "@babel/plugin-transform-dotall-regex@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz#bad7945dd07734ca52fe3ad4e872b40ed09bb09a"
+  integrity sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-duplicate-keys@^7.14.5", "@babel/plugin-transform-duplicate-keys@^7.18.9", "@babel/plugin-transform-duplicate-keys@^7.2.0":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e"
-  integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==
+"@babel/plugin-transform-duplicate-keys@^7.2.0", "@babel/plugin-transform-duplicate-keys@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz#8850ddf57dce2aebb4394bb434a7598031059e6d"
+  integrity sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-exponentiation-operator@^7.0.0", "@babel/plugin-transform-exponentiation-operator@^7.14.5", "@babel/plugin-transform-exponentiation-operator@^7.18.6", "@babel/plugin-transform-exponentiation-operator@^7.2.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd"
-  integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==
+"@babel/plugin-transform-duplicate-named-capturing-groups-regex@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz#6f7259b4de127721a08f1e5165b852fcaa696d31"
+  integrity sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+
+"@babel/plugin-transform-dynamic-import@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz#23e917de63ed23c6600c5dd06d94669dce79f7b8"
+  integrity sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.25.9"
+
+"@babel/plugin-transform-exponentiation-operator@^7.0.0", "@babel/plugin-transform-exponentiation-operator@^7.2.0", "@babel/plugin-transform-exponentiation-operator@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.9.tgz#ece47b70d236c1d99c263a1e22b62dc20a4c8b0f"
+  integrity sha512-KRhdhlVk2nObA5AYa7QMgTMTVJdfHprfpAk4DjZVtllqRg9qarilstTKEhpVjyt+Npi8ThRyiV8176Am3CodPA==
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+
+"@babel/plugin-transform-export-namespace-from@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz#90745fe55053394f554e40584cda81f2c8a402a2"
+  integrity sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.25.9"
 
 "@babel/plugin-transform-flow-strip-types@^7.0.0", "@babel/plugin-transform-flow-strip-types@^7.22.5":
   version "7.22.5"
@@ -937,85 +910,114 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-flow" "^7.22.5"
 
-"@babel/plugin-transform-for-of@^7.0.0", "@babel/plugin-transform-for-of@^7.15.4", "@babel/plugin-transform-for-of@^7.18.8", "@babel/plugin-transform-for-of@^7.2.0", "@babel/plugin-transform-for-of@^7.4.4":
-  version "7.18.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz#6ef8a50b244eb6a0bdbad0c7c61877e4e30097c1"
-  integrity sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==
+"@babel/plugin-transform-for-of@^7.0.0", "@babel/plugin-transform-for-of@^7.2.0", "@babel/plugin-transform-for-of@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.9.tgz#4bdc7d42a213397905d89f02350c5267866d5755"
+  integrity sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9"
 
-"@babel/plugin-transform-function-name@^7.0.0", "@babel/plugin-transform-function-name@^7.14.5", "@babel/plugin-transform-function-name@^7.18.9", "@babel/plugin-transform-function-name@^7.2.0", "@babel/plugin-transform-function-name@^7.4.4":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0"
-  integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==
+"@babel/plugin-transform-function-name@^7.0.0", "@babel/plugin-transform-function-name@^7.2.0", "@babel/plugin-transform-function-name@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz#939d956e68a606661005bfd550c4fc2ef95f7b97"
+  integrity sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-compilation-targets" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
 
-"@babel/plugin-transform-literals@^7.0.0", "@babel/plugin-transform-literals@^7.14.5", "@babel/plugin-transform-literals@^7.18.9", "@babel/plugin-transform-literals@^7.2.0":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc"
-  integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==
+"@babel/plugin-transform-json-strings@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz#c86db407cb827cded902a90c707d2781aaa89660"
+  integrity sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-member-expression-literals@^7.0.0", "@babel/plugin-transform-member-expression-literals@^7.14.5", "@babel/plugin-transform-member-expression-literals@^7.18.6", "@babel/plugin-transform-member-expression-literals@^7.2.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e"
-  integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==
+"@babel/plugin-transform-literals@^7.0.0", "@babel/plugin-transform-literals@^7.2.0", "@babel/plugin-transform-literals@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz#1a1c6b4d4aa59bc4cad5b6b3a223a0abd685c9de"
+  integrity sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-modules-amd@^7.14.5", "@babel/plugin-transform-modules-amd@^7.19.6", "@babel/plugin-transform-modules-amd@^7.2.0":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.7.tgz#1e5cfeb4e5f9b392e86f85698896336b442f8760"
-  integrity sha512-+1IVLD+dHOzRZWNFFSoyPZz4ffsVmOP+OhhjeahLKpU97v/52LcCb9RabRl5eHM1/HAuH5Dl0q9Pyzrq1v2otQ==
+"@babel/plugin-transform-logical-assignment-operators@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz#b19441a8c39a2fda0902900b306ea05ae1055db7"
+  integrity sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==
   dependencies:
-    "@babel/helper-module-transforms" "^7.20.7"
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-modules-commonjs@^7.0.0", "@babel/plugin-transform-modules-commonjs@^7.1.0", "@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.15.4", "@babel/plugin-transform-modules-commonjs@^7.19.6", "@babel/plugin-transform-modules-commonjs@^7.2.0", "@babel/plugin-transform-modules-commonjs@^7.22.5", "@babel/plugin-transform-modules-commonjs@^7.4.4":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz#7d9875908d19b8c0536085af7b053fd5bd651bfa"
-  integrity sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==
+"@babel/plugin-transform-member-expression-literals@^7.0.0", "@babel/plugin-transform-member-expression-literals@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz#63dff19763ea64a31f5e6c20957e6a25e41ed5de"
+  integrity sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-simple-access" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-modules-systemjs@^7.15.4", "@babel/plugin-transform-modules-systemjs@^7.19.6", "@babel/plugin-transform-modules-systemjs@^7.3.4", "@babel/plugin-transform-modules-systemjs@^7.4.4":
-  version "7.19.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz#59e2a84064b5736a4471b1aa7b13d4431d327e0d"
-  integrity sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==
+"@babel/plugin-transform-modules-amd@^7.2.0", "@babel/plugin-transform-modules-amd@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz#49ba478f2295101544abd794486cd3088dddb6c5"
+  integrity sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-module-transforms" "^7.19.6"
-    "@babel/helper-plugin-utils" "^7.19.0"
-    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/helper-module-transforms" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-modules-umd@^7.14.5", "@babel/plugin-transform-modules-umd@^7.18.6", "@babel/plugin-transform-modules-umd@^7.2.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9"
-  integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==
+"@babel/plugin-transform-modules-commonjs@^7.0.0", "@babel/plugin-transform-modules-commonjs@^7.1.0", "@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.2.0", "@babel/plugin-transform-modules-commonjs@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.9.tgz#d165c8c569a080baf5467bda88df6425fc060686"
+  integrity sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-module-transforms" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-simple-access" "^7.25.9"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.14.9", "@babel/plugin-transform-named-capturing-groups-regex@^7.19.1", "@babel/plugin-transform-named-capturing-groups-regex@^7.3.0", "@babel/plugin-transform-named-capturing-groups-regex@^7.4.5":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz#626298dd62ea51d452c3be58b285d23195ba69a8"
-  integrity sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==
+"@babel/plugin-transform-modules-systemjs@^7.25.9", "@babel/plugin-transform-modules-systemjs@^7.3.4":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz#8bd1b43836269e3d33307151a114bcf3ba6793f8"
+  integrity sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.20.5"
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-module-transforms" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-validator-identifier" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
 
-"@babel/plugin-transform-new-target@^7.0.0", "@babel/plugin-transform-new-target@^7.14.5", "@babel/plugin-transform-new-target@^7.18.6", "@babel/plugin-transform-new-target@^7.4.4":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8"
-  integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==
+"@babel/plugin-transform-modules-umd@^7.2.0", "@babel/plugin-transform-modules-umd@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz#6710079cdd7c694db36529a1e8411e49fcbf14c9"
+  integrity sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-module-transforms" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+
+"@babel/plugin-transform-named-capturing-groups-regex@^7.25.9", "@babel/plugin-transform-named-capturing-groups-regex@^7.3.0":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz#454990ae6cc22fd2a0fa60b3a2c6f63a38064e6a"
+  integrity sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+
+"@babel/plugin-transform-new-target@^7.0.0", "@babel/plugin-transform-new-target@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz#42e61711294b105c248336dcb04b77054ea8becd"
+  integrity sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.25.9"
+
+"@babel/plugin-transform-nullish-coalescing-operator@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.9.tgz#bcb1b0d9e948168102d5f7104375ca21c3266949"
+  integrity sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.25.9"
+
+"@babel/plugin-transform-numeric-separator@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz#bfed75866261a8b643468b0ccfd275f2033214a1"
+  integrity sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.25.9"
 
 "@babel/plugin-transform-object-assign@^7.0.0":
   version "7.2.0"
@@ -1024,55 +1026,89 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-object-super@^7.0.0", "@babel/plugin-transform-object-super@^7.14.5", "@babel/plugin-transform-object-super@^7.18.6", "@babel/plugin-transform-object-super@^7.2.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c"
-  integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==
+"@babel/plugin-transform-object-rest-spread@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz#0203725025074164808bcf1a2cfa90c652c99f18"
+  integrity sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/helper-replace-supers" "^7.18.6"
+    "@babel/helper-compilation-targets" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/plugin-transform-parameters" "^7.25.9"
 
-"@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.15.4", "@babel/plugin-transform-parameters@^7.2.0", "@babel/plugin-transform-parameters@^7.20.1", "@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.4.4":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz#0ee349e9d1bc96e78e3b37a7af423a4078a7083f"
-  integrity sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA==
+"@babel/plugin-transform-object-super@^7.0.0", "@babel/plugin-transform-object-super@^7.2.0", "@babel/plugin-transform-object-super@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz#385d5de135162933beb4a3d227a2b7e52bb4cf03"
+  integrity sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-replace-supers" "^7.25.9"
 
-"@babel/plugin-transform-property-literals@^7.0.0", "@babel/plugin-transform-property-literals@^7.14.5", "@babel/plugin-transform-property-literals@^7.18.6", "@babel/plugin-transform-property-literals@^7.2.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3"
-  integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==
+"@babel/plugin-transform-optional-catch-binding@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz#10e70d96d52bb1f10c5caaac59ac545ea2ba7ff3"
+  integrity sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-react-constant-elements@7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.9.0.tgz#a75abc936a3819edec42d3386d9f1c93f28d9d9e"
-  integrity sha512-wXMXsToAUOxJuBBEHajqKLFWcCkOSLshTI2ChCFFj1zDd7od4IOxiwLCOObNUvOpkxLpjIuaIdBMmNt6ocCPAw==
+"@babel/plugin-transform-optional-chaining@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz#e142eb899d26ef715435f201ab6e139541eee7dd"
+  integrity sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9"
+
+"@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.2.0", "@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz#b856842205b3e77e18b7a7a1b94958069c7ba257"
+  integrity sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.25.9"
+
+"@babel/plugin-transform-private-methods@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz#847f4139263577526455d7d3223cd8bda51e3b57"
+  integrity sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+
+"@babel/plugin-transform-private-property-in-object@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz#9c8b73e64e6cc3cbb2743633885a7dd2c385fe33"
+  integrity sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.25.9"
+    "@babel/helper-create-class-features-plugin" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+
+"@babel/plugin-transform-property-literals@^7.0.0", "@babel/plugin-transform-property-literals@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz#d72d588bd88b0dec8b62e36f6fda91cedfe28e3f"
+  integrity sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-react-constant-elements@^7.2.0":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.20.2.tgz#3f02c784e0b711970d7d8ccc96c4359d64e27ac7"
-  integrity sha512-KS/G8YI8uwMGKErLFOHS/ekhqdHhpEloxs43NecQHVgo2QuQSyJhGIY1fL8UGl9wy5ItVwwoUL4YxVqsplGq2g==
+"@babel/plugin-transform-react-constant-elements@7.25.9", "@babel/plugin-transform-react-constant-elements@^7.2.0":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.25.9.tgz#08a1de35a301929b60fdf2788a54b46cd8ecd0ef"
+  integrity sha512-Ncw2JFsJVuvfRsa2lSHiC55kETQVLSnsYGQ1JDDwkUeWGTL/8Tom8aLTnlqgoeuopWrbbGndrc9AlLYrIosrow==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-react-display-name@^7.0.0", "@babel/plugin-transform-react-display-name@^7.14.5":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz#8b1125f919ef36ebdfff061d664e266c666b9415"
-  integrity sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA==
+"@babel/plugin-transform-react-display-name@^7.0.0", "@babel/plugin-transform-react-display-name@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.25.9.tgz#4b79746b59efa1f38c8695065a92a9f5afb24f7d"
+  integrity sha512-KJfMlYIUxQB1CJfO3e0+h0ZHWOTLCPP115Awhaz8U0Zpq36Gl/cXlpoyMRnUWlhNUBAzldnCiAZNvCDj7CrKxQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-react-jsx-development@^7.14.5":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz#dbe5c972811e49c7405b630e4d0d2e1380c0ddc5"
-  integrity sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA==
+"@babel/plugin-transform-react-jsx-development@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.25.9.tgz#8fd220a77dd139c07e25225a903b8be8c829e0d7"
+  integrity sha512-9mj6rm7XVYs4mdLIpbZnHOYdpW42uoiBCTVowg7sP1thUOiANgMb4UtpRivR0pp5iL+ocvUv7X4mZgFRpJEzGw==
   dependencies:
-    "@babel/plugin-transform-react-jsx" "^7.18.6"
+    "@babel/plugin-transform-react-jsx" "^7.25.9"
 
 "@babel/plugin-transform-react-jsx-self@^7.0.0":
   version "7.16.7"
@@ -1088,265 +1124,294 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-react-jsx@^7.0.0", "@babel/plugin-transform-react-jsx@^7.12.17", "@babel/plugin-transform-react-jsx@^7.14.5", "@babel/plugin-transform-react-jsx@^7.18.6", "@babel/plugin-transform-react-jsx@^7.22.5":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.23.4.tgz#393f99185110cea87184ea47bcb4a7b0c2e39312"
-  integrity sha512-5xOpoPguCZCRbo/JeHlloSkTA8Bld1J/E1/kLfD1nsuiW1m8tduTA1ERCgIZokDflX/IBzKcqR3l7VlRgiIfHA==
+"@babel/plugin-transform-react-jsx@^7.0.0", "@babel/plugin-transform-react-jsx@^7.12.17", "@babel/plugin-transform-react-jsx@^7.22.5", "@babel/plugin-transform-react-jsx@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.9.tgz#06367940d8325b36edff5e2b9cbe782947ca4166"
+  integrity sha512-s5XwpQYCqGerXl+Pu6VDL3x0j2d82eiV77UJ8a2mDHAW7j9SWRqQ2y1fNo1Z74CdcYipl5Z41zvjj4Nfzq36rw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-module-imports" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-jsx" "^7.23.3"
-    "@babel/types" "^7.23.4"
+    "@babel/helper-annotate-as-pure" "^7.25.9"
+    "@babel/helper-module-imports" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/plugin-syntax-jsx" "^7.25.9"
+    "@babel/types" "^7.25.9"
 
-"@babel/plugin-transform-react-pure-annotations@^7.14.5":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz#561af267f19f3e5d59291f9950fd7b9663d0d844"
-  integrity sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ==
+"@babel/plugin-transform-react-pure-annotations@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.25.9.tgz#ea1c11b2f9dbb8e2d97025f43a3b5bc47e18ae62"
+  integrity sha512-KQ/Takk3T8Qzj5TppkS1be588lkbTp5uj7w6a0LeQaTMSckU/wK0oJ/pih+T690tkgI5jfmg2TqDJvd41Sj1Cg==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-annotate-as-pure" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-regenerator@^7.0.0", "@babel/plugin-transform-regenerator@^7.14.5", "@babel/plugin-transform-regenerator@^7.18.6", "@babel/plugin-transform-regenerator@^7.3.4", "@babel/plugin-transform-regenerator@^7.4.5":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz#57cda588c7ffb7f4f8483cc83bdcea02a907f04d"
-  integrity sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==
+"@babel/plugin-transform-regenerator@^7.0.0", "@babel/plugin-transform-regenerator@^7.25.9", "@babel/plugin-transform-regenerator@^7.3.4":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz#03a8a4670d6cebae95305ac6defac81ece77740b"
+  integrity sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    regenerator-transform "^0.15.1"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    regenerator-transform "^0.15.2"
 
-"@babel/plugin-transform-reserved-words@^7.14.5", "@babel/plugin-transform-reserved-words@^7.18.6", "@babel/plugin-transform-reserved-words@^7.2.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a"
-  integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==
+"@babel/plugin-transform-regexp-modifiers@^7.26.0":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.26.0.tgz#2f5837a5b5cd3842a919d8147e9903cc7455b850"
+  integrity sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-runtime@7.15.0":
-  version "7.15.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz#d3aa650d11678ca76ce294071fda53d7804183b3"
-  integrity sha512-sfHYkLGjhzWTq6xsuQ01oEsUYjkHRux9fW1iUA68dC7Qd8BS1Unq4aZ8itmQp95zUzIcyR2EbNMTzAicFj+guw==
+"@babel/plugin-transform-reserved-words@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz#0398aed2f1f10ba3f78a93db219b27ef417fb9ce"
+  integrity sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==
   dependencies:
-    "@babel/helper-module-imports" "^7.14.5"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    babel-plugin-polyfill-corejs2 "^0.2.2"
-    babel-plugin-polyfill-corejs3 "^0.2.2"
-    babel-plugin-polyfill-regenerator "^0.2.2"
-    semver "^6.3.0"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-runtime@^7.0.0", "@babel/plugin-transform-runtime@^7.13.15", "@babel/plugin-transform-runtime@^7.4.0":
-  version "7.19.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz#9d2a9dbf4e12644d6f46e5e75bfbf02b5d6e9194"
-  integrity sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==
+"@babel/plugin-transform-runtime@7.25.9", "@babel/plugin-transform-runtime@^7.0.0", "@babel/plugin-transform-runtime@^7.13.15", "@babel/plugin-transform-runtime@^7.4.0":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.25.9.tgz#62723ea3f5b31ffbe676da9d6dae17138ae580ea"
+  integrity sha512-nZp7GlEl+yULJrClz0SwHPqir3lc0zsPrDHQUcxGspSL7AKrexNSEfTbfqnDNJUO13bgKyfuOLMF8Xqtu8j3YQ==
   dependencies:
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.19.0"
-    babel-plugin-polyfill-corejs2 "^0.3.3"
-    babel-plugin-polyfill-corejs3 "^0.6.0"
-    babel-plugin-polyfill-regenerator "^0.4.1"
-    semver "^6.3.0"
+    "@babel/helper-module-imports" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    babel-plugin-polyfill-corejs2 "^0.4.10"
+    babel-plugin-polyfill-corejs3 "^0.10.6"
+    babel-plugin-polyfill-regenerator "^0.6.1"
+    semver "^6.3.1"
 
-"@babel/plugin-transform-shorthand-properties@^7.0.0", "@babel/plugin-transform-shorthand-properties@^7.14.5", "@babel/plugin-transform-shorthand-properties@^7.18.6", "@babel/plugin-transform-shorthand-properties@^7.2.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9"
-  integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==
+"@babel/plugin-transform-shorthand-properties@^7.0.0", "@babel/plugin-transform-shorthand-properties@^7.2.0", "@babel/plugin-transform-shorthand-properties@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz#bb785e6091f99f826a95f9894fc16fde61c163f2"
+  integrity sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-spread@^7.0.0", "@babel/plugin-transform-spread@^7.14.6", "@babel/plugin-transform-spread@^7.19.0", "@babel/plugin-transform-spread@^7.2.0":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz#c2d83e0b99d3bf83e07b11995ee24bf7ca09401e"
-  integrity sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==
+"@babel/plugin-transform-spread@^7.0.0", "@babel/plugin-transform-spread@^7.2.0", "@babel/plugin-transform-spread@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz#24a35153931b4ba3d13cec4a7748c21ab5514ef9"
+  integrity sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9"
 
-"@babel/plugin-transform-sticky-regex@^7.0.0", "@babel/plugin-transform-sticky-regex@^7.14.5", "@babel/plugin-transform-sticky-regex@^7.18.6", "@babel/plugin-transform-sticky-regex@^7.2.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc"
-  integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==
+"@babel/plugin-transform-sticky-regex@^7.0.0", "@babel/plugin-transform-sticky-regex@^7.2.0", "@babel/plugin-transform-sticky-regex@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz#c7f02b944e986a417817b20ba2c504dfc1453d32"
+  integrity sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-template-literals@^7.0.0", "@babel/plugin-transform-template-literals@^7.14.5", "@babel/plugin-transform-template-literals@^7.18.9", "@babel/plugin-transform-template-literals@^7.2.0", "@babel/plugin-transform-template-literals@^7.4.4":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e"
-  integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==
+"@babel/plugin-transform-template-literals@^7.0.0", "@babel/plugin-transform-template-literals@^7.2.0", "@babel/plugin-transform-template-literals@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz#6dbd4a24e8fad024df76d1fac6a03cf413f60fe1"
+  integrity sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-typeof-symbol@^7.14.5", "@babel/plugin-transform-typeof-symbol@^7.18.9", "@babel/plugin-transform-typeof-symbol@^7.2.0":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0"
-  integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==
+"@babel/plugin-transform-typeof-symbol@^7.2.0", "@babel/plugin-transform-typeof-symbol@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.9.tgz#224ba48a92869ddbf81f9b4a5f1204bbf5a2bc4b"
+  integrity sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-typescript@^7.15.0", "@babel/plugin-transform-typescript@^7.22.5", "@babel/plugin-transform-typescript@^7.5.0":
-  version "7.22.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.9.tgz#91e08ad1eb1028ecc62662a842e93ecfbf3c7234"
-  integrity sha512-BnVR1CpKiuD0iobHPaM1iLvcwPYN2uVFAqoLVSpEDKWuOikoCv5HbKLxclhKYUXlWkX86DoZGtqI4XhbOsyrMg==
+"@babel/plugin-transform-typescript@^7.25.9", "@babel/plugin-transform-typescript@^7.5.0":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.25.9.tgz#69267905c2b33c2ac6d8fe765e9dc2ddc9df3849"
+  integrity sha512-7PbZQZP50tzv2KGGnhh82GSyMB01yKY9scIjf1a+GfZCtInOWqUH5+1EBU4t9fyR5Oykkkc9vFTs4OHrhHXljQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-create-class-features-plugin" "^7.22.9"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-typescript" "^7.22.5"
+    "@babel/helper-annotate-as-pure" "^7.25.9"
+    "@babel/helper-create-class-features-plugin" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9"
+    "@babel/plugin-syntax-typescript" "^7.25.9"
+
+"@babel/plugin-transform-unicode-escapes@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz#a75ef3947ce15363fccaa38e2dd9bc70b2788b82"
+  integrity sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-unicode-escapes@^7.14.5", "@babel/plugin-transform-unicode-escapes@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246"
-  integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==
+"@babel/plugin-transform-unicode-property-regex@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz#a901e96f2c1d071b0d1bb5dc0d3c880ce8f53dd3"
+  integrity sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-unicode-regex@^7.0.0", "@babel/plugin-transform-unicode-regex@^7.14.5", "@babel/plugin-transform-unicode-regex@^7.18.6", "@babel/plugin-transform-unicode-regex@^7.2.0", "@babel/plugin-transform-unicode-regex@^7.4.4":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca"
-  integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==
+"@babel/plugin-transform-unicode-regex@^7.0.0", "@babel/plugin-transform-unicode-regex@^7.2.0", "@babel/plugin-transform-unicode-regex@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz#5eae747fe39eacf13a8bd006a4fb0b5d1fa5e9b1"
+  integrity sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+
+"@babel/plugin-transform-unicode-sets-regex@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz#65114c17b4ffc20fa5b163c63c70c0d25621fabe"
+  integrity sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/polyfill@7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.4.4.tgz#78801cf3dbe657844eeabf31c1cae3828051e893"
-  integrity sha512-WlthFLfhQQhh+A2Gn5NSFl0Huxz36x86Jn+E9OW7ibK8edKPq+KLy4apM1yDpQ8kJOVi1OVjpP4vSDLdrI04dg==
+"@babel/polyfill@7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.12.1.tgz#1f2d6371d1261bbd961f3c5d5909150e12d0bd96"
+  integrity sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==
   dependencies:
     core-js "^2.6.5"
-    regenerator-runtime "^0.13.2"
+    regenerator-runtime "^0.13.4"
 
-"@babel/preset-env@7.15.6":
-  version "7.15.6"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.6.tgz#0f3898db9d63d320f21b17380d8462779de57659"
-  integrity sha512-L+6jcGn7EWu7zqaO2uoTDjjMBW+88FXzV8KvrBl2z6MtRNxlsmUNRlZPaNNPUTgqhyC5DHNFk/2Jmra+ublZWw==
+"@babel/preset-env@7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.25.9.tgz#fc8a68705e02553cdeeeb5477bf241e12b9c3cd9"
+  integrity sha512-XqDEt+hfsQukahSX9JOBDHhpUHDhj2zGSxoqWQFCMajOSBnbhBdgON/bU/5PkBA1yX5tqW6tTzuIPVsZTQ7h5Q==
   dependencies:
-    "@babel/compat-data" "^7.15.0"
-    "@babel/helper-compilation-targets" "^7.15.4"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-validator-option" "^7.14.5"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.15.4"
-    "@babel/plugin-proposal-async-generator-functions" "^7.15.4"
-    "@babel/plugin-proposal-class-properties" "^7.14.5"
-    "@babel/plugin-proposal-class-static-block" "^7.15.4"
-    "@babel/plugin-proposal-dynamic-import" "^7.14.5"
-    "@babel/plugin-proposal-export-namespace-from" "^7.14.5"
-    "@babel/plugin-proposal-json-strings" "^7.14.5"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.14.5"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
-    "@babel/plugin-proposal-numeric-separator" "^7.14.5"
-    "@babel/plugin-proposal-object-rest-spread" "^7.15.6"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.14.5"
-    "@babel/plugin-proposal-optional-chaining" "^7.14.5"
-    "@babel/plugin-proposal-private-methods" "^7.14.5"
-    "@babel/plugin-proposal-private-property-in-object" "^7.15.4"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.14.5"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-    "@babel/plugin-syntax-class-properties" "^7.12.13"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-    "@babel/plugin-syntax-top-level-await" "^7.14.5"
-    "@babel/plugin-transform-arrow-functions" "^7.14.5"
-    "@babel/plugin-transform-async-to-generator" "^7.14.5"
-    "@babel/plugin-transform-block-scoped-functions" "^7.14.5"
-    "@babel/plugin-transform-block-scoping" "^7.15.3"
-    "@babel/plugin-transform-classes" "^7.15.4"
-    "@babel/plugin-transform-computed-properties" "^7.14.5"
-    "@babel/plugin-transform-destructuring" "^7.14.7"
-    "@babel/plugin-transform-dotall-regex" "^7.14.5"
-    "@babel/plugin-transform-duplicate-keys" "^7.14.5"
-    "@babel/plugin-transform-exponentiation-operator" "^7.14.5"
-    "@babel/plugin-transform-for-of" "^7.15.4"
-    "@babel/plugin-transform-function-name" "^7.14.5"
-    "@babel/plugin-transform-literals" "^7.14.5"
-    "@babel/plugin-transform-member-expression-literals" "^7.14.5"
-    "@babel/plugin-transform-modules-amd" "^7.14.5"
-    "@babel/plugin-transform-modules-commonjs" "^7.15.4"
-    "@babel/plugin-transform-modules-systemjs" "^7.15.4"
-    "@babel/plugin-transform-modules-umd" "^7.14.5"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.9"
-    "@babel/plugin-transform-new-target" "^7.14.5"
-    "@babel/plugin-transform-object-super" "^7.14.5"
-    "@babel/plugin-transform-parameters" "^7.15.4"
-    "@babel/plugin-transform-property-literals" "^7.14.5"
-    "@babel/plugin-transform-regenerator" "^7.14.5"
-    "@babel/plugin-transform-reserved-words" "^7.14.5"
-    "@babel/plugin-transform-shorthand-properties" "^7.14.5"
-    "@babel/plugin-transform-spread" "^7.14.6"
-    "@babel/plugin-transform-sticky-regex" "^7.14.5"
-    "@babel/plugin-transform-template-literals" "^7.14.5"
-    "@babel/plugin-transform-typeof-symbol" "^7.14.5"
-    "@babel/plugin-transform-unicode-escapes" "^7.14.5"
-    "@babel/plugin-transform-unicode-regex" "^7.14.5"
-    "@babel/preset-modules" "^0.1.4"
-    "@babel/types" "^7.15.6"
-    babel-plugin-polyfill-corejs2 "^0.2.2"
-    babel-plugin-polyfill-corejs3 "^0.2.2"
-    babel-plugin-polyfill-regenerator "^0.2.2"
-    core-js-compat "^3.16.0"
-    semver "^6.3.0"
+    "@babel/compat-data" "^7.25.9"
+    "@babel/helper-compilation-targets" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-validator-option" "^7.25.9"
+    "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.25.9"
+    "@babel/plugin-bugfix-safari-class-field-initializer-scope" "^7.25.9"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.25.9"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.25.9"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.25.9"
+    "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
+    "@babel/plugin-syntax-import-assertions" "^7.25.9"
+    "@babel/plugin-syntax-import-attributes" "^7.25.9"
+    "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
+    "@babel/plugin-transform-arrow-functions" "^7.25.9"
+    "@babel/plugin-transform-async-generator-functions" "^7.25.9"
+    "@babel/plugin-transform-async-to-generator" "^7.25.9"
+    "@babel/plugin-transform-block-scoped-functions" "^7.25.9"
+    "@babel/plugin-transform-block-scoping" "^7.25.9"
+    "@babel/plugin-transform-class-properties" "^7.25.9"
+    "@babel/plugin-transform-class-static-block" "^7.25.9"
+    "@babel/plugin-transform-classes" "^7.25.9"
+    "@babel/plugin-transform-computed-properties" "^7.25.9"
+    "@babel/plugin-transform-destructuring" "^7.25.9"
+    "@babel/plugin-transform-dotall-regex" "^7.25.9"
+    "@babel/plugin-transform-duplicate-keys" "^7.25.9"
+    "@babel/plugin-transform-duplicate-named-capturing-groups-regex" "^7.25.9"
+    "@babel/plugin-transform-dynamic-import" "^7.25.9"
+    "@babel/plugin-transform-exponentiation-operator" "^7.25.9"
+    "@babel/plugin-transform-export-namespace-from" "^7.25.9"
+    "@babel/plugin-transform-for-of" "^7.25.9"
+    "@babel/plugin-transform-function-name" "^7.25.9"
+    "@babel/plugin-transform-json-strings" "^7.25.9"
+    "@babel/plugin-transform-literals" "^7.25.9"
+    "@babel/plugin-transform-logical-assignment-operators" "^7.25.9"
+    "@babel/plugin-transform-member-expression-literals" "^7.25.9"
+    "@babel/plugin-transform-modules-amd" "^7.25.9"
+    "@babel/plugin-transform-modules-commonjs" "^7.25.9"
+    "@babel/plugin-transform-modules-systemjs" "^7.25.9"
+    "@babel/plugin-transform-modules-umd" "^7.25.9"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.25.9"
+    "@babel/plugin-transform-new-target" "^7.25.9"
+    "@babel/plugin-transform-nullish-coalescing-operator" "^7.25.9"
+    "@babel/plugin-transform-numeric-separator" "^7.25.9"
+    "@babel/plugin-transform-object-rest-spread" "^7.25.9"
+    "@babel/plugin-transform-object-super" "^7.25.9"
+    "@babel/plugin-transform-optional-catch-binding" "^7.25.9"
+    "@babel/plugin-transform-optional-chaining" "^7.25.9"
+    "@babel/plugin-transform-parameters" "^7.25.9"
+    "@babel/plugin-transform-private-methods" "^7.25.9"
+    "@babel/plugin-transform-private-property-in-object" "^7.25.9"
+    "@babel/plugin-transform-property-literals" "^7.25.9"
+    "@babel/plugin-transform-regenerator" "^7.25.9"
+    "@babel/plugin-transform-reserved-words" "^7.25.9"
+    "@babel/plugin-transform-shorthand-properties" "^7.25.9"
+    "@babel/plugin-transform-spread" "^7.25.9"
+    "@babel/plugin-transform-sticky-regex" "^7.25.9"
+    "@babel/plugin-transform-template-literals" "^7.25.9"
+    "@babel/plugin-transform-typeof-symbol" "^7.25.9"
+    "@babel/plugin-transform-unicode-escapes" "^7.25.9"
+    "@babel/plugin-transform-unicode-property-regex" "^7.25.9"
+    "@babel/plugin-transform-unicode-regex" "^7.25.9"
+    "@babel/plugin-transform-unicode-sets-regex" "^7.25.9"
+    "@babel/preset-modules" "0.1.6-no-external-plugins"
+    babel-plugin-polyfill-corejs2 "^0.4.10"
+    babel-plugin-polyfill-corejs3 "^0.10.6"
+    babel-plugin-polyfill-regenerator "^0.6.1"
+    core-js-compat "^3.38.1"
+    semver "^6.3.1"
 
-"@babel/preset-env@7.4.5":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.4.5.tgz#2fad7f62983d5af563b5f3139242755884998a58"
-  integrity sha512-f2yNVXM+FsR5V8UwcFeIHzHWgnhXg3NpRmy0ADvALpnhB0SLbCvrCRr4BLOUYbQNLS+Z0Yer46x9dJXpXewI7w==
+"@babel/preset-env@7.26.0", "@babel/preset-env@^7.12.9", "@babel/preset-env@^7.14.1", "@babel/preset-env@^7.4.5":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.26.0.tgz#30e5c6bc1bcc54865bff0c5a30f6d4ccdc7fa8b1"
+  integrity sha512-H84Fxq0CQJNdPFT2DrfnylZ3cf5K43rGfWK4LJGPpjKHiZlk0/RzwEus3PDDZZg+/Er7lCA03MVacueUuXdzfw==
   dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-async-generator-functions" "^7.2.0"
-    "@babel/plugin-proposal-json-strings" "^7.2.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.4.4"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
-    "@babel/plugin-syntax-async-generators" "^7.2.0"
-    "@babel/plugin-syntax-json-strings" "^7.2.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
-    "@babel/plugin-transform-arrow-functions" "^7.2.0"
-    "@babel/plugin-transform-async-to-generator" "^7.4.4"
-    "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
-    "@babel/plugin-transform-block-scoping" "^7.4.4"
-    "@babel/plugin-transform-classes" "^7.4.4"
-    "@babel/plugin-transform-computed-properties" "^7.2.0"
-    "@babel/plugin-transform-destructuring" "^7.4.4"
-    "@babel/plugin-transform-dotall-regex" "^7.4.4"
-    "@babel/plugin-transform-duplicate-keys" "^7.2.0"
-    "@babel/plugin-transform-exponentiation-operator" "^7.2.0"
-    "@babel/plugin-transform-for-of" "^7.4.4"
-    "@babel/plugin-transform-function-name" "^7.4.4"
-    "@babel/plugin-transform-literals" "^7.2.0"
-    "@babel/plugin-transform-member-expression-literals" "^7.2.0"
-    "@babel/plugin-transform-modules-amd" "^7.2.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.4.4"
-    "@babel/plugin-transform-modules-systemjs" "^7.4.4"
-    "@babel/plugin-transform-modules-umd" "^7.2.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.4.5"
-    "@babel/plugin-transform-new-target" "^7.4.4"
-    "@babel/plugin-transform-object-super" "^7.2.0"
-    "@babel/plugin-transform-parameters" "^7.4.4"
-    "@babel/plugin-transform-property-literals" "^7.2.0"
-    "@babel/plugin-transform-regenerator" "^7.4.5"
-    "@babel/plugin-transform-reserved-words" "^7.2.0"
-    "@babel/plugin-transform-shorthand-properties" "^7.2.0"
-    "@babel/plugin-transform-spread" "^7.2.0"
-    "@babel/plugin-transform-sticky-regex" "^7.2.0"
-    "@babel/plugin-transform-template-literals" "^7.4.4"
-    "@babel/plugin-transform-typeof-symbol" "^7.2.0"
-    "@babel/plugin-transform-unicode-regex" "^7.4.4"
-    "@babel/types" "^7.4.4"
-    browserslist "^4.6.0"
-    core-js-compat "^3.1.1"
-    invariant "^2.2.2"
-    js-levenshtein "^1.1.3"
-    semver "^5.5.0"
+    "@babel/compat-data" "^7.26.0"
+    "@babel/helper-compilation-targets" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-validator-option" "^7.25.9"
+    "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.25.9"
+    "@babel/plugin-bugfix-safari-class-field-initializer-scope" "^7.25.9"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.25.9"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.25.9"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.25.9"
+    "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
+    "@babel/plugin-syntax-import-assertions" "^7.26.0"
+    "@babel/plugin-syntax-import-attributes" "^7.26.0"
+    "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
+    "@babel/plugin-transform-arrow-functions" "^7.25.9"
+    "@babel/plugin-transform-async-generator-functions" "^7.25.9"
+    "@babel/plugin-transform-async-to-generator" "^7.25.9"
+    "@babel/plugin-transform-block-scoped-functions" "^7.25.9"
+    "@babel/plugin-transform-block-scoping" "^7.25.9"
+    "@babel/plugin-transform-class-properties" "^7.25.9"
+    "@babel/plugin-transform-class-static-block" "^7.26.0"
+    "@babel/plugin-transform-classes" "^7.25.9"
+    "@babel/plugin-transform-computed-properties" "^7.25.9"
+    "@babel/plugin-transform-destructuring" "^7.25.9"
+    "@babel/plugin-transform-dotall-regex" "^7.25.9"
+    "@babel/plugin-transform-duplicate-keys" "^7.25.9"
+    "@babel/plugin-transform-duplicate-named-capturing-groups-regex" "^7.25.9"
+    "@babel/plugin-transform-dynamic-import" "^7.25.9"
+    "@babel/plugin-transform-exponentiation-operator" "^7.25.9"
+    "@babel/plugin-transform-export-namespace-from" "^7.25.9"
+    "@babel/plugin-transform-for-of" "^7.25.9"
+    "@babel/plugin-transform-function-name" "^7.25.9"
+    "@babel/plugin-transform-json-strings" "^7.25.9"
+    "@babel/plugin-transform-literals" "^7.25.9"
+    "@babel/plugin-transform-logical-assignment-operators" "^7.25.9"
+    "@babel/plugin-transform-member-expression-literals" "^7.25.9"
+    "@babel/plugin-transform-modules-amd" "^7.25.9"
+    "@babel/plugin-transform-modules-commonjs" "^7.25.9"
+    "@babel/plugin-transform-modules-systemjs" "^7.25.9"
+    "@babel/plugin-transform-modules-umd" "^7.25.9"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.25.9"
+    "@babel/plugin-transform-new-target" "^7.25.9"
+    "@babel/plugin-transform-nullish-coalescing-operator" "^7.25.9"
+    "@babel/plugin-transform-numeric-separator" "^7.25.9"
+    "@babel/plugin-transform-object-rest-spread" "^7.25.9"
+    "@babel/plugin-transform-object-super" "^7.25.9"
+    "@babel/plugin-transform-optional-catch-binding" "^7.25.9"
+    "@babel/plugin-transform-optional-chaining" "^7.25.9"
+    "@babel/plugin-transform-parameters" "^7.25.9"
+    "@babel/plugin-transform-private-methods" "^7.25.9"
+    "@babel/plugin-transform-private-property-in-object" "^7.25.9"
+    "@babel/plugin-transform-property-literals" "^7.25.9"
+    "@babel/plugin-transform-regenerator" "^7.25.9"
+    "@babel/plugin-transform-regexp-modifiers" "^7.26.0"
+    "@babel/plugin-transform-reserved-words" "^7.25.9"
+    "@babel/plugin-transform-shorthand-properties" "^7.25.9"
+    "@babel/plugin-transform-spread" "^7.25.9"
+    "@babel/plugin-transform-sticky-regex" "^7.25.9"
+    "@babel/plugin-transform-template-literals" "^7.25.9"
+    "@babel/plugin-transform-typeof-symbol" "^7.25.9"
+    "@babel/plugin-transform-unicode-escapes" "^7.25.9"
+    "@babel/plugin-transform-unicode-property-regex" "^7.25.9"
+    "@babel/plugin-transform-unicode-regex" "^7.25.9"
+    "@babel/plugin-transform-unicode-sets-regex" "^7.25.9"
+    "@babel/preset-modules" "0.1.6-no-external-plugins"
+    babel-plugin-polyfill-corejs2 "^0.4.10"
+    babel-plugin-polyfill-corejs3 "^0.10.6"
+    babel-plugin-polyfill-regenerator "^0.6.1"
+    core-js-compat "^3.38.1"
+    semver "^6.3.1"
 
 "@babel/preset-env@^7.0.0 < 7.4.0":
   version "7.3.4"
@@ -1397,87 +1462,6 @@
     js-levenshtein "^1.1.3"
     semver "^5.3.0"
 
-"@babel/preset-env@^7.12.9", "@babel/preset-env@^7.14.1", "@babel/preset-env@^7.4.5":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.20.2.tgz#9b1642aa47bb9f43a86f9630011780dab7f86506"
-  integrity sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==
-  dependencies:
-    "@babel/compat-data" "^7.20.1"
-    "@babel/helper-compilation-targets" "^7.20.0"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-validator-option" "^7.18.6"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9"
-    "@babel/plugin-proposal-async-generator-functions" "^7.20.1"
-    "@babel/plugin-proposal-class-properties" "^7.18.6"
-    "@babel/plugin-proposal-class-static-block" "^7.18.6"
-    "@babel/plugin-proposal-dynamic-import" "^7.18.6"
-    "@babel/plugin-proposal-export-namespace-from" "^7.18.9"
-    "@babel/plugin-proposal-json-strings" "^7.18.6"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.18.9"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
-    "@babel/plugin-proposal-numeric-separator" "^7.18.6"
-    "@babel/plugin-proposal-object-rest-spread" "^7.20.2"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.18.6"
-    "@babel/plugin-proposal-optional-chaining" "^7.18.9"
-    "@babel/plugin-proposal-private-methods" "^7.18.6"
-    "@babel/plugin-proposal-private-property-in-object" "^7.18.6"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.18.6"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-    "@babel/plugin-syntax-class-properties" "^7.12.13"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-    "@babel/plugin-syntax-import-assertions" "^7.20.0"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-    "@babel/plugin-syntax-top-level-await" "^7.14.5"
-    "@babel/plugin-transform-arrow-functions" "^7.18.6"
-    "@babel/plugin-transform-async-to-generator" "^7.18.6"
-    "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
-    "@babel/plugin-transform-block-scoping" "^7.20.2"
-    "@babel/plugin-transform-classes" "^7.20.2"
-    "@babel/plugin-transform-computed-properties" "^7.18.9"
-    "@babel/plugin-transform-destructuring" "^7.20.2"
-    "@babel/plugin-transform-dotall-regex" "^7.18.6"
-    "@babel/plugin-transform-duplicate-keys" "^7.18.9"
-    "@babel/plugin-transform-exponentiation-operator" "^7.18.6"
-    "@babel/plugin-transform-for-of" "^7.18.8"
-    "@babel/plugin-transform-function-name" "^7.18.9"
-    "@babel/plugin-transform-literals" "^7.18.9"
-    "@babel/plugin-transform-member-expression-literals" "^7.18.6"
-    "@babel/plugin-transform-modules-amd" "^7.19.6"
-    "@babel/plugin-transform-modules-commonjs" "^7.19.6"
-    "@babel/plugin-transform-modules-systemjs" "^7.19.6"
-    "@babel/plugin-transform-modules-umd" "^7.18.6"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.19.1"
-    "@babel/plugin-transform-new-target" "^7.18.6"
-    "@babel/plugin-transform-object-super" "^7.18.6"
-    "@babel/plugin-transform-parameters" "^7.20.1"
-    "@babel/plugin-transform-property-literals" "^7.18.6"
-    "@babel/plugin-transform-regenerator" "^7.18.6"
-    "@babel/plugin-transform-reserved-words" "^7.18.6"
-    "@babel/plugin-transform-shorthand-properties" "^7.18.6"
-    "@babel/plugin-transform-spread" "^7.19.0"
-    "@babel/plugin-transform-sticky-regex" "^7.18.6"
-    "@babel/plugin-transform-template-literals" "^7.18.9"
-    "@babel/plugin-transform-typeof-symbol" "^7.18.9"
-    "@babel/plugin-transform-unicode-escapes" "^7.18.10"
-    "@babel/plugin-transform-unicode-regex" "^7.18.6"
-    "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.20.2"
-    babel-plugin-polyfill-corejs2 "^0.3.3"
-    babel-plugin-polyfill-corejs3 "^0.6.0"
-    babel-plugin-polyfill-regenerator "^0.4.1"
-    core-js-compat "^3.25.1"
-    semver "^6.3.0"
-
 "@babel/preset-flow@^7.0.0", "@babel/preset-flow@^7.13.13":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.22.5.tgz#876f24ab6b38bd79703a93f32020ca2162312784"
@@ -1487,59 +1471,49 @@
     "@babel/helper-validator-option" "^7.22.5"
     "@babel/plugin-transform-flow-strip-types" "^7.22.5"
 
-"@babel/preset-modules@^0.1.4", "@babel/preset-modules@^0.1.5":
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9"
-  integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==
+"@babel/preset-modules@0.1.6-no-external-plugins":
+  version "0.1.6-no-external-plugins"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz#ccb88a2c49c817236861fee7826080573b8a923a"
+  integrity sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
-    "@babel/plugin-transform-dotall-regex" "^7.4.4"
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/preset-react@7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz#e86b4b3d99433c7b3e9e91747e2653958bc6b3c0"
-  integrity sha512-oayxyPS4Zj+hF6Et11BwuBkmpgT/zMxyuZgFrMeZID6Hdh3dGlk4sHCAhdBCpuCKW2ppBfl2uCCetlrUIJRY3w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-transform-react-display-name" "^7.0.0"
-    "@babel/plugin-transform-react-jsx" "^7.0.0"
-    "@babel/plugin-transform-react-jsx-self" "^7.0.0"
-    "@babel/plugin-transform-react-jsx-source" "^7.0.0"
-
-"@babel/preset-react@7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.14.5.tgz#0fbb769513f899c2c56f3a882fa79673c2d4ab3c"
-  integrity sha512-XFxBkjyObLvBaAvkx1Ie95Iaq4S/GUEIrejyrntQ/VCMKUYvKLoyKxOBzJ2kjA3b6rC9/KL6KXfDC2GqvLiNqQ==
+"@babel/preset-react@7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.25.9.tgz#5f473035dc2094bcfdbc7392d0766bd42dce173e"
+  integrity sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-validator-option" "^7.14.5"
-    "@babel/plugin-transform-react-display-name" "^7.14.5"
-    "@babel/plugin-transform-react-jsx" "^7.14.5"
-    "@babel/plugin-transform-react-jsx-development" "^7.14.5"
-    "@babel/plugin-transform-react-pure-annotations" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-validator-option" "^7.25.9"
+    "@babel/plugin-transform-react-display-name" "^7.25.9"
+    "@babel/plugin-transform-react-jsx" "^7.25.9"
+    "@babel/plugin-transform-react-jsx-development" "^7.25.9"
+    "@babel/plugin-transform-react-pure-annotations" "^7.25.9"
 
-"@babel/preset-typescript@7.15.0":
-  version "7.15.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.15.0.tgz#e8fca638a1a0f64f14e1119f7fe4500277840945"
-  integrity sha512-lt0Y/8V3y06Wq/8H/u0WakrqciZ7Fz7mwPDHWUJAXlABL5hiUG42BNlRXiELNjeWjO5rWmnNKlx+yzJvxezHow==
+"@babel/preset-react@7.26.3":
+  version "7.26.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.26.3.tgz#7c5e028d623b4683c1f83a0bd4713b9100560caa"
+  integrity sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-validator-option" "^7.14.5"
-    "@babel/plugin-transform-typescript" "^7.15.0"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-validator-option" "^7.25.9"
+    "@babel/plugin-transform-react-display-name" "^7.25.9"
+    "@babel/plugin-transform-react-jsx" "^7.25.9"
+    "@babel/plugin-transform-react-jsx-development" "^7.25.9"
+    "@babel/plugin-transform-react-pure-annotations" "^7.25.9"
 
-"@babel/preset-typescript@^7.1.0", "@babel/preset-typescript@^7.13.0", "@babel/preset-typescript@^7.13.16":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.22.5.tgz#16367d8b01d640e9a507577ed4ee54e0101e51c8"
-  integrity sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ==
+"@babel/preset-typescript@7.26.0", "@babel/preset-typescript@^7.1.0", "@babel/preset-typescript@^7.13.0", "@babel/preset-typescript@^7.13.16":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.26.0.tgz#4a570f1b8d104a242d923957ffa1eaff142a106d"
+  integrity sha512-NMk1IGZ5I/oHhoXEElcm+xUnL/szL6xflkFZmoEU9xj1qSJXpiS7rsspYo92B4DRCDvZn2erT5LdsCeXAKNCkg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-validator-option" "^7.22.5"
-    "@babel/plugin-syntax-jsx" "^7.22.5"
-    "@babel/plugin-transform-modules-commonjs" "^7.22.5"
-    "@babel/plugin-transform-typescript" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-validator-option" "^7.25.9"
+    "@babel/plugin-syntax-jsx" "^7.25.9"
+    "@babel/plugin-transform-modules-commonjs" "^7.25.9"
+    "@babel/plugin-transform-typescript" "^7.25.9"
 
 "@babel/register@^7.0.0", "@babel/register@^7.13.16":
   version "7.22.5"
@@ -1582,14 +1556,14 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.0.0-beta.46", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.16.3", "@babel/runtime@^7.25.9", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2", "@babel/runtime@^7.9.6":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.0.0-beta.46", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.8", "@babel/runtime@^7.14.0", "@babel/runtime@^7.16.3", "@babel/runtime@^7.25.9", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2", "@babel/runtime@^7.9.6":
   version "7.26.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.0.tgz#8600c2f595f277c60815256418b85356a65173c1"
   integrity sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==
   dependencies:
     regenerator-runtime "^0.14.0"
 
-"@babel/template@^7.0.0", "@babel/template@^7.15.4", "@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.22.15", "@babel/template@^7.25.9", "@babel/template@^7.3.3", "@babel/template@^7.4.0", "@babel/template@^7.8.6":
+"@babel/template@^7.0.0", "@babel/template@^7.25.9", "@babel/template@^7.3.3", "@babel/template@^7.4.0", "@babel/template@^7.8.6":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.9.tgz#ecb62d81a8a6f5dc5fe8abfc3901fc52ddf15016"
   integrity sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==
@@ -1598,7 +1572,7 @@
     "@babel/parser" "^7.25.9"
     "@babel/types" "^7.25.9"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.11.5", "@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4", "@babel/traverse@^7.20.5", "@babel/traverse@^7.23.3", "@babel/traverse@^7.23.6", "@babel/traverse@^7.25.9", "@babel/traverse@^7.26.5", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2", "@babel/traverse@^7.9.0":
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.23.3", "@babel/traverse@^7.25.9", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2", "@babel/traverse@^7.9.0":
   version "7.26.5"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.26.5.tgz#6d0be3e772ff786456c1a37538208286f6e79021"
   integrity sha512-rkOSPOw+AXbgtwUga3U4u8RpoK9FEFWBNAlTpcnkLFjL5CT+oyHNuUUC/xx6XefEJ16r38r8Bc/lfp6rYuHeJQ==
@@ -1611,7 +1585,7 @@
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.3", "@babel/types@^7.23.4", "@babel/types@^7.23.6", "@babel/types@^7.24.7", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.26.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0":
+"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.23.3", "@babel/types@^7.24.7", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.26.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0":
   version "7.26.5"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.5.tgz#7a1e1c01d28e26d1fe7f8ec9567b3b92b9d07747"
   integrity sha512-L6mZmwFDK6Cjh1nRCLXpa6no13ZIioJDz7mdkzHv399pThrTa/k0nUlNaenOeh2kWu/iaOQYElEpKPUswUa9Vg==
@@ -2653,6 +2627,18 @@
     "@intlify/core-base" "9.2.2"
     "@intlify/shared" "9.2.2"
 
+"@isaacs/cliui@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
+  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
+  dependencies:
+    string-width "^5.1.2"
+    string-width-cjs "npm:string-width@^4.2.0"
+    strip-ansi "^7.0.1"
+    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
+    wrap-ansi "^8.1.0"
+    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
+
 "@isaacs/string-locale-compare@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b"
@@ -2947,13 +2933,13 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280"
   integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
 
-"@jridgewell/source-map@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb"
-  integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
+"@jridgewell/source-map@^0.3.3":
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.6.tgz#9d71ca886e32502eb9362c9a74a46787c36df81a"
+  integrity sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==
   dependencies:
-    "@jridgewell/gen-mapping" "^0.3.0"
-    "@jridgewell/trace-mapping" "^0.3.9"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
 
 "@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15":
   version "1.5.0"
@@ -3709,6 +3695,11 @@
   resolved "https://registry.yarnpkg.com/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-2.8.5.tgz#8233e8762440b0f4632c47a09b1b6f23de8b934c"
   integrity sha512-4wvrf5BgnR8RpogHhtpCPJMKBmvyZPhhUtEwMJbXh0ni2BucpfF07jlmyM11zRqQ2XIq6PbC2j7W7UCCcm1rRQ==
 
+"@mdn/browser-compat-data@^5.2.34", "@mdn/browser-compat-data@^5.5.35":
+  version "5.6.11"
+  resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-5.6.11.tgz#2beda3664297a3083b7c84a7e6eadc8bf843b90e"
+  integrity sha512-kJUu7JcRSOf3uEs0jK0RZCckaBfjhtWpgKyJUyAk8LRlQl9Yj/R/ddwfjo37dfzkvNYtHvH4Eg+NFkTDzd08Eg==
+
 "@metalsmith/in-place@4.6.0":
   version "4.6.0"
   resolved "https://registry.npmjs.org/@metalsmith/in-place/-/in-place-4.6.0.tgz#4b9aca9141f4d13e9bb451f3bdc1dad1e96c79c6"
@@ -3872,22 +3863,10 @@
   resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.1.4.tgz#188bce4c231f5ab0e7eaca55170764f7e8229db2"
   integrity sha512-xxsJy9wzq7FR5SqPCUqdgSXiNXrMuidgckBa8nH9HtjjxsilgcN6VgXF6tZ3uEWuVEadotQJI8/9EQ6guTC4Yw==
 
-"@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.2":
-  version "2.1.8-no-fsevents.2"
-  resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.2.tgz#e324c0a247a5567192dd7180647709d7e2faf94b"
-  integrity sha512-Fb8WxUFOBQVl+CX4MWet5o7eCc6Pj04rXIwVKZ6h1NnqTo45eOQW6aWyhG25NIODvWFwTDMwBsYxrQ3imxpetg==
-  dependencies:
-    anymatch "^2.0.0"
-    async-each "^1.0.1"
-    braces "^2.3.2"
-    glob-parent "^5.1.2"
-    inherits "^2.0.3"
-    is-binary-path "^1.0.0"
-    is-glob "^4.0.0"
-    normalize-path "^3.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.2.1"
-    upath "^1.1.1"
+"@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.3":
+  version "2.1.8-no-fsevents.3"
+  resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz#323d72dd25103d0c4fbdce89dadf574a787b1f9b"
+  integrity sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==
 
 "@nodelib/fs.scandir@2.1.4":
   version "2.1.4"
@@ -3971,6 +3950,13 @@
     "@gar/promisify" "^1.1.3"
     semver "^7.3.5"
 
+"@npmcli/fs@^3.1.0":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.1.tgz#59cdaa5adca95d135fc00f2bb53f5771575ce726"
+  integrity sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==
+  dependencies:
+    semver "^7.3.5"
+
 "@npmcli/git@^2.1.0":
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-2.1.0.tgz#2fbd77e147530247d37f325930d457b3ebe894f6"
@@ -4000,6 +3986,20 @@
     semver "^7.3.5"
     which "^2.0.2"
 
+"@npmcli/git@^4.0.0":
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-4.1.0.tgz#ab0ad3fd82bc4d8c1351b6c62f0fa56e8fe6afa6"
+  integrity sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ==
+  dependencies:
+    "@npmcli/promise-spawn" "^6.0.0"
+    lru-cache "^7.4.4"
+    npm-pick-manifest "^8.0.0"
+    proc-log "^3.0.0"
+    promise-inflight "^1.0.1"
+    promise-retry "^2.0.1"
+    semver "^7.3.5"
+    which "^3.0.0"
+
 "@npmcli/installed-package-contents@^1.0.6", "@npmcli/installed-package-contents@^1.0.7":
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz#ab7408c6147911b970a8abe261ce512232a3f4fa"
@@ -4008,6 +4008,14 @@
     npm-bundled "^1.1.1"
     npm-normalize-package-bin "^1.0.1"
 
+"@npmcli/installed-package-contents@^2.0.1":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz#63048e5f6e40947a3a88dcbcb4fd9b76fdd37c17"
+  integrity sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==
+  dependencies:
+    npm-bundled "^3.0.0"
+    npm-normalize-package-bin "^3.0.0"
+
 "@npmcli/map-workspaces@^2.0.3":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-2.0.4.tgz#9e5e8ab655215a262aefabf139782b894e0504fc"
@@ -4059,6 +4067,11 @@
   resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-2.0.0.tgz#8c20e53e34e9078d18815c1d2dda6f2420d75e35"
   integrity sha512-doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A==
 
+"@npmcli/node-gyp@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz#101b2d0490ef1aa20ed460e4c0813f0db560545a"
+  integrity sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==
+
 "@npmcli/package-json@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-2.0.0.tgz#3bbcf4677e21055adbe673d9f08c9f9cde942e4a"
@@ -4080,6 +4093,13 @@
   dependencies:
     infer-owner "^1.0.4"
 
+"@npmcli/promise-spawn@^6.0.0", "@npmcli/promise-spawn@^6.0.1":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz#c8bc4fa2bd0f01cb979d8798ba038f314cfa70f2"
+  integrity sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==
+  dependencies:
+    which "^3.0.0"
+
 "@npmcli/run-script@^1.8.2":
   version "1.8.6"
   resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.6.tgz#18314802a6660b0d4baa4c3afe7f1ad39d8c28b7"
@@ -4101,6 +4121,17 @@
     read-package-json-fast "^2.0.3"
     which "^2.0.2"
 
+"@npmcli/run-script@^6.0.0":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-6.0.2.tgz#a25452d45ee7f7fb8c16dfaf9624423c0c0eb885"
+  integrity sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA==
+  dependencies:
+    "@npmcli/node-gyp" "^3.0.0"
+    "@npmcli/promise-spawn" "^6.0.0"
+    node-gyp "^9.0.0"
+    read-package-json-fast "^3.0.0"
+    which "^3.0.0"
+
 "@nrwl/cli@15.0.13":
   version "15.0.13"
   resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-15.0.13.tgz#25b632e68464f9673e936a31b3bb2b3e6de87ebf"
@@ -5285,6 +5316,11 @@
   dependencies:
     esquery "^1.0.1"
 
+"@pkgjs/parseargs@^0.11.0":
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
+  integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
+
 "@polka/url@^1.0.0-next.20":
   version "1.0.0-next.21"
   resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1"
@@ -5444,70 +5480,85 @@
   resolved "https://registry.yarnpkg.com/@react-native/polyfills/-/polyfills-1.0.0.tgz#05bb0031533598f9458cf65a502b8df0eecae780"
   integrity sha512-0jbp4RxjYopTsIdLl+/Fy2TiwVYHy4mgeu07DG4b/LyM0OS/+lPP5c9sbnt/AMlnF6qz2JRZpPpGw1eMNS6A4w==
 
-"@rollup/rollup-android-arm-eabi@4.8.0":
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.8.0.tgz#0e42b155630adaaec0f659f979ece4b7d3391329"
-  integrity sha512-zdTObFRoNENrdPpnTNnhOljYIcOX7aI7+7wyrSpPFFIOf/nRdedE6IYsjaBE7tjukphh1tMTojgJ7p3lKY8x6Q==
-
-"@rollup/rollup-android-arm64@4.8.0":
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.8.0.tgz#6c9fe8f9eb0cd9029be93b822b1a1c2d6b31c275"
-  integrity sha512-aiItwP48BiGpMFS9Znjo/xCNQVwTQVcRKkFKsO81m8exrGjHkCBDvm9PHay2kpa8RPnZzzKcD1iQ9KaLY4fPQQ==
-
-"@rollup/rollup-darwin-arm64@4.8.0":
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.8.0.tgz#7dcb1317a8089762c1f7e437c1e1d695b787b70f"
-  integrity sha512-zhNIS+L4ZYkYQUjIQUR6Zl0RXhbbA0huvNIWjmPc2SL0cB1h5Djkcy+RZ3/Bwszfb6vgwUvcVJYD6e6Zkpsi8g==
-
-"@rollup/rollup-darwin-x64@4.8.0":
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.8.0.tgz#91d7d31d22607c4fcccce9126457d6785c57f7c7"
-  integrity sha512-A/FAHFRNQYrELrb/JHncRWzTTXB2ticiRFztP4ggIUAfa9Up1qfW8aG2w/mN9jNiZ+HB0t0u0jpJgFXG6BfRTA==
-
-"@rollup/rollup-linux-arm-gnueabihf@4.8.0":
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.8.0.tgz#f2015d6e4ff41417f2e2c55b3d9625346e355c57"
-  integrity sha512-JsidBnh3p2IJJA4/2xOF2puAYqbaczB3elZDT0qHxn362EIoIkq7hrR43Xa8RisgI6/WPfvb2umbGsuvf7E37A==
-
-"@rollup/rollup-linux-arm64-gnu@4.8.0":
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.8.0.tgz#95207444b78f235c9de62797ec2a3dcd18daf473"
-  integrity sha512-hBNCnqw3EVCkaPB0Oqd24bv8SklETptQWcJz06kb9OtiShn9jK1VuTgi7o4zPSt6rNGWQOTDEAccbk0OqJmS+g==
-
-"@rollup/rollup-linux-arm64-musl@4.8.0":
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.8.0.tgz#bc994c676fd3aae14aaa905040fdcde461e41ce5"
-  integrity sha512-Fw9ChYfJPdltvi9ALJ9wzdCdxGw4wtq4t1qY028b2O7GwB5qLNSGtqMsAel1lfWTZvf4b6/+4HKp0GlSYg0ahA==
-
-"@rollup/rollup-linux-riscv64-gnu@4.8.0":
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.8.0.tgz#67984f1d1f663610f4e1f6e638a2b07169562448"
-  integrity sha512-BH5xIh7tOzS9yBi8dFrCTG8Z6iNIGWGltd3IpTSKp6+pNWWO6qy8eKoRxOtwFbMrid5NZaidLYN6rHh9aB8bEw==
-
-"@rollup/rollup-linux-x64-gnu@4.8.0":
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.8.0.tgz#48e09a455d543be986003c7c2ea37c16ff4a53d5"
-  integrity sha512-PmvAj8k6EuWiyLbkNpd6BLv5XeYFpqWuRvRNRl80xVfpGXK/z6KYXmAgbI4ogz7uFiJxCnYcqyvZVD0dgFog7Q==
-
-"@rollup/rollup-linux-x64-musl@4.8.0":
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.8.0.tgz#df8d0966b02d1bdc6447b5eb58fa18666da1f3e8"
-  integrity sha512-mdxnlW2QUzXwY+95TuxZ+CurrhgrPAMveDWI97EQlA9bfhR8tw3Pt7SUlc/eSlCNxlWktpmT//EAA8UfCHOyXg==
-
-"@rollup/rollup-win32-arm64-msvc@4.8.0":
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.8.0.tgz#7cce8efc5c9239a1bafe7ac2a52743bc5734471f"
-  integrity sha512-ge7saUz38aesM4MA7Cad8CHo0Fyd1+qTaqoIo+Jtk+ipBi4ATSrHWov9/S4u5pbEQmLjgUjB7BJt+MiKG2kzmA==
-
-"@rollup/rollup-win32-ia32-msvc@4.8.0":
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.8.0.tgz#794ef4058d04f97447e4434c083b1309b2be73c2"
-  integrity sha512-p9E3PZlzurhlsN5h9g7zIP1DnqKXJe8ZUkFwAazqSvHuWfihlIISPxG9hCHCoA+dOOspL/c7ty1eeEVFTE0UTw==
-
-"@rollup/rollup-win32-x64-msvc@4.8.0":
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.8.0.tgz#05057436705f0be9203c30612a48225ec70af741"
-  integrity sha512-kb4/auKXkYKqlUYTE8s40FcJIj5soOyRLHKd4ugR0dCq0G2EfcF54eYcfQiGkHzjidZ40daB4ulsFdtqNKZtBg==
+"@rollup/rollup-android-arm-eabi@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.0.tgz#1661ff5ea9beb362795304cb916049aba7ac9c54"
+  integrity sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA==
+
+"@rollup/rollup-android-arm64@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.0.tgz#2ffaa91f1b55a0082b8a722525741aadcbd3971e"
+  integrity sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA==
+
+"@rollup/rollup-darwin-arm64@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.0.tgz#627007221b24b8cc3063703eee0b9177edf49c1f"
+  integrity sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA==
+
+"@rollup/rollup-darwin-x64@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.0.tgz#0605506142b9e796c370d59c5984ae95b9758724"
+  integrity sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ==
+
+"@rollup/rollup-linux-arm-gnueabihf@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.0.tgz#62dfd196d4b10c0c2db833897164d2d319ee0cbb"
+  integrity sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA==
+
+"@rollup/rollup-linux-arm-musleabihf@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.0.tgz#53ce72aeb982f1f34b58b380baafaf6a240fddb3"
+  integrity sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw==
+
+"@rollup/rollup-linux-arm64-gnu@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.0.tgz#1632990f62a75c74f43e4b14ab3597d7ed416496"
+  integrity sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA==
+
+"@rollup/rollup-linux-arm64-musl@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.0.tgz#8c03a996efb41e257b414b2e0560b7a21f2d9065"
+  integrity sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw==
+
+"@rollup/rollup-linux-powerpc64le-gnu@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.0.tgz#5b98729628d5bcc8f7f37b58b04d6845f85c7b5d"
+  integrity sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw==
+
+"@rollup/rollup-linux-riscv64-gnu@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.0.tgz#48e42e41f4cabf3573cfefcb448599c512e22983"
+  integrity sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg==
+
+"@rollup/rollup-linux-s390x-gnu@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.0.tgz#e0b4f9a966872cb7d3e21b9e412a4b7efd7f0b58"
+  integrity sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g==
+
+"@rollup/rollup-linux-x64-gnu@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.0.tgz#78144741993100f47bd3da72fce215e077ae036b"
+  integrity sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A==
+
+"@rollup/rollup-linux-x64-musl@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.0.tgz#d9fe32971883cd1bd858336bd33a1c3ca6146127"
+  integrity sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ==
+
+"@rollup/rollup-win32-arm64-msvc@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.0.tgz#71fa3ea369316db703a909c790743972e98afae5"
+  integrity sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ==
+
+"@rollup/rollup-win32-ia32-msvc@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.0.tgz#653f5989a60658e17d7576a3996deb3902e342e2"
+  integrity sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ==
+
+"@rollup/rollup-win32-x64-msvc@4.24.0":
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.0.tgz#0574d7e87b44ee8511d08cc7f914bcb802b70818"
+  integrity sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==
 
 "@rushstack/eslint-patch@^1.0.8":
   version "1.1.0"
@@ -5579,6 +5630,35 @@
   resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
   integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
 
+"@sigstore/bundle@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@sigstore/bundle/-/bundle-1.1.0.tgz#17f8d813b09348b16eeed66a8cf1c3d6bd3d04f1"
+  integrity sha512-PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog==
+  dependencies:
+    "@sigstore/protobuf-specs" "^0.2.0"
+
+"@sigstore/protobuf-specs@^0.2.0":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz#be9ef4f3c38052c43bd399d3f792c97ff9e2277b"
+  integrity sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==
+
+"@sigstore/sign@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@sigstore/sign/-/sign-1.0.0.tgz#6b08ebc2f6c92aa5acb07a49784cb6738796f7b4"
+  integrity sha512-INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA==
+  dependencies:
+    "@sigstore/bundle" "^1.1.0"
+    "@sigstore/protobuf-specs" "^0.2.0"
+    make-fetch-happen "^11.0.1"
+
+"@sigstore/tuf@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@sigstore/tuf/-/tuf-1.0.3.tgz#2a65986772ede996485728f027b0514c0b70b160"
+  integrity sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==
+  dependencies:
+    "@sigstore/protobuf-specs" "^0.2.0"
+    tuf-js "^1.1.7"
+
 "@sindresorhus/is@^0.14.0":
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
@@ -6212,6 +6292,19 @@
   resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
   integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
 
+"@tufjs/canonical-json@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz#eade9fd1f537993bc1f0949f3aea276ecc4fab31"
+  integrity sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==
+
+"@tufjs/models@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@tufjs/models/-/models-1.0.4.tgz#5a689630f6b9dbda338d4b208019336562f176ef"
+  integrity sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==
+  dependencies:
+    "@tufjs/canonical-json" "1.0.0"
+    minimatch "^9.0.0"
+
 "@types/argparse@1.0.38":
   version "1.0.38"
   resolved "https://registry.yarnpkg.com/@types/argparse/-/argparse-1.0.38.tgz#a81fd8606d481f873a3800c6ebae4f1d768a56a9"
@@ -6309,10 +6402,10 @@
     "@types/cheerio" "*"
     "@types/react" "*"
 
-"@types/estree@*", "@types/estree@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2"
-  integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==
+"@types/estree@*", "@types/estree@1.0.6", "@types/estree@^1.0.0":
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
+  integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
 
 "@types/estree@0.0.39":
   version "0.0.39"
@@ -7818,11 +7911,6 @@ accepts@^1.3.7, accepts@~1.3.3, accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7,
     mime-types "~2.1.34"
     negotiator "0.6.3"
 
-acorn-dynamic-import@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
-  integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
-
 acorn-globals@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
@@ -7846,7 +7934,7 @@ acorn-globals@^6.0.0:
     acorn "^7.1.1"
     acorn-walk "^7.1.1"
 
-acorn-jsx@^5.0.1, acorn-jsx@^5.2.0, acorn-jsx@^5.3.2:
+acorn-jsx@^5.2.0, acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
@@ -7900,10 +7988,10 @@ acorn@^7.0.0, acorn@^7.1.0, acorn@^7.1.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.0.4, acorn@^8.11.2, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.8.0, acorn@^8.8.2:
-  version "8.11.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b"
-  integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==
+acorn@^8.0.4, acorn@^8.11.2, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.8.0, acorn@^8.8.2:
+  version "8.13.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.13.0.tgz#2a30d670818ad16ddd6a35d3842dacec9e5d7ca3"
+  integrity sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==
 
 add-stream@^1.0.0:
   version "1.0.0"
@@ -8615,6 +8703,13 @@ assign-symbols@^1.0.0:
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
+ast-metadata-inferer@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/ast-metadata-inferer/-/ast-metadata-inferer-0.8.0.tgz#0f94c3425e310d8da45823ab2161142e3f134343"
+  integrity sha512-jOMKcHht9LxYIEQu+RVd22vtgrPaVCtDRQ/16IGmurdzxvYbDd5ynxjnyrzLnieG96eTcAyaoj/wN/4/1FyyeA==
+  dependencies:
+    "@mdn/browser-compat-data" "^5.2.34"
+
 ast-types-flow@^0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
@@ -8999,7 +9094,7 @@ babel-jest@27.4.6, babel-jest@^27.4.6:
     graceful-fs "^4.2.4"
     slash "^3.0.0"
 
-babel-loader@8.1.0, babel-loader@8.2.2, babel-loader@^8.0.5, babel-loader@^8.2.2:
+babel-loader@8.1.0, babel-loader@8.2.2, babel-loader@9.2.1, babel-loader@^8.0.5, babel-loader@^8.2.2:
   version "8.2.2"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81"
   integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==
@@ -9210,60 +9305,29 @@ babel-plugin-module-resolver@^4.1.0:
     reselect "^4.0.0"
     resolve "^1.13.1"
 
-babel-plugin-polyfill-corejs2@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz#e9124785e6fd94f94b618a7954e5693053bf5327"
-  integrity sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==
-  dependencies:
-    "@babel/compat-data" "^7.13.11"
-    "@babel/helper-define-polyfill-provider" "^0.2.2"
-    semver "^6.1.1"
-
-babel-plugin-polyfill-corejs2@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122"
-  integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==
-  dependencies:
-    "@babel/compat-data" "^7.17.7"
-    "@babel/helper-define-polyfill-provider" "^0.3.3"
-    semver "^6.1.1"
-
-babel-plugin-polyfill-corejs3@^0.2.2:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.5.tgz#2779846a16a1652244ae268b1e906ada107faf92"
-  integrity sha512-ninF5MQNwAX9Z7c9ED+H2pGt1mXdP4TqzlHKyPIYmJIYz0N+++uwdM7RnJukklhzJ54Q84vA4ZJkgs7lu5vqcw==
-  dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.2.2"
-    core-js-compat "^3.16.2"
-
-babel-plugin-polyfill-corejs3@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a"
-  integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==
+babel-plugin-polyfill-corejs2@^0.4.10:
+  version "0.4.11"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz#30320dfe3ffe1a336c15afdcdafd6fd615b25e33"
+  integrity sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.3"
-    core-js-compat "^3.25.1"
-
-babel-plugin-polyfill-es-shims@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-es-shims/-/babel-plugin-polyfill-es-shims-0.0.7.tgz#7520e219c8e170bc96b71ade382ac2462bfae922"
-  integrity sha512-iFCEP54EoQuj7aMdGIE5xAOEGhDK9j9bFnWyB3/GuHe8KDgAcaYnZ3ejsU8tz4OzwJLVUxKk2vPExfGRs2mcKA==
-  dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.0.5"
+    "@babel/compat-data" "^7.22.6"
+    "@babel/helper-define-polyfill-provider" "^0.6.2"
+    semver "^6.3.1"
 
-babel-plugin-polyfill-regenerator@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz#b310c8d642acada348c1fa3b3e6ce0e851bee077"
-  integrity sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==
+babel-plugin-polyfill-corejs3@^0.10.6:
+  version "0.10.6"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz#2deda57caef50f59c525aeb4964d3b2f867710c7"
+  integrity sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.2.2"
+    "@babel/helper-define-polyfill-provider" "^0.6.2"
+    core-js-compat "^3.38.0"
 
-babel-plugin-polyfill-regenerator@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747"
-  integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==
+babel-plugin-polyfill-regenerator@^0.6.1:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz#addc47e240edd1da1058ebda03021f382bba785e"
+  integrity sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.3"
+    "@babel/helper-define-polyfill-provider" "^0.6.2"
 
 babel-plugin-react-native-web@~0.17.1:
   version "0.17.5"
@@ -9829,7 +9893,7 @@ boxen@^4.1.0, boxen@^4.2.0:
     type-fest "^0.8.1"
     widest-line "^3.1.0"
 
-boxen@^5.0.1:
+boxen@^5.0.0, boxen@^5.0.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50"
   integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==
@@ -10089,14 +10153,14 @@ browserslist@4.7.0:
     electron-to-chromium "^1.3.247"
     node-releases "^1.1.29"
 
-browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.1, browserslist@^4.21.4, browserslist@^4.24.0, browserslist@^4.3.4, browserslist@^4.5.4, browserslist@^4.6.0, browserslist@^4.6.4, browserslist@^4.6.6:
-  version "4.24.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.4.tgz#c6b2865a3f08bcb860a0e827389003b9fe686e4b"
-  integrity sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==
+browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.1, browserslist@^4.21.4, browserslist@^4.23.1, browserslist@^4.23.3, browserslist@^4.24.0, browserslist@^4.3.4, browserslist@^4.5.4, browserslist@^4.6.4, browserslist@^4.6.6:
+  version "4.24.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.2.tgz#f5845bc91069dbd55ee89faf9822e1d885d16580"
+  integrity sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==
   dependencies:
-    caniuse-lite "^1.0.30001688"
-    electron-to-chromium "^1.5.73"
-    node-releases "^2.0.19"
+    caniuse-lite "^1.0.30001669"
+    electron-to-chromium "^1.5.41"
+    node-releases "^2.0.18"
     update-browserslist-db "^1.1.1"
 
 bs-logger@0.x:
@@ -10113,20 +10177,6 @@ bser@^2.0.0:
   dependencies:
     node-int64 "^0.4.0"
 
-buble@^0.19.6:
-  version "0.19.8"
-  resolved "https://registry.yarnpkg.com/buble/-/buble-0.19.8.tgz#d642f0081afab66dccd897d7b6360d94030b9d3d"
-  integrity sha512-IoGZzrUTY5fKXVkgGHw3QeXFMUNBFv+9l8a4QJKG1JhG3nCMHTdEX1DCOg8568E2Q9qvAQIiSokv6Jsgx8p2cA==
-  dependencies:
-    acorn "^6.1.1"
-    acorn-dynamic-import "^4.0.0"
-    acorn-jsx "^5.0.1"
-    chalk "^2.4.2"
-    magic-string "^0.25.3"
-    minimist "^1.2.0"
-    os-homedir "^2.0.0"
-    regexpu-core "^4.5.4"
-
 buffer-alloc-unsafe@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
@@ -10390,6 +10440,24 @@ cacache@^16.0.0, cacache@^16.0.6, cacache@^16.1.0:
     tar "^6.1.11"
     unique-filename "^2.0.0"
 
+cacache@^17.0.0:
+  version "17.1.4"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-17.1.4.tgz#b3ff381580b47e85c6e64f801101508e26604b35"
+  integrity sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==
+  dependencies:
+    "@npmcli/fs" "^3.1.0"
+    fs-minipass "^3.0.0"
+    glob "^10.2.2"
+    lru-cache "^7.7.1"
+    minipass "^7.0.3"
+    minipass-collect "^1.0.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    p-map "^4.0.0"
+    ssri "^10.0.0"
+    tar "^6.1.11"
+    unique-filename "^3.0.0"
+
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -10606,7 +10674,7 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001179, caniuse-lite@^1.0.30001228, caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001579, caniuse-lite@^1.0.30001688:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001179, caniuse-lite@^1.0.30001228, caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001579, caniuse-lite@^1.0.30001639, caniuse-lite@^1.0.30001669:
   version "1.0.30001692"
   resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001692.tgz"
   integrity sha512-A95VKan0kdtrsnMubMKxEKUKImOPSuCpYgxSQBo036P5YYgVIcOYJEgt/txJWqObiRQeISNCfef9nvlQ0vbV7A==
@@ -10861,10 +10929,10 @@ cheerio@^1.0.0-rc.3:
     parse5-htmlparser2-tree-adapter "^6.0.1"
     tslib "^2.2.0"
 
-"chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.3.0, chokidar@^3.4.0, chokidar@^3.4.1, chokidar@^3.5.1, chokidar@^3.5.2, chokidar@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
-  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+"chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.3.0, chokidar@^3.4.1, chokidar@^3.5.1, chokidar@^3.5.2, chokidar@^3.5.3, chokidar@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
+  integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
   dependencies:
     anymatch "~3.1.2"
     braces "~3.0.2"
@@ -11311,7 +11379,7 @@ colors@0.5.x:
   resolved "https://registry.yarnpkg.com/colors/-/colors-0.5.1.tgz#7d0023eaeb154e8ee9fce75dcb923d0ed1667774"
   integrity sha1-fQAj6usVTo7p/Oddy5I9DtFmd3Q=
 
-colors@1.4.0, colors@^1.1.2, colors@^1.3.3, colors@^1.4.0:
+colors@1.4.0, colors@^1.1.2, colors@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
@@ -11416,9 +11484,9 @@ commander@^2.18.0, commander@^2.19.0, commander@^2.20.0, commander@^2.9.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^6.2.1:
+commander@^6.2.0, commander@^6.2.1:
   version "6.2.1"
-  resolved "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
   integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
 
 commander@^7.0.0, commander@^7.2.0:
@@ -11864,12 +11932,12 @@ copy-webpack-plugin@~6.0.3:
     serialize-javascript "^4.0.0"
     webpack-sources "^1.4.3"
 
-core-js-compat@^3.1.1, core-js-compat@^3.12.1, core-js-compat@^3.16.0, core-js-compat@^3.16.2, core-js-compat@^3.25.1:
-  version "3.26.1"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.26.1.tgz#0e710b09ebf689d719545ac36e49041850f943df"
-  integrity sha512-622/KzTudvXCDLRw70iHW4KKs1aGpcRcowGWyYJr2DEBfRrd6hNJybxSWJFuZYD4ma86xhrwDDHxmDaIq4EA8A==
+core-js-compat@^3.12.1, core-js-compat@^3.38.0, core-js-compat@^3.38.1:
+  version "3.38.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.38.1.tgz#2bc7a298746ca5a7bcb9c164bcb120f2ebc09a09"
+  integrity sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==
   dependencies:
-    browserslist "^4.21.4"
+    browserslist "^4.23.3"
 
 core-js-pure@^3.0.0, core-js-pure@^3.0.1:
   version "3.8.3"
@@ -13451,10 +13519,10 @@ ejs@^3.0.0, ejs@^3.0.1, ejs@^3.1.7:
   dependencies:
     jake "^10.8.5"
 
-electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.564, electron-to-chromium@^1.5.73:
-  version "1.5.83"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.83.tgz#3f74078f0c83e24bf7e692eaa855a998d1bec34f"
-  integrity sha512-LcUDPqSt+V0QmI47XLzZrz5OqILSMGsPFkDYus22rIbgorSvBYEFqq854ltTmUdHkY92FSdAAvsh4jWEULMdfQ==
+electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.564, electron-to-chromium@^1.5.41:
+  version "1.5.45"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.45.tgz#fa592ce6a88b44d23acbc7453a2feab98996e6c9"
+  integrity sha512-vOzZS6uZwhhbkZbcRyiy99Wg+pYFV5hk+5YaECvx0+Z31NR3Tt5zS6dze2OepT6PCTzVzT0dIJItti+uAW5zmw==
 
 element-resize-detector@^1.2.1:
   version "1.2.4"
@@ -13958,6 +14026,20 @@ eslint-module-utils@^2.6.2, eslint-module-utils@^2.7.2:
   dependencies:
     debug "^3.2.7"
 
+eslint-plugin-compat@6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-compat/-/eslint-plugin-compat-6.0.1.tgz#2852f41893802870a530b2ac087499b4556882b6"
+  integrity sha512-0MeIEuoy8kWkOhW38kK8hU4vkb6l/VvyjpuYDymYOXmUY9NvTgyErF16lYuX+HPS5hkmym7lfA+XpYZiWYWmYA==
+  dependencies:
+    "@mdn/browser-compat-data" "^5.5.35"
+    ast-metadata-inferer "^0.8.0"
+    browserslist "^4.23.1"
+    caniuse-lite "^1.0.30001639"
+    find-up "^5.0.0"
+    globals "^15.7.0"
+    lodash.memoize "^4.1.2"
+    semver "^7.6.2"
+
 eslint-plugin-deprecation@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/eslint-plugin-deprecation/-/eslint-plugin-deprecation-1.3.2.tgz#a8125d28c56158cdfa1a685197e6be8ed86f189e"
@@ -15204,11 +15286,6 @@ filesize@6.1.0:
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.1.0.tgz#e81bdaa780e2451d714d71c0d7a4f3238d37ad00"
   integrity sha512-LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg==
 
-filesize@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-4.1.2.tgz#fcd570af1353cea97897be64f56183adb995994b"
-  integrity sha512-iSWteWtfNcrWQTkQw8ble2bnonSl7YJImsn9OZKpE2E4IHhXI78eASpDYUljXZZdYj36QsEKjOs/CsiDqmKMJw==
-
 filesize@^6.1.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.4.0.tgz#914f50471dd66fdca3cefe628bd0cde4ef769bcd"
@@ -15492,6 +15569,14 @@ foreach@^2.0.5:
   resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
   integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
 
+foreground-child@^3.1.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.0.tgz#0ac8644c06e431439f8561db8ecf29a7b5519c77"
+  integrity sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==
+  dependencies:
+    cross-spawn "^7.0.0"
+    signal-exit "^4.0.1"
+
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -15714,6 +15799,13 @@ fs-minipass@^2.0.0, fs-minipass@^2.1.0:
   dependencies:
     minipass "^3.0.0"
 
+fs-minipass@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.3.tgz#79a85981c4dc120065e96f62086bf6f9dc26cc54"
+  integrity sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==
+  dependencies:
+    minipass "^7.0.3"
+
 fs-monkey@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3"
@@ -16123,6 +16215,18 @@ glob@7.1.7, glob@~7.1.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^10.2.2:
+  version "10.4.5"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956"
+  integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^3.1.2"
+    minimatch "^9.0.4"
+    minipass "^7.1.2"
+    package-json-from-dist "^1.0.0"
+    path-scurry "^1.11.1"
+
 glob@^6.0.1:
   version "6.0.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
@@ -16227,6 +16331,11 @@ globals@^13.2.0, globals@^13.6.0, globals@^13.9.0:
   dependencies:
     type-fest "^0.20.2"
 
+globals@^15.7.0:
+  version "15.11.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-15.11.0.tgz#b96ed4c6998540c6fb824b24b5499216d2438d6e"
+  integrity sha512-yeyNSjdbyVaWurlwCpcA6XNBrHTMIeDdj0/hnvX/OLJ9ekOXYbLsLinH/MucQyGvNnXhidTdNhTtJaffL2sMfw==
+
 globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
@@ -16935,6 +17044,13 @@ hosted-git-info@^5.0.0:
   dependencies:
     lru-cache "^7.5.1"
 
+hosted-git-info@^6.0.0:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-6.1.1.tgz#629442c7889a69c05de604d52996b74fe6f26d58"
+  integrity sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==
+  dependencies:
+    lru-cache "^7.5.1"
+
 hpack.js@^2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
@@ -17428,6 +17544,13 @@ ignore-walk@^5.0.1:
   dependencies:
     minimatch "^5.0.1"
 
+ignore-walk@^6.0.0:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-6.0.5.tgz#ef8d61eab7da169078723d1f82833b36e200b0dd"
+  integrity sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==
+  dependencies:
+    minimatch "^9.0.0"
+
 ignore@^3.3.5:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
@@ -18625,6 +18748,15 @@ iterate-value@^1.0.2:
     es-get-iterator "^1.0.2"
     iterate-iterator "^1.0.1"
 
+jackspeak@^3.1.2:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.3.tgz#8833a9d89ab4acde6188942bd1c53b6390ed5a8a"
+  integrity sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==
+  dependencies:
+    "@isaacs/cliui" "^8.0.2"
+  optionalDependencies:
+    "@pkgjs/parseargs" "^0.11.0"
+
 jake@^10.8.5:
   version "10.8.5"
   resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46"
@@ -19607,15 +19739,10 @@ jsesc@^1.3.0:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
   integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
 
-jsesc@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.1.0.tgz#74d335a234f67ed19907fdadfac7ccf9d409825d"
-  integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==
-
-jsesc@~0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
+jsesc@^3.0.2, jsesc@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e"
+  integrity sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==
 
 json-buffer@3.0.0:
   version "3.0.0"
@@ -19637,6 +19764,11 @@ json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
 
+json-parse-even-better-errors@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz#b43d35e89c0f3be6b5fbbe9dc6c82467b30c28da"
+  integrity sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==
+
 json-schema-deref-sync@^0.13.0:
   version "0.13.0"
   resolved "https://registry.yarnpkg.com/json-schema-deref-sync/-/json-schema-deref-sync-0.13.0.tgz#cb08b4ff435a48b5a149652d7750fdd071009823"
@@ -20635,6 +20767,11 @@ lowlight@~1.11.0:
     fault "^1.0.2"
     highlight.js "~9.13.0"
 
+lru-cache@^10.2.0:
+  version "10.4.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
+  integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
+
 lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3, lru-cache@^4.1.5:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
@@ -20679,7 +20816,7 @@ magic-string@^0.22.5:
   dependencies:
     vlq "^0.2.2"
 
-magic-string@^0.25.1, magic-string@^0.25.2, magic-string@^0.25.3, magic-string@^0.25.7:
+magic-string@^0.25.1, magic-string@^0.25.2, magic-string@^0.25.7:
   version "0.25.9"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c"
   integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==
@@ -20742,6 +20879,27 @@ make-fetch-happen@^10.0.3, make-fetch-happen@^10.0.6:
     socks-proxy-agent "^7.0.0"
     ssri "^9.0.0"
 
+make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1, make-fetch-happen@^11.1.1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz#85ceb98079584a9523d4bf71d32996e7e208549f"
+  integrity sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==
+  dependencies:
+    agentkeepalive "^4.2.1"
+    cacache "^17.0.0"
+    http-cache-semantics "^4.1.1"
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.0"
+    is-lambda "^1.0.1"
+    lru-cache "^7.7.1"
+    minipass "^5.0.0"
+    minipass-fetch "^3.0.0"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    negotiator "^0.6.3"
+    promise-retry "^2.0.1"
+    socks-proxy-agent "^7.0.0"
+    ssri "^10.0.0"
+
 make-fetch-happen@^9.0.1:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
@@ -21978,6 +22136,13 @@ minimatch@^5.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
+minimatch@^9.0.0, minimatch@^9.0.4:
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
+  integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimatch@~3.0.2, minimatch@~3.0.3:
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz#5e6a59bd11e2ab0de1cfb843eb2d82e546c321c1"
@@ -22038,6 +22203,17 @@ minipass-fetch@^2.0.3:
   optionalDependencies:
     encoding "^0.1.13"
 
+minipass-fetch@^3.0.0:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.5.tgz#f0f97e40580affc4a35cc4a1349f05ae36cb1e4c"
+  integrity sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==
+  dependencies:
+    minipass "^7.0.3"
+    minipass-sized "^1.0.3"
+    minizlib "^2.1.2"
+  optionalDependencies:
+    encoding "^0.1.13"
+
 minipass-flush@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
@@ -22095,6 +22271,16 @@ minipass@^4.0.0:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.8.tgz#f0010f64393ecfc1d1ccb5f582bcaf45f48e1a3a"
   integrity sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==
 
+minipass@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
+  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
+
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.3, minipass@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
+  integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
+
 minizlib@^1.1.0, minizlib@^1.2.1:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
@@ -22696,10 +22882,10 @@ node-releases@^1.1.29, node-releases@^1.1.61:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.77.tgz#50b0cfede855dd374e7585bf228ff34e57c1c32e"
   integrity sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ==
 
-node-releases@^2.0.19:
-  version "2.0.19"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.19.tgz#9e445a52950951ec4d177d843af370b411caf314"
-  integrity sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==
+node-releases@^2.0.18:
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
+  integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
 
 node-res@^5.0.1:
   version "5.0.1"
@@ -22805,6 +22991,16 @@ normalize-package-data@^4.0.0:
     semver "^7.3.5"
     validate-npm-package-license "^3.0.4"
 
+normalize-package-data@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-5.0.0.tgz#abcb8d7e724c40d88462b84982f7cbf6859b4588"
+  integrity sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==
+  dependencies:
+    hosted-git-info "^6.0.0"
+    is-core-module "^2.8.1"
+    semver "^7.3.5"
+    validate-npm-package-license "^3.0.4"
+
 normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
@@ -22861,6 +23057,13 @@ npm-bundled@^2.0.0:
   dependencies:
     npm-normalize-package-bin "^2.0.0"
 
+npm-bundled@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-3.0.1.tgz#cca73e15560237696254b10170d8f86dad62da25"
+  integrity sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==
+  dependencies:
+    npm-normalize-package-bin "^3.0.0"
+
 npm-install-checks@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-4.0.0.tgz#a37facc763a2fde0497ef2c6d0ac7c3fbe00d7b4"
@@ -22875,6 +23078,13 @@ npm-install-checks@^5.0.0:
   dependencies:
     semver "^7.1.1"
 
+npm-install-checks@^6.0.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-6.3.0.tgz#046552d8920e801fa9f919cad569545d60e826fe"
+  integrity sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==
+  dependencies:
+    semver "^7.1.1"
+
 npm-normalize-package-bin@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
@@ -22885,6 +23095,11 @@ npm-normalize-package-bin@^2.0.0:
   resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-2.0.0.tgz#9447a1adaaf89d8ad0abe24c6c84ad614a675fff"
   integrity sha512-awzfKUO7v0FscrSpRoogyNm0sajikhBWpU0QMrW09AMi9n1PoKU6WaIqUzuJSQnpciZZmJ/jMZ2Egfmb/9LiWQ==
 
+npm-normalize-package-bin@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz#25447e32a9a7de1f51362c61a559233b89947832"
+  integrity sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==
+
 npm-package-arg@6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
@@ -22904,6 +23119,16 @@ npm-package-arg@8.1.1:
     semver "^7.0.0"
     validate-npm-package-name "^3.0.0"
 
+npm-package-arg@^10.0.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-10.1.0.tgz#827d1260a683806685d17193073cc152d3c7e9b1"
+  integrity sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==
+  dependencies:
+    hosted-git-info "^6.0.0"
+    proc-log "^3.0.0"
+    semver "^7.3.5"
+    validate-npm-package-name "^5.0.0"
+
 npm-package-arg@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-7.0.0.tgz#52cdf08b491c0c59df687c4c925a89102ef794a5"
@@ -22961,6 +23186,13 @@ npm-packlist@^5.1.0, npm-packlist@^5.1.1:
     npm-bundled "^2.0.0"
     npm-normalize-package-bin "^2.0.0"
 
+npm-packlist@^7.0.0:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-7.0.4.tgz#033bf74110eb74daf2910dc75144411999c5ff32"
+  integrity sha512-d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q==
+  dependencies:
+    ignore-walk "^6.0.0"
+
 npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz#7b5484ca2c908565f43b7f27644f36bb816f5148"
@@ -22981,6 +23213,16 @@ npm-pick-manifest@^7.0.0:
     npm-package-arg "^9.0.0"
     semver "^7.3.5"
 
+npm-pick-manifest@^8.0.0:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-8.0.2.tgz#2159778d9c7360420c925c1a2287b5a884c713aa"
+  integrity sha512-1dKY+86/AIiq1tkKVD3l0WI+Gd3vkknVGAggsFeBkTvbhMQ1OND/LKkYv4JtXPKUJ8bOTCyLiqEg2P6QNdK+Gg==
+  dependencies:
+    npm-install-checks "^6.0.0"
+    npm-normalize-package-bin "^3.0.0"
+    npm-package-arg "^10.0.0"
+    semver "^7.3.5"
+
 npm-registry-fetch@^11.0.0:
   version "11.0.0"
   resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz#68c1bb810c46542760d62a6a965f85a702d43a76"
@@ -23006,6 +23248,19 @@ npm-registry-fetch@^13.0.0, npm-registry-fetch@^13.0.1, npm-registry-fetch@^13.3
     npm-package-arg "^9.0.1"
     proc-log "^2.0.0"
 
+npm-registry-fetch@^14.0.0:
+  version "14.0.5"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz#fe7169957ba4986a4853a650278ee02e568d115d"
+  integrity sha512-kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA==
+  dependencies:
+    make-fetch-happen "^11.0.0"
+    minipass "^5.0.0"
+    minipass-fetch "^3.0.0"
+    minipass-json-stream "^1.0.1"
+    minizlib "^2.1.2"
+    npm-package-arg "^10.0.0"
+    proc-log "^3.0.0"
+
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -23465,11 +23720,6 @@ os-homedir@^1.0.0, os-homedir@^1.0.1:
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
-os-homedir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-2.0.0.tgz#a0c76bb001a8392a503cbd46e7e650b3423a923c"
-  integrity sha512-saRNz0DSC5C/I++gFIaJTXoFJMRwiP5zHar5vV3xQ2TkgEw6hDCcU5F272JjUylpiVgBrZNQHnfjkLabTfb92Q==
-
 os-locale@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
@@ -23711,6 +23961,11 @@ p-waterfall@^2.1.1:
   dependencies:
     p-reduce "^2.0.0"
 
+package-json-from-dist@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz#4f1471a010827a86f94cfd9b0727e36d267de505"
+  integrity sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==
+
 package-json@6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.4.0.tgz#4f626976604f4a9a41723ce1792b204a60b1b61e"
@@ -23793,6 +24048,30 @@ pacote@^13.0.3, pacote@^13.6.1:
     ssri "^9.0.0"
     tar "^6.1.11"
 
+pacote@^15.1.1:
+  version "15.2.0"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-15.2.0.tgz#0f0dfcc3e60c7b39121b2ac612bf8596e95344d3"
+  integrity sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==
+  dependencies:
+    "@npmcli/git" "^4.0.0"
+    "@npmcli/installed-package-contents" "^2.0.1"
+    "@npmcli/promise-spawn" "^6.0.1"
+    "@npmcli/run-script" "^6.0.0"
+    cacache "^17.0.0"
+    fs-minipass "^3.0.0"
+    minipass "^5.0.0"
+    npm-package-arg "^10.0.0"
+    npm-packlist "^7.0.0"
+    npm-pick-manifest "^8.0.0"
+    npm-registry-fetch "^14.0.0"
+    proc-log "^3.0.0"
+    promise-retry "^2.0.1"
+    read-package-json "^6.0.0"
+    read-package-json-fast "^3.0.0"
+    sigstore "^1.3.0"
+    ssri "^10.0.0"
+    tar "^6.1.11"
+
 pako@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
@@ -24134,6 +24413,14 @@ path-platform@~0.11.15:
   resolved "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz#e864217f74c36850f0852b78dc7bf7d4a5721bf2"
   integrity sha512-Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg==
 
+path-scurry@^1.11.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"
+  integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
+  dependencies:
+    lru-cache "^10.2.0"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
@@ -24198,7 +24485,7 @@ picocolors@^0.2.1:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
   integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
 
-picocolors@^1.0.0, picocolors@^1.1.1:
+picocolors@^1.0.0, picocolors@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
   integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
@@ -25427,6 +25714,11 @@ proc-log@^2.0.0, proc-log@^2.0.1:
   resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-2.0.1.tgz#8f3f69a1f608de27878f91f5c688b225391cb685"
   integrity sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==
 
+proc-log@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-3.0.0.tgz#fb05ef83ccd64fd7b20bbe9c8c1070fc08338dd8"
+  integrity sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==
+
 process-es6@^0.11.6:
   version "0.11.6"
   resolved "https://registry.yarnpkg.com/process-es6/-/process-es6-0.11.6.tgz#c6bb389f9a951f82bd4eb169600105bd2ff9c778"
@@ -26443,6 +26735,14 @@ read-package-json-fast@^2.0.1, read-package-json-fast@^2.0.2, read-package-json-
     json-parse-even-better-errors "^2.3.0"
     npm-normalize-package-bin "^1.0.1"
 
+read-package-json-fast@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz#394908a9725dc7a5f14e70c8e7556dff1d2b1049"
+  integrity sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==
+  dependencies:
+    json-parse-even-better-errors "^3.0.0"
+    npm-normalize-package-bin "^3.0.0"
+
 read-package-json@^5.0.0, read-package-json@^5.0.1:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-5.0.2.tgz#b8779ccfd169f523b67208a89cc912e3f663f3fa"
@@ -26453,6 +26753,16 @@ read-package-json@^5.0.0, read-package-json@^5.0.1:
     normalize-package-data "^4.0.0"
     npm-normalize-package-bin "^2.0.0"
 
+read-package-json@^6.0.0:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-6.0.4.tgz#90318824ec456c287437ea79595f4c2854708836"
+  integrity sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw==
+  dependencies:
+    glob "^10.2.2"
+    json-parse-even-better-errors "^3.0.0"
+    normalize-package-data "^5.0.0"
+    npm-normalize-package-bin "^3.0.0"
+
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -26703,17 +27013,10 @@ refractor@^2.4.1:
     parse-entities "^1.1.2"
     prismjs "~1.17.0"
 
-regenerate-unicode-properties@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
-  integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==
-  dependencies:
-    regenerate "^1.4.2"
-
-regenerate-unicode-properties@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326"
-  integrity sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==
+regenerate-unicode-properties@^10.2.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz#626e39df8c372338ea9b8028d1f99dc3fd9c3db0"
+  integrity sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==
   dependencies:
     regenerate "^1.4.2"
 
@@ -26742,10 +27045,10 @@ regenerator-runtime@^0.14.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
   integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
 
-regenerator-transform@^0.15.1:
-  version "0.15.1"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz#f6c4e99fc1b4591f780db2586328e4d9a9d8dc56"
-  integrity sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==
+regenerator-transform@^0.15.2:
+  version "0.15.2"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.2.tgz#5bbae58b522098ebdf09bca2f83838929001c7a4"
+  integrity sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==
   dependencies:
     "@babel/runtime" "^7.8.4"
 
@@ -26776,27 +27079,15 @@ regexpp@^3.2.0:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
-regexpu-core@^4.5.4:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0"
-  integrity sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==
-  dependencies:
-    regenerate "^1.4.2"
-    regenerate-unicode-properties "^9.0.0"
-    regjsgen "^0.5.2"
-    regjsparser "^0.7.0"
-    unicode-match-property-ecmascript "^2.0.0"
-    unicode-match-property-value-ecmascript "^2.0.0"
-
-regexpu-core@^5.2.1:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.2.2.tgz#3e4e5d12103b64748711c3aad69934d7718e75fc"
-  integrity sha512-T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw==
+regexpu-core@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-6.1.1.tgz#b469b245594cb2d088ceebc6369dceb8c00becac"
+  integrity sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw==
   dependencies:
     regenerate "^1.4.2"
-    regenerate-unicode-properties "^10.1.0"
-    regjsgen "^0.7.1"
-    regjsparser "^0.9.1"
+    regenerate-unicode-properties "^10.2.0"
+    regjsgen "^0.8.0"
+    regjsparser "^0.11.0"
     unicode-match-property-ecmascript "^2.0.0"
     unicode-match-property-value-ecmascript "^2.1.0"
 
@@ -26838,29 +27129,17 @@ registry-url@^5.0.0:
   dependencies:
     rc "^1.2.8"
 
-regjsgen@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
-  integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
-
-regjsgen@^0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.7.1.tgz#ee5ef30e18d3f09b7c369b76e7c2373ed25546f6"
-  integrity sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==
-
-regjsparser@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.7.0.tgz#a6b667b54c885e18b52554cb4960ef71187e9968"
-  integrity sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==
-  dependencies:
-    jsesc "~0.5.0"
+regjsgen@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.8.0.tgz#df23ff26e0c5b300a6470cad160a9d090c3a37ab"
+  integrity sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==
 
-regjsparser@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
-  integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
+regjsparser@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.11.1.tgz#ae55c74f646db0c8fcb922d4da635e33da405149"
+  integrity sha512-1DHODs4B8p/mQHU9kr+jv8+wIC9mtG4eBHxWxIq5mhjE3D5oORhCc6deRKzTjs9DcfRFmj9BHSDguZklqCGFWQ==
   dependencies:
-    jsesc "~0.5.0"
+    jsesc "~3.0.2"
 
 rehype-parse@^9.0.0:
   version "9.0.0"
@@ -27420,14 +27699,6 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^2.0.0"
     inherits "^2.0.1"
 
-rollup-plugin-babel@4.3.3:
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-4.3.3.tgz#7eb5ac16d9b5831c3fd5d97e8df77ba25c72a2aa"
-  integrity sha512-tKzWOCmIJD/6aKNz0H1GMM+lW1q9KyFubbWzGiOG540zxPPifnEAHTZwjo0g991Y+DyOZcLqBgqOdqazYE5fkw==
-  dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    rollup-pluginutils "^2.8.1"
-
 rollup-plugin-babel@4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-4.4.0.tgz#d15bd259466a9d1accbdb2fe2fff17c52d030acb"
@@ -27436,14 +27707,6 @@ rollup-plugin-babel@4.4.0:
     "@babel/helper-module-imports" "^7.0.0"
     rollup-pluginutils "^2.8.1"
 
-rollup-plugin-buble@0.19.6:
-  version "0.19.6"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-buble/-/rollup-plugin-buble-0.19.6.tgz#55ee0995d8870d536f01f4277c3eef4276e8747e"
-  integrity sha512-El5Fut4/wEO17ZN/n9BZvqd7DXXB2WbJr/DKvr89LXChC/cHllE0XwiUDeAalrTkgr0WrnyLDTCQvEv+cGywWQ==
-  dependencies:
-    buble "^0.19.6"
-    rollup-pluginutils "^2.3.3"
-
 rollup-plugin-commonjs@10.0.1:
   version "10.0.1"
   resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.0.1.tgz#fbfcadf4ce2e826068e056a9f5c19287d9744ddf"
@@ -27466,18 +27729,19 @@ rollup-plugin-commonjs@10.1.0:
     resolve "^1.11.0"
     rollup-pluginutils "^2.8.1"
 
-rollup-plugin-filesize@6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-filesize/-/rollup-plugin-filesize-6.2.1.tgz#552eebc88dd69db3321d99c27dbd49e550812e54"
-  integrity sha512-JQ2+NMoka81lCR2caGWyngqMKpvJCl7EkFYU7A+T0dA7U1Aml13FW5Ky0aiZIeU3/13cjsKQLRr35SQVmk6i/A==
+rollup-plugin-filesize@10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-filesize/-/rollup-plugin-filesize-10.0.0.tgz#fe5af99e5194fd379f1797b0c87549feaf407f82"
+  integrity sha512-JAYYhzCcmGjmCzo3LEHSDE3RAPHKIeBdpqRhiyZSv5o/3wFhktUOzYAWg/uUKyEu5dEaVaql6UOmaqHx1qKrZA==
   dependencies:
-    boxen "^4.1.0"
+    "@babel/runtime" "^7.13.8"
+    boxen "^5.0.0"
     brotli-size "4.0.0"
-    colors "^1.3.3"
-    filesize "^4.1.2"
-    gzip-size "^5.1.1"
-    lodash.merge "^4.6.2"
-    terser "^4.1.3"
+    colors "1.4.0"
+    filesize "^6.1.0"
+    gzip-size "^6.0.0"
+    pacote "^15.1.1"
+    terser "^5.6.0"
 
 rollup-plugin-filesize@9.0.0:
   version "9.0.0"
@@ -27582,22 +27846,13 @@ rollup-plugin-uglify@6.0.4:
     hash-sum "^2.0.0"
     rollup-pluginutils "^2.8.2"
 
-rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.3.3, rollup-pluginutils@^2.6.0, rollup-pluginutils@^2.8.1, rollup-pluginutils@^2.8.2:
+rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.6.0, rollup-pluginutils@^2.8.1, rollup-pluginutils@^2.8.2:
   version "2.8.2"
   resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
   integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
   dependencies:
     estree-walker "^0.6.1"
 
-rollup@1.29.1:
-  version "1.29.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.29.1.tgz#8715d0a4ca439be3079f8095989ec8aa60f637bc"
-  integrity sha512-dGQ+b9d1FOX/gluiggTAVnTvzQZUEkCi/TwZcax7ujugVRHs0nkYJlV9U4hsifGEMojnO+jvEML2CJQ6qXgbHA==
-  dependencies:
-    "@types/estree" "*"
-    "@types/node" "*"
-    acorn "^7.1.0"
-
 rollup@1.32.1:
   version "1.32.1"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.32.1.tgz#4480e52d9d9e2ae4b46ba0d9ddeaf3163940f9c4"
@@ -27607,24 +27862,29 @@ rollup@1.32.1:
     "@types/node" "*"
     acorn "^7.1.0"
 
-rollup@^4.2.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.8.0.tgz#365c34e85f1ed034de974dab934c1663cc69b754"
-  integrity sha512-NpsklK2fach5CdI+PScmlE5R4Ao/FSWtF7LkoIrHDxPACY/xshNasPsbpG0VVHxUTbf74tJbVT4PrP8JsJ6ZDA==
+rollup@4.24.0, rollup@^4.2.0:
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.24.0.tgz#c14a3576f20622ea6a5c9cad7caca5e6e9555d05"
+  integrity sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==
+  dependencies:
+    "@types/estree" "1.0.6"
   optionalDependencies:
-    "@rollup/rollup-android-arm-eabi" "4.8.0"
-    "@rollup/rollup-android-arm64" "4.8.0"
-    "@rollup/rollup-darwin-arm64" "4.8.0"
-    "@rollup/rollup-darwin-x64" "4.8.0"
-    "@rollup/rollup-linux-arm-gnueabihf" "4.8.0"
-    "@rollup/rollup-linux-arm64-gnu" "4.8.0"
-    "@rollup/rollup-linux-arm64-musl" "4.8.0"
-    "@rollup/rollup-linux-riscv64-gnu" "4.8.0"
-    "@rollup/rollup-linux-x64-gnu" "4.8.0"
-    "@rollup/rollup-linux-x64-musl" "4.8.0"
-    "@rollup/rollup-win32-arm64-msvc" "4.8.0"
-    "@rollup/rollup-win32-ia32-msvc" "4.8.0"
-    "@rollup/rollup-win32-x64-msvc" "4.8.0"
+    "@rollup/rollup-android-arm-eabi" "4.24.0"
+    "@rollup/rollup-android-arm64" "4.24.0"
+    "@rollup/rollup-darwin-arm64" "4.24.0"
+    "@rollup/rollup-darwin-x64" "4.24.0"
+    "@rollup/rollup-linux-arm-gnueabihf" "4.24.0"
+    "@rollup/rollup-linux-arm-musleabihf" "4.24.0"
+    "@rollup/rollup-linux-arm64-gnu" "4.24.0"
+    "@rollup/rollup-linux-arm64-musl" "4.24.0"
+    "@rollup/rollup-linux-powerpc64le-gnu" "4.24.0"
+    "@rollup/rollup-linux-riscv64-gnu" "4.24.0"
+    "@rollup/rollup-linux-s390x-gnu" "4.24.0"
+    "@rollup/rollup-linux-x64-gnu" "4.24.0"
+    "@rollup/rollup-linux-x64-musl" "4.24.0"
+    "@rollup/rollup-win32-arm64-msvc" "4.24.0"
+    "@rollup/rollup-win32-ia32-msvc" "4.24.0"
+    "@rollup/rollup-win32-x64-msvc" "4.24.0"
     fsevents "~2.3.2"
 
 router-ips@^1.0.0:
@@ -27926,7 +28186,7 @@ semver@7.3.4:
   dependencies:
     lru-cache "^6.0.0"
 
-semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.6, semver@^7.3.7, semver@^7.5.2, semver@^7.5.4, semver@^7.6.3:
+semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.6, semver@^7.3.7, semver@^7.5.2, semver@^7.5.4, semver@^7.6.2, semver@^7.6.3:
   version "7.6.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
   integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
@@ -28396,11 +28656,22 @@ signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
-signal-exit@^4.1.0:
+signal-exit@^4.0.1, signal-exit@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
   integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
 
+sigstore@^1.3.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-1.9.0.tgz#1e7ad8933aa99b75c6898ddd0eeebc3eb0d59875"
+  integrity sha512-0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A==
+  dependencies:
+    "@sigstore/bundle" "^1.1.0"
+    "@sigstore/protobuf-specs" "^0.2.0"
+    "@sigstore/sign" "^1.0.0"
+    "@sigstore/tuf" "^1.0.3"
+    make-fetch-happen "^11.0.1"
+
 simple-concat@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f"
@@ -28865,6 +29136,13 @@ sshpk@^1.7.0:
     jsbn "~0.1.0"
     tweetnacl "~0.14.0"
 
+ssri@^10.0.0:
+  version "10.0.6"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.6.tgz#a8aade2de60ba2bce8688e3fa349bad05c7dc1e5"
+  integrity sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==
+  dependencies:
+    minipass "^7.0.3"
+
 ssri@^5.2.4:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
@@ -29181,6 +29459,15 @@ string-length@^5.0.1:
     char-regex "^2.0.0"
     strip-ansi "^7.0.1"
 
+"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -29190,15 +29477,6 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
 string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
@@ -29336,6 +29614,13 @@ stringify-entities@^4.0.0:
     character-entities-html4 "^2.0.0"
     character-entities-legacy "^3.0.0"
 
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@5.2.0, strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
@@ -29364,13 +29649,6 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
 strip-ansi@^7.0.1, strip-ansi@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -30114,7 +30392,7 @@ terser@^3.14.1:
     source-map "~0.6.1"
     source-map-support "~0.5.10"
 
-terser@^4.1.2, terser@^4.1.3, terser@^4.4.3, terser@^4.6.12, terser@^4.6.3, terser@^4.8.0:
+terser@^4.1.2, terser@^4.4.3, terser@^4.6.12, terser@^4.6.3, terser@^4.8.0:
   version "4.8.1"
   resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f"
   integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==
@@ -30123,13 +30401,13 @@ terser@^4.1.2, terser@^4.1.3, terser@^4.4.3, terser@^4.6.12, terser@^4.6.3, ters
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
-terser@^5.3.4:
-  version "5.16.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.1.tgz#5af3bc3d0f24241c7fb2024199d5c461a1075880"
-  integrity sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==
+terser@^5.3.4, terser@^5.6.0:
+  version "5.36.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.36.0.tgz#8b0dbed459ac40ff7b4c9fd5a3a2029de105180e"
+  integrity sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w==
   dependencies:
-    "@jridgewell/source-map" "^0.3.2"
-    acorn "^8.5.0"
+    "@jridgewell/source-map" "^0.3.3"
+    acorn "^8.8.2"
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
@@ -30662,6 +30940,15 @@ tty-browserify@~0.0.0:
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811"
   integrity sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==
 
+tuf-js@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-1.1.7.tgz#21b7ae92a9373015be77dfe0cb282a80ec3bbe43"
+  integrity sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==
+  dependencies:
+    "@tufjs/models" "1.0.4"
+    debug "^4.3.4"
+    make-fetch-happen "^11.1.1"
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -30953,7 +31240,7 @@ unicode-match-property-ecmascript@^2.0.0:
     unicode-canonical-property-names-ecmascript "^2.0.0"
     unicode-property-aliases-ecmascript "^2.0.0"
 
-unicode-match-property-value-ecmascript@^2.0.0, unicode-match-property-value-ecmascript@^2.1.0:
+unicode-match-property-value-ecmascript@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0"
   integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==
@@ -31035,6 +31322,13 @@ unique-filename@^2.0.0:
   dependencies:
     unique-slug "^3.0.0"
 
+unique-filename@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea"
+  integrity sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==
+  dependencies:
+    unique-slug "^4.0.0"
+
 unique-slug@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.0.tgz#db6676e7c7cc0629878ff196097c78855ae9f4ab"
@@ -31049,6 +31343,13 @@ unique-slug@^3.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
+unique-slug@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-4.0.0.tgz#6bae6bb16be91351badd24cdce741f892a6532e3"
+  integrity sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==
+  dependencies:
+    imurmurhash "^0.1.4"
+
 unique-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
@@ -31242,12 +31543,12 @@ upath@^2.0.1:
   integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==
 
 update-browserslist-db@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz#97e9c96ab0ae7bcac08e9ae5151d26e6bc6b5580"
-  integrity sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz#80846fba1d79e82547fb661f8d141e0945755fe5"
+  integrity sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==
   dependencies:
     escalade "^3.2.0"
-    picocolors "^1.1.1"
+    picocolors "^1.1.0"
 
 update-check@1.5.3:
   version "1.5.3"
@@ -31550,6 +31851,11 @@ validate-npm-package-name@^4.0.0:
   dependencies:
     builtins "^5.0.0"
 
+validate-npm-package-name@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz#a316573e9b49f3ccd90dbb6eb52b3f06c6d604e8"
+  integrity sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==
+
 validator@^12.0.0:
   version "12.2.0"
   resolved "https://registry.yarnpkg.com/validator/-/validator-12.2.0.tgz#660d47e96267033fd070096c3b1a6f2db4380a0a"
@@ -32470,6 +32776,13 @@ which@^2.0.1, which@^2.0.2:
   dependencies:
     isexe "^2.0.0"
 
+which@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-3.0.1.tgz#89f1cd0c23f629a8105ffe69b8172791c87b4be1"
+  integrity sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==
+  dependencies:
+    isexe "^2.0.0"
+
 wide-align@^1.1.0, wide-align@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
@@ -32569,6 +32882,15 @@ worker-rpc@^0.1.0:
   dependencies:
     microevent.ts "~0.1.1"
 
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -32603,15 +32925,6 @@ wrap-ansi@^6.0.0, wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

From 6d6e593ca2b6ad4b83098c1fb671633148e42371 Mon Sep 17 00:00:00 2001
From: Dhaya <154633+dhayab@users.noreply.github.com>
Date: Thu, 5 Dec 2024 12:05:00 +0100
Subject: [PATCH 13/37] refactor: remove obsolete polyfills (#6417)

* refactor: remove findIndex polyfill

* refactor: remove object spread polyfill

* refactor: remove find and findIndex polyfill

---------

Co-authored-by: Haroen Viaene <hello@haroen.me>
---
 .../src/SearchParameters/index.js             |   8 +-
 .../generate-hierarchical-tree.js             |   3 +-
 .../src/SearchResults/index.js                |  41 ++--
 .../src/functions/find.js                     |  16 --
 .../src/functions/findIndex.js                |  15 --
 .../src/functions/formatSort.js               |  13 +-
 .../src/utils/sortAndMergeRecommendations.js  |   3 +-
 .../test/spec/functions/find.js               |  39 ----
 .../test/spec/functions/findIndex.js          |  39 ----
 .../src/lib/utils/mergeSearchParameters.ts    |   2 +-
 .../src/components/DynamicWidgets.js          |  11 +-
 .../src/components/StateResults.vue           |   9 +-
 .../components/__tests__/Index-integration.js |   4 +-
 .../__tests__/InstantSearch-integration.js    |   2 +-
 .../src/connectors/connectStateResults.js     |   6 +-
 .../src/mixins/__tests__/widget.test.js       |   7 +-
 .../vue-instantsearch/src/mixins/widget.js    |  17 +-
 .../src/util/createInstantSearchComponent.js  | 210 +++++++++---------
 .../vue-instantsearch/src/util/polyfills.js   |  10 -
 19 files changed, 162 insertions(+), 293 deletions(-)
 delete mode 100644 packages/algoliasearch-helper/src/functions/find.js
 delete mode 100644 packages/algoliasearch-helper/src/functions/findIndex.js
 delete mode 100644 packages/algoliasearch-helper/test/spec/functions/find.js
 delete mode 100644 packages/algoliasearch-helper/test/spec/functions/findIndex.js
 delete mode 100644 packages/vue-instantsearch/src/util/polyfills.js

diff --git a/packages/algoliasearch-helper/src/SearchParameters/index.js b/packages/algoliasearch-helper/src/SearchParameters/index.js
index 472b2ae4e7..7be0d3ee12 100644
--- a/packages/algoliasearch-helper/src/SearchParameters/index.js
+++ b/packages/algoliasearch-helper/src/SearchParameters/index.js
@@ -1,7 +1,6 @@
 'use strict';
 
 var defaultsPure = require('../functions/defaultsPure');
-var find = require('../functions/find');
 var intersection = require('../functions/intersection');
 var merge = require('../functions/merge');
 var objectHasKeys = require('../functions/objectHasKeys');
@@ -42,7 +41,10 @@ function isEqualNumericRefinement(a, b) {
  * @return {any} the searched value or undefined
  */
 function findArray(array, searchedValue) {
-  return find(array, function (currentValue) {
+  if (!Array.isArray(array)) {
+    return undefined;
+  }
+  return array.find(function (currentValue) {
     return isEqualNumericRefinement(currentValue, searchedValue);
   });
 }
@@ -1628,7 +1630,7 @@ SearchParameters.prototype = {
    * @return {object} a hierarchicalFacet
    */
   getHierarchicalFacetByName: function (hierarchicalFacetName) {
-    return find(this.hierarchicalFacets, function (f) {
+    return this.hierarchicalFacets.find(function (f) {
       return f.name === hierarchicalFacetName;
     });
   },
diff --git a/packages/algoliasearch-helper/src/SearchResults/generate-hierarchical-tree.js b/packages/algoliasearch-helper/src/SearchResults/generate-hierarchical-tree.js
index 0398d45343..597b72e149 100644
--- a/packages/algoliasearch-helper/src/SearchResults/generate-hierarchical-tree.js
+++ b/packages/algoliasearch-helper/src/SearchResults/generate-hierarchical-tree.js
@@ -3,7 +3,6 @@
 module.exports = generateTrees;
 
 var fv = require('../functions/escapeFacetValue');
-var find = require('../functions/find');
 var prepareHierarchicalFacetSortBy = require('../functions/formatSort');
 var orderBy = require('../functions/orderBy');
 var escapeFacetValue = fv.escapeFacetValue;
@@ -82,7 +81,7 @@ function generateHierarchicalTree(
          * @type {object[]]} hierarchical data
          */
         var data = parent && Array.isArray(parent.data) ? parent.data : [];
-        parent = find(data, function (subtree) {
+        parent = data.find(function (subtree) {
           return subtree.isRefined;
         });
         level++;
diff --git a/packages/algoliasearch-helper/src/SearchResults/index.js b/packages/algoliasearch-helper/src/SearchResults/index.js
index d1b1b5711b..73b1b996b6 100644
--- a/packages/algoliasearch-helper/src/SearchResults/index.js
+++ b/packages/algoliasearch-helper/src/SearchResults/index.js
@@ -3,8 +3,6 @@
 var compact = require('../functions/compact');
 var defaultsPure = require('../functions/defaultsPure');
 var fv = require('../functions/escapeFacetValue');
-var find = require('../functions/find');
-var findIndex = require('../functions/findIndex');
 var formatSort = require('../functions/formatSort');
 var mergeNumericMax = require('../functions/mergeNumericMax');
 var orderBy = require('../functions/orderBy');
@@ -90,13 +88,12 @@ function findMatchingHierarchicalFacetFromAttributeName(
   hierarchicalFacets,
   hierarchicalAttributeName
 ) {
-  return find(
-    hierarchicalFacets,
-    function facetKeyMatchesAttribute(hierarchicalFacet) {
-      var facetNames = hierarchicalFacet.attributes || [];
-      return facetNames.indexOf(hierarchicalAttributeName) > -1;
-    }
-  );
+  return hierarchicalFacets.find(function facetKeyMatchesAttribute(
+    hierarchicalFacet
+  ) {
+    var facetNames = hierarchicalFacet.attributes || [];
+    return facetNames.indexOf(hierarchicalAttributeName) > -1;
+  });
 }
 
 /**
@@ -440,7 +437,7 @@ function SearchResults(state, results, options) {
       // Place the hierarchicalFacet data at the correct index depending on
       // the attributes order that was defined at the helper initialization
       var facetIndex = hierarchicalFacet.attributes.indexOf(facetKey);
-      var idxAttributeName = findIndex(state.hierarchicalFacets, function (f) {
+      var idxAttributeName = state.hierarchicalFacets.findIndex(function (f) {
         return f.name === hierarchicalFacet.name;
       });
       self.hierarchicalFacets[idxAttributeName][facetIndex] = {
@@ -498,11 +495,10 @@ function SearchResults(state, results, options) {
       var position;
 
       if (hierarchicalFacet) {
-        position = findIndex(state.hierarchicalFacets, function (f) {
+        position = state.hierarchicalFacets.findIndex(function (f) {
           return f.name === hierarchicalFacet.name;
         });
-        var attributeIndex = findIndex(
-          self.hierarchicalFacets[position],
+        var attributeIndex = self.hierarchicalFacets[position].findIndex(
           function (f) {
             return f.attribute === dfacet;
           }
@@ -580,11 +576,10 @@ function SearchResults(state, results, options) {
 
       Object.keys(facets).forEach(function (dfacet) {
         var facetResults = facets[dfacet];
-        var position = findIndex(state.hierarchicalFacets, function (f) {
+        var position = state.hierarchicalFacets.findIndex(function (f) {
           return f.name === hierarchicalFacet.name;
         });
-        var attributeIndex = findIndex(
-          self.hierarchicalFacets[position],
+        var attributeIndex = self.hierarchicalFacets[position].findIndex(
           function (f) {
             return f.attribute === dfacet;
           }
@@ -675,7 +670,7 @@ function extractNormalizedFacetValues(results, attribute) {
   }
 
   if (results._state.isConjunctiveFacet(attribute)) {
-    var facet = find(results.facets, predicate);
+    var facet = results.facets.find(predicate);
     if (!facet) return [];
 
     return Object.keys(facet.data).map(function (name) {
@@ -689,7 +684,7 @@ function extractNormalizedFacetValues(results, attribute) {
       };
     });
   } else if (results._state.isDisjunctiveFacet(attribute)) {
-    var disjunctiveFacet = find(results.disjunctiveFacets, predicate);
+    var disjunctiveFacet = results.disjunctiveFacets.find(predicate);
     if (!disjunctiveFacet) return [];
 
     return Object.keys(disjunctiveFacet.data).map(function (name) {
@@ -702,7 +697,7 @@ function extractNormalizedFacetValues(results, attribute) {
       };
     });
   } else if (results._state.isHierarchicalFacet(attribute)) {
-    var hierarchicalFacetValues = find(results.hierarchicalFacets, predicate);
+    var hierarchicalFacetValues = results.hierarchicalFacets.find(predicate);
     if (!hierarchicalFacetValues) return hierarchicalFacetValues;
 
     var hierarchicalFacet =
@@ -980,7 +975,7 @@ SearchResults.prototype.getFacetStats = function (attribute) {
  * @return {object|undefined} The stats of the facet
  */
 function getFacetStatsIfAvailable(facetList, facetName) {
-  var data = find(facetList, function (facet) {
+  var data = facetList.find(function (facet) {
     return facet.name === facetName;
   });
   return data && data.stats;
@@ -1089,7 +1084,7 @@ SearchResults.prototype.getRefinements = function () {
  * @return {Refinement} the refinement
  */
 function getRefinement(state, type, attributeName, name, resultsFacets) {
-  var facet = find(resultsFacets, function (f) {
+  var facet = resultsFacets.find(function (f) {
     return f.name === attributeName;
   });
   var count = facet && facet.data && facet.data[name] ? facet.data[name] : 0;
@@ -1115,14 +1110,14 @@ function getHierarchicalRefinement(state, attributeName, name, resultsFacets) {
   var facetDeclaration = state.getHierarchicalFacetByName(attributeName);
   var separator = state._getHierarchicalFacetSeparator(facetDeclaration);
   var split = name.split(separator);
-  var rootFacet = find(resultsFacets, function (facet) {
+  var rootFacet = resultsFacets.find(function (facet) {
     return facet.name === attributeName;
   });
 
   var facet = split.reduce(function (intermediateFacet, part) {
     var newFacet =
       intermediateFacet &&
-      find(intermediateFacet.data, function (f) {
+      intermediateFacet.data.find(function (f) {
         return f.name === part;
       });
     return newFacet !== undefined ? newFacet : intermediateFacet;
diff --git a/packages/algoliasearch-helper/src/functions/find.js b/packages/algoliasearch-helper/src/functions/find.js
deleted file mode 100644
index f9d8275c8f..0000000000
--- a/packages/algoliasearch-helper/src/functions/find.js
+++ /dev/null
@@ -1,16 +0,0 @@
-'use strict';
-
-// @MAJOR can be replaced by native Array#find when we change support
-module.exports = function find(array, comparator) {
-  if (!Array.isArray(array)) {
-    return undefined;
-  }
-
-  for (var i = 0; i < array.length; i++) {
-    if (comparator(array[i])) {
-      return array[i];
-    }
-  }
-
-  return undefined;
-};
diff --git a/packages/algoliasearch-helper/src/functions/findIndex.js b/packages/algoliasearch-helper/src/functions/findIndex.js
deleted file mode 100644
index 1d522e9fdc..0000000000
--- a/packages/algoliasearch-helper/src/functions/findIndex.js
+++ /dev/null
@@ -1,15 +0,0 @@
-'use strict';
-
-// @MAJOR can be replaced by native Array#findIndex when we change support
-module.exports = function find(array, comparator) {
-  if (!Array.isArray(array)) {
-    return -1;
-  }
-
-  for (var i = 0; i < array.length; i++) {
-    if (comparator(array[i])) {
-      return i;
-    }
-  }
-  return -1;
-};
diff --git a/packages/algoliasearch-helper/src/functions/formatSort.js b/packages/algoliasearch-helper/src/functions/formatSort.js
index 8b0d7fb98f..552eece2c1 100644
--- a/packages/algoliasearch-helper/src/functions/formatSort.js
+++ b/packages/algoliasearch-helper/src/functions/formatSort.js
@@ -1,7 +1,5 @@
 'use strict';
 
-var find = require('./find');
-
 /**
  * Transform sort format from user friendly notation to lodash format
  * @param {string[]} sortBy array of predicate of the form "attribute:order"
@@ -17,12 +15,11 @@ module.exports = function formatSort(sortBy, defaults) {
     function preparePredicate(out, sort) {
       var sortInstruction = sort.split(':');
 
-      var matchingDefault = find(
-        defaultInstructions,
-        function (defaultInstruction) {
-          return defaultInstruction[0] === sortInstruction[0];
-        }
-      );
+      var matchingDefault = defaultInstructions.find(function (
+        defaultInstruction
+      ) {
+        return defaultInstruction[0] === sortInstruction[0];
+      });
 
       if (sortInstruction.length > 1 || !matchingDefault) {
         out[0].push(sortInstruction[0]);
diff --git a/packages/algoliasearch-helper/src/utils/sortAndMergeRecommendations.js b/packages/algoliasearch-helper/src/utils/sortAndMergeRecommendations.js
index dffa68b50e..8ca0ec1453 100644
--- a/packages/algoliasearch-helper/src/utils/sortAndMergeRecommendations.js
+++ b/packages/algoliasearch-helper/src/utils/sortAndMergeRecommendations.js
@@ -1,6 +1,5 @@
 'use strict';
 
-var find = require('../functions/find');
 var flat = require('../functions/flat');
 
 function getAverageIndices(indexTracker, nrOfObjs) {
@@ -43,7 +42,7 @@ function sortAndMergeRecommendations(results) {
     orderedHits,
     avgIndexRef
   ) {
-    var result = find(flat(results), function (hit) {
+    var result = flat(results).find(function (hit) {
       return hit.objectID === avgIndexRef.objectID;
     });
     return result ? orderedHits.concat(result) : orderedHits;
diff --git a/packages/algoliasearch-helper/test/spec/functions/find.js b/packages/algoliasearch-helper/test/spec/functions/find.js
deleted file mode 100644
index 31a849703b..0000000000
--- a/packages/algoliasearch-helper/test/spec/functions/find.js
+++ /dev/null
@@ -1,39 +0,0 @@
-'use strict';
-
-var find = require('../../../src/functions/find');
-
-test('find returns the first match based on the comparator', function () {
-  expect(
-    find([1], function () {
-      return true;
-    })
-  ).toBe(1);
-  expect(
-    find([1, 2], function () {
-      return true;
-    })
-  ).toBe(1);
-
-  expect(
-    find([{ nice: false }, { nice: true }], function (el) {
-      return el.nice;
-    })
-  ).toEqual({ nice: true });
-});
-
-test('find returns undefined in non-found cases', function () {
-  expect(
-    find([], function () {
-      return false;
-    })
-  ).toBeUndefined();
-  expect(
-    find(undefined, function () {
-      return false;
-    })
-  ).toBeUndefined();
-
-  expect(function () {
-    find([1, 2, 3], undefined);
-  }).toThrow();
-});
diff --git a/packages/algoliasearch-helper/test/spec/functions/findIndex.js b/packages/algoliasearch-helper/test/spec/functions/findIndex.js
deleted file mode 100644
index 81b6f9e966..0000000000
--- a/packages/algoliasearch-helper/test/spec/functions/findIndex.js
+++ /dev/null
@@ -1,39 +0,0 @@
-'use strict';
-
-var findIndex = require('../../../src/functions/findIndex');
-
-test('findIndex returns the first match based on the comparator', function () {
-  expect(
-    findIndex([1], function () {
-      return true;
-    })
-  ).toBe(0);
-  expect(
-    findIndex([1, 2], function () {
-      return true;
-    })
-  ).toBe(0);
-
-  expect(
-    findIndex([{ nice: false }, { nice: true }], function (el) {
-      return el.nice;
-    })
-  ).toBe(1);
-});
-
-test('findIndex returns -1 in non-found cases', function () {
-  expect(
-    findIndex([], function () {
-      return false;
-    })
-  ).toBe(-1);
-  expect(
-    findIndex(undefined, function () {
-      return false;
-    })
-  ).toBe(-1);
-
-  expect(function () {
-    findIndex([1, 2, 3], undefined);
-  }).toThrow();
-});
diff --git a/packages/instantsearch-core/src/lib/utils/mergeSearchParameters.ts b/packages/instantsearch-core/src/lib/utils/mergeSearchParameters.ts
index 646d99ef85..39b5f74032 100644
--- a/packages/instantsearch-core/src/lib/utils/mergeSearchParameters.ts
+++ b/packages/instantsearch-core/src/lib/utils/mergeSearchParameters.ts
@@ -38,7 +38,7 @@ const mergeDisjunctiveFacets: Merger = (left, right) =>
 const mergeHierarchicalFacets: Merger = (left, right) =>
   left.setQueryParameters({
     hierarchicalFacets: right.hierarchicalFacets.reduce((facets, facet) => {
-      const index = facets.findIndex((_) => _.name === facet.name);
+      const index = facets.findIndex(({ name }) => name === facet.name);
 
       if (index === -1) {
         return facets.concat(facet);
diff --git a/packages/vue-instantsearch/src/components/DynamicWidgets.js b/packages/vue-instantsearch/src/components/DynamicWidgets.js
index 69a90c4af1..8ae8c92d90 100644
--- a/packages/vue-instantsearch/src/components/DynamicWidgets.js
+++ b/packages/vue-instantsearch/src/components/DynamicWidgets.js
@@ -2,7 +2,6 @@ import { connectDynamicWidgets } from 'instantsearch-core';
 
 import { createSuitMixin } from '../mixins/suit';
 import { createWidgetMixin } from '../mixins/widget';
-import { _objectSpread } from '../util/polyfills';
 import { isVue3, renderCompat, getDefaultSlot } from '../util/vue-compat';
 
 function getWidgetAttribute(vnode) {
@@ -87,12 +86,10 @@ export default {
 
       return h(
         'div',
-        _objectSpread(
-          {
-            class: [this.suit()],
-          },
-          { attrs: { hidden: true } }
-        ),
+        {
+          class: [this.suit()],
+          attrs: { hidden: true },
+        },
         allComponents
       );
     }
diff --git a/packages/vue-instantsearch/src/components/StateResults.vue b/packages/vue-instantsearch/src/components/StateResults.vue
index 6a71b56d68..32ba406757 100644
--- a/packages/vue-instantsearch/src/components/StateResults.vue
+++ b/packages/vue-instantsearch/src/components/StateResults.vue
@@ -16,7 +16,6 @@
 <script>
 import { createSuitMixin } from '../mixins/suit';
 import { createWidgetMixin } from '../mixins/widget';
-import { _objectSpread } from '../util/polyfills';
 import { isVue3 } from '../util/vue-compat';
 
 export default {
@@ -78,7 +77,13 @@ export default {
   computed: {
     stateResults() {
       const { results, state, status, error } = this.state;
-      return _objectSpread({}, results, { results, state, status, error });
+      return {
+        ...results,
+        results,
+        state,
+        status,
+        error,
+      };
     },
   },
 };
diff --git a/packages/vue-instantsearch/src/components/__tests__/Index-integration.js b/packages/vue-instantsearch/src/components/__tests__/Index-integration.js
index 47ae5e4f57..4171ea1101 100644
--- a/packages/vue-instantsearch/src/components/__tests__/Index-integration.js
+++ b/packages/vue-instantsearch/src/components/__tests__/Index-integration.js
@@ -42,7 +42,7 @@ it('child widgets get added to their parent index', () => {
   });
 
   const indexWidget = wrapper.findComponent(Index).vm.widget;
-  expect(indexWidget.getWidgets()).toContain(widgetInstance);
+  expect(indexWidget.getWidgets()).toContainEqual(widgetInstance);
 
   expect(rootAddWidgets).toHaveBeenCalledTimes(1);
   expect(rootAddWidgets).toHaveBeenCalledWith([
@@ -88,7 +88,7 @@ it('child widgets render with right data', () => {
 
   const indexWidget = wrapper.findComponent(Index).vm.widget;
 
-  expect(indexWidget.getWidgets()).toContain(widgetInstance);
+  expect(indexWidget.getWidgets()).toContainEqual(widgetInstance);
 
   expect(widgetInstance.render).not.toHaveBeenCalled();
   expect(widgetInstance.init).toHaveBeenCalledTimes(1);
diff --git a/packages/vue-instantsearch/src/components/__tests__/InstantSearch-integration.js b/packages/vue-instantsearch/src/components/__tests__/InstantSearch-integration.js
index 850215ab41..e747e873cf 100644
--- a/packages/vue-instantsearch/src/components/__tests__/InstantSearch-integration.js
+++ b/packages/vue-instantsearch/src/components/__tests__/InstantSearch-integration.js
@@ -45,7 +45,7 @@ it('child widgets get added to its parent instantsearch', () => {
     wrapper
       .findComponent(InstantSearch)
       .vm.instantSearchInstance.mainIndex.getWidgets()
-  ).toContain(widgetInstance);
+  ).toContainEqual(widgetInstance);
 });
 
 describe('middlewares', () => {
diff --git a/packages/vue-instantsearch/src/connectors/connectStateResults.js b/packages/vue-instantsearch/src/connectors/connectStateResults.js
index f11697dcf0..1d89269a47 100644
--- a/packages/vue-instantsearch/src/connectors/connectStateResults.js
+++ b/packages/vue-instantsearch/src/connectors/connectStateResults.js
@@ -1,5 +1,3 @@
-import { _objectSpread } from '../util/polyfills';
-
 const connectStateResults =
   (renderFn, unmountFn = () => {}) =>
   (widgetParams = {}) => ({
@@ -16,9 +14,9 @@ const connectStateResults =
     },
 
     render({ results, instantSearchInstance, state }) {
-      const resultsCopy = _objectSpread({}, results);
+      const resultsCopy = { ...results };
 
-      const stateCopy = _objectSpread({}, state);
+      const stateCopy = { ...state };
 
       renderFn(
         {
diff --git a/packages/vue-instantsearch/src/mixins/__tests__/widget.test.js b/packages/vue-instantsearch/src/mixins/__tests__/widget.test.js
index 6d0f8ea43f..04820f17b5 100644
--- a/packages/vue-instantsearch/src/mixins/__tests__/widget.test.js
+++ b/packages/vue-instantsearch/src/mixins/__tests__/widget.test.js
@@ -425,7 +425,12 @@ describe('general', () => {
     expect(wrapper.vm.state).toBe(null);
 
     expect(instance.mainIndex.removeWidgets).toHaveBeenCalledTimes(1);
-    expect(instance.mainIndex.removeWidgets).toHaveBeenCalledWith([widget]);
+    expect(instance.mainIndex.removeWidgets).toHaveBeenCalledWith([
+      {
+        ...widget,
+        ...additionalProperties,
+      },
+    ]);
 
     expect(factory).toHaveBeenCalledTimes(2);
     expect(factory).toHaveBeenCalledWith(nextWidgetParams);
diff --git a/packages/vue-instantsearch/src/mixins/widget.js b/packages/vue-instantsearch/src/mixins/widget.js
index 157e801ede..14d6fa33b7 100644
--- a/packages/vue-instantsearch/src/mixins/widget.js
+++ b/packages/vue-instantsearch/src/mixins/widget.js
@@ -1,4 +1,3 @@
-import { _objectSpread } from '../util/polyfills';
 import { isVue3 } from '../util/vue-compat';
 import { warn } from '../util/warn';
 
@@ -31,10 +30,10 @@ export const createWidgetMixin = (
   created() {
     if (typeof connector === 'function') {
       this.factory = connector(this.updateState, () => {});
-      this.widget = _objectSpread(
-        this.factory(this.widgetParams),
-        additionalProperties
-      );
+      this.widget = {
+        ...this.factory(this.widgetParams),
+        ...additionalProperties,
+      };
       this.getParentIndex().addWidgets([this.widget]);
 
       if (
@@ -73,10 +72,10 @@ Read more on using connectors: https://alg.li/vue-custom`
       handler(nextWidgetParams) {
         this.state = null;
         this.getParentIndex().removeWidgets([this.widget]);
-        this.widget = _objectSpread(
-          this.factory(nextWidgetParams),
-          additionalProperties
-        );
+        this.widget = {
+          ...this.factory(nextWidgetParams),
+          ...additionalProperties,
+        };
         this.getParentIndex().addWidgets([this.widget]);
       },
       deep: true,
diff --git a/packages/vue-instantsearch/src/util/createInstantSearchComponent.js b/packages/vue-instantsearch/src/util/createInstantSearchComponent.js
index 7b9c1cd041..f63d8b9432 100644
--- a/packages/vue-instantsearch/src/util/createInstantSearchComponent.js
+++ b/packages/vue-instantsearch/src/util/createInstantSearchComponent.js
@@ -3,119 +3,111 @@ import { INSTANTSEARCH_FUTURE_DEFAULTS } from 'instantsearch-core';
 import { version } from '../../package.json'; // rollup does pick only what needed from json
 import { createSuitMixin } from '../mixins/suit';
 
-import { _objectSpread } from './polyfills';
 import { isVue3, version as vueVersion } from './vue-compat';
 import { warn } from './warn';
 
-export const createInstantSearchComponent = (component) =>
-  _objectSpread(
-    {
-      mixins: [createSuitMixin({ name: 'InstantSearch' })],
-      provide() {
-        return {
-          $_ais_instantSearchInstance: this.instantSearchInstance,
-        };
-      },
-      watch: {
-        searchClient(searchClient) {
-          warn(
-            false,
-            'The `search-client` prop of `<ais-instant-search>` changed between renders, which may cause more search requests than necessary. If this is an unwanted behavior, please provide a stable reference: https://www.algolia.com/doc/api-reference/widgets/instantsearch/vue/#widget-param-search-client'
-          );
-
-          this.instantSearchInstance.client = searchClient;
-          if (this.instantSearchInstance.mainHelper) {
-            this.instantSearchInstance.mainHelper
-              .setClient(searchClient)
-              .search();
-          }
-        },
-        indexName(indexName) {
-          if (
-            this.instantSearchInstance.helper &&
-            this.instantSearchInstance.mainHelper
-          ) {
-            this.instantSearchInstance.helper.setIndex(indexName || '');
-            this.instantSearchInstance.mainHelper
-              .setIndex(indexName || '')
-              .search();
-          }
-        },
-        compositionID(compositionID) {
-          this.instantSearchInstance.helper
-            .setIndex(compositionID || '')
-            .search();
-        },
-        stalledSearchDelay(stalledSearchDelay) {
-          // private InstantSearch.js API:
-          this.instantSearchInstance._stalledSearchDelay = stalledSearchDelay;
-        },
-        routing() {
-          throw new Error(
-            'routing configuration can not be changed dynamically at this point.' +
-              '\n\n' +
-              'Please open a new issue: https://github.com/algolia/instantsearch/discussions/new?category=ideas&labels=triage%2cLibrary%3A+Vue+InstantSearch&title=Feature%20request%3A%20dynamic%20props'
-          );
-        },
-        onStateChange() {
-          throw new Error(
-            'onStateChange configuration can not be changed dynamically at this point.' +
-              '\n\n' +
-              'Please open a new issue: https://github.com/algolia/instantsearch/discussions/new?category=ideas&labels=triage%2cLibrary%3A+Vue+InstantSearch&title=Feature%20request%3A%20dynamic%20props'
-          );
-        },
-        searchFunction(searchFunction) {
-          // private InstantSearch.js API:
-          this.instantSearchInstance._searchFunction = searchFunction;
-        },
-        middlewares: {
-          immediate: true,
-          handler(next, prev) {
-            (prev || [])
-              .filter((middleware) => (next || []).indexOf(middleware) === -1)
-              .forEach((middlewareToRemove) => {
-                this.instantSearchInstance.unuse(middlewareToRemove);
-              });
+export const createInstantSearchComponent = (component) => ({
+  mixins: [createSuitMixin({ name: 'InstantSearch' })],
+  provide() {
+    return {
+      $_ais_instantSearchInstance: this.instantSearchInstance,
+    };
+  },
+  watch: {
+    searchClient(searchClient) {
+      warn(
+        false,
+        'The `search-client` prop of `<ais-instant-search>` changed between renders, which may cause more search requests than necessary. If this is an unwanted behavior, please provide a stable reference: https://www.algolia.com/doc/api-reference/widgets/instantsearch/vue/#widget-param-search-client'
+      );
 
-            (next || [])
-              .filter((middleware) => (prev || []).indexOf(middleware) === -1)
-              .forEach((middlewareToAdd) => {
-                this.instantSearchInstance.use(middlewareToAdd);
-              });
-          },
-        },
-        future(future) {
-          this.instantSearchInstance.future = Object.assign(
-            INSTANTSEARCH_FUTURE_DEFAULTS,
-            future
-          );
-        },
-      },
-      created() {
-        const searchClient = this.instantSearchInstance.client;
-        if (typeof searchClient.addAlgoliaAgent === 'function') {
-          searchClient.addAlgoliaAgent(`Vue (${vueVersion})`);
-          searchClient.addAlgoliaAgent(`Vue InstantSearch (${version})`);
-        }
-      },
-      mounted() {
-        // from the documentation: https://vuejs.org/v2/api/#mounted
-        // "Note that mounted does not guarantee that all child components have also been mounted. If you want to
-        // wait until the entire view has been rendered, you can use vm.$nextTick inside of mounted"
-        this.$nextTick(() => {
-          if (!this.instantSearchInstance.started) {
-            this.instantSearchInstance.start();
-          }
-        });
-      },
-      [isVue3 ? 'beforeUnmount' : 'beforeDestroy']() {
-        if (this.instantSearchInstance.started) {
-          this.instantSearchInstance.dispose();
-        }
+      this.instantSearchInstance.client = searchClient;
+      if (this.instantSearchInstance.mainHelper) {
+        this.instantSearchInstance.mainHelper.setClient(searchClient).search();
+      }
+    },
+    indexName(indexName) {
+      if (
+        this.instantSearchInstance.helper &&
+        this.instantSearchInstance.mainHelper
+      ) {
+        this.instantSearchInstance.helper.setIndex(indexName || '');
+        this.instantSearchInstance.mainHelper
+          .setIndex(indexName || '')
+          .search();
+      }
+    },
+    compositionID(compositionID) {
+      this.instantSearchInstance.helper.setIndex(compositionID || '').search();
+    },
+    stalledSearchDelay(stalledSearchDelay) {
+      // private InstantSearch.js API:
+      this.instantSearchInstance._stalledSearchDelay = stalledSearchDelay;
+    },
+    routing() {
+      throw new Error(
+        'routing configuration can not be changed dynamically at this point.' +
+          '\n\n' +
+          'Please open a new issue: https://github.com/algolia/instantsearch/discussions/new?category=ideas&labels=triage%2cLibrary%3A+Vue+InstantSearch&title=Feature%20request%3A%20dynamic%20props'
+      );
+    },
+    onStateChange() {
+      throw new Error(
+        'onStateChange configuration can not be changed dynamically at this point.' +
+          '\n\n' +
+          'Please open a new issue: https://github.com/algolia/instantsearch/discussions/new?category=ideas&labels=triage%2cLibrary%3A+Vue+InstantSearch&title=Feature%20request%3A%20dynamic%20props'
+      );
+    },
+    searchFunction(searchFunction) {
+      // private InstantSearch.js API:
+      this.instantSearchInstance._searchFunction = searchFunction;
+    },
+    middlewares: {
+      immediate: true,
+      handler(next, prev) {
+        (prev || [])
+          .filter((middleware) => (next || []).indexOf(middleware) === -1)
+          .forEach((middlewareToRemove) => {
+            this.instantSearchInstance.unuse(middlewareToRemove);
+          });
 
-        // a hydrated instance will no longer be hydrated once disposed, and starts from scratch
-        this.instantSearchInstance.__initialSearchResults = undefined;
+        (next || [])
+          .filter((middleware) => (prev || []).indexOf(middleware) === -1)
+          .forEach((middlewareToAdd) => {
+            this.instantSearchInstance.use(middlewareToAdd);
+          });
       },
     },
-    component
-  );
+    future(future) {
+      this.instantSearchInstance.future = Object.assign(
+        INSTANTSEARCH_FUTURE_DEFAULTS,
+        future
+      );
+    },
+  },
+  created() {
+    const searchClient = this.instantSearchInstance.client;
+    if (typeof searchClient.addAlgoliaAgent === 'function') {
+      searchClient.addAlgoliaAgent(`Vue (${vueVersion})`);
+      searchClient.addAlgoliaAgent(`Vue InstantSearch (${version})`);
+    }
+  },
+  mounted() {
+    // from the documentation: https://vuejs.org/v2/api/#mounted
+    // "Note that mounted does not guarantee that all child components have also been mounted. If you want to
+    // wait until the entire view has been rendered, you can use vm.$nextTick inside of mounted"
+    this.$nextTick(() => {
+      if (!this.instantSearchInstance.started) {
+        this.instantSearchInstance.start();
+      }
+    });
+  },
+  [isVue3 ? 'beforeUnmount' : 'beforeDestroy']() {
+    if (this.instantSearchInstance.started) {
+      this.instantSearchInstance.dispose();
+    }
+
+    // a hydrated instance will no longer be hydrated once disposed, and starts from scratch
+    this.instantSearchInstance.__initialSearchResults = undefined;
+  },
+  ...component,
+});
diff --git a/packages/vue-instantsearch/src/util/polyfills.js b/packages/vue-instantsearch/src/util/polyfills.js
deleted file mode 100644
index 43f12e3d08..0000000000
--- a/packages/vue-instantsearch/src/util/polyfills.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/* eslint-disable eslint-comments/no-unlimited-disable */
-/* eslint-disable */
-
-// source: @babel/plugin-proposal-object-rest-spread@7.2.0
-// prettier-ignore
-export function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
-
-// source: @babel/plugin-proposal-object-rest-spread@7.2.0
-// prettier-ignore
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }

From 56f6b5e4b225fcc3be80bf44035ef95e4878358c Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Fri, 6 Dec 2024 10:07:13 +0100
Subject: [PATCH 14/37] refactor: remove insightsClient prop (#6462)

The `insightsClient` prop is a remnant of an older implementation of insights, and no longer is needed. In this PR it's removed.

BREAKING CHANGE: use `insights` prop of instantsearch instead of `insightsClient`
---
 .../src/__tests__/instantsearch.test.tsx      | 51 --------------
 .../instantsearch-core/src/instantsearch.ts   | 17 -----
 .../src/types/instantsearch.ts                | 12 +---
 .../test/createInstantSearch.ts               |  1 -
 .../instantsearch.js/stories/hits.stories.ts  | 59 +++++++---------
 .../stories/infinite-hits.stories.ts          | 69 ++++++++-----------
 .../test/createInstantSearch.ts               |  1 -
 .../vue-instantsearch/.storybook/addons.js    |  1 -
 .../src/components/InstantSearch.js           |  5 --
 .../src/components/__tests__/InstantSearch.js |  3 -
 .../vue-instantsearch/stories/Hits.stories.js |  8 +--
 .../stories/InfiniteHits.stories.js           |  8 +--
 packages/vue-instantsearch/stories/utils.js   |  3 -
 13 files changed, 54 insertions(+), 184 deletions(-)

diff --git a/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx b/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
index 8a132b8f15..e7681db7c9 100644
--- a/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
+++ b/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
@@ -157,25 +157,6 @@ See: https://www.algolia.com/doc/guides/building-search-ui/going-further/backend
     });
   });
 
-  it('throws if insightsClient is not a function', () => {
-    const warn = jest.spyOn(global.console, 'warn');
-    warn.mockImplementation(() => {});
-
-    expect(() => {
-      // eslint-disable-next-line no-new
-      new InstantSearch({
-        indexName: 'indexName',
-        searchClient: createSearchClient(),
-        // @ts-expect-error
-        insightsClient: 'insights',
-      });
-    }).toThrowErrorMatchingInlineSnapshot(`
-"The \`insightsClient\` option should be a function.
-
-See documentation: https://www.algolia.com/doc/api-reference/widgets/instantsearch/js/"
-`);
-  });
-
   it('throws if addWidgets is called with a single widget', () => {
     expect(() => {
       const search = new InstantSearch({
@@ -311,27 +292,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/instantsear
     }).not.toWarnDev();
   });
 
-  it('warns dev when insightsClient is given', () => {
-    const searchClient = createSearchClient({
-      addAlgoliaAgent: jest.fn(),
-    });
-    const warn = jest.spyOn(global.console, 'warn');
-    warn.mockImplementation(() => {});
-
-    expect(() => {
-      // eslint-disable-next-line no-new
-      new InstantSearch({
-        indexName: 'indexName',
-        searchClient,
-        insightsClient: () => {},
-      });
-    }).toWarnDev(
-      `[InstantSearch]: \`insightsClient\` property has been deprecated. It is still supported in 4.x releases, but not further. It is replaced by the \`insights\` middleware.
-
-For more information, visit https://www.algolia.com/doc/guides/getting-insights-and-analytics/search-analytics/click-through-and-conversions/how-to/send-click-and-conversion-events-with-instantsearch/js/`
-    );
-  });
-
   it('accepts middleware with partial methods', () => {
     const search = new InstantSearch({
       indexName: 'indexName',
@@ -415,17 +375,6 @@ search.addWidgets([
 See https://www.algolia.com/doc/api-reference/widgets/configure/js/`);
   });
 
-  it('does store insightsClient on the instance', () => {
-    const insightsClient = () => {};
-    const search = new InstantSearch({
-      indexName: 'indexName',
-      searchClient: createSearchClient(),
-      insightsClient,
-    });
-
-    expect(search.insightsClient).toBe(insightsClient);
-  });
-
   it("exposes helper's last results", async () => {
     const searchClient = createSearchClient();
 
diff --git a/packages/instantsearch-core/src/instantsearch.ts b/packages/instantsearch-core/src/instantsearch.ts
index 610636abec..2900e1b22c 100644
--- a/packages/instantsearch-core/src/instantsearch.ts
+++ b/packages/instantsearch-core/src/instantsearch.ts
@@ -24,7 +24,6 @@ import version from './version';
 import { index } from './widgets/index-widget';
 
 import type {
-  InsightsClient as AlgoliaInsightsClient,
   SearchClient,
   Widget,
   IndexWidget,
@@ -68,7 +67,6 @@ export class InstantSearch<
   client: InstantSearchOptions['searchClient'];
   indexName: string;
   compositionID?: string;
-  insightsClient: AlgoliaInsightsClient | null;
   onStateChange: InstantSearchOptions<TUiState>['onStateChange'] | null = null;
   future: NonNullable<InstantSearchOptions<TUiState>['future']>;
   helper: AlgoliaSearchHelper | null;
@@ -116,7 +114,6 @@ export class InstantSearch<
       searchFunction,
       stalledSearchDelay = 200,
       searchClient = null,
-      insightsClient = null,
       onStateChange = null,
       future = {
         ...INSTANTSEARCH_FUTURE_DEFAULTS,
@@ -140,19 +137,6 @@ See: https://www.algolia.com/doc/guides/building-search-ui/going-further/backend
       searchClient.addAlgoliaAgent(`instantsearch-core (${version})`);
     }
 
-    warning(
-      insightsClient === null,
-      `\`insightsClient\` property has been deprecated. It is still supported in 4.x releases, but not further. It is replaced by the \`insights\` middleware.
-
-For more information, visit https://www.algolia.com/doc/guides/getting-insights-and-analytics/search-analytics/click-through-and-conversions/how-to/send-click-and-conversion-events-with-instantsearch/js/`
-    );
-
-    if (insightsClient && typeof insightsClient !== 'function') {
-      throw new Error(
-        withUsage('The `insightsClient` option should be a function.')
-      );
-    }
-
     warning(
       !(options as any).searchParameters,
       `The \`searchParameters\` option is deprecated and will not be supported in InstantSearch.js 4.x.
@@ -185,7 +169,6 @@ See documentation: ${createDocumentationLink({
 
     this.client = searchClient;
     this.future = future;
-    this.insightsClient = insightsClient;
     this.indexName = indexName;
     this.compositionID = compositionID;
     this.helper = null;
diff --git a/packages/instantsearch-core/src/types/instantsearch.ts b/packages/instantsearch-core/src/types/instantsearch.ts
index a98169f661..cd6caa2f13 100644
--- a/packages/instantsearch-core/src/types/instantsearch.ts
+++ b/packages/instantsearch-core/src/types/instantsearch.ts
@@ -1,8 +1,5 @@
 import type { CompositionClient, SearchClient } from './algoliasearch';
-import type {
-  InsightsClient as AlgoliaInsightsClient,
-  InsightsProps,
-} from './insights';
+import type { InsightsProps } from './insights';
 import type { RouterProps } from './router';
 import type { UiState } from './ui-state';
 import type { AlgoliaSearchHelper } from 'algoliasearch-helper';
@@ -99,13 +96,6 @@ export type InstantSearchOptions<
    * @default false
    */
   insights?: InsightsProps | boolean;
-  /**
-   * the instance of search-insights to use for sending insights events inside
-   * widgets like `hits`.
-   *
-   * @deprecated This property will be still supported in 4.x releases, but not further. It is replaced by the `insights` middleware. For more information, visit https://www.algolia.com/doc/guides/getting-insights-and-analytics/search-analytics/click-through-and-conversions/how-to/send-click-and-conversion-events-with-instantsearch/js/
-   */
-  insightsClient?: AlgoliaInsightsClient;
   future?: {
     /**
      * Changes the way `dispose` is used in InstantSearch lifecycle.
diff --git a/packages/instantsearch-core/test/createInstantSearch.ts b/packages/instantsearch-core/test/createInstantSearch.ts
index e1271d43fa..c306695b06 100644
--- a/packages/instantsearch-core/test/createInstantSearch.ts
+++ b/packages/instantsearch-core/test/createInstantSearch.ts
@@ -28,7 +28,6 @@ export const createInstantSearch = (
     },
     refresh: jest.fn(),
     helper: mainHelper, // @TODO: use the Helper from the index once the RoutingManger uses the index
-    insightsClient: null,
     middleware: [],
     renderState: {},
     scheduleStalledRender: defer(jest.fn()),
diff --git a/packages/instantsearch.js/stories/hits.stories.ts b/packages/instantsearch.js/stories/hits.stories.ts
index bf41e8a000..fa49c5aee9 100644
--- a/packages/instantsearch.js/stories/hits.stories.ts
+++ b/packages/instantsearch.js/stories/hits.stories.ts
@@ -1,15 +1,7 @@
-import { action } from '@storybook/addon-actions';
 import { storiesOf } from '@storybook/html';
 
 import { withHits } from '../.storybook/decorators';
 
-import type { InsightsClient } from '../src/types';
-
-const fakeInsightsClient: InsightsClient = (method, ...payloads) => {
-  const [payload] = payloads;
-  action(`[InsightsClient] sent ${method} with payload`)(payload);
-};
-
 storiesOf('Results/Hits', module)
   .add(
     'default',
@@ -138,33 +130,28 @@ storiesOf('Results/Hits', module)
   )
   .add(
     'with insights function',
-    withHits(
-      ({ search, container, instantsearch }) => {
-        search.addWidgets([
-          instantsearch.widgets.configure({
-            attributesToSnippet: ['name', 'description'],
-            clickAnalytics: true,
-          }),
-        ]);
+    withHits(({ search, container, instantsearch }) => {
+      search.addWidgets([
+        instantsearch.widgets.configure({
+          attributesToSnippet: ['name', 'description'],
+          clickAnalytics: true,
+        }),
+      ]);
 
-        search.addWidgets([
-          instantsearch.widgets.hits({
-            container,
-            templates: {
-              item: (item, { html, sendEvent }) => html`
-                <h4>${item.name}</h4>
-                <button
-                  onClick=${() => sendEvent('click', [item], 'Add to cart')}
-                >
-                  Add to cart
-                </button>
-              `,
-            },
-          }),
-        ]);
-      },
-      {
-        insightsClient: fakeInsightsClient,
-      }
-    )
+      search.addWidgets([
+        instantsearch.widgets.hits({
+          container,
+          templates: {
+            item: (item, { html, sendEvent }) => html`
+              <h4>${item.name}</h4>
+              <button
+                onClick=${() => sendEvent('click', [item], 'Add to cart')}
+              >
+                Add to cart
+              </button>
+            `,
+          },
+        }),
+      ]);
+    })
   );
diff --git a/packages/instantsearch.js/stories/infinite-hits.stories.ts b/packages/instantsearch.js/stories/infinite-hits.stories.ts
index 0ced6146cc..2989c2d4ce 100644
--- a/packages/instantsearch.js/stories/infinite-hits.stories.ts
+++ b/packages/instantsearch.js/stories/infinite-hits.stories.ts
@@ -1,16 +1,8 @@
-import { action } from '@storybook/addon-actions';
 import { storiesOf } from '@storybook/html';
 
 import { withHits } from '../.storybook/decorators';
 import { createInfiniteHitsSessionStorageCache } from '../src/lib/infiniteHitsCache';
 
-import type { InsightsClient } from '../src/types';
-
-const fakeInsightsClient: InsightsClient = (method, ...payloads) => {
-  const [payload] = payloads;
-  action(`[InsightsClient] sent ${method} with payload`)(payload);
-};
-
 storiesOf('Results/InfiniteHits', module)
   .add(
     'default',
@@ -59,40 +51,35 @@ storiesOf('Results/InfiniteHits', module)
   )
   .add(
     'with insights helper',
-    withHits(
-      ({ search, container, instantsearch }) => {
-        search.addWidgets([
-          instantsearch.widgets.configure({
-            attributesToSnippet: ['name', 'description'],
-            clickAnalytics: true,
-          }),
-        ]);
+    withHits(({ search, container, instantsearch }) => {
+      search.addWidgets([
+        instantsearch.widgets.configure({
+          attributesToSnippet: ['name', 'description'],
+          clickAnalytics: true,
+        }),
+      ]);
 
-        search.addWidgets([
-          instantsearch.widgets.infiniteHits({
-            container,
-            templates: {
-              item: (item, { html, sendEvent }) => html`
-                <h4>${item.name}</h4>
-                <button
-                  onClick=${() =>
-                    sendEvent(
-                      'clickedObjectIDsAfterSearch',
-                      [item],
-                      'Add to cart'
-                    )}
-                >
-                  Add to cart
-                </button>
-              `,
-            },
-          }),
-        ]);
-      },
-      {
-        insightsClient: fakeInsightsClient,
-      }
-    )
+      search.addWidgets([
+        instantsearch.widgets.infiniteHits({
+          container,
+          templates: {
+            item: (item, { html, sendEvent }) => html`
+              <h4>${item.name}</h4>
+              <button
+                onClick=${() =>
+                  sendEvent(
+                    'clickedObjectIDsAfterSearch',
+                    [item],
+                    'Add to cart'
+                  )}
+              >
+                Add to cart
+              </button>
+            `,
+          },
+        }),
+      ]);
+    })
   )
   .add(
     'with previous button enabled',
diff --git a/packages/instantsearch.js/test/createInstantSearch.ts b/packages/instantsearch.js/test/createInstantSearch.ts
index 43bfa16caa..258711c43d 100644
--- a/packages/instantsearch.js/test/createInstantSearch.ts
+++ b/packages/instantsearch.js/test/createInstantSearch.ts
@@ -30,7 +30,6 @@ export const createInstantSearch = (
     },
     refresh: jest.fn(),
     helper: mainHelper, // @TODO: use the Helper from the index once the RoutingManger uses the index
-    insightsClient: null,
     middleware: [],
     renderState: {},
     scheduleStalledRender: defer(jest.fn()),
diff --git a/packages/vue-instantsearch/.storybook/addons.js b/packages/vue-instantsearch/.storybook/addons.js
index 1d561cdfdd..5659100510 100644
--- a/packages/vue-instantsearch/.storybook/addons.js
+++ b/packages/vue-instantsearch/.storybook/addons.js
@@ -1,3 +1,2 @@
 import '@storybook/addon-knobs/register';
 import '@storybook/addon-options/register';
-import '@storybook/addon-actions/register';
diff --git a/packages/vue-instantsearch/src/components/InstantSearch.js b/packages/vue-instantsearch/src/components/InstantSearch.js
index 5077001510..3f3446503c 100644
--- a/packages/vue-instantsearch/src/components/InstantSearch.js
+++ b/packages/vue-instantsearch/src/components/InstantSearch.js
@@ -16,10 +16,6 @@ export default createInstantSearchComponent({
       type: Object,
       required: true,
     },
-    insightsClient: {
-      type: Function,
-      default: undefined,
-    },
     indexName: {
       type: String,
       required: false,
@@ -102,7 +98,6 @@ export default createInstantSearchComponent({
     return {
       instantSearchInstance: instantsearch({
         searchClient: this.searchClient,
-        insightsClient: this.insightsClient,
         insights: this.insights,
         indexName: this.indexName,
         compositionID: this.compositionID,
diff --git a/packages/vue-instantsearch/src/components/__tests__/InstantSearch.js b/packages/vue-instantsearch/src/components/__tests__/InstantSearch.js
index 878aa52630..df55ed7f57 100644
--- a/packages/vue-instantsearch/src/components/__tests__/InstantSearch.js
+++ b/packages/vue-instantsearch/src/components/__tests__/InstantSearch.js
@@ -42,7 +42,6 @@ beforeEach(() => {
 
 it('passes props to InstantSearch.js', () => {
   const searchClient = createSearchClient();
-  const insightsClient = jest.fn();
   const searchFunction = (helper) => helper.search();
   const routing = {
     router: historyRouter(),
@@ -52,7 +51,6 @@ it('passes props to InstantSearch.js', () => {
   mount(InstantSearch, {
     propsData: {
       searchClient,
-      insightsClient,
       indexName: 'something',
       routing,
       stalledSearchDelay: 250,
@@ -64,7 +62,6 @@ it('passes props to InstantSearch.js', () => {
     indexName: 'something',
     routing,
     searchClient,
-    insightsClient,
     searchFunction,
     stalledSearchDelay: 250,
   });
diff --git a/packages/vue-instantsearch/stories/Hits.stories.js b/packages/vue-instantsearch/stories/Hits.stories.js
index 7c18dfa300..dfacf7cf5b 100644
--- a/packages/vue-instantsearch/stories/Hits.stories.js
+++ b/packages/vue-instantsearch/stories/Hits.stories.js
@@ -1,4 +1,3 @@
-import { action } from '@storybook/addon-actions';
 import { storiesOf } from '@storybook/vue';
 
 import { previewWrapper } from './utils';
@@ -68,12 +67,7 @@ storiesOf('ais-hits', module)
   }));
 
 storiesOf('ais-hits', module)
-  .addDecorator(
-    previewWrapper({
-      insightsClient: (method, payload) =>
-        action(`[InsightsClient] sent ${method} with payload`)(payload),
-    })
-  )
+  .addDecorator(previewWrapper({}))
   .add('with insights default slot', () => ({
     template: `
       <div>
diff --git a/packages/vue-instantsearch/stories/InfiniteHits.stories.js b/packages/vue-instantsearch/stories/InfiniteHits.stories.js
index e3690d3c82..15c16696c0 100644
--- a/packages/vue-instantsearch/stories/InfiniteHits.stories.js
+++ b/packages/vue-instantsearch/stories/InfiniteHits.stories.js
@@ -1,4 +1,3 @@
-import { action } from '@storybook/addon-actions';
 import { storiesOf } from '@storybook/vue';
 import { createInfiniteHitsSessionStorageCache } from 'instantsearch.js/es/lib/infiniteHitsCache';
 import { simple } from 'instantsearch.js/es/lib/stateMappings';
@@ -139,12 +138,7 @@ storiesOf('ais-infinite-hits', module)
   }));
 
 storiesOf('ais-infinite-hits', module)
-  .addDecorator(
-    previewWrapper({
-      insightsClient: (method, payload) =>
-        action(`[InsightsClient] sent ${method} with payload`)(payload),
-    })
-  )
+  .addDecorator(previewWrapper({}))
   .add('with insights on default slot', () => ({
     template: `
       <div>
diff --git a/packages/vue-instantsearch/stories/utils.js b/packages/vue-instantsearch/stories/utils.js
index 7a73b3cd8e..e8def8d204 100644
--- a/packages/vue-instantsearch/stories/utils.js
+++ b/packages/vue-instantsearch/stories/utils.js
@@ -3,7 +3,6 @@ import { liteClient as algoliasearch } from 'algoliasearch/lite';
 export const previewWrapper =
   ({
     searchClient = algoliasearch('latency', '6be0576ff61c053d5f9a3225e2a90f76'),
-    insightsClient,
     indexName = 'instant_search',
     hits = `
     <template v-slot="{ items }">
@@ -40,7 +39,6 @@ export const previewWrapper =
       :search-client="searchClient"
       index-name="${indexName}"
       :routing="routing"
-      :insights-client="insightsClient"
     >
       <div class="vis-container vis-container-preview">
         <story />
@@ -65,7 +63,6 @@ export const previewWrapper =
       return {
         searchClient,
         routing,
-        insightsClient,
       };
     },
   });

From 07ed6a99adbd5cbb4baf4f76124057db016a6069 Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Mon, 9 Dec 2024 14:54:27 +0100
Subject: [PATCH 15/37] fix(searchForFacetValues): only call client.search
 (#6465)

This signature is the easiest to detect and makes the required signature of the searchClient simpler (only `search`, `getRecommendations` and `addAlgoliaAgent` are now used).

In this PR I also fix the signature of `search` in `SearchClient` type to make this usage fit reality.

BREAKING CHANGE: in helper.searchForFacetFalues only the method client.search is used, none of the previous fallbacks.
---
 .../src/algoliasearch.helper.js               |  58 +--
 .../src/requestBuilder.js                     |   1 -
 .../test/spec/algoliasearch.helper/events.js  |   7 +-
 .../algoliasearch.helper/pendingSearch.js     |  91 +---
 .../searchForFacetValues.js                   | 416 +++++-----------
 .../types/algoliasearch.d.ts                  |  36 +-
 .../__tests__/connectRefinementList.test.ts   | 461 ++++++++----------
 .../widgets/__tests__/index-widget.test.ts}   |  68 ++-
 .../__tests__/refinement-list.test.tsx        | 146 +++---
 .../widgets/__tests__/RefinementList.test.tsx |  78 ++-
 .../common/widgets/refinement-list/options.ts |  59 ++-
 tests/mocks/createSearchClient.ts             |   8 +-
 12 files changed, 538 insertions(+), 891 deletions(-)
 rename packages/{instantsearch.js/src/widgets/index/__tests__/index-test.ts => instantsearch-core/src/widgets/__tests__/index-widget.test.ts} (98%)

diff --git a/packages/algoliasearch-helper/src/algoliasearch.helper.js b/packages/algoliasearch-helper/src/algoliasearch.helper.js
index e041474e5e..04e862fa69 100644
--- a/packages/algoliasearch-helper/src/algoliasearch.helper.js
+++ b/packages/algoliasearch-helper/src/algoliasearch.helper.js
@@ -326,21 +326,6 @@ AlgoliaSearchHelper.prototype.searchForFacetValues = function (
   maxFacetHits,
   userState
 ) {
-  var clientHasSFFV =
-    typeof this.client.searchForFacetValues === 'function' &&
-    // v5 has a wrong sffv signature
-    typeof this.client.searchForFacets !== 'function';
-  var clientHasInitIndex = typeof this.client.initIndex === 'function';
-  if (
-    !clientHasSFFV &&
-    !clientHasInitIndex &&
-    typeof this.client.search !== 'function'
-  ) {
-    throw new Error(
-      'search for facet values (searchable) was called, but this client does not have a function client.searchForFacetValues or client.initIndex(index).searchForFacetValues'
-    );
-  }
-
   var state = this.state.setQueryParameters(userState || {});
   var isDisjunctive = state.isDisjunctiveFacet(facet);
   var algoliaQuery = requestBuilder.getSearchForFacetQuery(
@@ -353,34 +338,15 @@ AlgoliaSearchHelper.prototype.searchForFacetValues = function (
   this._currentNbQueries++;
   // eslint-disable-next-line consistent-this
   var self = this;
-  var searchForFacetValuesPromise;
-  // newer algoliasearch ^3.27.1 - ~4.0.0
-  if (clientHasSFFV) {
-    searchForFacetValuesPromise = this.client.searchForFacetValues([
-      { indexName: state.index, params: algoliaQuery },
-    ]);
-    // algoliasearch < 3.27.1
-  } else if (clientHasInitIndex) {
-    searchForFacetValuesPromise = this.client
-      .initIndex(state.index)
-      .searchForFacetValues(algoliaQuery);
-    // algoliasearch ~5.0.0
-  } else {
-    // @MAJOR only use client.search
-    delete algoliaQuery.facetName;
-    searchForFacetValuesPromise = this.client
-      .search([
-        {
-          type: 'facet',
-          facet: facet,
-          indexName: state.index,
-          params: algoliaQuery,
-        },
-      ])
-      .then(function processResponse(response) {
-        return response.results[0];
-      });
-  }
+
+  var searchForFacetValuesPromise = this.client.search([
+    {
+      type: 'facet',
+      facet: facet,
+      indexName: state.index,
+      params: algoliaQuery,
+    },
+  ]);
 
   this.emit('searchForFacetValues', {
     state: state,
@@ -393,16 +359,16 @@ AlgoliaSearchHelper.prototype.searchForFacetValues = function (
       self._currentNbQueries--;
       if (self._currentNbQueries === 0) self.emit('searchQueueEmpty');
 
-      content = Array.isArray(content) ? content[0] : content;
+      var result = content.results[0];
 
-      content.facetHits.forEach(function (f) {
+      result.facetHits.forEach(function (f) {
         f.escapedValue = escapeFacetValue(f.value);
         f.isRefined = isDisjunctive
           ? state.isDisjunctiveFacetRefined(facet, f.escapedValue)
           : state.isFacetRefined(facet, f.escapedValue);
       });
 
-      return content;
+      return result;
     },
     function (e) {
       self._currentNbQueries--;
diff --git a/packages/algoliasearch-helper/src/requestBuilder.js b/packages/algoliasearch-helper/src/requestBuilder.js
index 9cb7235840..97115616b6 100644
--- a/packages/algoliasearch-helper/src/requestBuilder.js
+++ b/packages/algoliasearch-helper/src/requestBuilder.js
@@ -499,7 +499,6 @@ var requestBuilder = {
       : state;
     var searchForFacetSearchParameters = {
       facetQuery: query,
-      facetName: facetName,
     };
     if (typeof maxFacetHits === 'number') {
       searchForFacetSearchParameters.maxFacetHits = maxFacetHits;
diff --git a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/events.js b/packages/algoliasearch-helper/test/spec/algoliasearch.helper/events.js
index db8eada81a..8712e0ae56 100644
--- a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/events.js
+++ b/packages/algoliasearch-helper/test/spec/algoliasearch.helper/events.js
@@ -7,9 +7,6 @@ function makeFakeClient() {
     search: jest.fn(function () {
       return new Promise(function () {});
     }),
-    searchForFacetValues: jest.fn(function () {
-      return new Promise(function () {});
-    }),
   };
 }
 
@@ -297,7 +294,7 @@ test(
     helper.on('searchForFacetValues', searchedForFacetValues);
 
     expect(searchedForFacetValues).toHaveBeenCalledTimes(0);
-    expect(fakeClient.searchForFacetValues).toHaveBeenCalledTimes(0);
+    expect(fakeClient.search).toHaveBeenCalledTimes(0);
 
     helper.searchForFacetValues('city', 'NYC');
     expect(searchedForFacetValues).toHaveBeenCalledTimes(1);
@@ -306,7 +303,7 @@ test(
       facet: 'city',
       query: 'NYC',
     });
-    expect(fakeClient.searchForFacetValues).toHaveBeenCalledTimes(1);
+    expect(fakeClient.search).toHaveBeenCalledTimes(1);
   }
 );
 
diff --git a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/pendingSearch.js b/packages/algoliasearch-helper/test/spec/algoliasearch.helper/pendingSearch.js
index 00018aa06a..d4ed0f265d 100644
--- a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/pendingSearch.js
+++ b/packages/algoliasearch-helper/test/spec/algoliasearch.helper/pendingSearch.js
@@ -1,7 +1,6 @@
 'use strict';
 
 var algoliasearch = require('algoliasearch');
-var isV5 = (algoliasearch.apiClientVersion || '')[0] === '5';
 algoliasearch = algoliasearch.algoliasearch || algoliasearch;
 
 var algoliasearchHelper = require('../../../index');
@@ -72,85 +71,45 @@ test('When searchOnce with promises, hasPendingRequests is true', function (done
   triggerCb();
 });
 
-if (!isV5) {
-  test('When searchForFacetValues, hasPendingRequests is true (v3, v4)', function (done) {
-    var client = algoliasearch('dsf', 'dsfdf');
+test('When searchForFacetValues, hasPendingRequests is true', function (done) {
+  var client = algoliasearch('dsf', 'dsfdf');
 
-    let triggerCb;
-    client.searchForFacetValues = function () {
-      return new Promise(function (resolve) {
-        triggerCb = function () {
-          resolve([
+  let triggerCb;
+  client.search = function () {
+    return new Promise(function (resolve) {
+      triggerCb = function () {
+        resolve({
+          results: [
             {
               exhaustiveFacetsCount: true,
               facetHits: [],
               processingTimeMS: 3,
             },
-          ]);
-        };
-      });
-    };
-
-    var helper = algoliasearchHelper(client, 'test_hotels-node');
-    var countNoMoreSearch = 0;
-    helper.on('searchQueueEmpty', function () {
-      countNoMoreSearch += 1;
-    });
-
-    expect(helper.hasPendingRequests()).toBe(false);
-
-    helper.searchForFacetValues('').then(function () {
-      expect(helper.hasPendingRequests()).toBe(false);
-      expect(countNoMoreSearch).toBe(1);
-      done();
+          ],
+        });
+      };
     });
+  };
 
-    expect(helper.hasPendingRequests()).toBe(true);
-    expect(countNoMoreSearch).toBe(0);
-
-    triggerCb();
+  var helper = algoliasearchHelper(client, 'test_hotels-node');
+  var countNoMoreSearch = 0;
+  helper.on('searchQueueEmpty', function () {
+    countNoMoreSearch += 1;
   });
-} else {
-  test('When searchForFacetValues, hasPendingRequests is true (v5)', function (done) {
-    var client = algoliasearch('dsf', 'dsfdf');
-
-    let triggerCb;
-    client.search = function () {
-      return new Promise(function (resolve) {
-        triggerCb = function () {
-          resolve({
-            results: [
-              {
-                exhaustiveFacetsCount: true,
-                facetHits: [],
-                processingTimeMS: 3,
-              },
-            ],
-          });
-        };
-      });
-    };
 
-    var helper = algoliasearchHelper(client, 'test_hotels-node');
-    var countNoMoreSearch = 0;
-    helper.on('searchQueueEmpty', function () {
-      countNoMoreSearch += 1;
-    });
+  expect(helper.hasPendingRequests()).toBe(false);
 
+  helper.searchForFacetValues('').then(function () {
     expect(helper.hasPendingRequests()).toBe(false);
+    expect(countNoMoreSearch).toBe(1);
+    done();
+  });
 
-    helper.searchForFacetValues('').then(function () {
-      expect(helper.hasPendingRequests()).toBe(false);
-      expect(countNoMoreSearch).toBe(1);
-      done();
-    });
-
-    expect(helper.hasPendingRequests()).toBe(true);
-    expect(countNoMoreSearch).toBe(0);
+  expect(helper.hasPendingRequests()).toBe(true);
+  expect(countNoMoreSearch).toBe(0);
 
-    triggerCb();
-  });
-}
+  triggerCb();
+});
 
 test('When helper.search(), hasPendingRequests is true', function (done) {
   var testData = require('../../datasets/SearchParameters/search.dataset')();
diff --git a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/searchForFacetValues.js b/packages/algoliasearch-helper/test/spec/algoliasearch.helper/searchForFacetValues.js
index 6606e6d0e0..7e4d1b3e07 100644
--- a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/searchForFacetValues.js
+++ b/packages/algoliasearch-helper/test/spec/algoliasearch.helper/searchForFacetValues.js
@@ -10,77 +10,36 @@ function makeFakeSearchForFacetValuesResponse() {
   };
 }
 
-test('searchForFacetValues calls the client method over the index method', function () {
-  var clientSearchForFacetValues = jest.fn(function () {
-    return Promise.resolve([makeFakeSearchForFacetValuesResponse()]);
-  });
-
-  var indexSearchForFacetValues = jest.fn(function () {
-    return Promise.resolve(makeFakeSearchForFacetValuesResponse());
-  });
-
-  var fakeClient = {
-    searchForFacetValues: clientSearchForFacetValues,
-    initIndex: function () {
-      return {
-        searchForFacetValues: indexSearchForFacetValues,
-      };
-    },
-  };
-
-  var helper = algoliasearchHelper(fakeClient, 'index');
-
-  return helper.searchForFacetValues('facet', 'query', 1).then(function () {
-    expect(clientSearchForFacetValues).toHaveBeenCalledTimes(1);
-    expect(indexSearchForFacetValues).toHaveBeenCalledTimes(0);
-  });
-});
-
-test('searchForFacetValues calls the index method if no client method', function () {
-  var indexSearchForFacetValues = jest.fn(function () {
-    return Promise.resolve(makeFakeSearchForFacetValuesResponse());
-  });
-
+test('searchForFacetValues calls client.search if client.searchForFacets exists', function () {
   var fakeClient = {
     initIndex: function () {
       return {
-        searchForFacetValues: indexSearchForFacetValues,
+        searchForFacetValues: jest.fn(function () {}),
       };
     },
-  };
-
-  var helper = algoliasearchHelper(fakeClient, 'index');
-
-  return helper.searchForFacetValues('facet', 'query', 1).then(function () {
-    expect(indexSearchForFacetValues).toHaveBeenCalledTimes(1);
-  });
-});
-
-test('searchForFacetValues calls client.search if client.searchForFacets exists', function () {
-  var clientSearch = jest.fn(function () {
-    return Promise.resolve({
-      results: [makeFakeSearchForFacetValuesResponse()],
-    });
-  });
-
-  var fakeClient = {
     searchForFacets: jest.fn(),
     searchForFacetValues: jest.fn(),
-    search: clientSearch,
+    search: jest.fn(function () {
+      return Promise.resolve({
+        results: [makeFakeSearchForFacetValuesResponse()],
+      });
+    }),
   };
 
   var helper = algoliasearchHelper(fakeClient, 'index');
 
   return helper.searchForFacetValues('facet', 'query', 1).then(function () {
-    expect(clientSearch).toHaveBeenCalledTimes(1);
+    expect(fakeClient.search).toHaveBeenCalledTimes(1);
   });
 });
 
 test('searchForFacetValues resolve with the correct response from client', function () {
   var fakeClient = {
     addAlgoliaAgent: function () {},
-    searchForFacetValues: function () {
-      return Promise.resolve([makeFakeSearchForFacetValuesResponse()]);
+    search: function () {
+      return Promise.resolve({
+        results: [makeFakeSearchForFacetValuesResponse()],
+      });
     },
   };
 
@@ -95,158 +54,14 @@ test('searchForFacetValues resolve with the correct response from client', funct
     });
 });
 
-test('searchForFacetValues resolve with the correct response from initIndex', function () {
+test('searchForFacetValues should search for facetValues with the current state', function () {
   var fakeClient = {
     addAlgoliaAgent: function () {},
-    initIndex: function () {
-      return {
-        searchForFacetValues: function () {
-          return Promise.resolve(makeFakeSearchForFacetValuesResponse());
-        },
-      };
-    },
-  };
-
-  var helper = algoliasearchHelper(fakeClient, 'index');
-
-  return helper
-    .searchForFacetValues('facet', 'query', 1)
-    .then(function (content) {
-      expect(content.exhaustiveFacetsCount).toBe(true);
-      expect(content.facetHits.length).toBe(0);
-      expect(content.processingTimeMS).toBe(3);
-    });
-});
-
-test('index.searchForFacetValues should search for facetValues with the current state', function () {
-  var indexSearchForFacetValues = jest.fn(function () {
-    return Promise.resolve(makeFakeSearchForFacetValuesResponse());
-  });
-
-  var fakeClient = {
-    initIndex: function () {
-      return {
-        searchForFacetValues: indexSearchForFacetValues,
-      };
-    },
-  };
-
-  var helper = algoliasearchHelper(fakeClient, 'index', {
-    highlightPreTag: 'HIGHLIGHT>',
-    highlightPostTag: '<HIGHLIGHT',
-    query: 'iphone',
-  });
-
-  helper.searchForFacetValues('facet', 'query', 75);
-
-  var lastArguments = indexSearchForFacetValues.mock.calls[0][0];
-
-  expect(lastArguments.query).toBe('iphone');
-  expect(lastArguments.facetQuery).toBe('query');
-  expect(lastArguments.facetName).toBe('facet');
-  expect(lastArguments.highlightPreTag).toBe('HIGHLIGHT>');
-  expect(lastArguments.highlightPostTag).toBe('<HIGHLIGHT');
-});
-
-test('index.searchForFacetValues can override the current search state', function () {
-  var indexSearchForFacetValues = jest.fn(function () {
-    return Promise.resolve(makeFakeSearchForFacetValuesResponse());
-  });
-
-  var fakeClient = {
-    initIndex: function () {
-      return {
-        searchForFacetValues: indexSearchForFacetValues,
-      };
-    },
-  };
-
-  var helper = algoliasearchHelper(fakeClient, 'index', {
-    highlightPreTag: 'HIGHLIGHT>',
-    highlightPostTag: '<HIGHLIGHT',
-    query: 'iphone',
-  });
-
-  helper.searchForFacetValues('facet', 'query', 75, {
-    query: undefined,
-    highlightPreTag: 'highlightTag',
-  });
-
-  var lastArguments = indexSearchForFacetValues.mock.calls[0][0];
-
-  expect(lastArguments.hasOwnProperty('query')).toBeFalsy();
-  expect(lastArguments.facetQuery).toBe('query');
-  expect(lastArguments.facetName).toBe('facet');
-  expect(lastArguments.highlightPreTag).toBe('highlightTag');
-  expect(lastArguments.highlightPostTag).toBe('<HIGHLIGHT');
-});
-
-test('client.searchForFacetValues should search for facetValues with the current state', function () {
-  var clientSearchForFacetValues = jest.fn(function () {
-    return Promise.resolve([makeFakeSearchForFacetValuesResponse()]);
-  });
-
-  var fakeClient = {
-    searchForFacetValues: clientSearchForFacetValues,
-  };
-
-  var helper = algoliasearchHelper(fakeClient, 'index', {
-    highlightPreTag: 'HIGHLIGHT>',
-    highlightPostTag: '<HIGHLIGHT',
-    query: 'iphone',
-  });
-
-  helper.searchForFacetValues('facet', 'query', 75);
-
-  var lastArguments = clientSearchForFacetValues.mock.calls[0][0][0];
-
-  expect(lastArguments.indexName).toBe('index');
-  expect(lastArguments.params.query).toBe('iphone');
-  expect(lastArguments.params.facetQuery).toBe('query');
-  expect(lastArguments.params.facetName).toBe('facet');
-  expect(lastArguments.params.highlightPreTag).toBe('HIGHLIGHT>');
-  expect(lastArguments.params.highlightPostTag).toBe('<HIGHLIGHT');
-});
-
-test('client.searchForFacetValues can override the current search state', function () {
-  var clientSearchForFacetValues = jest.fn(function () {
-    return Promise.resolve([makeFakeSearchForFacetValuesResponse()]);
-  });
-
-  var fakeClient = {
-    searchForFacetValues: clientSearchForFacetValues,
-  };
-
-  var helper = algoliasearchHelper(fakeClient, 'index', {
-    highlightPreTag: 'HIGHLIGHT>',
-    highlightPostTag: '<HIGHLIGHT',
-    query: 'iphone',
-  });
-
-  helper.searchForFacetValues('facet', 'query', 75, {
-    query: undefined,
-    highlightPreTag: 'highlightTag',
-  });
-
-  var lastArguments = clientSearchForFacetValues.mock.calls[0][0][0];
-
-  expect(lastArguments.indexName).toBe('index');
-  expect(lastArguments.params.hasOwnProperty('query')).toBeFalsy();
-  expect(lastArguments.params.facetQuery).toBe('query');
-  expect(lastArguments.params.facetName).toBe('facet');
-  expect(lastArguments.params.highlightPreTag).toBe('highlightTag');
-  expect(lastArguments.params.highlightPostTag).toBe('<HIGHLIGHT');
-});
-
-test('client.search should search for facetValues with the current state', function () {
-  var clientSearch = jest.fn(function () {
-    return Promise.resolve({
-      results: [makeFakeSearchForFacetValuesResponse()],
-    });
-  });
-
-  var fakeClient = {
-    search: clientSearch,
+    search: jest.fn(function () {
+      return Promise.resolve({
+        results: [makeFakeSearchForFacetValuesResponse()],
+      });
+    }),
   };
 
   var helper = algoliasearchHelper(fakeClient, 'index', {
@@ -257,26 +72,22 @@ test('client.search should search for facetValues with the current state', funct
 
   helper.searchForFacetValues('facet', 'query', 75);
 
-  var lastArguments = clientSearch.mock.calls[0][0][0];
+  var lastArguments = fakeClient.search.mock.calls[0][0][0];
 
-  expect(lastArguments.indexName).toBe('index');
   expect(lastArguments.params.query).toBe('iphone');
   expect(lastArguments.params.facetQuery).toBe('query');
-  expect(lastArguments.params.hasOwnProperty('facetName')).toBeFalsy();
   expect(lastArguments.facet).toBe('facet');
   expect(lastArguments.params.highlightPreTag).toBe('HIGHLIGHT>');
   expect(lastArguments.params.highlightPostTag).toBe('<HIGHLIGHT');
 });
 
-test('client.search can override the current search state', function () {
-  var clientSearch = jest.fn(function () {
-    return Promise.resolve({
-      results: [makeFakeSearchForFacetValuesResponse()],
-    });
-  });
-
+test('searchForFacetValues can override the current search state', function () {
   var fakeClient = {
-    search: clientSearch,
+    search: jest.fn(function () {
+      return Promise.resolve({
+        results: [makeFakeSearchForFacetValuesResponse()],
+      });
+    }),
   };
 
   var helper = algoliasearchHelper(fakeClient, 'index', {
@@ -290,52 +101,39 @@ test('client.search can override the current search state', function () {
     highlightPreTag: 'highlightTag',
   });
 
-  var lastArguments = clientSearch.mock.calls[0][0][0];
+  var lastArguments = fakeClient.search.mock.calls[0][0][0];
 
-  expect(lastArguments.indexName).toBe('index');
   expect(lastArguments.params.hasOwnProperty('query')).toBeFalsy();
   expect(lastArguments.params.facetQuery).toBe('query');
-  expect(lastArguments.params.hasOwnProperty('facetName')).toBeFalsy();
   expect(lastArguments.facet).toBe('facet');
   expect(lastArguments.params.highlightPreTag).toBe('highlightTag');
   expect(lastArguments.params.highlightPostTag).toBe('<HIGHLIGHT');
 });
 
-test('an error will be thrown if the client does not contain .searchForFacetValues', function () {
-  var fakeClient = {};
-  var helper = algoliasearchHelper(fakeClient, 'index');
-
-  try {
-    helper.searchForFacetValues('facet', 'query');
-  } catch (e) {
-    expect(e.message).toBe(
-      'search for facet values (searchable) was called, but this client does not have a function client.searchForFacetValues or client.initIndex(index).searchForFacetValues'
-    );
-  }
-});
-
 test('isRefined is set for disjunctive facets', function () {
   var fakeClient = {
     addAlgoliaAgent: function () {},
-    searchForFacetValues: function () {
-      return Promise.resolve([
-        {
-          exhaustiveFacetsCount: true,
-          facetHits: [
-            {
-              count: 318,
-              highlighted: '__ais-highlight__K__/ais-highlight__itchenAid',
-              value: 'KitchenAid',
-            },
-            {
-              count: 1,
-              highlighted: 'something',
-              value: 'something',
-            },
-          ],
-          processingTimeMS: 3,
-        },
-      ]);
+    search: function () {
+      return Promise.resolve({
+        results: [
+          {
+            exhaustiveFacetsCount: true,
+            facetHits: [
+              {
+                count: 318,
+                highlighted: '__ais-highlight__K__/ais-highlight__itchenAid',
+                value: 'KitchenAid',
+              },
+              {
+                count: 1,
+                highlighted: 'something',
+                value: 'something',
+              },
+            ],
+            processingTimeMS: 3,
+          },
+        ],
+      });
     },
   };
 
@@ -360,25 +158,27 @@ test('isRefined is set for disjunctive facets', function () {
 test('isRefined is set for conjunctive facets', function () {
   var fakeClient = {
     addAlgoliaAgent: function () {},
-    searchForFacetValues: function () {
-      return Promise.resolve([
-        {
-          exhaustiveFacetsCount: true,
-          facetHits: [
-            {
-              count: 318,
-              highlighted: '__ais-highlight__K__/ais-highlight__itchenAid',
-              value: 'KitchenAid',
-            },
-            {
-              count: 1,
-              highlighted: 'something',
-              value: 'something',
-            },
-          ],
-          processingTimeMS: 3,
-        },
-      ]);
+    search: function () {
+      return Promise.resolve({
+        results: [
+          {
+            exhaustiveFacetsCount: true,
+            facetHits: [
+              {
+                count: 318,
+                highlighted: '__ais-highlight__K__/ais-highlight__itchenAid',
+                value: 'KitchenAid',
+              },
+              {
+                count: 1,
+                highlighted: 'something',
+                value: 'something',
+              },
+            ],
+            processingTimeMS: 3,
+          },
+        ],
+      });
     },
   };
 
@@ -403,25 +203,27 @@ test('isRefined is set for conjunctive facets', function () {
 test('value is escaped when it starts with `-`', function () {
   var fakeClient = {
     addAlgoliaAgent: function () {},
-    searchForFacetValues: function () {
-      return Promise.resolve([
-        {
-          exhaustiveFacetsCount: true,
-          facetHits: [
-            {
-              count: 318,
-              highlighted: 'something',
-              value: 'something',
-            },
-            {
-              count: 1,
-              highlighted: '-20%',
-              value: '-20%',
-            },
-          ],
-          processingTimeMS: 3,
-        },
-      ]);
+    search: function () {
+      return Promise.resolve({
+        results: [
+          {
+            exhaustiveFacetsCount: true,
+            facetHits: [
+              {
+                count: 318,
+                highlighted: 'something',
+                value: 'something',
+              },
+              {
+                count: 1,
+                highlighted: '-20%',
+                value: '-20%',
+              },
+            ],
+            processingTimeMS: 3,
+          },
+        ],
+      });
     },
   };
 
@@ -441,25 +243,27 @@ test('value is escaped when it starts with `-`', function () {
 test('escaped value is marked as refined', function () {
   var fakeClient = {
     addAlgoliaAgent: function () {},
-    searchForFacetValues: function () {
-      return Promise.resolve([
-        {
-          exhaustiveFacetsCount: true,
-          facetHits: [
-            {
-              count: 318,
-              highlighted: 'something',
-              value: 'something',
-            },
-            {
-              count: 1,
-              highlighted: '-20%',
-              value: '-20%',
-            },
-          ],
-          processingTimeMS: 3,
-        },
-      ]);
+    search: function () {
+      return Promise.resolve({
+        results: [
+          {
+            exhaustiveFacetsCount: true,
+            facetHits: [
+              {
+                count: 318,
+                highlighted: 'something',
+                value: 'something',
+              },
+              {
+                count: 1,
+                highlighted: '-20%',
+                value: '-20%',
+              },
+            ],
+            processingTimeMS: 3,
+          },
+        ],
+      });
     },
   };
 
diff --git a/packages/algoliasearch-helper/types/algoliasearch.d.ts b/packages/algoliasearch-helper/types/algoliasearch.d.ts
index 3ad8e12e6f..61905ba7f3 100644
--- a/packages/algoliasearch-helper/types/algoliasearch.d.ts
+++ b/packages/algoliasearch-helper/types/algoliasearch.d.ts
@@ -287,32 +287,28 @@ export type SupportedLanguage = PickForClient<{
   v5: AlgoliaSearch.SupportedLanguage;
 }>;
 
-// v5 only has the `searchForFacetValues` method in the `search` client, not in `lite`.
-// We need to check both clients to get the correct type.
-// (this is not actually used in the codebase, but it's here for completeness)
-type SearchForFacetValuesV5 = ClientSearchV5 | ClientFullV5 extends {
-  searchForFacetValues: unknown;
-}
-  ?
-      | ClientSearchV5['searchForFacetValues']
-      | ClientFullV5['searchForFacetValues']
-  : never;
-
 export interface SearchClient {
   search: <T>(
-    requests: Array<{ indexName: string; params: SearchOptions }>
+    requests: Array<
+      | {
+          type?: 'default';
+          indexName: string;
+          params: SearchOptions;
+        }
+      | {
+          type: 'facet';
+          indexName: string;
+          facet: string;
+          params: SearchOptions & {
+            maxFacetHits?: number;
+            facetQuery?: string;
+          };
+        }
+    >
   ) => Promise<SearchResponses<T>>;
   getRecommendations?: <T>(
     requests: RecommendOptions[]
   ) => Promise<RecommendResponses<T>>;
-  searchForFacetValues?: DefaultSearchClient extends {
-    searchForFacetValues: unknown;
-  }
-    ? DefaultSearchClient['searchForFacetValues']
-    : SearchForFacetValuesV5;
-  initIndex?: DefaultSearchClient extends { initIndex: unknown }
-    ? DefaultSearchClient['initIndex']
-    : never;
   addAlgoliaAgent?: DefaultSearchClient['addAlgoliaAgent'];
 }
 
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectRefinementList.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectRefinementList.test.ts
index a4630eb9ef..8c442e5e16 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectRefinementList.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectRefinementList.test.ts
@@ -1,9 +1,11 @@
 import {
   createSingleSearchResponse,
   createSearchClient,
+  createSFFVResponse,
+  createMultiSearchResponse,
 } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
-import jsHelper, {
+import algoliasearchHelper, {
   SearchResults,
   SearchParameters,
 } from 'algoliasearch-helper';
@@ -181,7 +183,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
         showMoreLimit: 30,
       });
 
-      const helper = jsHelper(
+      const helper = algoliasearchHelper(
         createSearchClient(),
         '',
         widget.getWidgetSearchParameters(new SearchParameters({}), {
@@ -266,7 +268,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
         showMoreLimit: 30,
       });
 
-      const helper = jsHelper(
+      const helper = algoliasearchHelper(
         createSearchClient(),
         '',
         widget.getWidgetSearchParameters(new SearchParameters({}), {
@@ -374,7 +376,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
     // test if widget is not rendered yet at this point
     expect(rendering).not.toHaveBeenCalled();
 
-    const helper = jsHelper(createSearchClient(), '', config);
+    const helper = algoliasearchHelper(createSearchClient(), '', config);
     helper.search = jest.fn();
 
     widget.init!(
@@ -428,7 +430,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       limit: 9,
     });
 
-    const helper = jsHelper(createSearchClient(), '');
+    const helper = algoliasearchHelper(createSearchClient(), '');
 
     widget.render!(
       createRenderOptions({
@@ -462,7 +464,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
         })),
     });
 
-    const helper = jsHelper(
+    const helper = algoliasearchHelper(
       createSearchClient(),
       '',
       widget.getWidgetSearchParameters(new SearchParameters({}), {
@@ -530,7 +532,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       transformItems,
     });
 
-    const helper = jsHelper(createSearchClient(), '');
+    const helper = algoliasearchHelper(createSearchClient(), '');
     const results = new SearchResults(helper.state, [
       createSingleSearchResponse(),
     ]);
@@ -557,7 +559,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       attribute: 'category',
     });
 
-    const helper = jsHelper(
+    const helper = algoliasearchHelper(
       createSearchClient(),
       '',
       widget.getWidgetSearchParameters(new SearchParameters({}), {
@@ -612,7 +614,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       operator: 'and',
     });
 
-    const helper = jsHelper(
+    const helper = algoliasearchHelper(
       createSearchClient(),
       '',
       widget.getWidgetSearchParameters(new SearchParameters({}), {
@@ -668,7 +670,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       showMoreLimit: 10,
     });
 
-    const helper = jsHelper(
+    const helper = algoliasearchHelper(
       createSearchClient(),
       '',
       widget.getWidgetSearchParameters(new SearchParameters({}), {
@@ -723,7 +725,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       limit: 1,
     });
 
-    const helper = jsHelper(
+    const helper = algoliasearchHelper(
       createSearchClient(),
       '',
       widget.getWidgetSearchParameters(new SearchParameters({}), {
@@ -784,7 +786,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       showMoreLimit: 10,
     });
 
-    const helper = jsHelper(
+    const helper = algoliasearchHelper(
       createSearchClient(),
       '',
       widget.getWidgetSearchParameters(new SearchParameters({}), {
@@ -845,7 +847,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       showMoreLimit: 10,
     });
 
-    const helper = jsHelper(
+    const helper = algoliasearchHelper(
       createSearchClient(),
       '',
       widget.getWidgetSearchParameters(new SearchParameters({}), {
@@ -909,7 +911,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       showMoreLimit: 3,
     });
 
-    const helper = jsHelper(
+    const helper = algoliasearchHelper(
       createSearchClient(),
       '',
       widget.getWidgetSearchParameters(new SearchParameters({}), {
@@ -1014,19 +1016,14 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       showMoreLimit,
     });
 
-    const helper = jsHelper(
-      createSearchClient(),
+    const client = createSearchClient();
+    const helper = algoliasearchHelper(
+      client,
       '',
       widget.getWidgetSearchParameters(new SearchParameters({}), {
         uiState: {},
       })
     );
-    helper.search = jest.fn();
-    helper.searchForFacetValues = jest.fn().mockReturnValue(
-      Promise.resolve({
-        facetHits: [],
-      })
-    );
 
     widget.init!(
       createInitOptions({
@@ -1101,12 +1098,21 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
     renderingOptions2.searchForItems('query triggering no results');
     await wait(0);
 
-    expect(helper.searchForFacetValues).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.anything(),
-      limit,
-      expect.anything()
-    );
+    expect(client.search).toHaveBeenCalledWith([
+      {
+        type: 'facet',
+        facet: 'category',
+        indexName: '',
+        params: {
+          facetQuery: 'query triggering no results',
+          facets: ['category'],
+          highlightPostTag: '__/ais-highlight__',
+          highlightPreTag: '__ais-highlight__',
+          maxFacetHits: limit,
+          maxValuesPerFacet: showMoreLimit,
+        },
+      },
+    ]);
 
     expect(rendering).toHaveBeenCalledTimes(3);
     const renderingOptions3 = rendering.mock.calls[2][0];
@@ -1208,12 +1214,21 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
     });
 
     renderingOptions5.searchForItems('new search');
-    expect(helper.searchForFacetValues).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.anything(),
-      showMoreLimit,
-      expect.anything()
-    );
+    expect(client.search).toHaveBeenCalledWith([
+      {
+        type: 'facet',
+        facet: 'category',
+        indexName: '',
+        params: {
+          facetQuery: 'new search',
+          facets: ['category'],
+          highlightPostTag: '__/ais-highlight__',
+          highlightPreTag: '__ais-highlight__',
+          maxFacetHits: showMoreLimit,
+          maxValuesPerFacet: showMoreLimit,
+        },
+      },
+    ]);
   });
 
   it('Toggle show more should be enabled when refinement list is expanded and number of facet is above limit and below showMoreLimit', () => {
@@ -1225,7 +1240,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       showMoreLimit: 3,
     });
 
-    const helper = jsHelper(createSearchClient(), '', {
+    const helper = algoliasearchHelper(createSearchClient(), '', {
       ...widget.getWidgetSearchParameters(new SearchParameters({}), {
         uiState: {},
       }),
@@ -1323,7 +1338,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       showMoreLimit: 3,
     });
 
-    const helper = jsHelper(createSearchClient(), '', {
+    const helper = algoliasearchHelper(createSearchClient(), '', {
       ...widget.getWidgetSearchParameters(new SearchParameters({}), {
         uiState: {},
       }),
@@ -1417,7 +1432,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       limit: 2,
     });
 
-    const helper = jsHelper(
+    const helper = algoliasearchHelper(
       createSearchClient(),
       '',
       widget.getWidgetSearchParameters(new SearchParameters({}), {
@@ -1505,7 +1520,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       limit: 2,
     });
 
-    const helper = jsHelper(createSearchClient(), '', {
+    const helper = algoliasearchHelper(createSearchClient(), '', {
       ...widget.getWidgetSearchParameters(new SearchParameters({}), {
         uiState: {},
       }),
@@ -1594,31 +1609,9 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
         limit: 2,
         escapeFacetValues: false,
       });
-
-      const helper = jsHelper(
-        createSearchClient({
-          // @ts-ignore v5 does not have this method, but it's easier to have it here. In a future version we can replace this method and its usages with search({ type: 'facet })
-          searchForFacetValues() {
-            return Promise.resolve([
-              {
-                exhaustiveFacetsCount: true,
-                facetHits: [
-                  {
-                    count: 33,
-                    highlighted: 'Salvador <mark>Da</mark>li',
-                    value: 'Salvador Dali',
-                  },
-                  {
-                    count: 9,
-                    highlighted: '<mark>Da</mark>vidoff',
-                    value: 'Davidoff',
-                  },
-                ],
-                processingTimeMS: 1,
-              },
-            ]);
-          },
-        }),
+      const client = createMockClient();
+      const helper = algoliasearchHelper(
+        client,
         '',
         widget.getWidgetSearchParameters(new SearchParameters({}), {
           uiState: {},
@@ -1626,11 +1619,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       );
       helper.search = jest.fn();
 
-      const searchForFacetValuesSpy = jest.spyOn(
-        helper,
-        'searchForFacetValues'
-      );
-
       // Simulate the lifecycle
       widget.init!(
         createInitOptions({
@@ -1677,16 +1665,21 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       const search = rendering.mock.calls[1][0].searchForItems;
       search('da');
 
-      const [sffvFacet, sffvQuery, maxNbItems, paramOverride] =
-        searchForFacetValuesSpy.mock.calls[0];
-
-      expect(sffvQuery).toBe('da');
-      expect(sffvFacet).toBe('category');
-      expect(maxNbItems).toBe(2);
-      expect(paramOverride).toEqual({
-        highlightPreTag: '<mark>',
-        highlightPostTag: '</mark>',
-      });
+      expect(client.search).toHaveBeenCalledWith([
+        {
+          type: 'facet',
+          facet: 'category',
+          indexName: '',
+          params: {
+            facetQuery: 'da',
+            facets: ['category'],
+            highlightPostTag: '</mark>',
+            highlightPreTag: '<mark>',
+            maxFacetHits: 2,
+            maxValuesPerFacet: 2,
+          },
+        },
+      ]);
 
       await wait(0);
 
@@ -1717,29 +1710,14 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
         showMoreLimit: 1000,
       });
 
-      const helper = jsHelper(
-        createSearchClient({
-          // @ts-ignore v5 does not have this method, but it's easier to have it here. In a future version we can replace this method and its usages with search({ type: 'facet })
-          searchForFacetValues() {
-            return Promise.resolve([
-              {
-                exhaustiveFacetsCount: true,
-                facetHits: [],
-                processingTimeMS: 1,
-              },
-            ]);
-          },
-        }),
+      const client = createMockClient();
+      const helper = algoliasearchHelper(
+        client,
         '',
         widget.getWidgetSearchParameters(new SearchParameters({}), {
           uiState: {},
         })
       );
-      helper.search = jest.fn();
-      const searchForFacetValuesSpy = jest.spyOn(
-        helper,
-        'searchForFacetValues'
-      );
 
       widget.init!(
         createInitOptions({
@@ -1780,9 +1758,11 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       const { searchForItems } = rendering.mock.calls[2][0];
       searchForItems('query');
 
-      const maxNbItems = searchForFacetValuesSpy.mock.calls[0][2];
-
-      expect(maxNbItems).toBe(100);
+      expect(client.search).toHaveBeenCalledWith([
+        expect.objectContaining({
+          params: expect.objectContaining({ maxFacetHits: 100 }),
+        }),
+      ]);
     });
 
     it('can search in facet values with transformed items', async () => {
@@ -1800,40 +1780,14 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
           })),
       });
 
-      const helper = jsHelper(
-        createSearchClient({
-          // @ts-ignore v5 does not have this method, but it's easier to have it here. In a future version we can replace this method and its usages with search({ type: 'facet })
-          searchForFacetValues() {
-            return Promise.resolve([
-              {
-                exhaustiveFacetsCount: true,
-                facetHits: [
-                  {
-                    count: 33,
-                    highlighted: 'will be transformed',
-                    value: 'will be transformed',
-                  },
-                  {
-                    count: 9,
-                    highlighted: 'will be transformed',
-                    value: 'will be transformed',
-                  },
-                ],
-                processingTimeMS: 1,
-              },
-            ]);
-          },
-        }),
+      const client = createMockClient();
+      const helper = algoliasearchHelper(
+        client,
         '',
         widget.getWidgetSearchParameters(new SearchParameters({}), {
           uiState: {},
         })
       );
-      helper.search = jest.fn();
-      const searchForFacetValuesSpy = jest.spyOn(
-        helper,
-        'searchForFacetValues'
-      );
 
       // Simulate the lifecycle
       widget.init!(
@@ -1875,16 +1829,21 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       const search = rendering.mock.calls[1][0].searchForItems;
       search('transfo');
 
-      const [sffvFacet, sffvQuery, maxNbItems, paramOverride] =
-        searchForFacetValuesSpy.mock.calls[0];
-
-      expect(sffvQuery).toBe('transfo');
-      expect(sffvFacet).toBe('category');
-      expect(maxNbItems).toBe(2);
-      expect(paramOverride).toEqual({
-        highlightPreTag: '<mark>',
-        highlightPostTag: '</mark>',
-      });
+      expect(client.search).toHaveBeenCalledWith([
+        {
+          type: 'facet',
+          facet: 'category',
+          indexName: '',
+          params: {
+            facetQuery: 'transfo',
+            facets: ['category'],
+            highlightPostTag: '</mark>',
+            highlightPreTag: '<mark>',
+            maxFacetHits: 2,
+            maxValuesPerFacet: 2,
+          },
+        },
+      ]);
 
       await wait(0);
 
@@ -1911,44 +1870,15 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
         escapeFacetValues: false,
       });
 
-      const helper = jsHelper(
-        createSearchClient({
-          // @ts-ignore v5 does not have this method, but it's easier to have it here. In a future version we can replace this method and its usages with search({ type: 'facet })
-          searchForFacetValues() {
-            return Promise.resolve([
-              {
-                exhaustiveFacetsCount: true,
-                facetHits: [
-                  {
-                    count: 33,
-                    highlighted: 'Salvador <mark>Da</mark>li',
-                    value: 'Salvador Dali',
-                  },
-                  {
-                    count: 9,
-                    highlighted: '<mark>Da</mark>vidoff',
-                    value: 'Davidoff',
-                  },
-                ],
-                processingTimeMS: 1,
-              },
-            ]);
-          },
+      const client = createMockClient();
+      const helper = algoliasearchHelper(client, '', {
+        ...widget.getWidgetSearchParameters(new SearchParameters({}), {
+          uiState: {},
         }),
-        '',
-        {
-          ...widget.getWidgetSearchParameters(new SearchParameters({}), {
-            uiState: {},
-          }),
-          // Here we simulate that another widget has set some highlight tags
-          ...TAG_PLACEHOLDER,
-        }
-      );
+        // Here we simulate that another widget has set some highlight tags
+        ...TAG_PLACEHOLDER,
+      });
       helper.search = jest.fn();
-      const searchForFacetValuesSpy = jest.spyOn(
-        helper,
-        'searchForFacetValues'
-      );
 
       // Simulate the lifecycle
       widget.init!(
@@ -1990,16 +1920,21 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       const search = rendering.mock.calls[1][0].searchForItems;
       search('da');
 
-      const [sffvFacet, sffvQuery, maxNbItems, paramOverride] =
-        searchForFacetValuesSpy.mock.calls[0];
-
-      expect(sffvQuery).toBe('da');
-      expect(sffvFacet).toBe('category');
-      expect(maxNbItems).toBe(2);
-      expect(paramOverride).toEqual({
-        highlightPreTag: '<mark>',
-        highlightPostTag: '</mark>',
-      });
+      expect(client.search).toHaveBeenCalledWith([
+        {
+          type: 'facet',
+          facet: 'category',
+          indexName: '',
+          params: {
+            facetQuery: 'da',
+            facets: ['category'],
+            highlightPostTag: '</mark>',
+            highlightPreTag: '<mark>',
+            maxFacetHits: 2,
+            maxValuesPerFacet: 2,
+          },
+        },
+      ]);
 
       await wait(0);
 
@@ -2030,44 +1965,14 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
         escapeFacetValues: true,
       });
 
-      const helper = jsHelper(
-        createSearchClient({
-          // @ts-ignore v5 does not have this method, but it's easier to have it here. In a future version we can replace this method and its usages with search({ type: 'facet })
-          searchForFacetValues() {
-            return Promise.resolve([
-              {
-                exhaustiveFacetsCount: true,
-                facetHits: [
-                  {
-                    count: 33,
-                    highlighted: `Salvador ${TAG_PLACEHOLDER.highlightPreTag}Da${TAG_PLACEHOLDER.highlightPostTag}li`,
-                    value: 'Salvador Dali',
-                  },
-                  {
-                    count: 9,
-                    highlighted: `${TAG_PLACEHOLDER.highlightPreTag}Da${TAG_PLACEHOLDER.highlightPostTag}vidoff`,
-                    value: 'Davidoff',
-                  },
-                ],
-                processingTimeMS: 1,
-              },
-            ]);
-          },
+      const client = createMockClient();
+      const helper = algoliasearchHelper(client, '', {
+        ...widget.getWidgetSearchParameters(new SearchParameters({}), {
+          uiState: {},
         }),
-        '',
-        {
-          ...widget.getWidgetSearchParameters(new SearchParameters({}), {
-            uiState: {},
-          }),
-          // Here we simulate that another widget has set some highlight tags
-          ...TAG_PLACEHOLDER,
-        }
-      );
-      helper.search = jest.fn();
-      const searchForFacetValuesSpy = jest.spyOn(
-        helper,
-        'searchForFacetValues'
-      );
+        // Here we simulate that another widget has set some highlight tags
+        ...TAG_PLACEHOLDER,
+      });
 
       // Simulate the lifecycle
       widget.init!(
@@ -2109,13 +2014,20 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       const search = rendering.mock.calls[1][0].searchForItems;
       search('da');
 
-      const [sffvFacet, sffvQuery, maxNbItems, paramOverride] =
-        searchForFacetValuesSpy.mock.calls[0];
-
-      expect(sffvQuery).toBe('da');
-      expect(sffvFacet).toBe('category');
-      expect(maxNbItems).toBe(2);
-      expect(paramOverride).toEqual(TAG_PLACEHOLDER);
+      expect(client.search).toHaveBeenCalledWith([
+        {
+          type: 'facet',
+          facet: 'category',
+          indexName: '',
+          params: {
+            facetQuery: 'da',
+            facets: ['category'],
+            ...TAG_PLACEHOLDER,
+            maxFacetHits: 2,
+            maxValuesPerFacet: 2,
+          },
+        },
+      ]);
 
       await wait(0);
 
@@ -2145,7 +2057,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
     const widget = makeWidget({
       attribute: 'myFacet',
     });
-    const helper = jsHelper(
+    const helper = algoliasearchHelper(
       createSearchClient(),
       '',
       widget.getWidgetSearchParameters(new SearchParameters({}), {
@@ -2170,7 +2082,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       });
 
       const indexName = 'my-index';
-      const helper = jsHelper(
+      const helper = algoliasearchHelper(
         createSearchClient(),
         indexName,
         widget.getWidgetSearchParameters(new SearchParameters({}), {
@@ -2265,7 +2177,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       });
 
       const indexName = 'my-index';
-      const helper = jsHelper(
+      const helper = algoliasearchHelper(
         createSearchClient(),
         indexName,
         widget.getWidgetSearchParameters(new SearchParameters({}), {
@@ -2354,7 +2266,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
     test('returns the `uiState` empty', () => {
       const render = () => {};
       const makeWidget = connectRefinementList(render);
-      const helper = jsHelper(createSearchClient(), '');
+      const helper = algoliasearchHelper(createSearchClient(), '');
       const widget = makeWidget({
         attribute: 'brand',
       });
@@ -2373,7 +2285,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
     test('returns the `uiState` with a refinement', () => {
       const render = () => {};
       const makeWidget = connectRefinementList(render);
-      const helper = jsHelper(createSearchClient(), '', {
+      const helper = algoliasearchHelper(createSearchClient(), '', {
         disjunctiveFacets: ['brand'],
         disjunctiveFacetsRefinements: {
           brand: ['Apple', 'Microsoft'],
@@ -2402,7 +2314,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
     test('returns the `uiState` without namespace overridden', () => {
       const render = () => {};
       const makeWidget = connectRefinementList(render);
-      const helper = jsHelper(createSearchClient(), '', {
+      const helper = algoliasearchHelper(createSearchClient(), '', {
         disjunctiveFacets: ['brand'],
         disjunctiveFacetsRefinements: {
           brand: ['Apple', 'Microsoft'],
@@ -2440,7 +2352,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       const unmountFn = jest.fn();
       const createRefinementList = connectRefinementList(renderFn, unmountFn);
       const refinementListWidget = createRefinementList({ attribute: 'brand' });
-      const helper = jsHelper(createSearchClient(), 'indexName', {
+      const helper = algoliasearchHelper(createSearchClient(), 'indexName', {
         disjunctiveFacets: ['brand'],
         disjunctiveFacetsRefinements: {
           brand: ['Apple', 'Microsoft'],
@@ -2476,7 +2388,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       const unmountFn = jest.fn();
       const createRefinementList = connectRefinementList(renderFn, unmountFn);
       const refinementListWidget = createRefinementList({ attribute: 'brand' });
-      const helper = jsHelper(createSearchClient(), 'indexName', {
+      const helper = algoliasearchHelper(createSearchClient(), 'indexName', {
         disjunctiveFacets: ['brand'],
         disjunctiveFacetsRefinements: {
           brand: ['Apple', 'Microsoft'],
@@ -2560,7 +2472,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       const unmountFn = jest.fn();
       const createRefinementList = connectRefinementList(renderFn, unmountFn);
       const refinementListWidget = createRefinementList({ attribute: 'brand' });
-      const helper = jsHelper(createSearchClient(), 'indexName', {
+      const helper = algoliasearchHelper(createSearchClient(), 'indexName', {
         disjunctiveFacets: ['brand'],
         disjunctiveFacetsRefinements: {
           brand: ['Apple', 'Microsoft'],
@@ -2593,7 +2505,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
     it('returns the widget render state with results', () => {
       const createRefinementList = connectRefinementList(jest.fn(), jest.fn());
       const refinementListWidget = createRefinementList({ attribute: 'brand' });
-      const helper = jsHelper(createSearchClient(), 'indexName', {
+      const helper = algoliasearchHelper(createSearchClient(), 'indexName', {
         disjunctiveFacets: ['brand'],
         disjunctiveFacetsRefinements: {
           brand: ['Apple', 'Microsoft'],
@@ -2682,7 +2594,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
         const refinementListWidget = createRefinementList({
           attribute: 'discounts',
         });
-        const helper = jsHelper(createSearchClient(), 'indexName', {
+        const helper = algoliasearchHelper(createSearchClient(), 'indexName', {
           disjunctiveFacets: ['discounts'],
           disjunctiveFacetsRefinements: {
             discounts: ['\\-10%', '\\-2€'],
@@ -2833,7 +2745,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
             attribute: 'brand',
             sortBy,
           });
-          const helper = jsHelper(
+          const helper = algoliasearchHelper(
             createSearchClient(),
             'indexName',
             refinementList.getWidgetSearchParameters(new SearchParameters(), {
@@ -2885,7 +2797,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       test('returns the `SearchParameters` with default `limit`', () => {
         const render = () => {};
         const makeWidget = connectRefinementList(render);
-        const helper = jsHelper(createSearchClient(), '');
+        const helper = algoliasearchHelper(createSearchClient(), '');
         const widget = makeWidget({
           attribute: 'brand',
         });
@@ -2900,7 +2812,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       test('returns the `SearchParameters` with provided `limit`', () => {
         const render = () => {};
         const makeWidget = connectRefinementList(render);
-        const helper = jsHelper(createSearchClient(), '');
+        const helper = algoliasearchHelper(createSearchClient(), '');
         const widget = makeWidget({
           attribute: 'brand',
           limit: 5,
@@ -2916,7 +2828,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       test('returns the `SearchParameters` with default `showMoreLimit`', () => {
         const render = () => {};
         const makeWidget = connectRefinementList(render);
-        const helper = jsHelper(createSearchClient(), '');
+        const helper = algoliasearchHelper(createSearchClient(), '');
         const widget = makeWidget({
           attribute: 'brand',
           showMore: true,
@@ -2932,7 +2844,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       test('returns the `SearchParameters` with provided `showMoreLimit`', () => {
         const render = () => {};
         const makeWidget = connectRefinementList(render);
-        const helper = jsHelper(createSearchClient(), '');
+        const helper = algoliasearchHelper(createSearchClient(), '');
         const widget = makeWidget({
           attribute: 'brand',
           showMore: true,
@@ -2949,7 +2861,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       test('returns the `SearchParameters` with the previous value if higher than `limit`/`showMoreLimit`', () => {
         const render = () => {};
         const makeWidget = connectRefinementList(render);
-        const helper = jsHelper(createSearchClient(), '', {
+        const helper = algoliasearchHelper(createSearchClient(), '', {
           maxValuesPerFacet: 100,
         });
 
@@ -2967,7 +2879,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       test('returns the `SearchParameters` with `limit`/`showMoreLimit` if higher than previous value', () => {
         const render = () => {};
         const makeWidget = connectRefinementList(render);
-        const helper = jsHelper(createSearchClient(), '', {
+        const helper = algoliasearchHelper(createSearchClient(), '', {
           maxValuesPerFacet: 100,
         });
 
@@ -2988,7 +2900,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       test('returns the `SearchParameters` with the default value', () => {
         const render = () => {};
         const makeWidget = connectRefinementList(render);
-        const helper = jsHelper(createSearchClient(), '');
+        const helper = algoliasearchHelper(createSearchClient(), '');
         const widget = makeWidget({
           attribute: 'brand',
           operator: 'and',
@@ -3007,7 +2919,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       test('returns the `SearchParameters` with the default value without the previous refinement', () => {
         const render = () => {};
         const makeWidget = connectRefinementList(render);
-        const helper = jsHelper(createSearchClient(), '', {
+        const helper = algoliasearchHelper(createSearchClient(), '', {
           facets: ['brand'],
           facetsRefinements: {
             brand: ['Apple', 'Samsung'],
@@ -3032,7 +2944,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       test('returns the `SearchParameters` with the value from `uiState`', () => {
         const render = () => {};
         const makeWidget = connectRefinementList(render);
-        const helper = jsHelper(createSearchClient(), '');
+        const helper = algoliasearchHelper(createSearchClient(), '');
         const widget = makeWidget({
           attribute: 'brand',
           operator: 'and',
@@ -3055,7 +2967,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       test('returns the `SearchParameters` with the value from `uiState` without the previous refinement', () => {
         const render = () => {};
         const makeWidget = connectRefinementList(render);
-        const helper = jsHelper(createSearchClient(), '', {
+        const helper = algoliasearchHelper(createSearchClient(), '', {
           facets: ['brand'],
           facetsRefinements: {
             brand: ['Microsoft'],
@@ -3085,7 +2997,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
         warnCache.current = {};
         const render = () => {};
         const makeWidget = connectRefinementList(render);
-        const helper = jsHelper(createSearchClient(), '', {
+        const helper = algoliasearchHelper(createSearchClient(), '', {
           disjunctiveFacets: ['brand'],
         });
 
@@ -3106,7 +3018,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       test('returns the `SearchParameters` with the default value', () => {
         const render = () => {};
         const makeWidget = connectRefinementList(render);
-        const helper = jsHelper(createSearchClient(), '');
+        const helper = algoliasearchHelper(createSearchClient(), '');
         const widget = makeWidget({
           attribute: 'brand',
         });
@@ -3124,7 +3036,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       test('returns the `SearchParameters` with the default value without the previous refinement', () => {
         const render = () => {};
         const makeWidget = connectRefinementList(render);
-        const helper = jsHelper(createSearchClient(), '', {
+        const helper = algoliasearchHelper(createSearchClient(), '', {
           disjunctiveFacets: ['brand'],
           disjunctiveFacetsRefinements: {
             brand: ['Apple', 'Samsung'],
@@ -3148,7 +3060,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       test('returns the `SearchParameters` with the value from `uiState`', () => {
         const render = () => {};
         const makeWidget = connectRefinementList(render);
-        const helper = jsHelper(createSearchClient(), '');
+        const helper = algoliasearchHelper(createSearchClient(), '');
         const widget = makeWidget({
           attribute: 'brand',
         });
@@ -3170,7 +3082,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       test('returns the `SearchParameters` with the value from `uiState` without the previous refinement', () => {
         const render = () => {};
         const makeWidget = connectRefinementList(render);
-        const helper = jsHelper(createSearchClient(), '', {
+        const helper = algoliasearchHelper(createSearchClient(), '', {
           disjunctiveFacets: ['brand'],
           disjunctiveFacetsRefinements: {
             brand: ['Microsoft'],
@@ -3199,7 +3111,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
         warnCache.current = {};
         const render = () => {};
         const makeWidget = connectRefinementList(render);
-        const helper = jsHelper(createSearchClient(), '', {
+        const helper = algoliasearchHelper(createSearchClient(), '', {
           facets: ['brand'],
         });
 
@@ -3217,7 +3129,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
 
     test('warns when attribute is used for hierarchical faceting and does not change `SearchParameters`', () => {
       warnCache.current = {};
-      const helper = jsHelper(createSearchClient(), '', {
+      const helper = algoliasearchHelper(createSearchClient(), '', {
         hierarchicalFacets: [{ name: 'brand', attributes: ['brand'] }],
       });
       const widget = connectRefinementList(jest.fn())({ attribute: 'brand' });
@@ -3242,7 +3154,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
         attribute: 'category',
       });
 
-      const helper = jsHelper(
+      const helper = algoliasearchHelper(
         createSearchClient(),
         '',
         widget.getWidgetSearchParameters(new SearchParameters({}), {
@@ -3306,3 +3218,36 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
     });
   });
 });
+
+function createMockClient() {
+  const client = createSearchClient({
+    search: jest.fn((requests) => {
+      return Promise.resolve(
+        createMultiSearchResponse(
+          ...requests.map((request) =>
+            request.type === 'facet'
+              ? createSFFVResponse({
+                  facetHits:
+                    request.params.facetQuery === 'nothing'
+                      ? []
+                      : [
+                          {
+                            count: 33,
+                            highlighted: `Salvador ${request.params.highlightPreTag}Da${request.params.highlightPostTag}li`,
+                            value: 'Salvador Dali',
+                          },
+                          {
+                            count: 9,
+                            highlighted: `${request.params.highlightPreTag}Da${request.params.highlightPostTag}vidoff`,
+                            value: 'Davidoff',
+                          },
+                        ],
+                })
+              : createSingleSearchResponse()
+          )
+        )
+      );
+    }),
+  });
+  return client;
+}
diff --git a/packages/instantsearch.js/src/widgets/index/__tests__/index-test.ts b/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts
similarity index 98%
rename from packages/instantsearch.js/src/widgets/index/__tests__/index-test.ts
rename to packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts
index 88ba45166c..8fb7b73cb3 100644
--- a/packages/instantsearch.js/src/widgets/index/__tests__/index-test.ts
+++ b/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts
@@ -7,7 +7,7 @@ import {
   createSingleRecommendResponse,
   createSingleSearchResponse,
 } from '@instantsearch/mocks';
-import { wait } from '@instantsearch/testutils';
+import { wait, castToJestMock } from '@instantsearch/testutils';
 import algoliasearchHelper, {
   SearchResults,
   SearchParameters,
@@ -15,24 +15,23 @@ import algoliasearchHelper, {
   RecommendResults,
 } from 'algoliasearch-helper';
 
-import { castToJestMock } from '../../../../../../tests/utils';
-import { createInstantSearch } from '../../../../test/createInstantSearch';
-import {
-  createWidget,
-  createIndexInitOptions,
-  createDisposeOptions,
-} from '../../../../test/createWidget';
 import {
+  instantsearch,
+  index,
   connectHits,
   connectPagination,
   connectRefinementList,
   connectSearchBox,
-} from '../../../connectors';
-import instantsearch from '../../../index.es';
-import { warnCache } from '../../../lib/utils';
-import index from '../index';
+} from '../..';
+import { createInstantSearch } from '../../../test/createInstantSearch';
+import {
+  createWidget,
+  createIndexInitOptions,
+  createDisposeOptions,
+} from '../../../test/createWidget';
+import { warnCache } from '../../lib/public';
 
-import type { Widget } from '../../../types';
+import type { Widget } from '../../types';
 import type { PlainSearchParameters } from 'algoliasearch-helper';
 
 describe('index', () => {
@@ -972,15 +971,10 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
 
     it('create URLs with non-namesake helper state', () => {
       const instance = index({ indexName: 'indexName' });
-      const searchBox = virtualSearchBox({});
-      const pagination = virtualPagination({});
-
-      const container = document.createElement('div');
-      document.body.append(container);
 
       instance.addWidgets([
-        searchBox,
-        pagination,
+        virtualSearchBox({}),
+        virtualPagination({}),
         virtualRefinementList({ attribute: 'doggies' }),
       ]);
 
@@ -1452,7 +1446,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
       instance.addWidgets([
         createSearchBox({
           getWidgetSearchParameters(state) {
-            return state.setQueryParameter('query', 'Apple');
+            return state.setQueryParameter('query', 'Global Query');
           },
         }),
         createPagination({
@@ -1475,22 +1469,22 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
         highlightPostTag: '</mark>',
       });
 
-      expect(searchClient.searchForFacetValues).toHaveBeenCalledTimes(1);
-      expect(searchClient.searchForFacetValues).toHaveBeenCalledWith(
-        expect.arrayContaining([
-          {
-            indexName: 'indexName',
-            params: expect.objectContaining({
-              facetName: 'brand',
-              facetQuery: 'Apple',
-              maxFacetHits: 10,
-              highlightPreTag: '<mark>',
-              highlightPostTag: '</mark>',
-              page: 5,
-            }),
-          },
-        ])
-      );
+      expect(searchClient.search).toHaveBeenCalledTimes(1);
+      expect(searchClient.search).toHaveBeenCalledWith([
+        {
+          type: 'facet',
+          indexName: 'indexName',
+          facet: 'brand',
+          params: expect.objectContaining({
+            facetQuery: 'Apple',
+            query: 'Global Query',
+            maxFacetHits: 10,
+            highlightPreTag: '<mark>',
+            highlightPostTag: '</mark>',
+            page: 5,
+          }),
+        },
+      ]);
     });
 
     it('schedules a render on DerivedHelper results', async () => {
diff --git a/packages/instantsearch.js/src/widgets/refinement-list/__tests__/refinement-list.test.tsx b/packages/instantsearch.js/src/widgets/refinement-list/__tests__/refinement-list.test.tsx
index 6f0a7dc0ed..fc43c0af8a 100644
--- a/packages/instantsearch.js/src/widgets/refinement-list/__tests__/refinement-list.test.tsx
+++ b/packages/instantsearch.js/src/widgets/refinement-list/__tests__/refinement-list.test.tsx
@@ -1157,89 +1157,83 @@ describe('refinementList', () => {
 });
 
 function createMockedSearchClient() {
+  const facetHits = [
+    {
+      value: 'Apple',
+      highlighted: '__ais-highlight__App__/ais-highlight__le',
+      count: 442,
+    },
+    {
+      value: 'Alpine',
+      highlighted: '__ais-highlight__Alp__/ais-highlight__ine',
+      count: 30,
+    },
+    {
+      value: 'APC',
+      highlighted: '__ais-highlight__AP__/ais-highlight__C',
+      count: 24,
+    },
+    {
+      value: 'Amped Wireless',
+      highlighted: '__ais-highlight__Amp__/ais-highlight__ed Wireless',
+      count: 4,
+    },
+    {
+      value: "Applebee's",
+      highlighted: "__ais-highlight__App__/ais-highlight__lebee's",
+      count: 2,
+    },
+    {
+      value: 'Amplicom',
+      highlighted: '__ais-highlight__Amp__/ais-highlight__licom',
+      count: 1,
+    },
+    {
+      value: 'Apollo Enclosures',
+      highlighted: '__ais-highlight__Ap__/ais-highlight__ollo Enclosures',
+      count: 1,
+    },
+    {
+      value: 'Apple®',
+      highlighted: '__ais-highlight__App__/ais-highlight__le®',
+      count: 1,
+    },
+    {
+      value: 'Applica',
+      highlighted: '__ais-highlight__App__/ais-highlight__lica',
+      count: 1,
+    },
+    {
+      value: 'Apricorn',
+      highlighted: '__ais-highlight__Ap__/ais-highlight__ricorn',
+      count: 1,
+    },
+  ];
+
   return createSearchClient({
     search: jest.fn((requests) => {
       return Promise.resolve(
         createMultiSearchResponse(
-          ...requests.map(() =>
-            createSingleSearchResponse({
-              facets: {
-                brand: {
-                  Apple: 746,
-                  Samsung: 633,
-                  Metra: 591,
-                },
-              },
-            })
+          ...requests.map((request) =>
+            request.type === 'facet'
+              ? createSFFVResponse({
+                  facetHits:
+                    request.params.facetQuery === 'query with no results'
+                      ? []
+                      : facetHits,
+                })
+              : createSingleSearchResponse({
+                  facets: {
+                    brand: {
+                      Apple: 746,
+                      Samsung: 633,
+                      Metra: 591,
+                    },
+                  },
+                })
           )
         )
       );
     }),
-    // @ts-ignore v5 does not have this method, but it's easier to have it here. In a future version we can replace this method and its usages with search({ type: 'facet })
-    searchForFacetValues: jest.fn((requests) => {
-      return Promise.resolve([
-        createSFFVResponse({
-          facetHits:
-            // @ts-ignore for v5, which has a different definition of `searchForFacetValues`
-            requests[0].params.facetQuery === 'query with no results'
-              ? []
-              : [
-                  {
-                    value: 'Apple',
-                    highlighted: '__ais-highlight__App__/ais-highlight__le',
-                    count: 442,
-                  },
-                  {
-                    value: 'Alpine',
-                    highlighted: '__ais-highlight__Alp__/ais-highlight__ine',
-                    count: 30,
-                  },
-                  {
-                    value: 'APC',
-                    highlighted: '__ais-highlight__AP__/ais-highlight__C',
-                    count: 24,
-                  },
-                  {
-                    value: 'Amped Wireless',
-                    highlighted:
-                      '__ais-highlight__Amp__/ais-highlight__ed Wireless',
-                    count: 4,
-                  },
-                  {
-                    value: "Applebee's",
-                    highlighted:
-                      "__ais-highlight__App__/ais-highlight__lebee's",
-                    count: 2,
-                  },
-                  {
-                    value: 'Amplicom',
-                    highlighted: '__ais-highlight__Amp__/ais-highlight__licom',
-                    count: 1,
-                  },
-                  {
-                    value: 'Apollo Enclosures',
-                    highlighted:
-                      '__ais-highlight__Ap__/ais-highlight__ollo Enclosures',
-                    count: 1,
-                  },
-                  {
-                    value: 'Apple®',
-                    highlighted: '__ais-highlight__App__/ais-highlight__le®',
-                    count: 1,
-                  },
-                  {
-                    value: 'Applica',
-                    highlighted: '__ais-highlight__App__/ais-highlight__lica',
-                    count: 1,
-                  },
-                  {
-                    value: 'Apricorn',
-                    highlighted: '__ais-highlight__Ap__/ais-highlight__ricorn',
-                    count: 1,
-                  },
-                ],
-        }),
-      ]);
-    }),
   });
 }
diff --git a/packages/react-instantsearch/src/widgets/__tests__/RefinementList.test.tsx b/packages/react-instantsearch/src/widgets/__tests__/RefinementList.test.tsx
index db939e5c7c..68f0f56011 100644
--- a/packages/react-instantsearch/src/widgets/__tests__/RefinementList.test.tsx
+++ b/packages/react-instantsearch/src/widgets/__tests__/RefinementList.test.tsx
@@ -73,33 +73,38 @@ function createMockedSearchClient(parameters: Record<string, any> = {}) {
     search: jest.fn((requests) => {
       return Promise.resolve(
         createMultiSearchResponse(
-          ...requests.map(() =>
-            createSingleSearchResponse({
-              facets: {
-                brand: {
-                  'Insignia™': 746,
-                  Samsung: 633,
-                  Metra: 591,
-                  HP: 530,
-                  Apple: 442,
-                  GE: 394,
-                  Sony: 350,
-                  Incipio: 320,
-                  KitchenAid: 318,
-                  Whirlpool: 298,
-                  LG: 291,
-                  Canon: 287,
-                  Frigidaire: 275,
-                  Speck: 216,
-                  OtterBox: 214,
-                  Epson: 204,
-                  'Dynex™': 184,
-                  Dell: 174,
-                  'Hamilton Beach': 173,
-                  Platinum: 155,
-                },
-              },
-            })
+          ...requests.map((request) =>
+            request.type === 'facet'
+              ? createSFFVResponse({
+                  facetHits:
+                    request.params.facetQuery === 'nothing' ? [] : FACET_HITS,
+                })
+              : createSingleSearchResponse({
+                  facets: {
+                    brand: {
+                      'Insignia™': 746,
+                      Samsung: 633,
+                      Metra: 591,
+                      HP: 530,
+                      Apple: 442,
+                      GE: 394,
+                      Sony: 350,
+                      Incipio: 320,
+                      KitchenAid: 318,
+                      Whirlpool: 298,
+                      LG: 291,
+                      Canon: 287,
+                      Frigidaire: 275,
+                      Speck: 216,
+                      OtterBox: 214,
+                      Epson: 204,
+                      'Dynex™': 184,
+                      Dell: 174,
+                      'Hamilton Beach': 173,
+                      Platinum: 155,
+                    },
+                  },
+                })
           )
         )
       );
@@ -136,21 +141,7 @@ describe('RefinementList', () => {
   });
 
   test('renders with translations', async () => {
-    const searchClient = createMockedSearchClient({
-      searchForFacetValues: jest.fn(
-        ([
-          {
-            params: { facetQuery },
-          },
-        ]) => {
-          return Promise.resolve([
-            createSFFVResponse({
-              facetHits: facetQuery === 'nothing' ? [] : FACET_HITS,
-            }),
-          ]);
-        }
-      ),
-    });
+    const searchClient = createMockedSearchClient();
     const { container, getByRole } = render(
       <InstantSearchTestWrapper searchClient={searchClient}>
         <RefinementList
@@ -181,6 +172,7 @@ describe('RefinementList', () => {
 
     expect(getByRole('button', { name: 'Submit' })).toBeInTheDocument();
 
+    expect(searchClient.search).toHaveBeenCalledTimes(1);
     userEvent.type(
       container.querySelector('.ais-SearchBox-input') as HTMLInputElement,
       'nothing'
@@ -189,7 +181,7 @@ describe('RefinementList', () => {
     expect(getByRole('button', { name: 'Reset' })).toBeInTheDocument();
 
     await waitFor(() => {
-      expect(searchClient.searchForFacetValues).toHaveBeenCalledTimes(7);
+      expect(searchClient.search).toHaveBeenCalledTimes(1 + 'nothing'.length);
 
       expect(
         container.querySelector('.ais-RefinementList-noResults')
diff --git a/tests/common/widgets/refinement-list/options.ts b/tests/common/widgets/refinement-list/options.ts
index 1fa4913dbb..14bb14b991 100644
--- a/tests/common/widgets/refinement-list/options.ts
+++ b/tests/common/widgets/refinement-list/options.ts
@@ -905,17 +905,22 @@ export function createOptionsTests(
         });
 
         // One call per keystroke
-        expect(searchClient.searchForFacetValues).toHaveBeenCalledTimes(3);
-        expect(searchClient.searchForFacetValues).toHaveBeenLastCalledWith(
-          expect.arrayContaining([
-            expect.objectContaining({
-              params: expect.objectContaining({
-                facetName: 'brand',
-                facetQuery: 'app',
-              }),
-            }),
-          ])
-        );
+        expect(searchClient.search).toHaveBeenCalledTimes(1 + 'app'.length);
+        expect(searchClient.search).toHaveBeenLastCalledWith([
+          {
+            type: 'facet',
+            indexName: 'indexName',
+            facet: 'brand',
+            params: {
+              facetQuery: 'app',
+              facets: ['brand'],
+              highlightPostTag: '__/ais-highlight__',
+              highlightPreTag: '__ais-highlight__',
+              maxFacetHits: 10,
+              maxValuesPerFacet: 10,
+            },
+          },
+        ]);
         expect(
           document.querySelector('.ais-RefinementList-labelText')
         ).toMatchNormalizedInlineSnapshot(
@@ -960,11 +965,7 @@ export function createOptionsTests(
       });
 
       test('displays a fallback when there are no results', async () => {
-        const searchClient = createMockedSearchClient({
-          searchForFacetValues: jest.fn(() =>
-            Promise.resolve([createSFFVResponse({ facetHits: [] })])
-          ),
-        });
+        const searchClient = createMockedSearchClient();
 
         await setup({
           instantSearchOptions: {
@@ -993,7 +994,7 @@ export function createOptionsTests(
           await wait(0);
         });
 
-        expect(searchClient.searchForFacetValues).toHaveBeenCalledTimes(7);
+        expect(searchClient.search).toHaveBeenCalledTimes(1 + 'nothing'.length);
 
         expect(
           document.querySelector('.ais-RefinementList-noResults')
@@ -1568,23 +1569,21 @@ function createMockedSearchClient(
     search: jest.fn((requests) => {
       return Promise.resolve(
         createMultiSearchResponse(
-          ...requests.map(() =>
-            createSingleSearchResponse({
-              facets: {
-                brand: values,
-              },
-            })
+          ...requests.map((request) =>
+            request.type === 'facet'
+              ? createSFFVResponse({
+                  facetHits:
+                    request.params.facetQuery === 'nothing' ? [] : FACET_HITS,
+                })
+              : createSingleSearchResponse({
+                  facets: {
+                    brand: values,
+                  },
+                })
           )
         )
       );
     }),
-    searchForFacetValues: jest.fn(() =>
-      Promise.resolve([
-        createSFFVResponse({
-          facetHits: FACET_HITS,
-        }),
-      ])
-    ) as any, // @TODO: for now casted as any, because v5 only has `type: facet` in search
     ...parameters,
   });
 }
diff --git a/tests/mocks/createSearchClient.ts b/tests/mocks/createSearchClient.ts
index ff87042767..b5cf5b3626 100644
--- a/tests/mocks/createSearchClient.ts
+++ b/tests/mocks/createSearchClient.ts
@@ -16,12 +16,14 @@ export const createSearchClient = (
   search: jest.fn((requests) =>
     Promise.resolve(
       createMultiSearchResponse(
-        ...requests.map(() => createSingleSearchResponse())
+        ...requests.map((request) =>
+          request.type === 'facet'
+            ? createSFFVResponse()
+            : createSingleSearchResponse()
+        )
       )
     )
   ),
-  // @ts-ignore v5 does not have this method, but it's easier to have it here. In a future version we can replace this method and its usages with search({ type: 'facet })
-  searchForFacetValues: jest.fn(() => Promise.resolve([createSFFVResponse()])),
   // @ts-ignore this allows us to test insights initialization without warning
   applicationID: 'appId',
   apiKey: 'apiKey',

From 9aa59d8664c7bf552799b492ef2967f8e608d95d Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Thu, 12 Dec 2024 12:06:23 +0100
Subject: [PATCH 16/37] fix(insights): remove bindEvent (#6471)

bindEvent is no longer handled in the component since #6403 (https://github.com/algolia/instantsearch/pull/6403/files#diff-e7717d55fdbbc94c7dd996f78b6f0f860332545d6fa8f6b843c940798334532cL94)

[FX-3191]

BREAKING CHANGE: the `bindEvent` related functions are non longer usable, use `sendEvent` instead
---
 .../connectors/__tests__/connectHits.test.ts  |  70 -----
 .../__tests__/connectInfiniteHits.test.ts     |  70 -----
 .../src/connectors/connectHits.ts             |  18 --
 .../src/connectors/connectInfiniteHits.ts     |  14 -
 .../__tests__/createSendEventForFacet.test.ts |  27 +-
 .../__tests__/createSendEventForHits.test.ts  | 276 +-----------------
 .../src/lib/utils/createSendEventForFacet.ts  |   5 +-
 .../src/lib/utils/createSendEventForHits.ts   |  45 +--
 .../instantsearch-core/src/lib/utils/index.ts |   1 -
 .../src/lib/utils/serializer.ts               |   9 -
 .../instantsearch-core/src/types/insights.ts  |  12 -
 .../components/InfiniteHits/InfiniteHits.tsx  |   2 -
 .../__tests__/InfiniteHits-test.tsx           |   7 -
 .../__tests__/InfiniteHits.test.tsx           |   1 -
 .../widgets/infinite-hits/infinite-hits.tsx   |   2 -
 .../src/connectors/__tests__/useHits.test.tsx |   2 -
 .../__tests__/useInfiniteHits.test.tsx        |   2 -
 17 files changed, 33 insertions(+), 530 deletions(-)
 delete mode 100644 packages/instantsearch-core/src/lib/utils/serializer.ts

diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectHits.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectHits.test.ts
index 71f1b26fbe..cbbf982ee8 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectHits.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectHits.test.ts
@@ -20,7 +20,6 @@ import {
   createInitOptions,
   createRenderOptions,
 } from '../../../test/createWidget';
-import { deserializePayload } from '../../lib/utils';
 
 import type {
   EscapedHits,
@@ -509,7 +508,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
         hits: [],
         items: [],
         sendEvent: expect.any(Function),
-        bindEvent: expect.any(Function),
         results: undefined,
         widgetParams: {},
       });
@@ -541,7 +539,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
         hits: expectedHits,
         items: expectedHits,
         sendEvent: renderState1.hits.sendEvent,
-        bindEvent: renderState1.hits.bindEvent,
         results,
         widgetParams: {},
       });
@@ -573,7 +570,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
         items: [],
         banner: undefined,
         sendEvent: expect.any(Function),
-        bindEvent: expect.any(Function),
         results: undefined,
         widgetParams: {},
       });
@@ -611,7 +607,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
         items: expectedHits,
         banner,
         sendEvent: renderState1.sendEvent,
-        bindEvent: renderState2.bindEvent,
         results,
         widgetParams: {},
       });
@@ -1033,71 +1028,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
           });
         });
       });
-
-      describe('bindEvent', () => {
-        it('returns a payload for click event', () => {
-          const { renderFn, hits } = createRenderedWidget();
-          const { bindEvent } =
-            renderFn.mock.calls[renderFn.mock.calls.length - 1][0];
-          const payload = bindEvent('click', hits[0], 'Product Added');
-          expect(payload.startsWith('data-insights-event=')).toBe(true);
-          expect(
-            deserializePayload(payload.substr('data-insights-event='.length))
-          ).toEqual([
-            {
-              eventType: 'click',
-              hits: [
-                {
-                  __position: 0,
-                  __queryID: 'test-query-id',
-                  fake: 'data',
-                  objectID: '1',
-                },
-              ],
-              insightsMethod: 'clickedObjectIDsAfterSearch',
-              payload: {
-                eventName: 'Product Added',
-                index: '',
-                objectIDs: ['1'],
-                positions: [0],
-                queryID: 'test-query-id',
-              },
-              widgetType: 'ais.hits',
-            },
-          ]);
-        });
-
-        it('returns a payload for conversion event', () => {
-          const { renderFn, hits } = createRenderedWidget();
-          const { bindEvent } =
-            renderFn.mock.calls[renderFn.mock.calls.length - 1][0];
-          const payload = bindEvent('conversion', hits[1], 'Product Ordered');
-          expect(payload.startsWith('data-insights-event=')).toBe(true);
-          expect(
-            deserializePayload(payload.substr('data-insights-event='.length))
-          ).toEqual([
-            {
-              eventType: 'conversion',
-              hits: [
-                {
-                  __position: 1,
-                  __queryID: 'test-query-id',
-                  objectID: '2',
-                  sample: 'infos',
-                },
-              ],
-              insightsMethod: 'convertedObjectIDsAfterSearch',
-              payload: {
-                eventName: 'Product Ordered',
-                index: '',
-                objectIDs: ['2'],
-                queryID: 'test-query-id',
-              },
-              widgetType: 'ais.hits',
-            },
-          ]);
-        });
-      });
     });
   });
 });
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectInfiniteHits.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectInfiniteHits.test.ts
index 861d77a3cc..53a3b72ecd 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectInfiniteHits.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectInfiniteHits.test.ts
@@ -18,7 +18,6 @@ import {
   createRenderOptions,
 } from '../../../test/createWidget';
 import { createInfiniteHitsSessionStorageCache } from '../../lib/infiniteHitsCache';
-import { deserializePayload } from '../../lib/utils';
 
 import type {
   SearchClient,
@@ -1328,7 +1327,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
         items: [],
         currentPageHits: [],
         sendEvent: expect.any(Function),
-        bindEvent: expect.any(Function),
         isFirstPage: true,
         isLastPage: true,
         banner: undefined,
@@ -1392,7 +1390,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
         items: expectedHits,
         currentPageHits: expectedCurrentPageHits,
         sendEvent: renderState1.infiniteHits.sendEvent,
-        bindEvent: renderState1.infiniteHits.bindEvent,
         isFirstPage: true,
         isLastPage: true,
         banner: undefined,
@@ -1423,7 +1420,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
         items: [],
         currentPageHits: [],
         sendEvent: expect.any(Function),
-        bindEvent: expect.any(Function),
         isFirstPage: true,
         isLastPage: true,
         banner: undefined,
@@ -1500,7 +1496,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
         items: expectedHits,
         currentPageHits: expectedCurrentPageHits,
         sendEvent: renderState1.sendEvent,
-        bindEvent: renderState1.bindEvent,
         isFirstPage: true,
         isLastPage: true,
         banner,
@@ -1870,71 +1865,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
           });
         });
       });
-
-      describe('bindEvent', () => {
-        it('returns a payload for click event', () => {
-          const { renderFn, hits } = createRenderedWidget();
-          const { bindEvent } =
-            renderFn.mock.calls[renderFn.mock.calls.length - 1][0];
-          const payload = bindEvent('click', hits[0], 'Product Added');
-          expect(payload.startsWith('data-insights-event=')).toBe(true);
-          expect(
-            deserializePayload(payload.substr('data-insights-event='.length))
-          ).toEqual([
-            {
-              eventType: 'click',
-              hits: [
-                {
-                  __position: 0,
-                  __queryID: 'test-query-id',
-                  fake: 'data',
-                  objectID: '1',
-                },
-              ],
-              insightsMethod: 'clickedObjectIDsAfterSearch',
-              payload: {
-                eventName: 'Product Added',
-                index: '',
-                objectIDs: ['1'],
-                positions: [0],
-                queryID: 'test-query-id',
-              },
-              widgetType: 'ais.infiniteHits',
-            },
-          ]);
-        });
-
-        it('returns a payload for conversion event', () => {
-          const { renderFn, hits } = createRenderedWidget();
-          const { bindEvent } =
-            renderFn.mock.calls[renderFn.mock.calls.length - 1][0];
-          const payload = bindEvent('conversion', hits[1], 'Product Ordered');
-          expect(payload.startsWith('data-insights-event=')).toBe(true);
-          expect(
-            deserializePayload(payload.substr('data-insights-event='.length))
-          ).toEqual([
-            {
-              eventType: 'conversion',
-              hits: [
-                {
-                  __position: 1,
-                  __queryID: 'test-query-id',
-                  objectID: '2',
-                  sample: 'infos',
-                },
-              ],
-              insightsMethod: 'convertedObjectIDsAfterSearch',
-              payload: {
-                eventName: 'Product Ordered',
-                index: '',
-                objectIDs: ['2'],
-                queryID: 'test-query-id',
-              },
-              widgetType: 'ais.infiniteHits',
-            },
-          ]);
-        });
-      });
     });
   });
 });
diff --git a/packages/instantsearch-core/src/connectors/connectHits.ts b/packages/instantsearch-core/src/connectors/connectHits.ts
index 8ff829ad8c..026ff0ca1a 100644
--- a/packages/instantsearch-core/src/connectors/connectHits.ts
+++ b/packages/instantsearch-core/src/connectors/connectHits.ts
@@ -9,7 +9,6 @@ import {
   addAbsolutePosition,
   addQueryID,
   createSendEventForHits,
-  createBindEventForHits,
 } from '../lib/utils';
 
 import type {
@@ -21,7 +20,6 @@ import type {
   Unmounter,
   Renderer,
   SendEventForHits,
-  BindEventForHits,
   Widget,
 } from '../types';
 import type { Banner, SearchResults } from 'algoliasearch-helper';
@@ -57,11 +55,6 @@ export type HitsRenderState<THit extends NonNullable<object> = BaseHit> = {
    * Sends an event to the Insights middleware.
    */
   sendEvent: SendEventForHits;
-
-  /**
-   * Returns a string for the `data-insights-event` attribute for the Insights middleware
-   */
-  bindEvent: BindEventForHits;
 };
 
 export type HitsConnectorParams<THit extends NonNullable<object> = BaseHit> = {
@@ -107,7 +100,6 @@ export const connectHits = function connectHits<TWidgetParams>(
       >,
     } = (widgetParams || {}) as HitsConnectorParams<THit>;
     let sendEvent: SendEventForHits;
-    let bindEvent: BindEventForHits;
 
     type HitsWidget = Widget<
       HitsWidgetDescription<THit> & {
@@ -160,14 +152,6 @@ export const connectHits = function connectHits<TWidgetParams>(
           });
         }
 
-        if (!bindEvent) {
-          bindEvent = createBindEventForHits({
-            getIndex: () => helper.getIndex(),
-            widgetType: this.$$type,
-            instantSearchInstance,
-          });
-        }
-
         if (!results) {
           return {
             hits: [],
@@ -175,7 +159,6 @@ export const connectHits = function connectHits<TWidgetParams>(
             results: undefined,
             banner: undefined,
             sendEvent,
-            bindEvent,
             widgetParams,
           };
         }
@@ -207,7 +190,6 @@ export const connectHits = function connectHits<TWidgetParams>(
           results,
           banner,
           sendEvent,
-          bindEvent,
           widgetParams,
         };
       },
diff --git a/packages/instantsearch-core/src/connectors/connectInfiniteHits.ts b/packages/instantsearch-core/src/connectors/connectInfiniteHits.ts
index b8d13dd703..b8105d54cf 100644
--- a/packages/instantsearch-core/src/connectors/connectInfiniteHits.ts
+++ b/packages/instantsearch-core/src/connectors/connectInfiniteHits.ts
@@ -11,7 +11,6 @@ import {
   addAbsolutePosition,
   addQueryID,
   createSendEventForHits,
-  createBindEventForHits,
 } from '../lib/utils';
 
 import type {
@@ -24,7 +23,6 @@ import type {
   Unmounter,
   UnknownWidgetParams,
   SendEventForHits,
-  BindEventForHits,
   Widget,
 } from '../types';
 import type {
@@ -117,11 +115,6 @@ export type InfiniteHitsRenderState<
    */
   sendEvent: SendEventForHits;
 
-  /**
-   * Returns a string of data-insights-event attribute for insights middleware
-   */
-  bindEvent: BindEventForHits;
-
   /**
    * Hits for the current page
    */
@@ -237,7 +230,6 @@ export const connectInfiniteHits = function connectInfiniteHits<
     let showPrevious: () => void;
     let showMore: () => void;
     let sendEvent: SendEventForHits;
-    let bindEvent: BindEventForHits;
     const getFirstReceivedPage = (
       state: SearchParameters,
       cachedHits: InfiniteHitsCachedHits<THit>
@@ -365,11 +357,6 @@ export const connectInfiniteHits = function connectInfiniteHits<
             getIndex: () => helper.getIndex(),
             widgetType: this.$$type,
           });
-          bindEvent = createBindEventForHits({
-            getIndex: () => helper.getIndex(),
-            widgetType: this.$$type,
-            instantSearchInstance,
-          });
           isFirstPage =
             state.page === undefined ||
             getFirstReceivedPage(state, cachedHits) === 0;
@@ -440,7 +427,6 @@ export const connectInfiniteHits = function connectInfiniteHits<
           items,
           currentPageHits,
           sendEvent,
-          bindEvent,
           banner,
           results: results || undefined,
           showPrevious,
diff --git a/packages/instantsearch-core/src/lib/utils/__tests__/createSendEventForFacet.test.ts b/packages/instantsearch-core/src/lib/utils/__tests__/createSendEventForFacet.test.ts
index 3260c9868b..e3c0785c97 100644
--- a/packages/instantsearch-core/src/lib/utils/__tests__/createSendEventForFacet.test.ts
+++ b/packages/instantsearch-core/src/lib/utils/__tests__/createSendEventForFacet.test.ts
@@ -34,12 +34,11 @@ describe('createSendEventForFacet', () => {
       expect(() => {
         sendEvent('click');
       }).toThrowErrorMatchingInlineSnapshot(`
-"You need to pass between two and four arguments like:
-  sendEvent('click', facetValue, eventName?, additionalData?);
+        "You need to pass between two and four arguments like:
+        sendEvent('click', facetValue, eventName?, additionalData?);
 
-If you want to send a custom payload, you can pass one object: sendEvent(customPayload);
-"
-`);
+        If you want to send a custom payload, you can pass one object: sendEvent(customPayload);"
+      `);
     });
 
     it('throws with unknown eventType', () => {
@@ -47,12 +46,11 @@ If you want to send a custom payload, you can pass one object: sendEvent(customP
       expect(() => {
         sendEvent('my custom event type');
       }).toThrowErrorMatchingInlineSnapshot(`
-"You need to pass between two and four arguments like:
-  sendEvent('click', facetValue, eventName?, additionalData?);
+        "You need to pass between two and four arguments like:
+        sendEvent('click', facetValue, eventName?, additionalData?);
 
-If you want to send a custom payload, you can pass one object: sendEvent(customPayload);
-"
-`);
+        If you want to send a custom payload, you can pass one object: sendEvent(customPayload);"
+      `);
     });
 
     it('throws when eventType is not click', () => {
@@ -60,12 +58,11 @@ If you want to send a custom payload, you can pass one object: sendEvent(customP
       expect(() => {
         sendEvent('custom event type');
       }).toThrowErrorMatchingInlineSnapshot(`
-"You need to pass between two and four arguments like:
-  sendEvent('click', facetValue, eventName?, additionalData?);
+        "You need to pass between two and four arguments like:
+        sendEvent('click', facetValue, eventName?, additionalData?);
 
-If you want to send a custom payload, you can pass one object: sendEvent(customPayload);
-"
-`);
+        If you want to send a custom payload, you can pass one object: sendEvent(customPayload);"
+      `);
     });
 
     it('does not send event when a facet is removed', () => {
diff --git a/packages/instantsearch-core/src/lib/utils/__tests__/createSendEventForHits.test.ts b/packages/instantsearch-core/src/lib/utils/__tests__/createSendEventForHits.test.ts
index a08002c996..d0fa7c0e8e 100644
--- a/packages/instantsearch-core/src/lib/utils/__tests__/createSendEventForHits.test.ts
+++ b/packages/instantsearch-core/src/lib/utils/__tests__/createSendEventForHits.test.ts
@@ -3,11 +3,7 @@
  */
 
 import { createInstantSearch } from '../../../../test/createInstantSearch';
-import { deserializePayload } from '../../utils';
-import {
-  createBindEventForHits,
-  createSendEventForHits,
-} from '../createSendEventForHits';
+import { createSendEventForHits } from '../createSendEventForHits';
 
 import type { EscapedHits } from '../../../types';
 
@@ -41,11 +37,6 @@ const createTestEnvironment = ({
     getIndex: () => helper.getIndex(),
     widgetType,
   });
-  const bindEvent = createBindEventForHits({
-    getIndex: () => helper.getIndex(),
-    widgetType,
-    instantSearchInstance,
-  });
   return {
     instantSearchInstance,
     helper,
@@ -54,7 +45,6 @@ const createTestEnvironment = ({
     hits,
     additionalData,
     sendEvent,
-    bindEvent,
   };
 };
 
@@ -65,10 +55,9 @@ describe('createSendEventForHits', () => {
       expect(() => {
         sendEvent('click');
       }).toThrowErrorMatchingInlineSnapshot(`
-"You need to pass hit or hits as the second argument like:
-  sendEvent(eventType, hit);
-  "
-`);
+        "You need to pass hit or hits as the second argument like:
+        sendEvent(eventType, hit);"
+      `);
     });
 
     it('throws with unknown eventType', () => {
@@ -76,10 +65,9 @@ describe('createSendEventForHits', () => {
       expect(() => {
         sendEvent('my custom event type');
       }).toThrowErrorMatchingInlineSnapshot(`
-"You need to pass hit or hits as the second argument like:
-  sendEvent(eventType, hit);
-  "
-`);
+        "You need to pass hit or hits as the second argument like:
+        sendEvent(eventType, hit);"
+      `);
     });
 
     it('throw when eventName is missing for click or conversion event', () => {
@@ -88,23 +76,21 @@ describe('createSendEventForHits', () => {
         // @ts-expect-error wrong input
         sendEvent('click', {});
       }).toThrowErrorMatchingInlineSnapshot(`
-"You need to pass eventName as the third argument for 'click' or 'conversion' events like:
-  sendEvent('click', hit, 'Product Purchased');
+        "You need to pass eventName as the third argument for 'click' or 'conversion' events like:
+        sendEvent('click', hit, 'Product Purchased');
 
-  To learn more about event naming: https://www.algolia.com/doc/guides/getting-insights-and-analytics/search-analytics/click-through-and-conversions/in-depth/clicks-conversions-best-practices/
-  "
-`);
+        To learn more about event naming: https://www.algolia.com/doc/guides/getting-insights-and-analytics/search-analytics/click-through-and-conversions/in-depth/clicks-conversions-best-practices/"
+      `);
 
       expect(() => {
         // @ts-expect-error wrong input
         sendEvent('conversion', {});
       }).toThrowErrorMatchingInlineSnapshot(`
-"You need to pass eventName as the third argument for 'click' or 'conversion' events like:
-  sendEvent('click', hit, 'Product Purchased');
+        "You need to pass eventName as the third argument for 'click' or 'conversion' events like:
+        sendEvent('click', hit, 'Product Purchased');
 
-  To learn more about event naming: https://www.algolia.com/doc/guides/getting-insights-and-analytics/search-analytics/click-through-and-conversions/in-depth/clicks-conversions-best-practices/
-  "
-`);
+        To learn more about event naming: https://www.algolia.com/doc/guides/getting-insights-and-analytics/search-analytics/click-through-and-conversions/in-depth/clicks-conversions-best-practices/"
+      `);
     });
   });
 
@@ -597,235 +583,3 @@ describe('createSendEventForHits', () => {
     });
   });
 });
-
-describe('createBindEventForHits', () => {
-  function parsePayload(payload: string): Record<string, unknown> {
-    expect(payload.startsWith('data-insights-event=')).toBe(true);
-    return deserializePayload(payload.substr('data-insights-event='.length));
-  }
-
-  it('returns a payload for view event', () => {
-    const { bindEvent, hits, additionalData } = createTestEnvironment();
-    const parsedPayload = parsePayload(bindEvent('view', hits));
-    expect(parsedPayload).toEqual([
-      {
-        eventType: 'view',
-        hits: [
-          {
-            __position: 0,
-            __queryID: 'test-query-id',
-            objectID: 'obj0',
-          },
-          {
-            __position: 1,
-            __queryID: 'test-query-id',
-            objectID: 'obj1',
-          },
-        ],
-        insightsMethod: 'viewedObjectIDs',
-        payload: {
-          eventName: 'Hits Viewed',
-          index: 'testIndex',
-          objectIDs: ['obj0', 'obj1'],
-        },
-        widgetType: 'ais.testWidget',
-      },
-    ]);
-
-    const parsedPayloadWithAdditionalData = parsePayload(
-      bindEvent('view', hits, 'Products Viewed', additionalData)
-    );
-    expect(parsedPayloadWithAdditionalData).toEqual([
-      {
-        eventType: 'view',
-        hits: [
-          {
-            __position: 0,
-            __queryID: 'test-query-id',
-            objectID: 'obj0',
-          },
-          {
-            __position: 1,
-            __queryID: 'test-query-id',
-            objectID: 'obj1',
-          },
-        ],
-        insightsMethod: 'viewedObjectIDs',
-        payload: {
-          eventName: 'Products Viewed',
-          index: 'testIndex',
-          objectIDs: ['obj0', 'obj1'],
-          ...additionalData,
-        },
-        widgetType: 'ais.testWidget',
-      },
-    ]);
-  });
-
-  it('skips payload for view event when search is not idle', () => {
-    const { bindEvent, hits, instantSearchInstance } = createTestEnvironment();
-
-    instantSearchInstance.status = 'loading';
-    expect(bindEvent('view', hits)).toHaveLength(0);
-
-    instantSearchInstance.status = 'error';
-    expect(bindEvent('view', hits)).toHaveLength(0);
-
-    instantSearchInstance.status = 'stalled';
-    expect(bindEvent('view', hits)).toHaveLength(0);
-
-    instantSearchInstance.status = 'idle';
-    expect(bindEvent('view', hits)).not.toHaveLength(0);
-  });
-
-  it('returns a payload for click event', () => {
-    const { bindEvent, hits, additionalData } = createTestEnvironment();
-    const parsedPayload = parsePayload(
-      bindEvent('click', hits[0], 'Product Clicked')
-    );
-    expect(parsedPayload).toEqual([
-      {
-        eventType: 'click',
-        hits: [
-          {
-            __position: 0,
-            __queryID: 'test-query-id',
-            objectID: 'obj0',
-          },
-        ],
-        insightsMethod: 'clickedObjectIDsAfterSearch',
-        payload: {
-          eventName: 'Product Clicked',
-          index: 'testIndex',
-          objectIDs: ['obj0'],
-          positions: [0],
-          queryID: 'test-query-id',
-        },
-        widgetType: 'ais.testWidget',
-      },
-    ]);
-
-    const parsedPayloadWithAdditionalData = parsePayload(
-      bindEvent('click', hits[0], 'Product Clicked', additionalData)
-    );
-    expect(parsedPayloadWithAdditionalData).toEqual([
-      {
-        eventType: 'click',
-        hits: [
-          {
-            __position: 0,
-            __queryID: 'test-query-id',
-            objectID: 'obj0',
-          },
-        ],
-        insightsMethod: 'clickedObjectIDsAfterSearch',
-        payload: {
-          eventName: 'Product Clicked',
-          index: 'testIndex',
-          objectIDs: ['obj0'],
-          positions: [0],
-          queryID: 'test-query-id',
-          ...additionalData,
-        },
-        widgetType: 'ais.testWidget',
-      },
-    ]);
-  });
-
-  it('returns a payload for conversion event', () => {
-    const { bindEvent, hits, additionalData } = createTestEnvironment();
-    const parsedPayload = parsePayload(
-      bindEvent('conversion', hits[0], 'Product Ordered')
-    );
-    expect(parsedPayload).toEqual([
-      {
-        eventType: 'conversion',
-        hits: [
-          {
-            __position: 0,
-            __queryID: 'test-query-id',
-            objectID: 'obj0',
-          },
-        ],
-        insightsMethod: 'convertedObjectIDsAfterSearch',
-        payload: {
-          eventName: 'Product Ordered',
-          index: 'testIndex',
-          objectIDs: ['obj0'],
-          queryID: 'test-query-id',
-        },
-        widgetType: 'ais.testWidget',
-      },
-    ]);
-
-    const parsedPayloadWithAdditionalData = parsePayload(
-      bindEvent('conversion', hits[0], 'Product Added To Cart', additionalData)
-    );
-    expect(parsedPayloadWithAdditionalData).toEqual([
-      {
-        eventType: 'conversion',
-        hits: [
-          {
-            __position: 0,
-            __queryID: 'test-query-id',
-            objectID: 'obj0',
-          },
-        ],
-        insightsMethod: 'convertedObjectIDsAfterSearch',
-        payload: {
-          eventName: 'Product Added To Cart',
-          index: 'testIndex',
-          objectIDs: ['obj0'],
-          queryID: 'test-query-id',
-          ...additionalData,
-        },
-        widgetType: 'ais.testWidget',
-      },
-    ]);
-  });
-
-  it('splits a payload for > 20 hits', () => {
-    const { bindEvent, hits } = createTestEnvironment({ nbHits: 21 });
-    const parsedPayload = parsePayload(
-      bindEvent('click', hits, 'Product Clicked')
-    );
-    expect(parsedPayload).toEqual([
-      {
-        eventType: 'click',
-        hits: Array.from({ length: 20 }, (_, i) => ({
-          __position: i,
-          __queryID: 'test-query-id',
-          objectID: `obj${i}`,
-        })),
-        insightsMethod: 'clickedObjectIDsAfterSearch',
-        payload: {
-          eventName: 'Product Clicked',
-          index: 'testIndex',
-          objectIDs: Array.from({ length: 20 }, (_, i) => `obj${i}`),
-          positions: Array.from({ length: 20 }, (_, i) => i),
-          queryID: 'test-query-id',
-        },
-        widgetType: 'ais.testWidget',
-      },
-      {
-        eventType: 'click',
-        hits: [
-          {
-            __position: 20,
-            __queryID: 'test-query-id',
-            objectID: 'obj20',
-          },
-        ],
-        insightsMethod: 'clickedObjectIDsAfterSearch',
-        payload: {
-          eventName: 'Product Clicked',
-          index: 'testIndex',
-          objectIDs: ['obj20'],
-          positions: [20],
-          queryID: 'test-query-id',
-        },
-        widgetType: 'ais.testWidget',
-      },
-    ]);
-  });
-});
diff --git a/packages/instantsearch-core/src/lib/utils/createSendEventForFacet.ts b/packages/instantsearch-core/src/lib/utils/createSendEventForFacet.ts
index bb34caf6d9..c50ee4eec4 100644
--- a/packages/instantsearch-core/src/lib/utils/createSendEventForFacet.ts
+++ b/packages/instantsearch-core/src/lib/utils/createSendEventForFacet.ts
@@ -45,10 +45,9 @@ export function createSendEventForFacet({
     } else if (__DEV__) {
       throw new Error(
         `You need to pass between two and four arguments like:
-  sendEvent('click', facetValue, eventName?, additionalData?);
+sendEvent('click', facetValue, eventName?, additionalData?);
 
-If you want to send a custom payload, you can pass one object: sendEvent(customPayload);
-`
+If you want to send a custom payload, you can pass one object: sendEvent(customPayload);`
       );
     }
   };
diff --git a/packages/instantsearch-core/src/lib/utils/createSendEventForHits.ts b/packages/instantsearch-core/src/lib/utils/createSendEventForHits.ts
index 78e525b966..5d05492ec3 100644
--- a/packages/instantsearch-core/src/lib/utils/createSendEventForHits.ts
+++ b/packages/instantsearch-core/src/lib/utils/createSendEventForHits.ts
@@ -1,11 +1,8 @@
-import { serializePayload } from './serializer';
-
 import type { InstantSearch } from '../../instantsearch';
 import type {
   Hit,
   EscapedHits,
   InsightsEvent,
-  BindEventForHits,
   SendEventForHits,
 } from '../../types';
 
@@ -20,13 +17,11 @@ function chunk<TItem>(arr: TItem[], chunkSize: number = 20): TItem[][] {
 export function _buildEventPayloadsForHits({
   getIndex,
   widgetType,
-  methodName,
   args,
   instantSearchInstance,
 }: {
   widgetType: string;
   getIndex: () => string;
-  methodName: 'sendEvent' | 'bindEvent';
   args: any[];
   instantSearchInstance: InstantSearch;
 }): InsightsEvent[] {
@@ -44,8 +39,7 @@ export function _buildEventPayloadsForHits({
     if (__DEV__) {
       throw new Error(
         `You need to pass hit or hits as the second argument like:
-  ${methodName}(eventType, hit);
-  `
+sendEvent(eventType, hit);`
       );
     } else {
       return [];
@@ -55,10 +49,9 @@ export function _buildEventPayloadsForHits({
     if (__DEV__) {
       throw new Error(
         `You need to pass eventName as the third argument for 'click' or 'conversion' events like:
-  ${methodName}('click', hit, 'Product Purchased');
+sendEvent('click', hit, 'Product Purchased');
 
-  To learn more about event naming: https://www.algolia.com/doc/guides/getting-insights-and-analytics/search-analytics/click-through-and-conversions/in-depth/clicks-conversions-best-practices/
-  `
+To learn more about event naming: https://www.algolia.com/doc/guides/getting-insights-and-analytics/search-analytics/click-through-and-conversions/in-depth/clicks-conversions-best-practices/`
       );
     } else {
       return [];
@@ -134,8 +127,7 @@ export function _buildEventPayloadsForHits({
     });
   } else if (__DEV__) {
     throw new Error(`eventType("${eventType}") is not supported.
-    If you want to send a custom payload, you can pass one object: ${methodName}(customPayload);
-    `);
+If you want to send a custom payload, you can pass one object: sendEvent(customPayload);`);
   } else {
     return [];
   }
@@ -157,7 +149,6 @@ export function createSendEventForHits({
     const payloads = _buildEventPayloadsForHits({
       widgetType,
       getIndex,
-      methodName: 'sendEvent',
       args,
       instantSearchInstance,
     });
@@ -182,31 +173,3 @@ export function createSendEventForHits({
   };
   return sendEventForHits;
 }
-
-/**
- * @deprecated
- */
-export function createBindEventForHits({
-  getIndex,
-  widgetType,
-  instantSearchInstance,
-}: {
-  getIndex: () => string;
-  widgetType: string;
-  instantSearchInstance: InstantSearch;
-}): BindEventForHits {
-  const bindEventForHits: BindEventForHits = (...args: any[]) => {
-    const payloads = _buildEventPayloadsForHits({
-      widgetType,
-      getIndex,
-      methodName: 'bindEvent',
-      args,
-      instantSearchInstance,
-    });
-
-    return payloads.length
-      ? `data-insights-event=${serializePayload(payloads)}`
-      : '';
-  };
-  return bindEventForHits;
-}
diff --git a/packages/instantsearch-core/src/lib/utils/index.ts b/packages/instantsearch-core/src/lib/utils/index.ts
index d4912e484f..9c2218c33c 100644
--- a/packages/instantsearch-core/src/lib/utils/index.ts
+++ b/packages/instantsearch-core/src/lib/utils/index.ts
@@ -16,5 +16,4 @@ export * from './hydrateRecommendCache';
 export * from './hydrateSearchClient';
 export * from './mergeSearchParameters';
 export * from './resolveSearchParameters';
-export * from './serializer';
 export * from './setIndexHelperState';
diff --git a/packages/instantsearch-core/src/lib/utils/serializer.ts b/packages/instantsearch-core/src/lib/utils/serializer.ts
deleted file mode 100644
index 03f6e95c7f..0000000000
--- a/packages/instantsearch-core/src/lib/utils/serializer.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// @MAJOR delete after bindEvent is removed
-export function serializePayload<TPayload>(payload: TPayload): string {
-  return btoa(encodeURIComponent(JSON.stringify(payload)));
-}
-
-// @MAJOR delete after bindEvent is removed
-export function deserializePayload<TPayload>(serialized: string): TPayload {
-  return JSON.parse(decodeURIComponent(atob(serialized)));
-}
diff --git a/packages/instantsearch-core/src/types/insights.ts b/packages/instantsearch-core/src/types/insights.ts
index 2ac1329858..07eae60b76 100644
--- a/packages/instantsearch-core/src/types/insights.ts
+++ b/packages/instantsearch-core/src/types/insights.ts
@@ -98,15 +98,3 @@ type BuiltInSendEventForFacet = (
 type CustomSendEventForFacet = (customPayload: any) => void;
 export type SendEventForFacet = BuiltInSendEventForFacet &
   CustomSendEventForFacet;
-
-/** @deprecated */
-type BuiltInBindEventForHits = (
-  eventType: string,
-  hits: Hit | Hit[],
-  eventName?: string,
-  additionalData?: Record<string, any>
-) => string;
-/** @deprecated */
-export type CustomBindEventForHits = (customPayload: any) => string;
-/** @deprecated */
-export type BindEventForHits = BuiltInBindEventForHits & CustomBindEventForHits;
diff --git a/packages/instantsearch.js/src/components/InfiniteHits/InfiniteHits.tsx b/packages/instantsearch.js/src/components/InfiniteHits/InfiniteHits.tsx
index 391294a009..ab81382d88 100644
--- a/packages/instantsearch.js/src/components/InfiniteHits/InfiniteHits.tsx
+++ b/packages/instantsearch.js/src/components/InfiniteHits/InfiniteHits.tsx
@@ -10,7 +10,6 @@ import type {
   Hit,
   InsightsClient,
   SendEventForHits,
-  BindEventForHits,
 } from '../../types';
 import type {
   InfiniteHitsCSSClasses,
@@ -37,7 +36,6 @@ export type InfiniteHitsProps = {
   isLastPage: boolean;
   insights?: InsightsClient;
   sendEvent: SendEventForHits;
-  bindEvent: BindEventForHits;
   banner?: Banner;
 };
 
diff --git a/packages/instantsearch.js/src/components/InfiniteHits/__tests__/InfiniteHits-test.tsx b/packages/instantsearch.js/src/components/InfiniteHits/__tests__/InfiniteHits-test.tsx
index ab4fdbf878..0154811b73 100644
--- a/packages/instantsearch.js/src/components/InfiniteHits/__tests__/InfiniteHits-test.tsx
+++ b/packages/instantsearch.js/src/components/InfiniteHits/__tests__/InfiniteHits-test.tsx
@@ -34,7 +34,6 @@ describe('InfiniteHits', () => {
   };
 
   const sendEvent = () => {};
-  const bindEvent = () => '';
 
   describe('markup', () => {
     it('should render <InfiniteHits /> on first page', () => {
@@ -69,7 +68,6 @@ describe('InfiniteHits', () => {
         },
         cssClasses,
         sendEvent,
-        bindEvent,
       };
 
       const { container } = render(<InfiniteHits {...props} />);
@@ -109,7 +107,6 @@ describe('InfiniteHits', () => {
         },
         cssClasses,
         sendEvent,
-        bindEvent,
       };
 
       const { container } = render(<InfiniteHits {...props} />);
@@ -138,7 +135,6 @@ describe('InfiniteHits', () => {
         },
         cssClasses,
         sendEvent,
-        bindEvent,
       };
 
       const { container } = render(<InfiniteHits {...props} />);
@@ -167,7 +163,6 @@ describe('InfiniteHits', () => {
         },
         cssClasses,
         sendEvent,
-        bindEvent,
       };
 
       const { container } = render(<InfiniteHits {...props} />);
@@ -207,7 +202,6 @@ describe('InfiniteHits', () => {
         },
         cssClasses,
         sendEvent,
-        bindEvent,
       };
 
       const { container } = render(<InfiniteHits {...props} />);
@@ -252,7 +246,6 @@ describe('InfiniteHits', () => {
         },
         cssClasses,
         sendEvent,
-        bindEvent,
       };
 
       const { container } = render(<InfiniteHits {...props} />);
diff --git a/packages/instantsearch.js/src/components/InfiniteHits/__tests__/InfiniteHits.test.tsx b/packages/instantsearch.js/src/components/InfiniteHits/__tests__/InfiniteHits.test.tsx
index c1eee9299f..1b5a3e6577 100644
--- a/packages/instantsearch.js/src/components/InfiniteHits/__tests__/InfiniteHits.test.tsx
+++ b/packages/instantsearch.js/src/components/InfiniteHits/__tests__/InfiniteHits.test.tsx
@@ -48,7 +48,6 @@ describe('InfiniteHits', () => {
       ]),
       hits: hits as THit[],
       sendEvent: jest.fn(),
-      bindEvent: jest.fn(),
       showPrevious: jest.fn(),
       showMore: jest.fn(),
       hasShowPrevious: true,
diff --git a/packages/instantsearch.js/src/widgets/infinite-hits/infinite-hits.tsx b/packages/instantsearch.js/src/widgets/infinite-hits/infinite-hits.tsx
index 3273e95f9f..8b8e0f591c 100644
--- a/packages/instantsearch.js/src/widgets/infinite-hits/infinite-hits.tsx
+++ b/packages/instantsearch.js/src/widgets/infinite-hits/infinite-hits.tsx
@@ -188,7 +188,6 @@ const renderer =
       isFirstPage,
       isLastPage,
       insights,
-      bindEvent,
       sendEvent,
       banner,
     },
@@ -216,7 +215,6 @@ const renderer =
         isLastPage={isLastPage}
         insights={insights as InsightsClient}
         sendEvent={sendEvent}
-        bindEvent={bindEvent}
         banner={banner}
       />,
       containerNode
diff --git a/packages/react-instantsearch-core/src/connectors/__tests__/useHits.test.tsx b/packages/react-instantsearch-core/src/connectors/__tests__/useHits.test.tsx
index 0d6a5165fe..94f587a549 100644
--- a/packages/react-instantsearch-core/src/connectors/__tests__/useHits.test.tsx
+++ b/packages/react-instantsearch-core/src/connectors/__tests__/useHits.test.tsx
@@ -17,7 +17,6 @@ describe('useHits', () => {
     // Initial render state from manual `getWidgetRenderState`
     expect(result.current).toEqual({
       banner: undefined,
-      bindEvent: expect.any(Function),
       hits: [],
       items: [],
       results: expect.objectContaining({ nbHits: 0 }),
@@ -28,7 +27,6 @@ describe('useHits', () => {
       // InstantSearch.js state from the `render` lifecycle step
       expect(result.current).toEqual({
         banner: undefined,
-        bindEvent: expect.any(Function),
         hits: [],
         items: [],
         results: expect.objectContaining({ nbHits: 0 }),
diff --git a/packages/react-instantsearch-core/src/connectors/__tests__/useInfiniteHits.test.tsx b/packages/react-instantsearch-core/src/connectors/__tests__/useInfiniteHits.test.tsx
index b34ccd8702..94fb711894 100644
--- a/packages/react-instantsearch-core/src/connectors/__tests__/useInfiniteHits.test.tsx
+++ b/packages/react-instantsearch-core/src/connectors/__tests__/useInfiniteHits.test.tsx
@@ -16,7 +16,6 @@ describe('useInfiniteHits', () => {
 
     // Initial render state from manual `getWidgetRenderState`
     expect(result.current).toEqual({
-      bindEvent: undefined,
       hits: [],
       items: [],
       results: expect.objectContaining({ nbHits: 0 }),
@@ -31,7 +30,6 @@ describe('useInfiniteHits', () => {
     await waitFor(() => {
       // InstantSearch.js state from the `render` lifecycle step
       expect(result.current).toEqual({
-        bindEvent: expect.any(Function),
         hits: [],
         items: [],
         results: expect.objectContaining({ nbHits: 0 }),

From ddaea7b355e104b79e805f3117c76ce6e220111b Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Thu, 12 Dec 2024 15:04:21 +0100
Subject: [PATCH 17/37] fix(geoSearch): hasMapMovedSinceLastRefine (#6470)

The property that is exposed is called `hasMapMovedSinceLastRefine`, no longer `hasMapMoveSinceLastRefine`

BREAKING CHANGE: replace `hasMapMoveSinceLastRefine` in your code base with `hasMapMovedSinceLastRefine`
---
 .../__tests__/connectGeoSearch.test.ts        | 72 +++++++++----------
 .../src/connectors/connectGeoSearch.ts        | 19 +++--
 .../GeoSearchControls/GeoSearchControls.tsx   | 12 ++--
 .../__tests__/GeoSearchControls-test.tsx      | 20 +++---
 .../widgets/geo-search/GeoSearchRenderer.js   |  6 +-
 .../__snapshots__/geo-search-test.ts.snap     |  4 +-
 .../geo-search/__tests__/geo-search-test.ts   | 20 +++---
 .../__tests__/useGeoSearch.test.tsx           |  4 +-
 8 files changed, 79 insertions(+), 78 deletions(-)

diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectGeoSearch.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectGeoSearch.test.ts
index 7f868e26de..6c072d1109 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectGeoSearch.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectGeoSearch.test.ts
@@ -176,7 +176,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         toggleRefineOnMapMove: expect.any(Function),
         isRefineOnMapMove: expect.any(Function),
         setMapMoveSinceLastRefine: expect.any(Function),
-        hasMapMoveSinceLastRefine: expect.any(Function),
+        hasMapMovedSinceLastRefine: expect.any(Function),
         widgetParams: {},
         instantSearchInstance,
       },
@@ -184,7 +184,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
     );
 
     expect(lastRenderArgs(render).isRefineOnMapMove()).toBe(true);
-    expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(false);
+    expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(false);
     expect(lastRenderArgs(render).isRefinedWithMap()).toBe(false);
 
     widget.render!(
@@ -222,7 +222,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
     );
 
     expect(lastRenderArgs(render).isRefineOnMapMove()).toBe(true);
-    expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(false);
+    expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(false);
     expect(lastRenderArgs(render).isRefinedWithMap()).toBe(false);
   });
 
@@ -496,13 +496,13 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
     );
 
     expect(render).toHaveBeenCalledTimes(3);
-    expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(false);
+    expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(false);
     expect(lastRenderArgs(render).isRefinedWithMap()).toBe(true);
 
     lastRenderArgs(render).setMapMoveSinceLastRefine();
 
     expect(render).toHaveBeenCalledTimes(4);
-    expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(true);
+    expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(true);
     expect(lastRenderArgs(render).isRefinedWithMap()).toBe(true);
 
     helper.setQueryParameter('aroundLatLng', '14,16');
@@ -515,7 +515,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
     );
 
     expect(render).toHaveBeenCalledTimes(5);
-    expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(false);
+    expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(false);
     expect(lastRenderArgs(render).isRefinedWithMap()).toBe(true);
   });
 
@@ -574,13 +574,13 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
     );
 
     expect(render).toHaveBeenCalledTimes(3);
-    expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(false);
+    expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(false);
     expect(lastRenderArgs(render).isRefinedWithMap()).toBe(true);
 
     lastRenderArgs(render).setMapMoveSinceLastRefine();
 
     expect(render).toHaveBeenCalledTimes(4);
-    expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(true);
+    expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(true);
     expect(lastRenderArgs(render).isRefinedWithMap()).toBe(true);
 
     helper.setQueryParameter('aroundLatLng', '10,12');
@@ -593,7 +593,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
     );
 
     expect(render).toHaveBeenCalledTimes(5);
-    expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(true);
+    expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(true);
     expect(lastRenderArgs(render).isRefinedWithMap()).toBe(true);
   });
 
@@ -653,13 +653,13 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
     );
 
     expect(render).toHaveBeenCalledTimes(3);
-    expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(false);
+    expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(false);
     expect(lastRenderArgs(render).isRefinedWithMap()).toBe(true);
 
     lastRenderArgs(render).setMapMoveSinceLastRefine();
 
     expect(render).toHaveBeenCalledTimes(4);
-    expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(true);
+    expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(true);
     expect(lastRenderArgs(render).isRefinedWithMap()).toBe(true);
 
     helper.setQueryParameter('insideBoundingBox', undefined);
@@ -672,7 +672,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
     );
 
     expect(render).toHaveBeenCalledTimes(5);
-    expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(false);
+    expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(false);
     expect(lastRenderArgs(render).isRefinedWithMap()).toBe(false);
   });
 
@@ -732,13 +732,13 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
     );
 
     expect(render).toHaveBeenCalledTimes(3);
-    expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(false);
+    expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(false);
     expect(lastRenderArgs(render).isRefinedWithMap()).toBe(true);
 
     lastRenderArgs(render).setMapMoveSinceLastRefine();
 
     expect(render).toHaveBeenCalledTimes(4);
-    expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(true);
+    expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(true);
     expect(lastRenderArgs(render).isRefinedWithMap()).toBe(true);
 
     // @ts-ignore
@@ -752,7 +752,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
     );
 
     expect(render).toHaveBeenCalledTimes(5);
-    expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(true);
+    expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(true);
     expect(lastRenderArgs(render).isRefinedWithMap()).toBe(true);
   });
 
@@ -938,7 +938,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       );
 
       expect(render).toHaveBeenCalledTimes(1);
-      expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(false);
+      expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(false);
       expect(lastRenderArgs(render).isRefinedWithMap()).toBe(false);
       expect(helper.state.insideBoundingBox).toBe(undefined);
       expect(helper.search).not.toHaveBeenCalled();
@@ -953,7 +953,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       );
 
       expect(render).toHaveBeenCalledTimes(2);
-      expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(false);
+      expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(false);
       expect(lastRenderArgs(render).isRefinedWithMap()).toBe(true);
       expect(helper.state.insideBoundingBox).toEqual('12,10,40,42');
       expect(helper.search).toHaveBeenCalledTimes(1);
@@ -999,7 +999,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       );
 
       expect(render).toHaveBeenCalledTimes(2);
-      expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(false);
+      expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(false);
       expect(lastRenderArgs(render).isRefinedWithMap()).toBe(false);
       expect(helper.state.insideBoundingBox).toBe(undefined);
       expect(helper.search).not.toHaveBeenCalled();
@@ -1014,7 +1014,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       );
 
       expect(render).toHaveBeenCalledTimes(3);
-      expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(false);
+      expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(false);
       expect(lastRenderArgs(render).isRefinedWithMap()).toBe(true);
       expect(helper.state.insideBoundingBox).toEqual('12,10,40,42');
       expect(helper.search).toHaveBeenCalledTimes(1);
@@ -1055,7 +1055,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       );
 
       expect(render).toHaveBeenCalledTimes(1);
-      expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(false);
+      expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(false);
       expect(lastRenderArgs(render).isRefinedWithMap()).toBe(false);
       expect(helper.state.insideBoundingBox).toBe(undefined);
       expect(helper.search).not.toHaveBeenCalled();
@@ -1070,7 +1070,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       );
 
       expect(render).toHaveBeenCalledTimes(2);
-      expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(false);
+      expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(false);
       expect(lastRenderArgs(render).isRefinedWithMap()).toBe(true);
       expect(helper.state.insideBoundingBox).toEqual('12,10,40,42');
       expect(helper.search).toHaveBeenCalledTimes(1);
@@ -1085,7 +1085,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       );
 
       expect(render).toHaveBeenCalledTimes(3);
-      expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(false);
+      expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(false);
       expect(lastRenderArgs(render).isRefinedWithMap()).toBe(false);
       expect(helper.state.insideBoundingBox).toBe(undefined);
       expect(helper.search).toHaveBeenCalledTimes(2);
@@ -1131,7 +1131,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       );
 
       expect(render).toHaveBeenCalledTimes(2);
-      expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(false);
+      expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(false);
       expect(lastRenderArgs(render).isRefinedWithMap()).toBe(false);
       expect(helper.state.insideBoundingBox).toBe(undefined);
       expect(helper.search).not.toHaveBeenCalled();
@@ -1146,7 +1146,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       );
 
       expect(render).toHaveBeenCalledTimes(3);
-      expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(false);
+      expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(false);
       expect(lastRenderArgs(render).isRefinedWithMap()).toBe(true);
       expect(helper.state.insideBoundingBox).toEqual('12,10,40,42');
       expect(helper.search).toHaveBeenCalledTimes(1);
@@ -1161,7 +1161,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       );
 
       expect(render).toHaveBeenCalledTimes(4);
-      expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(false);
+      expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(false);
       expect(lastRenderArgs(render).isRefinedWithMap()).toBe(false);
       expect(helper.state.insideBoundingBox).toBe(undefined);
       expect(helper.search).toHaveBeenCalledTimes(2);
@@ -1262,12 +1262,12 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       widget.init!(createInitOptions());
 
       expect(render).toHaveBeenCalledTimes(1);
-      expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(false);
+      expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(false);
 
       lastRenderArgs(render).setMapMoveSinceLastRefine();
 
       expect(render).toHaveBeenCalledTimes(1);
-      expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(true);
+      expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(true);
 
       widget.render!(
         createRenderOptions({
@@ -1280,7 +1280,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       );
 
       expect(render).toHaveBeenCalledTimes(2);
-      expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(true);
+      expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(true);
       expect(firstRenderArgs(render).setMapMoveSinceLastRefine).toBe(
         lastRenderArgs(render).setMapMoveSinceLastRefine
       );
@@ -1318,12 +1318,12 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       );
 
       expect(render).toHaveBeenCalledTimes(2);
-      expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(false);
+      expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(false);
 
       lastRenderArgs(render).setMapMoveSinceLastRefine();
 
       expect(render).toHaveBeenCalledTimes(3);
-      expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(true);
+      expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(true);
       expect(firstRenderArgs(render).setMapMoveSinceLastRefine).toBe(
         lastRenderArgs(render).setMapMoveSinceLastRefine
       );
@@ -1361,17 +1361,17 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       );
 
       expect(render).toHaveBeenCalledTimes(2);
-      expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(false);
+      expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(false);
 
       lastRenderArgs(render).setMapMoveSinceLastRefine();
 
       expect(render).toHaveBeenCalledTimes(3);
-      expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(true);
+      expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(true);
 
       lastRenderArgs(render).setMapMoveSinceLastRefine();
 
       expect(render).toHaveBeenCalledTimes(3);
-      expect(lastRenderArgs(render).hasMapMoveSinceLastRefine()).toBe(true);
+      expect(lastRenderArgs(render).hasMapMovedSinceLastRefine()).toBe(true);
       expect(firstRenderArgs(render).setMapMoveSinceLastRefine).toBe(
         lastRenderArgs(render).setMapMoveSinceLastRefine
       );
@@ -1593,7 +1593,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         currentRefinement: undefined,
         items: [],
         clearMapRefinement: expect.any(Function),
-        hasMapMoveSinceLastRefine: expect.any(Function),
+        hasMapMovedSinceLastRefine: expect.any(Function),
         isRefineOnMapMove: expect.any(Function),
         isRefinedWithMap: expect.any(Function),
         refine: expect.any(Function),
@@ -1630,7 +1630,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         items: [],
         refine: expect.any(Function),
         clearMapRefinement: expect.any(Function),
-        hasMapMoveSinceLastRefine: expect.any(Function),
+        hasMapMovedSinceLastRefine: expect.any(Function),
         isRefineOnMapMove: expect.any(Function),
         isRefinedWithMap: expect.any(Function),
         setMapMoveSinceLastRefine: expect.any(Function),
@@ -1658,7 +1658,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
           currentRefinement: undefined,
           items: [],
           clearMapRefinement: expect.any(Function),
-          hasMapMoveSinceLastRefine: expect.any(Function),
+          hasMapMovedSinceLastRefine: expect.any(Function),
           isRefineOnMapMove: expect.any(Function),
           isRefinedWithMap: expect.any(Function),
           refine: expect.any(Function),
diff --git a/packages/instantsearch-core/src/connectors/connectGeoSearch.ts b/packages/instantsearch-core/src/connectors/connectGeoSearch.ts
index 3867fe531f..0bf37cbcee 100644
--- a/packages/instantsearch-core/src/connectors/connectGeoSearch.ts
+++ b/packages/instantsearch-core/src/connectors/connectGeoSearch.ts
@@ -67,7 +67,7 @@ export type GeoSearchRenderState<THit extends NonNullable<object> = BaseHit> = {
   /**
    * Return true if the map has move since the last refinement.
    */
-  hasMapMoveSinceLastRefine: () => boolean;
+  hasMapMovedSinceLastRefine: () => boolean;
   /**
    * Return true if the current refinement is set with the map bounds.
    */
@@ -179,8 +179,7 @@ export const connectGeoSearch = function connectGeoSearch<
 
     const widgetState = {
       isRefineOnMapMove: enableRefineOnMapMove,
-      // @MAJOR hasMapMoveSinceLastRefine -> hasMapMovedSinceLastRefine
-      hasMapMoveSinceLastRefine: false,
+      hasMapMovedSinceLastRefine: false,
       lastRefinePosition: '',
       lastRefineBoundingBox: '',
       internalToggleRefineOnMapMove: noop,
@@ -207,7 +206,7 @@ export const connectGeoSearch = function connectGeoSearch<
           )
           .search();
 
-        widgetState.hasMapMoveSinceLastRefine = false;
+        widgetState.hasMapMovedSinceLastRefine = false;
         widgetState.lastRefineBoundingBox = boundingBox;
       };
 
@@ -246,17 +245,17 @@ export const connectGeoSearch = function connectGeoSearch<
       ) =>
       () => {
         const shouldTriggerRender =
-          widgetState.hasMapMoveSinceLastRefine !== true;
+          widgetState.hasMapMovedSinceLastRefine !== true;
 
-        widgetState.hasMapMoveSinceLastRefine = true;
+        widgetState.hasMapMovedSinceLastRefine = true;
 
         if (shouldTriggerRender) {
           render(renderOptions);
         }
       };
 
-    const hasMapMoveSinceLastRefine = () =>
-      widgetState.hasMapMoveSinceLastRefine;
+    const hasMapMovedSinceLastRefine = () =>
+      widgetState.hasMapMovedSinceLastRefine;
 
     let sendEvent: SendEventForHits;
 
@@ -307,7 +306,7 @@ export const connectGeoSearch = function connectGeoSearch<
           positionChangedSinceLastRefine ||
           boundingBoxChangedSinceLastRefine
         ) {
-          widgetState.hasMapMoveSinceLastRefine = false;
+          widgetState.hasMapMovedSinceLastRefine = false;
         }
 
         widgetState.lastRefinePosition = state.aroundLatLng || '';
@@ -369,7 +368,7 @@ export const connectGeoSearch = function connectGeoSearch<
           toggleRefineOnMapMove,
           isRefineOnMapMove,
           setMapMoveSinceLastRefine,
-          hasMapMoveSinceLastRefine,
+          hasMapMovedSinceLastRefine,
           widgetParams,
         };
       },
diff --git a/packages/instantsearch.js/src/components/GeoSearchControls/GeoSearchControls.tsx b/packages/instantsearch.js/src/components/GeoSearchControls/GeoSearchControls.tsx
index 0b8b855ad4..39e49e099a 100644
--- a/packages/instantsearch.js/src/components/GeoSearchControls/GeoSearchControls.tsx
+++ b/packages/instantsearch.js/src/components/GeoSearchControls/GeoSearchControls.tsx
@@ -22,7 +22,7 @@ type Props = {
   enableClearMapRefinement: boolean;
   isRefineOnMapMove: boolean;
   isRefinedWithMap: boolean;
-  hasMapMoveSinceLastRefine: boolean;
+  hasMapMovedSinceLastRefine: boolean;
   onRefineToggle: (event: Event) => void;
   onRefineClick: (event: MouseEvent) => void;
   onClearClick: (event: MouseEvent) => void;
@@ -36,7 +36,7 @@ const GeoSearchControls = ({
   enableClearMapRefinement,
   isRefineOnMapMove,
   isRefinedWithMap,
-  hasMapMoveSinceLastRefine,
+  hasMapMovedSinceLastRefine,
   onRefineToggle,
   onRefineClick,
   onClearClick,
@@ -47,7 +47,7 @@ const GeoSearchControls = ({
       <div>
         {enableRefineControl && (
           <div className={cssClasses.control}>
-            {isRefineOnMapMove || !hasMapMoveSinceLastRefine ? (
+            {isRefineOnMapMove || !hasMapMovedSinceLastRefine ? (
               <GeoSearchToggle
                 classNameLabel={cx(
                   cssClasses.label,
@@ -66,7 +66,7 @@ const GeoSearchControls = ({
             ) : (
               <GeoSearchButton
                 className={cssClasses.redo}
-                disabled={!hasMapMoveSinceLastRefine}
+                disabled={!hasMapMovedSinceLastRefine}
                 onClick={onRefineClick}
               >
                 <Template
@@ -84,9 +84,9 @@ const GeoSearchControls = ({
             <GeoSearchButton
               className={cx(
                 cssClasses.redo,
-                !hasMapMoveSinceLastRefine && cssClasses.disabledRedo
+                !hasMapMovedSinceLastRefine && cssClasses.disabledRedo
               )}
-              disabled={!hasMapMoveSinceLastRefine}
+              disabled={!hasMapMovedSinceLastRefine}
               onClick={onRefineClick}
             >
               <Template
diff --git a/packages/instantsearch.js/src/components/GeoSearchControls/__tests__/GeoSearchControls-test.tsx b/packages/instantsearch.js/src/components/GeoSearchControls/__tests__/GeoSearchControls-test.tsx
index b66484d323..17c1219398 100644
--- a/packages/instantsearch.js/src/components/GeoSearchControls/__tests__/GeoSearchControls-test.tsx
+++ b/packages/instantsearch.js/src/components/GeoSearchControls/__tests__/GeoSearchControls-test.tsx
@@ -39,7 +39,7 @@ describe('GeoSearchControls', () => {
     enableRefine: true,
     isRefineOnMapMove: true,
     isRefinedWithMap: false,
-    hasMapMoveSinceLastRefine: false,
+    hasMapMovedSinceLastRefine: false,
     onRefineToggle: () => {},
     onRefineClick: () => {},
     onClearClick: () => {},
@@ -63,7 +63,7 @@ describe('GeoSearchControls', () => {
         ...defaultProps,
         enableRefineControl: true,
         isRefineOnMapMove: true,
-        hasMapMoveSinceLastRefine: false,
+        hasMapMovedSinceLastRefine: false,
       };
 
       const { container } = render(<GeoSearchControls {...props} />);
@@ -76,7 +76,7 @@ describe('GeoSearchControls', () => {
         ...defaultProps,
         enableRefineControl: true,
         isRefineOnMapMove: true,
-        hasMapMoveSinceLastRefine: true,
+        hasMapMovedSinceLastRefine: true,
       };
 
       const { container } = render(<GeoSearchControls {...props} />);
@@ -89,7 +89,7 @@ describe('GeoSearchControls', () => {
         ...defaultProps,
         enableRefineControl: true,
         isRefineOnMapMove: false,
-        hasMapMoveSinceLastRefine: false,
+        hasMapMovedSinceLastRefine: false,
       };
 
       const { container } = render(<GeoSearchControls {...props} />);
@@ -102,7 +102,7 @@ describe('GeoSearchControls', () => {
         ...defaultProps,
         enableRefineControl: true,
         isRefineOnMapMove: false,
-        hasMapMoveSinceLastRefine: true,
+        hasMapMovedSinceLastRefine: true,
       };
 
       const { container } = render(<GeoSearchControls {...props} />);
@@ -115,7 +115,7 @@ describe('GeoSearchControls', () => {
         ...defaultProps,
         enableRefineControl: true,
         isRefineOnMapMove: true,
-        hasMapMoveSinceLastRefine: false,
+        hasMapMovedSinceLastRefine: false,
         onRefineToggle: jest.fn(),
       };
 
@@ -133,7 +133,7 @@ describe('GeoSearchControls', () => {
         ...defaultProps,
         enableRefineControl: true,
         isRefineOnMapMove: false,
-        hasMapMoveSinceLastRefine: true,
+        hasMapMovedSinceLastRefine: true,
         onRefineClick: jest.fn(),
       };
 
@@ -153,7 +153,7 @@ describe('GeoSearchControls', () => {
         ...defaultProps,
         enableRefineControl: false,
         isRefineOnMapMove: false,
-        hasMapMoveSinceLastRefine: true,
+        hasMapMovedSinceLastRefine: true,
       };
 
       const { container } = render(<GeoSearchControls {...props} />);
@@ -166,7 +166,7 @@ describe('GeoSearchControls', () => {
         ...defaultProps,
         enableRefineControl: false,
         isRefineOnMapMove: false,
-        hasMapMoveSinceLastRefine: false,
+        hasMapMovedSinceLastRefine: false,
       };
 
       const { container } = render(<GeoSearchControls {...props} />);
@@ -191,7 +191,7 @@ describe('GeoSearchControls', () => {
         ...defaultProps,
         enableRefineControl: false,
         isRefineOnMapMove: false,
-        hasMapMoveSinceLastRefine: true,
+        hasMapMovedSinceLastRefine: true,
         onRefineClick: jest.fn(),
       };
 
diff --git a/packages/instantsearch.js/src/widgets/geo-search/GeoSearchRenderer.js b/packages/instantsearch.js/src/widgets/geo-search/GeoSearchRenderer.js
index 7e8b98a689..49e72c6866 100644
--- a/packages/instantsearch.js/src/widgets/geo-search/GeoSearchRenderer.js
+++ b/packages/instantsearch.js/src/widgets/geo-search/GeoSearchRenderer.js
@@ -51,7 +51,7 @@ const renderer = (
     toggleRefineOnMapMove,
     isRefineOnMapMove,
     setMapMoveSinceLastRefine,
-    hasMapMoveSinceLastRefine,
+    hasMapMovedSinceLastRefine,
     isRefinedWithMap,
     widgetParams,
   },
@@ -180,7 +180,7 @@ const renderer = (
     })
   );
 
-  const shouldUpdate = !hasMapMoveSinceLastRefine();
+  const shouldUpdate = !hasMapMovedSinceLastRefine();
 
   // We use this value for differentiate the padding to apply during
   // fitBounds. When we don't have a currenRefinement (boundingBox)
@@ -218,7 +218,7 @@ const renderer = (
       enableClearMapRefinement={enableClearMapRefinement}
       isRefineOnMapMove={isRefineOnMapMove()}
       isRefinedWithMap={isRefinedWithMap()}
-      hasMapMoveSinceLastRefine={hasMapMoveSinceLastRefine()}
+      hasMapMovedSinceLastRefine={hasMapMovedSinceLastRefine()}
       onRefineToggle={toggleRefineOnMapMove}
       onRefineClick={() =>
         refineWithMap({
diff --git a/packages/instantsearch.js/src/widgets/geo-search/__tests__/__snapshots__/geo-search-test.ts.snap b/packages/instantsearch.js/src/widgets/geo-search/__tests__/__snapshots__/geo-search-test.ts.snap
index 1de8720982..0bd05277ef 100644
--- a/packages/instantsearch.js/src/widgets/geo-search/__tests__/__snapshots__/geo-search-test.ts.snap
+++ b/packages/instantsearch.js/src/widgets/geo-search/__tests__/__snapshots__/geo-search-test.ts.snap
@@ -26,7 +26,7 @@ exports[`GeoSearch expect to render 2`] = `
   "enableClearMapRefinement": true,
   "enableRefine": true,
   "enableRefineControl": true,
-  "hasMapMoveSinceLastRefine": false,
+  "hasMapMovedSinceLastRefine": false,
   "isRefineOnMapMove": true,
   "isRefinedWithMap": false,
   "onClearClick": [Function],
@@ -69,7 +69,7 @@ exports[`GeoSearch expect to render with custom classNames 2`] = `
   "enableClearMapRefinement": true,
   "enableRefine": true,
   "enableRefineControl": true,
-  "hasMapMoveSinceLastRefine": false,
+  "hasMapMovedSinceLastRefine": false,
   "isRefineOnMapMove": true,
   "isRefinedWithMap": false,
   "onClearClick": [Function],
diff --git a/packages/instantsearch.js/src/widgets/geo-search/__tests__/geo-search-test.ts b/packages/instantsearch.js/src/widgets/geo-search/__tests__/geo-search-test.ts
index c59bb68849..9f4224eaa0 100644
--- a/packages/instantsearch.js/src/widgets/geo-search/__tests__/geo-search-test.ts
+++ b/packages/instantsearch.js/src/widgets/geo-search/__tests__/geo-search-test.ts
@@ -618,13 +618,15 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
           })
         );
 
-        expect(lastRenderArgs(renderer).hasMapMoveSinceLastRefine()).toBe(
+        expect(lastRenderArgs(renderer).hasMapMovedSinceLastRefine()).toBe(
           false
         );
 
         simulateEvent(mapInstance, eventName);
 
-        expect(lastRenderArgs(renderer).hasMapMoveSinceLastRefine()).toBe(true);
+        expect(lastRenderArgs(renderer).hasMapMovedSinceLastRefine()).toBe(
+          true
+        );
       });
 
       it(`expect to listen for "${eventName}" and schedule a refine call`, () => {
@@ -750,14 +752,14 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         // Simulate programmatic event
         lastRenderState(renderer).isUserInteraction = false;
 
-        expect(lastRenderArgs(renderer).hasMapMoveSinceLastRefine()).toBe(
+        expect(lastRenderArgs(renderer).hasMapMovedSinceLastRefine()).toBe(
           false
         );
         expect(lastRenderState(renderer).isPendingRefine).toBe(false);
 
         simulateEvent(mapInstance, eventName);
 
-        expect(lastRenderArgs(renderer).hasMapMoveSinceLastRefine()).toBe(
+        expect(lastRenderArgs(renderer).hasMapMovedSinceLastRefine()).toBe(
           false
         );
         expect(lastRenderState(renderer).isPendingRefine).toBe(false);
@@ -791,14 +793,14 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
           expect.any(Function)
         );
 
-        expect(lastRenderArgs(renderer).hasMapMoveSinceLastRefine()).toBe(
+        expect(lastRenderArgs(renderer).hasMapMovedSinceLastRefine()).toBe(
           false
         );
         expect(lastRenderState(renderer).isPendingRefine).toBe(false);
 
         simulateEvent(mapInstance, eventName);
 
-        expect(lastRenderArgs(renderer).hasMapMoveSinceLastRefine()).toBe(
+        expect(lastRenderArgs(renderer).hasMapMovedSinceLastRefine()).toBe(
           false
         );
         expect(lastRenderState(renderer).isPendingRefine).toBe(false);
@@ -1705,7 +1707,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         })
       );
 
-      expect(lastRenderArgs(renderer).hasMapMoveSinceLastRefine()).toBe(false);
+      expect(lastRenderArgs(renderer).hasMapMovedSinceLastRefine()).toBe(false);
       expect(lastRenderArgs(renderer).isRefinedWithMap()).toBe(false);
       expect(mapInstance.fitBounds).toHaveBeenCalledTimes(1);
       expect(mapInstance.fitBounds).toHaveBeenLastCalledWith(
@@ -2003,7 +2005,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
         })
       );
 
-      expect(lastRenderArgs(renderer).hasMapMoveSinceLastRefine()).toBe(false);
+      expect(lastRenderArgs(renderer).hasMapMovedSinceLastRefine()).toBe(false);
       expect(mapInstance.fitBounds).toHaveBeenCalledTimes(1);
       expect(mapInstance.setZoom).not.toHaveBeenCalled();
       expect(mapInstance.setCenter).not.toHaveBeenCalled();
@@ -2013,7 +2015,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
       simulateEvent(mapInstance, 'dragstart');
       simulateEvent(mapInstance, 'center_changed');
 
-      expect(lastRenderArgs(renderer).hasMapMoveSinceLastRefine()).toBe(true);
+      expect(lastRenderArgs(renderer).hasMapMovedSinceLastRefine()).toBe(true);
       expect(mapInstance.fitBounds).toHaveBeenCalledTimes(1);
       expect(mapInstance.setZoom).not.toHaveBeenCalled();
       expect(mapInstance.setCenter).not.toHaveBeenCalled();
diff --git a/packages/react-instantsearch-core/src/connectors/__tests__/useGeoSearch.test.tsx b/packages/react-instantsearch-core/src/connectors/__tests__/useGeoSearch.test.tsx
index 947c3a9a72..7b6857ff3a 100644
--- a/packages/react-instantsearch-core/src/connectors/__tests__/useGeoSearch.test.tsx
+++ b/packages/react-instantsearch-core/src/connectors/__tests__/useGeoSearch.test.tsx
@@ -18,7 +18,7 @@ describe('useGeoSearch', () => {
     expect(result.current).toEqual({
       clearMapRefinement: expect.any(Function),
       currentRefinement: undefined,
-      hasMapMoveSinceLastRefine: expect.any(Function),
+      hasMapMovedSinceLastRefine: expect.any(Function),
       isRefinedWithMap: expect.any(Function),
       isRefineOnMapMove: expect.any(Function),
       items: [],
@@ -34,7 +34,7 @@ describe('useGeoSearch', () => {
       expect(result.current).toEqual({
         clearMapRefinement: expect.any(Function),
         currentRefinement: undefined,
-        hasMapMoveSinceLastRefine: expect.any(Function),
+        hasMapMovedSinceLastRefine: expect.any(Function),
         isRefinedWithMap: expect.any(Function),
         isRefineOnMapMove: expect.any(Function),
         items: [],

From 57d520979857ece572ad475645b4766c9a5a40b7 Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Thu, 12 Dec 2024 16:40:24 +0100
Subject: [PATCH 18/37] fix(error): directly emit error from events (#6472)

In `@algolia/events`, errors are properly rethrown if they are thrown with `.emit('error', new Error("msg"))`, not if they are thrown with `.emit('error', { error: new Error('msg') })`. Therefore in InstantSearch and the helper, all errors are now properly thrown directly in the emit.

[FX-3187]

BREAKING CHANGE: if you have any `on('error'` handler that reads `event.error` from the callback, change that to just `error`
---
 packages/algoliasearch-helper/index.d.ts      |  4 ++--
 .../src/algoliasearch.helper.js               | 21 ++++++-------------
 .../integration-spec/helper.distinct.facet.js |  4 ++--
 .../test/integration-spec/helper.filters.js   |  4 ++--
 .../test/integration-spec/helper.numerics.js  |  8 +++----
 .../integration-spec/helper.searchOnce.js     |  4 ++--
 .../test/integration-spec/helper.tags.js      |  4 ++--
 .../test/spec/algoliasearch.helper/events.js  |  8 ++-----
 .../instantsearch-integration.test.ts         |  5 +----
 .../src/__tests__/instantsearch.test.tsx      |  4 ++--
 .../instantsearch-core/src/instantsearch.ts   | 16 +++++---------
 11 files changed, 30 insertions(+), 52 deletions(-)

diff --git a/packages/algoliasearch-helper/index.d.ts b/packages/algoliasearch-helper/index.d.ts
index cdc7044f80..3b2aadc01d 100644
--- a/packages/algoliasearch-helper/index.d.ts
+++ b/packages/algoliasearch-helper/index.d.ts
@@ -75,7 +75,7 @@ declare namespace algoliasearchHelper {
       event: 'result',
       cb: (res: { results: SearchResults; state: SearchParameters }) => void
     ): this;
-    on(event: 'error', cb: (res: { error: Error }) => void): this;
+    on(event: 'error', cb: (res: Error) => void): this;
     on(event: 'searchQueueEmpty', cb: () => void): this;
 
     /**
@@ -364,7 +364,7 @@ declare namespace algoliasearchHelper {
         };
       }) => void
     ): this;
-    on(event: 'error', cb: (res: { error: Error }) => void): this;
+    on(event: 'error', cb: (res: Error) => void): this;
 
     lastResults: SearchResults | null;
     lastRecommendResults: RecommendResults | null;
diff --git a/packages/algoliasearch-helper/src/algoliasearch.helper.js b/packages/algoliasearch-helper/src/algoliasearch.helper.js
index 04e862fa69..8478ae91f9 100644
--- a/packages/algoliasearch-helper/src/algoliasearch.helper.js
+++ b/packages/algoliasearch-helper/src/algoliasearch.helper.js
@@ -78,10 +78,9 @@ var version = require('./version');
  * Event triggered when Algolia sends back an error. For example, if an unknown parameter is
  * used, the error can be caught using this event.
  * @event AlgoliaSearchHelper#event:error
- * @property {object} event
- * @property {Error} event.error the error returned by the Algolia.
+ * @property {Error} error the error returned by the Algolia.
  * @example
- * helper.on('error', function(event) {
+ * helper.on('error', function(error) {
  *   console.log('Houston we got a problem.');
  * });
  */
@@ -1408,9 +1407,7 @@ AlgoliaSearchHelper.prototype._search = function (options) {
       .catch(this._dispatchAlgoliaError.bind(this, queryId));
   } catch (error) {
     // If we reach this part, we're in an internal error state
-    this.emit('error', {
-      error: error,
-    });
+    this.emit('error', error);
   }
 
   return undefined;
@@ -1564,9 +1561,7 @@ AlgoliaSearchHelper.prototype._recommend = function () {
       .catch(this._dispatchRecommendError.bind(this, queryId));
   } catch (error) {
     // If we reach this part, we're in an internal error state
-    this.emit('error', {
-      error: error,
-    });
+    this.emit('error', error);
   }
 
   return;
@@ -1732,9 +1727,7 @@ AlgoliaSearchHelper.prototype._dispatchAlgoliaError = function (
   this._currentNbQueries -= queryId - this._lastQueryIdReceived;
   this._lastQueryIdReceived = queryId;
 
-  this.emit('error', {
-    error: error,
-  });
+  this.emit('error', error);
 
   if (this._currentNbQueries === 0) this.emit('searchQueueEmpty');
 };
@@ -1752,9 +1745,7 @@ AlgoliaSearchHelper.prototype._dispatchRecommendError = function (
     queryId - this._lastRecommendQueryIdReceived;
   this._lastRecommendQueryIdReceived = queryId;
 
-  this.emit('error', {
-    error: error,
-  });
+  this.emit('error', error);
 
   if (this._currentNbRecommendQueries === 0) this.emit('recommendQueueEmpty');
 };
diff --git a/packages/algoliasearch-helper/test/integration-spec/helper.distinct.facet.js b/packages/algoliasearch-helper/test/integration-spec/helper.distinct.facet.js
index dd1f1723aa..f586079c14 100644
--- a/packages/algoliasearch-helper/test/integration-spec/helper.distinct.facet.js
+++ b/packages/algoliasearch-helper/test/integration-spec/helper.distinct.facet.js
@@ -31,8 +31,8 @@ test('[INT][FILTERS] Using distinct should let me retrieve all facet without dis
     facets: ['colors'],
   });
 
-  helper.on('error', function (event) {
-    done.fail(event.error);
+  helper.on('error', function (error) {
+    done.fail(error);
   });
 
   helper.on('result', function (event) {
diff --git a/packages/algoliasearch-helper/test/integration-spec/helper.filters.js b/packages/algoliasearch-helper/test/integration-spec/helper.filters.js
index 9d85f1cc4f..393b1287b2 100644
--- a/packages/algoliasearch-helper/test/integration-spec/helper.filters.js
+++ b/packages/algoliasearch-helper/test/integration-spec/helper.filters.js
@@ -32,8 +32,8 @@ test('[INT][FILTERS] Should retrieve different values for multi facetted records
 
   var calls = 0;
 
-  helper.on('error', function (event) {
-    done.fail(event.error);
+  helper.on('error', function (error) {
+    done.fail(error);
   });
 
   helper.on('result', function (event) {
diff --git a/packages/algoliasearch-helper/test/integration-spec/helper.numerics.js b/packages/algoliasearch-helper/test/integration-spec/helper.numerics.js
index fdb92f90b4..96d4be696c 100644
--- a/packages/algoliasearch-helper/test/integration-spec/helper.numerics.js
+++ b/packages/algoliasearch-helper/test/integration-spec/helper.numerics.js
@@ -32,8 +32,8 @@ test('[INT][NUMERICS][RAW-API]Test numeric operations on the helper and their re
 
   var calls = 0;
 
-  helper.on('error', function (event) {
-    done.fail(event.error);
+  helper.on('error', function (error) {
+    done.fail(error);
   });
 
   helper.on('result', function (event) {
@@ -84,8 +84,8 @@ test('[INT][NUMERICS][MANAGED-API]Test numeric operations on the helper and thei
 
   var calls = 0;
 
-  helper.on('error', function (event) {
-    done.fail(event.error);
+  helper.on('error', function (error) {
+    done.fail(error);
   });
 
   helper.on('result', function (event) {
diff --git a/packages/algoliasearch-helper/test/integration-spec/helper.searchOnce.js b/packages/algoliasearch-helper/test/integration-spec/helper.searchOnce.js
index 85cf869e53..f292f56497 100644
--- a/packages/algoliasearch-helper/test/integration-spec/helper.searchOnce.js
+++ b/packages/algoliasearch-helper/test/integration-spec/helper.searchOnce.js
@@ -30,8 +30,8 @@ test('[INT][SEARCHONCE] Should be able to search once with custom parameters wit
   var state0 = helper.state;
 
   var calls = 1;
-  helper.on('error', function (event) {
-    done.fail(event.error);
+  helper.on('error', function (error) {
+    done.fail(error);
   });
 
   helper.on('result', function (event) {
diff --git a/packages/algoliasearch-helper/test/integration-spec/helper.tags.js b/packages/algoliasearch-helper/test/integration-spec/helper.tags.js
index 62bc63ddb9..3337f415db 100644
--- a/packages/algoliasearch-helper/test/integration-spec/helper.tags.js
+++ b/packages/algoliasearch-helper/test/integration-spec/helper.tags.js
@@ -32,8 +32,8 @@ test('[INT][TAGS]Test tags operations on the helper and their results on the alg
 
   var calls = 0;
 
-  helper.on('error', function (event) {
-    done.fail(event.error);
+  helper.on('error', function (error) {
+    done.fail(error);
   });
 
   helper.on('result', function (event) {
diff --git a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/events.js b/packages/algoliasearch-helper/test/spec/algoliasearch.helper/events.js
index 8712e0ae56..6a93fb2ee6 100644
--- a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/events.js
+++ b/packages/algoliasearch-helper/test/spec/algoliasearch.helper/events.js
@@ -356,9 +356,7 @@ test('error event should be emitted once the request is complete with errors', f
 
   return runAllMicroTasks().then(function () {
     expect(errored).toHaveBeenCalledTimes(1);
-    expect(errored).toHaveBeenLastCalledWith({
-      error: expect.any(Error),
-    });
+    expect(errored).toHaveBeenLastCalledWith(expect.any(Error));
   });
 });
 
@@ -381,7 +379,5 @@ test('error event should be emitted if an error happens at request time', functi
   helper.search();
 
   expect(errored).toHaveBeenCalledTimes(1);
-  expect(errored).toHaveBeenLastCalledWith({
-    error: expect.any(Error),
-  });
+  expect(errored).toHaveBeenLastCalledWith(expect.any(Error));
 });
diff --git a/packages/instantsearch-core/src/__tests__/instantsearch-integration.test.ts b/packages/instantsearch-core/src/__tests__/instantsearch-integration.test.ts
index 27ccea5507..d32cc8b082 100644
--- a/packages/instantsearch-core/src/__tests__/instantsearch-integration.test.ts
+++ b/packages/instantsearch-core/src/__tests__/instantsearch-integration.test.ts
@@ -132,14 +132,11 @@ describe('errors', () => {
 
     search.addWidgets([connectSearchBox(() => {})({})]);
 
-    expect.assertions(4);
+    expect.assertions(2);
 
     search.on('error', (error) => {
       expect(error).toBeInstanceOf(Error);
       expect(error.message).toBe('test!');
-
-      expect(error.error).toBeInstanceOf(Error);
-      expect(error.error.message).toBe('test!');
     });
 
     search.start();
diff --git a/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx b/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
index e7681db7c9..8d10700904 100644
--- a/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
+++ b/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
@@ -1108,9 +1108,9 @@ describe('start', () => {
     search.addWidgets([virtualSearchBox({})]);
     search.start();
 
-    search.on('error', (event) => {
+    search.on('error', (error) => {
       expect(searchClient.search).toHaveBeenCalledTimes(1);
-      expect(event.error).toEqual(new Error('SERVER_ERROR'));
+      expect(error).toEqual(new Error('SERVER_ERROR'));
       done();
     });
   });
diff --git a/packages/instantsearch-core/src/instantsearch.ts b/packages/instantsearch-core/src/instantsearch.ts
index 2900e1b22c..6ce217c3ac 100644
--- a/packages/instantsearch-core/src/instantsearch.ts
+++ b/packages/instantsearch-core/src/instantsearch.ts
@@ -425,28 +425,22 @@ See documentation: ${createDocumentationLink({
 
     // Only the "main" Helper emits the `error` event vs the one for `search`
     // and `results` that are also emitted on the derived one.
-    mainHelper.on('error', ({ error }) => {
+    mainHelper.on('error', (error) => {
       if (!(error instanceof Error)) {
         // typescript lies here, error is in some cases { name: string, message: string }
         const err = error as Record<string, any>;
-        error = Object.keys(err).reduce((acc, key) => {
+        this.error = Object.keys(err).reduce((acc, key) => {
           (acc as any)[key] = err[key];
           return acc;
         }, new Error(err.message));
+      } else {
+        this.error = error;
       }
-      // If an error is emitted, it is re-thrown by events. In previous versions
-      // we emitted {error}, which is thrown as:
-      // "Uncaught, unspecified \"error\" event. ([object Object])"
-      // To avoid breaking changes, we make the error available in both
-      // `error` and `error.error`
-      // @MAJOR emit only error
-      (error as any).error = error;
-      this.error = error;
       this.status = 'error';
       this.scheduleRender(false);
 
       // This needs to execute last because it throws the error.
-      this.emit('error', error);
+      this.emit('error', this.error);
     });
 
     this.mainHelper = mainHelper;

From ddaeebb7650c65dc7b12f3bcdfeac04e9388bd98 Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Wed, 18 Dec 2024 10:16:08 +0100
Subject: [PATCH 19/37] fix(core): remove searchMetadata (#6474)

* fix(core): remove searchMetadata

This is redundant with `search.status === 'stalled'`, so all relevant places have been removed:

- rendering no longer sets searchMetadata
- not used in connectSearchBox
- Widgets use `instance.status === 'stalled'` instead

[FX-3196]

BREAKING CHANGE: `searchMetadata` is not exposed on rendering widgets, use `instance.status === 'stalled'` instead.

* !fixup for vue

* !fixup for TS

* !fixup for return of isSearchStalled

* !fixup
---
 .../src/__tests__/instantsearch.test.tsx      | 12 ----
 .../__tests__/connectSearchBox.test.ts        | 60 ++-----------------
 .../src/connectors/connectSearchBox.ts        |  9 ++-
 .../src/lib/public/render-args.ts             |  6 --
 .../instantsearch-core/src/types/widget.ts    |  5 --
 .../widgets/__tests__/index-widget.test.ts    | 33 +++-------
 .../instantsearch-core/test/createWidget.ts   |  6 --
 .../src/widgets/search-box/search-box.tsx     |  4 +-
 .../instantsearch.js/test/createWidget.ts     |  6 --
 .../__tests__/useSearchBox.test.tsx           |  8 +--
 .../src/hooks/__tests__/useConnector.test.tsx |  3 -
 .../src/hooks/useConnector.ts                 |  3 -
 .../src/widgets/SearchBox.tsx                 |  7 ++-
 .../src/components/__tests__/SearchBox.js     | 14 ++---
 .../__tests__/createServerRootMixin.test.js   |  3 -
 .../src/util/createServerRootMixin.js         |  3 -
 16 files changed, 35 insertions(+), 147 deletions(-)

diff --git a/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx b/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
index 8d10700904..d2e2bbecff 100644
--- a/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
+++ b/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
@@ -1658,9 +1658,6 @@ describe('scheduleStalledRender', () => {
     expect(widget.render).toHaveBeenCalledTimes(1);
     expect(widget.render).toHaveBeenLastCalledWith(
       expect.objectContaining({
-        searchMetadata: {
-          isSearchStalled: false,
-        },
         status: 'idle',
       })
     );
@@ -1677,9 +1674,6 @@ describe('scheduleStalledRender', () => {
     expect(widget.render).toHaveBeenCalledTimes(1);
     expect(widget.render).toHaveBeenLastCalledWith(
       expect.objectContaining({
-        searchMetadata: {
-          isSearchStalled: false,
-        },
         status: 'loading',
       })
     );
@@ -1692,9 +1686,6 @@ describe('scheduleStalledRender', () => {
     expect(widget.render).toHaveBeenCalledTimes(1);
     expect(widget.render).toHaveBeenLastCalledWith(
       expect.objectContaining({
-        searchMetadata: {
-          isSearchStalled: true,
-        },
         status: 'stalled',
       })
     );
@@ -1710,9 +1701,6 @@ describe('scheduleStalledRender', () => {
     expect(widget.render).toHaveBeenCalledTimes(1);
     expect(widget.render).toHaveBeenLastCalledWith(
       expect.objectContaining({
-        searchMetadata: {
-          isSearchStalled: false,
-        },
         status: 'idle',
       })
     );
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectSearchBox.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectSearchBox.test.ts
index 2ccf8278a5..7a2f8def7a 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectSearchBox.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectSearchBox.test.ts
@@ -8,7 +8,6 @@ import algoliasearchHelper, {
 } from 'algoliasearch-helper';
 
 import { connectSearchBox, instantsearch } from '../..';
-import { createInstantSearch } from '../../../test/createInstantSearch';
 import {
   createDisposeOptions,
   createInitOptions,
@@ -430,10 +429,10 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/search-box/
 
       expect(renderState1.searchBox).toEqual({
         clear: expect.any(Function),
-        isSearchStalled: false,
         query: '',
         refine: expect.any(Function),
         widgetParams: { queryHook },
+        isSearchStalled: false,
       });
 
       searchBox.init!(createInitOptions());
@@ -442,12 +441,12 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/search-box/
 
       expect(renderState2.searchBox).toEqual({
         clear: renderState1.searchBox.clear,
-        isSearchStalled: false,
         query: '',
         refine: renderState1.searchBox.refine,
         widgetParams: {
           queryHook,
         },
+        isSearchStalled: false,
       });
     });
 
@@ -469,34 +468,10 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/search-box/
 
       expect(renderState.searchBox).toEqual({
         clear: expect.any(Function),
-        isSearchStalled: false,
         query: 'query',
         refine: expect.any(Function),
         widgetParams: {},
-      });
-    });
-
-    test('returns the render state with stalled search', () => {
-      const renderFn = jest.fn();
-      const unmountFn = jest.fn();
-      const createSearchBox = connectSearchBox(renderFn, unmountFn);
-      const searchBox = createSearchBox({});
-
-      searchBox.init!(createInitOptions());
-
-      const renderState = searchBox.getRenderState(
-        {},
-        createRenderOptions({
-          instantSearchInstance: createInstantSearch({ status: 'stalled' }),
-        })
-      );
-
-      expect(renderState.searchBox).toEqual({
-        clear: expect.any(Function),
-        isSearchStalled: true,
-        query: '',
-        refine: expect.any(Function),
-        widgetParams: {},
+        isSearchStalled: false,
       });
     });
   });
@@ -515,10 +490,10 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/search-box/
 
       expect(renderState1).toEqual({
         clear: expect.any(Function),
-        isSearchStalled: false,
         query: '',
         refine: expect.any(Function),
         widgetParams: { queryHook },
+        isSearchStalled: false,
       });
 
       searchBox.init!(createInitOptions());
@@ -527,12 +502,12 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/search-box/
       );
       expect(renderState2).toEqual({
         clear: renderState2.clear,
-        isSearchStalled: false,
         query: '',
         refine: expect.any(Function),
         widgetParams: {
           queryHook,
         },
+        isSearchStalled: false,
       });
 
       searchBox.render!(createRenderOptions());
@@ -559,33 +534,10 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/search-box/
 
       expect(renderState).toEqual({
         clear: expect.any(Function),
-        isSearchStalled: false,
         query: 'query',
         refine: expect.any(Function),
         widgetParams: {},
-      });
-    });
-
-    test('returns the widget render state with stalled search', () => {
-      const renderFn = jest.fn();
-      const unmountFn = jest.fn();
-      const createSearchBox = connectSearchBox(renderFn, unmountFn);
-      const searchBox = createSearchBox({});
-
-      searchBox.init!(createInitOptions());
-
-      const renderState = searchBox.getWidgetRenderState(
-        createRenderOptions({
-          instantSearchInstance: createInstantSearch({ status: 'stalled' }),
-        })
-      );
-
-      expect(renderState).toEqual({
-        clear: expect.any(Function),
-        isSearchStalled: true,
-        query: '',
-        refine: expect.any(Function),
-        widgetParams: {},
+        isSearchStalled: false,
       });
     });
   });
diff --git a/packages/instantsearch-core/src/connectors/connectSearchBox.ts b/packages/instantsearch-core/src/connectors/connectSearchBox.ts
index 4aa121a18a..ea12129320 100644
--- a/packages/instantsearch-core/src/connectors/connectSearchBox.ts
+++ b/packages/instantsearch-core/src/connectors/connectSearchBox.ts
@@ -42,10 +42,8 @@ export type SearchBoxRenderState = {
    */
   clear: () => void;
   /**
-   * `true` if the search results takes more than a certain time to come back
-   * from Algolia servers. This can be configured on the InstantSearch constructor with the attribute
-   * `stalledSearchDelay` which is 200ms, by default.
-   * @deprecated use `instantSearchInstance.status` instead
+   * @deprecated Use `status === 'stalled'` on the instantsearch instance instead.
+   * This can be removed in a future patch version.
    */
   isSearchStalled: boolean;
 };
@@ -130,7 +128,7 @@ export const connectSearchBox: SearchBoxConnector = function connectSearchBox(
         };
       },
 
-      getWidgetRenderState({ helper, instantSearchInstance, state }) {
+      getWidgetRenderState({ helper, state, instantSearchInstance }) {
         if (!_refine) {
           _refine = (query) => {
             queryHook(query, (q) => helper.setQuery(q).search());
@@ -146,6 +144,7 @@ export const connectSearchBox: SearchBoxConnector = function connectSearchBox(
           refine: _refine,
           clear: _clear,
           widgetParams,
+          // This is only exposed because Vue InstantSearch crashes if `instantSearchInstance` is accessed in render
           isSearchStalled: instantSearchInstance.status === 'stalled',
         };
       },
diff --git a/packages/instantsearch-core/src/lib/public/render-args.ts b/packages/instantsearch-core/src/lib/public/render-args.ts
index 557f5a55d1..73f4265aa1 100644
--- a/packages/instantsearch-core/src/lib/public/render-args.ts
+++ b/packages/instantsearch-core/src/lib/public/render-args.ts
@@ -16,9 +16,6 @@ export function createInitArgs(
     renderState: instantSearchInstance.renderState,
     createURL: parent.createURL,
     scopedResults: [],
-    searchMetadata: {
-      isSearchStalled: instantSearchInstance.status === 'stalled',
-    },
     status: instantSearchInstance.status,
     error: instantSearchInstance.error,
   };
@@ -41,9 +38,6 @@ export function createRenderArgs(
     state: results && '_state' in results ? results._state : helper.state,
     renderState: instantSearchInstance.renderState,
     createURL: parent.createURL,
-    searchMetadata: {
-      isSearchStalled: instantSearchInstance.status === 'stalled',
-    },
     status: instantSearchInstance.status,
     error: instantSearchInstance.error,
   };
diff --git a/packages/instantsearch-core/src/types/widget.ts b/packages/instantsearch-core/src/types/widget.ts
index 06d3c4ac65..5791e70ee7 100644
--- a/packages/instantsearch-core/src/types/widget.ts
+++ b/packages/instantsearch-core/src/types/widget.ts
@@ -29,11 +29,6 @@ type SharedRenderOptions = {
   state: SearchParameters;
   renderState: IndexRenderState;
   helper: Helper;
-  /** @deprecated use `status` instead */
-  searchMetadata: {
-    /** @deprecated use `status === "stalled"` instead */
-    isSearchStalled: boolean;
-  };
   status: InstantSearch['status'];
   error: InstantSearch['error'];
   createURL: (
diff --git a/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts b/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts
index 8fb7b73cb3..228a9db564 100644
--- a/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts
+++ b/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts
@@ -344,9 +344,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
             createURL: expect.any(Function),
             scopedResults: [],
             status: instantSearchInstance.status,
-            searchMetadata: {
-              isSearchStalled: instantSearchInstance.status === 'stalled',
-            },
           });
         });
       });
@@ -403,9 +400,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
             createURL: expect.any(Function),
             scopedResults: [],
             status: instantSearchInstance.status,
-            searchMetadata: {
-              isSearchStalled: instantSearchInstance.status === 'stalled',
-            },
           });
         });
 
@@ -1566,9 +1560,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
           createURL: expect.any(Function),
           scopedResults: [],
           status: instantSearchInstance.status,
-          searchMetadata: {
-            isSearchStalled: instantSearchInstance.status === 'stalled',
-          },
         });
       });
     });
@@ -2461,15 +2452,15 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
 
       const searchBox = createSearchBox({
         dependsOn: 'search',
-        getRenderState: jest.fn((renderState, { helper, searchMetadata }) => {
+        getRenderState: jest.fn((renderState, { helper }) => {
           return {
             ...renderState,
             searchBox: {
               query: helper.state.query || '',
               refine: searchBoxRefine,
               clear: searchBoxClear,
-              isSearchStalled: searchMetadata.isSearchStalled,
               widgetParams: {},
+              isSearchStalled: false,
             },
           };
         }),
@@ -2501,8 +2492,8 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
                 query: '',
                 refine: searchBoxRefine,
                 clear: searchBoxClear,
-                isSearchStalled: false,
                 widgetParams: {},
+                isSearchStalled: false,
               },
             },
             indexName1: {
@@ -2510,8 +2501,8 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
                 query: '',
                 refine: searchBoxRefine,
                 clear: searchBoxClear,
-                isSearchStalled: false,
                 widgetParams: {},
+                isSearchStalled: false,
               },
               pagination: {
                 refine: paginationRefine,
@@ -2535,8 +2526,8 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
                 query: '',
                 refine: searchBoxRefine,
                 clear: searchBoxClear,
-                isSearchStalled: false,
                 widgetParams: {},
+                isSearchStalled: false,
               },
             },
             indexName1: {
@@ -2544,8 +2535,8 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
                 query: '',
                 refine: searchBoxRefine,
                 clear: searchBoxClear,
-                isSearchStalled: false,
                 widgetParams: {},
+                isSearchStalled: false,
               },
               pagination: {
                 refine: paginationRefine,
@@ -2578,15 +2569,15 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
       const instantSearchInstance = createInstantSearch({ mainHelper });
       const searchBox = createSearchBox({
         dependsOn: 'search',
-        getRenderState: jest.fn((renderState, { helper, searchMetadata }) => {
+        getRenderState: jest.fn((renderState, { helper }) => {
           return {
             ...renderState,
             searchBox: {
               query: helper.state.query || '',
               refine: () => {},
               clear: () => {},
-              isSearchStalled: searchMetadata.isSearchStalled,
               widgetParams: {},
+              isSearchStalled: false,
             },
           };
         }),
@@ -2633,9 +2624,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
           createURL: expect.any(Function),
           scopedResults: [],
           status: instantSearchInstance.status,
-          searchMetadata: {
-            isSearchStalled: instantSearchInstance.status === 'stalled',
-          },
         })
       );
 
@@ -2644,10 +2632,10 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
         {
           searchBox: {
             clear: expect.any(Function),
-            isSearchStalled: instantSearchInstance.status === 'stalled',
             query: '',
             refine: expect.any(Function),
             widgetParams: {},
+            isSearchStalled: false,
           },
         },
         expect.anything()
@@ -2761,9 +2749,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
           helper: instance.getHelper(),
           createURL: expect.any(Function),
           status: instantSearchInstance.status,
-          searchMetadata: {
-            isSearchStalled: instantSearchInstance.status === 'stalled',
-          },
         });
       });
     });
diff --git a/packages/instantsearch-core/test/createWidget.ts b/packages/instantsearch-core/test/createWidget.ts
index f4326bd0f4..da46a57401 100644
--- a/packages/instantsearch-core/test/createWidget.ts
+++ b/packages/instantsearch-core/test/createWidget.ts
@@ -27,9 +27,6 @@ export const createInitOptions = (
     renderState: instantSearchInstance.renderState,
     scopedResults: [],
     createURL: jest.fn(() => '#'),
-    searchMetadata: {
-      isSearchStalled: false,
-    },
     status: instantSearchInstance.status,
     error: instantSearchInstance.error,
     ...rest,
@@ -74,9 +71,6 @@ export const createRenderOptions = (
         results,
       },
     ],
-    searchMetadata: {
-      isSearchStalled: false,
-    },
     status: instantSearchInstance.status,
     error: instantSearchInstance.error,
     createURL: jest.fn(() => '#'),
diff --git a/packages/instantsearch.js/src/widgets/search-box/search-box.tsx b/packages/instantsearch.js/src/widgets/search-box/search-box.tsx
index 35fb3fe3f2..cf69a79510 100644
--- a/packages/instantsearch.js/src/widgets/search-box/search-box.tsx
+++ b/packages/instantsearch.js/src/widgets/search-box/search-box.tsx
@@ -162,7 +162,7 @@ const renderer =
   ({
     refine,
     query,
-    isSearchStalled,
+    instantSearchInstance,
   }: SearchBoxRenderState & RendererOptions<SearchBoxConnectorParams>) => {
     render(
       <SearchBox
@@ -176,7 +176,7 @@ const renderer =
         showSubmit={showSubmit}
         showReset={showReset}
         showLoadingIndicator={showLoadingIndicator}
-        isSearchStalled={isSearchStalled}
+        isSearchStalled={instantSearchInstance.status === 'stalled'}
         cssClasses={cssClasses}
       />,
       containerNode
diff --git a/packages/instantsearch.js/test/createWidget.ts b/packages/instantsearch.js/test/createWidget.ts
index 9f10e090e4..44bc46cb44 100644
--- a/packages/instantsearch.js/test/createWidget.ts
+++ b/packages/instantsearch.js/test/createWidget.ts
@@ -27,9 +27,6 @@ export const createInitOptions = (
     renderState: instantSearchInstance.renderState,
     scopedResults: [],
     createURL: jest.fn(() => '#'),
-    searchMetadata: {
-      isSearchStalled: false,
-    },
     status: instantSearchInstance.status,
     error: instantSearchInstance.error,
     ...rest,
@@ -74,9 +71,6 @@ export const createRenderOptions = (
         results,
       },
     ],
-    searchMetadata: {
-      isSearchStalled: false,
-    },
     status: instantSearchInstance.status,
     error: instantSearchInstance.error,
     createURL: jest.fn(() => '#'),
diff --git a/packages/react-instantsearch-core/src/connectors/__tests__/useSearchBox.test.tsx b/packages/react-instantsearch-core/src/connectors/__tests__/useSearchBox.test.tsx
index d92cd5574c..8c86ca77f3 100644
--- a/packages/react-instantsearch-core/src/connectors/__tests__/useSearchBox.test.tsx
+++ b/packages/react-instantsearch-core/src/connectors/__tests__/useSearchBox.test.tsx
@@ -17,18 +17,18 @@ describe('useSearchBox', () => {
     // Initial render state from manual `getWidgetRenderState`
     expect(result.current).toEqual({
       query: '',
-      isSearchStalled: false,
       clear: expect.any(Function),
       refine: expect.any(Function),
+      isSearchStalled: false,
     });
 
     await waitFor(() => {
       // InstantSearch.js state from the `render` lifecycle step
       expect(result.current).toEqual({
         query: '',
-        isSearchStalled: false,
         clear: expect.any(Function),
         refine: expect.any(Function),
+        isSearchStalled: false,
       });
     });
   });
@@ -48,18 +48,18 @@ describe('useSearchBox', () => {
     // Initial render state from manual `getWidgetRenderState`
     expect(result.current).toEqual({
       query: 'testio',
-      isSearchStalled: false,
       clear: expect.any(Function),
       refine: expect.any(Function),
+      isSearchStalled: false,
     });
 
     await waitFor(() => {
       // InstantSearch.js state from the `render` lifecycle step
       expect(result.current).toEqual({
         query: 'testio',
-        isSearchStalled: false,
         clear: expect.any(Function),
         refine: expect.any(Function),
+        isSearchStalled: false,
       });
     });
   });
diff --git a/packages/react-instantsearch-core/src/hooks/__tests__/useConnector.test.tsx b/packages/react-instantsearch-core/src/hooks/__tests__/useConnector.test.tsx
index 2cd107ea3d..c2988824cc 100644
--- a/packages/react-instantsearch-core/src/hooks/__tests__/useConnector.test.tsx
+++ b/packages/react-instantsearch-core/src/hooks/__tests__/useConnector.test.tsx
@@ -386,9 +386,6 @@ describe('useConnector', () => {
       state: helperState,
       renderState: searchContext.current!.renderState,
       createURL: indexContext.current!.createURL,
-      searchMetadata: {
-        isSearchStalled: false,
-      },
       status: 'idle',
       error: undefined,
     });
diff --git a/packages/react-instantsearch-core/src/hooks/useConnector.ts b/packages/react-instantsearch-core/src/hooks/useConnector.ts
index 4ca5aa8731..ff5b2af2b0 100644
--- a/packages/react-instantsearch-core/src/hooks/useConnector.ts
+++ b/packages/react-instantsearch-core/src/hooks/useConnector.ts
@@ -130,9 +130,6 @@ export function useConnector<
         state: helper.state,
         renderState: search.renderState,
         createURL: parentIndex.createURL,
-        searchMetadata: {
-          isSearchStalled: search.status === 'stalled',
-        },
         status: search.status,
         error: search.error,
       });
diff --git a/packages/react-instantsearch/src/widgets/SearchBox.tsx b/packages/react-instantsearch/src/widgets/SearchBox.tsx
index e18b94ff08..f33d81a342 100644
--- a/packages/react-instantsearch/src/widgets/SearchBox.tsx
+++ b/packages/react-instantsearch/src/widgets/SearchBox.tsx
@@ -1,5 +1,5 @@
 import React, { useRef, useState } from 'react';
-import { useSearchBox } from 'react-instantsearch-core';
+import { useInstantSearch, useSearchBox } from 'react-instantsearch-core';
 
 import { SearchBox as SearchBoxUiComponent } from '../ui/SearchBox';
 
@@ -44,7 +44,8 @@ export function SearchBox({
   translations,
   ...props
 }: SearchBoxProps) {
-  const { query, refine, isSearchStalled } = useSearchBox(
+  const { status } = useInstantSearch();
+  const { query, refine } = useSearchBox(
     { queryHook },
     { $$widgetType: 'ais.searchBox' }
   );
@@ -96,7 +97,7 @@ export function SearchBox({
 
   const uiProps: UiProps = {
     inputRef,
-    isSearchStalled,
+    isSearchStalled: status === 'stalled',
     onChange,
     onReset,
     onSubmit,
diff --git a/packages/vue-instantsearch/src/components/__tests__/SearchBox.js b/packages/vue-instantsearch/src/components/__tests__/SearchBox.js
index 02cd2f9097..e30b756670 100644
--- a/packages/vue-instantsearch/src/components/__tests__/SearchBox.js
+++ b/packages/vue-instantsearch/src/components/__tests__/SearchBox.js
@@ -8,7 +8,9 @@ import SearchBox from '../SearchBox.vue';
 jest.mock('../../mixins/widget');
 import '../../../test/utils/sortedHtmlSerializer';
 
-const defaultState = {};
+const defaultState = {
+  isSearchStalled: false,
+};
 
 test('with submit title', () => {
   __setState(defaultState);
@@ -50,13 +52,11 @@ test('with stalled search but no `showLoadingIndicator` displays the submit and
 });
 
 test('with not stalled search displays the submit and hides reset, loader', () => {
-  __setState(defaultState);
+  __setState({ ...defaultState, isSearchStalled: false });
   const wrapper = mount(SearchBox);
 
   expect(wrapper.find('.ais-SearchBox-submit')).not.vueToBeHidden();
-
   expect(wrapper.find('.ais-SearchBox-reset')).vueToBeHidden();
-
   expect(wrapper.find('.ais-SearchBox-loadingIndicator')).vueToBeHidden();
 });
 
@@ -97,10 +97,8 @@ test('keep local query when out of sync and input is focused', async () => {
 });
 
 test('overriding slots', () => {
-  __setState({
-    ...defaultState,
-    isSearchStalled: true,
-  });
+  __setState({ ...defaultState, isSearchStalled: true });
+
   const wrapper = mount({
     components: { SearchBox },
     data() {
diff --git a/packages/vue-instantsearch/src/util/__tests__/createServerRootMixin.test.js b/packages/vue-instantsearch/src/util/__tests__/createServerRootMixin.test.js
index 119ea289a1..70b4d57cda 100644
--- a/packages/vue-instantsearch/src/util/__tests__/createServerRootMixin.test.js
+++ b/packages/vue-instantsearch/src/util/__tests__/createServerRootMixin.test.js
@@ -1146,9 +1146,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/instantsear
               "results": Anything,
             },
           ],
-          "searchMetadata": {
-            "isSearchStalled": false,
-          },
           "state": Anything,
         }
       `
diff --git a/packages/vue-instantsearch/src/util/createServerRootMixin.js b/packages/vue-instantsearch/src/util/createServerRootMixin.js
index bca2b21c6c..1eddf5eb0c 100644
--- a/packages/vue-instantsearch/src/util/createServerRootMixin.js
+++ b/packages/vue-instantsearch/src/util/createServerRootMixin.js
@@ -168,9 +168,6 @@ function augmentInstantSearch(instantSearchOptions, cloneComponent) {
       state,
       createURL: parent.createURL,
       instantSearchInstance: search,
-      searchMetadata: {
-        isSearchStalled: false,
-      },
     });
   };
 

From ee3f7ef0b8bfb83a29b18b98d9f6cfa13c57281d Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Wed, 18 Dec 2024 14:14:22 +0100
Subject: [PATCH 20/37] feat(index): remove getWidgetState (#6476)

The old method has long been deprecated and has no usage inside instantsearch outside of running a warning.

The warning on adding a widget with getWidgetState is still present, but slightly reworded.

[FX-3197]

BREAKING CHANGE: rename getWidgetState to getWidgetUiState in your custom widgets or connectors.
---
 .../instantsearch-core/src/types/widget.ts    | 17 +---
 .../widgets/__tests__/index-widget.test.ts    | 89 -------------------
 .../src/widgets/index-widget.ts               | 23 +----
 .../__tests__/createServerRootMixin.test.js   | 11 ++-
 4 files changed, 9 insertions(+), 131 deletions(-)

diff --git a/packages/instantsearch-core/src/types/widget.ts b/packages/instantsearch-core/src/types/widget.ts
index 5791e70ee7..131de32bae 100644
--- a/packages/instantsearch-core/src/types/widget.ts
+++ b/packages/instantsearch-core/src/types/widget.ts
@@ -246,17 +246,6 @@ type RequiredUiStateLifeCycle<TWidgetDescription extends WidgetDescription> = {
     }
   ) => Partial<IndexUiState & TWidgetDescription['indexUiState']>;
 
-  /**
-   * This function is required for a widget to be taken in account for routing.
-   * It will derive a uiState for this widget based on the existing uiState and
-   * the search parameters applied.
-   *
-   * @deprecated Use `getWidgetUiState` instead.
-   * @param uiState - Current state.
-   * @param widgetStateOptions - Extra information to calculate uiState.
-   */
-  getWidgetState?: RequiredUiStateLifeCycle<TWidgetDescription>['getWidgetUiState'];
-
   /**
    * This function is required for a widget to behave correctly when a URL is
    * loaded via e.g. Routing. It receives the current UiState and applied search
@@ -330,7 +319,7 @@ export type Widget<
 
 export type IndexWidget<TUiState extends UiState = UiState> = Omit<
   Widget<IndexWidgetDescription & { widgetParams: IndexWidgetParams }>,
-  'getWidgetUiState' | 'getWidgetState'
+  'getWidgetUiState'
 > & {
   // public API
   addWidgets: (widgets: Array<Widget | IndexWidget>) => IndexWidget;
@@ -371,10 +360,6 @@ export type IndexWidget<TUiState extends UiState = UiState> = Omit<
   init: (options: IndexInitOptions) => void;
   render: (options: IndexRenderOptions) => void;
   dispose: (options?: DisposeOptions) => void;
-  /**
-   * @deprecated
-   */
-  getWidgetState: (uiState: UiState) => UiState;
   getWidgetUiState: <TSpecificUiState extends UiState = TUiState>(
     uiState: TSpecificUiState
   ) => TSpecificUiState;
diff --git a/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts b/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts
index 228a9db564..48ea187006 100644
--- a/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts
+++ b/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts
@@ -29,7 +29,6 @@ import {
   createIndexInitOptions,
   createDisposeOptions,
 } from '../../../test/createWidget';
-import { warnCache } from '../../lib/public';
 
 import type { Widget } from '../../types';
 import type { PlainSearchParameters } from 'algoliasearch-helper';
@@ -3231,94 +3230,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
     });
   });
 
-  describe('getWidgetState', () => {
-    test('warns when index has this method', () => {
-      warnCache.current = {};
-
-      const instance = index({ indexName: 'indexName' });
-
-      expect(() => {
-        instance.getWidgetState({});
-      }).toWarnDev(
-        '[InstantSearch]: The `getWidgetState` method is renamed `getWidgetUiState` and will no longer exist under that name in InstantSearch.js 5.x. Please use `getWidgetUiState` instead.'
-      );
-    });
-
-    test('warns when widget has this method', () => {
-      warnCache.current = {};
-
-      const createDeprecatedSearchBox = (args: Partial<Widget> = {}): Widget =>
-        createWidget({
-          dispose: jest.fn(({ state }) => {
-            return state.setQueryParameter('query', undefined);
-          }),
-          getWidgetState: jest.fn((uiState, { searchParameters }) => {
-            if (!searchParameters.query) {
-              return uiState;
-            }
-
-            return {
-              ...uiState,
-              query: searchParameters.query,
-            };
-          }),
-          getWidgetSearchParameters: jest.fn(
-            (searchParameters, { uiState }) => {
-              return searchParameters.setQueryParameter(
-                'query',
-                uiState.query || ''
-              );
-            }
-          ),
-          ...args,
-        });
-
-      const instance = index({ indexName: 'indexName' });
-      const searchClient = createSearchClient();
-      const mainHelper = algoliasearchHelper(searchClient, '', {});
-      const instantSearchInstance = createInstantSearch({
-        mainHelper,
-      });
-
-      instance.addWidgets([createDeprecatedSearchBox()]);
-
-      expect(() => {
-        instance.init(
-          createIndexInitOptions({
-            instantSearchInstance,
-            parent: null,
-          })
-        );
-      }).toWarnDev(
-        '[InstantSearch]: The `getWidgetState` method is renamed `getWidgetUiState` and will no longer exist under that name in InstantSearch.js 5.x. Please use `getWidgetUiState` instead.'
-      );
-    });
-
-    test('does not warn for index itself', () => {
-      warnCache.current = {};
-
-      const instance = index({ indexName: 'indexName' });
-      const searchClient = createSearchClient();
-      const mainHelper = algoliasearchHelper(searchClient, '', {});
-      const instantSearchInstance = createInstantSearch({
-        mainHelper,
-      });
-
-      instance.addWidgets([index({ indexName: 'other' })]);
-
-      expect(() => {
-        instance.init(
-          createIndexInitOptions({
-            instantSearchInstance,
-            parent: null,
-          })
-        );
-      }).not.toWarnDev(
-        '[InstantSearch]: The `getWidgetState` method is renamed `getWidgetUiState` and will no longer exist under that name in InstantSearch.js 5.x. Please use `getWidgetUiState` instead.'
-      );
-    });
-  });
-
   describe('setIndexUiState', () => {
     it('updates main UI state with an object', () => {
       const instance = index({ indexName: 'indexName' });
diff --git a/packages/instantsearch-core/src/widgets/index-widget.ts b/packages/instantsearch-core/src/widgets/index-widget.ts
index bcabd94be5..6251e44086 100644
--- a/packages/instantsearch-core/src/widgets/index-widget.ts
+++ b/packages/instantsearch-core/src/widgets/index-widget.ts
@@ -3,7 +3,6 @@ import algoliasearchHelper from 'algoliasearch-helper';
 import {
   addWidgetId,
   createDocumentationMessageGenerator,
-  warning,
   isIndexWidget,
   createInitArgs,
   createRenderArgs,
@@ -120,15 +119,11 @@ function getLocalWidgetsUiState(
       return uiState;
     }
 
-    if (!widget.getWidgetUiState && !widget.getWidgetState) {
-      return uiState;
-    }
-
     if (widget.getWidgetUiState) {
       return widget.getWidgetUiState(uiState, widgetStateOptions);
     }
 
-    return widget.getWidgetState!(uiState, widgetStateOptions);
+    return uiState;
   }, initialUiState);
 }
 
@@ -685,13 +680,6 @@ export const index = (widgetParams: IndexWidgetParams): IndexWidget => {
       });
 
       localWidgets.forEach((widget) => {
-        warning(
-          // if it has NO getWidgetState or if it has getWidgetUiState, we don't warn
-          // aka we warn if there's _only_ getWidgetState
-          !widget.getWidgetState || Boolean(widget.getWidgetUiState),
-          'The `getWidgetState` method is renamed `getWidgetUiState` and will no longer exist under that name in InstantSearch.js 5.x. Please use `getWidgetUiState` instead.'
-        );
-
         if (widget.init) {
           widget.init(createInitArgs(instantSearchInstance, this, uiState));
         }
@@ -847,15 +835,6 @@ export const index = (widgetParams: IndexWidgetParams): IndexWidget => {
         );
     },
 
-    getWidgetState(uiState: UiState) {
-      warning(
-        false,
-        'The `getWidgetState` method is renamed `getWidgetUiState` and will no longer exist under that name in InstantSearch.js 5.x. Please use `getWidgetUiState` instead.'
-      );
-
-      return this.getWidgetUiState(uiState);
-    },
-
     getWidgetSearchParameters(searchParameters, { uiState }) {
       return getLocalWidgetsSearchParameters(localWidgets, {
         uiState,
diff --git a/packages/vue-instantsearch/src/util/__tests__/createServerRootMixin.test.js b/packages/vue-instantsearch/src/util/__tests__/createServerRootMixin.test.js
index 70b4d57cda..938c961b65 100644
--- a/packages/vue-instantsearch/src/util/__tests__/createServerRootMixin.test.js
+++ b/packages/vue-instantsearch/src/util/__tests__/createServerRootMixin.test.js
@@ -1237,7 +1237,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/instantsear
         expect(renderArgs.createURL()).toBe('#');
       });
 
-      it('allows for widgets without getWidgetState', () => {
+      it('allows for widgets without getWidgetUiState', () => {
         let instantSearchInstance;
         mount({
           mixins: [
@@ -1255,12 +1255,12 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/instantsear
         const widget = {
           init: jest.fn(),
           render: jest.fn(),
-          getWidgetState(uiState) {
+          getWidgetUiState(uiState) {
             return uiState;
           },
         };
 
-        const widgetWithoutGetWidgetState = {
+        const widgetWithoutGetWidgetUiState = {
           init: jest.fn(),
           render: jest.fn(),
         };
@@ -1269,7 +1269,10 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/instantsear
           lol: createSerializedState(),
         });
 
-        instantSearchInstance.addWidgets([widget, widgetWithoutGetWidgetState]);
+        instantSearchInstance.addWidgets([
+          widget,
+          widgetWithoutGetWidgetUiState,
+        ]);
 
         instantSearchInstance.__forceRender(
           widget,

From d344104940c9b9d68ac8e3ef6d9ed3b3fd18aa27 Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Fri, 20 Dec 2024 09:07:25 +0100
Subject: [PATCH 21/37] feat(routing): replace getLocation with getCurrentURL
 (#6477)

getCurrentURL is the alternative of getLocation in the history router. This is changed as it's possible to create a URL out of a string, but not a location. We also don't use any properties of the location that aren't also present in a URL.

[FX-3191]

BREAKING CHANGE: change from `getLocation` to `getCurrentURL`, and return a URL object.
BREAKING CHANGE: createURL createURL now receives `currentURL` instead of `location`
BREAKING CHANGE: parseURL createURL now receives `currentURL` instead of `location`
---
 examples/js/e-commerce-umd/src/routing.ts     | 14 +++--
 examples/js/e-commerce/src/routing.ts         | 14 +++--
 examples/react/e-commerce/routing.ts          | 14 +++--
 examples/react/ssr/src/App.js                 |  8 +--
 examples/react/ssr/src/server.js              |  6 +-
 examples/vue/e-commerce/src/routing.js        | 14 +++--
 .../src/__tests__/RoutingManager.test.ts      |  4 +-
 .../routing/__tests__/historyRouter.test.ts   | 58 +++++++----------
 .../src/routing/historyRouter.ts              | 62 +++++++++----------
 .../__tests__/InstantSearch.test.tsx          | 10 ++-
 .../InstantSearchSSRProvider.test.tsx         |  6 +-
 .../src/useInstantSearchRouting.ts            |  8 +--
 .../src/index.ts                              |  4 +-
 13 files changed, 103 insertions(+), 119 deletions(-)

diff --git a/examples/js/e-commerce-umd/src/routing.ts b/examples/js/e-commerce-umd/src/routing.ts
index eadeb5dd02..d8d2eb248c 100644
--- a/examples/js/e-commerce-umd/src/routing.ts
+++ b/examples/js/e-commerce-umd/src/routing.ts
@@ -89,10 +89,10 @@ const router = window.instantsearch.routers.history<RouteState>({
       .join(' | ');
   },
 
-  createURL({ qsModule, routeState, location }): string {
-    const { protocol, hostname, port = '', pathname, hash } = location;
+  createURL({ qsModule, routeState, currentURL }): string {
+    const { protocol, hostname, port = '', pathname, hash } = currentURL;
     const portWithPrefix = port === '' ? '' : `:${port}`;
-    const urlParts = location.href.match(/^(.*?)\/search/);
+    const urlParts = currentURL.href.match(/^(.*?)\/search/);
     const baseUrl =
       (urlParts && urlParts[0]) ||
       `${protocol}//${hostname}${portWithPrefix}${pathname}search`;
@@ -156,12 +156,14 @@ const router = window.instantsearch.routers.history<RouteState>({
     return `${baseUrl}/${categoryPath}${queryString}${hash}`;
   },
 
-  parseURL({ qsModule, location }): RouteState {
-    const pathnameMatches = location.pathname.match(/search\/(.*?)\/?$/);
+  parseURL({ qsModule, currentURL }): RouteState {
+    const pathnameMatches = currentURL.pathname.match(/search\/(.*?)\/?$/);
     const category = getCategoryName(
       (pathnameMatches && pathnameMatches[1]) || ''
     );
-    const queryParameters = qsModule.parse(location.search.slice(1));
+    const queryParameters = qsModule.parse(currentURL.search, {
+      ignoreQueryPrefix: true,
+    });
     const {
       query = '',
       page = 1,
diff --git a/examples/js/e-commerce/src/routing.ts b/examples/js/e-commerce/src/routing.ts
index 5598133508..dcc681e605 100644
--- a/examples/js/e-commerce/src/routing.ts
+++ b/examples/js/e-commerce/src/routing.ts
@@ -91,10 +91,10 @@ const router = historyRouter<RouteState>({
       .join(' | ');
   },
 
-  createURL({ qsModule, routeState, location }): string {
-    const { protocol, hostname, port = '', pathname, hash } = location;
+  createURL({ qsModule, routeState, currentURL }): string {
+    const { protocol, hostname, port = '', pathname, hash } = currentURL;
     const portWithPrefix = port === '' ? '' : `:${port}`;
-    const urlParts = location.href.match(/^(.*?)\/search/);
+    const urlParts = currentURL.href.match(/^(.*?)\/search/);
     const baseUrl =
       (urlParts && urlParts[0]) ||
       `${protocol}//${hostname}${portWithPrefix}${pathname}search`;
@@ -158,12 +158,14 @@ const router = historyRouter<RouteState>({
     return `${baseUrl}/${categoryPath}${queryString}${hash}`;
   },
 
-  parseURL({ qsModule, location }): RouteState {
-    const pathnameMatches = location.pathname.match(/search\/(.*?)\/?$/);
+  parseURL({ qsModule, currentURL }): RouteState {
+    const pathnameMatches = currentURL.pathname.match(/search\/(.*?)\/?$/);
     const category = getCategoryName(
       (pathnameMatches && pathnameMatches[1]) || ''
     );
-    const queryParameters = qsModule.parse(location.search.slice(1));
+    const queryParameters = qsModule.parse(currentURL.search, {
+      ignoreQueryPrefix: true,
+    });
     const {
       query = '',
       page = 1,
diff --git a/examples/react/e-commerce/routing.ts b/examples/react/e-commerce/routing.ts
index 0cd7e8e28f..38caee3149 100644
--- a/examples/react/e-commerce/routing.ts
+++ b/examples/react/e-commerce/routing.ts
@@ -85,10 +85,10 @@ const router = historyRouter<RouteState>({
       .join(' | ');
   },
 
-  createURL({ qsModule, routeState, location }): string {
-    const { protocol, hostname, port = '', pathname, hash } = location;
+  createURL({ qsModule, routeState, currentURL }): string {
+    const { protocol, hostname, port = '', pathname, hash } = currentURL;
     const portWithPrefix = port === '' ? '' : `:${port}`;
-    const urlParts = location.href.match(/^(.*?)\/search/);
+    const urlParts = currentURL.href.match(/^(.*?)\/search/);
     const baseUrl =
       (urlParts && urlParts[0]) ||
       `${protocol}//${hostname}${portWithPrefix}${pathname}search`;
@@ -152,13 +152,15 @@ const router = historyRouter<RouteState>({
     return `${baseUrl}/${categoryPath}${queryString}${hash}`;
   },
 
-  parseURL({ qsModule, location }): RouteState {
-    const pathnameMatches = location.pathname.match(/search\/(.*?)\/?$/);
+  parseURL({ qsModule, currentURL }): RouteState {
+    const pathnameMatches = currentURL.pathname.match(/search\/(.*?)\/?$/);
     const category = getCategoryName(
       (pathnameMatches && pathnameMatches[1]) || ''
     );
 
-    const queryParameters = qsModule.parse(location.search.slice(1));
+    const queryParameters = qsModule.parse(currentURL.search, {
+      ignoreQueryPrefix: true,
+    });
     const {
       query = '',
       page = 1,
diff --git a/examples/react/ssr/src/App.js b/examples/react/ssr/src/App.js
index bcdba14b30..3fb8561c37 100644
--- a/examples/react/ssr/src/App.js
+++ b/examples/react/ssr/src/App.js
@@ -21,7 +21,7 @@ function Hit({ hit }) {
   return <Highlight hit={hit} attribute="name" />;
 }
 
-function App({ serverState, location }) {
+function App({ serverState, currentURL }) {
   return (
     <InstantSearchSSRProvider {...serverState}>
       <InstantSearch
@@ -31,12 +31,12 @@ function App({ serverState, location }) {
           stateMapping: simple(),
           router: history({
             cleanUrlOnDispose: false,
-            getLocation() {
+            getCurrentURL() {
               if (typeof window === 'undefined') {
-                return location;
+                return currentURL;
               }
 
-              return window.location;
+              return new URL(window.location.href);
             },
           }),
         }}
diff --git a/examples/react/ssr/src/server.js b/examples/react/ssr/src/server.js
index 78403c8850..8f54bcf05b 100644
--- a/examples/react/ssr/src/server.js
+++ b/examples/react/ssr/src/server.js
@@ -13,15 +13,15 @@ const app = express();
 app.use('/assets', express.static(join(__dirname, 'assets')));
 
 app.get('/', async (req, res) => {
-  const location = new URL(
+  const currentURL = new URL(
     `${req.protocol}://${req.get('host')}${req.originalUrl}`
   );
-  const serverState = await getServerState(<App location={location} />, {
+  const serverState = await getServerState(<App currentURL={currentURL} />, {
     renderToString,
   });
   requestsCache.clear();
   const html = renderToString(
-    <App serverState={serverState} location={location} />
+    <App serverState={serverState} currentURL={currentURL} />
   );
 
   res.send(
diff --git a/examples/vue/e-commerce/src/routing.js b/examples/vue/e-commerce/src/routing.js
index fa91f7f9c5..6ed99129ab 100644
--- a/examples/vue/e-commerce/src/routing.js
+++ b/examples/vue/e-commerce/src/routing.js
@@ -96,10 +96,10 @@ const router = historyRouter({
       .join(' | ');
   },
 
-  createURL({ qsModule, routeState, location }) {
-    const { protocol, hostname, port = '', pathname, hash } = location;
+  createURL({ qsModule, routeState, currentURL }) {
+    const { protocol, hostname, port = '', pathname, hash } = currentURL;
     const portWithPrefix = port === '' ? '' : `:${port}`;
-    const urlParts = location.href.match(/^(.*?)\/search/);
+    const urlParts = currentURL.href.match(/^(.*?)\/search/);
     const baseUrl =
       (urlParts && urlParts[0]) ||
       `${protocol}//${hostname}${portWithPrefix}${pathname}search`;
@@ -163,12 +163,14 @@ const router = historyRouter({
     return `${baseUrl}/${categoryPath}${queryString}${hash}`;
   },
 
-  parseURL({ qsModule, location }) {
-    const pathnameMatches = location.pathname.match(/search\/(.*?)\/?$/);
+  parseURL({ qsModule, currentURL }) {
+    const pathnameMatches = currentURL.pathname.match(/search\/(.*?)\/?$/);
     const category = getCategoryName(
       (pathnameMatches && pathnameMatches[1]) || ''
     );
-    const queryParameters = qsModule.parse(location.search.slice(1));
+    const queryParameters = qsModule.parse(currentURL.search, {
+      ignoreQueryPrefix: true,
+    });
     const {
       query = '',
       page = 1,
diff --git a/packages/instantsearch-core/src/__tests__/RoutingManager.test.ts b/packages/instantsearch-core/src/__tests__/RoutingManager.test.ts
index 4dcd5356f5..df91c4c5bb 100644
--- a/packages/instantsearch-core/src/__tests__/RoutingManager.test.ts
+++ b/packages/instantsearch-core/src/__tests__/RoutingManager.test.ts
@@ -580,7 +580,7 @@ describe('RoutingManager', () => {
       // In a next refactor, we can consider changing this test implementation.
       const parsedUrl = router.parseURL({
         qsModule: qs,
-        location: window.location,
+        currentURL: new URL(window.location.href),
       });
 
       expect(parsedUrl.refinementList!.brand).toBeInstanceOf(Array);
@@ -627,7 +627,7 @@ describe('RoutingManager', () => {
       // In a next refactor, we can consider changing this test implementation.
       const parsedUrl = router.parseURL({
         qsModule: qs,
-        location: window.location,
+        currentURL: new URL(window.location.href),
       });
 
       expect(parsedUrl.refinementList!.brand).toBeInstanceOf(Array);
diff --git a/packages/instantsearch-core/src/routing/__tests__/historyRouter.test.ts b/packages/instantsearch-core/src/routing/__tests__/historyRouter.test.ts
index b727dd97a3..2c1bee0317 100644
--- a/packages/instantsearch-core/src/routing/__tests__/historyRouter.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/historyRouter.test.ts
@@ -80,50 +80,50 @@ describe('life cycle', () => {
     });
   });
 
-  describe('getLocation', () => {
-    test('calls getLocation on windowTitle', () => {
-      const getLocation = jest.fn(() => window.location);
+  describe('getCurrentURL', () => {
+    test('calls getCurrentURL on windowTitle', () => {
+      const getCurrentURL = jest.fn(() => new URL(window.location.href));
 
       historyRouter<UiState>({
         windowTitle() {
           return 'Search';
         },
-        getLocation,
+        getCurrentURL,
         cleanUrlOnDispose: true,
       });
 
-      expect(getLocation).toHaveBeenCalledTimes(1);
+      expect(getCurrentURL).toHaveBeenCalledTimes(1);
     });
 
-    test('calls getLocation on read', () => {
-      const getLocation = jest.fn(() => window.location);
+    test('calls getCurrentURL on read', () => {
+      const getCurrentURL = jest.fn(() => new URL(window.location.href));
       const router = historyRouter<UiState>({
-        getLocation,
+        getCurrentURL,
         cleanUrlOnDispose: true,
       });
 
-      expect(getLocation).toHaveBeenCalledTimes(0);
+      expect(getCurrentURL).toHaveBeenCalledTimes(0);
 
       router.write({ indexName: { query: 'query1' } });
       jest.runAllTimers();
 
-      expect(getLocation).toHaveBeenCalledTimes(1);
+      expect(getCurrentURL).toHaveBeenCalledTimes(1);
 
       router.read();
 
-      expect(getLocation).toHaveBeenCalledTimes(2);
+      expect(getCurrentURL).toHaveBeenCalledTimes(2);
     });
 
-    test('calls getLocation on createURL', () => {
-      const getLocation = jest.fn(() => window.location);
+    test('calls getCurrentURL on createURL', () => {
+      const getCurrentURL = jest.fn(() => new URL(window.location.href));
       const router = historyRouter<UiState>({
-        getLocation,
+        getCurrentURL,
         cleanUrlOnDispose: true,
       });
 
       router.createURL({ indexName: { query: 'query1' } });
 
-      expect(getLocation).toHaveBeenCalledTimes(1);
+      expect(getCurrentURL).toHaveBeenCalledTimes(1);
     });
   });
 
@@ -188,25 +188,18 @@ describe('life cycle', () => {
         search.start();
         jest.runAllTimers();
       }).toThrowErrorMatchingInlineSnapshot(
-        `"You need to provide \`getLocation\` to the \`history\` router in environments where \`window\` does not exist."`
+        `"You need to provide \`getCurrentURL\` to the \`history\` router in environments where \`window\` does not exist."`
       );
     });
 
-    test('does not fail on environments without window with provided getLocation', () => {
+    test('does not fail on environments without window with provided getCurrentURL', () => {
       // @ts-expect-error
       delete global.window;
 
       expect(() => {
         const router = historyRouter<UiState>({
-          getLocation() {
-            return {
-              protocol: '',
-              hostname: '',
-              port: '',
-              pathname: '',
-              hash: '',
-              search: '',
-            } as unknown as Location;
+          getCurrentURL() {
+            return new URL('http://localhost/');
           },
           cleanUrlOnDispose: true,
         });
@@ -224,21 +217,14 @@ describe('life cycle', () => {
       }).not.toThrow();
     });
 
-    test('does not fail when running the whole router lifecycle with getLocation', () => {
+    test('does not fail when running the whole router lifecycle with getCurrentURL', () => {
       // @ts-expect-error
       delete global.window;
 
       expect(() => {
         const router = historyRouter<UiState>({
-          getLocation() {
-            return {
-              protocol: '',
-              hostname: '',
-              port: '',
-              pathname: '',
-              hash: '',
-              search: '',
-            } as unknown as Location;
+          getCurrentURL() {
+            return new URL('http://localhost/');
           },
           cleanUrlOnDispose: true,
         });
diff --git a/packages/instantsearch-core/src/routing/historyRouter.ts b/packages/instantsearch-core/src/routing/historyRouter.ts
index 7ae0978ca8..0f2408b705 100644
--- a/packages/instantsearch-core/src/routing/historyRouter.ts
+++ b/packages/instantsearch-core/src/routing/historyRouter.ts
@@ -11,12 +11,12 @@ import type { Router, UiState } from '../types';
 type CreateURL<TRouteState> = (args: {
   qsModule: typeof qs;
   routeState: TRouteState;
-  location: Location;
+  currentURL: URL;
 }) => string;
 
 type ParseURL<TRouteState> = (args: {
   qsModule: typeof qs;
-  location: Location;
+  currentURL: URL;
 }) => TRouteState;
 
 export type BrowserHistoryArgs<TRouteState> = {
@@ -24,10 +24,7 @@ export type BrowserHistoryArgs<TRouteState> = {
   writeDelay: number;
   createURL: CreateURL<TRouteState>;
   parseURL: ParseURL<TRouteState>;
-  // @MAJOR: The `Location` type is hard to simulate in non-browser environments
-  // so we should accept a subset of it that is easier to work with in any
-  // environments.
-  getLocation: () => Location;
+  getCurrentURL: () => URL;
   start?: (onUpdate: () => void) => void;
   dispose?: () => void;
   push?: (url: string) => void;
@@ -81,11 +78,11 @@ class BrowserHistory<TRouteState> implements Router<TRouteState> {
   >['parseURL'];
   /**
    * Returns the location to store in the history.
-   * @default () => window.location
+   * @default () => new URL(window.location.href)
    */
-  private readonly getLocation: Required<
+  private readonly getCurrentURL: Required<
     BrowserHistoryArgs<TRouteState>
-  >['getLocation'];
+  >['getCurrentURL'];
 
   private writeTimer?: ReturnType<typeof setTimeout>;
   private _onPopState?: (event: PopStateEvent) => void;
@@ -122,7 +119,7 @@ class BrowserHistory<TRouteState> implements Router<TRouteState> {
     writeDelay = 400,
     createURL,
     parseURL,
-    getLocation,
+    getCurrentURL,
     start,
     dispose,
     push,
@@ -133,7 +130,7 @@ class BrowserHistory<TRouteState> implements Router<TRouteState> {
     this.writeDelay = writeDelay;
     this._createURL = createURL;
     this.parseURL = parseURL;
-    this.getLocation = getLocation;
+    this.getCurrentURL = getCurrentURL;
     this._start = start;
     this._dispose = dispose;
     this._push = push;
@@ -164,7 +161,7 @@ See documentation: ${createDocumentationLink({
    * Reads the URL and returns a syncable UI search state.
    */
   public read(): TRouteState {
-    return this.parseURL({ qsModule: qs, location: this.getLocation() });
+    return this.parseURL({ qsModule: qs, currentURL: this.getCurrentURL() });
   }
 
   /**
@@ -236,7 +233,7 @@ See documentation: ${createDocumentationLink({
     const url = this._createURL({
       qsModule: qs,
       routeState,
-      location: this.getLocation(),
+      currentURL: this.getCurrentURL(),
     });
 
     if (__DEV__) {
@@ -316,19 +313,13 @@ Please make sure it returns an absolute URL to avoid issues, e.g: \`https://algo
 }
 
 export function historyRouter<TRouteState = UiState>({
-  createURL = ({ qsModule, routeState, location }) => {
-    const { protocol, hostname, port = '', pathname, hash } = location;
-    const queryString = qsModule.stringify(routeState);
-    const portWithPrefix = port === '' ? '' : `:${port}`;
-
-    // IE <= 11 has no proper `location.origin` so we cannot rely on it.
-    if (!queryString) {
-      return `${protocol}//${hostname}${portWithPrefix}${pathname}${hash}`;
-    }
+  createURL = ({ qsModule, routeState, currentURL }) => {
+    const url = new URL(currentURL);
+    url.search = qsModule.stringify(routeState);
 
-    return `${protocol}//${hostname}${portWithPrefix}${pathname}?${queryString}${hash}`;
+    return url.href;
   },
-  parseURL = ({ qsModule, location }) => {
+  parseURL = ({ qsModule, currentURL }) => {
     // `qs` by default converts arrays with more than 20 items to an object.
     // We want to avoid this because the data structure manipulated can therefore vary.
     // Setting the limit to `100` seems a good number because the engine's default is 100
@@ -339,20 +330,23 @@ export function historyRouter<TRouteState = UiState>({
     // See:
     //   - https://github.com/ljharb/qs#parsing-arrays
     //   - https://www.algolia.com/doc/api-reference/api-parameters/maxValuesPerFacet/
-    return qsModule.parse(location.search.slice(1), {
+    return qsModule.parse(currentURL.search.slice(1), {
       arrayLimit: 99,
     }) as unknown as TRouteState;
   },
   writeDelay = 400,
   windowTitle,
-  getLocation = () => {
-    return safelyRunOnBrowser<Location>(({ window }) => window.location, {
-      fallback: () => {
-        throw new Error(
-          'You need to provide `getLocation` to the `history` router in environments where `window` does not exist.'
-        );
-      },
-    });
+  getCurrentURL = () => {
+    return safelyRunOnBrowser<URL>(
+      ({ window }) => new URL(window.location.href),
+      {
+        fallback: () => {
+          throw new Error(
+            'You need to provide `getCurrentURL` to the `history` router in environments where `window` does not exist.'
+          );
+        },
+      }
+    );
   },
   start,
   dispose,
@@ -364,7 +358,7 @@ export function historyRouter<TRouteState = UiState>({
     parseURL,
     writeDelay,
     windowTitle,
-    getLocation,
+    getCurrentURL,
     start,
     dispose,
     push,
diff --git a/packages/react-instantsearch-core/src/components/__tests__/InstantSearch.test.tsx b/packages/react-instantsearch-core/src/components/__tests__/InstantSearch.test.tsx
index f74ca119fc..d8ef860320 100644
--- a/packages/react-instantsearch-core/src/components/__tests__/InstantSearch.test.tsx
+++ b/packages/react-instantsearch-core/src/components/__tests__/InstantSearch.test.tsx
@@ -244,10 +244,8 @@ describe('InstantSearch', () => {
     const routing = {
       stateMapping: simple(),
       router: history({
-        getLocation() {
-          return new URL(
-            `http://localhost/?indexName[query]=iphone`
-          ) as unknown as Location;
+        getCurrentURL() {
+          return new URL(`http://localhost/?indexName[query]=iphone`);
         },
       }),
     };
@@ -306,8 +304,8 @@ describe('InstantSearch', () => {
       const routing = {
         stateMapping: simple(),
         router: history({
-          getLocation() {
-            return new URL(url) as unknown as Location;
+          getCurrentURL() {
+            return new URL(url);
           },
         }),
       };
diff --git a/packages/react-instantsearch-core/src/components/__tests__/InstantSearchSSRProvider.test.tsx b/packages/react-instantsearch-core/src/components/__tests__/InstantSearchSSRProvider.test.tsx
index 48953aa545..27163a116a 100644
--- a/packages/react-instantsearch-core/src/components/__tests__/InstantSearchSSRProvider.test.tsx
+++ b/packages/react-instantsearch-core/src/components/__tests__/InstantSearchSSRProvider.test.tsx
@@ -166,10 +166,8 @@ describe('InstantSearchSSRProvider', () => {
     const routing = {
       stateMapping: simple(),
       router: history({
-        getLocation() {
-          return new URL(
-            `http://localhost/?indexName[query]=iphone`
-          ) as unknown as Location;
+        getCurrentURL() {
+          return new URL(`http://localhost/?indexName[query]=iphone`);
         },
       }),
     };
diff --git a/packages/react-instantsearch-nextjs/src/useInstantSearchRouting.ts b/packages/react-instantsearch-nextjs/src/useInstantSearchRouting.ts
index 4df7e195ee..337bd1e566 100644
--- a/packages/react-instantsearch-nextjs/src/useInstantSearchRouting.ts
+++ b/packages/react-instantsearch-nextjs/src/useInstantSearchRouting.ts
@@ -41,21 +41,21 @@ export function useInstantSearchRouting<
   if (passedRouting && !routingRef.current) {
     let browserHistoryOptions: Partial<BrowserHistoryArgs<TRouteState>> = {};
 
-    browserHistoryOptions.getLocation = () => {
+    browserHistoryOptions.getCurrentURL = () => {
       if (isServer) {
         const url = `${
           headers?.get('x-forwarded-proto') || 'http'
         }://${headers?.get('host')}${pathname}?${searchParams}`;
-        return new URL(url) as unknown as Location;
+        return new URL(url);
       }
 
       if (isMounting.current) {
         return new URL(
           `${window.location.protocol}//${window.location.host}${pathname}?${searchParams}`
-        ) as unknown as Location;
+        );
       }
 
-      return window.location;
+      return new URL(window.location.href);
     };
     browserHistoryOptions.push = function push(
       this: ReturnType<typeof historyRouter>,
diff --git a/packages/react-instantsearch-router-nextjs/src/index.ts b/packages/react-instantsearch-router-nextjs/src/index.ts
index 55c640395a..6a4086d1ff 100644
--- a/packages/react-instantsearch-router-nextjs/src/index.ts
+++ b/packages/react-instantsearch-router-nextjs/src/index.ts
@@ -85,8 +85,8 @@ export function createInstantSearchRouterNext<TRouteState = UiState>(
   // If we're rendering on the server, we create a simpler router
   if (typeof window === 'undefined') {
     return history({
-      getLocation() {
-        return new URL(serverUrl!) as unknown as Location;
+      getCurrentURL() {
+        return new URL(serverUrl!);
       },
       ...routerOptions,
     });

From 28658d3006fd06e19cc0546898c2325a6c168fd8 Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Fri, 20 Dec 2024 10:08:57 +0100
Subject: [PATCH 22/37] feat(helper): persistHierarchicalRootCount: true
 (#6478)

* feat(helper): persistHierarchicalRootCount: true

BREAKING CHANGE: the default behaviour of the helper is now persistHierarchicalRootCount: true

* fix(options): remove persistHierarchicalRootCount option

It behaves as persistHierarchicalRootCount: true
---
 packages/algoliasearch-helper/index.d.ts      |   1 -
 .../src/SearchResults/index.js                |  41 +----
 .../SearchParameters/search.dataset.js        |   1 -
 .../test/spec/SearchResults/getFacetValues.js |  48 +----
 .../spec/algoliasearch.helper/searchOnce.js   | 153 ++++++++--------
 .../spec/hierarchical-facets/simple-usage.js  | 171 +-----------------
 .../test/spec/hierarchical-facets/sort-by.js  |  30 ++-
 .../src/__tests__/instantsearch.test.tsx      |  25 +--
 .../instantsearch-core/src/instantsearch.ts   |   5 +-
 .../src/types/instantsearch.ts                |  10 -
 .../widgets/__tests__/index-widget.test.ts    |   1 -
 11 files changed, 107 insertions(+), 379 deletions(-)

diff --git a/packages/algoliasearch-helper/index.d.ts b/packages/algoliasearch-helper/index.d.ts
index 3b2aadc01d..8192a0eef1 100644
--- a/packages/algoliasearch-helper/index.d.ts
+++ b/packages/algoliasearch-helper/index.d.ts
@@ -1140,7 +1140,6 @@ declare namespace algoliasearchHelper {
      * This is for internal use, e.g., avoiding caching in infinite hits, or delaying the display of these results.
      */
     __isArtificial?: boolean | undefined;
-    persistHierarchicalRootCount?: boolean;
   }
 
   type ISearchResponse<T> = Omit<SearchResponse<T>, 'facets' | 'params'> &
diff --git a/packages/algoliasearch-helper/src/SearchResults/index.js b/packages/algoliasearch-helper/src/SearchResults/index.js
index 73b1b996b6..079a6ab6be 100644
--- a/packages/algoliasearch-helper/src/SearchResults/index.js
+++ b/packages/algoliasearch-helper/src/SearchResults/index.js
@@ -241,11 +241,8 @@ function SearchResults(state, results, options) {
   });
 
   // Make every key of the result options reachable from the instance
-  var opts = defaultsPure(options, {
-    persistHierarchicalRootCount: false,
-  });
-  Object.keys(opts).forEach(function (key) {
-    self[key] = opts[key];
+  Object.keys(options || {}).forEach(function (key) {
+    self[key] = options[key];
   });
 
   /**
@@ -510,15 +507,10 @@ function SearchResults(state, results, options) {
         }
 
         self.hierarchicalFacets[position][attributeIndex].data =
-          self.persistHierarchicalRootCount
-            ? mergeNumericMax(
-                self.hierarchicalFacets[position][attributeIndex].data,
-                facetResults
-              )
-            : defaultsPure(
-                facetResults,
-                self.hierarchicalFacets[position][attributeIndex].data
-              );
+          mergeNumericMax(
+            self.hierarchicalFacets[position][attributeIndex].data,
+            facetResults
+          );
       } else {
         position = disjunctiveFacetsIndices[dfacet];
 
@@ -590,28 +582,7 @@ function SearchResults(state, results, options) {
           return;
         }
 
-        // when we always get root levels, if the hits refinement is `beers > IPA` (count: 5),
-        // then the disjunctive values will be `beers` (count: 100),
-        // but we do not want to display
-        //   | beers (100)
-        //     > IPA (5)
-        // We want
-        //   | beers (5)
-        //     > IPA (5)
-        // @MAJOR: remove this legacy behaviour in next major version
-        var defaultData = {};
-
-        if (
-          currentRefinement.length > 0 &&
-          !self.persistHierarchicalRootCount
-        ) {
-          var root = currentRefinement[0].split(separator)[0];
-          defaultData[root] =
-            self.hierarchicalFacets[position][attributeIndex].data[root];
-        }
-
         self.hierarchicalFacets[position][attributeIndex].data = defaultsPure(
-          defaultData,
           facetResults,
           self.hierarchicalFacets[position][attributeIndex].data
         );
diff --git a/packages/algoliasearch-helper/test/datasets/SearchParameters/search.dataset.js b/packages/algoliasearch-helper/test/datasets/SearchParameters/search.dataset.js
index 7ab07b44df..4ff8f7c50b 100644
--- a/packages/algoliasearch-helper/test/datasets/SearchParameters/search.dataset.js
+++ b/packages/algoliasearch-helper/test/datasets/SearchParameters/search.dataset.js
@@ -336,7 +336,6 @@ function getData() {
     index: 'test_hotels-node',
     hitsPerPage: 20,
     nbHits: 4,
-    persistHierarchicalRootCount: false,
     nbPages: 1,
     page: 0,
     params:
diff --git a/packages/algoliasearch-helper/test/spec/SearchResults/getFacetValues.js b/packages/algoliasearch-helper/test/spec/SearchResults/getFacetValues.js
index 53b38e39f0..33b6f80b68 100644
--- a/packages/algoliasearch-helper/test/spec/SearchResults/getFacetValues.js
+++ b/packages/algoliasearch-helper/test/spec/SearchResults/getFacetValues.js
@@ -751,12 +751,10 @@ test('getFacetValues(facetName) prefers the "main" facet result (disjunctive)',
   expect(facetValues).toEqual(expected);
 });
 
-test('getFacetValues(facetName) prefers the "main" facet result (hierarchical) (persistHierarchicalRootCount: true)', function () {
+test('getFacetValues(facetName) prefers the "main" facet result (hierarchical)', function () {
   var data = require('./getFacetValues/hierarchical-non-exhaustive.json');
   var searchParams = new SearchParameters(data.state);
-  var result = new SearchResults(searchParams, data.content.results, {
-    persistHierarchicalRootCount: true,
-  });
+  var result = new SearchResults(searchParams, data.content.results);
 
   var facetValues = result.getFacetValues('brand').data;
 
@@ -792,45 +790,3 @@ test('getFacetValues(facetName) prefers the "main" facet result (hierarchical) (
 
   expect(facetValues).toEqual(expected);
 });
-
-test('getFacetValues(facetName) prefers the "main" facet result (hierarchical) (persistHierarchicalRootCount: false)', function () {
-  var data = require('./getFacetValues/hierarchical-non-exhaustive.json');
-  var searchParams = new SearchParameters(data.state);
-  var result = new SearchResults(searchParams, data.content.results, {
-    persistHierarchicalRootCount: false,
-  });
-
-  var facetValues = result.getFacetValues('brand').data;
-
-  var expected = [
-    {
-      count: 50,
-      data: null,
-      isRefined: true,
-      name: 'Apple',
-      escapedValue: 'Apple',
-      path: 'Apple',
-      exhaustive: true,
-    },
-    {
-      count: 551,
-      data: null,
-      isRefined: false,
-      name: 'Insignia™',
-      escapedValue: 'Insignia™',
-      path: 'Insignia™',
-      exhaustive: true,
-    },
-    {
-      count: 551,
-      data: null,
-      isRefined: false,
-      name: 'Samsung',
-      escapedValue: 'Samsung',
-      path: 'Samsung',
-      exhaustive: true,
-    },
-  ];
-
-  expect(facetValues).toEqual(expected);
-});
diff --git a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/searchOnce.js b/packages/algoliasearch-helper/test/spec/algoliasearch.helper/searchOnce.js
index 0d9e5141ca..bad494c381 100644
--- a/packages/algoliasearch-helper/test/spec/algoliasearch.helper/searchOnce.js
+++ b/packages/algoliasearch-helper/test/spec/algoliasearch.helper/searchOnce.js
@@ -3,7 +3,7 @@
 var algoliasearchHelper = require('../../../index');
 var SearchParameters = require('../../../src/SearchParameters');
 
-test('searchOnce should call the algolia client according to the number of refinements and call callback with no error and with results when no error', function (done) {
+test('searchOnce should call the algolia client according to the number of refinements and call callback with no error and with results when no error', async function () {
   var testData = require('../../datasets/SearchParameters/search.dataset')();
 
   var client = {
@@ -21,76 +21,72 @@ test('searchOnce should call the algolia client according to the number of refin
     .addDisjunctiveFacetRefinement('city', 'Paris')
     .addDisjunctiveFacetRefinement('city', 'New York');
 
-  helper.searchOnce(parameters, function (err, data) {
-    expect(err).toBe(null);
-
-    // shame deepclone, to remove any associated methods coming from the results
-    expect(JSON.parse(JSON.stringify(data))).toEqual(
-      JSON.parse(JSON.stringify(testData.responseHelper))
-    );
-
-    var cityValues = data.getFacetValues('city');
-    var expectedCityValues = [
-      { name: 'Paris', escapedValue: 'Paris', count: 3, isRefined: true },
-      { name: 'New York', escapedValue: 'New York', count: 1, isRefined: true },
-      {
-        name: 'San Francisco',
-        escapedValue: 'San Francisco',
-        count: 1,
-        isRefined: false,
-      },
-    ];
-
-    expect(cityValues).toEqual(expectedCityValues);
-
-    var cityValuesCustom = data.getFacetValues('city', {
-      sortBy: ['count:asc', 'name:asc'],
-    });
-    var expectedCityValuesCustom = [
-      { name: 'New York', escapedValue: 'New York', count: 1, isRefined: true },
-      {
-        name: 'San Francisco',
-        escapedValue: 'San Francisco',
-        count: 1,
-        isRefined: false,
-      },
-      { name: 'Paris', escapedValue: 'Paris', count: 3, isRefined: true },
-    ];
-
-    expect(cityValuesCustom).toEqual(expectedCityValuesCustom);
-
-    var cityValuesFn = data.getFacetValues('city', {
-      sortBy: function (a, b) {
-        return a.count - b.count;
-      },
-    });
-    var expectedCityValuesFn = [
-      { name: 'New York', escapedValue: 'New York', count: 1, isRefined: true },
-      {
-        name: 'San Francisco',
-        escapedValue: 'San Francisco',
-        count: 1,
-        isRefined: false,
-      },
-      { name: 'Paris', escapedValue: 'Paris', count: 3, isRefined: true },
-    ];
-
-    expect(cityValuesFn).toEqual(expectedCityValuesFn);
-
-    expect(client.search).toHaveBeenCalledTimes(1);
-
-    var queries = client.search.mock.calls[0][0];
-    for (var i = 0; i < queries.length; i++) {
-      var query = queries[i];
-      expect(query.query).toBeUndefined();
-      expect(query.params.query).toBeUndefined();
-    }
-
-    done();
+  const { content } = await helper.searchOnce(parameters);
+
+  // shame deepclone, to remove any associated methods coming from the results
+  expect(JSON.parse(JSON.stringify(content))).toEqual(
+    JSON.parse(JSON.stringify(testData.responseHelper))
+  );
+
+  var cityValues = content.getFacetValues('city');
+  var expectedCityValues = [
+    { name: 'Paris', escapedValue: 'Paris', count: 3, isRefined: true },
+    { name: 'New York', escapedValue: 'New York', count: 1, isRefined: true },
+    {
+      name: 'San Francisco',
+      escapedValue: 'San Francisco',
+      count: 1,
+      isRefined: false,
+    },
+  ];
+
+  expect(cityValues).toEqual(expectedCityValues);
+
+  var cityValuesCustom = content.getFacetValues('city', {
+    sortBy: ['count:asc', 'name:asc'],
   });
+  var expectedCityValuesCustom = [
+    { name: 'New York', escapedValue: 'New York', count: 1, isRefined: true },
+    {
+      name: 'San Francisco',
+      escapedValue: 'San Francisco',
+      count: 1,
+      isRefined: false,
+    },
+    { name: 'Paris', escapedValue: 'Paris', count: 3, isRefined: true },
+  ];
+
+  expect(cityValuesCustom).toEqual(expectedCityValuesCustom);
+
+  var cityValuesFn = content.getFacetValues('city', {
+    sortBy: function (a, b) {
+      return a.count - b.count;
+    },
+  });
+  var expectedCityValuesFn = [
+    { name: 'New York', escapedValue: 'New York', count: 1, isRefined: true },
+    {
+      name: 'San Francisco',
+      escapedValue: 'San Francisco',
+      count: 1,
+      isRefined: false,
+    },
+    { name: 'Paris', escapedValue: 'Paris', count: 3, isRefined: true },
+  ];
+
+  expect(cityValuesFn).toEqual(expectedCityValuesFn);
+
+  expect(client.search).toHaveBeenCalledTimes(1);
+
+  var queries = client.search.mock.calls[0][0];
+  for (var i = 0; i < queries.length; i++) {
+    var query = queries[i];
+    expect(query.query).toBeUndefined();
+    expect(query.params.query).toBeUndefined();
+  }
 });
 
-test('searchOnce should call the algolia client according to the number of refinements and call callback with error and no results when error', function (done) {
+test('searchOnce should call the algolia client according to the number of refinements and call callback with error and no results when error', async function () {
   var error = { message: 'error' };
   var client = {
     search: jest.fn().mockImplementationOnce(function () {
@@ -107,19 +103,14 @@ test('searchOnce should call the algolia client according to the number of refin
     .addDisjunctiveFacetRefinement('city', 'Paris')
     .addDisjunctiveFacetRefinement('city', 'New York');
 
-  helper.searchOnce(parameters, function (err, data) {
-    expect(err).toBe(error);
-    expect(data).toBe(null);
-
-    expect(client.search).toHaveBeenCalledTimes(1);
+  await expect(() => helper.searchOnce(parameters)).rejects.toEqual(error);
 
-    var queries = client.search.mock.calls[0][0];
-    for (var i = 0; i < queries.length; i++) {
-      var query = queries[i];
-      expect(query.query).toBeUndefined();
-      expect(query.params.query).toBeUndefined();
-    }
+  expect(client.search).toHaveBeenCalledTimes(1);
 
-    done();
-  });
+  var queries = client.search.mock.calls[0][0];
+  for (var i = 0; i < queries.length; i++) {
+    var query = queries[i];
+    expect(query.query).toBeUndefined();
+    expect(query.params.query).toBeUndefined();
+  }
 });
diff --git a/packages/algoliasearch-helper/test/spec/hierarchical-facets/simple-usage.js b/packages/algoliasearch-helper/test/spec/hierarchical-facets/simple-usage.js
index 54230e4437..f3b60af493 100644
--- a/packages/algoliasearch-helper/test/spec/hierarchical-facets/simple-usage.js
+++ b/packages/algoliasearch-helper/test/spec/hierarchical-facets/simple-usage.js
@@ -86,7 +86,7 @@ describe('hierarchical facets: simple usage', function () {
     client.search.mockClear();
   });
 
-  test('persistHierarchicalRootCount: false', function (done) {
+  test('simple usage', function (done) {
     var helper = algoliasearchHelper(client, indexName, {
       hierarchicalFacets: [
         {
@@ -103,175 +103,6 @@ describe('hierarchical facets: simple usage', function () {
 
     helper.toggleFacetRefinement('categories', 'beers > IPA > Flying dog');
 
-    var expectedHelperResponse = [
-      {
-        name: 'categories',
-        count: null,
-        isRefined: true,
-        path: null,
-        escapedValue: null,
-        exhaustive: true,
-        data: [
-          {
-            name: 'beers',
-            path: 'beers',
-            escapedValue: 'beers',
-            count: 9,
-            isRefined: true,
-            exhaustive: true,
-            data: [
-              {
-                name: 'IPA',
-                path: 'beers > IPA',
-                escapedValue: 'beers > IPA',
-                count: 9,
-                isRefined: true,
-                exhaustive: true,
-                data: [
-                  {
-                    name: 'Flying dog',
-                    path: 'beers > IPA > Flying dog',
-                    escapedValue: 'beers > IPA > Flying dog',
-                    count: 3,
-                    isRefined: true,
-                    exhaustive: true,
-                    data: null,
-                  },
-                  {
-                    name: 'Brewdog punk IPA',
-                    path: 'beers > IPA > Brewdog punk IPA',
-                    escapedValue: 'beers > IPA > Brewdog punk IPA',
-                    count: 6,
-                    isRefined: false,
-                    exhaustive: true,
-                    data: null,
-                  },
-                ],
-              },
-              {
-                name: 'Pale Ale',
-                path: 'beers > Pale Ale',
-                escapedValue: 'beers > Pale Ale',
-                count: 10,
-                isRefined: false,
-                exhaustive: true,
-                data: null,
-              },
-              {
-                name: 'Stout',
-                path: 'beers > Stout',
-                escapedValue: 'beers > Stout',
-                count: 1,
-                isRefined: false,
-                exhaustive: true,
-                data: null,
-              },
-            ],
-          },
-          {
-            name: 'fruits',
-            path: 'fruits',
-            escapedValue: 'fruits',
-            count: 5,
-            isRefined: false,
-            exhaustive: true,
-            data: null,
-          },
-          {
-            name: 'sales',
-            path: 'sales',
-            escapedValue: 'sales',
-            count: 20,
-            isRefined: false,
-            exhaustive: true,
-            data: null,
-          },
-        ],
-      },
-    ];
-
-    helper.setQuery('a').search();
-
-    helper.once('result', function (event) {
-      var queries = client.search.mock.calls[0][0];
-      var hitsQuery = queries[0];
-      var parentValuesQuery = queries[1];
-      var fullParentsValuesQueries = queries.slice(2);
-
-      expect(queries.length).toBe(4);
-
-      expect(hitsQuery.params.facets).toEqual([
-        'categories.lvl0',
-        'categories.lvl1',
-        'categories.lvl2',
-        'categories.lvl3',
-      ]);
-      expect(hitsQuery.params.facetFilters).toEqual([
-        ['categories.lvl2:beers > IPA > Flying dog'],
-      ]);
-
-      expect(parentValuesQuery.params.facets).toEqual([
-        'categories.lvl0',
-        'categories.lvl1',
-        'categories.lvl2',
-      ]);
-      expect(parentValuesQuery.params.facetFilters).toEqual([
-        ['categories.lvl1:beers > IPA'],
-      ]);
-
-      // Root
-      expect(fullParentsValuesQueries[0].params.facets).toEqual(
-        'categories.lvl0'
-      );
-      expect(fullParentsValuesQueries[0].params.facetFilters).toBe(undefined);
-
-      // Level 1
-      expect(fullParentsValuesQueries[1].params.facets).toEqual(
-        'categories.lvl1'
-      );
-      expect(fullParentsValuesQueries[1].params.facetFilters).toEqual([
-        'categories.lvl0:beers',
-      ]);
-
-      expect(event.results.hierarchicalFacets).toEqual(expectedHelperResponse);
-      expect(
-        event.results.hierarchicalFacets.find((f) => f.name === 'categories')
-      ).toEqual(expectedHelperResponse[0]);
-
-      // we do not yet support multiple values for hierarchicalFacetsRefinements
-      // but at some point we may want to open multiple leafs of a hierarchical menu
-      // So we set this as an array so that we do not have to bump major to handle it
-      expect(
-        Array.isArray(helper.state.hierarchicalFacetsRefinements.categories)
-      ).toBeTruthy();
-      done();
-    });
-  });
-
-  test('persistHierarchicalRootCount: true', function (done) {
-    var helper = algoliasearchHelper(
-      client,
-      indexName,
-      {
-        hierarchicalFacets: [
-          {
-            name: 'categories',
-            attributes: [
-              'categories.lvl0',
-              'categories.lvl1',
-              'categories.lvl2',
-              'categories.lvl3',
-            ],
-          },
-        ],
-      },
-      {
-        persistHierarchicalRootCount: true,
-      }
-    );
-
-    helper.toggleFacetRefinement('categories', 'beers > IPA > Flying dog');
-
     var expectedHelperResponse = [
       {
         name: 'categories',
diff --git a/packages/algoliasearch-helper/test/spec/hierarchical-facets/sort-by.js b/packages/algoliasearch-helper/test/spec/hierarchical-facets/sort-by.js
index 079d149f4e..3f87b23bca 100644
--- a/packages/algoliasearch-helper/test/spec/hierarchical-facets/sort-by.js
+++ b/packages/algoliasearch-helper/test/spec/hierarchical-facets/sort-by.js
@@ -1,6 +1,6 @@
 'use strict';
 
-test('hierarchical facets: using sortBy', function (done) {
+test('hierarchical facets: using sortBy', async function () {
   var algoliasearch = require('algoliasearch');
   algoliasearch = algoliasearch.algoliasearch || algoliasearch;
 
@@ -30,6 +30,7 @@ test('hierarchical facets: using sortBy', function (done) {
 
   var algoliaResponse = {
     results: [
+      // for hits
       {
         query: 'a',
         index: indexName,
@@ -45,6 +46,7 @@ test('hierarchical facets: using sortBy', function (done) {
           'categories.lvl2': { 'beers > IPA > Flying dog': 1 },
         },
       },
+      // deepest level
       {
         query: 'a',
         index: indexName,
@@ -54,8 +56,8 @@ test('hierarchical facets: using sortBy', function (done) {
         nbPages: 1,
         hitsPerPage: 1,
         facets: {
-          'categories.lvl0': { beers: 5 },
-          'categories.lvl1': { 'beers > IPA': 5 },
+          'categories.lvl0': { beers: 1 },
+          'categories.lvl1': { 'beers > IPA': 1 },
           'categories.lvl2': {
             'beers > IPA > Flying dog': 1,
             'beers > IPA > Anchor steam': 1,
@@ -63,6 +65,7 @@ test('hierarchical facets: using sortBy', function (done) {
           },
         },
       },
+      // root level
       {
         query: 'a',
         index: indexName,
@@ -75,6 +78,19 @@ test('hierarchical facets: using sortBy', function (done) {
           'categories.lvl0': { beers: 5 },
         },
       },
+      // other levels
+      {
+        query: 'a',
+        index: indexName,
+        hits: [{ objectID: 'one' }],
+        nbHits: 1,
+        page: 0,
+        nbPages: 1,
+        hitsPerPage: 1,
+        facets: {
+          'categories.lvl1': { 'beers > IPA': 5 },
+        },
+      },
     ],
   };
 
@@ -143,8 +159,10 @@ test('hierarchical facets: using sortBy', function (done) {
   });
 
   helper.setQuery('a').search();
-  helper.once('result', function (event) {
-    expect(event.results.hierarchicalFacets).toEqual(expectedHelperResponse);
-    done();
+
+  const { results } = await new Promise(function (resolve) {
+    helper.once('result', resolve);
   });
+
+  expect(results.hierarchicalFacets).toEqual(expectedHelperResponse);
 });
diff --git a/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx b/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
index d2e2bbecff..89786f6b9a 100644
--- a/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
+++ b/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
@@ -864,30 +864,7 @@ describe('start', () => {
     expect(algoliasearchHelper).toHaveBeenCalledWith(
       searchClient,
       indexName,
-      undefined,
-      { persistHierarchicalRootCount: false }
-    );
-  });
-
-  it('creates a Helper with `persistHierarchicalRootCount` set to true when specified with a future flag', () => {
-    const searchClient = createSearchClient();
-    const indexName = 'indexName';
-    const future = {
-      persistHierarchicalRootCount: true,
-    };
-    const search = new InstantSearch({
-      indexName,
-      searchClient,
-      future,
-    });
-
-    search.start();
-
-    expect(algoliasearchHelper).toHaveBeenCalledWith(
-      searchClient,
-      indexName,
-      undefined,
-      future
+      undefined
     );
   });
 
diff --git a/packages/instantsearch-core/src/instantsearch.ts b/packages/instantsearch-core/src/instantsearch.ts
index 6ce217c3ac..d5d0b8f7ee 100644
--- a/packages/instantsearch-core/src/instantsearch.ts
+++ b/packages/instantsearch-core/src/instantsearch.ts
@@ -52,7 +52,6 @@ export const INSTANTSEARCH_FUTURE_DEFAULTS: Required<
   InstantSearchOptions['future']
 > = {
   preserveSharedStateOnUnmount: false,
-  persistHierarchicalRootCount: false,
 };
 
 /**
@@ -356,9 +355,7 @@ See documentation: ${createDocumentationLink({
     // we need to respect this helper as a way to keep all listeners correct.
     const mainHelper =
       this.mainHelper ||
-      algoliasearchHelper(this.client, this.indexName, undefined, {
-        persistHierarchicalRootCount: this.future.persistHierarchicalRootCount,
-      });
+      algoliasearchHelper(this.client, this.indexName, undefined);
 
     if (this.compositionID) {
       mainHelper.searchForFacetValues =
diff --git a/packages/instantsearch-core/src/types/instantsearch.ts b/packages/instantsearch-core/src/types/instantsearch.ts
index cd6caa2f13..4dcf93945d 100644
--- a/packages/instantsearch-core/src/types/instantsearch.ts
+++ b/packages/instantsearch-core/src/types/instantsearch.ts
@@ -107,16 +107,6 @@ export type InstantSearchOptions<
      * @default false
      */
     preserveSharedStateOnUnmount?: boolean; // @MAJOR remove option, only keep the "true" behaviour
-    /**
-     * Changes the way root levels of hierarchical facets have their count displayed.
-     *
-     * If `false` (by default), the count of the refined root level is updated to match the count of the actively refined parent level.
-     *
-     * If `true`, the count of the root level stays the same as the count of all children levels.
-     *
-     * @default false
-     */
-    persistHierarchicalRootCount?: boolean; // @MAJOR change the default to true
   };
 };
 
diff --git a/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts b/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts
index 48ea187006..4884a84f38 100644
--- a/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts
+++ b/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts
@@ -3346,7 +3346,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
         nbPages: 1,
         page: 0,
         params: '',
-        persistHierarchicalRootCount: false,
         processingTimeMS: 0,
         query: 'iphone',
       };

From ff4d6556990032ce567c5e073ef1569ead8ba7f0 Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Sat, 21 Dec 2024 09:51:14 +0100
Subject: [PATCH 23/37] fix(vue): don't spread in ais-state-results (#6481)

We no longer document directly using the `query` for example in the ais-state-results component, read it either from state or results.

[FX-3194]

BREAKING CHANGE: connectStateResults is no longer exposed from Vue InstantSearch
BREAKING CHANGE: the slot in ais-state-results receives an object with `results`, `state`, `status` and `error`, no longer direct access to e.g. `query`
---
 .../src/components/StateResults.vue           |  15 +--
 .../src/components/__tests__/StateResults.js  |  75 -----------
 .../src/connectors/connectStateResults.js     |  37 ------
 .../connectors/connectStateResults.test.js    | 123 ------------------
 4 files changed, 1 insertion(+), 249 deletions(-)
 delete mode 100644 packages/vue-instantsearch/src/connectors/connectStateResults.js
 delete mode 100644 packages/vue-instantsearch/src/connectors/connectStateResults.test.js

diff --git a/packages/vue-instantsearch/src/components/StateResults.vue b/packages/vue-instantsearch/src/components/StateResults.vue
index 32ba406757..8a5ed9db1e 100644
--- a/packages/vue-instantsearch/src/components/StateResults.vue
+++ b/packages/vue-instantsearch/src/components/StateResults.vue
@@ -1,6 +1,6 @@
 <template>
   <div :class="suit()" v-if="state && state.state && state.results">
-    <slot v-bind="stateResults">
+    <slot v-bind="state">
       <p>
         Use this component to have a different layout based on a certain state.
       </p>
@@ -38,7 +38,6 @@ export default {
         const helper = this.getParentIndex().getHelper();
         const state = helper ? helper.state : null;
 
-        // @MAJOR no longer spread this inside `results`
         this.state = {
           results,
           state,
@@ -74,17 +73,5 @@ export default {
       },
     },
   },
-  computed: {
-    stateResults() {
-      const { results, state, status, error } = this.state;
-      return {
-        ...results,
-        results,
-        state,
-        status,
-        error,
-      };
-    },
-  },
 };
 </script>
diff --git a/packages/vue-instantsearch/src/components/__tests__/StateResults.js b/packages/vue-instantsearch/src/components/__tests__/StateResults.js
index 4683878a24..c1fcf66a7a 100644
--- a/packages/vue-instantsearch/src/components/__tests__/StateResults.js
+++ b/packages/vue-instantsearch/src/components/__tests__/StateResults.js
@@ -53,7 +53,6 @@ it('gives state & results to default slot', () => {
   mount(StateResults, {
     scopedSlots: {
       default: (props) => {
-        expect(props).toEqual(expect.objectContaining(results));
         expect(props.results).toEqual(results);
         expect(props.state).toEqual(state);
         expect(props.status).toEqual('idle');
@@ -182,77 +181,3 @@ it('allows default slot to render whatever they want (falsy query)', () => {
 </div>
 `);
 });
-
-describe('legacy spread props', () => {
-  it('allows default slot to render whatever they want (truthy query)', () => {
-    __setIndexResults({
-      query: 'q',
-      hits: [
-        { objectID: '1', name: 'one' },
-        { objectID: '2', name: 'two' },
-      ],
-      page: 1,
-    });
-    __setIndexHelper({ state: {} });
-
-    const wrapper = mount({
-      components: { StateResults },
-      template: `
-        <StateResults>
-          <template v-slot="{ query }">
-            <p v-if="query">
-              Query is here
-            </p>
-            <p v-else>
-              There's no query
-            </p>
-          </template>
-        </StateResults>
-      `,
-    });
-
-    expect(wrapper.html()).toMatchInlineSnapshot(`
-<div class="ais-StateResults">
-  <p>
-    Query is here
-  </p>
-</div>
-`);
-  });
-
-  it('allows default slot to render whatever they want (falsy query)', () => {
-    __setIndexResults({
-      query: '',
-      hits: [
-        { objectID: '1', name: 'one' },
-        { objectID: '2', name: 'two' },
-      ],
-      page: 1,
-    });
-    __setIndexHelper({ state: {} });
-
-    const wrapper = mount({
-      components: { StateResults },
-      template: `
-        <StateResults>
-          <template v-slot="{ query }">
-            <p v-if="query">
-              Query is here
-            </p>
-            <p v-else>
-              There's no query
-            </p>
-          </template>
-        </StateResults>
-      `,
-    });
-
-    expect(wrapper.html()).toMatchInlineSnapshot(`
-<div class="ais-StateResults">
-  <p>
-    There's no query
-  </p>
-</div>
-`);
-  });
-});
diff --git a/packages/vue-instantsearch/src/connectors/connectStateResults.js b/packages/vue-instantsearch/src/connectors/connectStateResults.js
deleted file mode 100644
index 1d89269a47..0000000000
--- a/packages/vue-instantsearch/src/connectors/connectStateResults.js
+++ /dev/null
@@ -1,37 +0,0 @@
-const connectStateResults =
-  (renderFn, unmountFn = () => {}) =>
-  (widgetParams = {}) => ({
-    init({ instantSearchInstance }) {
-      renderFn(
-        {
-          state: undefined,
-          results: undefined,
-          instantSearchInstance,
-          widgetParams,
-        },
-        true
-      );
-    },
-
-    render({ results, instantSearchInstance, state }) {
-      const resultsCopy = { ...results };
-
-      const stateCopy = { ...state };
-
-      renderFn(
-        {
-          results: resultsCopy,
-          state: stateCopy,
-          instantSearchInstance,
-          widgetParams,
-        },
-        false
-      );
-    },
-
-    dispose() {
-      unmountFn();
-    },
-  });
-
-export default connectStateResults;
diff --git a/packages/vue-instantsearch/src/connectors/connectStateResults.test.js b/packages/vue-instantsearch/src/connectors/connectStateResults.test.js
deleted file mode 100644
index 1dd9ef424a..0000000000
--- a/packages/vue-instantsearch/src/connectors/connectStateResults.test.js
+++ /dev/null
@@ -1,123 +0,0 @@
-import connectStateResults from './connectStateResults';
-
-it('is a connector', () => {
-  const widgetFactory = connectStateResults(() => {});
-  const widgetInstance = widgetFactory();
-  expect(widgetInstance).toEqual(
-    expect.objectContaining({
-      init: expect.any(Function),
-      render: expect.any(Function),
-      dispose: expect.any(Function),
-    })
-  );
-});
-
-it('state & results are forwarded in render', () => {
-  const renderFn = jest.fn();
-  const widgetFactory = connectStateResults(renderFn);
-  const widgetInstance = widgetFactory({ myParams: true });
-
-  widgetInstance.init({});
-
-  expect(renderFn).toHaveBeenCalledWith(
-    expect.objectContaining({ state: undefined, results: undefined }),
-    true
-  );
-
-  widgetInstance.render({
-    state: { isState: true },
-    results: { isResults: true },
-  });
-
-  expect(renderFn).toHaveBeenCalledWith(
-    expect.objectContaining({
-      state: { isState: true },
-      results: { isResults: true },
-    }),
-    false
-  );
-});
-
-it('instantSearchInstance is forwarded', () => {
-  const renderFn = jest.fn();
-  const widgetFactory = connectStateResults(renderFn);
-  const widgetInstance = widgetFactory({ myParams: true });
-
-  const instantSearchInstance = {};
-
-  widgetInstance.init({ instantSearchInstance });
-
-  expect(renderFn).toHaveBeenCalledWith(
-    expect.objectContaining({ instantSearchInstance }),
-    true
-  );
-
-  widgetInstance.render({
-    instantSearchInstance,
-    state: { isState: true },
-    results: { isResults: true },
-  });
-
-  expect(renderFn).toHaveBeenCalledWith(
-    expect.objectContaining({
-      instantSearchInstance,
-    }),
-    false
-  );
-});
-
-it('widgetParams are forwarded, and default to {}', () => {
-  const renderFn = jest.fn();
-  const widgetFactory = connectStateResults(renderFn);
-  const widgetInstance = widgetFactory({ myParams: true });
-
-  widgetInstance.init({});
-
-  expect(renderFn).toHaveBeenCalledWith(
-    expect.objectContaining({ widgetParams: { myParams: true } }),
-    true
-  );
-
-  widgetInstance.render({});
-
-  expect(renderFn).toHaveBeenCalledWith(
-    expect.objectContaining({ widgetParams: { myParams: true } }),
-    false
-  );
-});
-
-it('widgetParams are optional, and default to {}', () => {
-  const renderFn = jest.fn();
-  const widgetFactory = connectStateResults(renderFn);
-  const widgetInstance = widgetFactory();
-
-  widgetInstance.init({});
-
-  expect(renderFn).toHaveBeenCalledWith(
-    expect.objectContaining({ widgetParams: {} }),
-    true
-  );
-
-  widgetInstance.render({});
-
-  expect(renderFn).toHaveBeenCalledWith(
-    expect.objectContaining({ widgetParams: {} }),
-    false
-  );
-});
-
-it('unmountFn gets called on dispose', () => {
-  const unmountFn = jest.fn();
-  const widgetFactory = connectStateResults(() => {}, unmountFn);
-  const widgetInstance = widgetFactory();
-  widgetInstance.dispose();
-
-  expect(unmountFn).toHaveBeenCalledTimes(1);
-});
-
-it('unmountFn is optional', () => {
-  const unmountFn = jest.fn();
-  const widgetFactory = connectStateResults(() => {}, unmountFn);
-  const widgetInstance = widgetFactory();
-  widgetInstance.dispose();
-});

From 8001aecc35e6ac72aad352d20e2c7e7393cd860a Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Thu, 26 Dec 2024 15:22:37 +0100
Subject: [PATCH 24/37] fix(connectors): replace hits for items (#6486)

* fix(connectors): replace hits for items

In the past we have added an `items` alias for the previously added `hits`, so that all widgets are more consistent and the same widget would be usable between hits and relatedItems connectors for example. This is now continued with:
- hits render property removed
- infinite hits cache "write" receives `{ page, items }` instead of hits

[FX-3207]

BREAKING CHANGE: connectHits: `hits` property from render is replaced with `items`
BREAKING CHANGE: connectInfiniteHits: `hits` property from render is replaced with `items`
BREAKING CHANGE: infiniteHits: the cache.write function gets called with `{ page, items }` instead of `{ page, hits }`

* bim
---
 .../connectors/__tests__/connectHits.test.ts  | 20 +++---
 .../__tests__/connectInfiniteHits.test.ts     | 68 +++++++++++--------
 .../src/connectors/connectHits.ts             |  8 ---
 .../src/connectors/connectInfiniteHits.ts     | 55 +++++++--------
 .../__tests__/sessionStorage-key.test.ts      |  6 +-
 .../__tests__/sessionStorage.test.ts          |  6 +-
 .../lib/infiniteHitsCache/sessionStorage.ts   |  4 +-
 .../widgets/__tests__/index-widget.test.ts    |  2 +-
 .../instantsearch.js/src/connectors/index.ts  |  2 +-
 .../src/connectors/__tests__/useHits.test.tsx |  2 -
 .../__tests__/useInfiniteHits.test.tsx        |  2 -
 tests/common/widgets/infinite-hits/options.ts | 14 ++--
 12 files changed, 87 insertions(+), 102 deletions(-)

diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectHits.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectHits.test.ts
index cbbf982ee8..b0973c7154 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectHits.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectHits.test.ts
@@ -122,7 +122,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
 
     expect(renderFn).toHaveBeenLastCalledWith(
       expect.objectContaining({
-        hits: [],
+        items: [],
         results: undefined,
       }),
       expect.anything()
@@ -146,7 +146,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
 
     expect(renderFn).toHaveBeenLastCalledWith(
       expect.objectContaining({
-        hits,
+        items: hits,
         results,
       }),
       expect.anything()
@@ -170,7 +170,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
 
     expect(renderFn).toHaveBeenLastCalledWith(
       expect.objectContaining({
-        hits: [],
+        items: [],
         results: undefined,
       }),
       expect.anything()
@@ -217,7 +217,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
 
     expect(renderFn).toHaveBeenLastCalledWith(
       expect.objectContaining({
-        hits: expectedHits,
+        items: expectedHits,
         results,
       }),
       expect.anything()
@@ -244,7 +244,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
 
     expect(renderFn).toHaveBeenNthCalledWith(
       1,
-      expect.objectContaining({ hits: [], results: undefined }),
+      expect.objectContaining({ items: [], results: undefined }),
       expect.anything()
     );
 
@@ -272,7 +272,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
     expect(renderFn).toHaveBeenNthCalledWith(
       2,
       expect.objectContaining({
-        hits: expectedHits,
+        items: expectedHits,
         results,
       }),
       expect.anything()
@@ -345,7 +345,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
     expect(renderFn).toHaveBeenNthCalledWith(
       2,
       expect.objectContaining({
-        hits: expectedHits,
+        items: expectedHits,
       }),
       expect.anything()
     );
@@ -450,7 +450,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
     expect(renderFn).toHaveBeenNthCalledWith(
       2,
       expect.objectContaining({
-        hits: expectedHits,
+        items: expectedHits,
         results,
       }),
       expect.anything()
@@ -505,7 +505,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
       );
 
       expect(renderState1.hits).toEqual({
-        hits: [],
         items: [],
         sendEvent: expect.any(Function),
         results: undefined,
@@ -536,7 +535,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
       ];
 
       expect(renderState2.hits).toEqual({
-        hits: expectedHits,
         items: expectedHits,
         sendEvent: renderState1.hits.sendEvent,
         results,
@@ -566,7 +564,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
       );
 
       expect(renderState1).toEqual({
-        hits: [],
         items: [],
         banner: undefined,
         sendEvent: expect.any(Function),
@@ -603,7 +600,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
       ];
 
       expect(renderState2).toEqual({
-        hits: expectedHits,
         items: expectedHits,
         banner,
         sendEvent: renderState1.sendEvent,
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectInfiniteHits.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectInfiniteHits.test.ts
index 53a3b72ecd..261d89ff69 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectInfiniteHits.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectInfiniteHits.test.ts
@@ -105,7 +105,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     expect(renderFn).toHaveBeenLastCalledWith(
       expect.objectContaining({
         instantSearchInstance,
-        hits: [],
+        items: [],
         showPrevious: expect.any(Function),
         showMore: expect.any(Function),
         results: undefined,
@@ -133,7 +133,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     expect(renderFn).toHaveBeenLastCalledWith(
       expect.objectContaining({
         instantSearchInstance,
-        hits: [],
+        items: [],
         showPrevious: expect.any(Function),
         showMore: expect.any(Function),
         results: expect.any(Object),
@@ -163,7 +163,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     );
 
     const firstRenderOptions = renderFn.mock.calls[0][0];
-    expect(firstRenderOptions.hits).toEqual([]);
+    expect(firstRenderOptions.items).toEqual([]);
     expect(firstRenderOptions.results).toBe(undefined);
 
     const hits = [
@@ -184,7 +184,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
 
     const secondRenderOptions = renderFn.mock.calls[1][0];
     const { showMore } = secondRenderOptions;
-    expect(secondRenderOptions.hits).toEqual(hits);
+    expect(secondRenderOptions.items).toEqual(hits);
     expect(secondRenderOptions.results).toEqual(results);
     showMore();
     expect(helper.search).toHaveBeenCalledTimes(1);
@@ -207,7 +207,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     );
 
     const thirdRenderOptions = renderFn.mock.calls[2][0];
-    expect(thirdRenderOptions.hits).toEqual([...hits, ...otherHits]);
+    expect(thirdRenderOptions.items).toEqual([...hits, ...otherHits]);
     expect(thirdRenderOptions.results).toEqual(otherResults);
   });
 
@@ -230,7 +230,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     );
 
     const firstRenderOptions = renderFn.mock.calls[0][0];
-    expect(firstRenderOptions.hits).toEqual([]);
+    expect(firstRenderOptions.items).toEqual([]);
     expect(firstRenderOptions.results).toBe(undefined);
 
     const hits = [
@@ -251,7 +251,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
 
     const secondRenderOptions = renderFn.mock.calls[1][0];
     const { showPrevious } = secondRenderOptions;
-    expect(secondRenderOptions.hits).toEqual(hits);
+    expect(secondRenderOptions.items).toEqual(hits);
     expect(secondRenderOptions.results).toEqual(results);
     showPrevious();
     expect(helper.state.page).toBe(0);
@@ -279,7 +279,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     );
 
     const thirdRenderOptions = renderFn.mock.calls[2][0];
-    expect(thirdRenderOptions.hits).toEqual([...previousHits, ...hits]);
+    expect(thirdRenderOptions.items).toEqual([...previousHits, ...hits]);
     expect(thirdRenderOptions.results).toEqual(previousResults);
   });
 
@@ -315,7 +315,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     ).toHaveBeenCalledWith(expect.objectContaining({ page: 3 }));
   });
 
-  it('Provides the hits and flush hists cache on query changes', () => {
+  it('Provides the hits and flush hits cache on query changes', () => {
     const renderFn = jest.fn();
     const makeWidget = connectInfiniteHits(renderFn);
     const widget = makeWidget({});
@@ -331,7 +331,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     );
 
     const firstRenderOptions = renderFn.mock.calls[0][0];
-    expect(firstRenderOptions.hits).toEqual([]);
+    expect(firstRenderOptions.items).toEqual([]);
     expect(firstRenderOptions.results).toBe(undefined);
 
     const hits = [
@@ -351,7 +351,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     );
 
     const secondRenderOptions = renderFn.mock.calls[1][0];
-    expect(secondRenderOptions.hits).toEqual(hits);
+    expect(secondRenderOptions.items).toEqual(hits);
     expect(secondRenderOptions.results).toEqual(results);
 
     helper.setQuery('data');
@@ -374,7 +374,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     );
 
     const thirdRenderOptions = renderFn.mock.calls[2][0];
-    expect(thirdRenderOptions.hits).toEqual(otherHits);
+    expect(thirdRenderOptions.items).toEqual(otherHits);
     expect(thirdRenderOptions.results).toEqual(otherResults);
   });
 
@@ -480,7 +480,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     );
 
     const firstRenderOptions = renderFn.mock.calls[0][0];
-    expect(firstRenderOptions.hits).toEqual([]);
+    expect(firstRenderOptions.items).toEqual([]);
     expect(firstRenderOptions.results).toBe(undefined);
 
     const hits = [
@@ -524,7 +524,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     ];
 
     const secondRenderOptions = renderFn.mock.calls[1][0];
-    expect(secondRenderOptions.hits).toEqual(escapedHits);
+    expect(secondRenderOptions.items).toEqual(escapedHits);
     expect(secondRenderOptions.results).toEqual(results);
   });
 
@@ -548,7 +548,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     );
 
     const firstRenderOptions = renderFn.mock.calls[0][0];
-    expect(firstRenderOptions.hits).toEqual([]);
+    expect(firstRenderOptions.items).toEqual([]);
     expect(firstRenderOptions.results).toBe(undefined);
 
     const hits = [
@@ -586,7 +586,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     ];
 
     const secondRenderOptions = renderFn.mock.calls[1][0];
-    expect(secondRenderOptions.hits).toEqual(transformedHits);
+    expect(secondRenderOptions.items).toEqual(transformedHits);
     expect(secondRenderOptions.results).toEqual(results);
   });
 
@@ -683,7 +683,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     expect(renderFn).toHaveBeenNthCalledWith(
       2,
       expect.objectContaining({
-        hits: [
+        items: [
           {
             name: 'hello',
             _highlightResult: {
@@ -754,7 +754,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     expect(renderFn).toHaveBeenNthCalledWith(
       2,
       expect.objectContaining({
-        hits: [
+        items: [
           {
             name: 'name 1',
             objectID: '1',
@@ -819,7 +819,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     expect(renderFn).toHaveBeenCalledTimes(3);
     expect(renderFn).toHaveBeenLastCalledWith(
       expect.objectContaining({
-        hits: [{ objectID: 'a' }, { objectID: 'b' }],
+        items: [{ objectID: 'a' }, { objectID: 'b' }],
       }),
       false
     );
@@ -841,7 +841,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
     expect(renderFn).toHaveBeenCalledTimes(4);
     expect(renderFn).toHaveBeenLastCalledWith(
       expect.objectContaining({
-        hits: [{ objectID: 'a' }, { objectID: 'b' }],
+        items: [{ objectID: 'a' }, { objectID: 'b' }],
       }),
       false
     );
@@ -947,7 +947,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       renderWidget({ results: searchResults });
 
       let renderOptions = renderFn.mock.calls[2][0];
-      expect(renderOptions.hits).toEqual(firstPageHits);
+      expect(renderOptions.items).toEqual(firstPageHits);
       expect(renderOptions.results).toEqual(searchResults);
 
       // Search: page 2
@@ -964,7 +964,10 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       renderWidget({ results: searchResults });
 
       renderOptions = renderFn.mock.calls[3][0];
-      expect(renderOptions.hits).toEqual([...firstPageHits, ...secondPageHits]);
+      expect(renderOptions.items).toEqual([
+        ...firstPageHits,
+        ...secondPageHits,
+      ]);
       expect(renderOptions.results).toEqual(searchResults);
     }
 
@@ -991,7 +994,10 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       renderWidget({ results: searchResults });
 
       const renderOptions = renderFn.mock.calls[2][0];
-      expect(renderOptions.hits).toEqual([...firstPageHits, ...secondPageHits]);
+      expect(renderOptions.items).toEqual([
+        ...firstPageHits,
+        ...secondPageHits,
+      ]);
       expect(renderOptions.results).toEqual(searchResults);
     }
   });
@@ -1063,7 +1069,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       renderWidget({ results: searchResults });
 
       let renderOptions = renderFn.mock.calls[2][0];
-      expect(renderOptions.hits).toEqual(firstPageHits);
+      expect(renderOptions.items).toEqual(firstPageHits);
       expect(renderOptions.results).toEqual(searchResults);
 
       // Search: page 2
@@ -1081,7 +1087,10 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       renderWidget({ results: searchResults });
 
       renderOptions = renderFn.mock.calls[3][0];
-      expect(renderOptions.hits).toEqual([...firstPageHits, ...secondPageHits]);
+      expect(renderOptions.items).toEqual([
+        ...firstPageHits,
+        ...secondPageHits,
+      ]);
       expect(renderOptions.results).toEqual(searchResults);
     }
 
@@ -1109,7 +1118,10 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       renderWidget({ results: searchResults });
 
       const renderOptions = renderFn.mock.calls[2][0];
-      expect(renderOptions.hits).toEqual([...firstPageHits, ...secondPageHits]);
+      expect(renderOptions.items).toEqual([
+        ...firstPageHits,
+        ...secondPageHits,
+      ]);
       expect(renderOptions.results).toEqual(searchResults);
     }
   });
@@ -1323,7 +1335,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       const renderState1 = infiniteHitsWidget.getRenderState({}, initOptions);
 
       expect(renderState1.infiniteHits).toEqual({
-        hits: [],
         items: [],
         currentPageHits: [],
         sendEvent: expect.any(Function),
@@ -1386,7 +1397,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       ];
 
       expect(renderState2.infiniteHits).toEqual({
-        hits: expectedHits,
         items: expectedHits,
         currentPageHits: expectedCurrentPageHits,
         sendEvent: renderState1.infiniteHits.sendEvent,
@@ -1416,7 +1426,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       const renderState1 = infiniteHitsWidget.getWidgetRenderState(initOptions);
 
       expect(renderState1).toEqual({
-        hits: [],
         items: [],
         currentPageHits: [],
         sendEvent: expect.any(Function),
@@ -1492,7 +1501,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
       ];
 
       expect(renderState2).toEqual({
-        hits: expectedHits,
         items: expectedHits,
         currentPageHits: expectedCurrentPageHits,
         sendEvent: renderState1.sendEvent,
diff --git a/packages/instantsearch-core/src/connectors/connectHits.ts b/packages/instantsearch-core/src/connectors/connectHits.ts
index 026ff0ca1a..fd2970f1d5 100644
--- a/packages/instantsearch-core/src/connectors/connectHits.ts
+++ b/packages/instantsearch-core/src/connectors/connectHits.ts
@@ -30,12 +30,6 @@ const withUsage = createDocumentationMessageGenerator({
 });
 
 export type HitsRenderState<THit extends NonNullable<object> = BaseHit> = {
-  /**
-   * The matched hits from Algolia API.
-   * @deprecated use `items` instead
-   */
-  hits: Array<Hit<THit>>;
-
   /**
    * The matched hits from Algolia API.
    */
@@ -154,7 +148,6 @@ export const connectHits = function connectHits<TWidgetParams>(
 
         if (!results) {
           return {
-            hits: [],
             items: [],
             results: undefined,
             banner: undefined,
@@ -185,7 +178,6 @@ export const connectHits = function connectHits<TWidgetParams>(
         const banner = results.renderingContent?.widgets?.banners?.[0];
 
         return {
-          hits: items,
           items,
           results,
           banner,
diff --git a/packages/instantsearch-core/src/connectors/connectInfiniteHits.ts b/packages/instantsearch-core/src/connectors/connectInfiniteHits.ts
index b8105d54cf..c72105f760 100644
--- a/packages/instantsearch-core/src/connectors/connectInfiniteHits.ts
+++ b/packages/instantsearch-core/src/connectors/connectInfiniteHits.ts
@@ -33,7 +33,7 @@ import type {
   SearchResults,
 } from 'algoliasearch-helper';
 
-export type InfiniteHitsCachedHits<THit extends NonNullable<object>> = {
+export type InfiniteHitsCachedItems<THit extends NonNullable<object>> = {
   [page: number]: Array<Hit<THit>>;
 };
 
@@ -41,14 +41,14 @@ type Read<THit extends NonNullable<object>> = ({
   state,
 }: {
   state: PlainSearchParameters;
-}) => InfiniteHitsCachedHits<THit> | null;
+}) => InfiniteHitsCachedItems<THit> | null;
 
 type Write<THit extends NonNullable<object>> = ({
   state,
-  hits,
+  items,
 }: {
   state: PlainSearchParameters;
-  hits: InfiniteHitsCachedHits<THit>;
+  items: InfiniteHitsCachedItems<THit>;
 }) => void;
 
 export type InfiniteHitsCache<THit extends NonNullable<object> = BaseHit> = {
@@ -120,12 +120,6 @@ export type InfiniteHitsRenderState<
    */
   currentPageHits: Array<Hit<THit>>;
 
-  /**
-   * Hits for current and cached pages
-   * @deprecated use `items` instead
-   */
-  hits: Array<Hit<THit>>;
-
   /**
    * Hits for current and cached pages
    */
@@ -182,29 +176,29 @@ function normalizeState(state: PlainSearchParameters) {
 function getInMemoryCache<
   THit extends NonNullable<object>
 >(): InfiniteHitsCache<THit> {
-  let cachedHits: InfiniteHitsCachedHits<THit> | null = null;
+  let cachedItems: InfiniteHitsCachedItems<THit> | null = null;
   let cachedState: PlainSearchParameters | null = null;
   return {
     read({ state }) {
       return isEqual(cachedState, getStateWithoutPage(state))
-        ? cachedHits
+        ? cachedItems
         : null;
     },
-    write({ state, hits }) {
+    write({ state, items }) {
       cachedState = getStateWithoutPage(state);
-      cachedHits = hits;
+      cachedItems = items;
     },
   };
 }
 
-function extractHitsFromCachedHits<THit extends NonNullable<object>>(
-  cachedHits: InfiniteHitsCachedHits<THit>
+function extractHitsFromCachedItems<THit extends NonNullable<object>>(
+  cachedItems: InfiniteHitsCachedItems<THit>
 ) {
-  return Object.keys(cachedHits)
+  return Object.keys(cachedItems)
     .map(Number)
     .sort((a, b) => a - b)
     .reduce((acc: Array<Hit<THit>>, page) => {
-      return acc.concat(cachedHits[page]);
+      return acc.concat(cachedItems[page]);
     }, []);
 }
 
@@ -232,10 +226,10 @@ export const connectInfiniteHits = function connectInfiniteHits<
     let sendEvent: SendEventForHits;
     const getFirstReceivedPage = (
       state: SearchParameters,
-      cachedHits: InfiniteHitsCachedHits<THit>
+      cachedItems: InfiniteHitsCachedItems<THit>
     ) => {
       const { page = 0 } = state;
-      const pages = Object.keys(cachedHits).map(Number);
+      const pages = Object.keys(cachedItems).map(Number);
       if (pages.length === 0) {
         return page;
       } else {
@@ -244,10 +238,10 @@ export const connectInfiniteHits = function connectInfiniteHits<
     };
     const getLastReceivedPage = (
       state: SearchParameters,
-      cachedHits: InfiniteHitsCachedHits<THit>
+      cachedItems: InfiniteHitsCachedItems<THit>
     ) => {
       const { page = 0 } = state;
-      const pages = Object.keys(cachedHits).map(Number);
+      const pages = Object.keys(cachedItems).map(Number);
       if (pages.length === 0) {
         return page;
       } else {
@@ -345,7 +339,7 @@ export const connectInfiniteHits = function connectInfiniteHits<
          */
         const state = parent.getPreviousState() || existingState;
 
-        const cachedHits = cache.read({ state: normalizeState(state) }) || {};
+        const cachedItems = cache.read({ state: normalizeState(state) }) || {};
 
         const banner = results?.renderingContent?.widgets?.banners?.[0];
 
@@ -359,7 +353,7 @@ export const connectInfiniteHits = function connectInfiniteHits<
           });
           isFirstPage =
             state.page === undefined ||
-            getFirstReceivedPage(state, cachedHits) === 0;
+            getFirstReceivedPage(state, cachedItems) === 0;
         } else {
           const { page = 0 } = state;
 
@@ -404,26 +398,25 @@ export const connectInfiniteHits = function connectInfiniteHits<
             !state.hierarchicalFacets?.length;
 
           if (
-            cachedHits[page] === undefined &&
+            cachedItems[page] === undefined &&
             !results.__isArtificial &&
             instantSearchInstance.status === 'idle' &&
             !(hasDynamicWidgets && hasNoFacets)
           ) {
-            cachedHits[page] = transformedHits;
-            cache.write({ state: normalizeState(state), hits: cachedHits });
+            cachedItems[page] = transformedHits;
+            cache.write({ state: normalizeState(state), items: cachedItems });
           }
           currentPageHits = transformedHits;
 
-          isFirstPage = getFirstReceivedPage(state, cachedHits) === 0;
+          isFirstPage = getFirstReceivedPage(state, cachedItems) === 0;
         }
 
-        const items = extractHitsFromCachedHits(cachedHits);
+        const items = extractHitsFromCachedItems(cachedItems);
         const isLastPage = results
-          ? results.nbPages <= getLastReceivedPage(state, cachedHits) + 1
+          ? results.nbPages <= getLastReceivedPage(state, cachedItems) + 1
           : true;
 
         return {
-          hits: items,
           items,
           currentPageHits,
           sendEvent,
diff --git a/packages/instantsearch-core/src/lib/infiniteHitsCache/__tests__/sessionStorage-key.test.ts b/packages/instantsearch-core/src/lib/infiniteHitsCache/__tests__/sessionStorage-key.test.ts
index 9bd48e7f64..477d622ad6 100644
--- a/packages/instantsearch-core/src/lib/infiniteHitsCache/__tests__/sessionStorage-key.test.ts
+++ b/packages/instantsearch-core/src/lib/infiniteHitsCache/__tests__/sessionStorage-key.test.ts
@@ -59,7 +59,7 @@ describe('createInfiniteHitsSessionStorageCache', () => {
     const hits = {
       1: defaultHits,
     };
-    cache.write({ state, hits });
+    cache.write({ state, items: hits });
     expect(cache.read({ state })).toEqual(hits);
   });
 
@@ -68,7 +68,7 @@ describe('createInfiniteHitsSessionStorageCache', () => {
     const state = { query: 'hello' };
     const newState = { query: 'world' };
     const hits = { 1: defaultHits };
-    cache.write({ state, hits });
+    cache.write({ state, items: hits });
     expect(cache.read({ state: newState })).toBeNull();
   });
 
@@ -94,7 +94,7 @@ describe('createInfiniteHitsSessionStorageCache', () => {
     });
     const cache = createInfiniteHitsSessionStorageCache({ key: 'myKey' });
     expect(() => {
-      cache.write({ state: {}, hits: [] });
+      cache.write({ state: {}, items: [] });
     }).not.toThrow();
   });
 });
diff --git a/packages/instantsearch-core/src/lib/infiniteHitsCache/__tests__/sessionStorage.test.ts b/packages/instantsearch-core/src/lib/infiniteHitsCache/__tests__/sessionStorage.test.ts
index 94d8c1f6a1..81a475c94a 100644
--- a/packages/instantsearch-core/src/lib/infiniteHitsCache/__tests__/sessionStorage.test.ts
+++ b/packages/instantsearch-core/src/lib/infiniteHitsCache/__tests__/sessionStorage.test.ts
@@ -59,7 +59,7 @@ describe('createInfiniteHitsSessionStorageCache', () => {
     const hits = {
       1: defaultHits,
     };
-    cache.write({ state, hits });
+    cache.write({ state, items: hits });
     expect(cache.read({ state })).toEqual(hits);
   });
 
@@ -68,7 +68,7 @@ describe('createInfiniteHitsSessionStorageCache', () => {
     const state = { query: 'hello' };
     const newState = { query: 'world' };
     const hits = { 1: defaultHits };
-    cache.write({ state, hits });
+    cache.write({ state, items: hits });
     expect(cache.read({ state: newState })).toBeNull();
   });
 
@@ -94,7 +94,7 @@ describe('createInfiniteHitsSessionStorageCache', () => {
     });
     const cache = createInfiniteHitsSessionStorageCache();
     expect(() => {
-      cache.write({ state: {}, hits: [] });
+      cache.write({ state: {}, items: [] });
     }).not.toThrow();
   });
 });
diff --git a/packages/instantsearch-core/src/lib/infiniteHitsCache/sessionStorage.ts b/packages/instantsearch-core/src/lib/infiniteHitsCache/sessionStorage.ts
index 3455c0b2bb..40eb1d74eb 100644
--- a/packages/instantsearch-core/src/lib/infiniteHitsCache/sessionStorage.ts
+++ b/packages/instantsearch-core/src/lib/infiniteHitsCache/sessionStorage.ts
@@ -49,7 +49,7 @@ export function createInfiniteHitsSessionStorageCache({
         return null;
       }
     },
-    write({ state, hits }) {
+    write({ state, items }) {
       const sessionStorage = safelyRunOnBrowser<Storage | undefined>(
         ({ window }) => window.sessionStorage
       );
@@ -63,7 +63,7 @@ export function createInfiniteHitsSessionStorageCache({
           KEY,
           JSON.stringify({
             state: getStateWithoutPage(state),
-            hits,
+            hits: items,
           })
         );
       } catch (error) {
diff --git a/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts b/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts
index 4884a84f38..adb290a912 100644
--- a/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts
+++ b/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts
@@ -3612,7 +3612,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
       search.start();
       await wait(0);
 
-      const receivedHits = renderFn.mock.calls[1][0].hits;
+      const receivedHits = renderFn.mock.calls[1][0].items;
       expect(receivedHits).toEqual([
         expect.objectContaining({ objectID: '1' }),
         expect.objectContaining({ objectID: '2' }),
diff --git a/packages/instantsearch.js/src/connectors/index.ts b/packages/instantsearch.js/src/connectors/index.ts
index dacfa90f38..6ed5e8ca29 100644
--- a/packages/instantsearch.js/src/connectors/index.ts
+++ b/packages/instantsearch.js/src/connectors/index.ts
@@ -99,7 +99,7 @@ export type {
   InfiniteHitsWidgetDescription,
   InfiniteHitsConnectorParams,
   InfiniteHitsCache,
-  InfiniteHitsCachedHits,
+  InfiniteHitsCachedItems,
 } from 'instantsearch-core';
 
 export { connectLookingSimilar } from 'instantsearch-core';
diff --git a/packages/react-instantsearch-core/src/connectors/__tests__/useHits.test.tsx b/packages/react-instantsearch-core/src/connectors/__tests__/useHits.test.tsx
index 94f587a549..2308ab9975 100644
--- a/packages/react-instantsearch-core/src/connectors/__tests__/useHits.test.tsx
+++ b/packages/react-instantsearch-core/src/connectors/__tests__/useHits.test.tsx
@@ -17,7 +17,6 @@ describe('useHits', () => {
     // Initial render state from manual `getWidgetRenderState`
     expect(result.current).toEqual({
       banner: undefined,
-      hits: [],
       items: [],
       results: expect.objectContaining({ nbHits: 0 }),
       sendEvent: expect.any(Function),
@@ -27,7 +26,6 @@ describe('useHits', () => {
       // InstantSearch.js state from the `render` lifecycle step
       expect(result.current).toEqual({
         banner: undefined,
-        hits: [],
         items: [],
         results: expect.objectContaining({ nbHits: 0 }),
         sendEvent: expect.any(Function),
diff --git a/packages/react-instantsearch-core/src/connectors/__tests__/useInfiniteHits.test.tsx b/packages/react-instantsearch-core/src/connectors/__tests__/useInfiniteHits.test.tsx
index 94fb711894..c250d03057 100644
--- a/packages/react-instantsearch-core/src/connectors/__tests__/useInfiniteHits.test.tsx
+++ b/packages/react-instantsearch-core/src/connectors/__tests__/useInfiniteHits.test.tsx
@@ -16,7 +16,6 @@ describe('useInfiniteHits', () => {
 
     // Initial render state from manual `getWidgetRenderState`
     expect(result.current).toEqual({
-      hits: [],
       items: [],
       results: expect.objectContaining({ nbHits: 0 }),
       sendEvent: undefined,
@@ -30,7 +29,6 @@ describe('useInfiniteHits', () => {
     await waitFor(() => {
       // InstantSearch.js state from the `render` lifecycle step
       expect(result.current).toEqual({
-        hits: [],
         items: [],
         results: expect.objectContaining({ nbHits: 0 }),
         sendEvent: expect.any(Function),
diff --git a/tests/common/widgets/infinite-hits/options.ts b/tests/common/widgets/infinite-hits/options.ts
index d73f01a355..cd63064bef 100644
--- a/tests/common/widgets/infinite-hits/options.ts
+++ b/tests/common/widgets/infinite-hits/options.ts
@@ -15,7 +15,7 @@ import type { MockSearchClient } from '@instantsearch/mocks';
 import type { PlainSearchParameters } from 'algoliasearch-helper';
 import type {
   InfiniteHitsCache,
-  InfiniteHitsCachedHits,
+  InfiniteHitsCachedItems,
 } from 'instantsearch-core';
 import type { BaseHit, SearchResponse } from 'instantsearch.js';
 
@@ -493,7 +493,7 @@ export function createOptionsTests(
       });
 
       expect(cache.write).toHaveBeenCalledTimes(1);
-      expect(cache.write.mock.calls[0][0].hits).toEqual({
+      expect(cache.write.mock.calls[0][0].items).toEqual({
         '0': [
           { __position: 1, objectID: '0' },
           { __position: 2, objectID: '1' },
@@ -514,7 +514,7 @@ export function createOptionsTests(
       });
 
       expect(cache.write).toHaveBeenCalledTimes(2);
-      expect(cache.write.mock.calls[0][0].hits).toEqual({
+      expect(cache.write.mock.calls[0][0].items).toEqual({
         '0': [
           { __position: 1, objectID: '0' },
           { __position: 2, objectID: '1' },
@@ -535,7 +535,7 @@ export function createOptionsTests(
       // We write in cache before instantiating InstantSearch to mimic a
       // pre-filled cache from previous searches (e.g., after a page refresh)
       cache.write({
-        hits: {
+        items: {
           '0': [
             { __position: 1, objectID: 'one' },
             { __position: 2, objectID: 'two' },
@@ -677,7 +677,7 @@ function createCustomCache() {
 
   let cachedState: PlainSearchParameters | undefined = undefined;
 
-  let cachedHits: InfiniteHitsCachedHits<Record<string, any>> | undefined =
+  let cachedHits: InfiniteHitsCachedItems<Record<string, any>> | undefined =
     undefined;
 
   type Cache = InfiniteHitsCache<Record<string, any>> & { clear: () => void };
@@ -697,9 +697,9 @@ function createCustomCache() {
 
       return null;
     }),
-    write: jest.fn(({ state, hits }) => {
+    write: jest.fn(({ state, items }) => {
       cachedState = getStateWithoutPage(state);
-      cachedHits = hits;
+      cachedHits = items;
     }),
     clear: jest.fn(() => {
       cachedState = undefined;

From 22de6f5a092aaad2a34876c62d1329fbdea2adfa Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Thu, 26 Dec 2024 15:23:00 +0100
Subject: [PATCH 25/37] fix(state): change behaviour of
 preserveSharedStateOnUnmount (#6488)

With preserveSharedStateOnUnmount behavior, UI State is the source of truth, when a widget gets removed, the UI State is evaluated again and the parameters result out of that.

[FX-3192]

Not done in this PR yet:
- changed the signature of dispose (no more helper and state)
- implement a similar behavior for recommend

BREAKING CHANGE: The option `future.preserveSharedStateOnUnmount` is removed and now behaves as if it was set to `true`
---
 examples/react/next/pages/index.tsx           |   3 -
 .../e2e/__snapshots__/templates.test.js.snap  |   5 -
 .../templates/InstantSearch.js/src/app.js.hbs |   3 +-
 .../React InstantSearch/src/App.tsx.hbs       |   4 +-
 .../Vue InstantSearch with Vue 3/src/App.vue  |   1 -
 .../instantsearch-core/src/instantsearch.ts   |  17 +--
 .../src/types/instantsearch.ts                |  13 +-
 .../widgets/__tests__/index-widget.test.ts    | 122 ++----------------
 .../src/widgets/index-widget.ts               |  27 ++--
 9 files changed, 22 insertions(+), 173 deletions(-)

diff --git a/examples/react/next/pages/index.tsx b/examples/react/next/pages/index.tsx
index d307acb0c9..f536e8d36f 100644
--- a/examples/react/next/pages/index.tsx
+++ b/examples/react/next/pages/index.tsx
@@ -67,9 +67,6 @@ export default function HomePage({ serverState, url }: HomePageProps) {
           }),
         }}
         insights={true}
-        future={{
-          preserveSharedStateOnUnmount: true,
-        }}
       >
         <div className="Container">
           <div>
diff --git a/packages/create-instantsearch-app/e2e/__snapshots__/templates.test.js.snap b/packages/create-instantsearch-app/e2e/__snapshots__/templates.test.js.snap
index e89951ad7e..2f476b4ccc 100644
--- a/packages/create-instantsearch-app/e2e/__snapshots__/templates.test.js.snap
+++ b/packages/create-instantsearch-app/e2e/__snapshots__/templates.test.js.snap
@@ -1900,7 +1900,6 @@ const searchClient = algoliasearch('appId', 'apiKey');
 const search = instantsearch({
   indexName: 'indexName',
   searchClient,
-  future: { preserveSharedStateOnUnmount: true },
   insights: true,
 });
 
@@ -4125,8 +4124,6 @@ import './App.css';
 
 const searchClient = algoliasearch('appId', 'apiKey');
 
-const future = { preserveSharedStateOnUnmount: true };
-
 export function App() {
   return (
     <div>
@@ -4146,7 +4143,6 @@ export function App() {
         <InstantSearch
           searchClient={searchClient}
           indexName=\\"indexName\\"
-          future={future}
           insights
         >
           <Configure hitsPerPage={8} />
@@ -5218,7 +5214,6 @@ export default {
   data() {
     return {
       searchClient: algoliasearch('appId', 'apiKey'),
-      future: { preserveSharedStateOnUnmount: true },
     };
   },
 };
diff --git a/packages/create-instantsearch-app/src/templates/InstantSearch.js/src/app.js.hbs b/packages/create-instantsearch-app/src/templates/InstantSearch.js/src/app.js.hbs
index 76bb02773e..b4b95bc614 100644
--- a/packages/create-instantsearch-app/src/templates/InstantSearch.js/src/app.js.hbs
+++ b/packages/create-instantsearch-app/src/templates/InstantSearch.js/src/app.js.hbs
@@ -14,7 +14,6 @@ const searchClient = algoliasearch('{{appId}}', '{{apiKey}}');
 const search = instantsearch({
   indexName: '{{indexName}}',
   searchClient,
-  future: { preserveSharedStateOnUnmount: true },
   {{#if flags.insights}}insights: true,{{/if}}
 });
 
@@ -174,4 +173,4 @@ function isModifierEvent(event) {
     event.shiftKey
   );
 }
-{{/if}}
+{{/if}}
\ No newline at end of file
diff --git a/packages/create-instantsearch-app/src/templates/React InstantSearch/src/App.tsx.hbs b/packages/create-instantsearch-app/src/templates/React InstantSearch/src/App.tsx.hbs
index ecec31408e..d7a96f538e 100644
--- a/packages/create-instantsearch-app/src/templates/React InstantSearch/src/App.tsx.hbs	
+++ b/packages/create-instantsearch-app/src/templates/React InstantSearch/src/App.tsx.hbs	
@@ -31,8 +31,6 @@ const searchClient = algoliasearch(
   '{{apiKey}}'
 );
 
-const future = { preserveSharedStateOnUnmount: true };
-
 export function App() {
   return (
     <div>
@@ -49,7 +47,7 @@ export function App() {
       </header>
 
       <div className="container">
-        <InstantSearch searchClient={searchClient} indexName="{{indexName}}" future={future} {{#if flags.insights}}insights{{/if}}>
+        <InstantSearch searchClient={searchClient} indexName="{{indexName}}" {{#if flags.insights}}insights{{/if}}>
           <Configure hitsPerPage={8} />
           <div className="search-panel">
             <div className="search-panel__filters">
diff --git a/packages/create-instantsearch-app/src/templates/Vue InstantSearch with Vue 3/src/App.vue b/packages/create-instantsearch-app/src/templates/Vue InstantSearch with Vue 3/src/App.vue
index 77676ddea9..c19dd6ec2b 100644
--- a/packages/create-instantsearch-app/src/templates/Vue InstantSearch with Vue 3/src/App.vue	
+++ b/packages/create-instantsearch-app/src/templates/Vue InstantSearch with Vue 3/src/App.vue	
@@ -91,7 +91,6 @@ export default {
   data() {
     return {
       searchClient: algoliasearch('{{appId}}', '{{apiKey}}'),
-      future: { preserveSharedStateOnUnmount: true },
     };
   },
 };
diff --git a/packages/instantsearch-core/src/instantsearch.ts b/packages/instantsearch-core/src/instantsearch.ts
index d5d0b8f7ee..140a23c197 100644
--- a/packages/instantsearch-core/src/instantsearch.ts
+++ b/packages/instantsearch-core/src/instantsearch.ts
@@ -50,9 +50,7 @@ function defaultCreateURL() {
 
 export const INSTANTSEARCH_FUTURE_DEFAULTS: Required<
   InstantSearchOptions['future']
-> = {
-  preserveSharedStateOnUnmount: false,
-};
+> = {};
 
 /**
  * The actual implementation of the InstantSearch. This is
@@ -153,19 +151,6 @@ See ${createDocumentationLink({
       })}`
     );
 
-    if (__DEV__ && options.future?.preserveSharedStateOnUnmount === undefined) {
-      // eslint-disable-next-line no-console
-      console.info(`Starting from the next major version, InstantSearch will change how widgets state is preserved when they are removed. InstantSearch will keep the state of unmounted widgets to be usable by other widgets with the same attribute.
-
-We recommend setting \`future.preserveSharedStateOnUnmount\` to true to adopt this change today.
-To stay with the current behaviour and remove this warning, set the option to false.
-
-See documentation: ${createDocumentationLink({
-        name: 'instantsearch',
-      })}#widget-param-future
-          `);
-    }
-
     this.client = searchClient;
     this.future = future;
     this.indexName = indexName;
diff --git a/packages/instantsearch-core/src/types/instantsearch.ts b/packages/instantsearch-core/src/types/instantsearch.ts
index 4dcf93945d..5e131a2a95 100644
--- a/packages/instantsearch-core/src/types/instantsearch.ts
+++ b/packages/instantsearch-core/src/types/instantsearch.ts
@@ -96,18 +96,7 @@ export type InstantSearchOptions<
    * @default false
    */
   insights?: InsightsProps | boolean;
-  future?: {
-    /**
-     * Changes the way `dispose` is used in InstantSearch lifecycle.
-     *
-     * If `false` (by default), each widget unmounting will remove its state as well, even if there are multiple widgets reading that UI State.
-     *
-     * If `true`, each widget unmounting will only remove its own state if it's the last of its type. This allows for dynamically adding and removing widgets without losing their state.
-     *
-     * @default false
-     */
-    preserveSharedStateOnUnmount?: boolean; // @MAJOR remove option, only keep the "true" behaviour
-  };
+  future?: Record<string, never>;
 };
 
 export type InstantSearchStatus = 'idle' | 'loading' | 'stalled' | 'error';
diff --git a/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts b/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts
index adb290a912..2f5d90091d 100644
--- a/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts
+++ b/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts
@@ -603,11 +603,9 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
           hitsPerPage: 5,
         });
 
-        instance.addWidgets([
-          configureTopLevel,
-          configureSubLevel,
-          virtualSearchBox({}),
-        ]);
+        const searchBox = virtualSearchBox({});
+
+        instance.addWidgets([configureTopLevel, configureSubLevel, searchBox]);
 
         instance.init(
           createIndexInitOptions({
@@ -628,12 +626,12 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
           })
         );
 
-        instance.removeWidgets([configureSubLevel]);
+        instance.removeWidgets([searchBox]);
 
         expect(instance.getHelper()!.state).toEqual(
           new SearchParameters({
             index: 'indexName',
-            query: 'Apple iPhone',
+            hitsPerPage: 5,
             distinct: true,
           })
         );
@@ -646,111 +644,9 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
         ).toHaveBeenCalledTimes(2);
       });
 
-      it('cleans shared refinements when `preserveSharedStateOnUnmount` is unset', () => {
+      it('preserves shared refinements', () => {
         const instance = index({ indexName: 'indexName' });
-        const instantSearchInstance = createInstantSearch();
-
-        const refinementList1 = virtualRefinementList({
-          attribute: 'brand',
-        });
-
-        const refinementList2 = virtualRefinementList({
-          attribute: 'brand',
-        });
-
-        instance.addWidgets([refinementList1, refinementList2]);
-
-        instance.init(
-          createIndexInitOptions({
-            instantSearchInstance,
-            parent: null,
-          })
-        );
-
-        // Simulate a state change
-        instance.getHelper()!.addDisjunctiveFacetRefinement('brand', 'Apple');
-
-        expect(instance.getHelper()!.state).toEqual(
-          new SearchParameters({
-            index: 'indexName',
-            maxValuesPerFacet: 10,
-            disjunctiveFacets: ['brand'],
-            disjunctiveFacetsRefinements: {
-              brand: ['Apple'],
-            },
-          })
-        );
-
-        instance.removeWidgets([refinementList2]);
-
-        expect(instance.getHelper()!.state).toEqual(
-          new SearchParameters({
-            index: 'indexName',
-            maxValuesPerFacet: 10,
-            disjunctiveFacets: ['brand'],
-            disjunctiveFacetsRefinements: {
-              brand: [],
-            },
-          })
-        );
-      });
-
-      it('cleans shared refinements when `preserveSharedStateOnUnmount` is false', () => {
-        const instance = index({ indexName: 'indexName' });
-        const instantSearchInstance = createInstantSearch({
-          future: { preserveSharedStateOnUnmount: false },
-        });
-
-        const refinementList1 = virtualRefinementList({
-          attribute: 'brand',
-        });
-
-        const refinementList2 = virtualRefinementList({
-          attribute: 'brand',
-        });
-
-        instance.addWidgets([refinementList1, refinementList2]);
-
-        instance.init(
-          createIndexInitOptions({
-            instantSearchInstance,
-            parent: null,
-          })
-        );
-
-        // Simulate a state change
-        instance.getHelper()!.addDisjunctiveFacetRefinement('brand', 'Apple');
-
-        expect(instance.getHelper()!.state).toEqual(
-          new SearchParameters({
-            index: 'indexName',
-            maxValuesPerFacet: 10,
-            disjunctiveFacets: ['brand'],
-            disjunctiveFacetsRefinements: {
-              brand: ['Apple'],
-            },
-          })
-        );
-
-        instance.removeWidgets([refinementList2]);
-
-        expect(instance.getHelper()!.state).toEqual(
-          new SearchParameters({
-            index: 'indexName',
-            maxValuesPerFacet: 10,
-            disjunctiveFacets: ['brand'],
-            disjunctiveFacetsRefinements: {
-              brand: [],
-            },
-          })
-        );
-      });
-
-      it('preserves shared refinements when `preserveSharedStateOnUnmount` is true', () => {
-        const instance = index({ indexName: 'indexName' });
-        const instantSearchInstance = createInstantSearch({
-          future: { preserveSharedStateOnUnmount: true },
-        });
+        const instantSearchInstance = createInstantSearch({});
 
         const refinementList1 = virtualRefinementList({
           attribute: 'brand',
@@ -816,13 +712,15 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
           expect(widget.dispose).toHaveBeenCalledTimes(0);
         });
 
+        const stateBefore = instance.getHelper()!.state;
+
         instance.removeWidgets(widgets);
 
         widgets.forEach((widget) => {
           expect(widget.dispose).toHaveBeenCalledTimes(1);
           expect(widget.dispose).toHaveBeenCalledWith({
             helper: instance.getHelper(),
-            state: instance.getHelper()!.state,
+            state: stateBefore,
             recommendState: instance.getHelper()!.recommendState,
             parent: instance,
           });
diff --git a/packages/instantsearch-core/src/widgets/index-widget.ts b/packages/instantsearch-core/src/widgets/index-widget.ts
index 6251e44086..8b4fbcfc3f 100644
--- a/packages/instantsearch-core/src/widgets/index-widget.ts
+++ b/packages/instantsearch-core/src/widgets/index-widget.ts
@@ -438,8 +438,9 @@ export const index = (widgetParams: IndexWidgetParams): IndexWidget => {
       });
 
       if (localInstantSearchInstance && Boolean(widgets.length)) {
-        const { cleanedSearchState, cleanedRecommendState } = widgets.reduce(
+        const { cleanedRecommendState } = widgets.reduce(
           (states, widget) => {
+            // @MAJOR remove the "cleanup" part of the dispose method
             // the `dispose` method exists at this point we already assert it
             const next = widget.dispose!({
               helper: helper!,
@@ -462,24 +463,12 @@ export const index = (widgetParams: IndexWidgetParams): IndexWidget => {
           }
         );
 
-        const newState = localInstantSearchInstance.future
-          .preserveSharedStateOnUnmount
-          ? getLocalWidgetsSearchParameters(localWidgets, {
-              uiState: localUiState,
-              initialSearchParameters: new algoliasearchHelper.SearchParameters(
-                {
-                  index: this.getIndexName(),
-                }
-              ),
-            })
-          : getLocalWidgetsSearchParameters(localWidgets, {
-              uiState: getLocalWidgetsUiState(localWidgets, {
-                searchParameters: cleanedSearchState,
-                helper: helper!,
-              }),
-              initialSearchParameters: cleanedSearchState,
-            });
-
+        const newState = getLocalWidgetsSearchParameters(localWidgets, {
+          uiState: localUiState,
+          initialSearchParameters: new algoliasearchHelper.SearchParameters({
+            index: this.getIndexName(),
+          }),
+        });
         localUiState = getLocalWidgetsUiState(localWidgets, {
           searchParameters: newState,
           helper: helper!,

From 72aad49dfd57c06a613316f1ff94b7ab8d14f3d6 Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Mon, 30 Dec 2024 15:43:29 +0100
Subject: [PATCH 26/37] fix(connectors): don't expose duplicates of canRefine
 (#6484)

In the past, `canRefine` has been introduced as a consistent way to check if any widget can be refined. There were previous largely overlapping pieces of information exposed which were deprecated. These are now removed.

[FX-3195]

BREAKING CHANGE: clearRefinements: replace `hasRefinements` with `canRefine`
BREAKING CHANGE: hitsPerPage: replace `hasNoResults` with `!canRefine`
BREAKING CHANGE: numericMenu: replace `hasNoResults` with `!canRefine`
BREAKING CHANGE: ratingMenu: replace `hasNoResults` with `!canRefine`
BREAKING CHANGE: sortBy: replace `hasNoResults` with `!canRefine`
---
 .../src/components/NumericMenu.tsx            |  4 ++--
 .../__tests__/connectClearRefinements.test.ts | 19 -------------------
 .../__tests__/connectHitsPerPage.test.ts      |  6 ------
 .../__tests__/connectNumericMenu.test.ts      |  5 -----
 .../__tests__/connectRatingMenu.test.ts       |  5 -----
 .../__tests__/connectSortBy.test.ts           |  4 ----
 .../src/connectors/connectClearRefinements.ts |  7 -------
 .../src/connectors/connectHitsPerPage.ts      |  7 -------
 .../src/connectors/connectNumericMenu.ts      |  7 -------
 .../src/connectors/connectRatingMenu.ts       |  8 --------
 .../src/connectors/connectSortBy.ts           |  6 ------
 .../ClearRefinements/ClearRefinements.tsx     | 10 +++++-----
 .../__tests__/clear-refinements.test.tsx      | 10 ++++------
 .../clear-refinements/clear-refinements.tsx   |  4 ++--
 .../__tests__/useClearRefinements.test.tsx    |  4 ----
 .../__tests__/useHitsPerPage.test.tsx         |  2 --
 .../__tests__/useNumericMenu.test.tsx         |  2 --
 .../connectors/__tests__/useSortBy.test.tsx   |  2 --
 .../src/ui/CurrentRefinements.tsx             |  8 ++++----
 .../ui/__tests__/CurrentRefinements.test.tsx  |  2 +-
 .../src/widgets/CurrentRefinements.tsx        |  7 ++-----
 .../src/components/ClearRefinements.vue       | 12 ++++++------
 .../components/__tests__/ClearRefinements.js  |  6 +++---
 23 files changed, 29 insertions(+), 118 deletions(-)

diff --git a/examples/react/default-theme/src/components/NumericMenu.tsx b/examples/react/default-theme/src/components/NumericMenu.tsx
index 4a79c8350e..f1cbaa2a99 100644
--- a/examples/react/default-theme/src/components/NumericMenu.tsx
+++ b/examples/react/default-theme/src/components/NumericMenu.tsx
@@ -7,13 +7,13 @@ export type NumericMenuProps = React.ComponentProps<'div'> &
   UseNumericMenuProps;
 
 export function NumericMenu(props: NumericMenuProps) {
-  const { hasNoResults, items, refine } = useNumericMenu(props);
+  const { canRefine, items, refine } = useNumericMenu(props);
 
   return (
     <div
       className={cx(
         'ais-NumericMenu',
-        hasNoResults && 'ais-NumericMenu--noRefinement',
+        !canRefine && 'ais-NumericMenu--noRefinement',
         props.className
       )}
     >
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectClearRefinements.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectClearRefinements.test.ts
index df58df05e7..5bc39c2c5d 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectClearRefinements.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectClearRefinements.test.ts
@@ -97,7 +97,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/clear-refin
       expect(firstRenderingOptions.createURL).toBeInstanceOf(Function);
       expect(firstRenderingOptions.refine).toBeInstanceOf(Function);
       expect(firstRenderingOptions.canRefine).toBe(false);
-      expect(firstRenderingOptions.hasRefinements).toBe(false);
       expect(firstRenderingOptions.widgetParams).toEqual({
         foo: 'bar', // dummy param to test `widgetParams`
       });
@@ -121,7 +120,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/clear-refin
       expect(isFirstRenderAtRender).toBe(false);
       expect(secondRenderingOptions.createURL).toBeInstanceOf(Function);
       expect(secondRenderingOptions.refine).toBeInstanceOf(Function);
-      expect(secondRenderingOptions.hasRefinements).toBe(false);
       expect(secondRenderingOptions.canRefine).toBe(false);
     });
 
@@ -162,7 +160,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/clear-refin
         );
 
         expect(renderState1.clearRefinements).toEqual({
-          hasRefinements: false,
           canRefine: false,
           createURL: expect.any(Function),
           refine: expect.any(Function),
@@ -209,7 +206,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/clear-refin
         );
 
         expect(renderState2.clearRefinements).toEqual({
-          hasRefinements: true,
           canRefine: true,
           createURL: expect.any(Function),
           refine: expect.any(Function),
@@ -243,7 +239,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/clear-refin
         );
 
         expect(renderState1).toEqual({
-          hasRefinements: false,
           canRefine: false,
           createURL: expect.any(Function),
           refine: expect.any(Function),
@@ -289,7 +284,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/clear-refin
         );
 
         expect(renderState2).toEqual({
-          hasRefinements: true,
           canRefine: true,
           createURL: expect.any(Function),
           refine: expect.any(Function),
@@ -449,7 +443,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/clear-refin
         })
       );
 
-      expect(rendering.mock.calls[0][0].hasRefinements).toBe(false);
       expect(rendering.mock.calls[0][0].canRefine).toBe(false);
 
       widget.render!(
@@ -462,7 +455,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/clear-refin
         })
       );
 
-      expect(rendering.mock.calls[1][0].hasRefinements).toBe(true);
       expect(rendering.mock.calls[1][0].canRefine).toBe(true);
     });
 
@@ -488,7 +480,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/clear-refin
         })
       );
 
-      expect(rendering.mock.calls[0][0].hasRefinements).toBe(false);
       expect(rendering.mock.calls[0][0].canRefine).toBe(false);
 
       widget.render!(
@@ -501,7 +492,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/clear-refin
         })
       );
 
-      expect(rendering.mock.calls[1][0].hasRefinements).toBe(true);
       expect(rendering.mock.calls[1][0].canRefine).toBe(true);
     });
 
@@ -524,7 +514,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/clear-refin
         })
       );
 
-      expect(rendering.mock.calls[0][0].hasRefinements).toBe(false);
       expect(rendering.mock.calls[0][0].canRefine).toBe(false);
 
       widget.render!(
@@ -537,7 +526,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/clear-refin
         })
       );
 
-      expect(rendering.mock.calls[1][0].hasRefinements).toBe(false);
       expect(rendering.mock.calls[1][0].canRefine).toBe(false);
     });
 
@@ -557,7 +545,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/clear-refin
         })
       );
 
-      expect(rendering.mock.calls[0][0].hasRefinements).toBe(false);
       expect(rendering.mock.calls[0][0].canRefine).toBe(false);
 
       widget.render!(
@@ -570,7 +557,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/clear-refin
         })
       );
 
-      expect(rendering.mock.calls[1][0].hasRefinements).toBe(false);
       expect(rendering.mock.calls[1][0].canRefine).toBe(false);
     });
 
@@ -624,7 +610,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/clear-refin
 
       expect(helper.hasRefinements('facet1')).toBe(false);
       expect(helper.hasRefinements('facet2')).toBe(true);
-      expect(rendering.mock.calls[2][0].hasRefinements).toBe(false);
       expect(rendering.mock.calls[2][0].canRefine).toBe(false);
     });
 
@@ -675,7 +660,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/clear-refin
 
       expect(helper.hasRefinements('facet1')).toBe(false);
       expect(helper.state.query).toBe('');
-      expect(rendering.mock.calls[2][0].hasRefinements).toBe(false);
       expect(rendering.mock.calls[2][0].canRefine).toBe(false);
     });
 
@@ -723,8 +707,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/clear-refin
 
         expect(helper.hasRefinements('facet1')).toBe(false);
         expect(helper.hasRefinements('facet2')).toBe(true);
-
-        expect(rendering.mock.calls[1][0].hasRefinements).toBe(true);
         expect(rendering.mock.calls[1][0].canRefine).toBe(true);
       }
 
@@ -824,7 +806,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/clear-refin
       expect(helper.hasRefinements('facet2')).toBe(true);
       expect(helper.hasRefinements('facet3')).toBe(false);
       expect(helper.state.query).toBe('');
-      expect(rendering.mock.calls[2][0].hasRefinements).toBe(false);
       expect(rendering.mock.calls[2][0].canRefine).toBe(false);
     });
 
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectHitsPerPage.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectHitsPerPage.test.ts
index 3b2bc06ef5..f3f8a5038f 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectHitsPerPage.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectHitsPerPage.test.ts
@@ -769,7 +769,6 @@ You may want to add another entry to the \`items\` option with this value.`);
             ],
             createURL: expect.any(Function),
             refine: expect.any(Function),
-            hasNoResults: false,
             canRefine: true,
             widgetParams: {
               items: [
@@ -804,7 +803,6 @@ You may want to add another entry to the \`items\` option with this value.`);
           },
         ],
         createURL: expect.any(Function),
-        hasNoResults: true,
         canRefine: false,
         refine: expect.any(Function),
         widgetParams: {
@@ -841,7 +839,6 @@ You may want to add another entry to the \`items\` option with this value.`);
             ],
             createURL: () => '',
             refine: () => {},
-            hasNoResults: true,
             canRefine: false,
             widgetParams: {
               items: [
@@ -889,7 +886,6 @@ You may want to add another entry to the \`items\` option with this value.`);
           },
         ],
         createURL: expect.any(Function),
-        hasNoResults: true,
         canRefine: false,
         refine: expect.any(Function),
         widgetParams: {
@@ -944,7 +940,6 @@ You may want to add another entry to the \`items\` option with this value.`);
         ],
         refine: expect.any(Function),
         createURL: expect.any(Function),
-        hasNoResults: true,
         canRefine: false,
         widgetParams: {
           items: [
@@ -995,7 +990,6 @@ You may want to add another entry to the \`items\` option with this value.`);
           },
         ],
         createURL: expect.any(Function),
-        hasNoResults: true,
         canRefine: false,
         refine: expect.any(Function),
         widgetParams: {
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectNumericMenu.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectNumericMenu.test.ts
index 5a72026e1c..faef0e728d 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectNumericMenu.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectNumericMenu.test.ts
@@ -1172,7 +1172,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/numeric-men
       expect(renderState1.numericMenu).toEqual({
         numerics: {
           createURL: expect.any(Function),
-          hasNoResults: true,
           canRefine: false,
           items: [
             {
@@ -1232,7 +1231,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/numeric-men
           createURL: expect.any(Function),
           refine: renderState1.numericMenu.numerics.refine,
           sendEvent: renderState1.numericMenu.numerics.sendEvent,
-          hasNoResults: true,
           canRefine: false,
           items: [
             {
@@ -1314,7 +1312,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/numeric-men
         createURL: expect.any(Function),
         refine: expect.any(Function),
         sendEvent: expect.any(Function),
-        hasNoResults: true,
         canRefine: false,
         widgetParams: {
           attribute: 'numerics',
@@ -1365,7 +1362,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/numeric-men
         createURL: expect.any(Function),
         refine: expect.any(Function),
         sendEvent: expect.any(Function),
-        hasNoResults: true,
         canRefine: false,
         widgetParams: {
           attribute: 'numerics',
@@ -1401,7 +1397,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/numeric-men
 
       expect(renderState2).toEqual({
         createURL: expect.any(Function),
-        hasNoResults: true,
         canRefine: false,
         items: [
           {
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectRatingMenu.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectRatingMenu.test.ts
index 0e95d40c58..e0b094eba8 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectRatingMenu.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectRatingMenu.test.ts
@@ -493,7 +493,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/rating-menu
           canRefine: false,
           refine: expect.any(Function),
           sendEvent: expect.any(Function),
-          hasNoResults: true,
           widgetParams: {
             attribute: 'grade',
           },
@@ -577,7 +576,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/rating-menu
           canRefine: true,
           refine: expect.any(Function),
           sendEvent: renderState1.ratingMenu.grade.sendEvent,
-          hasNoResults: true,
           widgetParams: {
             attribute: 'grade',
           },
@@ -613,7 +611,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/rating-menu
         canRefine: false,
         refine: expect.any(Function),
         sendEvent: expect.any(Function),
-        hasNoResults: true,
         widgetParams: {
           attribute: 'grade',
         },
@@ -695,7 +692,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/rating-menu
         canRefine: true,
         refine: expect.any(Function),
         sendEvent: renderState1.sendEvent,
-        hasNoResults: true,
         widgetParams: {
           attribute: 'grade',
         },
@@ -735,7 +731,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/rating-menu
         canRefine: false,
         refine: expect.any(Function),
         sendEvent: renderState1.sendEvent,
-        hasNoResults: true,
         widgetParams: {
           attribute: 'grade',
         },
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectSortBy.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectSortBy.test.ts
index 6424fdaad1..e0f5f5c26f 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectSortBy.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectSortBy.test.ts
@@ -329,7 +329,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/sort-by/js/
       expect(renderState1.sortBy).toEqual({
         currentRefinement: 'index_default',
         refine: expect.any(Function),
-        hasNoResults: true,
         canRefine: false,
         options: [
           { label: 'default', value: 'index_default' },
@@ -371,7 +370,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/sort-by/js/
       expect(renderState2.sortBy).toEqual({
         currentRefinement: 'index_desc',
         refine: expect.any(Function),
-        hasNoResults: false,
         canRefine: true,
         options: [
           { label: 'default', value: 'index_default' },
@@ -412,7 +410,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/sort-by/js/
       expect(renderState1).toEqual({
         currentRefinement: 'index_desc',
         refine: expect.any(Function),
-        hasNoResults: true,
         canRefine: false,
         options: [
           { label: 'default', value: 'index_default' },
@@ -452,7 +449,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/sort-by/js/
       expect(renderState2).toEqual({
         currentRefinement: 'index_default',
         refine: expect.any(Function),
-        hasNoResults: false,
         canRefine: true,
         options: [
           { label: 'default', value: 'index_default' },
diff --git a/packages/instantsearch-core/src/connectors/connectClearRefinements.ts b/packages/instantsearch-core/src/connectors/connectClearRefinements.ts
index 453a3afffe..a810bc48be 100644
--- a/packages/instantsearch-core/src/connectors/connectClearRefinements.ts
+++ b/packages/instantsearch-core/src/connectors/connectClearRefinements.ts
@@ -43,12 +43,6 @@ export type ClearRefinementsRenderState = {
    */
   refine: () => void;
 
-  /**
-   * Indicates if search state is refined.
-   * @deprecated prefer reading canRefine
-   */
-  hasRefinements: boolean;
-
   /**
    * Indicates if search state can be refined.
    */
@@ -210,7 +204,6 @@ export const connectClearRefinements: ClearRefinementsConnector =
 
           return {
             canRefine,
-            hasRefinements: canRefine,
             refine: cachedRefine,
             createURL: cachedCreateURL,
             widgetParams,
diff --git a/packages/instantsearch-core/src/connectors/connectHitsPerPage.ts b/packages/instantsearch-core/src/connectors/connectHitsPerPage.ts
index 7eebe8a8d2..6f200a225e 100644
--- a/packages/instantsearch-core/src/connectors/connectHitsPerPage.ts
+++ b/packages/instantsearch-core/src/connectors/connectHitsPerPage.ts
@@ -88,12 +88,6 @@ export type HitsPerPageRenderState = {
    */
   refine: (value: number) => void;
 
-  /**
-   * Indicates whether or not the search has results.
-   * @deprecated Use `canRefine` instead.
-   */
-  hasNoResults: boolean;
-
   /**
    * Indicates if search state can be refined.
    */
@@ -278,7 +272,6 @@ You may want to add another entry to the \`items\` option with this value.`
               getWidgetUiState: this.getWidgetUiState,
               helper,
             }),
-            hasNoResults: !canRefine,
             canRefine,
             widgetParams,
           };
diff --git a/packages/instantsearch-core/src/connectors/connectNumericMenu.ts b/packages/instantsearch-core/src/connectors/connectNumericMenu.ts
index a44d6d0e60..968d96fb89 100644
--- a/packages/instantsearch-core/src/connectors/connectNumericMenu.ts
+++ b/packages/instantsearch-core/src/connectors/connectNumericMenu.ts
@@ -82,12 +82,6 @@ export type NumericMenuRenderState = {
    */
   createURL: CreateURL<NumericMenuRenderStateItem['value']>;
 
-  /**
-   * `true` if the last search contains no result
-   * @deprecated Use `canRefine` instead.
-   */
-  hasNoResults: boolean;
-
   /**
    * Indicates if search state can be refined.
    *
@@ -340,7 +334,6 @@ export const connectNumericMenu: NumericMenuConnector =
           return {
             createURL: connectorState.createURL(state),
             items: transformItems(preparedItems, { results }),
-            hasNoResults,
             canRefine: !(hasNoResults && allIsSelected),
             refine: connectorState.refine,
             sendEvent: connectorState.sendEvent,
diff --git a/packages/instantsearch-core/src/connectors/connectRatingMenu.ts b/packages/instantsearch-core/src/connectors/connectRatingMenu.ts
index 1a354dea7a..ef69a7920b 100644
--- a/packages/instantsearch-core/src/connectors/connectRatingMenu.ts
+++ b/packages/instantsearch-core/src/connectors/connectRatingMenu.ts
@@ -131,13 +131,6 @@ export type RatingMenuRenderState = {
    */
   refine: (value: string) => void;
 
-  /**
-   * `true` if the last search contains no result.
-   *
-   * @deprecated Use `canRefine` instead.
-   */
-  hasNoResults: boolean;
-
   /**
    * Send event to insights middleware
    */
@@ -415,7 +408,6 @@ export const connectRatingMenu: RatingMenuConnector =
 
           return {
             items: facetValues,
-            hasNoResults,
             canRefine: (!hasNoResults || refinementIsApplied) && totalCount > 0,
             refine: connectorState.toggleRefinementFactory(helper),
             sendEvent,
diff --git a/packages/instantsearch-core/src/connectors/connectSortBy.ts b/packages/instantsearch-core/src/connectors/connectSortBy.ts
index e27b8ce846..d6e0bf261b 100644
--- a/packages/instantsearch-core/src/connectors/connectSortBy.ts
+++ b/packages/instantsearch-core/src/connectors/connectSortBy.ts
@@ -57,11 +57,6 @@ export type SortByRenderState = {
    * Switches indices and triggers a new search.
    */
   refine: (value: string) => void;
-  /**
-   * `true` if the last search contains no result.
-   * @deprecated Use `canRefine` instead.
-   */
-  hasNoResults: boolean;
   /**
    * `true` if we can refine.
    */
@@ -179,7 +174,6 @@ export const connectSortBy: SortByConnector = function connectSortBy(
           currentRefinement: state.index,
           options: transformItems(items, { results }),
           refine: connectorState.setIndex,
-          hasNoResults,
           canRefine: !hasNoResults && items.length > 0,
           widgetParams,
         };
diff --git a/packages/instantsearch.js/src/components/ClearRefinements/ClearRefinements.tsx b/packages/instantsearch.js/src/components/ClearRefinements/ClearRefinements.tsx
index 637ecf2e44..3ab3958059 100644
--- a/packages/instantsearch.js/src/components/ClearRefinements/ClearRefinements.tsx
+++ b/packages/instantsearch.js/src/components/ClearRefinements/ClearRefinements.tsx
@@ -22,12 +22,12 @@ export type ClearRefinementsComponentTemplates =
 export type ClearRefinementsProps = {
   refine: ClearRefinementsRenderState['refine'];
   cssClasses: ClearRefinementsComponentCSSClasses;
-  hasRefinements: ClearRefinementsRenderState['hasRefinements'];
+  canRefine: ClearRefinementsRenderState['canRefine'];
   templateProps: PreparedTemplateProps<ClearRefinementsComponentTemplates>;
 };
 
 const ClearRefinements = ({
-  hasRefinements,
+  canRefine,
   refine,
   cssClasses,
   templateProps,
@@ -40,12 +40,12 @@ const ClearRefinements = ({
       rootProps={{
         className: cx(
           cssClasses.button,
-          !hasRefinements && cssClasses.disabledButton
+          !canRefine && cssClasses.disabledButton
         ),
         onClick: refine,
-        disabled: !hasRefinements,
+        disabled: !canRefine,
       }}
-      data={{ hasRefinements }}
+      data={{ canRefine }}
     />
   </div>
 );
diff --git a/packages/instantsearch.js/src/widgets/clear-refinements/__tests__/clear-refinements.test.tsx b/packages/instantsearch.js/src/widgets/clear-refinements/__tests__/clear-refinements.test.tsx
index bfd10d671a..0effc7d975 100644
--- a/packages/instantsearch.js/src/widgets/clear-refinements/__tests__/clear-refinements.test.tsx
+++ b/packages/instantsearch.js/src/widgets/clear-refinements/__tests__/clear-refinements.test.tsx
@@ -158,11 +158,9 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/clear-refin
         clearRefinements({
           container,
           templates: {
-            resetLabel({ hasRefinements }, { html }) {
+            resetLabel({ canRefine }, { html }) {
               return html`<span
-                >${hasRefinements
-                  ? 'Clear refinements'
-                  : 'No refinements'}</span
+                >${canRefine ? 'Clear refinements' : 'No refinements'}</span
               >`;
             },
           },
@@ -235,10 +233,10 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/clear-refin
         clearRefinements({
           container,
           templates: {
-            resetLabel({ hasRefinements }) {
+            resetLabel({ canRefine }) {
               return (
                 <span>
-                  {hasRefinements ? 'Clear refinements' : 'No refinements'}
+                  {canRefine ? 'Clear refinements' : 'No refinements'}
                 </span>
               );
             },
diff --git a/packages/instantsearch.js/src/widgets/clear-refinements/clear-refinements.tsx b/packages/instantsearch.js/src/widgets/clear-refinements/clear-refinements.tsx
index 63f08fb9bf..10b17f862a 100644
--- a/packages/instantsearch.js/src/widgets/clear-refinements/clear-refinements.tsx
+++ b/packages/instantsearch.js/src/widgets/clear-refinements/clear-refinements.tsx
@@ -61,7 +61,7 @@ const renderer =
       <ClearRefinements
         refine={refine}
         cssClasses={cssClasses}
-        hasRefinements={canRefine}
+        canRefine={canRefine}
         templateProps={renderState.templateProps!}
       />,
       containerNode
@@ -89,7 +89,7 @@ export type ClearRefinementsTemplates = Partial<{
   /**
    * Template for the content of the button
    */
-  resetLabel: Template<{ hasRefinements: boolean }>;
+  resetLabel: Template<{ canRefine: boolean }>;
 }>;
 
 export type ClearRefinementsWidgetParams = {
diff --git a/packages/react-instantsearch-core/src/connectors/__tests__/useClearRefinements.test.tsx b/packages/react-instantsearch-core/src/connectors/__tests__/useClearRefinements.test.tsx
index e958f8029a..22ba2f9204 100644
--- a/packages/react-instantsearch-core/src/connectors/__tests__/useClearRefinements.test.tsx
+++ b/packages/react-instantsearch-core/src/connectors/__tests__/useClearRefinements.test.tsx
@@ -20,7 +20,6 @@ describe('useClearRefinements', () => {
 
     // Initial render state from manual `getWidgetRenderState`
     expect(result.current).toEqual({
-      hasRefinements: false,
       canRefine: false,
       refine: expect.any(Function),
       createURL: expect.any(Function),
@@ -29,7 +28,6 @@ describe('useClearRefinements', () => {
     await waitFor(() => {
       // InstantSearch.js state from the `render` lifecycle step
       expect(result.current).toEqual({
-        hasRefinements: false,
         canRefine: false,
         refine: expect.any(Function),
         createURL: expect.any(Function),
@@ -62,7 +60,6 @@ describe('useClearRefinements', () => {
 
     // Initial render state from manual `getWidgetRenderState`
     expect(result.current).toEqual({
-      hasRefinements: true,
       canRefine: true,
       refine: expect.any(Function),
       createURL: expect.any(Function),
@@ -71,7 +68,6 @@ describe('useClearRefinements', () => {
     await waitFor(() => {
       // InstantSearch.js state from the `render` lifecycle step
       expect(result.current).toEqual({
-        hasRefinements: true,
         canRefine: true,
         refine: expect.any(Function),
         createURL: expect.any(Function),
diff --git a/packages/react-instantsearch-core/src/connectors/__tests__/useHitsPerPage.test.tsx b/packages/react-instantsearch-core/src/connectors/__tests__/useHitsPerPage.test.tsx
index 242fe21dfb..42afbea1d1 100644
--- a/packages/react-instantsearch-core/src/connectors/__tests__/useHitsPerPage.test.tsx
+++ b/packages/react-instantsearch-core/src/connectors/__tests__/useHitsPerPage.test.tsx
@@ -27,7 +27,6 @@ describe('useHitsPerPage', () => {
     expect(result.current).toEqual({
       refine: expect.any(Function),
       createURL: expect.any(Function),
-      hasNoResults: true,
       canRefine: false,
       items: [
         {
@@ -49,7 +48,6 @@ describe('useHitsPerPage', () => {
       expect(result.current).toEqual({
         refine: expect.any(Function),
         createURL: expect.any(Function),
-        hasNoResults: true,
         canRefine: false,
         items: [
           {
diff --git a/packages/react-instantsearch-core/src/connectors/__tests__/useNumericMenu.test.tsx b/packages/react-instantsearch-core/src/connectors/__tests__/useNumericMenu.test.tsx
index 46c6a266ca..e616bb4231 100644
--- a/packages/react-instantsearch-core/src/connectors/__tests__/useNumericMenu.test.tsx
+++ b/packages/react-instantsearch-core/src/connectors/__tests__/useNumericMenu.test.tsx
@@ -29,7 +29,6 @@ describe('useNumericMenu', () => {
     // Initial render state from manual `getWidgetRenderState`
     expect(result.current).toEqual({
       createURL: expect.any(Function),
-      hasNoResults: true,
       canRefine: false,
       items: [
         {
@@ -61,7 +60,6 @@ describe('useNumericMenu', () => {
       // InstantSearch.js state from the `render` lifecycle step
       expect(result.current).toEqual({
         createURL: expect.any(Function),
-        hasNoResults: true,
         canRefine: false,
         items: [
           {
diff --git a/packages/react-instantsearch-core/src/connectors/__tests__/useSortBy.test.tsx b/packages/react-instantsearch-core/src/connectors/__tests__/useSortBy.test.tsx
index f4981602b5..453177af54 100644
--- a/packages/react-instantsearch-core/src/connectors/__tests__/useSortBy.test.tsx
+++ b/packages/react-instantsearch-core/src/connectors/__tests__/useSortBy.test.tsx
@@ -22,7 +22,6 @@ describe('useSortBy', () => {
       currentRefinement: 'indexName',
       options: items,
       refine: expect.any(Function),
-      hasNoResults: expect.any(Boolean),
       canRefine: expect.any(Boolean),
     });
 
@@ -31,7 +30,6 @@ describe('useSortBy', () => {
         currentRefinement: 'indexName',
         options: items,
         refine: expect.any(Function),
-        hasNoResults: expect.any(Boolean),
         canRefine: expect.any(Boolean),
       });
     });
diff --git a/packages/react-instantsearch/src/ui/CurrentRefinements.tsx b/packages/react-instantsearch/src/ui/CurrentRefinements.tsx
index 8aa49e1613..f5fab56257 100644
--- a/packages/react-instantsearch/src/ui/CurrentRefinements.tsx
+++ b/packages/react-instantsearch/src/ui/CurrentRefinements.tsx
@@ -14,7 +14,7 @@ export type CurrentRefinementsProps = React.ComponentProps<'div'> & {
     > &
       Record<string, unknown>
   >;
-  hasRefinements?: boolean;
+  canRefine?: boolean;
 };
 
 export type CurrentRefinementsClassNames = {
@@ -59,7 +59,7 @@ export type CurrentRefinementsClassNames = {
 export function CurrentRefinements({
   classNames = {},
   items = [],
-  hasRefinements = false,
+  canRefine = false,
   ...props
 }: CurrentRefinementsProps) {
   return (
@@ -68,7 +68,7 @@ export function CurrentRefinements({
       className={cx(
         'ais-CurrentRefinements',
         classNames.root,
-        !hasRefinements &&
+        !canRefine &&
           cx(
             'ais-CurrentRefinements--noRefinement',
             classNames.noRefinementRoot
@@ -81,7 +81,7 @@ export function CurrentRefinements({
           'ais-CurrentRefinements-list',
           classNames.list,
           /* @MAJOR remove to ensure conformity with InstantSearch.css specs */
-          !hasRefinements &&
+          !canRefine &&
             cx(
               'ais-CurrentRefinements-list--noRefinement',
               classNames.noRefinementList
diff --git a/packages/react-instantsearch/src/ui/__tests__/CurrentRefinements.test.tsx b/packages/react-instantsearch/src/ui/__tests__/CurrentRefinements.test.tsx
index 1629522420..65f168fa13 100644
--- a/packages/react-instantsearch/src/ui/__tests__/CurrentRefinements.test.tsx
+++ b/packages/react-instantsearch/src/ui/__tests__/CurrentRefinements.test.tsx
@@ -52,7 +52,7 @@ describe('CurrentRefinements', () => {
             ],
           },
         ]}
-        hasRefinements={true}
+        canRefine={true}
       />
     );
 
diff --git a/packages/react-instantsearch/src/widgets/CurrentRefinements.tsx b/packages/react-instantsearch/src/widgets/CurrentRefinements.tsx
index aa981db69e..a8d5502d8c 100644
--- a/packages/react-instantsearch/src/widgets/CurrentRefinements.tsx
+++ b/packages/react-instantsearch/src/widgets/CurrentRefinements.tsx
@@ -6,10 +6,7 @@ import { CurrentRefinements as CurrentRefinementsUiComponent } from '../ui/Curre
 import type { CurrentRefinementsProps as CurrentRefinementsUiComponentProps } from '../ui/CurrentRefinements';
 import type { UseCurrentRefinementsProps } from 'react-instantsearch-core';
 
-type UiProps = Pick<
-  CurrentRefinementsUiComponentProps,
-  'items' | 'hasRefinements'
->;
+type UiProps = Pick<CurrentRefinementsUiComponentProps, 'items' | 'canRefine'>;
 
 export type CurrentRefinementsProps = Omit<
   CurrentRefinementsUiComponentProps,
@@ -36,7 +33,7 @@ export function CurrentRefinements({
 
   const uiProps: UiProps = {
     items,
-    hasRefinements: canRefine,
+    canRefine,
   };
 
   return <CurrentRefinementsUiComponent {...props} {...uiProps} />;
diff --git a/packages/vue-instantsearch/src/components/ClearRefinements.vue b/packages/vue-instantsearch/src/components/ClearRefinements.vue
index 066d9ae51a..e5a514932f 100644
--- a/packages/vue-instantsearch/src/components/ClearRefinements.vue
+++ b/packages/vue-instantsearch/src/components/ClearRefinements.vue
@@ -2,14 +2,17 @@
 <template>
   <div v-if="state" :class="suit()">
     <slot
-      :can-refine="canRefine"
+      :can-refine="state.canRefine"
       :refine="state.refine"
       :createURL="state.createURL"
     >
       <button
         type="reset"
-        :class="[suit('button'), !canRefine && suit('button', 'disabled')]"
-        :disabled="!canRefine"
+        :class="[
+          suit('button'),
+          !state.canRefine && suit('button', 'disabled'),
+        ]"
+        :disabled="!state.canRefine"
         @click.prevent="state.refine"
       >
         <slot name="resetLabel"> Clear refinements </slot>
@@ -61,9 +64,6 @@ export default {
         transformItems: this.transformItems,
       };
     },
-    canRefine() {
-      return this.state.hasRefinements;
-    },
   },
 };
 </script>
diff --git a/packages/vue-instantsearch/src/components/__tests__/ClearRefinements.js b/packages/vue-instantsearch/src/components/__tests__/ClearRefinements.js
index dc1eeb5b06..284d1ed527 100644
--- a/packages/vue-instantsearch/src/components/__tests__/ClearRefinements.js
+++ b/packages/vue-instantsearch/src/components/__tests__/ClearRefinements.js
@@ -11,7 +11,7 @@ jest.mock('../../mixins/widget');
 jest.mock('../../mixins/panel');
 
 const defaultState = {
-  hasRefinements: true,
+  canRefine: true,
   refine: () => {},
   createURL: () => {},
 };
@@ -59,7 +59,7 @@ describe('default render', () => {
   it('renders correctly without refinements', () => {
     __setState({
       ...defaultState,
-      hasRefinements: false,
+      canRefine: false,
     });
 
     const wrapper = mount(ClearRefinements);
@@ -118,7 +118,7 @@ describe('custom default render', () => {
   it('renders correctly without refinement', () => {
     __setState({
       ...defaultState,
-      hasRefinements: false,
+      canRefine: false,
     });
 
     const wrapper = mount({

From 9afa5cc449c71a522d87cc72a941218e37461e29 Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Mon, 30 Dec 2024 15:43:49 +0100
Subject: [PATCH 27/37] fix(refinementList): canRefine is calculated for
 searchable (#6494)

Before this PR `canRefine` was always true for searchable.

[FX-3190]

BREAKING CHANGE: `canRefine` is false if there are no results from searchable if there's a query.
---
 .../src/connectors/__tests__/connectRefinementList.test.ts    | 2 +-
 .../src/connectors/connectRefinementList.ts                   | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectRefinementList.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectRefinementList.test.ts
index 8c442e5e16..b945354dcd 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectRefinementList.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectRefinementList.test.ts
@@ -1122,7 +1122,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
       refine: expect.any(Function),
       searchForItems: expect.any(Function),
       isFromSearch: true,
-      canRefine: true,
+      canRefine: false,
       widgetParams: {
         attribute: 'category',
         limit: 1,
diff --git a/packages/instantsearch-core/src/connectors/connectRefinementList.ts b/packages/instantsearch-core/src/connectors/connectRefinementList.ts
index 8be83bd411..9dad501112 100644
--- a/packages/instantsearch-core/src/connectors/connectRefinementList.ts
+++ b/packages/instantsearch-core/src/connectors/connectRefinementList.ts
@@ -125,8 +125,6 @@ export type RefinementListRenderState = {
   isFromSearch: boolean;
   /**
    * `true` if a refinement can be applied.
-   * @MAJOR: reconsider how `canRefine` is computed so it both accounts for the
-   * items returned in the main search and in SFFV.
    */
   canRefine: boolean;
   /**
@@ -324,7 +322,7 @@ export const connectRefinementList: RefinementListConnector =
                       }),
                       items: normalizedFacetValues,
                       canToggleShowMore: false,
-                      canRefine: true,
+                      canRefine: normalizedFacetValues.length > 0,
                       isFromSearch: true,
                       instantSearchInstance,
                     },

From 4d93df6fca825f8c26a504e220f4ece06803d2e0 Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Tue, 31 Dec 2024 10:49:22 +0100
Subject: [PATCH 28/37] fix(instantsearch): remove addWidget, removeWidget
 methods (#6498)

* fix(instantsearch): remove addWidget, removeWidget methdos

BREAKING CHANGE: use removeWidgets, addWidgets instead of removeWidget, addWidget

* !fixup
---
 .../src/__tests__/instantsearch.test.tsx      | 94 +------------------
 .../instantsearch-core/src/instantsearch.ts   | 18 ----
 .../test/createInstantSearch.ts               |  2 -
 .../test/createInstantSearch.ts               |  2 -
 4 files changed, 2 insertions(+), 114 deletions(-)

diff --git a/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx b/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
index 89786f6b9a..b5d6477f23 100644
--- a/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
+++ b/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
@@ -673,26 +673,7 @@ See https://www.algolia.com/doc/api-reference/widgets/configure/js/`);
   });
 });
 
-describe('addWidget(s)', () => {
-  it('forwards the call of `addWidget` to the main index', () => {
-    const warn = jest.spyOn(global.console, 'warn');
-    warn.mockImplementation(() => {});
-
-    const searchClient = createSearchClient();
-    const search = new InstantSearch({
-      indexName: 'indexName',
-      searchClient,
-    });
-
-    expect(search.mainIndex.getWidgets()).toHaveLength(0);
-
-    expect(() => search.addWidget(createWidget())).toWarnDev(
-      '[InstantSearch]: addWidget will still be supported in 4.x releases, but not further. It is replaced by `addWidgets([widget])`'
-    );
-
-    expect(search.mainIndex.getWidgets()).toHaveLength(1);
-  });
-
+describe('addWidgets', () => {
   it('forwards the call of `addWidgets` to the main index', () => {
     const searchClient = createSearchClient();
     const search = new InstantSearch({
@@ -707,27 +688,6 @@ describe('addWidget(s)', () => {
     expect(search.mainIndex.getWidgets()).toHaveLength(1);
   });
 
-  it('returns the search instance when calling `addWidget`', () => {
-    const warn = jest.spyOn(global.console, 'warn');
-    warn.mockImplementation(() => {});
-
-    const searchClient = createSearchClient();
-    const search = new InstantSearch({
-      indexName: 'indexName',
-      searchClient,
-    });
-
-    let result: InstantSearch | null = null;
-
-    expect(() => {
-      result = search.addWidget(createWidget());
-    }).toWarnDev(
-      '[InstantSearch]: addWidget will still be supported in 4.x releases, but not further. It is replaced by `addWidgets([widget])`'
-    );
-
-    expect(result).toBe(search);
-  });
-
   it('returns the search instance when calling `addWidgets`', () => {
     const searchClient = createSearchClient();
     const search = new InstantSearch({
@@ -764,30 +724,7 @@ describe('addWidget(s)', () => {
   });
 });
 
-describe('removeWidget(s)', () => {
-  it('forwards the call to `removeWidget` to the main index', () => {
-    const warn = jest.spyOn(global.console, 'warn');
-    warn.mockImplementation(() => {});
-
-    const searchClient = createSearchClient();
-    const search = new InstantSearch({
-      indexName: 'indexName',
-      searchClient,
-    });
-
-    const widget = createWidget();
-
-    search.addWidgets([widget]);
-
-    expect(search.mainIndex.getWidgets()).toHaveLength(1);
-
-    expect(() => search.removeWidget(widget)).toWarnDev(
-      '[InstantSearch]: removeWidget will still be supported in 4.x releases, but not further. It is replaced by `removeWidgets([widget])`'
-    );
-
-    expect(search.mainIndex.getWidgets()).toHaveLength(0);
-  });
-
+describe('removeWidgets', () => {
   it('forwards the call to `removeWidgets` to the main index', () => {
     const searchClient = createSearchClient();
     const search = new InstantSearch({
@@ -806,33 +743,6 @@ describe('removeWidget(s)', () => {
     expect(search.mainIndex.getWidgets()).toHaveLength(0);
   });
 
-  it('returns the search instance when calling `removeWidget`', () => {
-    const warn = jest.spyOn(global.console, 'warn');
-    warn.mockImplementation(() => {});
-
-    const searchClient = createSearchClient();
-    const search = new InstantSearch({
-      indexName: 'indexName',
-      searchClient,
-    });
-
-    const widget = createWidget();
-
-    expect(() => search.addWidget(widget)).toWarnDev(
-      '[InstantSearch]: addWidget will still be supported in 4.x releases, but not further. It is replaced by `addWidgets([widget])`'
-    );
-
-    let result: InstantSearch | null = null;
-
-    expect(() => {
-      result = search.removeWidget(widget);
-    }).toWarnDev(
-      '[InstantSearch]: removeWidget will still be supported in 4.x releases, but not further. It is replaced by `removeWidgets([widget])`'
-    );
-
-    expect(result).toBe(search);
-  });
-
   it('returns the search instance when calling `removeWidgets`', () => {
     const searchClient = createSearchClient();
     const search = new InstantSearch({
diff --git a/packages/instantsearch-core/src/instantsearch.ts b/packages/instantsearch-core/src/instantsearch.ts
index 140a23c197..4414501efb 100644
--- a/packages/instantsearch-core/src/instantsearch.ts
+++ b/packages/instantsearch-core/src/instantsearch.ts
@@ -252,15 +252,6 @@ See ${createDocumentationLink({
     return this;
   }
 
-  addWidget(widget: Widget | IndexWidget) {
-    warning(
-      false,
-      'addWidget will still be supported in 4.x releases, but not further. It is replaced by `addWidgets([widget])`'
-    );
-
-    return this.addWidgets([widget]);
-  }
-
   addWidgets(widgets: Array<Widget | IndexWidget>) {
     if (!Array.isArray(widgets)) {
       throw new Error(
@@ -297,15 +288,6 @@ See ${createDocumentationLink({
     return this;
   }
 
-  removeWidget(widget: Widget | IndexWidget) {
-    warning(
-      false,
-      'removeWidget will still be supported in 4.x releases, but not further. It is replaced by `removeWidgets([widget])`'
-    );
-
-    return this.removeWidgets([widget]);
-  }
-
   removeWidgets(widgets: Array<Widget | IndexWidget>) {
     if (!Array.isArray(widgets)) {
       throw new Error(
diff --git a/packages/instantsearch-core/test/createInstantSearch.ts b/packages/instantsearch-core/test/createInstantSearch.ts
index c306695b06..09ef3a1bab 100644
--- a/packages/instantsearch-core/test/createInstantSearch.ts
+++ b/packages/instantsearch-core/test/createInstantSearch.ts
@@ -50,9 +50,7 @@ export const createInstantSearch = (
     // See https://github.com/algolia/instantsearch/blob/f3213b2f118d75acac31a1f6cf4640241c438e9d/src/lib/utils/defer.ts#L13-L28
     onInternalStateChange: jest.fn() as any,
     createURL: jest.fn(() => '#'),
-    addWidget: jest.fn(),
     addWidgets: jest.fn(),
-    removeWidget: jest.fn(),
     removeWidgets: jest.fn(),
     use: jest.fn(),
     unuse: jest.fn(),
diff --git a/packages/instantsearch.js/test/createInstantSearch.ts b/packages/instantsearch.js/test/createInstantSearch.ts
index 258711c43d..c4da38cdb3 100644
--- a/packages/instantsearch.js/test/createInstantSearch.ts
+++ b/packages/instantsearch.js/test/createInstantSearch.ts
@@ -52,9 +52,7 @@ export const createInstantSearch = (
     // See https://github.com/algolia/instantsearch/blob/f3213b2f118d75acac31a1f6cf4640241c438e9d/src/lib/utils/defer.ts#L13-L28
     onInternalStateChange: jest.fn() as any,
     createURL: jest.fn(() => '#'),
-    addWidget: jest.fn(),
     addWidgets: jest.fn(),
-    removeWidget: jest.fn(),
     removeWidgets: jest.fn(),
     use: jest.fn(),
     unuse: jest.fn(),

From f435184008309c58717bd4ac09e913f443109086 Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Tue, 31 Dec 2024 10:49:47 +0100
Subject: [PATCH 29/37] feat(routing): change default of cleanUrlOnDispose to
 false (#6499)

* feat(routing): change default of cleanUrlOnDispose to false

In the vast majority of cases you're either never disposing InstantSearch, or the URL already gets cleared some other way (eg. through SPA navigation). This is why the new default for cleanUrlOnDispose is `false`.

You'd still want to set this option to `true` if you're rendering instantsearch in a modal that should have the url cleared when that modal is closed.

BREAKING CHANGE: default of cleanUrlOnDispose is false

[FX-3213]

* fix tests

* Update packages/instantsearch-core/src/routing/historyRouter.ts

Co-authored-by: Dhaya <154633+dhayab@users.noreply.github.com>

---------

Co-authored-by: Dhaya <154633+dhayab@users.noreply.github.com>
---
 examples/js/e-commerce-umd/src/routing.ts     |   1 -
 examples/js/e-commerce/src/routing.ts         |   1 -
 examples/react/e-commerce/routing.ts          |   1 -
 examples/react/next-routing/pages/index.tsx   |   3 -
 examples/react/next-routing/pages/test.tsx    |   3 -
 examples/react/next/pages/index.tsx           |   3 -
 examples/react/ssr/src/App.js                 |   1 -
 examples/vue/default-theme/src/App.vue        |   4 +-
 examples/vue/e-commerce/src/routing.js        |   1 -
 examples/vue/media/src/App.vue                |   4 +-
 .../__tests__/dispose-start-clean.test.ts     | 103 +++++++++++++++++
 .../routing/__tests__/dispose-start.test.ts   |  38 ++++---
 .../historyRouter-integration.test.ts         |   8 +-
 .../routing/__tests__/historyRouter.test.ts   |  17 +--
 .../src/routing/__tests__/modal-clean.test.ts |  67 +++++++++++
 .../src/routing/__tests__/modal.test.ts       |  10 +-
 .../src/routing/__tests__/spa-clean.test.ts   | 104 ++++++++++++++++++
 .../__tests__/spa-debounced-clean.test.ts     | 100 +++++++++++++++++
 .../routing/__tests__/spa-debounced.test.ts   |  30 ++---
 .../__tests__/spa-replace-state-clean.test.ts |  88 +++++++++++++++
 .../__tests__/spa-replace-state.test.ts       |  14 +--
 .../src/routing/historyRouter.ts              |  24 +---
 .../routing-clean/dispose-start.test.tsx      | 102 +++++++++++++++++
 .../routing-clean/external-influence.test.tsx |  85 ++++++++++++++
 .../__tests__/routing-clean/modal.test.tsx    |  64 +++++++++++
 .../routing-clean/spa-debounced.test.tsx      |  94 ++++++++++++++++
 .../routing-clean/spa-replace-state.test.tsx  |  85 ++++++++++++++
 .../__tests__/routing-clean/spa.test.tsx      |  77 +++++++++++++
 .../__tests__/routing/dispose-start.test.tsx  |  30 +++--
 .../__tests__/routing/modal.test.tsx          |  10 +-
 .../__tests__/routing/spa-debounced.test.tsx  |  30 ++---
 .../routing/spa-replace-state.test.tsx        |  16 +--
 32 files changed, 1080 insertions(+), 138 deletions(-)
 create mode 100644 packages/instantsearch-core/src/routing/__tests__/dispose-start-clean.test.ts
 create mode 100644 packages/instantsearch-core/src/routing/__tests__/modal-clean.test.ts
 create mode 100644 packages/instantsearch-core/src/routing/__tests__/spa-clean.test.ts
 create mode 100644 packages/instantsearch-core/src/routing/__tests__/spa-debounced-clean.test.ts
 create mode 100644 packages/instantsearch-core/src/routing/__tests__/spa-replace-state-clean.test.ts
 create mode 100644 packages/react-instantsearch-core/src/components/__tests__/routing-clean/dispose-start.test.tsx
 create mode 100644 packages/react-instantsearch-core/src/components/__tests__/routing-clean/external-influence.test.tsx
 create mode 100644 packages/react-instantsearch-core/src/components/__tests__/routing-clean/modal.test.tsx
 create mode 100644 packages/react-instantsearch-core/src/components/__tests__/routing-clean/spa-debounced.test.tsx
 create mode 100644 packages/react-instantsearch-core/src/components/__tests__/routing-clean/spa-replace-state.test.tsx
 create mode 100644 packages/react-instantsearch-core/src/components/__tests__/routing-clean/spa.test.tsx

diff --git a/examples/js/e-commerce-umd/src/routing.ts b/examples/js/e-commerce-umd/src/routing.ts
index d8d2eb248c..9c47ec1c35 100644
--- a/examples/js/e-commerce-umd/src/routing.ts
+++ b/examples/js/e-commerce-umd/src/routing.ts
@@ -80,7 +80,6 @@ function getCategoryName(slug: string): string {
 const originalWindowTitle = document.title;
 
 const router = window.instantsearch.routers.history<RouteState>({
-  cleanUrlOnDispose: false,
   windowTitle({ category, query }) {
     const queryTitle = query ? `Results for "${query}"` : '';
 
diff --git a/examples/js/e-commerce/src/routing.ts b/examples/js/e-commerce/src/routing.ts
index dcc681e605..db3d15b790 100644
--- a/examples/js/e-commerce/src/routing.ts
+++ b/examples/js/e-commerce/src/routing.ts
@@ -82,7 +82,6 @@ function getCategoryName(slug: string): string {
 const originalWindowTitle = document.title;
 
 const router = historyRouter<RouteState>({
-  cleanUrlOnDispose: false,
   windowTitle({ category, query }) {
     const queryTitle = query ? `Results for "${query}"` : '';
 
diff --git a/examples/react/e-commerce/routing.ts b/examples/react/e-commerce/routing.ts
index 38caee3149..b7d0bae667 100644
--- a/examples/react/e-commerce/routing.ts
+++ b/examples/react/e-commerce/routing.ts
@@ -76,7 +76,6 @@ function getCategoryName(slug: string): string {
 const originalWindowTitle = document.title;
 
 const router = historyRouter<RouteState>({
-  cleanUrlOnDispose: false,
   windowTitle({ category, query }) {
     const queryTitle = query ? `Results for "${query}"` : '';
 
diff --git a/examples/react/next-routing/pages/index.tsx b/examples/react/next-routing/pages/index.tsx
index 8d35d78f3d..15c50aa86f 100644
--- a/examples/react/next-routing/pages/index.tsx
+++ b/examples/react/next-routing/pages/index.tsx
@@ -67,9 +67,6 @@ export default function HomePage({ serverState, url }: HomePageProps) {
           router: createInstantSearchRouterNext({
             singletonRouter,
             serverUrl: url,
-            routerOptions: {
-              cleanUrlOnDispose: false,
-            },
           }),
         }}
         insights={true}
diff --git a/examples/react/next-routing/pages/test.tsx b/examples/react/next-routing/pages/test.tsx
index 8178bbaf14..dc7b937c1f 100644
--- a/examples/react/next-routing/pages/test.tsx
+++ b/examples/react/next-routing/pages/test.tsx
@@ -46,9 +46,6 @@ export default function HomePage({ serverState, url }: HomePageProps) {
           router: createInstantSearchRouterNext({
             singletonRouter,
             serverUrl: url,
-            routerOptions: {
-              cleanUrlOnDispose: false,
-            },
           }),
         }}
         insights={true}
diff --git a/examples/react/next/pages/index.tsx b/examples/react/next/pages/index.tsx
index f536e8d36f..06244267ff 100644
--- a/examples/react/next/pages/index.tsx
+++ b/examples/react/next/pages/index.tsx
@@ -61,9 +61,6 @@ export default function HomePage({ serverState, url }: HomePageProps) {
           router: createInstantSearchRouterNext({
             serverUrl: url,
             singletonRouter,
-            routerOptions: {
-              cleanUrlOnDispose: false,
-            },
           }),
         }}
         insights={true}
diff --git a/examples/react/ssr/src/App.js b/examples/react/ssr/src/App.js
index 3fb8561c37..a680f20b5d 100644
--- a/examples/react/ssr/src/App.js
+++ b/examples/react/ssr/src/App.js
@@ -30,7 +30,6 @@ function App({ serverState, currentURL }) {
         routing={{
           stateMapping: simple(),
           router: history({
-            cleanUrlOnDispose: false,
             getCurrentURL() {
               if (typeof window === 'undefined') {
                 return currentURL;
diff --git a/examples/vue/default-theme/src/App.vue b/examples/vue/default-theme/src/App.vue
index ce023ef04c..6d48d1d8df 100644
--- a/examples/vue/default-theme/src/App.vue
+++ b/examples/vue/default-theme/src/App.vue
@@ -134,9 +134,7 @@ export default {
         '6be0576ff61c053d5f9a3225e2a90f76'
       ),
       routing: {
-        router: historyRouter({
-          cleanUrlOnDispose: false,
-        }),
+        router: historyRouter(),
         stateMapping: simpleStateMapping(),
       },
     };
diff --git a/examples/vue/e-commerce/src/routing.js b/examples/vue/e-commerce/src/routing.js
index 6ed99129ab..69476a50f9 100644
--- a/examples/vue/e-commerce/src/routing.js
+++ b/examples/vue/e-commerce/src/routing.js
@@ -87,7 +87,6 @@ function getCategoryName(slug) {
 const originalWindowTitle = document.title;
 
 const router = historyRouter({
-  cleanUrlOnDispose: false,
   windowTitle({ category, query }) {
     const queryTitle = query ? `Results for "${query}"` : '';
 
diff --git a/examples/vue/media/src/App.vue b/examples/vue/media/src/App.vue
index d2d1bb0798..646fab510d 100644
--- a/examples/vue/media/src/App.vue
+++ b/examples/vue/media/src/App.vue
@@ -123,9 +123,7 @@ export default {
         '6be0576ff61c053d5f9a3225e2a90f76'
       ),
       routing: {
-        router: historyRouter({
-          cleanUrlOnDispose: false,
-        }),
+        router: historyRouter(),
         stateMapping: simpleStateMapping(),
       },
     };
diff --git a/packages/instantsearch-core/src/routing/__tests__/dispose-start-clean.test.ts b/packages/instantsearch-core/src/routing/__tests__/dispose-start-clean.test.ts
new file mode 100644
index 0000000000..c3c8028bb2
--- /dev/null
+++ b/packages/instantsearch-core/src/routing/__tests__/dispose-start-clean.test.ts
@@ -0,0 +1,103 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import { createSearchClient } from '@instantsearch/mocks';
+import { wait } from '@instantsearch/testutils/wait';
+
+import { instantsearch, historyRouter, connectSearchBox } from '../..';
+
+import type { InstantSearch } from '../..';
+
+/* eslint no-lone-blocks: "off" */
+
+const writeDelay = 10;
+const writeWait = 10 * writeDelay;
+
+const addWidgetsAndStart = (search: InstantSearch) => {
+  search.addWidgets([connectSearchBox(() => {})({})]);
+  search.start();
+};
+
+describe('routing back and forth to an InstantSearch instance', () => {
+  test('updates the URL after the instance is disposed then restarted', async () => {
+    // -- Flow
+    // 1. Initial: '/'
+    // 2. Refine: '/?indexName[query]=Apple'
+    // 3. Dispose: '/'
+    // 4. Refine: '/'
+    // 5. Start: '/'
+    // 6. Refine: '/?indexName[query]=Samsung'
+
+    const pushState = jest.spyOn(window.history, 'pushState');
+
+    const search = instantsearch({
+      indexName: 'indexName',
+      searchClient: createSearchClient(),
+      routing: {
+        router: historyRouter({
+          writeDelay,
+          cleanUrlOnDispose: true,
+        }),
+      },
+    });
+
+    // 1. Initial: '/'
+    {
+      addWidgetsAndStart(search);
+
+      await wait(writeWait);
+      expect(window.location.search).toEqual('');
+      expect(pushState).toHaveBeenCalledTimes(0);
+    }
+
+    // 2. Refine: '/?indexName[query]=Apple'
+    {
+      search.renderState.indexName.searchBox!.refine('Apple');
+
+      await wait(writeWait);
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
+      expect(pushState).toHaveBeenCalledTimes(1);
+    }
+
+    // 3. Dispose: '/'
+    {
+      search.dispose();
+
+      await wait(writeWait);
+      expect(window.location.search).toEqual('');
+      expect(pushState).toHaveBeenCalledTimes(2);
+    }
+
+    // 4. Refine: '/'
+    {
+      search.renderState.indexName.searchBox!.refine('Samsung');
+
+      await wait(writeWait);
+      expect(window.location.search).toEqual('');
+      expect(pushState).toHaveBeenCalledTimes(2);
+    }
+
+    // 5. Start: '/'
+    {
+      addWidgetsAndStart(search);
+
+      await wait(writeWait);
+      expect(window.location.search).toEqual('');
+      expect(pushState).toHaveBeenCalledTimes(2);
+    }
+
+    // 6. Refine: '/?indexName[query]=Samsung'
+    {
+      search.renderState.indexName.searchBox!.refine('Samsung');
+
+      await wait(writeWait);
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Samsung')}`
+      );
+      expect(pushState).toHaveBeenCalledTimes(3);
+    }
+  });
+});
diff --git a/packages/instantsearch-core/src/routing/__tests__/dispose-start.test.ts b/packages/instantsearch-core/src/routing/__tests__/dispose-start.test.ts
index 673f09ec6a..331c701210 100644
--- a/packages/instantsearch-core/src/routing/__tests__/dispose-start.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/dispose-start.test.ts
@@ -24,10 +24,10 @@ describe('routing back and forth to an InstantSearch instance', () => {
     // -- Flow
     // 1. Initial: '/'
     // 2. Refine: '/?indexName[query]=Apple'
-    // 3. Dispose: '/'
-    // 4. Refine: '/'
-    // 5. Start: '/'
-    // 6. Refine: '/?indexName[query]=Apple'
+    // 3. Dispose: '/?indexName[query]=Apple'
+    // 4. Refine: '/?indexName[query]=Apple'
+    // 5. Start: '/?indexName[query]=Apple'
+    // 6. Refine: '/?indexName[query]=Samsung'
 
     const pushState = jest.spyOn(window.history, 'pushState');
 
@@ -61,34 +61,40 @@ describe('routing back and forth to an InstantSearch instance', () => {
       expect(pushState).toHaveBeenCalledTimes(1);
     }
 
-    // 3. Dispose: '/'
+    // 3. Dispose: '/?indexName[query]=Apple'
     {
       search.dispose();
 
       await wait(writeWait);
-      expect(window.location.search).toEqual('');
-      expect(pushState).toHaveBeenCalledTimes(2);
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
+      expect(pushState).toHaveBeenCalledTimes(1);
     }
 
-    // 4. Refine: '/'
+    // 4. Refine: '/?indexName[query]=Apple'
     {
-      search.renderState.indexName.searchBox!.refine('Apple');
+      search.renderState.indexName.searchBox!.refine('Samsung');
 
       await wait(writeWait);
-      expect(window.location.search).toEqual('');
-      expect(pushState).toHaveBeenCalledTimes(2);
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
+      expect(pushState).toHaveBeenCalledTimes(1);
     }
 
-    // 5. Start: '/'
+    // 5. Start: '/?indexName[query]=Apple'
     {
       addWidgetsAndStart(search);
 
       await wait(writeWait);
-      expect(window.location.search).toEqual('');
-      expect(pushState).toHaveBeenCalledTimes(2);
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
+      expect(pushState).toHaveBeenCalledTimes(1);
     }
 
-    // 6. Refine: '/?indexName[query]=Apple'
+    // 6. Refine: '/?indexName[query]=Samsung'
     {
       search.renderState.indexName.searchBox!.refine('Samsung');
 
@@ -96,7 +102,7 @@ describe('routing back and forth to an InstantSearch instance', () => {
       expect(window.location.search).toEqual(
         `?${encodeURI('indexName[query]=Samsung')}`
       );
-      expect(pushState).toHaveBeenCalledTimes(3);
+      expect(pushState).toHaveBeenCalledTimes(2);
     }
   });
 });
diff --git a/packages/instantsearch-core/src/routing/__tests__/historyRouter-integration.test.ts b/packages/instantsearch-core/src/routing/__tests__/historyRouter-integration.test.ts
index 3e7c5aad94..99802d69a9 100644
--- a/packages/instantsearch-core/src/routing/__tests__/historyRouter-integration.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/historyRouter-integration.test.ts
@@ -99,7 +99,7 @@ test('clears url with cleanUrlOnDispose: true', async () => {
   expect(window.location.search).toBe('');
 });
 
-test('clears url with cleanUrlOnDispose: undefined', async () => {
+test('does not clear url with cleanUrlOnDispose: undefined', async () => {
   const router = historyRouter({ writeDelay });
 
   const indexName = 'indexName';
@@ -135,6 +135,8 @@ test('clears url with cleanUrlOnDispose: undefined', async () => {
 
   await wait(writeWait);
 
-  // URL has been cleaned
-  expect(window.location.search).toBe('');
+  // URL has not been cleaned
+  expect(window.location.search).toBe(
+    `?${encodeURI('indexName[page]=40&indexName[query]=test')}`
+  );
 });
diff --git a/packages/instantsearch-core/src/routing/__tests__/historyRouter.test.ts b/packages/instantsearch-core/src/routing/__tests__/historyRouter.test.ts
index 2c1bee0317..74a0e8ed52 100644
--- a/packages/instantsearch-core/src/routing/__tests__/historyRouter.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/historyRouter.test.ts
@@ -276,18 +276,10 @@ describe('life cycle', () => {
         consoleSpy.mockReset();
       });
 
-      test('cleans refinements from URL if not defined', () => {
+      test('does not clean refinements from URL if not defined', () => {
         const windowPushState = jest.spyOn(window.history, 'pushState');
         const router = historyRouter<UiState>();
 
-        expect(consoleSpy)
-          .toHaveBeenCalledWith(`Starting from the next major version, InstantSearch will not clean up the URL from active refinements when it is disposed.
-
-We recommend setting \`cleanUrlOnDispose\` to false to adopt this change today.
-To stay with the current behaviour and remove this warning, set the option to true.
-
-See documentation: https://www.algolia.com/doc/api-reference/widgets/history-router/js/#widget-param-cleanurlondispose`);
-
         router.write({ indexName: { query: 'query1' } });
         jest.runAllTimers();
 
@@ -303,12 +295,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/history-rou
         router.dispose();
         jest.runAllTimers();
 
-        expect(windowPushState).toHaveBeenCalledTimes(2);
-        expect(windowPushState).toHaveBeenLastCalledWith(
-          {},
-          '',
-          'http://localhost/'
-        );
+        expect(windowPushState).toHaveBeenCalledTimes(1);
       });
 
       test('cleans refinements from URL if `true`', () => {
diff --git a/packages/instantsearch-core/src/routing/__tests__/modal-clean.test.ts b/packages/instantsearch-core/src/routing/__tests__/modal-clean.test.ts
new file mode 100644
index 0000000000..26a8eafb8e
--- /dev/null
+++ b/packages/instantsearch-core/src/routing/__tests__/modal-clean.test.ts
@@ -0,0 +1,67 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import { createSearchClient } from '@instantsearch/mocks';
+import { wait } from '@instantsearch/testutils/wait';
+
+import { instantsearch, historyRouter, connectSearchBox } from '../..';
+
+/* eslint no-lone-blocks: "off" */
+
+const writeDelay = 10;
+const writeWait = 10 * writeDelay;
+
+describe('routing with no navigation', () => {
+  test('cleans the URL when InstantSearch is disposed within the same page', async () => {
+    // -- Flow
+    // 1. Initial: '/'
+    // 2. Refine: '/?indexName[query]=Apple'
+    // 3. Dispose: '/'
+
+    const pushState = jest.spyOn(window.history, 'pushState');
+
+    const search = instantsearch({
+      indexName: 'indexName',
+      searchClient: createSearchClient(),
+      routing: {
+        router: historyRouter({
+          writeDelay,
+          cleanUrlOnDispose: true,
+        }),
+      },
+    });
+
+    // 1. Initial: '/'
+    {
+      search.addWidgets([connectSearchBox(() => {})({})]);
+      search.start();
+
+      await wait(writeWait);
+      expect(window.location.search).toEqual('');
+      expect(pushState).toHaveBeenCalledTimes(0);
+    }
+
+    // 2. Refine: '/?indexName[query]=Apple'
+    {
+      search.renderState.indexName.searchBox!.refine('Apple');
+
+      await wait(writeWait);
+      expect(window.location.pathname).toEqual('/');
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
+      expect(pushState).toHaveBeenCalledTimes(1);
+    }
+
+    // 3. Dispose: '/'
+    {
+      search.dispose();
+
+      await wait(writeWait);
+      expect(window.location.pathname).toEqual('/');
+      expect(window.location.search).toEqual('');
+      expect(pushState).toHaveBeenCalledTimes(2);
+    }
+  });
+});
diff --git a/packages/instantsearch-core/src/routing/__tests__/modal.test.ts b/packages/instantsearch-core/src/routing/__tests__/modal.test.ts
index 9ccd1a047e..3f7dcb606c 100644
--- a/packages/instantsearch-core/src/routing/__tests__/modal.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/modal.test.ts
@@ -13,11 +13,11 @@ const writeDelay = 10;
 const writeWait = 10 * writeDelay;
 
 describe('routing with no navigation', () => {
-  test('cleans the URL when InstantSearch is disposed within the same page', async () => {
+  test('does not clean the URL when InstantSearch is disposed within the same page', async () => {
     // -- Flow
     // 1. Initial: '/'
     // 2. Refine: '/?indexName[query]=Apple'
-    // 3. Dispose: '/'
+    // 3. Dispose: '/?indexName[query]=Apple'
 
     const pushState = jest.spyOn(window.history, 'pushState');
 
@@ -59,8 +59,10 @@ describe('routing with no navigation', () => {
 
       await wait(writeWait);
       expect(window.location.pathname).toEqual('/');
-      expect(window.location.search).toEqual('');
-      expect(pushState).toHaveBeenCalledTimes(2);
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
+      expect(pushState).toHaveBeenCalledTimes(1);
     }
   });
 });
diff --git a/packages/instantsearch-core/src/routing/__tests__/spa-clean.test.ts b/packages/instantsearch-core/src/routing/__tests__/spa-clean.test.ts
new file mode 100644
index 0000000000..fc01ea85c7
--- /dev/null
+++ b/packages/instantsearch-core/src/routing/__tests__/spa-clean.test.ts
@@ -0,0 +1,104 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import { createSearchClient } from '@instantsearch/mocks';
+import { wait } from '@instantsearch/testutils/wait';
+
+import { instantsearch, historyRouter, connectSearchBox } from '../..';
+
+/* eslint no-lone-blocks: "off" */
+
+const writeDelay = 10;
+const writeWait = 10 * writeDelay;
+
+describe('routing with third-party client-side router', () => {
+  test('does not clean the URL after navigating', async () => {
+    // -- Flow
+    // 1. Initial: '/'
+    // 2. Refine: '/?indexName[query]=Apple'
+    // 3. Navigate: '/about'
+    // 4. Back: '/?indexName[query]=Apple'
+    // 5. Restart: '/?indexName[query]=Apple'
+    // 6. Refine: '/?indexName[query]=Samsung'
+
+    const pushState = jest.spyOn(window.history, 'pushState');
+
+    const search = instantsearch({
+      indexName: 'indexName',
+      searchClient: createSearchClient(),
+      routing: {
+        router: historyRouter({
+          writeDelay,
+          cleanUrlOnDispose: true,
+        }),
+      },
+    });
+
+    // 1. Initial: '/'
+    {
+      search.addWidgets([connectSearchBox(() => {})({})]);
+      search.start();
+
+      await wait(writeWait);
+      expect(window.location.search).toEqual('');
+      expect(pushState).toHaveBeenCalledTimes(0);
+    }
+
+    // 2. Refine: '/?indexName[query]=Apple'
+    {
+      search.renderState.indexName.searchBox!.refine('Apple');
+
+      await wait(writeWait);
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
+      expect(pushState).toHaveBeenCalledTimes(1);
+    }
+
+    // 3. Navigate: '/about'
+    {
+      search.dispose();
+      window.history.pushState({}, '', '/about');
+
+      await wait(writeWait);
+      expect(window.location.pathname).toEqual('/about');
+      expect(window.location.search).toEqual('');
+      expect(pushState).toHaveBeenCalledTimes(2);
+    }
+
+    // 4. Back to previous page
+    {
+      window.history.back();
+
+      await wait(writeWait);
+      expect(window.location.pathname).toEqual('/');
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
+    }
+
+    // 5. Restart InstantSearch
+    {
+      search.addWidgets([connectSearchBox(() => {})({})]);
+      search.start();
+
+      await wait(writeWait);
+      expect(window.location.pathname).toEqual('/');
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
+    }
+
+    // 6. Refine: '/?indexName[query]=Samsung'
+    {
+      search.renderState.indexName.searchBox!.refine('Samsung');
+
+      await wait(writeWait);
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Samsung')}`
+      );
+      expect(pushState).toHaveBeenCalledTimes(3);
+    }
+  });
+});
diff --git a/packages/instantsearch-core/src/routing/__tests__/spa-debounced-clean.test.ts b/packages/instantsearch-core/src/routing/__tests__/spa-debounced-clean.test.ts
new file mode 100644
index 0000000000..3f2f371002
--- /dev/null
+++ b/packages/instantsearch-core/src/routing/__tests__/spa-debounced-clean.test.ts
@@ -0,0 +1,100 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import { createSearchClient } from '@instantsearch/mocks';
+import { wait } from '@instantsearch/testutils/wait';
+
+import { instantsearch, historyRouter, connectSearchBox } from '../..';
+
+/* eslint no-lone-blocks: "off" */
+
+const writeDelay = 10;
+const writeWait = 10 * writeDelay;
+
+describe('routing with debounced third-party client-side router', () => {
+  test('does not clean the URL after navigating', async () => {
+    // -- Flow
+    // 1. Initial: '/'
+    // 2. Refine: '/?indexName[query]=Apple'
+    // 3. Dispose: '/'
+    // 4. Route change: '/about'
+    // 5. Back: '/'
+    // 6. Back: '/?indexName[query]=Apple'
+
+    const pushState = jest.spyOn(window.history, 'pushState');
+
+    const search = instantsearch({
+      indexName: 'indexName',
+      searchClient: createSearchClient(),
+      routing: {
+        router: historyRouter({
+          writeDelay,
+          cleanUrlOnDispose: true,
+        }),
+      },
+    });
+
+    // 1. Initial: '/'
+    {
+      search.addWidgets([connectSearchBox(() => {})({})]);
+      search.start();
+
+      await wait(writeWait);
+      expect(window.location.search).toEqual('');
+      expect(pushState).toHaveBeenCalledTimes(0);
+    }
+
+    // 2. Refine: '/?indexName[query]=Apple'
+    {
+      search.renderState.indexName.searchBox!.refine('Apple');
+
+      await wait(writeWait);
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
+      expect(pushState).toHaveBeenCalledTimes(1);
+    }
+
+    // 3. Dispose: '/'
+    {
+      search.dispose();
+
+      await wait(writeWait);
+      expect(window.location.pathname).toEqual('/');
+      expect(window.location.search).toEqual('');
+      expect(pushState).toHaveBeenCalledTimes(2);
+    }
+
+    // 4. Route change: '/about'
+    {
+      window.history.pushState({}, '', '/about');
+
+      await wait(writeWait);
+      expect(window.location.pathname).toEqual('/about');
+      expect(window.location.search).toEqual('');
+      expect(pushState).toHaveBeenCalledTimes(3);
+    }
+
+    // 5. Back: '/'
+    {
+      window.history.back();
+
+      await wait(writeWait);
+      expect(window.location.pathname).toEqual('/');
+      expect(window.location.search).toEqual('');
+    }
+
+    // 6. Back: '/?indexName[query]=Apple'
+    {
+      window.history.back();
+
+      await wait(writeWait);
+      expect(window.location.pathname).toEqual('/');
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
+      expect(pushState).toHaveBeenCalledTimes(3);
+    }
+  });
+});
diff --git a/packages/instantsearch-core/src/routing/__tests__/spa-debounced.test.ts b/packages/instantsearch-core/src/routing/__tests__/spa-debounced.test.ts
index 75f53d5366..3b58d5dead 100644
--- a/packages/instantsearch-core/src/routing/__tests__/spa-debounced.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/spa-debounced.test.ts
@@ -17,10 +17,10 @@ describe('routing with debounced third-party client-side router', () => {
     // -- Flow
     // 1. Initial: '/'
     // 2. Refine: '/?indexName[query]=Apple'
-    // 3. Dispose: '/'
+    // 3. Dispose: '/?indexName[query]=Apple'
     // 4. Route change: '/about'
-    // 5. Back: '/'
-    // 6. Back: '/?indexName[query]=Apple'
+    // 5. Back: '/?indexName[query]=Apple'
+    // 6. Back: '/'
 
     const pushState = jest.spyOn(window.history, 'pushState');
 
@@ -55,14 +55,16 @@ describe('routing with debounced third-party client-side router', () => {
       expect(pushState).toHaveBeenCalledTimes(1);
     }
 
-    // 3. Dispose: '/'
+    // 3. Dispose: '/?indexName[query]=Apple'
     {
       search.dispose();
 
       await wait(writeWait);
       expect(window.location.pathname).toEqual('/');
-      expect(window.location.search).toEqual('');
-      expect(pushState).toHaveBeenCalledTimes(2);
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
+      expect(pushState).toHaveBeenCalledTimes(1);
     }
 
     // 4. Route change: '/about'
@@ -72,28 +74,28 @@ describe('routing with debounced third-party client-side router', () => {
       await wait(writeWait);
       expect(window.location.pathname).toEqual('/about');
       expect(window.location.search).toEqual('');
-      expect(pushState).toHaveBeenCalledTimes(3);
+      expect(pushState).toHaveBeenCalledTimes(2);
     }
 
-    // 5. Back: '/'
+    // 5. Back: '/?indexName[query]=Apple'
     {
       window.history.back();
 
       await wait(writeWait);
       expect(window.location.pathname).toEqual('/');
-      expect(window.location.search).toEqual('');
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
     }
 
-    // 6. Back: '/?indexName[query]=Apple'
+    // 6. Back: '/'
     {
       window.history.back();
 
       await wait(writeWait);
       expect(window.location.pathname).toEqual('/');
-      expect(window.location.search).toEqual(
-        `?${encodeURI('indexName[query]=Apple')}`
-      );
-      expect(pushState).toHaveBeenCalledTimes(3);
+      expect(window.location.search).toEqual('');
+      expect(pushState).toHaveBeenCalledTimes(2);
     }
   });
 });
diff --git a/packages/instantsearch-core/src/routing/__tests__/spa-replace-state-clean.test.ts b/packages/instantsearch-core/src/routing/__tests__/spa-replace-state-clean.test.ts
new file mode 100644
index 0000000000..83281a1ec1
--- /dev/null
+++ b/packages/instantsearch-core/src/routing/__tests__/spa-replace-state-clean.test.ts
@@ -0,0 +1,88 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import { createSearchClient } from '@instantsearch/mocks';
+import { wait } from '@instantsearch/testutils/wait';
+
+import { instantsearch, historyRouter, connectSearchBox } from '../..';
+
+/* eslint no-lone-blocks: "off" */
+
+const writeDelay = 10;
+const writeWait = 10 * writeDelay;
+
+describe('routing using `replaceState`', () => {
+  // We can't assert whether another router did update the URL
+  // So there's no way to prevent `write` after `dispose`
+  test('cleans the URL after navigating', async () => {
+    // -- Flow
+    // 1. Initial: '/'
+    // 2. Refine: '/?indexName[query]=Apple'
+    // 3. Dispose: does not yet write
+    // 4. Route change (with `replaceState`): '/about?external=true', replaces state 2
+    // 5. Dispose: writes '/about' (this is a bug, and should be fixed when we have a way to prevent it)
+    // 6. Back: '/about?external=true'
+
+    const pushState = jest.spyOn(window.history, 'pushState');
+
+    const search = instantsearch({
+      indexName: 'indexName',
+      searchClient: createSearchClient(),
+      routing: {
+        router: historyRouter({
+          writeDelay,
+          cleanUrlOnDispose: true,
+        }),
+      },
+    });
+
+    // 1. Initial: '/'
+    {
+      search.addWidgets([connectSearchBox(() => {})({})]);
+      search.start();
+
+      await wait(writeWait);
+      expect(window.location.search).toEqual('');
+      expect(pushState).toHaveBeenCalledTimes(0);
+    }
+
+    // 2. Refine: '/?indexName[query]=Apple'
+    {
+      search.renderState.indexName.searchBox!.refine('Apple');
+
+      await wait(writeWait);
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
+      expect(pushState).toHaveBeenCalledTimes(1);
+    }
+
+    // 3. Dispose: '/about'
+    // 4. Route change (with `replaceState`): '/about'
+    {
+      search.dispose();
+      window.history.replaceState({}, '', '/about?external=true');
+
+      // Asserting `replaceState` call
+      expect(window.location.pathname).toEqual('/about');
+      expect(window.location.search).toEqual('?external=true');
+      expect(pushState).toHaveBeenCalledTimes(1);
+
+      // Asserting `dispose` calling `pushState`
+      await wait(writeWait);
+      expect(window.location.pathname).toEqual('/about');
+      expect(window.location.search).toEqual('');
+      expect(pushState).toHaveBeenCalledTimes(2);
+    }
+
+    // 5. Back: '/about'
+    {
+      window.history.back();
+
+      await wait(writeWait);
+      expect(window.location.pathname).toEqual('/about');
+      expect(window.location.search).toEqual('?external=true');
+    }
+  });
+});
diff --git a/packages/instantsearch-core/src/routing/__tests__/spa-replace-state.test.ts b/packages/instantsearch-core/src/routing/__tests__/spa-replace-state.test.ts
index dfa5869a6d..25281cc06e 100644
--- a/packages/instantsearch-core/src/routing/__tests__/spa-replace-state.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/spa-replace-state.test.ts
@@ -15,14 +15,14 @@ const writeWait = 10 * writeDelay;
 describe('routing using `replaceState`', () => {
   // We can't assert whether another router did update the URL
   // So there's no way to prevent `write` after `dispose`
-  test('cleans the URL after navigating', async () => {
+  test('does not clean the URL after navigating', async () => {
     // -- Flow
     // 1. Initial: '/'
     // 2. Refine: '/?indexName[query]=Apple'
     // 3. Dispose: does not yet write
     // 4. Route change (with `replaceState`): '/about?external=true', replaces state 2
-    // 5. Dispose: writes '/about' (this is a bug, and should be fixed when we have a way to prevent it)
-    // 6. Back: '/about?external=true'
+    // 5. Dispose: does not write
+    // 6. Back: '/'
 
     const pushState = jest.spyOn(window.history, 'pushState');
 
@@ -71,8 +71,8 @@ describe('routing using `replaceState`', () => {
       // Asserting `dispose` calling `pushState`
       await wait(writeWait);
       expect(window.location.pathname).toEqual('/about');
-      expect(window.location.search).toEqual('');
-      expect(pushState).toHaveBeenCalledTimes(2);
+      expect(window.location.search).toEqual('?external=true');
+      expect(pushState).toHaveBeenCalledTimes(1);
     }
 
     // 5. Back: '/about'
@@ -80,8 +80,8 @@ describe('routing using `replaceState`', () => {
       window.history.back();
 
       await wait(writeWait);
-      expect(window.location.pathname).toEqual('/about');
-      expect(window.location.search).toEqual('?external=true');
+      expect(window.location.pathname).toEqual('/');
+      expect(window.location.search).toEqual('');
     }
   });
 });
diff --git a/packages/instantsearch-core/src/routing/historyRouter.ts b/packages/instantsearch-core/src/routing/historyRouter.ts
index 0f2408b705..929201edbd 100644
--- a/packages/instantsearch-core/src/routing/historyRouter.ts
+++ b/packages/instantsearch-core/src/routing/historyRouter.ts
@@ -1,10 +1,6 @@
 import qs from 'qs';
 
-import {
-  createDocumentationLink,
-  safelyRunOnBrowser,
-  warning,
-} from '../lib/public';
+import { safelyRunOnBrowser, warning } from '../lib/public';
 
 import type { Router, UiState } from '../types';
 
@@ -32,9 +28,8 @@ export type BrowserHistoryArgs<TRouteState> = {
    * Whether the URL should be cleaned up when the router is disposed.
    * This can be useful when closing a modal containing InstantSearch, to
    * remove active refinements from the URL.
-   * @default true
+   * @default false
    */
-  // @MAJOR: Switch the default to `false` and remove the console info in the next major version.
   cleanUrlOnDispose?: boolean;
 };
 
@@ -134,20 +129,7 @@ class BrowserHistory<TRouteState> implements Router<TRouteState> {
     this._start = start;
     this._dispose = dispose;
     this._push = push;
-    this._cleanUrlOnDispose =
-      typeof cleanUrlOnDispose === 'undefined' ? true : cleanUrlOnDispose;
-
-    if (__DEV__ && typeof cleanUrlOnDispose === 'undefined') {
-      // eslint-disable-next-line no-console
-      console.info(`Starting from the next major version, InstantSearch will not clean up the URL from active refinements when it is disposed.
-
-We recommend setting \`cleanUrlOnDispose\` to false to adopt this change today.
-To stay with the current behaviour and remove this warning, set the option to true.
-
-See documentation: ${createDocumentationLink({
-        name: 'history-router',
-      })}#widget-param-cleanurlondispose`);
-    }
+    this._cleanUrlOnDispose = Boolean(cleanUrlOnDispose);
 
     safelyRunOnBrowser(({ window }) => {
       const title = this.windowTitle && this.windowTitle(this.read());
diff --git a/packages/react-instantsearch-core/src/components/__tests__/routing-clean/dispose-start.test.tsx b/packages/react-instantsearch-core/src/components/__tests__/routing-clean/dispose-start.test.tsx
new file mode 100644
index 0000000000..90e6029f1c
--- /dev/null
+++ b/packages/react-instantsearch-core/src/components/__tests__/routing-clean/dispose-start.test.tsx
@@ -0,0 +1,102 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import { createSearchClient } from '@instantsearch/mocks';
+import { render, waitFor } from '@testing-library/react';
+import { historyRouter } from 'instantsearch-core';
+import React, { useEffect } from 'react';
+import { InstantSearch, SearchBox, useSearchBox } from 'react-instantsearch';
+
+describe('routing back and forth to an InstantSearch instance', () => {
+  test('updates the URL after the instance is disposed then restarted', async () => {
+    // -- Flow
+    // 1. Initial: '/'
+    // 2. Refine: '/?indexName[query]=Apple'
+    // 3. Dispose: '/'
+    // 4. Refine: '/'
+    // 5. Start: '/'
+    // 6. Refine: '/?indexName[query]=Apple'
+
+    const pushState = jest.spyOn(window.history, 'pushState');
+    const searchClient = createSearchClient({});
+
+    let setQuery = (_query: string) => {};
+    function QueryController() {
+      const { refine } = useSearchBox();
+
+      useEffect(() => {
+        setQuery = refine;
+      }, [refine]);
+
+      return null;
+    }
+
+    function App() {
+      return (
+        <InstantSearch
+          searchClient={searchClient}
+          indexName="indexName"
+          routing={{
+            router: historyRouter({ writeDelay: 0, cleanUrlOnDispose: true }),
+          }}
+        >
+          <QueryController />
+          <SearchBox />
+        </InstantSearch>
+      );
+    }
+
+    const { unmount } = render(<App />);
+
+    // 1. Initial: '/'
+    await waitFor(() => {
+      expect(window.location.search).toEqual('');
+    });
+    expect(pushState).toHaveBeenCalledTimes(0);
+
+    // 2. Refine: '/?indexName[query]=Apple'
+    setQuery('Apple');
+
+    await waitFor(() => {
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
+    });
+    expect(pushState).toHaveBeenCalledTimes(1);
+
+    // 3. Dispose: '/'
+    unmount();
+
+    await waitFor(() => {
+      expect(window.location.search).toEqual('');
+    });
+    expect(pushState).toHaveBeenCalledTimes(2);
+
+    // 4. Refine: '/'
+    setQuery('Apple');
+
+    await waitFor(() => {
+      expect(window.location.search).toEqual('');
+    });
+    expect(pushState).toHaveBeenCalledTimes(2);
+
+    // 5. Start: '/'
+    render(<App />);
+
+    await waitFor(() => {
+      expect(window.location.search).toEqual('');
+    });
+    expect(pushState).toHaveBeenCalledTimes(2);
+
+    // 6. Refine: '/?indexName[query]=Samsung'
+    setQuery('Samsung');
+
+    await waitFor(() => {
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Samsung')}`
+      );
+    });
+    expect(pushState).toHaveBeenCalledTimes(3);
+  });
+});
diff --git a/packages/react-instantsearch-core/src/components/__tests__/routing-clean/external-influence.test.tsx b/packages/react-instantsearch-core/src/components/__tests__/routing-clean/external-influence.test.tsx
new file mode 100644
index 0000000000..d441b0d315
--- /dev/null
+++ b/packages/react-instantsearch-core/src/components/__tests__/routing-clean/external-influence.test.tsx
@@ -0,0 +1,85 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import { createSearchClient } from '@instantsearch/mocks';
+import { render, waitFor } from '@testing-library/react';
+import { historyRouter } from 'instantsearch-core';
+import React, { useEffect } from 'react';
+import { InstantSearch, SearchBox, useSearchBox } from 'react-instantsearch';
+
+describe('routing with external influence', () => {
+  test('keeps on working when the URL is updated by another program', async () => {
+    // -- Flow
+    // 1. Initial: '/'
+    // 2. Refine: '/?indexName[query]=Apple'
+    // 3. External influence: '/about'
+    // 4. Refine: '/about?indexName[query]=Samsung'
+
+    const pushState = jest.spyOn(window.history, 'pushState');
+    const searchClient = createSearchClient({});
+
+    let setQuery = (_query: string) => {};
+    function QueryController() {
+      const { refine } = useSearchBox();
+
+      useEffect(() => {
+        setQuery = refine;
+      }, [refine]);
+
+      return null;
+    }
+
+    function App() {
+      return (
+        <InstantSearch
+          searchClient={searchClient}
+          indexName="indexName"
+          routing={{
+            router: historyRouter({ writeDelay: 0, cleanUrlOnDispose: true }),
+          }}
+        >
+          <QueryController />
+          <SearchBox />
+        </InstantSearch>
+      );
+    }
+
+    render(<App />);
+
+    // 1. Initial: '/'
+    await waitFor(() => {
+      expect(window.location.search).toEqual('');
+    });
+    expect(pushState).toHaveBeenCalledTimes(0);
+
+    // 2. Refine: '/?indexName[query]=Apple'
+    setQuery('Apple');
+
+    await waitFor(() => {
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
+    });
+    expect(pushState).toHaveBeenCalledTimes(1);
+
+    // 3. External influence: '/about'
+    window.history.pushState({}, '', '/about');
+
+    await waitFor(() => {
+      expect(window.location.pathname).toEqual('/about');
+      expect(window.location.search).toEqual('');
+    });
+    expect(pushState).toHaveBeenCalledTimes(2);
+
+    // 4. Refine: '/about?indexName[query]=Samsung'
+    setQuery('Samsung');
+
+    await waitFor(() => {
+      expect(window.location.pathname).toEqual('/about');
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Samsung')}`
+      );
+    });
+  });
+});
diff --git a/packages/react-instantsearch-core/src/components/__tests__/routing-clean/modal.test.tsx b/packages/react-instantsearch-core/src/components/__tests__/routing-clean/modal.test.tsx
new file mode 100644
index 0000000000..ca1840afc7
--- /dev/null
+++ b/packages/react-instantsearch-core/src/components/__tests__/routing-clean/modal.test.tsx
@@ -0,0 +1,64 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import { createSearchClient } from '@instantsearch/mocks';
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { historyRouter } from 'instantsearch-core';
+import React from 'react';
+import { InstantSearch, SearchBox } from 'react-instantsearch';
+
+describe('routing with no navigation', () => {
+  test('cleans the URL when InstantSearch is disposed within the same page', async () => {
+    // -- Flow
+    // 1. Initial: '/'
+    // 2. Refine: '/?indexName[query]=Apple'
+    // 3. Dispose: '/'
+
+    const pushState = jest.spyOn(window.history, 'pushState');
+    const searchClient = createSearchClient({});
+
+    function App() {
+      return (
+        <InstantSearch
+          searchClient={searchClient}
+          indexName="indexName"
+          routing={{
+            router: historyRouter({ writeDelay: 0, cleanUrlOnDispose: true }),
+          }}
+        >
+          <SearchBox />
+        </InstantSearch>
+      );
+    }
+
+    const { unmount } = render(<App />);
+
+    // 1. Initial: '/'
+    await waitFor(() => {
+      expect(window.location.search).toEqual('');
+    });
+    expect(pushState).toHaveBeenCalledTimes(0);
+
+    // 2. Refine: '/?indexName[query]=Apple'
+    userEvent.type(screen.getByRole('searchbox'), 'Apple');
+
+    await waitFor(() => {
+      expect(window.location.pathname).toEqual('/');
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
+    });
+    expect(pushState).toHaveBeenCalledTimes(1);
+
+    // 3. Dispose: '/'
+    unmount();
+
+    await waitFor(() => {
+      expect(window.location.pathname).toEqual('/');
+      expect(window.location.search).toEqual('');
+    });
+    expect(pushState).toHaveBeenCalledTimes(2);
+  });
+});
diff --git a/packages/react-instantsearch-core/src/components/__tests__/routing-clean/spa-debounced.test.tsx b/packages/react-instantsearch-core/src/components/__tests__/routing-clean/spa-debounced.test.tsx
new file mode 100644
index 0000000000..b2d688023a
--- /dev/null
+++ b/packages/react-instantsearch-core/src/components/__tests__/routing-clean/spa-debounced.test.tsx
@@ -0,0 +1,94 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import { createSearchClient } from '@instantsearch/mocks';
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { historyRouter } from 'instantsearch-core';
+import React from 'react';
+import { InstantSearch, SearchBox } from 'react-instantsearch';
+
+describe('routing with debounced third-party client-side router', () => {
+  test('does not clean the URL after navigating', async () => {
+    // -- Flow
+    // 1. Initial: '/'
+    // 2. Refine: '/?indexName[query]=Apple'
+    // 3. Dispose: '/'
+    // 4. Route change: '/about'
+    // 5. Back: '/'
+    // 6. Back: '/?indexName[query]=Apple'
+
+    const pushState = jest.spyOn(window.history, 'pushState');
+    const searchClient = createSearchClient({});
+
+    function App() {
+      return (
+        <InstantSearch
+          searchClient={searchClient}
+          indexName="indexName"
+          routing={{
+            router: historyRouter({ writeDelay: 0, cleanUrlOnDispose: true }),
+          }}
+        >
+          <SearchBox />
+        </InstantSearch>
+      );
+    }
+
+    const { unmount } = render(<App />);
+
+    // 1. Initial: '/'
+    await waitFor(() => {
+      expect(window.location.search).toEqual('');
+    });
+    expect(pushState).toHaveBeenCalledTimes(0);
+
+    // 2. Refine: '/?indexName[query]=Apple'
+    userEvent.type(screen.getByRole('searchbox'), 'Apple');
+
+    await waitFor(() => {
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
+    });
+    expect(pushState).toHaveBeenCalledTimes(1);
+
+    // 3. Dispose: '/'
+    unmount();
+
+    await waitFor(() => {
+      expect(window.location.pathname).toEqual('/');
+      expect(window.location.search).toEqual('');
+    });
+    expect(pushState).toHaveBeenCalledTimes(2);
+
+    // 4. Route change: '/about'
+    window.history.pushState({}, '', '/about');
+
+    await waitFor(() => {
+      expect(window.location.pathname).toEqual('/about');
+      expect(window.location.search).toEqual('');
+    });
+    expect(pushState).toHaveBeenCalledTimes(3);
+
+    // 5. Back: '/'
+    window.history.back();
+
+    await waitFor(() => {
+      expect(window.location.pathname).toEqual('/');
+      expect(window.location.search).toEqual('');
+    });
+
+    // 6. Back: '/?indexName[query]=Apple'
+    window.history.back();
+
+    await waitFor(() => {
+      expect(window.location.pathname).toEqual('/');
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
+    });
+    expect(pushState).toHaveBeenCalledTimes(3);
+  });
+});
diff --git a/packages/react-instantsearch-core/src/components/__tests__/routing-clean/spa-replace-state.test.tsx b/packages/react-instantsearch-core/src/components/__tests__/routing-clean/spa-replace-state.test.tsx
new file mode 100644
index 0000000000..a5c8f67adf
--- /dev/null
+++ b/packages/react-instantsearch-core/src/components/__tests__/routing-clean/spa-replace-state.test.tsx
@@ -0,0 +1,85 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import { createSearchClient } from '@instantsearch/mocks';
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { historyRouter } from 'instantsearch-core';
+import React from 'react';
+import { InstantSearch, SearchBox } from 'react-instantsearch';
+
+describe('routing using `replaceState`', () => {
+  // We can't assert whether another router did update the URL
+  // So there's no way to prevent `write` after `dispose`
+  test('cleans the URL after navigating', async () => {
+    // -- Flow
+    // 1. Initial: '/'
+    // 2. Refine: '/?indexName[query]=Apple'
+    // 3. Dispose: does not yet write
+    // 4. Route change (with `replaceState`): '/about?external=true', replaces state 2
+    // 5. Dispose: writes '/about' (this is a bug, and should be fixed when we have a way to prevent it)
+    // 6. Back: '/about?external=true'
+
+    const pushState = jest.spyOn(window.history, 'pushState');
+    const searchClient = createSearchClient({});
+
+    function App() {
+      return (
+        <InstantSearch
+          searchClient={searchClient}
+          indexName="indexName"
+          routing={{
+            router: historyRouter({ writeDelay: 0, cleanUrlOnDispose: true }),
+          }}
+        >
+          <SearchBox />
+        </InstantSearch>
+      );
+    }
+
+    const { unmount } = render(<App />);
+
+    // 1. Initial: '/'
+    await waitFor(() => {
+      expect(window.location.search).toEqual('');
+    });
+    expect(pushState).toHaveBeenCalledTimes(0);
+
+    // 2. Refine: '/?indexName[query]=Apple'
+    userEvent.type(screen.getByRole('searchbox'), 'Apple');
+
+    await waitFor(() => {
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
+    });
+    expect(pushState).toHaveBeenCalledTimes(1);
+
+    // 3. Dispose: '/about'
+    unmount();
+
+    // 4. Route change (with `replaceState`): '/about'
+    window.history.replaceState({}, '', '/about?external=true');
+
+    // Asserting `replaceState` call
+    expect(window.location.pathname).toEqual('/about');
+    expect(window.location.search).toEqual('?external=true');
+    expect(pushState).toHaveBeenCalledTimes(1);
+
+    // Asserting `dispose` calling `pushState`
+    await waitFor(() => {
+      expect(window.location.pathname).toEqual('/about');
+      expect(window.location.search).toEqual('');
+    });
+    expect(pushState).toHaveBeenCalledTimes(2);
+
+    // 5. Back: '/about'
+    window.history.back();
+
+    await waitFor(() => {
+      expect(window.location.pathname).toEqual('/about');
+      expect(window.location.search).toEqual('?external=true');
+    });
+  });
+});
diff --git a/packages/react-instantsearch-core/src/components/__tests__/routing-clean/spa.test.tsx b/packages/react-instantsearch-core/src/components/__tests__/routing-clean/spa.test.tsx
new file mode 100644
index 0000000000..9731d31a5c
--- /dev/null
+++ b/packages/react-instantsearch-core/src/components/__tests__/routing-clean/spa.test.tsx
@@ -0,0 +1,77 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import { createSearchClient } from '@instantsearch/mocks';
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { historyRouter } from 'instantsearch-core';
+import React from 'react';
+import { InstantSearch, SearchBox } from 'react-instantsearch';
+
+describe('routing with third-party client-side router', () => {
+  test('does not clean the URL after navigating', async () => {
+    // -- Flow
+    // 1. Initial: '/'
+    // 2. Refine: '/?indexName[query]=Apple'
+    // 3. Navigate: '/about'
+    // 4. Back: '/?indexName[query]=Apple'
+
+    const pushState = jest.spyOn(window.history, 'pushState');
+    const searchClient = createSearchClient({});
+
+    function App() {
+      return (
+        <InstantSearch
+          searchClient={searchClient}
+          indexName="indexName"
+          routing={{
+            router: historyRouter({ writeDelay: 0, cleanUrlOnDispose: true }),
+          }}
+        >
+          <SearchBox />
+        </InstantSearch>
+      );
+    }
+
+    const { unmount } = render(<App />);
+
+    // 1. Initial: '/'
+    await waitFor(() => {
+      expect(window.location.search).toEqual('');
+    });
+
+    expect(pushState).toHaveBeenCalledTimes(0);
+
+    // 2. Refine: '/?indexName[query]=Apple'
+    userEvent.type(screen.getByRole('searchbox'), 'Apple');
+
+    await waitFor(() => {
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
+    });
+
+    expect(pushState).toHaveBeenCalledTimes(1);
+
+    // 3. Navigate: '/about'
+    unmount();
+    window.history.pushState({}, '', '/about');
+
+    await waitFor(() => {
+      expect(window.location.pathname).toEqual('/about');
+      expect(window.location.search).toEqual('');
+    });
+    expect(pushState).toHaveBeenCalledTimes(2);
+
+    // 4. Back to previous page
+    window.history.back();
+
+    await waitFor(() => {
+      expect(window.location.pathname).toEqual('/');
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
+    });
+  });
+});
diff --git a/packages/react-instantsearch-core/src/components/__tests__/routing/dispose-start.test.tsx b/packages/react-instantsearch-core/src/components/__tests__/routing/dispose-start.test.tsx
index b0e855c3a7..a196a2595c 100644
--- a/packages/react-instantsearch-core/src/components/__tests__/routing/dispose-start.test.tsx
+++ b/packages/react-instantsearch-core/src/components/__tests__/routing/dispose-start.test.tsx
@@ -13,10 +13,10 @@ describe('routing back and forth to an InstantSearch instance', () => {
     // -- Flow
     // 1. Initial: '/'
     // 2. Refine: '/?indexName[query]=Apple'
-    // 3. Dispose: '/'
-    // 4. Refine: '/'
-    // 5. Start: '/'
-    // 6. Refine: '/?indexName[query]=Apple'
+    // 3. Dispose: '/?indexName[query]=Apple'
+    // 4. Refine: '/?indexName[query]=Apple'
+    // 5. Start: '/?indexName[query]=Apple'
+    // 6. Refine: '/?indexName[query]=Samsung'
 
     const pushState = jest.spyOn(window.history, 'pushState');
     const searchClient = createSearchClient({});
@@ -67,25 +67,31 @@ describe('routing back and forth to an InstantSearch instance', () => {
     unmount();
 
     await waitFor(() => {
-      expect(window.location.search).toEqual('');
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
     });
-    expect(pushState).toHaveBeenCalledTimes(2);
+    expect(pushState).toHaveBeenCalledTimes(1);
 
     // 4. Refine: '/'
-    setQuery('Apple');
+    setQuery('Samsung');
 
     await waitFor(() => {
-      expect(window.location.search).toEqual('');
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
     });
-    expect(pushState).toHaveBeenCalledTimes(2);
+    expect(pushState).toHaveBeenCalledTimes(1);
 
     // 5. Start: '/'
     render(<App />);
 
     await waitFor(() => {
-      expect(window.location.search).toEqual('');
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
     });
-    expect(pushState).toHaveBeenCalledTimes(2);
+    expect(pushState).toHaveBeenCalledTimes(1);
 
     // 6. Refine: '/?indexName[query]=Samsung'
     setQuery('Samsung');
@@ -95,6 +101,6 @@ describe('routing back and forth to an InstantSearch instance', () => {
         `?${encodeURI('indexName[query]=Samsung')}`
       );
     });
-    expect(pushState).toHaveBeenCalledTimes(3);
+    expect(pushState).toHaveBeenCalledTimes(2);
   });
 });
diff --git a/packages/react-instantsearch-core/src/components/__tests__/routing/modal.test.tsx b/packages/react-instantsearch-core/src/components/__tests__/routing/modal.test.tsx
index 2b9446ab2d..e2f8895822 100644
--- a/packages/react-instantsearch-core/src/components/__tests__/routing/modal.test.tsx
+++ b/packages/react-instantsearch-core/src/components/__tests__/routing/modal.test.tsx
@@ -14,7 +14,7 @@ describe('routing with no navigation', () => {
     // -- Flow
     // 1. Initial: '/'
     // 2. Refine: '/?indexName[query]=Apple'
-    // 3. Dispose: '/'
+    // 3. Dispose: '/?indexName[query]=Apple'
 
     const pushState = jest.spyOn(window.history, 'pushState');
     const searchClient = createSearchClient({});
@@ -50,13 +50,15 @@ describe('routing with no navigation', () => {
     });
     expect(pushState).toHaveBeenCalledTimes(1);
 
-    // 3. Dispose: '/'
+    // 3. Dispose: '/?indexName[query]=Apple'
     unmount();
 
     await waitFor(() => {
       expect(window.location.pathname).toEqual('/');
-      expect(window.location.search).toEqual('');
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
     });
-    expect(pushState).toHaveBeenCalledTimes(2);
+    expect(pushState).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/packages/react-instantsearch-core/src/components/__tests__/routing/spa-debounced.test.tsx b/packages/react-instantsearch-core/src/components/__tests__/routing/spa-debounced.test.tsx
index b67ebe9d46..b5280dcb59 100644
--- a/packages/react-instantsearch-core/src/components/__tests__/routing/spa-debounced.test.tsx
+++ b/packages/react-instantsearch-core/src/components/__tests__/routing/spa-debounced.test.tsx
@@ -14,10 +14,10 @@ describe('routing with debounced third-party client-side router', () => {
     // -- Flow
     // 1. Initial: '/'
     // 2. Refine: '/?indexName[query]=Apple'
-    // 3. Dispose: '/'
+    // 3. Dispose: '/?indexName[query]=Apple'
     // 4. Route change: '/about'
-    // 5. Back: '/'
-    // 6. Back: '/?indexName[query]=Apple'
+    // 5. Back: '/?indexName[query]=Apple'
+    // 6. Back: '/'
 
     const pushState = jest.spyOn(window.history, 'pushState');
     const searchClient = createSearchClient({});
@@ -52,14 +52,16 @@ describe('routing with debounced third-party client-side router', () => {
     });
     expect(pushState).toHaveBeenCalledTimes(1);
 
-    // 3. Dispose: '/'
+    // 3. Dispose: '/?indexName[query]=Apple'
     unmount();
 
     await waitFor(() => {
       expect(window.location.pathname).toEqual('/');
-      expect(window.location.search).toEqual('');
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
     });
-    expect(pushState).toHaveBeenCalledTimes(2);
+    expect(pushState).toHaveBeenCalledTimes(1);
 
     // 4. Route change: '/about'
     window.history.pushState({}, '', '/about');
@@ -68,25 +70,25 @@ describe('routing with debounced third-party client-side router', () => {
       expect(window.location.pathname).toEqual('/about');
       expect(window.location.search).toEqual('');
     });
-    expect(pushState).toHaveBeenCalledTimes(3);
+    expect(pushState).toHaveBeenCalledTimes(2);
 
-    // 5. Back: '/'
+    // 5. Back: '/?indexName[query]=Apple'
     window.history.back();
 
     await waitFor(() => {
       expect(window.location.pathname).toEqual('/');
-      expect(window.location.search).toEqual('');
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
     });
 
-    // 6. Back: '/?indexName[query]=Apple'
+    // 6. Back: '/
     window.history.back();
 
     await waitFor(() => {
       expect(window.location.pathname).toEqual('/');
-      expect(window.location.search).toEqual(
-        `?${encodeURI('indexName[query]=Apple')}`
-      );
+      expect(window.location.search).toEqual('');
     });
-    expect(pushState).toHaveBeenCalledTimes(3);
+    expect(pushState).toHaveBeenCalledTimes(2);
   });
 });
diff --git a/packages/react-instantsearch-core/src/components/__tests__/routing/spa-replace-state.test.tsx b/packages/react-instantsearch-core/src/components/__tests__/routing/spa-replace-state.test.tsx
index 9605d02c62..be66730568 100644
--- a/packages/react-instantsearch-core/src/components/__tests__/routing/spa-replace-state.test.tsx
+++ b/packages/react-instantsearch-core/src/components/__tests__/routing/spa-replace-state.test.tsx
@@ -16,9 +16,9 @@ describe('routing using `replaceState`', () => {
     // -- Flow
     // 1. Initial: '/'
     // 2. Refine: '/?indexName[query]=Apple'
-    // 3. Dispose: does not yet write
+    // 3. Dispose: does not write
     // 4. Route change (with `replaceState`): '/about?external=true', replaces state 2
-    // 5. Dispose: writes '/about' (this is a bug, and should be fixed when we have a way to prevent it)
+    // 5. Dispose: does not write
     // 6. Back: '/about?external=true'
 
     const pushState = jest.spyOn(window.history, 'pushState');
@@ -65,19 +65,19 @@ describe('routing using `replaceState`', () => {
     expect(window.location.search).toEqual('?external=true');
     expect(pushState).toHaveBeenCalledTimes(1);
 
-    // Asserting `dispose` calling `pushState`
+    // Asserting `dispose` not calling `pushState`
     await waitFor(() => {
       expect(window.location.pathname).toEqual('/about');
-      expect(window.location.search).toEqual('');
+      expect(window.location.search).toEqual('?external=true');
     });
-    expect(pushState).toHaveBeenCalledTimes(2);
+    expect(pushState).toHaveBeenCalledTimes(1);
 
-    // 5. Back: '/about'
+    // 5. Back: '/'
     window.history.back();
 
     await waitFor(() => {
-      expect(window.location.pathname).toEqual('/about');
-      expect(window.location.search).toEqual('?external=true');
+      expect(window.location.pathname).toEqual('/');
+      expect(window.location.search).toEqual('');
     });
   });
 });

From 9f2f442d8b73888ad6e5df03b4d1f87fc7740b57 Mon Sep 17 00:00:00 2001
From: Dhaya <154633+dhayab@users.noreply.github.com>
Date: Tue, 31 Dec 2024 11:00:35 +0100
Subject: [PATCH 30/37] ci: run e2e tests on next branch (#6500)

---
 .circleci/config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8e3b04a7e8..cae489ed27 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -67,6 +67,7 @@ workflows:
             branches:
               only:
                 - master
+                - next
       - helper docs:
           requires:
             - build
@@ -85,6 +86,7 @@ workflows:
             branches:
               only:
                 - master
+                - next
       - e2e tests router nextjs:
           context: fx-libraries
           requires:
@@ -93,6 +95,7 @@ workflows:
             branches:
               only:
                 - master
+                - next
       - release if needed:
           context: fx-libraries
           requires:

From 84cd027d9aa26b2c6e7be724bd281dc0229441d4 Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Tue, 31 Dec 2024 15:45:17 +0100
Subject: [PATCH 31/37] fix(instantsearch): remove searchFunction (#6502)

This option is deprecated and all use cases are possible with onStateChange or other methods too

[FX-3216]

BREAKING CHANGE: replace searchFunction usage with onStateChange
---
 .../src/__tests__/RoutingManager.test.ts      | 111 ------------------
 .../src/__tests__/instantsearch.test.tsx      |  46 --------
 .../instantsearch-core/src/instantsearch.ts   |  39 ------
 .../src/types/instantsearch.ts                |   8 --
 .../stories/instantsearch.stories.ts          |   8 +-
 .../__tests__/InstantSearch.test.tsx          |  49 --------
 .../src/lib/useInstantSearchApi.ts            |   8 --
 .../src/components/InstantSearch.js           |   5 -
 .../src/components/__tests__/InstantSearch.js |  25 ----
 .../src/util/createInstantSearchComponent.js  |   4 -
 .../stories/InstantSearch.stories.js          |  14 ---
 11 files changed, 4 insertions(+), 313 deletions(-)

diff --git a/packages/instantsearch-core/src/__tests__/RoutingManager.test.ts b/packages/instantsearch-core/src/__tests__/RoutingManager.test.ts
index df91c4c5bb..d50443968e 100644
--- a/packages/instantsearch-core/src/__tests__/RoutingManager.test.ts
+++ b/packages/instantsearch-core/src/__tests__/RoutingManager.test.ts
@@ -186,68 +186,6 @@ describe('RoutingManager', () => {
       });
     });
 
-    test('should apply state mapping on differences after searchFunction', async () => {
-      const searchClient = createSearchClient();
-
-      const router = createFakeRouter({
-        write: jest.fn(),
-      });
-
-      const stateMapping = createFakeStateMapping({
-        stateToRoute(uiState) {
-          return Object.keys(uiState).reduce((state, indexId) => {
-            const indexState = uiState[indexId];
-
-            return {
-              ...state,
-              [indexId]: {
-                query: indexState.query && indexState.query.toUpperCase(),
-              },
-            };
-          }, {});
-        },
-      });
-
-      const search = instantsearch({
-        indexName: 'indexName',
-        searchFunction: (helper) => {
-          helper.setQuery('test').search();
-        },
-        searchClient,
-        routing: {
-          stateMapping,
-          router,
-        },
-      });
-
-      search.addWidgets([
-        createWidget({
-          getWidgetUiState(uiState, { searchParameters }) {
-            return {
-              ...uiState,
-              query: searchParameters.query,
-            };
-          },
-          getWidgetSearchParameters: jest.fn(
-            (searchParameters) => searchParameters
-          ),
-        }),
-      ]);
-
-      search.start();
-
-      await wait(0);
-      // initialization is done at this point
-
-      expect(search.mainIndex.getHelper()!.state.query).toEqual('test');
-
-      expect(router.write).toHaveBeenLastCalledWith({
-        indexName: {
-          query: 'TEST',
-        },
-      });
-    });
-
     test('should keep the UI state up to date on state changes', async () => {
       const searchClient = createSearchClient();
       const stateMapping = createFakeStateMapping({});
@@ -299,55 +237,6 @@ describe('RoutingManager', () => {
       expect(router.write).toHaveBeenCalledTimes(1);
     });
 
-    test('should keep the UI state up to date on first render', async () => {
-      const searchClient = createSearchClient();
-      const stateMapping = createFakeStateMapping({});
-      const router = createFakeRouter({
-        write: jest.fn(),
-      });
-
-      const search = instantsearch({
-        indexName: 'indexName',
-        searchFunction(helper) {
-          // Force the value of the query
-          helper.setQuery('Apple iPhone').search();
-        },
-        searchClient,
-        routing: {
-          router,
-          stateMapping,
-        },
-      });
-
-      const fakeSearchBox = connectSearchBox(() => {})({});
-      const fakeHitsPerPage = connectHitsPerPage(() => {})({
-        items: [{ default: true, value: 1, label: 'one' }],
-      });
-
-      search.addWidgets([fakeSearchBox, fakeHitsPerPage]);
-
-      // Trigger the call to `searchFunction` -> Apple iPhone
-      search.start();
-
-      await wait(0);
-
-      expect(router.write).toHaveBeenCalledTimes(1);
-      expect(router.write).toHaveBeenLastCalledWith({
-        indexName: {
-          query: 'Apple iPhone',
-        },
-      });
-
-      // Trigger change
-      search.removeWidgets([fakeHitsPerPage]);
-
-      await wait(0);
-
-      // The UI state hasn't changed so `router.write` wasn't called a second
-      // time
-      expect(router.write).toHaveBeenCalledTimes(1);
-    });
-
     test('should keep the UI state up to date on router.update', async () => {
       const searchClient = createSearchClient();
       const stateMapping = createFakeStateMapping({});
diff --git a/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx b/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
index b5d6477f23..04ca20e9fa 100644
--- a/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
+++ b/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
@@ -824,52 +824,6 @@ describe('start', () => {
     ).toHaveBeenCalledTimes(1);
   });
 
-  it('calls the provided `searchFunction` with a single request', async () => {
-    const searchFunction = jest.fn((helper) =>
-      helper.setQuery('test').search()
-    );
-    const searchClient = createSearchClient();
-    const search = new InstantSearch({
-      indexName: 'indexName',
-      searchFunction,
-      searchClient,
-    });
-
-    search.addWidgets([virtualSearchBox({})]);
-
-    expect(searchFunction).toHaveBeenCalledTimes(0);
-    expect(searchClient.search).toHaveBeenCalledTimes(0);
-
-    search.start();
-
-    await wait(0);
-
-    expect(searchFunction).toHaveBeenCalledTimes(1);
-    expect(searchClient.search).toHaveBeenCalledTimes(1);
-    expect(search.mainIndex.getHelper()!.state.query).toBe('test');
-  });
-
-  it('calls the provided `searchFunction` with multiple requests', () => {
-    const searchClient = createSearchClient();
-    const search = new InstantSearch({
-      indexName: 'indexName',
-      searchClient,
-      searchFunction(helper) {
-        const nextState = helper.state
-          .addDisjunctiveFacet('brand')
-          .addDisjunctiveFacetRefinement('brand', 'Apple');
-
-        helper.setState(nextState).search();
-      },
-    });
-
-    search.addWidgets([virtualSearchBox({})]);
-
-    expect(() => {
-      search.start();
-    }).not.toThrow();
-  });
-
   it('forwards the `initialUiState` to the main index', () => {
     const search = new InstantSearch({
       indexName: 'indexName',
diff --git a/packages/instantsearch-core/src/instantsearch.ts b/packages/instantsearch-core/src/instantsearch.ts
index 4414501efb..13a9c42bd1 100644
--- a/packages/instantsearch-core/src/instantsearch.ts
+++ b/packages/instantsearch-core/src/instantsearch.ts
@@ -24,7 +24,6 @@ import version from './version';
 import { index } from './widgets/index-widget';
 
 import type {
-  SearchClient,
   Widget,
   IndexWidget,
   UiState,
@@ -76,7 +75,6 @@ export class InstantSearch<
   _initialUiState: TUiState;
   _initialResults: InitialResults | null;
   _createURL: CreateURL<TUiState>;
-  _searchFunction?: InstantSearchOptions['searchFunction'];
   _mainHelperSearch?: AlgoliaSearchHelper['search'];
   _hasSearchWidget: boolean = false;
   _hasRecommendWidget: boolean = false;
@@ -108,7 +106,6 @@ export class InstantSearch<
       initialUiState = {} as TUiState,
       routing = null,
       insights = undefined,
-      searchFunction,
       stalledSearchDelay = 200,
       searchClient = null,
       onStateChange = null,
@@ -175,14 +172,6 @@ See ${createDocumentationLink({
 
     this._insights = insights;
 
-    if (searchFunction) {
-      warning(
-        false,
-        `The \`searchFunction\` option is deprecated. Use \`onStateChange\` instead.`
-      );
-      this._searchFunction = searchFunction;
-    }
-
     this.sendEventToInsights = noop;
 
     if (routing) {
@@ -359,34 +348,6 @@ See ${createDocumentationLink({
       return mainHelper;
     };
 
-    if (this._searchFunction) {
-      // this client isn't used to actually search, but required for the helper
-      // to not throw errors
-      const fakeClient = {
-        search: () => new Promise(noop),
-      } as any as SearchClient;
-
-      this._mainHelperSearch = mainHelper.search.bind(mainHelper);
-      mainHelper.search = () => {
-        const mainIndexHelper = this.mainIndex.getHelper()!;
-        const searchFunctionHelper = algoliasearchHelper(
-          fakeClient,
-          mainIndexHelper.state.index,
-          mainIndexHelper.state
-        );
-        searchFunctionHelper.once('search', ({ state }) => {
-          mainIndexHelper.overrideStateWithoutTriggeringChangeEvent(state);
-          this._mainHelperSearch!();
-        });
-        // Forward state changes from `searchFunctionHelper` to `mainIndexHelper`
-        searchFunctionHelper.on('change', ({ state }) => {
-          mainIndexHelper.setState(state);
-        });
-        this._searchFunction!(searchFunctionHelper);
-        return mainHelper;
-      };
-    }
-
     // Only the "main" Helper emits the `error` event vs the one for `search`
     // and `results` that are also emitted on the derived one.
     mainHelper.on('error', (error) => {
diff --git a/packages/instantsearch-core/src/types/instantsearch.ts b/packages/instantsearch-core/src/types/instantsearch.ts
index 5e131a2a95..d7c58ef318 100644
--- a/packages/instantsearch-core/src/types/instantsearch.ts
+++ b/packages/instantsearch-core/src/types/instantsearch.ts
@@ -2,7 +2,6 @@ import type { CompositionClient, SearchClient } from './algoliasearch';
 import type { InsightsProps } from './insights';
 import type { RouterProps } from './router';
 import type { UiState } from './ui-state';
-import type { AlgoliaSearchHelper } from 'algoliasearch-helper';
 
 export type InstantSearchOptions<
   TUiState extends UiState = UiState,
@@ -51,13 +50,6 @@ export type InstantSearchOptions<
    * to `Number.prototype.toLocaleString()`
    */
   numberLocale?: string;
-  /**
-   * A hook that will be called each time a search needs to be done, with the
-   * helper as a parameter. It's your responsibility to call `helper.search()`.
-   * This option allows you to avoid doing searches at page load for example.
-   * @deprecated use onStateChange instead
-   */
-  searchFunction?: (helper: AlgoliaSearchHelper) => void;
   /**
    * Function called when the state changes.
    *
diff --git a/packages/instantsearch.js/stories/instantsearch.stories.ts b/packages/instantsearch.js/stories/instantsearch.stories.ts
index 3ae6959993..04272715a8 100644
--- a/packages/instantsearch.js/stories/instantsearch.stories.ts
+++ b/packages/instantsearch.js/stories/instantsearch.stories.ts
@@ -4,16 +4,16 @@ import { withHits } from '../.storybook/decorators';
 
 storiesOf('Basics/InstantSearch', module)
   .add(
-    'with searchFunction to prevent search',
+    'with onStateChange to prevent search',
     withHits(() => {}, {
-      searchFunction: (helper) => {
-        const query = helper.state.query;
+      onStateChange({ uiState, setUiState }) {
+        const query = uiState.instant_search?.query ?? '';
 
         if (query === '') {
           return;
         }
 
-        helper.search();
+        setUiState(uiState);
       },
     })
   )
diff --git a/packages/react-instantsearch-core/src/components/__tests__/InstantSearch.test.tsx b/packages/react-instantsearch-core/src/components/__tests__/InstantSearch.test.tsx
index d8ef860320..ad815ec301 100644
--- a/packages/react-instantsearch-core/src/components/__tests__/InstantSearch.test.tsx
+++ b/packages/react-instantsearch-core/src/components/__tests__/InstantSearch.test.tsx
@@ -775,55 +775,6 @@ describe('InstantSearch', () => {
     });
   });
 
-  test('updates searchFunction on searchFunction prop change', async () => {
-    const searchClient = createAlgoliaSearchClient({});
-    const searchFunction1 = jest.fn((helper) => {
-      helper.search();
-    });
-    const searchFunction2 = jest.fn((helper) => {
-      helper.search();
-    });
-
-    function App({
-      searchFunction,
-    }: Pick<InstantSearchProps, 'searchFunction'>) {
-      return (
-        <StrictMode>
-          <InstantSearch
-            searchClient={searchClient}
-            indexName="indexName"
-            searchFunction={searchFunction}
-          >
-            <SearchBox />
-          </InstantSearch>
-        </StrictMode>
-      );
-    }
-
-    const { rerender } = render(<App searchFunction={searchFunction1} />);
-
-    await waitFor(() => {
-      expect(searchFunction1).toHaveBeenCalledTimes(1);
-    });
-
-    userEvent.type(screen.getByRole('searchbox'), 'iphone');
-
-    await waitFor(() => {
-      expect(searchFunction1).toHaveBeenCalledTimes(7);
-    });
-
-    rerender(<App searchFunction={searchFunction2} />);
-
-    userEvent.type(screen.getByRole('searchbox'), ' case', {
-      initialSelectionStart: 6,
-    });
-
-    await waitFor(() => {
-      expect(searchFunction1).toHaveBeenCalledTimes(7);
-      expect(searchFunction2).toHaveBeenCalledTimes(5);
-    });
-  });
-
   test('triggers no search on unmount', async () => {
     const searchClient = createAlgoliaSearchClient({});
 
diff --git a/packages/react-instantsearch-core/src/lib/useInstantSearchApi.ts b/packages/react-instantsearch-core/src/lib/useInstantSearchApi.ts
index ddab5a5495..2291ff1496 100644
--- a/packages/react-instantsearch-core/src/lib/useInstantSearchApi.ts
+++ b/packages/react-instantsearch-core/src/lib/useInstantSearchApi.ts
@@ -164,14 +164,6 @@ export function useInstantSearchApi<TUiState extends UiState, TRouteState>(
       prevPropsRef.current = props;
     }
 
-    if (prevProps.searchFunction !== props.searchFunction) {
-      // Updating the `searchFunction` to `undefined` is not supported by
-      // InstantSearch.js, so it will throw an error.
-      // This is a fair behavior until we add an update API in InstantSearch.js.
-      search._searchFunction = props.searchFunction;
-      prevPropsRef.current = props;
-    }
-
     if (prevProps.stalledSearchDelay !== props.stalledSearchDelay) {
       // The default `stalledSearchDelay` in InstantSearch.js is 200ms.
       // We need to reset it when it's undefined to get back to the original value.
diff --git a/packages/vue-instantsearch/src/components/InstantSearch.js b/packages/vue-instantsearch/src/components/InstantSearch.js
index 3f3446503c..e2e4a30651 100644
--- a/packages/vue-instantsearch/src/components/InstantSearch.js
+++ b/packages/vue-instantsearch/src/components/InstantSearch.js
@@ -53,10 +53,6 @@ export default createInstantSearchComponent({
       type: Number,
       default: undefined,
     },
-    searchFunction: {
-      type: Function,
-      default: undefined,
-    },
     onStateChange: {
       type: Function,
       default: undefined,
@@ -103,7 +99,6 @@ export default createInstantSearchComponent({
         compositionID: this.compositionID,
         routing: this.routing,
         stalledSearchDelay: this.stalledSearchDelay,
-        searchFunction: this.searchFunction,
         onStateChange: this.onStateChange,
         initialUiState: this.initialUiState,
         future: this.future,
diff --git a/packages/vue-instantsearch/src/components/__tests__/InstantSearch.js b/packages/vue-instantsearch/src/components/__tests__/InstantSearch.js
index df55ed7f57..552b6ae4a3 100644
--- a/packages/vue-instantsearch/src/components/__tests__/InstantSearch.js
+++ b/packages/vue-instantsearch/src/components/__tests__/InstantSearch.js
@@ -42,7 +42,6 @@ beforeEach(() => {
 
 it('passes props to InstantSearch.js', () => {
   const searchClient = createSearchClient();
-  const searchFunction = (helper) => helper.search();
   const routing = {
     router: historyRouter(),
     stateMapping: simpleStateMapping(),
@@ -54,7 +53,6 @@ it('passes props to InstantSearch.js', () => {
       indexName: 'something',
       routing,
       stalledSearchDelay: 250,
-      searchFunction,
     },
   });
 
@@ -62,7 +60,6 @@ it('passes props to InstantSearch.js', () => {
     indexName: 'something',
     routing,
     searchClient,
-    searchFunction,
     stalledSearchDelay: 250,
   });
 });
@@ -247,33 +244,11 @@ it('does not warn when the `search-client` does not change', async () => {
   expect(warn).not.toHaveBeenCalled();
 });
 
-it('Allows a change in `search-function`', async () => {
-  const oldValue = () => {};
-  const newValue = () => {};
-
-  const wrapper = mount(InstantSearch, {
-    propsData: {
-      searchClient: createSearchClient(),
-      indexName: 'bla',
-      searchFunction: oldValue,
-    },
-  });
-
-  expect(wrapper.vm.instantSearchInstance._searchFunction).toEqual(oldValue);
-
-  await wrapper.setProps({
-    searchFunction: newValue,
-  });
-
-  expect(wrapper.vm.instantSearchInstance._searchFunction).toEqual(newValue);
-});
-
 it('Allows a change in `stalled-search-delay`', async () => {
   const wrapper = mount(InstantSearch, {
     propsData: {
       searchClient: createSearchClient(),
       indexName: 'bla',
-      searchFunction: () => {},
       stalledSearchDelay: 200,
     },
   });
diff --git a/packages/vue-instantsearch/src/util/createInstantSearchComponent.js b/packages/vue-instantsearch/src/util/createInstantSearchComponent.js
index f63d8b9432..ee21d94a6e 100644
--- a/packages/vue-instantsearch/src/util/createInstantSearchComponent.js
+++ b/packages/vue-instantsearch/src/util/createInstantSearchComponent.js
@@ -57,10 +57,6 @@ export const createInstantSearchComponent = (component) => ({
           'Please open a new issue: https://github.com/algolia/instantsearch/discussions/new?category=ideas&labels=triage%2cLibrary%3A+Vue+InstantSearch&title=Feature%20request%3A%20dynamic%20props'
       );
     },
-    searchFunction(searchFunction) {
-      // private InstantSearch.js API:
-      this.instantSearchInstance._searchFunction = searchFunction;
-    },
     middlewares: {
       immediate: true,
       handler(next, prev) {
diff --git a/packages/vue-instantsearch/stories/InstantSearch.stories.js b/packages/vue-instantsearch/stories/InstantSearch.stories.js
index 489d20f3c2..7cc978b1ee 100644
--- a/packages/vue-instantsearch/stories/InstantSearch.stories.js
+++ b/packages/vue-instantsearch/stories/InstantSearch.stories.js
@@ -29,13 +29,6 @@ const clients = {
   fake: new FakeClient(),
 };
 
-const searchFunctions = {
-  working: undefined,
-  broken(helper) {
-    helper.setQuery('bingo').search();
-  },
-};
-
 storiesOf('ais-instant-search', module)
   .add('simple usage', () => ({
     template: `
@@ -74,7 +67,6 @@ storiesOf('ais-instant-search', module)
         <ais-instant-search
           :index-name="indexName"
           :search-client="searchClient"
-          :search-function="searchFunction"
           :stalled-search-delay="stalledSearchDelay"
         >
           <p>This is inside a <code>ais-instant-search</code>: <code>{{indexName}}</code></p>
@@ -91,8 +83,6 @@ storiesOf('ais-instant-search', module)
       return {
         searchClientName: 'working',
         searchClient: clients.working,
-        searchFunctionName: 'working',
-        searchFunction: searchFunctions.working,
         stalledSearchDelay: undefined,
         indexName: 'instant_search',
       };
@@ -102,9 +92,5 @@ storiesOf('ais-instant-search', module)
         this.searchClientName = newName;
         this.searchClient = clients[newName];
       },
-      searchFunctionName(newName) {
-        this.searchFunctionName = newName;
-        this.searchFunction = searchFunctions[newName];
-      },
     },
   }));

From d27e36a8bd6043cc8a12d011b8be2daa4110764a Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Tue, 31 Dec 2024 16:10:05 +0100
Subject: [PATCH 32/37] fix(build): prevent destructure with reuse of same
 symbol. (#6504)

This is the cause of the UMD e2e failure in `next`.
---
 package.json                                  |  2 +-
 packages/algolia-experiences/rollup.config.js |  9 +---
 .../scripts/rollup/rollup.config.js           |  9 +---
 .../react-instantsearch-core/rollup.config.js | 13 +-----
 packages/react-instantsearch/rollup.config.js | 13 +-----
 yarn.lock                                     | 42 ++++++++++---------
 6 files changed, 32 insertions(+), 56 deletions(-)

diff --git a/package.json b/package.json
index a9307fa1da..ab7bf01dd6 100644
--- a/package.json
+++ b/package.json
@@ -137,7 +137,7 @@
     "rollup-plugin-node-globals": "1.4.0",
     "rollup-plugin-node-resolve": "5.2.0",
     "rollup-plugin-replace": "2.2.0",
-    "rollup-plugin-uglify": "6.0.4",
+    "@rollup/plugin-terser": "0.4.4",
     "shelljs": "0.8.5",
     "shipjs": "0.26.0",
     "ts-jest": "27",
diff --git a/packages/algolia-experiences/rollup.config.js b/packages/algolia-experiences/rollup.config.js
index 258242f17d..f5f6b10218 100644
--- a/packages/algolia-experiences/rollup.config.js
+++ b/packages/algolia-experiences/rollup.config.js
@@ -1,10 +1,10 @@
 import path from 'path';
 
+import terser from '@rollup/plugin-terser';
 import babel from 'rollup-plugin-babel';
 import commonjs from 'rollup-plugin-commonjs';
 import resolve from 'rollup-plugin-node-resolve';
 import replace from 'rollup-plugin-replace';
-import { uglify } from 'rollup-plugin-uglify';
 
 import packageJson from '../../package.json';
 
@@ -68,12 +68,7 @@ const createConfiguration = ({ mode, filename }) => ({
       __DEV__: mode === 'development',
       'process.env.NODE_ENV': JSON.stringify('production'),
     }),
-    mode === 'production' &&
-      uglify({
-        output: {
-          preamble: license,
-        },
-      }),
+    mode === 'production' && terser(),
   ].filter(Boolean),
 });
 
diff --git a/packages/instantsearch.js/scripts/rollup/rollup.config.js b/packages/instantsearch.js/scripts/rollup/rollup.config.js
index fc29baf117..65bfb236e0 100644
--- a/packages/instantsearch.js/scripts/rollup/rollup.config.js
+++ b/packages/instantsearch.js/scripts/rollup/rollup.config.js
@@ -1,9 +1,9 @@
+import terser from '@rollup/plugin-terser';
 import babel from 'rollup-plugin-babel';
 import commonjs from 'rollup-plugin-commonjs';
 import filesize from 'rollup-plugin-filesize';
 import resolve from 'rollup-plugin-node-resolve';
 import replace from 'rollup-plugin-replace';
-import { uglify } from 'rollup-plugin-uglify';
 
 import packageJson from '../../package.json';
 
@@ -55,12 +55,7 @@ const createConfiguration = ({ mode, filename }) => ({
       __DEV__: mode === 'development',
       'process.env.NODE_ENV': JSON.stringify('production'),
     }),
-    mode === 'production' &&
-      uglify({
-        output: {
-          preamble: license,
-        },
-      }),
+    mode === 'production' && terser(),
   ].filter(Boolean),
 });
 
diff --git a/packages/react-instantsearch-core/rollup.config.js b/packages/react-instantsearch-core/rollup.config.js
index 808f3778f3..9a253b7b83 100644
--- a/packages/react-instantsearch-core/rollup.config.js
+++ b/packages/react-instantsearch-core/rollup.config.js
@@ -1,10 +1,10 @@
+import terser from '@rollup/plugin-terser';
 import babel from 'rollup-plugin-babel';
 import commonjs from 'rollup-plugin-commonjs';
 import filesize from 'rollup-plugin-filesize';
 import globals from 'rollup-plugin-node-globals';
 import resolve from 'rollup-plugin-node-resolve';
 import replace from 'rollup-plugin-replace';
-import { uglify } from 'rollup-plugin-uglify';
 
 const clear = (x) => x.filter(Boolean);
 
@@ -63,16 +63,7 @@ const createConfiguration = ({ name, minify = false } = {}) => ({
 
     warn(warning);
   },
-  plugins: plugins.concat(
-    clear([
-      minify &&
-        uglify({
-          output: {
-            preamble: createBanner(name),
-          },
-        }),
-    ])
-  ),
+  plugins: plugins.concat(clear([minify && terser()])),
 });
 
 export default [
diff --git a/packages/react-instantsearch/rollup.config.js b/packages/react-instantsearch/rollup.config.js
index 8ec3f4b010..ebba5d78b0 100644
--- a/packages/react-instantsearch/rollup.config.js
+++ b/packages/react-instantsearch/rollup.config.js
@@ -1,10 +1,10 @@
+import terser from '@rollup/plugin-terser';
 import babel from 'rollup-plugin-babel';
 import commonjs from 'rollup-plugin-commonjs';
 import filesize from 'rollup-plugin-filesize';
 import globals from 'rollup-plugin-node-globals';
 import resolve from 'rollup-plugin-node-resolve';
 import replace from 'rollup-plugin-replace';
-import { uglify } from 'rollup-plugin-uglify';
 
 const clear = (x) => x.filter(Boolean);
 
@@ -63,16 +63,7 @@ const createConfiguration = ({ name, minify = false } = {}) => ({
 
     warn(warning);
   },
-  plugins: plugins.concat(
-    clear([
-      minify &&
-        uglify({
-          output: {
-            preamble: createBanner(name),
-          },
-        }),
-    ])
-  ),
+  plugins: plugins.concat(clear([minify && terser()])),
 });
 
 export default [
diff --git a/yarn.lock b/yarn.lock
index c04b8d607e..7bfbd1359f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5480,6 +5480,15 @@
   resolved "https://registry.yarnpkg.com/@react-native/polyfills/-/polyfills-1.0.0.tgz#05bb0031533598f9458cf65a502b8df0eecae780"
   integrity sha512-0jbp4RxjYopTsIdLl+/Fy2TiwVYHy4mgeu07DG4b/LyM0OS/+lPP5c9sbnt/AMlnF6qz2JRZpPpGw1eMNS6A4w==
 
+"@rollup/plugin-terser@0.4.4":
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-terser/-/plugin-terser-0.4.4.tgz#15dffdb3f73f121aa4fbb37e7ca6be9aeea91962"
+  integrity sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==
+  dependencies:
+    serialize-javascript "^6.0.1"
+    smob "^1.0.0"
+    terser "^5.17.4"
+
 "@rollup/rollup-android-arm-eabi@4.24.0":
   version "4.24.0"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.0.tgz#1661ff5ea9beb362795304cb916049aba7ac9c54"
@@ -27814,16 +27823,6 @@ rollup-plugin-terser@4.0.4:
     serialize-javascript "^1.6.1"
     terser "^3.14.1"
 
-rollup-plugin-uglify@6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-uglify/-/rollup-plugin-uglify-6.0.4.tgz#65a0959d91586627f1e46a7db966fd504ec6c4e6"
-  integrity sha512-ddgqkH02klveu34TF0JqygPwZnsbhHVI6t8+hGTcYHngPkQb5MIHI0XiztXIN/d6V9j+efwHAqEL7LspSxQXGw==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    jest-worker "^24.0.0"
-    serialize-javascript "^2.1.2"
-    uglify-js "^3.4.9"
-
 "rollup-plugin-vue2@npm:rollup-plugin-vue@4.3.2":
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/rollup-plugin-vue/-/rollup-plugin-vue-4.3.2.tgz#0bdf0cf677565b0ac2358d590f177b6b4ded8cce"
@@ -28334,10 +28333,10 @@ serialize-javascript@^5.0.1:
   dependencies:
     randombytes "^2.1.0"
 
-serialize-javascript@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
-  integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
+serialize-javascript@^6.0.0, serialize-javascript@^6.0.1:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2"
+  integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==
   dependencies:
     randombytes "^2.1.0"
 
@@ -28796,6 +28795,11 @@ smart-buffer@^4.2.0:
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
 
+smob@^1.0.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/smob/-/smob-1.5.0.tgz#85d79a1403abf128d24d3ebc1cdc5e1a9548d3ab"
+  integrity sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig==
+
 snake-case@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-2.1.0.tgz#41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f"
@@ -30401,10 +30405,10 @@ terser@^4.1.2, terser@^4.4.3, terser@^4.6.12, terser@^4.6.3, terser@^4.8.0:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
-terser@^5.3.4, terser@^5.6.0:
-  version "5.36.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.36.0.tgz#8b0dbed459ac40ff7b4c9fd5a3a2029de105180e"
-  integrity sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w==
+terser@^5.17.4, terser@^5.3.4, terser@^5.6.0:
+  version "5.37.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.37.0.tgz#38aa66d1cfc43d0638fab54e43ff8a4f72a21ba3"
+  integrity sha512-B8wRRkmre4ERucLM/uXx4MOV5cbnOlVAqUst+1+iLKPI0dOgFO28f84ptoQt9HEI537PMzfYa/d+GEPKTRXmYA==
   dependencies:
     "@jridgewell/source-map" "^0.3.3"
     acorn "^8.8.2"
@@ -31143,7 +31147,7 @@ uglify-js@3.4.x:
     commander "~2.17.1"
     source-map "~0.6.1"
 
-uglify-js@^3.1.4, uglify-js@^3.4.9, uglify-js@^3.5.1:
+uglify-js@^3.1.4, uglify-js@^3.5.1:
   version "3.17.4"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
   integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==

From 4c69f0b42e4bb90433b40ad5c18298ec006d253f Mon Sep 17 00:00:00 2001
From: Dhaya <154633+dhayab@users.noreply.github.com>
Date: Tue, 7 Jan 2025 11:47:30 +0100
Subject: [PATCH 33/37] refactor(range): make range connector more consistent
 and simpler to use (#6508)

BREAKING CHANGE: `start` is now called `currentRefinement` and its data structure and behavior are different
---
 .../e-commerce/components/PriceSlider.tsx     |  40 ++--
 .../connectors/__tests__/connectRange.test.ts | 174 +++++++++++++-----
 .../src/connectors/connectRange.ts            |  48 ++---
 .../src/components/RangeInput/RangeInput.tsx  |  12 +-
 .../RangeInput/__tests__/RangeInput-test.tsx  |  13 +-
 .../src/components/Slider/Slider.tsx          |  19 +-
 .../Slider/__tests__/Slider-test.tsx          |  10 +-
 .../instantsearch.js/src/connectors/index.ts  |   1 -
 .../src/widgets/range-input/range-input.tsx   |  12 +-
 .../__snapshots__/range-slider-test.ts.snap   |  48 ++---
 .../__tests__/range-slider-test.ts            |  50 +----
 .../src/widgets/range-slider/range-slider.tsx |  21 +--
 .../connectors/__tests__/useRange.test.tsx    |   4 +-
 .../react-instantsearch/src/ui/RangeInput.tsx |  36 ++--
 .../src/ui/__tests__/RangeInput.test.tsx      |  29 +--
 .../src/widgets/RangeInput.tsx                |  11 +-
 .../src/components/RangeInput.vue             |  25 +--
 .../src/components/__tests__/RangeInput.js    |   2 +-
 18 files changed, 280 insertions(+), 275 deletions(-)

diff --git a/examples/react/e-commerce/components/PriceSlider.tsx b/examples/react/e-commerce/components/PriceSlider.tsx
index 0d9e9e9c65..4d0da7f64d 100644
--- a/examples/react/e-commerce/components/PriceSlider.tsx
+++ b/examples/react/e-commerce/components/PriceSlider.tsx
@@ -1,4 +1,4 @@
-import { Range, RangeBoundaries } from 'instantsearch-core';
+import { Range } from 'instantsearch-core';
 import React, { useState } from 'react';
 import {
   Slider,
@@ -56,16 +56,13 @@ function Handle({
   );
 }
 
-function convertToTicks(start: RangeBoundaries, range: Range): number[] {
+function convertToTicks({ min, max }: Range, range: Range): readonly number[] {
   const domain =
     range.min === 0 && range.max === 0
       ? { min: undefined, max: undefined }
       : range;
 
-  return [
-    start[0] === -Infinity ? domain.min! : start[0]!,
-    start[1] === Infinity ? domain.max! : start[1]!,
-  ];
+  return [min || domain.min!, max || domain.max!];
 }
 
 export function PriceSlider({
@@ -77,7 +74,7 @@ export function PriceSlider({
   min?: number;
   max?: number;
 }) {
-  const { range, start, refine, canRefine } = useRange(
+  const { range, currentRefinement, refine, canRefine } = useRange(
     {
       attribute,
       min,
@@ -85,22 +82,16 @@ export function PriceSlider({
     },
     { $$widgetType: 'e-commerce.rangeSlider' }
   );
-  const [ticksValues, setTicksValues] = useState(convertToTicks(start, range));
-  const [prevStart, setPrevStart] = useState(start);
+  const [ticksValues, setTicksValues] = useState(
+    convertToTicks(currentRefinement, range)
+  );
+  const [prevRefinement, setPrevRefinement] = useState(currentRefinement);
 
-  if (start !== prevStart) {
-    setTicksValues(convertToTicks(start, range));
-    setPrevStart(start);
+  if (currentRefinement !== prevRefinement) {
+    setTicksValues(convertToTicks(currentRefinement, range));
+    setPrevRefinement(currentRefinement);
   }
 
-  const onChange = (values: readonly number[]) => {
-    refine(values as [number, number]);
-  };
-
-  const onUpdate = (values: readonly number[]) => {
-    setTicksValues(values as [number, number]);
-  };
-
   if (
     !canRefine ||
     ticksValues[0] === undefined ||
@@ -114,10 +105,13 @@ export function PriceSlider({
       mode={2}
       step={1}
       domain={[range.min!, range.max!]}
-      values={start as number[]}
+      values={[
+        currentRefinement.min || range.min!,
+        currentRefinement.max || range.max!,
+      ]}
       disabled={!canRefine}
-      onChange={onChange}
-      onUpdate={onUpdate}
+      onChange={([newMin, newMax]) => refine({ min: newMin, max: newMax })}
+      onUpdate={(values) => setTicksValues(values)}
       rootStyle={{ position: 'relative', marginTop: '1.5rem' }}
       className="ais-RangeSlider"
     >
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectRange.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectRange.test.ts
index ec8701b910..fafd8ae220 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectRange.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectRange.test.ts
@@ -132,10 +132,10 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
       expect(isFirstRendering).toBe(true);
 
       // should provide good values for the first rendering
-      const { range, start, widgetParams } =
+      const { range, currentRefinement, widgetParams } =
         rendering.mock.calls[rendering.mock.calls.length - 1][0];
       expect(range).toEqual({ min: 0, max: 0 });
-      expect(start).toEqual([-Infinity, Infinity]);
+      expect(currentRefinement).toEqual({ min: undefined, max: undefined });
       expect(widgetParams).toEqual({
         attribute,
         precision: 0,
@@ -162,10 +162,10 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
       expect(isFirstRendering).toBe(false);
 
       // should provide good values for the first rendering
-      const { range, start, widgetParams } =
+      const { range, currentRefinement, widgetParams } =
         rendering.mock.calls[rendering.mock.calls.length - 1][0];
       expect(range).toEqual({ min: 10, max: 30 });
-      expect(start).toEqual([-Infinity, Infinity]);
+      expect(currentRefinement).toEqual({ min: undefined, max: undefined });
       expect(widgetParams).toEqual({
         attribute,
         precision: 0,
@@ -255,7 +255,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
       const renderOptions =
         rendering.mock.calls[rendering.mock.calls.length - 1][0];
       const { refine } = renderOptions;
-      refine([10, 30]);
+      refine({ min: 10, max: 30 });
       expect(helper.getNumericRefinement('price', '>=')).toEqual([10]);
       expect(helper.getNumericRefinement('price', '<=')).toEqual([30]);
       expect(helper.search).toHaveBeenCalledTimes(1);
@@ -281,7 +281,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
       const renderOptions =
         rendering.mock.calls[rendering.mock.calls.length - 1][0];
       const { refine } = renderOptions;
-      refine([23, 27]);
+      refine({ min: 23, max: 27 });
       expect(helper.getNumericRefinement('price', '>=')).toEqual([23]);
       expect(helper.getNumericRefinement('price', '<=')).toEqual([27]);
       expect(helper.search).toHaveBeenCalledTimes(2);
@@ -312,13 +312,13 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
       const renderOptions =
         rendering.mock.calls[rendering.mock.calls.length - 1][0];
       const { refine } = renderOptions;
-      refine([10, 30]);
+      refine({ min: 10, max: 30 });
 
       expect(helper.getNumericRefinement('price', '>=')).toEqual([10]);
       expect(helper.getNumericRefinement('price', '<=')).toEqual([30]);
       expect(helper.search).toHaveBeenCalledTimes(1);
 
-      refine([0, undefined]);
+      refine({ min: 0, max: undefined });
       expect(helper.getNumericRefinement('price', '>=')).toEqual([0]);
       expect(helper.getNumericRefinement('price', '<=')).toEqual([500]);
     }
@@ -356,13 +356,13 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
       const renderOptions =
         rendering.mock.calls[rendering.mock.calls.length - 1][0];
       const { refine } = renderOptions;
-      refine([10, 30]);
+      refine({ min: 10, max: 30 });
 
       expect(helper.getNumericRefinement('price', '>=')).toEqual([10]);
       expect(helper.getNumericRefinement('price', '<=')).toEqual([30]);
       expect(helper.search).toHaveBeenCalledTimes(1);
 
-      refine([0, undefined]);
+      refine({ min: 0, max: undefined });
       expect(helper.getNumericRefinement('price', '>=')).toEqual([0]);
       expect(helper.getNumericRefinement('price', '<=')).toEqual([500]);
     }
@@ -396,17 +396,17 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
         rendering.mock.calls[rendering.mock.calls.length - 1][0];
       const { refine } = renderOptions;
 
-      refine([undefined, 100]);
+      refine({ min: undefined, max: 100 });
       expect(helper.getNumericRefinement('price', '>=')).toEqual(undefined);
       expect(helper.getNumericRefinement('price', '<=')).toEqual([100]);
       expect(helper.search).toHaveBeenCalledTimes(1);
 
-      refine([0, undefined]);
+      refine({ min: 0, max: undefined });
       expect(helper.getNumericRefinement('price', '>=')).toEqual([0]);
       expect(helper.getNumericRefinement('price', '<=')).toEqual([]);
       expect(helper.search).toHaveBeenCalledTimes(2);
 
-      refine([0, 100]);
+      refine({ min: 0, max: 100 });
       expect(helper.getNumericRefinement('price', '>=')).toEqual([0]);
       expect(helper.getNumericRefinement('price', '<=')).toEqual([100]);
       expect(helper.search).toHaveBeenCalledTimes(3);
@@ -580,7 +580,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
     });
   });
 
-  describe('start', () => {
+  describe('currentRefinement', () => {
     const attribute = 'price';
     const rendering = () => {};
     const createHelper = () => jsHelper(createSearchClient(), '');
@@ -593,7 +593,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
         widget.getWidgetSearchParameters(helper.state, { uiState: {} })
       );
 
-      const { start } = widget.getWidgetRenderState(
+      const { currentRefinement } = widget.getWidgetRenderState(
         createRenderOptions({
           results: createFacetStatsResults({
             helper,
@@ -604,7 +604,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
         })
       );
 
-      expect(start).toEqual([-Infinity, Infinity]);
+      expect(currentRefinement).toEqual({ min: undefined, max: undefined });
     });
 
     it('expect to return refinement from helper', () => {
@@ -617,7 +617,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
       helper.addNumericRefinement(attribute, '>=', 10);
       helper.addNumericRefinement(attribute, '<=', 100);
 
-      const { start } = widget.getWidgetRenderState(
+      const { currentRefinement } = widget.getWidgetRenderState(
         createRenderOptions({
           helper,
           results: createFacetStatsResults({
@@ -629,7 +629,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
         })
       );
 
-      expect(start).toEqual([10, 100]);
+      expect(currentRefinement).toEqual({ min: 10, max: 100 });
     });
 
     it('expect to return float refinement values', () => {
@@ -642,7 +642,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
       helper.addNumericRefinement(attribute, '>=', 10.9);
       helper.addNumericRefinement(attribute, '<=', 99.1);
 
-      const { start } = widget.getWidgetRenderState(
+      const { currentRefinement } = widget.getWidgetRenderState(
         createRenderOptions({
           helper,
           results: createFacetStatsResults({
@@ -654,7 +654,85 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
         })
       );
 
-      expect(start).toEqual([10.9, 99.1]);
+      expect(currentRefinement).toEqual({ min: 10.9, max: 99.1 });
+    });
+
+    it('expect to return undefined values when refinement is equal to range', () => {
+      const widget = connectRange(rendering)({ attribute });
+      const helper = createHelper();
+
+      helper.setState(
+        widget.getWidgetSearchParameters(helper.state, { uiState: {} })
+      );
+      helper.addNumericRefinement(attribute, '>=', 1);
+      helper.addNumericRefinement(attribute, '<=', 4999);
+
+      const { currentRefinement } = widget.getWidgetRenderState(
+        createRenderOptions({
+          helper,
+          results: createFacetStatsResults({
+            helper,
+            attribute,
+            min: 1,
+            max: 4999,
+          }),
+        })
+      );
+
+      expect(currentRefinement).toEqual({
+        min: undefined,
+        max: undefined,
+      });
+    });
+
+    it('expect to clamp min refinement value to max range', () => {
+      const widget = connectRange(rendering)({ attribute });
+      const helper = createHelper();
+
+      helper.setState(
+        widget.getWidgetSearchParameters(helper.state, { uiState: {} })
+      );
+      helper.addNumericRefinement(attribute, '>=', 5000);
+      helper.addNumericRefinement(attribute, '<=', 6000);
+
+      const { currentRefinement } = widget.getWidgetRenderState(
+        createRenderOptions({
+          helper,
+          results: createFacetStatsResults({
+            helper,
+            attribute,
+            min: 1,
+            max: 4999,
+          }),
+        })
+      );
+
+      expect(currentRefinement.min).toBe(4999);
+    });
+
+    it('expect to clamp max refinement value to min range', () => {
+      const widget = connectRange(rendering)({ attribute });
+      const helper = createHelper();
+
+      helper.setState(
+        widget.getWidgetSearchParameters(helper.state, { uiState: {} })
+      );
+      helper.addNumericRefinement(attribute, '>=', -50);
+      helper.addNumericRefinement(attribute, '<=', 0);
+
+      const { currentRefinement } = widget.getWidgetRenderState(
+        createRenderOptions({
+          helper,
+          results: createFacetStatsResults({
+            helper,
+            attribute,
+            min: 1,
+            max: 4999,
+          }),
+        })
+      );
+
+      expect(currentRefinement.max).toBe(1);
     });
   });
 
@@ -679,7 +757,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
         createInitOptions({ helper })
       );
 
-      refine([10, 490]);
+      refine({ min: 10, max: 490 });
 
       expect(helper.state.page).toBe(0);
     });
@@ -694,7 +772,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
         createInitOptions({ helper })
       );
 
-      refine([10, 490]);
+      refine({ min: 10, max: 490 });
 
       expect(helper.getNumericRefinement(attribute, '>=')).toEqual([10]);
       expect(helper.getNumericRefinement(attribute, '<=')).toEqual([490]);
@@ -724,7 +802,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
         })
       );
 
-      refine([10, 490]);
+      refine({ min: 10, max: 490 });
 
       expect(helper.getNumericRefinement(attribute, '>=')).toEqual([10]);
       expect(helper.getNumericRefinement(attribute, '<=')).toEqual([490]);
@@ -755,7 +833,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
       );
 
       // @ts-expect-error
-      refine(['10', '490']);
+      refine({ min: '10', max: '490' });
 
       expect(helper.getNumericRefinement(attribute, '>=')).toEqual([10]);
       expect(helper.getNumericRefinement(attribute, '<=')).toEqual([490]);
@@ -784,7 +862,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
       );
 
       // @ts-expect-error
-      refine(['10.50', '490.50']);
+      refine({ min: '10.50', max: '490.50' });
 
       // min is rounded down, max rounded up
       expect(helper.getNumericRefinement(attribute, '>=')).toEqual([10]);
@@ -813,7 +891,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
         })
       );
 
-      refine([10, 490]);
+      refine({ min: 10, max: 490 });
 
       expect(helper.getNumericRefinement(attribute, '>=')).toEqual([10]);
       expect(helper.getNumericRefinement(attribute, '<=')).toEqual([490]);
@@ -844,7 +922,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
         })
       );
 
-      refine([10, 490]);
+      refine({ min: 10, max: 490 });
 
       expect(helper.getNumericRefinement(attribute, '>=')).toEqual([10]);
       expect(helper.getNumericRefinement(attribute, '<=')).toEqual([490]);
@@ -880,7 +958,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
         })
       );
 
-      refine([undefined, 490]);
+      refine({ min: undefined, max: 490 });
 
       expect(helper.getNumericRefinement(attribute, '>=')).toEqual([]);
       expect(helper.getNumericRefinement(attribute, '<=')).toEqual([490]);
@@ -913,7 +991,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
         })
       );
 
-      refine([10, undefined]);
+      refine({ min: 10, max: undefined });
 
       expect(helper.getNumericRefinement(attribute, '>=')).toEqual([10]);
       expect(helper.getNumericRefinement(attribute, '<=')).toEqual([]);
@@ -947,7 +1025,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
       );
 
       // @ts-expect-error
-      refine(['', 490]);
+      refine({ min: '', max: 490 });
 
       expect(helper.getNumericRefinement(attribute, '>=')).toEqual([]);
       expect(helper.getNumericRefinement(attribute, '<=')).toEqual([490]);
@@ -981,7 +1059,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
       );
 
       // @ts-expect-error
-      refine([10, '']);
+      refine({ min: 10, max: '' });
 
       expect(helper.getNumericRefinement(attribute, '>=')).toEqual([10]);
       expect(helper.getNumericRefinement(attribute, '<=')).toEqual([]);
@@ -1013,7 +1091,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
         })
       );
 
-      refine([0, 490]);
+      refine({ min: 0, max: 490 });
 
       expect(helper.getNumericRefinement(attribute, '>=')).toEqual([]);
       expect(helper.getNumericRefinement(attribute, '<=')).toEqual([490]);
@@ -1045,7 +1123,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
         })
       );
 
-      refine([10, 500]);
+      refine({ min: 10, max: 500 });
 
       expect(helper.getNumericRefinement(attribute, '>=')).toEqual([10]);
       expect(helper.getNumericRefinement(attribute, '<=')).toEqual([]);
@@ -1080,7 +1158,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
         })
       );
 
-      refine([undefined, 490]);
+      refine({ min: undefined, max: 490 });
 
       expect(helper.getNumericRefinement(attribute, '>=')).toEqual([10]);
       expect(helper.getNumericRefinement(attribute, '<=')).toEqual([490]);
@@ -1113,7 +1191,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
         })
       );
 
-      refine([10, undefined]);
+      refine({ min: 10, max: undefined });
 
       expect(helper.getNumericRefinement(attribute, '>=')).toEqual([10]);
       expect(helper.getNumericRefinement(attribute, '<=')).toEqual([250]);
@@ -1141,7 +1219,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
         })
       );
 
-      refine([0, 490]);
+      refine({ min: 0, max: 490 });
 
       expect(helper.getNumericRefinement(attribute, '>=')).toEqual(undefined);
       expect(helper.getNumericRefinement(attribute, '<=')).toEqual(undefined);
@@ -1169,7 +1247,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
         })
       );
 
-      refine([10, 500]);
+      refine({ min: 10, max: 500 });
 
       expect(helper.getNumericRefinement(attribute, '>=')).toEqual(undefined);
       expect(helper.getNumericRefinement(attribute, '<=')).toEqual(undefined);
@@ -1197,7 +1275,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
         })
       );
 
-      refine([undefined, undefined]);
+      refine({ min: undefined, max: undefined });
 
       expect(helper.getNumericRefinement(attribute, '>=')).toEqual(undefined);
       expect(helper.getNumericRefinement(attribute, '<=')).toEqual(undefined);
@@ -1228,7 +1306,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
         })
       );
 
-      refine([10, 490]);
+      refine({ min: 10, max: 490 });
 
       expect(helper.getNumericRefinement(attribute, '>=')).toEqual([10]);
       expect(helper.getNumericRefinement(attribute, '<=')).toEqual([490]);
@@ -1256,7 +1334,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
       );
 
       // @ts-expect-error
-      refine(['ADASA', 'FFDSFQS']);
+      refine({ min: 'ADASA', max: 'FFDSFQS' });
 
       expect(helper.getNumericRefinement(attribute, '>=')).toEqual(undefined);
       expect(helper.getNumericRefinement(attribute, '<=')).toEqual(undefined);
@@ -1328,7 +1406,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
       const renderOptions = rendering.mock.calls[0][0];
       const { refine } = renderOptions;
 
-      refine([100, 1000]);
+      refine({ min: 100, max: 1000 });
 
       expect(helper.state).toEqual(
         new SearchParameters({
@@ -1624,7 +1702,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
           canRefine: false,
           refine: expect.any(Function),
           sendEvent: expect.any(Function),
-          start: [0, 1000],
+          currentRefinement: { min: undefined, max: 1000 },
           widgetParams: {
             attribute: 'price',
             precision: 0,
@@ -1659,7 +1737,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
           canRefine: true,
           refine: expect.any(Function),
           sendEvent: expect.any(Function),
-          start: [0, 1000],
+          currentRefinement: { min: 0, max: 1000 },
           widgetParams: {
             attribute: 'price',
             precision: 0,
@@ -1703,7 +1781,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
         canRefine: false,
         refine: expect.any(Function),
         sendEvent: expect.any(Function),
-        start: [0, 1000],
+        currentRefinement: { min: undefined, max: 1000 },
         widgetParams: {
           attribute: 'price',
           precision: 0,
@@ -1735,7 +1813,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
         canRefine: true,
         refine: expect.any(Function),
         sendEvent: expect.any(Function),
-        start: [0, 1000],
+        currentRefinement: { min: 0, max: 1000 },
         widgetParams: {
           attribute: 'price',
           precision: 0,
@@ -1779,7 +1857,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
         canRefine: false,
         refine: expect.any(Function),
         sendEvent: expect.any(Function),
-        start: [-Infinity, Infinity],
+        currentRefinement: { min: undefined, max: undefined },
         widgetParams: {
           attribute: 'price',
           precision: 0,
@@ -2210,7 +2288,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
 
       expect(renderer).toHaveBeenCalledWith(
         expect.objectContaining({
-          start: [100, 200],
+          currentRefinement: { min: 100, max: 200 },
         }),
         true
       );
@@ -2246,7 +2324,7 @@ describe('insights', () => {
     const firstRenderingOptions =
       rendering.mock.calls[rendering.mock.calls.length - 1][0];
     const { refine } = firstRenderingOptions;
-    refine([10, 30]);
+    refine({ min: 10, max: 30 });
 
     expect(instantSearchInstance.sendEventToInsights).not.toHaveBeenCalled();
   });
diff --git a/packages/instantsearch-core/src/connectors/connectRange.ts b/packages/instantsearch-core/src/connectors/connectRange.ts
index 314108070f..e6001724b5 100644
--- a/packages/instantsearch-core/src/connectors/connectRange.ts
+++ b/packages/instantsearch-core/src/connectors/connectRange.ts
@@ -2,7 +2,12 @@ import { createDocumentationMessageGenerator, noop } from '../lib/public';
 import { checkRendering } from '../lib/utils';
 
 import type { InstantSearch } from '../instantsearch';
-import type { Connector, WidgetRenderState, SendEventForFacet } from '../types';
+import type {
+  Connector,
+  Expand,
+  WidgetRenderState,
+  SendEventForFacet,
+} from '../types';
 import type { AlgoliaSearchHelper, SearchResults } from 'algoliasearch-helper';
 
 const withUsage = createDocumentationMessageGenerator(
@@ -15,8 +20,6 @@ const $$type = 'ais.range';
 export type RangeMin = number | undefined;
 export type RangeMax = number | undefined;
 
-// @MAJOR: potentially we should consolidate these types
-export type RangeBoundaries = [RangeMin, RangeMax];
 export type Range = {
   min: RangeMin;
   max: RangeMax;
@@ -25,11 +28,10 @@ export type Range = {
 export type RangeRenderState = {
   /**
    * Sets a range to filter the results on. Both values
-   * are optional, and will default to the higher and lower bounds. You can use `undefined` to remove a
-   * previously set bound or to set an infinite bound.
-   * @param rangeValue tuple of [min, max] bounds
+   * are optional, and will default to the higher and lower bounds. You can use `undefined` to remove a previously set bound.
+   * @param rangeValue object with min and max bounds
    */
-  refine: (rangeValue: RangeBoundaries) => void;
+  refine: (rangeValue: Expand<Partial<Range>>) => void;
 
   /**
    * Indicates whether this widget can be refined
@@ -49,7 +51,7 @@ export type RangeRenderState = {
   /**
    * Current refinement of the search
    */
-  start: RangeBoundaries;
+  currentRefinement: Range;
 
   /**
    * Transform for the rendering `from` and/or `to` values.
@@ -96,7 +98,6 @@ export type RangeWidgetDescription = {
   };
   indexUiState: {
     range: {
-      // @TODO: this could possibly become `${number}:${number}` later
       [attribute: string]: string;
     };
   };
@@ -284,26 +285,31 @@ export const connectRange: RangeConnector = function connectRange(
     }
 
     function _getCurrentRefinement(
-      helper: AlgoliaSearchHelper
-    ): RangeBoundaries {
+      helper: AlgoliaSearchHelper,
+      range: Range
+    ): Range {
       const [minValue] = helper.getNumericRefinement(attribute, '>=') || [];
 
       const [maxValue] = helper.getNumericRefinement(attribute, '<=') || [];
 
       const min =
-        typeof minValue === 'number' && Number.isFinite(minValue)
-          ? minValue
-          : -Infinity;
+        typeof minValue === 'number' &&
+        Number.isFinite(minValue) &&
+        minValue !== range.min
+          ? Math.min(minValue, range.max!)
+          : undefined;
       const max =
-        typeof maxValue === 'number' && Number.isFinite(maxValue)
-          ? maxValue
-          : Infinity;
+        typeof maxValue === 'number' &&
+        Number.isFinite(maxValue) &&
+        maxValue !== range.max
+          ? Math.max(maxValue, range.min!)
+          : undefined;
 
-      return [min, max];
+      return { min, max };
     }
 
     function _refine(helper: AlgoliaSearchHelper, currentRange: Range) {
-      return ([nextMin, nextMax]: RangeBoundaries = [undefined, undefined]) => {
+      return ({ min: nextMin, max: nextMax }: Partial<Range> = {}) => {
         const refinedState = getRefinedState(
           helper,
           currentRange,
@@ -360,7 +366,7 @@ export const connectRange: RangeConnector = function connectRange(
         };
 
         const currentRange = _getCurrentRange(stats);
-        const start = _getCurrentRefinement(helper);
+        const currentRefinement = _getCurrentRefinement(helper, currentRange);
 
         let refine: ReturnType<typeof _refine>;
 
@@ -386,7 +392,7 @@ export const connectRange: RangeConnector = function connectRange(
             ...widgetParams,
             precision,
           },
-          start,
+          currentRefinement,
         };
       },
 
diff --git a/packages/instantsearch.js/src/components/RangeInput/RangeInput.tsx b/packages/instantsearch.js/src/components/RangeInput/RangeInput.tsx
index 0c54d0fa7a..d17a470fad 100644
--- a/packages/instantsearch.js/src/components/RangeInput/RangeInput.tsx
+++ b/packages/instantsearch.js/src/components/RangeInput/RangeInput.tsx
@@ -5,7 +5,7 @@ import { h, Component } from 'preact';
 
 import Template from '../Template/Template';
 
-import type { Range, RangeBoundaries } from '../../connectors';
+import type { Range } from '../../connectors';
 import type { ComponentCSSClasses } from '../../types';
 import type {
   RangeInputCSSClasses,
@@ -26,7 +26,7 @@ export type RangeInputProps = {
   templateProps: {
     templates: RangeInputComponentTemplates;
   };
-  refine: (rangeValue: RangeBoundaries) => void;
+  refine: (rangeValue: Range) => void;
 };
 
 // Strips leading `0` from a positive number value
@@ -62,10 +62,10 @@ class RangeInput extends Component<
     event.preventDefault();
 
     const { min, max } = this.state;
-    this.props.refine([
-      min ? Number(min) : undefined,
-      max ? Number(max) : undefined,
-    ]);
+    this.props.refine({
+      min: min ? Number(min) : undefined,
+      max: max ? Number(max) : undefined,
+    });
   };
 
   public render() {
diff --git a/packages/instantsearch.js/src/components/RangeInput/__tests__/RangeInput-test.tsx b/packages/instantsearch.js/src/components/RangeInput/__tests__/RangeInput-test.tsx
index a264cbfcf6..b1115e60ae 100644
--- a/packages/instantsearch.js/src/components/RangeInput/__tests__/RangeInput-test.tsx
+++ b/packages/instantsearch.js/src/components/RangeInput/__tests__/RangeInput-test.tsx
@@ -176,7 +176,7 @@ describe('RangeInput', () => {
         fireEvent.submit(form);
       }
 
-      expect(props.refine).toHaveBeenCalledWith([20, 480]);
+      expect(props.refine).toHaveBeenCalledWith({ min: 20, max: 480 });
     });
 
     it('expect to call refine with min, max as float', () => {
@@ -202,7 +202,7 @@ describe('RangeInput', () => {
         fireEvent.submit(form);
       }
 
-      expect(props.refine).toHaveBeenCalledWith([20.05, 480.05]);
+      expect(props.refine).toHaveBeenCalledWith({ min: 20.05, max: 480.05 });
     });
 
     it('expect to call refine with min only', () => {
@@ -225,7 +225,7 @@ describe('RangeInput', () => {
         fireEvent.submit(form);
       }
 
-      expect(props.refine).toHaveBeenCalledWith([20, undefined]);
+      expect(props.refine).toHaveBeenCalledWith({ min: 20, max: undefined });
     });
 
     it('expect to call refine with max only', () => {
@@ -248,7 +248,7 @@ describe('RangeInput', () => {
         fireEvent.submit(form);
       }
 
-      expect(props.refine).toHaveBeenCalledWith([undefined, 480]);
+      expect(props.refine).toHaveBeenCalledWith({ min: undefined, max: 480 });
     });
 
     it('expect to call refine without values', () => {
@@ -263,7 +263,10 @@ describe('RangeInput', () => {
         fireEvent.submit(form);
       }
 
-      expect(props.refine).toHaveBeenCalledWith([undefined, undefined]);
+      expect(props.refine).toHaveBeenCalledWith({
+        min: undefined,
+        max: undefined,
+      });
     });
   });
 });
diff --git a/packages/instantsearch.js/src/components/Slider/Slider.tsx b/packages/instantsearch.js/src/components/Slider/Slider.tsx
index 008ff82c0d..733ecfd318 100644
--- a/packages/instantsearch.js/src/components/Slider/Slider.tsx
+++ b/packages/instantsearch.js/src/components/Slider/Slider.tsx
@@ -8,7 +8,7 @@ import { range } from '../../lib/utils';
 import Pit from './Pit';
 import Rheostat from './Rheostat';
 
-import type { RangeBoundaries } from '../../connectors';
+import type { Range } from '../../connectors';
 import type { ComponentCSSClasses } from '../../types';
 import type {
   RangeSliderCssClasses,
@@ -20,10 +20,10 @@ export type RangeSliderComponentCSSClasses =
   ComponentCSSClasses<RangeSliderCssClasses>;
 
 export type SliderProps = {
-  refine: (values: RangeBoundaries) => void;
+  refine: (values: Range) => void;
   min?: number;
   max?: number;
-  values: RangeBoundaries;
+  values: Range;
   pips?: boolean;
   step?: number;
   tooltips?: RangeSliderWidgetParams['tooltips'];
@@ -35,9 +35,11 @@ class Slider extends Component<SliderProps> {
     return this.props.min! >= this.props.max!;
   }
 
-  private handleChange = ({ values }: { values: RangeBoundaries }) => {
+  private handleChange = ({
+    values: [min, max],
+  }: Parameters<NonNullable<Rheostat['props']['onChange']>>[0]) => {
     if (!this.isDisabled) {
-      this.props.refine(values);
+      this.props.refine({ min, max });
     }
   };
 
@@ -132,7 +134,12 @@ class Slider extends Component<SliderProps> {
           pitPoints={pitPoints}
           snap={true}
           snapPoints={snapPoints}
-          values={(this.isDisabled ? [min, max] : values) as [number, number]}
+          values={
+            (this.isDisabled ? [min, max] : [values.min, values.max]) as [
+              number,
+              number
+            ]
+          }
           disabled={this.isDisabled}
         />
       </div>
diff --git a/packages/instantsearch.js/src/components/Slider/__tests__/Slider-test.tsx b/packages/instantsearch.js/src/components/Slider/__tests__/Slider-test.tsx
index e0f48af9e2..415b4a53c4 100644
--- a/packages/instantsearch.js/src/components/Slider/__tests__/Slider-test.tsx
+++ b/packages/instantsearch.js/src/components/Slider/__tests__/Slider-test.tsx
@@ -17,7 +17,7 @@ describe('Slider', () => {
         refine={() => undefined}
         min={0}
         max={500}
-        values={[0, 0]}
+        values={{ min: 0, max: 0 }}
         pips={true}
         step={2}
         tooltips={true}
@@ -37,7 +37,7 @@ describe('Slider', () => {
         refine={() => undefined}
         min={0}
         max={500}
-        values={[0, 0]}
+        values={{ min: 0, max: 0 }}
         pips={false}
         step={2}
         tooltips={true}
@@ -57,7 +57,7 @@ describe('Slider', () => {
         refine={() => undefined}
         min={0}
         max={500}
-        values={[0, 0]}
+        values={{ min: 0, max: 0 }}
         pips={false}
         step={2}
         tooltips={true}
@@ -76,7 +76,7 @@ describe('Slider', () => {
       refine: jest.fn(),
       min: 0,
       max: 500,
-      values: [0, 0],
+      values: { min: 0, max: 0 },
       pips: true,
       step: 2,
       tooltips: true,
@@ -92,6 +92,6 @@ describe('Slider', () => {
     Rheostat.props().onChange!({ values: [0, 100] });
 
     expect(props.refine).toHaveBeenCalledTimes(1);
-    expect(props.refine).toHaveBeenCalledWith([0, 100]);
+    expect(props.refine).toHaveBeenCalledWith({ min: 0, max: 100 });
   });
 });
diff --git a/packages/instantsearch.js/src/connectors/index.ts b/packages/instantsearch.js/src/connectors/index.ts
index 6ed5e8ca29..2ab1ed01ea 100644
--- a/packages/instantsearch.js/src/connectors/index.ts
+++ b/packages/instantsearch.js/src/connectors/index.ts
@@ -160,7 +160,6 @@ export type {
   RangeWidgetDescription,
   RangeConnectorParams,
   Range,
-  RangeBoundaries,
 } from 'instantsearch-core';
 
 export { connectRatingMenu } from 'instantsearch-core';
diff --git a/packages/instantsearch.js/src/widgets/range-input/range-input.tsx b/packages/instantsearch.js/src/widgets/range-input/range-input.tsx
index e3017c93a1..8b9679e6b8 100644
--- a/packages/instantsearch.js/src/widgets/range-input/range-input.tsx
+++ b/packages/instantsearch.js/src/widgets/range-input/range-input.tsx
@@ -134,7 +134,7 @@ const renderer =
     };
     templates: RangeInputTemplates;
   }): Renderer<RangeRenderState, Partial<RangeInputWidgetParams>> =>
-  ({ refine, range, start, widgetParams }, isFirstRendering) => {
+  ({ refine, range, currentRefinement, widgetParams }, isFirstRendering) => {
     if (isFirstRendering) {
       renderState.templateProps = prepareTemplateProps({
         defaultTemplates,
@@ -144,23 +144,15 @@ const renderer =
     }
 
     const { min: rangeMin, max: rangeMax } = range;
-    const [minValue, maxValue] = start;
 
     const step = 1 / Math.pow(10, widgetParams.precision || 0);
 
-    const values = {
-      min:
-        minValue !== -Infinity && minValue !== rangeMin ? minValue : undefined,
-      max:
-        maxValue !== Infinity && maxValue !== rangeMax ? maxValue : undefined,
-    };
-
     render(
       <RangeInput
         min={rangeMin}
         max={rangeMax}
         step={step}
-        values={values}
+        values={currentRefinement}
         cssClasses={cssClasses}
         refine={refine}
         templateProps={renderState.templateProps!}
diff --git a/packages/instantsearch.js/src/widgets/range-slider/__tests__/__snapshots__/range-slider-test.ts.snap b/packages/instantsearch.js/src/widgets/range-slider/__tests__/__snapshots__/range-slider-test.ts.snap
index b92d6f6ad3..fe0f63737d 100644
--- a/packages/instantsearch.js/src/widgets/range-slider/__tests__/__snapshots__/range-slider-test.ts.snap
+++ b/packages/instantsearch.js/src/widgets/range-slider/__tests__/__snapshots__/range-slider-test.ts.snap
@@ -12,10 +12,10 @@ exports[`rangeSlider Lifecycle max option will use the results min when only max
   "refine": [Function],
   "step": 1,
   "tooltips": true,
-  "values": [
-    1,
-    100,
-  ],
+  "values": {
+    "max": 100,
+    "min": 1,
+  },
 }
 `;
 
@@ -31,10 +31,10 @@ exports[`rangeSlider Lifecycle min option sets the right range 1`] = `
   "refine": [Function],
   "step": 1,
   "tooltips": true,
-  "values": [
-    100,
-    200,
-  ],
+  "values": {
+    "max": 200,
+    "min": 100,
+  },
 }
 `;
 
@@ -50,10 +50,10 @@ exports[`rangeSlider Lifecycle min option will use the results max when only min
   "refine": [Function],
   "step": 1,
   "tooltips": true,
-  "values": [
-    100,
-    5000,
-  ],
+  "values": {
+    "max": 5000,
+    "min": 100,
+  },
 }
 `;
 
@@ -69,10 +69,10 @@ exports[`rangeSlider Lifecycle should render without results 1`] = `
   "refine": [Function],
   "step": 1,
   "tooltips": true,
-  "values": [
-    0,
-    0,
-  ],
+  "values": {
+    "max": 0,
+    "min": 0,
+  },
 }
 `;
 
@@ -88,10 +88,10 @@ exports[`rangeSlider Lifecycle with results calls twice render 1`] = `
   "refine": [Function],
   "step": 1,
   "tooltips": true,
-  "values": [
-    1,
-    5000,
-  ],
+  "values": {
+    "max": 5000,
+    "min": 1,
+  },
 }
 `;
 
@@ -107,9 +107,9 @@ exports[`rangeSlider Lifecycle with results calls twice render 2`] = `
   "refine": [Function],
   "step": 1,
   "tooltips": true,
-  "values": [
-    1,
-    5000,
-  ],
+  "values": {
+    "max": 5000,
+    "min": 1,
+  },
 }
 `;
diff --git a/packages/instantsearch.js/src/widgets/range-slider/__tests__/range-slider-test.ts b/packages/instantsearch.js/src/widgets/range-slider/__tests__/range-slider-test.ts
index 679c87743d..dfe6965e1a 100644
--- a/packages/instantsearch.js/src/widgets/range-slider/__tests__/range-slider-test.ts
+++ b/packages/instantsearch.js/src/widgets/range-slider/__tests__/range-slider-test.ts
@@ -20,7 +20,7 @@ import {
 } from '../../../../test/createWidget';
 import rangeSlider from '../range-slider';
 
-import type { InstantSearch } from '../../../types';
+import type { InstantSearch, Range } from '../../../types';
 import type { AlgoliaSearchHelper } from 'algoliasearch-helper';
 import type { VNode } from 'preact';
 
@@ -36,7 +36,7 @@ jest.mock('preact', () => {
 type SliderProps = {
   max: number;
   min: number;
-  values: [number, number];
+  values: Range;
 };
 
 function createFacetStatsResults({
@@ -385,7 +385,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-slide
           uiState: {},
         });
         helper.setState(state0);
-        refine([stats!.min + 1, stats!.max]);
+        refine({ min: stats!.min + 1, max: stats!.max });
         const state1 = helper.state;
 
         expect(helper.search).toHaveBeenCalledTimes(1);
@@ -407,7 +407,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-slide
           uiState: {},
         });
         helper.setState(state0);
-        refine([stats!.min, stats!.max - 1]);
+        refine({ min: stats!.min, max: stats!.max - 1 });
         const state1 = helper.state;
 
         expect(helper.search).toHaveBeenCalledTimes(1);
@@ -427,7 +427,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-slide
         );
 
         const state0 = helper.state;
-        refine([stats!.min + 1, stats!.max - 1]);
+        refine({ min: stats!.min + 1, max: stats!.max - 1 });
         const state1 = helper.state;
 
         expect(helper.search).toHaveBeenCalledTimes(1);
@@ -437,46 +437,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-slide
             .addNumericRefinement(attribute, '<=', 4999)
         );
       });
-
-      it("expect to clamp the min value to the max range when it's greater than range", () => {
-        widget = rangeSlider({
-          container,
-          attribute,
-          step: 1,
-          cssClasses: { root: '' },
-        });
-
-        widget.init!(createInitOptions({ helper, instantSearchInstance }));
-
-        helper.addNumericRefinement(attribute, '>=', 5550);
-        helper.addNumericRefinement(attribute, '<=', 6000);
-
-        widget.render!(createRenderOptions({ results, helper }));
-
-        const firstRender = render.mock.calls[0][0] as VNode<SliderProps>;
-
-        expect((firstRender.props as SliderProps).values[0]).toBe(5000);
-      });
-
-      it("expect to clamp the max value to the min range when it's lower than range", () => {
-        widget = rangeSlider({
-          container,
-          attribute,
-          step: 1,
-          cssClasses: { root: '' },
-        });
-
-        widget.init!(createInitOptions({ helper, instantSearchInstance }));
-
-        helper.addNumericRefinement(attribute, '>=', -50);
-        helper.addNumericRefinement(attribute, '<=', 0);
-
-        widget.render!(createRenderOptions({ results, helper }));
-
-        const firstRender = render.mock.calls[0][0] as VNode<SliderProps>;
-
-        expect((firstRender.props as SliderProps).values[1]).toBe(1);
-      });
     });
   });
 });
diff --git a/packages/instantsearch.js/src/widgets/range-slider/range-slider.tsx b/packages/instantsearch.js/src/widgets/range-slider/range-slider.tsx
index fa8569f2ff..d1961596d6 100644
--- a/packages/instantsearch.js/src/widgets/range-slider/range-slider.tsx
+++ b/packages/instantsearch.js/src/widgets/range-slider/range-slider.tsx
@@ -13,7 +13,6 @@ import {
 
 import type { RangeSliderComponentCSSClasses } from '../../components/Slider/Slider';
 import type {
-  RangeBoundaries,
   RangeConnectorParams,
   RangeRenderState,
   RangeWidgetDescription,
@@ -37,25 +36,14 @@ const renderer =
     step?: number;
     tooltips: RangeSliderWidgetParams['tooltips'];
   }): Renderer<RangeRenderState, Partial<RangeSliderWidgetParams>> =>
-  ({ refine, range, start }, isFirstRendering) => {
+  ({ refine, range, currentRefinement }, isFirstRendering) => {
     if (isFirstRendering) {
       // There's no information at this point, let's render nothing.
       return;
     }
 
     const { min: minRange, max: maxRange } = range;
-
-    const [minStart, maxStart] = start;
-    const minFinite = minStart === -Infinity ? minRange : minStart;
-    const maxFinite = maxStart === Infinity ? maxRange : maxStart;
-
-    // Clamp values to the range for avoid extra rendering & refinement
-    // Should probably be done on the connector side, but we need to stay
-    // backward compatible so we still need to pass [-Infinity, Infinity]
-    const values: RangeBoundaries = [
-      minFinite! > maxRange! ? maxRange : minFinite,
-      maxFinite! < minRange! ? minRange : maxFinite,
-    ];
+    const { min: minValue, max: maxValue } = currentRefinement;
 
     render(
       <Slider
@@ -63,7 +51,10 @@ const renderer =
         refine={refine}
         min={minRange}
         max={maxRange}
-        values={values}
+        values={{
+          min: minValue ?? minRange,
+          max: maxValue ?? maxRange,
+        }}
         tooltips={tooltips}
         step={step}
         pips={pips}
diff --git a/packages/react-instantsearch-core/src/connectors/__tests__/useRange.test.tsx b/packages/react-instantsearch-core/src/connectors/__tests__/useRange.test.tsx
index 97783c081c..f58a8ed32b 100644
--- a/packages/react-instantsearch-core/src/connectors/__tests__/useRange.test.tsx
+++ b/packages/react-instantsearch-core/src/connectors/__tests__/useRange.test.tsx
@@ -27,7 +27,7 @@ describe('useRange', () => {
       },
       refine: expect.any(Function),
       sendEvent: expect.any(Function),
-      start: [-Infinity, Infinity],
+      currentRefinement: { min: undefined, max: undefined },
     });
 
     await waitFor(() => {
@@ -44,7 +44,7 @@ describe('useRange', () => {
         },
         refine: expect.any(Function),
         sendEvent: expect.any(Function),
-        start: [-Infinity, Infinity],
+        currentRefinement: { min: undefined, max: undefined },
       });
     });
   });
diff --git a/packages/react-instantsearch/src/ui/RangeInput.tsx b/packages/react-instantsearch/src/ui/RangeInput.tsx
index ffc737cde7..90f0ff6817 100644
--- a/packages/react-instantsearch/src/ui/RangeInput.tsx
+++ b/packages/react-instantsearch/src/ui/RangeInput.tsx
@@ -6,7 +6,7 @@ import type { useRange } from 'react-instantsearch-core';
 type RangeRenderState = ReturnType<typeof useRange>;
 
 export type RangeInputProps = Omit<React.ComponentProps<'div'>, 'onSubmit'> &
-  Pick<RangeRenderState, 'range' | 'start'> & {
+  Pick<RangeRenderState, 'range' | 'currentRefinement'> & {
     classNames?: Partial<RangeInputClassNames>;
     disabled: boolean;
     onSubmit: RangeRenderState['refine'];
@@ -74,8 +74,8 @@ function stripLeadingZeroFromInput(value: string): string {
 
 export function RangeInput({
   classNames = {},
-  range: { min, max },
-  start: [minValue, maxValue],
+  range: { min: minRange, max: maxRange },
+  currentRefinement: { min: minValue, max: maxValue },
   step = 1,
   disabled,
   onSubmit,
@@ -83,14 +83,8 @@ export function RangeInput({
   ...props
 }: RangeInputProps) {
   const values = {
-    min:
-      minValue !== -Infinity && minValue !== min
-        ? minValue
-        : unsetNumberInputValue,
-    max:
-      maxValue !== Infinity && maxValue !== max
-        ? maxValue
-        : unsetNumberInputValue,
+    min: minValue ?? unsetNumberInputValue,
+    max: maxValue ?? unsetNumberInputValue,
   };
   const [prevValues, setPrevValues] = useState(values);
 
@@ -118,10 +112,10 @@ export function RangeInput({
         className={cx('ais-RangeInput-form', classNames.form)}
         onSubmit={(event) => {
           event.preventDefault();
-          onSubmit([
-            from ? Number(from) : undefined,
-            to ? Number(to) : undefined,
-          ]);
+          onSubmit({
+            min: from ? Number(from) : undefined,
+            max: to ? Number(to) : undefined,
+          });
         }}
       >
         <label className={cx('ais-RangeInput-label', classNames.label)}>
@@ -133,11 +127,11 @@ export function RangeInput({
               classNames.inputMin
             )}
             type="number"
-            min={min}
-            max={max}
+            min={minRange}
+            max={maxRange}
             value={stripLeadingZeroFromInput(from || unsetNumberInputValue)}
             step={step}
-            placeholder={min?.toString()}
+            placeholder={minRange?.toString()}
             disabled={disabled}
             onInput={({ currentTarget }) => {
               const value = currentTarget.value;
@@ -160,11 +154,11 @@ export function RangeInput({
               classNames.inputMax
             )}
             type="number"
-            min={min}
-            max={max}
+            min={minRange}
+            max={maxRange}
             value={stripLeadingZeroFromInput(to || unsetNumberInputValue)}
             step={step}
-            placeholder={max?.toString()}
+            placeholder={maxRange?.toString()}
             disabled={disabled}
             onInput={({ currentTarget }) => {
               const value = currentTarget.value;
diff --git a/packages/react-instantsearch/src/ui/__tests__/RangeInput.test.tsx b/packages/react-instantsearch/src/ui/__tests__/RangeInput.test.tsx
index 7423128b4d..488a63340d 100644
--- a/packages/react-instantsearch/src/ui/__tests__/RangeInput.test.tsx
+++ b/packages/react-instantsearch/src/ui/__tests__/RangeInput.test.tsx
@@ -14,7 +14,7 @@ describe('RangeInput', () => {
   function createProps(props: Partial<RangeInputProps> = {}): RangeInputProps {
     return {
       range: { min: 1, max: 5000 },
-      start: [undefined, undefined],
+      currentRefinement: { min: undefined, max: undefined },
       disabled: false,
       onSubmit: jest.fn(),
       translations: { separatorElementText: 'to', submitButtonText: 'Go' },
@@ -107,23 +107,9 @@ describe('RangeInput', () => {
       ).toEqual(['', '']);
     });
 
-    test('renders with empty values when refinement is equal to range', () => {
-      const props = createProps({
-        range: { min: 100, max: 1000 },
-        start: [100, 1000],
-      });
-      const { container } = render(<RangeInput {...props} />);
-
-      expect(
-        Array.from(
-          container.querySelectorAll<HTMLInputElement>('.ais-RangeInput-input')
-        ).map((input) => input.value)
-      ).toEqual(['', '']);
-    });
-
     test('renders with refined values', () => {
       const props = createProps({
-        start: [100, 1000],
+        currentRefinement: { min: 100, max: 1000 },
       });
       const { container } = render(<RangeInput {...props} />);
 
@@ -135,7 +121,10 @@ describe('RangeInput', () => {
     });
 
     test('steps with specific value', () => {
-      const props = createProps({ start: [100, 100], step: 0.01 });
+      const props = createProps({
+        currentRefinement: { min: 100, max: 100 },
+        step: 0.01,
+      });
       render(<RangeInput {...props} />);
 
       ['min', 'max'].forEach((target) => {
@@ -154,13 +143,13 @@ describe('RangeInput', () => {
   });
 
   test('calls an `onSubmit` callback when submitting form', () => {
-    const props = createProps({ start: [100, 1000] });
+    const props = createProps({ currentRefinement: { min: 100, max: 1000 } });
     const { container } = render(<RangeInput {...props} />);
 
     userEvent.click(container.querySelector('.ais-RangeInput-submit')!);
 
     expect(props.onSubmit).toHaveBeenCalledTimes(1);
-    expect(props.onSubmit).toHaveBeenLastCalledWith([100, 1000]);
+    expect(props.onSubmit).toHaveBeenLastCalledWith({ min: 100, max: 1000 });
 
     userEvent.type(
       container.querySelector('.ais-RangeInput-input--min')!,
@@ -176,7 +165,7 @@ describe('RangeInput', () => {
     userEvent.click(container.querySelector('.ais-RangeInput-submit')!);
 
     expect(props.onSubmit).toHaveBeenCalledTimes(2);
-    expect(props.onSubmit).toHaveBeenLastCalledWith([500, 5000]);
+    expect(props.onSubmit).toHaveBeenLastCalledWith({ min: 500, max: 5000 });
   });
 
   test('accepts custom class names', () => {
diff --git a/packages/react-instantsearch/src/widgets/RangeInput.tsx b/packages/react-instantsearch/src/widgets/RangeInput.tsx
index 8e1e8e2bb5..2edad73a58 100644
--- a/packages/react-instantsearch/src/widgets/RangeInput.tsx
+++ b/packages/react-instantsearch/src/widgets/RangeInput.tsx
@@ -8,7 +8,12 @@ import type { UseRangeProps } from 'react-instantsearch-core';
 
 type UiProps = Pick<
   RangeInputUiProps,
-  'disabled' | 'onSubmit' | 'range' | 'start' | 'step' | 'translations'
+  | 'disabled'
+  | 'onSubmit'
+  | 'range'
+  | 'currentRefinement'
+  | 'step'
+  | 'translations'
 >;
 
 export type RangeInputProps = Omit<RangeInputUiProps, keyof UiProps> &
@@ -22,7 +27,7 @@ export function RangeInput({
   translations,
   ...props
 }: RangeInputProps) {
-  const { range, start, canRefine, refine } = useRange(
+  const { range, currentRefinement, canRefine, refine } = useRange(
     { attribute, min, max, precision },
     { $$widgetType: 'ais.rangeInput' }
   );
@@ -31,7 +36,7 @@ export function RangeInput({
 
   const uiProps: UiProps = {
     range,
-    start,
+    currentRefinement,
     step,
     disabled: !canRefine,
     onSubmit: refine,
diff --git a/packages/vue-instantsearch/src/components/RangeInput.vue b/packages/vue-instantsearch/src/components/RangeInput.vue
index 3e18bfa2d4..6fa5b3eedc 100644
--- a/packages/vue-instantsearch/src/components/RangeInput.vue
+++ b/packages/vue-instantsearch/src/components/RangeInput.vue
@@ -4,7 +4,7 @@
     :class="[suit(), !state.canRefine && suit('', 'noRefinement')]"
   >
     <slot
-      :current-refinement="values"
+      :current-refinement="state.currentRefinement"
       :refine="refine"
       :can-refine="state.canRefine"
       :range="state.range"
@@ -14,8 +14,8 @@
         :class="suit('form')"
         @submit.prevent="
           refine({
-            min: pick(minInput, values.min),
-            max: pick(maxInput, values.max),
+            min: pick(minInput, state.currentRefinement.min),
+            max: pick(maxInput, state.currentRefinement.max),
           })
         "
       >
@@ -28,7 +28,7 @@
             :min="state.range.min"
             :max="state.range.max"
             :placeholder="state.range.min"
-            :value="values.min"
+            :value="state.currentRefinement.min"
             @change="minInput = $event.currentTarget.value"
           />
         </label>
@@ -44,7 +44,7 @@
             :min="state.range.min"
             :max="state.range.max"
             :placeholder="state.range.max"
-            :value="values.max"
+            :value="state.currentRefinement.max"
             @change="maxInput = $event.currentTarget.value"
           />
         </label>
@@ -120,19 +120,6 @@ export default {
     step() {
       return 1 / Math.pow(10, this.precision);
     },
-    values() {
-      const [minValue, maxValue] = this.state.start;
-      const { min: minRange, max: maxRange } = this.state.range;
-
-      return {
-        min:
-          minValue !== -Infinity && minValue !== minRange
-            ? minValue
-            : undefined,
-        max:
-          maxValue !== Infinity && maxValue !== maxRange ? maxValue : undefined,
-      };
-    },
   },
   methods: {
     pick(first, second) {
@@ -143,7 +130,7 @@ export default {
       }
     },
     refine({ min, max }) {
-      this.state.refine([min, max]);
+      this.state.refine({ min, max });
     },
   },
 };
diff --git a/packages/vue-instantsearch/src/components/__tests__/RangeInput.js b/packages/vue-instantsearch/src/components/__tests__/RangeInput.js
index cd029199df..2ff71c2ad6 100644
--- a/packages/vue-instantsearch/src/components/__tests__/RangeInput.js
+++ b/packages/vue-instantsearch/src/components/__tests__/RangeInput.js
@@ -16,7 +16,7 @@ const defaultRange = {
 };
 
 const defaultState = {
-  start: [0, 1000],
+  currentRefinement: { min: 0, max: 1000 },
   range: defaultRange,
   canRefine: true,
   refine: () => {},

From 1c6e2935645580a26b52ce5d4f7ed311100739ed Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Wed, 8 Jan 2025 13:45:11 +0100
Subject: [PATCH 34/37] feat(connectors): cleanup life cycle without dispose
 (#6497)

feat(connectors): rely entirely on gWSP and gUS for parameters in dispose

In `dispose`, we no longer have any logic other than clearing listeners and removing rendering. This causes a significant simplification in all connectors.

One side-effect of this is that `configure` no longer can be collaborating in ui state. If we'd want that, there's no way to distinguish between the ui state set for one configure or the one set for another. Therefore the configure widget is completely in charge of its parameters. If you want to synchronise configure with the URL, do that separately of the UI State.

Small side-effect of this PR is the deduplication of the test/mock createWidget files

BREAKING CHANGE: widgets no longer explicitly clean in dispose (handled in index widget automatically)
BREAKING CHANGE: configure no longer shows in ui state or routing.

[FX-3209]
---
 .../src/__tests__/RoutingManager.test.ts      |   2 +-
 .../instantsearch-integration.test.ts         |  45 ---
 .../src/__tests__/instantsearch.test.tsx      |   5 +-
 .../__tests__/connectAutocomplete.test.ts     | 111 +------
 .../__tests__/connectBreadcrumb.test.ts       |  52 +--
 .../__tests__/connectClearRefinements.test.ts |  30 +-
 .../__tests__/connectConfigure.test.ts        | 305 +++++-------------
 .../connectCurrentRefinements.test.ts         |  30 +-
 .../__tests__/connectDynamicWidgets.test.ts   |  10 +-
 .../connectFrequentlyBoughtTogether.test.ts   |  31 +-
 .../__tests__/connectGeoSearch.test.ts        |  27 +-
 .../__tests__/connectHierarchicalMenu.test.ts |  90 ++----
 .../connectors/__tests__/connectHits.test.ts  |  90 +-----
 .../__tests__/connectHitsPerPage.test.ts      |  78 +----
 .../__tests__/connectInfiniteHits.test.ts     | 112 +------
 .../__tests__/connectLookingSimilar.test.ts   |  29 +-
 .../connectors/__tests__/connectMenu.test.ts  | 202 ++----------
 .../__tests__/connectNumericMenu.test.ts      |  54 ++--
 .../__tests__/connectPagination.test.ts       |  57 +---
 .../__tests__/connectPoweredBy.test.ts        |  33 +-
 .../__tests__/connectQueryRules.test.ts       | 146 +--------
 .../connectors/__tests__/connectRange.test.ts |  97 +-----
 .../__tests__/connectRatingMenu.test.ts       |  76 +----
 .../__tests__/connectRefinementList.test.ts   | 212 +-----------
 .../__tests__/connectRelatedProducts.test.ts  |  29 +-
 .../__tests__/connectRelevantSort.test.ts     |  42 ++-
 .../__tests__/connectSearchBox.test.ts        |  55 +---
 .../__tests__/connectSortBy.test.ts           |  53 ++-
 .../connectors/__tests__/connectStats.test.ts |  34 +-
 .../__tests__/connectToggleRefinement.test.ts |  81 +----
 .../__tests__/connectTrendingItems.test.ts    |  26 +-
 .../__tests__/connectVoiceSearch.test.ts      | 150 ++++-----
 .../src/connectors/connectAutocomplete.ts     |  18 +-
 .../src/connectors/connectConfigure.ts        |  72 +----
 .../connectFrequentlyBoughtTogether.ts        |   3 +-
 .../src/connectors/connectGeoSearch.ts        |   4 +-
 .../src/connectors/connectHierarchicalMenu.ts |   6 +-
 .../src/connectors/connectHits.ts             |  16 +-
 .../src/connectors/connectHitsPerPage.ts      |   4 +-
 .../src/connectors/connectInfiniteHits.ts     |  18 +-
 .../src/connectors/connectLookingSimilar.ts   |   3 +-
 .../src/connectors/connectMenu.ts             |   6 +-
 .../src/connectors/connectNumericMenu.ts      |   3 +-
 .../src/connectors/connectPagination.ts       |   4 +-
 .../src/connectors/connectQueryRules.ts       |  20 +-
 .../src/connectors/connectRange.ts            |   6 +-
 .../src/connectors/connectRatingMenu.ts       |   4 +-
 .../src/connectors/connectRefinementList.ts   |  11 +-
 .../src/connectors/connectRelatedProducts.ts  |   3 +-
 .../src/connectors/connectRelevantSort.ts     |   4 +-
 .../src/connectors/connectSearchBox.ts        |   4 +-
 .../src/connectors/connectSortBy.ts           |   6 +-
 .../src/connectors/connectToggleRefinement.ts |   4 +-
 .../src/connectors/connectTrendingItems.ts    |   3 +-
 .../src/connectors/connectVoiceSearch.ts      |  30 +-
 .../__tests__/getWidgetAttribute.test.ts      |   3 +-
 .../__tests__/createSendEventForFacet.test.ts |   2 +-
 .../__tests__/createSendEventForHits.test.ts  |   3 +-
 .../__tests__/resolveSearchParameters.test.ts |   3 +-
 .../src/lib/utils/checkIndexUiState.ts        |   4 -
 .../__tests__/createInsightsMiddleware.ts     |   2 +-
 .../__tests__/simpleStateMapping.test.ts      |  48 ---
 .../__tests__/singleIndexStateMapping.test.ts |  44 ---
 .../src/routing/simpleStateMapping.ts         |  28 +-
 .../src/routing/singleIndexStateMapping.ts    |  13 +-
 .../instantsearch-core/src/types/ui-state.ts  |   2 -
 .../instantsearch-core/src/types/widget.ts    |   3 -
 .../widgets/__tests__/index-widget.test.ts    |  60 +---
 .../src/widgets/index-widget.ts               |  52 ++-
 .../instantsearch-core/test/createWidget.ts   |  10 +-
 .../components/Panel/__tests__/Panel-test.tsx |   2 +-
 .../__tests__/dynamic-widgets-test.ts         |  10 +-
 .../geo-search/__tests__/geo-search-test.ts   |  53 +--
 .../src/widgets/panel/__tests__/panel-test.ts |  16 +-
 .../__tests__/query-rule-custom-data-test.ts  |  36 +--
 .../__tests__/range-slider-test.ts            |   8 +-
 .../__tests__/relevant-sort-test.ts           |   6 +-
 .../__tests__/voice-search-test.ts            |   6 +-
 .../stories/geo-search.stories.ts             |   2 +-
 .../test/createInstantSearch.ts               |  76 -----
 .../instantsearch.js/test/createWidget.ts     | 103 ------
 .../widgets/__tests__/all-widgets.test.tsx    |   7 +-
 .../__tests__/createServerRootMixin.test.js   | 126 +++-----
 83 files changed, 816 insertions(+), 2558 deletions(-)
 delete mode 100644 packages/instantsearch.js/test/createInstantSearch.ts
 delete mode 100644 packages/instantsearch.js/test/createWidget.ts

diff --git a/packages/instantsearch-core/src/__tests__/RoutingManager.test.ts b/packages/instantsearch-core/src/__tests__/RoutingManager.test.ts
index d50443968e..16f9cf368d 100644
--- a/packages/instantsearch-core/src/__tests__/RoutingManager.test.ts
+++ b/packages/instantsearch-core/src/__tests__/RoutingManager.test.ts
@@ -4,6 +4,7 @@
 
 import { createSearchClient } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
+import { createWidget } from 'instantsearch-core/test/createWidget';
 import qs from 'qs';
 
 import {
@@ -12,7 +13,6 @@ import {
   connectHitsPerPage,
   connectSearchBox,
 } from '..';
-import { createWidget } from '../../test/createWidget';
 
 import type { Router, UiState, StateMapping, IndexUiState } from '../types';
 import type { JSDOM } from 'jsdom';
diff --git a/packages/instantsearch-core/src/__tests__/instantsearch-integration.test.ts b/packages/instantsearch-core/src/__tests__/instantsearch-integration.test.ts
index d32cc8b082..033dd128a7 100644
--- a/packages/instantsearch-core/src/__tests__/instantsearch-integration.test.ts
+++ b/packages/instantsearch-core/src/__tests__/instantsearch-integration.test.ts
@@ -6,60 +6,15 @@ import { createSearchClient } from '@instantsearch/mocks';
 import { createRecommendSearchClient } from '@instantsearch/mocks/fixtures';
 import { castToJestMock } from '@instantsearch/testutils';
 import { wait } from '@instantsearch/testutils/wait';
-import { getByText, fireEvent } from '@testing-library/dom';
 
 import {
   instantsearch,
-  connectConfigure,
   connectSearchBox,
   connectFrequentlyBoughtTogether,
 } from '..';
 
 import type { MiddlewareDefinition } from '../types';
 
-describe('configure', () => {
-  it('provides up-to-date uiState to onStateChange', () => {
-    const container = document.createElement('div');
-    const onStateChange = jest.fn();
-    const search = instantsearch({
-      indexName: 'instant_search',
-      searchClient: createSearchClient(),
-      onStateChange({ uiState, setUiState }) {
-        onStateChange(uiState);
-        setUiState(uiState);
-      },
-    });
-    const customComp = connectConfigure(({ refine }, isFirstRendering) => {
-      if (isFirstRendering) {
-        const button = document.createElement('button');
-        button.setAttribute('type', 'button');
-        button.textContent = 'click me';
-        container.appendChild(button);
-        container.querySelector('button')!.addEventListener('click', () => {
-          refine({ hitsPerPage: 4 });
-        });
-      }
-    });
-    search.addWidgets([
-      connectConfigure(() => {})({
-        searchParameters: {
-          hitsPerPage: 10,
-        },
-      }),
-      customComp({ searchParameters: {} }),
-    ]);
-
-    search.start();
-    expect(onStateChange).not.toHaveBeenCalled();
-
-    fireEvent.click(getByText(container, 'click me'));
-    expect(onStateChange).toHaveBeenCalledTimes(1);
-    expect(onStateChange).toHaveBeenCalledWith({
-      instant_search: { configure: { hitsPerPage: 4 } },
-    });
-  });
-});
-
 describe('middleware', () => {
   it("runs middlewares' onStateChange when uiState changes", async () => {
     const search = instantsearch({
diff --git a/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx b/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
index 04ca20e9fa..387bd3e6ea 100644
--- a/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
+++ b/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
@@ -12,6 +12,10 @@ import {
 import { castToJestMock } from '@instantsearch/testutils/castToJestMock';
 import { wait } from '@instantsearch/testutils/wait';
 import originalHelper from 'algoliasearch-helper';
+import {
+  createRenderOptions,
+  createWidget,
+} from 'instantsearch-core/test/createWidget';
 import { h, render, createRef } from 'preact';
 
 import {
@@ -21,7 +25,6 @@ import {
   connectSearchBox,
   connectPagination,
 } from '..';
-import { createRenderOptions, createWidget } from '../../test/createWidget';
 import version from '../version';
 
 import type {
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectAutocomplete.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectAutocomplete.test.ts
index c7c636608e..5f0ce561f5 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectAutocomplete.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectAutocomplete.test.ts
@@ -8,13 +8,13 @@ import algoliasearchHelper, {
   SearchResults,
   SearchParameters,
 } from 'algoliasearch-helper';
-
-import { connectAutocomplete, instantsearch, TAG_PLACEHOLDER } from '../..';
 import {
   createInitOptions,
   createRenderOptions,
   createDisposeOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectAutocomplete, instantsearch, TAG_PLACEHOLDER } from '../..';
 
 import type { AutocompleteRenderState } from '../..';
 import type { SearchClient, SearchResponse } from '../../types';
@@ -336,112 +336,21 @@ search.addWidgets([
   });
 
   describe('dispose', () => {
-    it('calls the unmount function', () => {
-      const searchClient = createSearchClient();
-      const helper = algoliasearchHelper(searchClient, '');
-
+    it('calls unmount function', () => {
       const render = jest.fn();
       const unmount = jest.fn();
-      const makeWidget = connectAutocomplete(render, unmount);
-      const widget = makeWidget({});
 
-      widget.init!(createInitOptions({ helper }));
+      const widget = connectAutocomplete(render, unmount)({});
 
-      expect(unmount).toHaveBeenCalledTimes(0);
+      widget.dispose!(createDisposeOptions());
 
-      widget.dispose!(createDisposeOptions({ helper, state: helper.state }));
-
-      expect(unmount).toHaveBeenCalledTimes(1);
+      expect(unmount).toHaveBeenCalled();
     });
 
     it('does not throw without the unmount function', () => {
-      const searchClient = createSearchClient();
-      const helper = algoliasearchHelper(searchClient, '');
-
-      const render = jest.fn();
-      const makeWidget = connectAutocomplete(render);
-      const widget = makeWidget({});
-
-      widget.init!(createInitOptions({ helper }));
-
-      expect(() =>
-        widget.dispose!(createDisposeOptions({ helper, state: helper.state }))
-      ).not.toThrow();
-    });
-
-    it('removes the `query` from the `SearchParameters`', () => {
-      const searchClient = createSearchClient();
-      const helper = algoliasearchHelper(searchClient, '', {
-        query: 'Apple',
-      });
-
-      const render = jest.fn();
-      const makeWidget = connectAutocomplete(render);
-      const widget = makeWidget({});
-
-      widget.init!(createInitOptions({ helper }));
-
-      expect(helper.state.query).toBe('Apple');
-
-      const nextState = widget.dispose!(
-        createDisposeOptions({ helper, state: helper.state })
-      ) as SearchParameters;
-
-      expect(nextState.query).toBeUndefined();
-    });
-
-    it('removes the TAG_PLACEHOLDER from the `SearchParameters`', () => {
-      const searchClient = createSearchClient();
-      const helper = algoliasearchHelper(searchClient, '', {
-        ...TAG_PLACEHOLDER,
-      });
-
-      const render = jest.fn();
-      const makeWidget = connectAutocomplete(render);
-      const widget = makeWidget({});
-
-      expect(helper.state.highlightPreTag).toBe(
-        TAG_PLACEHOLDER.highlightPreTag
-      );
-
-      expect(helper.state.highlightPostTag).toBe(
-        TAG_PLACEHOLDER.highlightPostTag
-      );
-
-      widget.init!(createInitOptions({ helper }));
-
-      const nextState = widget.dispose!(
-        createDisposeOptions({ helper, state: helper.state })
-      ) as SearchParameters;
-
-      expect(nextState.highlightPreTag).toBeUndefined();
-      expect(nextState.highlightPostTag).toBeUndefined();
-    });
-
-    it('does not remove the TAG_PLACEHOLDER from the `SearchParameters` with `escapeHTML` disabled', () => {
-      const searchClient = createSearchClient();
-      const helper = algoliasearchHelper(searchClient, '', {
-        highlightPreTag: '<mark>',
-        highlightPostTag: '</mark>',
-      });
-
-      const render = jest.fn();
-      const makeWidget = connectAutocomplete(render);
-      const widget = makeWidget({
-        escapeHTML: false,
-      });
-
-      expect(helper.state.highlightPreTag).toBe('<mark>');
-      expect(helper.state.highlightPostTag).toBe('</mark>');
-
-      widget.init!(createInitOptions({ helper }));
-
-      const nextState = widget.dispose!(
-        createDisposeOptions({ helper, state: helper.state })
-      ) as SearchParameters;
-
-      expect(nextState.highlightPreTag).toBe('<mark>');
-      expect(nextState.highlightPostTag).toBe('</mark>');
+      const render = () => {};
+      const widget = connectAutocomplete(render)({});
+      expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
     });
   });
 
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectBreadcrumb.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectBreadcrumb.test.ts
index 111b74c851..26660db7eb 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectBreadcrumb.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectBreadcrumb.test.ts
@@ -6,13 +6,13 @@ import algoliasearchHelper, {
   SearchResults,
   SearchParameters,
 } from 'algoliasearch-helper';
-
-import { connectBreadcrumb, warnCache } from '../..';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectBreadcrumb, warnCache } from '../..';
 
 describe('connectBreadcrumb', () => {
   describe('Usage', () => {
@@ -1243,42 +1243,24 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/breadcrumb/
   });
 
   describe('dispose', () => {
-    it('does not throw without the unmount function', () => {
-      const helper = algoliasearchHelper(createSearchClient(), '');
+    it('calls unmount function', () => {
+      const render = jest.fn();
+      const unmount = jest.fn();
 
-      const renderFn = () => {};
-      const makeWidget = connectBreadcrumb(renderFn);
-      const widget = makeWidget({ attributes: ['category'] });
+      const widget = connectBreadcrumb(
+        render,
+        unmount
+      )({ attributes: ['cat'] });
 
-      expect(() =>
-        widget.dispose!(createDisposeOptions({ helper, state: helper.state }))
-      ).not.toThrow();
-    });
-
-    it('does not remove refinement', () => {
-      const renderFn = () => {};
-      const makeWidget = connectBreadcrumb(renderFn);
-      const widget = makeWidget({ attributes: ['category'] });
+      widget.dispose!(createDisposeOptions());
 
-      const helper = algoliasearchHelper(createSearchClient(), '', {
-        hierarchicalFacetsRefinements: {
-          category: ['boxes'],
-        },
-      });
-      helper.search = jest.fn();
-
-      widget.init!(
-        createInitOptions({
-          helper,
-          state: helper.state,
-        })
-      );
-
-      const newState = widget.dispose!(
-        createDisposeOptions({ helper, state: helper.state })
-      );
+      expect(unmount).toHaveBeenCalled();
+    });
 
-      expect(newState).toBeUndefined();
+    it('does not throw without the unmount function', () => {
+      const render = () => {};
+      const widget = connectBreadcrumb(render)({ attributes: ['cat'] });
+      expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
     });
   });
 });
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectClearRefinements.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectClearRefinements.test.ts
index 5bc39c2c5d..f259189643 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectClearRefinements.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectClearRefinements.test.ts
@@ -3,13 +3,13 @@ import {
   createSearchClient,
 } from '@instantsearch/mocks';
 import algoliasearchHelper, { SearchResults } from 'algoliasearch-helper';
-
-import { connectClearRefinements } from '../..';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectClearRefinements } from '../..';
 
 describe('connectClearRefinements', () => {
   describe('Usage', () => {
@@ -123,15 +123,23 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/clear-refin
       expect(secondRenderingOptions.canRefine).toBe(false);
     });
 
-    it('does not throw without the unmount function', () => {
-      const helper = algoliasearchHelper(createSearchClient(), 'indexName');
-      const rendering = () => {};
-      const makeWidget = connectClearRefinements(rendering);
-      const widget = makeWidget({});
+    describe('dispose', () => {
+      it('calls unmount function', () => {
+        const render = jest.fn();
+        const unmount = jest.fn();
+
+        const widget = connectClearRefinements(render, unmount)({});
+
+        widget.dispose!(createDisposeOptions());
 
-      expect(() =>
-        widget.dispose!(createDisposeOptions({ helper, state: helper.state }))
-      ).not.toThrow();
+        expect(unmount).toHaveBeenCalled();
+      });
+
+      it('does not throw without the unmount function', () => {
+        const render = () => {};
+        const widget = connectClearRefinements(render)({});
+        expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
+      });
     });
 
     describe('getRenderState', () => {
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectConfigure.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectConfigure.test.ts
index eeeb9064ea..379dcbbdac 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectConfigure.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectConfigure.test.ts
@@ -1,12 +1,12 @@
 import { createSearchClient } from '@instantsearch/mocks';
+import { wait } from '@instantsearch/testutils';
 import algoliasearchHelper, { SearchParameters } from 'algoliasearch-helper';
-
-import { connectConfigure, noop } from '../..';
 import {
   createInitOptions,
   createRenderOptions,
-  createDisposeOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectConfigure, instantsearch, noop } from '../..';
 
 import type { AlgoliaSearchHelper } from 'algoliasearch-helper';
 
@@ -88,7 +88,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/configure/j
     });
 
     expect(
-      widget.getWidgetSearchParameters(new SearchParameters({}), {
+      widget.getWidgetSearchParameters!(new SearchParameters({}), {
         uiState: {},
       })
     ).toEqual(
@@ -107,11 +107,11 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/configure/j
     });
 
     expect(
-      widget.getWidgetSearchParameters(
+      widget.getWidgetSearchParameters!(
         new SearchParameters({
           analytics: false,
         }),
-        { uiState: { configure: { analytics: true } } }
+        { uiState: {} }
       )
     ).toEqual(
       new SearchParameters({
@@ -120,12 +120,12 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/configure/j
     );
 
     expect(
-      widget.getWidgetSearchParameters(
+      widget.getWidgetSearchParameters!(
         new SearchParameters({
           analytics: false,
           clickAnalytics: true,
         }),
-        { uiState: { configure: { analytics: true } } }
+        { uiState: {} }
       )
     ).toEqual(
       new SearchParameters({
@@ -135,7 +135,13 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/configure/j
     );
   });
 
-  it('should apply new searchParameters on refine()', () => {
+  it('should apply new searchParameters on refine()', async () => {
+    const searchClient = createSearchClient();
+    const search = instantsearch({
+      searchClient,
+      indexName: 'indexName',
+    });
+    search.start();
     const renderFn = jest.fn();
     const makeWidget = connectConfigure(renderFn, jest.fn());
     const widget = makeWidget({
@@ -144,41 +150,45 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/configure/j
       },
     });
 
-    helper.setState(
-      widget.getWidgetSearchParameters(
+    search.addWidgets([widget]);
+
+    search.helper!.setState(
+      widget.getWidgetSearchParameters!(
         new SearchParameters({
           // This facet is added outside of the widget params
           // so it shouldn't be overridden when calling `refine`.
           facets: ['brand'],
         }),
-        { uiState: { configure: { analytics: true } } }
+        { uiState: {} }
       )
     );
-    widget.init!(createInitOptions({ helper }));
 
     expect(
-      widget.getWidgetSearchParameters(new SearchParameters({}), {
-        uiState: { configure: { analytics: true } },
+      widget.getWidgetSearchParameters!(new SearchParameters({}), {
+        uiState: {},
       })
     ).toEqual(
       new SearchParameters({
         analytics: true,
       })
     );
-    expect(helper.state).toEqual(
-      new SearchParameters({
-        analytics: true,
-        facets: ['brand'],
-      })
-    );
+
+    await wait(100);
+    expect(searchClient.search).toHaveBeenCalledTimes(1);
+    expect(searchClient.search).toHaveBeenLastCalledWith([
+      {
+        indexName: 'indexName',
+        params: { analytics: true, facets: ['brand'] },
+      },
+    ]);
 
     const { refine } = renderFn.mock.calls[0][0];
 
     refine({ hitsPerPage: 3, facets: ['rating'] });
 
     expect(
-      widget.getWidgetSearchParameters(new SearchParameters({}), {
-        uiState: { configure: { hitsPerPage: 3, facets: ['rating'] } },
+      widget.getWidgetSearchParameters!(new SearchParameters({}), {
+        uiState: {},
       })
     ).toEqual(
       new SearchParameters({
@@ -186,57 +196,57 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/configure/j
         facets: ['rating'],
       })
     );
-    expect(helper.state).toEqual(
-      new SearchParameters({
-        hitsPerPage: 3,
-        facets: ['brand', 'rating'],
-      })
-    );
+    await wait(100);
+    expect(searchClient.search).toHaveBeenCalledTimes(2);
+    expect(searchClient.search).toHaveBeenLastCalledWith([
+      {
+        indexName: 'indexName',
+        params: {
+          hitsPerPage: 3,
+          analytics: true,
+          facets: ['brand', 'rating'],
+        },
+      },
+    ]);
   });
 
-  it('should dispose only the state set by configure', () => {
-    const makeWidget = connectConfigure(noop);
-    const widget = makeWidget({
-      searchParameters: {
-        analytics: true,
-      },
+  it('should dispose only the state set by configure', async () => {
+    const search = instantsearch({
+      searchClient: createSearchClient(),
+      indexName: 'indexName',
     });
+    search.start();
 
-    helper.setState(
-      widget.getWidgetSearchParameters(
-        new SearchParameters({
-          clickAnalytics: true,
-        }),
-        { uiState: { configure: { analytics: true } } }
-      )
-    );
-    widget.init!(createInitOptions({ helper }));
+    const analytics = connectConfigure(noop)({
+      searchParameters: { analytics: true },
+    });
+    const clickAnalytics = connectConfigure(noop)({
+      searchParameters: { clickAnalytics: true },
+    });
 
-    expect(
-      widget.getWidgetSearchParameters(new SearchParameters({}), {
-        uiState: { configure: { analytics: true } },
-      })
-    ).toEqual(
-      new SearchParameters({
-        analytics: true,
-      })
-    );
-    expect(helper.state).toEqual(
-      new SearchParameters({
-        analytics: true,
-        clickAnalytics: true,
-      })
-    );
+    search.addWidgets([analytics]);
 
-    const nextState = widget.dispose!(
-      createDisposeOptions({ state: helper.state })
-    );
+    await wait(100);
+    expect(search.client.search).toHaveBeenCalledWith([
+      { indexName: 'indexName', params: { analytics: true } },
+    ]);
 
-    expect(nextState).toEqual(
-      new SearchParameters({
-        clickAnalytics: true,
-      })
-    );
+    search.addWidgets([clickAnalytics]);
+
+    await wait(100);
+    expect(search.client.search).toHaveBeenCalledWith([
+      {
+        indexName: 'indexName',
+        params: { analytics: true, clickAnalytics: true },
+      },
+    ]);
+
+    search.removeWidgets([analytics]);
+
+    await wait(100);
+    expect(search.client.search).toHaveBeenCalledWith([
+      { indexName: 'indexName', params: { clickAnalytics: true } },
+    ]);
   });
 
   describe('getRenderState', () => {
@@ -364,101 +374,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/configure/j
     });
   });
 
-  describe('getWidgetUiState', () => {
-    it('adds default parameters', () => {
-      const makeWidget = connectConfigure(noop);
-      const widget = makeWidget({
-        searchParameters: {
-          analytics: true,
-        },
-      });
-
-      expect(
-        widget.getWidgetUiState({}, { helper, searchParameters: helper.state })
-      ).toEqual({
-        configure: { analytics: true },
-      });
-    });
-
-    it('adds refined parameters', () => {
-      const renderFn = jest.fn();
-      const makeWidget = connectConfigure(renderFn);
-      const widget = makeWidget({
-        searchParameters: {
-          analytics: true,
-        },
-      });
-
-      widget.init!(createInitOptions({ helper }));
-      const { refine } = renderFn.mock.calls[0][0];
-
-      refine({ analytics: false });
-
-      expect(
-        widget.getWidgetUiState({}, { helper, searchParameters: helper.state })
-      ).toEqual({
-        configure: { analytics: false },
-      });
-    });
-
-    it('adds refined (new) parameters', () => {
-      const renderFn = jest.fn();
-      const makeWidget = connectConfigure(renderFn);
-      const widget = makeWidget({
-        searchParameters: {
-          analytics: true,
-        },
-      });
-
-      widget.init!(createInitOptions({ helper }));
-      const { refine } = renderFn.mock.calls[0][0];
-
-      refine({ query: 'unsafe toys' });
-
-      expect(
-        widget.getWidgetUiState({}, { helper, searchParameters: helper.state })
-      ).toEqual({
-        configure: { query: 'unsafe toys' },
-      });
-    });
-
-    it('merges with existing configuration', () => {
-      const makeWidget = connectConfigure(noop);
-      const widget = makeWidget({
-        searchParameters: {
-          analytics: true,
-        },
-      });
-
-      expect(
-        widget.getWidgetUiState(
-          { configure: { queryType: 'prefixAll' } },
-          { helper, searchParameters: helper.state }
-        )
-      ).toEqual({
-        configure: { analytics: true, queryType: 'prefixAll' },
-      });
-    });
-
-    it('overwrites existing configuration', () => {
-      const makeWidget = connectConfigure(noop);
-      const widget = makeWidget({
-        searchParameters: {
-          analytics: true,
-        },
-      });
-
-      expect(
-        widget.getWidgetUiState(
-          { configure: { analytics: false } },
-          { helper, searchParameters: helper.state }
-        )
-      ).toEqual({
-        configure: { analytics: true },
-      });
-    });
-  });
-
   describe('getWidgetSearchParameters', () => {
     it('returns parameters set by default', () => {
       const makeWidget = connectConfigure(noop);
@@ -468,71 +383,13 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/configure/j
         },
       });
 
-      const sp = widget.getWidgetSearchParameters(new SearchParameters(), {
+      const sp = widget.getWidgetSearchParameters!(new SearchParameters(), {
         uiState: {},
       });
 
       expect(sp).toEqual(new SearchParameters({ analytics: true }));
     });
 
-    it('returns parameters set by uiState', () => {
-      const makeWidget = connectConfigure(noop);
-      const widget = makeWidget({ searchParameters: {} });
-
-      const sp = widget.getWidgetSearchParameters(new SearchParameters(), {
-        uiState: {
-          configure: {
-            analytics: false,
-          },
-        },
-      });
-
-      expect(sp).toEqual(new SearchParameters({ analytics: false }));
-    });
-
-    it('overrides parameters set by uiState', () => {
-      const makeWidget = connectConfigure(noop);
-      const widget = makeWidget({
-        searchParameters: {
-          analytics: true,
-        },
-      });
-
-      const sp = widget.getWidgetSearchParameters(new SearchParameters(), {
-        uiState: {
-          configure: {
-            analytics: false,
-          },
-        },
-      });
-
-      expect(sp).toEqual(new SearchParameters({ analytics: true }));
-    });
-
-    it('merges parameters set by uiState', () => {
-      const makeWidget = connectConfigure(noop);
-      const widget = makeWidget({
-        searchParameters: {
-          analyticsTags: ['best-website-in-the-world'],
-        },
-      });
-
-      const sp = widget.getWidgetSearchParameters(new SearchParameters(), {
-        uiState: {
-          configure: {
-            analytics: false,
-          },
-        },
-      });
-
-      expect(sp).toEqual(
-        new SearchParameters({
-          analytics: false,
-          analyticsTags: ['best-website-in-the-world'],
-        })
-      );
-    });
-
     it('merges with the previous parameters', () => {
       const makeWidget = connectConfigure(noop);
       const widget = makeWidget({
@@ -544,7 +401,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/configure/j
         },
       });
 
-      const sp = widget.getWidgetSearchParameters(
+      const sp = widget.getWidgetSearchParameters!(
         new SearchParameters({
           disjunctiveFacets: ['categories'],
           disjunctiveFacetsRefinements: {
@@ -581,7 +438,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/configure/j
 
       refine({ analyticsTags: ['worst-site-now'] });
 
-      const sp = widget.getWidgetSearchParameters(new SearchParameters(), {
+      const sp = widget.getWidgetSearchParameters!(new SearchParameters(), {
         uiState: {},
       });
 
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectCurrentRefinements.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectCurrentRefinements.test.ts
index e57289e6cb..b1eb110f64 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectCurrentRefinements.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectCurrentRefinements.test.ts
@@ -6,13 +6,13 @@ import algoliasearchHelper, {
   SearchResults,
   SearchParameters,
 } from 'algoliasearch-helper';
-
-import { connectCurrentRefinements } from '../..';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectCurrentRefinements } from '../..';
 
 import type { CurrentRefinementsConnectorParamsItem } from '../connectCurrentRefinements';
 import type { AlgoliaSearchHelper } from 'algoliasearch-helper';
@@ -116,15 +116,23 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/current-ref
       });
     });
 
-    it('does not throw without the unmount function', () => {
-      const helper = algoliasearchHelper(createSearchClient(), 'indexName', {});
-      const rendering = () => {};
-      const customCurrentRefinements = connectCurrentRefinements(rendering);
-      const widget = customCurrentRefinements({});
+    describe('dispose', () => {
+      it('calls unmount function', () => {
+        const render = jest.fn();
+        const unmount = jest.fn();
+
+        const widget = connectCurrentRefinements(render, unmount)({});
+
+        widget.dispose!(createDisposeOptions());
 
-      expect(() =>
-        widget.dispose!(createDisposeOptions({ helper, state: helper.state }))
-      ).not.toThrow();
+        expect(unmount).toHaveBeenCalled();
+      });
+
+      it('does not throw without the unmount function', () => {
+        const render = () => {};
+        const widget = connectCurrentRefinements(render)({});
+        expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
+      });
     });
 
     describe('getRenderState', () => {
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectDynamicWidgets.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectDynamicWidgets.test.ts
index 00db3fc488..e2f06f8fbd 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectDynamicWidgets.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectDynamicWidgets.test.ts
@@ -9,6 +9,11 @@ import algoliasearchHelper, {
   SearchParameters,
   SearchResults,
 } from 'algoliasearch-helper';
+import {
+  createDisposeOptions,
+  createInitOptions,
+  createRenderOptions,
+} from 'instantsearch-core/test/createWidget';
 
 import {
   connectHierarchicalMenu,
@@ -17,11 +22,6 @@ import {
   connectDynamicWidgets,
   index,
 } from '../..';
-import {
-  createDisposeOptions,
-  createInitOptions,
-  createRenderOptions,
-} from '../../../test/createWidget';
 
 import type { SearchResponse } from '../../types';
 import type { DynamicWidgetsConnectorParams } from '../connectDynamicWidgets';
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectFrequentlyBoughtTogether.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectFrequentlyBoughtTogether.test.ts
index 0d6fce2cbe..21dd32a46a 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectFrequentlyBoughtTogether.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectFrequentlyBoughtTogether.test.ts
@@ -4,12 +4,13 @@
 
 import { createSearchClient } from '@instantsearch/mocks';
 import algoliasearchHelper, { RecommendParameters } from 'algoliasearch-helper';
-
-import { connectFrequentlyBoughtTogether } from '../..';
 import {
+  createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectFrequentlyBoughtTogether } from '../..';
 
 describe('connectFrequentlyBoughtTogether', () => {
   it('throws without render function', () => {
@@ -92,6 +93,30 @@ describe('connectFrequentlyBoughtTogether', () => {
     );
   });
 
+  describe('dispose', () => {
+    it('calls unmount function', () => {
+      const render = jest.fn();
+      const unmount = jest.fn();
+
+      const widget = connectFrequentlyBoughtTogether(
+        render,
+        unmount
+      )({ objectIDs: ['1'] });
+
+      widget.dispose!(createDisposeOptions());
+
+      expect(unmount).toHaveBeenCalled();
+    });
+
+    it('does not throw without the unmount function', () => {
+      const render = () => {};
+      const widget = connectFrequentlyBoughtTogether(render)({
+        objectIDs: ['1'],
+      });
+      expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
+    });
+  });
+
   describe('getWidgetParameters', () => {
     it('forwards widgetParams to the recommend state', () => {
       const render = () => {};
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectGeoSearch.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectGeoSearch.test.ts
index 6c072d1109..6a41ad6cb9 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectGeoSearch.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectGeoSearch.test.ts
@@ -8,14 +8,14 @@ import algoliasearchHelper, {
   SearchParameters,
   SearchResults,
 } from 'algoliasearch-helper';
-
-import { connectGeoSearch, instantsearch } from '../..';
-import { createInstantSearch } from '../../../test/createInstantSearch';
+import { createInstantSearch } from 'instantsearch-core/test/createInstantSearch';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectGeoSearch, instantsearch } from '../..';
 
 import type { SearchResponse } from '../../types';
 
@@ -1379,31 +1379,20 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
   });
 
   describe('dispose', () => {
-    it('expect reset insideBoundingBox', () => {
+    it('calls unmount function', () => {
       const render = jest.fn();
       const unmount = jest.fn();
 
-      const customGeoSearch = connectGeoSearch(render, unmount);
-      const widget = customGeoSearch({});
-      const helper = createFakeHelper();
+      const widget = connectGeoSearch(render, unmount)({});
 
-      // @ts-ignore
-      helper.setQueryParameter('insideBoundingBox', '10,12,12,14');
-
-      const expectation = new SearchParameters({ index: '' });
-
-      const actual = widget.dispose!(
-        createDisposeOptions({ state: helper.state })
-      );
+      widget.dispose!(createDisposeOptions());
 
       expect(unmount).toHaveBeenCalled();
-      expect(actual).toEqual(expectation);
     });
 
     it('does not throw without the unmount function', () => {
       const render = () => {};
-      const customGeoSearch = connectGeoSearch(render);
-      const widget = customGeoSearch({});
+      const widget = connectGeoSearch(render)({});
       expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
     });
   });
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectHierarchicalMenu.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectHierarchicalMenu.test.ts
index 839b726d93..577fb53c3a 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectHierarchicalMenu.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectHierarchicalMenu.test.ts
@@ -6,14 +6,14 @@ import algoliasearchHelper, {
   SearchResults,
   SearchParameters,
 } from 'algoliasearch-helper';
-
-import { connectHierarchicalMenu, warnCache } from '../..';
-import { createInstantSearch } from '../../../test/createInstantSearch';
+import { createInstantSearch } from 'instantsearch-core/test/createInstantSearch';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectHierarchicalMenu, warnCache } from '../..';
 
 describe('connectHierarchicalMenu', () => {
   describe('Usage', () => {
@@ -513,78 +513,24 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hierarchica
   });
 
   describe('dispose', () => {
-    it('does not throw without the unmount function', () => {
-      const rendering = jest.fn();
-      const makeWidget = connectHierarchicalMenu(rendering);
-      const widget = makeWidget({
-        attributes: ['category'],
-      });
-      const helper = algoliasearchHelper(
-        createSearchClient(),
-        '',
-        widget.getWidgetSearchParameters(new SearchParameters(), {
-          uiState: {},
-        })
-      );
-      expect(() =>
-        widget.dispose!(createDisposeOptions({ helper, state: helper.state }))
-      ).not.toThrow();
-    });
-
-    it('unsets maxValuesPerFacet fully', () => {
-      const rendering = jest.fn();
-      const makeWidget = connectHierarchicalMenu(rendering);
-      const indexName = '';
-      const widget = makeWidget({
-        attributes: ['category'],
-      });
-      const helper = algoliasearchHelper(
-        createSearchClient(),
-        indexName,
-        widget.getWidgetSearchParameters(new SearchParameters(), {
-          uiState: {},
-        })
-      );
-
-      expect(
-        widget.dispose!(createDisposeOptions({ helper, state: helper.state }))
-      ).toEqual(new SearchParameters({ index: indexName }));
-    });
-
-    it('unsets refinement', () => {
-      const rendering = jest.fn();
-      const makeWidget = connectHierarchicalMenu(rendering);
-      const indexName = '';
-      const widget = makeWidget({
-        attributes: ['category'],
-      });
-      const helper = algoliasearchHelper(
-        createSearchClient(),
-        indexName,
-        widget.getWidgetSearchParameters(new SearchParameters(), {
-          uiState: {},
-        })
-      );
-      helper.search = jest.fn();
+    it('calls unmount function', () => {
+      const render = jest.fn();
+      const unmount = jest.fn();
 
-      widget.init!(
-        createInitOptions({
-          helper,
-          state: helper.state,
-        })
-      );
+      const widget = connectHierarchicalMenu(
+        render,
+        unmount
+      )({ attributes: ['cat'] });
 
-      const firstRenderingOptions = rendering.mock.calls[0][0];
-      const { refine } = firstRenderingOptions;
-      refine('zombo.com');
+      widget.dispose!(createDisposeOptions());
 
-      expect(helper.state.hierarchicalFacetsRefinements).toEqual({
-        category: ['zombo.com'],
-      });
+      expect(unmount).toHaveBeenCalled();
+    });
 
-      expect(
-        widget.dispose!(createDisposeOptions({ helper, state: helper.state }))
-      ).toEqual(new SearchParameters({ index: indexName }));
+    it('does not throw without the unmount function', () => {
+      const render = () => {};
+      const widget = connectHierarchicalMenu(render)({ attributes: ['cat'] });
+      expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
     });
   });
 
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectHits.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectHits.test.ts
index b0973c7154..270f7e9f2e 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectHits.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectHits.test.ts
@@ -12,14 +12,14 @@ import algoliasearchHelper, {
   SearchParameters,
   SearchResults,
 } from 'algoliasearch-helper';
-
-import { connectHits, instantsearch, TAG_PLACEHOLDER } from '../..';
-import { createInstantSearch } from '../../../test/createInstantSearch';
+import { createInstantSearch } from 'instantsearch-core/test/createInstantSearch';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectHits, instantsearch, TAG_PLACEHOLDER } from '../..';
 
 import type {
   EscapedHits,
@@ -638,85 +638,21 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/#co
   });
 
   describe('dispose', () => {
-    it('calls the unmount function', () => {
-      const helper = algoliasearchHelper(createSearchClient(), '');
+    it('calls unmount function', () => {
+      const render = jest.fn();
+      const unmount = jest.fn();
 
-      const renderFn = () => {};
-      const unmountFn = jest.fn();
-      const makeWidget = connectHits(renderFn, unmountFn);
-      const widget = makeWidget({});
+      const widget = connectHits(render, unmount)({});
 
-      expect(unmountFn).toHaveBeenCalledTimes(0);
+      widget.dispose!(createDisposeOptions());
 
-      widget.dispose!(createDisposeOptions({ helper, state: helper.state }));
-
-      expect(unmountFn).toHaveBeenCalledTimes(1);
+      expect(unmount).toHaveBeenCalled();
     });
 
     it('does not throw without the unmount function', () => {
-      const helper = algoliasearchHelper(createSearchClient(), '');
-
-      const renderFn = () => {};
-      const makeWidget = connectHits(renderFn);
-      const widget = makeWidget({});
-
-      expect(() =>
-        widget.dispose!(createDisposeOptions({ helper, state: helper.state }))
-      ).not.toThrow();
-    });
-
-    it('removes the TAG_PLACEHOLDER from the `SearchParameters`', () => {
-      const helper = algoliasearchHelper(createSearchClient(), '', {
-        ...TAG_PLACEHOLDER,
-      });
-
-      const renderFn = () => {};
-      const makeWidget = connectHits(renderFn);
-      const widget = makeWidget({});
-
-      expect(helper.state.highlightPreTag).toBe(
-        TAG_PLACEHOLDER.highlightPreTag
-      );
-
-      expect(helper.state.highlightPostTag).toBe(
-        TAG_PLACEHOLDER.highlightPostTag
-      );
-
-      const nextState = widget.dispose!(
-        createDisposeOptions({
-          helper,
-          state: helper.state,
-        })
-      );
-
-      expect((nextState as SearchParameters).highlightPreTag).toBeUndefined();
-      expect((nextState as SearchParameters).highlightPostTag).toBeUndefined();
-    });
-
-    it('does not remove the TAG_PLACEHOLDER from the `SearchParameters` with `escapeHTML` disabled', () => {
-      const helper = algoliasearchHelper(createSearchClient(), '', {
-        highlightPreTag: '<mark>',
-        highlightPostTag: '</mark>',
-      });
-
-      const renderFn = () => {};
-      const makeWidget = connectHits(renderFn);
-      const widget = makeWidget({
-        escapeHTML: false,
-      });
-
-      expect(helper.state.highlightPreTag).toBe('<mark>');
-      expect(helper.state.highlightPostTag).toBe('</mark>');
-
-      const nextState = widget.dispose!(
-        createDisposeOptions({
-          helper,
-          state: helper.state,
-        })
-      );
-
-      expect((nextState as SearchParameters).highlightPreTag).toBe('<mark>');
-      expect((nextState as SearchParameters).highlightPostTag).toBe('</mark>');
+      const render = () => {};
+      const widget = connectHits(render)({});
+      expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
     });
   });
 
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectHitsPerPage.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectHitsPerPage.test.ts
index f3f8a5038f..8fc9b5ee3d 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectHitsPerPage.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectHitsPerPage.test.ts
@@ -6,13 +6,13 @@ import algoliasearchHelper, {
   SearchParameters,
   SearchResults,
 } from 'algoliasearch-helper';
-
-import { connectHitsPerPage } from '../..';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectHitsPerPage } from '../..';
 
 import type { HitsPerPageConnectorParams } from '../connectHitsPerPage';
 
@@ -662,74 +662,28 @@ You may want to add another entry to the \`items\` option with this value.`);
   });
 
   describe('dispose', () => {
-    it('calls the unmount function', () => {
-      const searchClient = createSearchClient();
-      const helper = algoliasearchHelper(searchClient, '');
-
-      const renderFn = () => {};
-      const unmountFn = jest.fn();
-      const makeWidget = connectHitsPerPage(renderFn, unmountFn);
-      const widget = makeWidget({
-        items: [
-          { value: 3, label: '3 items per page', default: true },
-          { value: 10, label: '10 items per page' },
-        ],
-      });
+    it('calls unmount function', () => {
+      const render = jest.fn();
+      const unmount = jest.fn();
 
-      expect(unmountFn).toHaveBeenCalledTimes(0);
+      const widget = connectHitsPerPage(
+        render,
+        unmount
+      )({ items: [{ label: '10 items per page', value: 10, default: true }] });
 
-      widget.dispose!(createDisposeOptions({ helper, state: helper.state }));
+      widget.dispose!(createDisposeOptions());
 
-      expect(unmountFn).toHaveBeenCalledTimes(1);
+      expect(unmount).toHaveBeenCalled();
     });
 
     it('does not throw without the unmount function', () => {
-      const searchClient = createSearchClient();
-      const helper = algoliasearchHelper(searchClient, '');
-
-      const renderFn = () => {};
-      const makeWidget = connectHitsPerPage(renderFn);
-      const widget = makeWidget({
-        items: [
-          { value: 3, label: '3 items per page', default: true },
-          { value: 10, label: '10 items per page' },
-        ],
-      });
-
-      expect(() =>
-        widget.dispose!(createDisposeOptions({ helper, state: helper.state }))
-      ).not.toThrow();
-    });
-
-    it('removes `hitsPerPage` from the `SearchParameters`', () => {
-      const searchClient = createSearchClient();
-      const helper = algoliasearchHelper(searchClient, '', {
-        hitsPerPage: 5,
-      });
-
-      const renderFn = () => {};
-      const unmountFn = jest.fn();
-      const makeWidget = connectHitsPerPage(renderFn, unmountFn);
-      const widget = makeWidget({
-        items: [
-          { value: 3, label: '3 items per page', default: true },
-          { value: 10, label: '10 items per page' },
-        ],
+      const render = () => {};
+      const widget = connectHitsPerPage(render)({
+        items: [{ label: '10 items per page', value: 10, default: true }],
       });
-
-      expect(helper.state.hitsPerPage).toBe(5);
-
-      const nextState = widget.dispose!(
-        createDisposeOptions({
-          helper,
-          state: helper.state,
-        })
-      ) as SearchParameters;
-
-      expect(nextState.hitsPerPage).toBeUndefined();
+      expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
     });
   });
-
   describe('getRenderState', () => {
     test('returns the render state', () => {
       const renderFn = jest.fn();
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectInfiniteHits.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectInfiniteHits.test.ts
index 261d89ff69..2b7378fb25 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectInfiniteHits.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectInfiniteHits.test.ts
@@ -9,14 +9,14 @@ import {
 } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
 import algoliasearchHelper, { SearchResults } from 'algoliasearch-helper';
-
-import { connectInfiniteHits, instantsearch, TAG_PLACEHOLDER } from '../..';
-import { createInstantSearch } from '../../../test/createInstantSearch';
+import { createInstantSearch } from 'instantsearch-core/test/createInstantSearch';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectInfiniteHits, instantsearch, TAG_PLACEHOLDER } from '../..';
 import { createInfiniteHitsSessionStorageCache } from '../../lib/infiniteHitsCache';
 
 import type {
@@ -26,7 +26,6 @@ import type {
   EscapedHits,
   SearchResponse,
 } from '../../types';
-import type { SearchParameters } from 'algoliasearch-helper';
 
 jest.mock('../../lib/utils/addAbsolutePosition', () => ({
   // The real implementation creates a new array instance, which can cause bugs,
@@ -1127,106 +1126,21 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/infinite-hi
   });
 
   describe('dispose', () => {
-    it('calls the unmount function', () => {
-      const helper = algoliasearchHelper({} as SearchClient, '', {});
-
-      const renderFn = (): void => {};
-      const unmountFn = jest.fn();
-      const makeWidget = connectInfiniteHits(renderFn, unmountFn);
-      const widget = makeWidget({});
+    it('calls unmount function', () => {
+      const render = jest.fn();
+      const unmount = jest.fn();
 
-      expect(unmountFn).toHaveBeenCalledTimes(0);
+      const widget = connectInfiniteHits(render, unmount)({});
 
-      widget.dispose!(createDisposeOptions({ helper, state: helper.state }));
+      widget.dispose!(createDisposeOptions());
 
-      expect(unmountFn).toHaveBeenCalledTimes(1);
+      expect(unmount).toHaveBeenCalled();
     });
 
     it('does not throw without the unmount function', () => {
-      const helper = algoliasearchHelper({} as SearchClient, '', {});
-
-      const renderFn = (): void => {};
-      const makeWidget = connectInfiniteHits(renderFn);
-      const widget = makeWidget({});
-
-      expect(() =>
-        widget.dispose!(createDisposeOptions({ helper, state: helper.state }))
-      ).not.toThrow();
-    });
-
-    it('removes the TAG_PLACEHOLDER from the `SearchParameters`', () => {
-      const helper = algoliasearchHelper({} as SearchClient, '', {
-        ...TAG_PLACEHOLDER,
-      });
-
-      const renderFn = (): void => {};
-      const makeWidget = connectInfiniteHits(renderFn);
-      const widget = makeWidget({});
-
-      expect(helper.state.highlightPreTag).toBe(
-        TAG_PLACEHOLDER.highlightPreTag
-      );
-
-      expect(helper.state.highlightPostTag).toBe(
-        TAG_PLACEHOLDER.highlightPostTag
-      );
-
-      const nextState = widget.dispose!(
-        createDisposeOptions({
-          helper,
-          state: helper.state,
-        })
-      );
-
-      expect((nextState as SearchParameters).highlightPreTag).toBeUndefined();
-      expect((nextState as SearchParameters).highlightPostTag).toBeUndefined();
-    });
-
-    it('does not remove the TAG_PLACEHOLDER from the `SearchParameters` with `escapeHTML` disabled', () => {
-      const helper = algoliasearchHelper({} as SearchClient, '', {
-        highlightPreTag: '<mark>',
-        highlightPostTag: '</mark>',
-      });
-
-      const renderFn = (): void => {};
-      const makeWidget = connectInfiniteHits(renderFn);
-      const widget = makeWidget({
-        escapeHTML: false,
-      });
-
-      expect(helper.state.highlightPreTag).toBe('<mark>');
-      expect(helper.state.highlightPostTag).toBe('</mark>');
-
-      const nextState = widget.dispose!(
-        createDisposeOptions({
-          helper,
-          state: helper.state,
-        })
-      );
-
-      expect((nextState as SearchParameters).highlightPreTag).toBe('<mark>');
-      expect((nextState as SearchParameters).highlightPostTag).toBe('</mark>');
-    });
-
-    it('removes the `page` from the `SearchParameters`', () => {
-      const helper = algoliasearchHelper({} as SearchClient, '', {
-        page: 5,
-      });
-
-      const renderFn = (): void => {};
-      const makeWidget = connectInfiniteHits(renderFn);
-      const widget = makeWidget({});
-
-      expect(helper.state.page).toBe(5);
-
-      const nextState = widget.dispose!(
-        createDisposeOptions({
-          helper,
-          state: helper.state,
-        })
-      );
-
-      expect((nextState as SearchParameters).page).toBeUndefined();
+      const render = () => {};
+      const widget = connectInfiniteHits(render)({});
+      expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
     });
   });
 
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectLookingSimilar.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectLookingSimilar.test.ts
index 80eae3c1d8..c9e5eeed97 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectLookingSimilar.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectLookingSimilar.test.ts
@@ -4,12 +4,13 @@
 
 import { createSearchClient } from '@instantsearch/mocks';
 import algoliasearchHelper, { RecommendParameters } from 'algoliasearch-helper';
-
-import { connectLookingSimilar } from '../..';
 import {
+  createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectLookingSimilar } from '../..';
 
 describe('connectLookingSimilar', () => {
   it('throws without render function', () => {
@@ -92,6 +93,28 @@ describe('connectLookingSimilar', () => {
     );
   });
 
+  describe('dispose', () => {
+    it('calls unmount function', () => {
+      const render = jest.fn();
+      const unmount = jest.fn();
+
+      const widget = connectLookingSimilar(
+        render,
+        unmount
+      )({ objectIDs: ['1'] });
+
+      widget.dispose!(createDisposeOptions());
+
+      expect(unmount).toHaveBeenCalled();
+    });
+
+    it('does not throw without the unmount function', () => {
+      const render = () => {};
+      const widget = connectLookingSimilar(render)({ objectIDs: ['1'] });
+      expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
+    });
+  });
+
   describe('getWidgetParameters', () => {
     it('forwards widgetParams to the recommend state', () => {
       const render = () => {};
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectMenu.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectMenu.test.ts
index 70785e60f6..62a143d210 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectMenu.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectMenu.test.ts
@@ -6,14 +6,14 @@ import jsHelper, {
   SearchResults,
   SearchParameters,
 } from 'algoliasearch-helper';
-
-import { connectMenu, warnCache } from '../..';
-import { createInstantSearch } from '../../../test/createInstantSearch';
+import { createInstantSearch } from 'instantsearch-core/test/createInstantSearch';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectMenu, warnCache } from '../..';
 
 import type { MenuRenderState, MenuConnector } from '../..';
 
@@ -576,20 +576,23 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/menu/js/#co
     );
   });
 
-  it('does not throw without the unmount function', () => {
-    const widget = connectMenu(() => {})({
-      attribute: 'category',
+  describe('dispose', () => {
+    it('calls unmount function', () => {
+      const render = jest.fn();
+      const unmount = jest.fn();
+
+      const widget = connectMenu(render, unmount)({ attribute: 's' });
+
+      widget.dispose!(createDisposeOptions());
+
+      expect(unmount).toHaveBeenCalled();
+    });
+
+    it('does not throw without the unmount function', () => {
+      const render = () => {};
+      const widget = connectMenu(render)({ attribute: 's' });
+      expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
     });
-    const helper = jsHelper(
-      createSearchClient(),
-      '',
-      widget.getWidgetSearchParameters(new SearchParameters(), {
-        uiState: {},
-      })
-    );
-    expect(() =>
-      widget.dispose!(createDisposeOptions({ helper, state: helper.state }))
-    ).not.toThrow();
   });
 
   describe('getRenderState', () => {
@@ -1455,171 +1458,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/menu/js/#co
     });
   });
 
-  describe('dispose', () => {
-    it('removes hierarchical refinements', () => {
-      const widget = makeWidget({
-        attribute: 'myFacet',
-        limit: 10,
-        showMore: true,
-      });
-      const indexName = 'instant_search';
-
-      const helper = jsHelper(
-        createSearchClient(),
-        indexName,
-        widget.getWidgetSearchParameters(new SearchParameters(), {
-          uiState: {},
-        })
-      );
-      helper.search = jest.fn();
-
-      expect(helper.state).toEqual(
-        new SearchParameters({
-          hierarchicalFacets: [
-            {
-              attributes: ['myFacet'],
-              name: 'myFacet',
-            },
-          ],
-          hierarchicalFacetsRefinements: {
-            myFacet: [],
-          },
-          maxValuesPerFacet: 20,
-          index: indexName,
-        })
-      );
-
-      widget.init!(
-        createInitOptions({
-          helper,
-          state: helper.state,
-          createURL: () => '#',
-          instantSearchInstance: createInstantSearch(),
-        })
-      );
-
-      widget.render!(
-        createRenderOptions({
-          results: new SearchResults(helper.state, [
-            createSingleSearchResponse({
-              hits: [],
-              facets: {
-                myFacet: {
-                  Decoration: 880,
-                },
-              },
-            }),
-            createSingleSearchResponse({
-              facets: {
-                myFacet: {
-                  Decoration: 880,
-                  Outdoor: 47,
-                },
-              },
-            }),
-          ]),
-          state: helper.state,
-          helper,
-          createURL: () => '#',
-        })
-      );
-
-      const { refine } = rendering.mock.calls[0][0];
-
-      refine('Decoration');
-
-      expect(helper.state).toEqual(
-        new SearchParameters({
-          hierarchicalFacets: [
-            {
-              attributes: ['myFacet'],
-              name: 'myFacet',
-            },
-          ],
-          hierarchicalFacetsRefinements: {
-            myFacet: ['Decoration'],
-          },
-          index: indexName,
-          maxValuesPerFacet: 20,
-        })
-      );
-
-      const newState = widget.dispose!(
-        createDisposeOptions({ state: helper.state, helper })
-      );
-
-      expect(newState).toEqual(
-        new SearchParameters({
-          index: indexName,
-        })
-      );
-    });
-
-    it('removes unrefined state', () => {
-      const widget = makeWidget({
-        attribute: 'myFacet',
-        limit: 10,
-        showMore: true,
-      });
-      const indexName = 'instant_search';
-
-      const helper = jsHelper(
-        createSearchClient(),
-        indexName,
-        widget.getWidgetSearchParameters(new SearchParameters(), {
-          uiState: {},
-        })
-      );
-      helper.search = jest.fn();
-
-      expect(helper.state).toEqual(
-        new SearchParameters({
-          hierarchicalFacets: [
-            {
-              attributes: ['myFacet'],
-              name: 'myFacet',
-            },
-          ],
-          hierarchicalFacetsRefinements: {
-            myFacet: [],
-          },
-          maxValuesPerFacet: 20,
-          index: indexName,
-        })
-      );
-
-      const newState = widget.dispose!(
-        createDisposeOptions({ state: helper.state, helper })
-      );
-
-      expect(newState).toEqual(
-        new SearchParameters({
-          index: indexName,
-        })
-      );
-    });
-
-    it('leaves empty state intact', () => {
-      const state = new SearchParameters();
-      const widget = makeWidget({
-        attribute: 'myFacet',
-        limit: 10,
-        showMore: true,
-      });
-      const helper = jsHelper(
-        createSearchClient(),
-        'test',
-        widget.getWidgetSearchParameters(new SearchParameters(), {
-          uiState: {},
-        })
-      );
-      helper.search = jest.fn();
-      const newState = widget.dispose!(createDisposeOptions({ state, helper }));
-
-      expect(newState).toEqual(new SearchParameters());
-    });
-  });
-
   describe('insights', () => {
     const createInitializedWidget = () => {
       const widget = makeWidget({
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectNumericMenu.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectNumericMenu.test.ts
index faef0e728d..df94225f24 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectNumericMenu.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectNumericMenu.test.ts
@@ -10,13 +10,13 @@ import jsHelper, {
   SearchResults,
   SearchParameters,
 } from 'algoliasearch-helper';
-
-import { connectNumericMenu } from '../..';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectNumericMenu } from '../..';
 
 import type {
   NumericMenuConnectorParamsItem,
@@ -828,26 +828,40 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/numeric-men
     expect(helper.state.page).toBeUndefined();
   });
 
-  it('does not throw without the unmount function', () => {
-    const rendering = () => {};
-    const makeWidget = connectNumericMenu(rendering);
+  describe('dispose', () => {
+    it('calls unmount function', () => {
+      const render = jest.fn();
+      const unmount = jest.fn();
 
-    const widget = makeWidget({
-      attribute: 'numerics',
-      items: [
-        { label: 'below 10', end: 10 },
-        { label: '10 - 20', start: 10, end: 20 },
-        { label: 'more than 20', start: 20 },
-        { label: '42', start: 42, end: 42 },
-        { label: 'void' },
-      ],
-    });
+      const widget = connectNumericMenu(
+        render,
+        unmount
+      )({
+        attribute: 'a',
+        items: [
+          { label: 'below 10', end: 10 },
+          { label: '10 - 20', start: 10, end: 20 },
+          { label: 'more than 20', start: 20 },
+        ],
+      });
 
-    const helper = jsHelper(createSearchClient(), '');
+      widget.dispose!(createDisposeOptions());
+
+      expect(unmount).toHaveBeenCalled();
+    });
 
-    expect(() =>
-      widget.dispose!(createDisposeOptions({ helper, state: helper.state }))
-    ).not.toThrow();
+    it('does not throw without the unmount function', () => {
+      const render = () => {};
+      const widget = connectNumericMenu(render)({
+        attribute: 'a',
+        items: [
+          { label: 'below 10', end: 10 },
+          { label: '10 - 20', start: 10, end: 20 },
+          { label: 'more than 20', start: 20 },
+        ],
+      });
+      expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
+    });
   });
 
   describe('getWidgetUiState', () => {
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectPagination.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectPagination.test.ts
index e6dbd384b1..e3cd4cab8b 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectPagination.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectPagination.test.ts
@@ -6,13 +6,13 @@ import algoliasearchHelper, {
   SearchResults,
   SearchParameters,
 } from 'algoliasearch-helper';
-
-import { connectPagination } from '../..';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectPagination } from '../..';
 
 import type {
   PaginationConnectorParams,
@@ -303,54 +303,21 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/pagination/
   });
 
   describe('dispose', () => {
-    it('calls the unmount function', () => {
-      const helper = algoliasearchHelper(createSearchClient(), '');
-
-      const renderFn = () => {};
-      const unmountFn = jest.fn();
-      const makeWidget = connectPagination(renderFn, unmountFn);
-      const widget = makeWidget({});
+    it('calls unmount function', () => {
+      const render = jest.fn();
+      const unmount = jest.fn();
 
-      expect(unmountFn).toHaveBeenCalledTimes(0);
+      const widget = connectPagination(render, unmount)({});
 
-      widget.dispose!(createDisposeOptions({ helper, state: helper.state }));
+      widget.dispose!(createDisposeOptions());
 
-      expect(unmountFn).toHaveBeenCalledTimes(1);
+      expect(unmount).toHaveBeenCalled();
     });
 
     it('does not throw without the unmount function', () => {
-      const helper = algoliasearchHelper(createSearchClient(), '');
-
-      const renderFn = () => {};
-      const makeWidget = connectPagination(renderFn);
-      const widget = makeWidget({});
-
-      expect(() =>
-        widget.dispose!(createDisposeOptions({ helper, state: helper.state }))
-      ).not.toThrow();
-    });
-
-    it('removes the `page` from the `SearchParameters`', () => {
-      const helper = algoliasearchHelper(createSearchClient(), '', {
-        page: 5,
-      });
-
-      const renderFn = () => {};
-      const makeWidget = connectPagination(renderFn);
-      const widget = makeWidget({});
-
-      expect(helper.state.page).toBe(5);
-
-      const nextState = widget.dispose!(
-        createDisposeOptions({ helper, state: helper.state })
-      );
-
-      // error used for typescript
-      if (!nextState) {
-        throw new Error('expect state to be returned');
-      }
-
-      expect((nextState as SearchParameters).page).toBeUndefined();
+      const render = () => {};
+      const widget = connectPagination(render)({});
+      expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
     });
   });
 
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectPoweredBy.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectPoweredBy.test.ts
index cdf1ef1ce2..6868f4e0f5 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectPoweredBy.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectPoweredBy.test.ts
@@ -2,15 +2,13 @@
  * @jest-environment jsdom
  */
 
-import { createSearchClient } from '@instantsearch/mocks';
-import jsHelper from 'algoliasearch-helper';
-
-import { connectPoweredBy } from '../..';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectPoweredBy } from '../..';
 
 describe('connectPoweredBy', () => {
   it('throws without rendering function', () => {
@@ -117,14 +115,23 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/powered-by/
     );
   });
 
-  it('does not throw without the unmount function', () => {
-    const rendering = () => {};
-    const makeWidget = connectPoweredBy(rendering);
-    const widget = makeWidget({});
-    const helper = jsHelper(createSearchClient(), '');
-    expect(() =>
-      widget.dispose!(createDisposeOptions({ helper, state: helper.state }))
-    ).not.toThrow();
+  describe('dispose', () => {
+    it('calls unmount function', () => {
+      const render = jest.fn();
+      const unmount = jest.fn();
+
+      const widget = connectPoweredBy(render, unmount)({});
+
+      widget.dispose!(createDisposeOptions());
+
+      expect(unmount).toHaveBeenCalled();
+    });
+
+    it('does not throw without the unmount function', () => {
+      const render = () => {};
+      const widget = connectPoweredBy(render)({});
+      expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
+    });
   });
 
   describe('getWidgetRenderState', () => {
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectQueryRules.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectQueryRules.test.ts
index 6a4a5867f2..1975c5803e 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectQueryRules.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectQueryRules.test.ts
@@ -6,14 +6,14 @@ import algoliasearchHelper, {
   SearchResults,
   SearchParameters,
 } from 'algoliasearch-helper';
-
-import { connectQueryRules } from '../..';
-import { createInstantSearch } from '../../../test/createInstantSearch';
+import { createInstantSearch } from 'instantsearch-core/test/createInstantSearch';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectQueryRules } from '../..';
 
 import type { TransformItems } from '../../types';
 import type { AlgoliaSearchHelper as Helper } from 'algoliasearch-helper';
@@ -183,40 +183,24 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/query-rules
         expect(widgetParams).toEqual({});
       }
     });
+  });
 
-    test('calls the unmount function on dispose', () => {
-      const helper = createFakeHelper();
-      const { makeWidget, unmountFn } = createWidget();
-      const widget = makeWidget({});
+  describe('dispose', () => {
+    it('calls unmount function', () => {
+      const render = jest.fn();
+      const unmount = jest.fn();
 
-      widget.init!(
-        createInitOptions({
-          helper,
-          state: helper.state,
-        })
-      );
+      const widget = connectQueryRules(render, unmount)({});
 
-      widget.dispose!(createDisposeOptions({ helper, state: helper.state }));
+      widget.dispose!(createDisposeOptions());
 
-      expect(unmountFn).toHaveBeenCalledTimes(1);
+      expect(unmount).toHaveBeenCalled();
     });
 
-    test('does not throw without the unmount function', () => {
-      const helper = createFakeHelper();
-      const rendering = () => {};
-      const makeWidget = connectQueryRules(rendering);
-      const widget = makeWidget({});
-
-      widget.init!(
-        createInitOptions({
-          state: helper.state,
-          helper,
-        })
-      );
-
-      expect(() =>
-        widget.dispose!(createDisposeOptions({ helper, state: helper.state }))
-      ).not.toThrow();
+    it('does not throw without the unmount function', () => {
+      const render = () => {};
+      const widget = connectQueryRules(render)({});
+      expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
     });
   });
 
@@ -920,104 +904,6 @@ Consider using \`transformRuleContexts\` to minimize the number of rules sent to
           'ais-brand-Speck',
         ]);
       });
-
-      test('reinitializes the rule contexts on dispose', () => {
-        const helper = createFakeHelper({
-          disjunctiveFacets: ['brand'],
-          ruleContexts: ['initial-rule'],
-        });
-        const { makeWidget } = createWidget();
-        const widget = makeWidget({
-          trackedFilters: {
-            brand: (values) => values,
-          },
-        });
-
-        widget.init!(
-          createInitOptions({
-            helper,
-            state: helper.state,
-          })
-        );
-
-        helper.setState({
-          disjunctiveFacetsRefinements: {
-            brand: ['Samsung', 'Apple'],
-          },
-        });
-
-        widget.render!(
-          createRenderOptions({
-            helper,
-            state: helper.state,
-            results: new SearchResults(helper.state, [
-              createSingleSearchResponse(),
-              createSingleSearchResponse({
-                facets: {
-                  brand: {
-                    Samsung: 100,
-                    Apple: 100,
-                  },
-                },
-              }),
-            ]),
-          })
-        );
-
-        expect(helper.state.ruleContexts).toEqual([
-          'initial-rule',
-          'ais-brand-Samsung',
-          'ais-brand-Apple',
-        ]);
-
-        const nextState = widget.dispose!(
-          createDisposeOptions({ helper, state: helper.state })
-        );
-
-        expect((nextState as SearchParameters).ruleContexts).toEqual([
-          'initial-rule',
-        ]);
-      });
-
-      test('stops tracking filters after dispose', () => {
-        const helper = createFakeHelper({
-          disjunctiveFacets: ['brand'],
-          disjunctiveFacetsRefinements: {
-            brand: ['Samsung'],
-          },
-        });
-        const brandFilterSpy = jest.fn((values) => values);
-        const { makeWidget } = createWidget();
-        const widget = makeWidget({
-          trackedFilters: {
-            brand: brandFilterSpy,
-          },
-        });
-
-        expect(helper.state.ruleContexts).toEqual(undefined);
-
-        widget.init!(
-          createInitOptions({
-            helper,
-            state: helper.state,
-          })
-        );
-
-        expect(helper.state.ruleContexts).toEqual(['ais-brand-Samsung']);
-        expect(brandFilterSpy).toHaveBeenCalledTimes(1);
-        expect(brandFilterSpy).toHaveBeenCalledWith(['Samsung']);
-
-        widget.dispose!(createDisposeOptions({ helper, state: helper.state }));
-
-        helper.setState({
-          disjunctiveFacetsRefinements: {
-            brand: ['Samsung', 'Apple'],
-          },
-        });
-
-        expect(helper.state.ruleContexts).toEqual(undefined);
-        expect(brandFilterSpy).toHaveBeenCalledTimes(1);
-      });
     });
 
     describe('transformRuleContexts', () => {
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectRange.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectRange.test.ts
index fafd8ae220..81aecdbc99 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectRange.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectRange.test.ts
@@ -6,14 +6,14 @@ import jsHelper, {
   SearchResults,
   SearchParameters,
 } from 'algoliasearch-helper';
-
-import { connectRange, instantsearch } from '../..';
-import { createInstantSearch } from '../../../test/createInstantSearch';
+import { createInstantSearch } from 'instantsearch-core/test/createInstantSearch';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectRange, instantsearch } from '../..';
 
 import type { AlgoliaSearchHelper } from 'algoliasearch-helper';
 
@@ -1344,88 +1344,21 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/range-input
   });
 
   describe('dispose', () => {
-    it('does not throw without the unmount function', () => {
-      const rendering = () => {};
-      const makeWidget = connectRange(rendering);
-      const attribute = 'price';
-      const widget = makeWidget({ attribute });
-      const helper = jsHelper(
-        createSearchClient(),
-        '',
-        widget.getWidgetSearchParameters(new SearchParameters(), {
-          uiState: {},
-        })
-      );
-      expect(() =>
-        widget.dispose!(createDisposeOptions({ helper, state: helper.state }))
-      ).not.toThrow();
-    });
-
-    it('removes empty refinement', () => {
-      const rendering = () => {};
-      const makeWidget = connectRange(rendering);
-      const attribute = 'price';
-      const indexName = '';
-      const widget = makeWidget({ attribute });
-      const helper = jsHelper(
-        createSearchClient(),
-        indexName,
-        widget.getWidgetSearchParameters(new SearchParameters(), {
-          uiState: {},
-        })
-      );
-
-      const newState = widget.dispose!(
-        createDisposeOptions({ helper, state: helper.state })
-      );
-
-      expect(newState).toEqual(new SearchParameters({ index: indexName }));
-    });
-
-    it('removes active refinement', () => {
-      const rendering = jest.fn();
-      const makeWidget = connectRange(rendering);
-      const attribute = 'price';
-      const indexName = '';
-      const widget = makeWidget({ attribute });
-      const helper = jsHelper(
-        createSearchClient(),
-        indexName,
-        widget.getWidgetSearchParameters(new SearchParameters(), {
-          uiState: {},
-        })
-      );
-      helper.search = jest.fn();
-
-      widget.init!(
-        createInitOptions({
-          helper,
-        })
-      );
-
-      const renderOptions = rendering.mock.calls[0][0];
-      const { refine } = renderOptions;
+    it('calls unmount function', () => {
+      const render = jest.fn();
+      const unmount = jest.fn();
 
-      refine({ min: 100, max: 1000 });
+      const widget = connectRange(render, unmount)({ attribute: 's' });
 
-      expect(helper.state).toEqual(
-        new SearchParameters({
-          index: indexName,
-          disjunctiveFacets: ['price'],
-          numericRefinements: {
-            price: {
-              '<=': [1000],
-              '>=': [100],
-            },
-          },
-        })
-      );
+      widget.dispose!(createDisposeOptions());
 
-      const newState = widget.dispose!(
-        createDisposeOptions({ helper, state: helper.state })
-      );
+      expect(unmount).toHaveBeenCalled();
+    });
 
-      expect(newState).toEqual(new SearchParameters({ index: indexName }));
+    it('does not throw without the unmount function', () => {
+      const render = () => {};
+      const widget = connectRange(render)({ attribute: 's' });
+      expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
     });
   });
 
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectRatingMenu.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectRatingMenu.test.ts
index e0b094eba8..8d523c54c6 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectRatingMenu.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectRatingMenu.test.ts
@@ -6,14 +6,14 @@ import jsHelper, {
   SearchResults,
   SearchParameters,
 } from 'algoliasearch-helper';
-
-import { connectRatingMenu } from '../..';
-import { createInstantSearch } from '../../../test/createInstantSearch';
+import { createInstantSearch } from 'instantsearch-core/test/createInstantSearch';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectRatingMenu } from '../..';
 
 describe('connectRatingMenu', () => {
   const getInitializedWidget = (config = {}, unmount = () => {}) => {
@@ -311,69 +311,21 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/rating-menu
   });
 
   describe('dispose', () => {
-    it('does not throw without the unmount function', () => {
-      const { widget, helper } = getInitializedWidget();
-
-      expect(() =>
-        widget.dispose!(createDisposeOptions({ helper, state: helper.state }))
-      ).not.toThrow();
-    });
-
-    test('calls the unmount function', () => {
-      const unmount = jest.fn();
-      const { widget, helper } = getInitializedWidget({}, unmount);
-
-      widget.dispose!(createDisposeOptions({ helper, state: helper.state }));
-
-      expect(unmount).toHaveBeenCalledTimes(1);
-    });
-
-    test('resets the state', () => {
+    it('calls unmount function', () => {
       const render = jest.fn();
-      const makeWidget = connectRatingMenu(render);
-      const indexName = 'indexName';
-      const attribute = 'grade';
-      const helper = jsHelper(createSearchClient(), indexName, {
-        disjunctiveFacets: [attribute],
-        numericRefinements: {
-          [attribute]: {
-            '>=': [4],
-          },
-        },
-      });
-      helper.search = jest.fn();
+      const unmount = jest.fn();
 
-      const widget = makeWidget({
-        attribute,
-      });
+      const widget = connectRatingMenu(render, unmount)({ attribute: 's' });
 
-      expect(helper.state).toEqual(
-        new SearchParameters({
-          index: indexName,
-          disjunctiveFacets: [attribute],
-          numericRefinements: {
-            grade: {
-              '>=': [4],
-            },
-          },
-        })
-      );
+      widget.dispose!(createDisposeOptions());
 
-      const nextState = widget.dispose!(
-        createDisposeOptions({ helper, state: helper.state })
-      );
+      expect(unmount).toHaveBeenCalled();
+    });
 
-      expect(nextState).toEqual(
-        new SearchParameters({
-          index: indexName,
-          disjunctiveFacets: [attribute],
-          numericRefinements: {
-            grade: {
-              '>=': [],
-            },
-          },
-        })
-      );
+    it('does not throw without the unmount function', () => {
+      const render = () => {};
+      const widget = connectRatingMenu(render)({ attribute: 's' });
+      expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
     });
   });
 
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectRefinementList.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectRefinementList.test.ts
index b945354dcd..1a30570f18 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectRefinementList.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectRefinementList.test.ts
@@ -9,14 +9,14 @@ import algoliasearchHelper, {
   SearchResults,
   SearchParameters,
 } from 'algoliasearch-helper';
-
-import { connectRefinementList, TAG_PLACEHOLDER, warnCache } from '../..';
-import { createInstantSearch } from '../../../test/createInstantSearch';
+import { createInstantSearch } from 'instantsearch-core/test/createInstantSearch';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectRefinementList, TAG_PLACEHOLDER, warnCache } from '../..';
 
 describe('connectRefinementList', () => {
   const createWidgetFactory = () => {
@@ -2057,208 +2057,26 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/refinement-
     const widget = makeWidget({
       attribute: 'myFacet',
     });
-    const helper = algoliasearchHelper(
-      createSearchClient(),
-      '',
-      widget.getWidgetSearchParameters(new SearchParameters({}), {
-        uiState: {},
-      })
-    );
 
-    expect(() =>
-      widget.dispose!(createDisposeOptions({ helper, state: helper.state }))
-    ).not.toThrow();
+    expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
   });
 
   describe('dispose', () => {
-    it('removes refinements completely on dispose (and)', () => {
-      const rendering = jest.fn();
-      const makeWidget = connectRefinementList(rendering);
-      const instantSearchInstance = createInstantSearch();
-
-      const widget = makeWidget({
-        attribute: 'category',
-        operator: 'and',
-      });
-
-      const indexName = 'my-index';
-      const helper = algoliasearchHelper(
-        createSearchClient(),
-        indexName,
-        widget.getWidgetSearchParameters(new SearchParameters({}), {
-          uiState: {},
-        })
-      );
-      helper.search = jest.fn();
-
-      widget.init!(
-        createInitOptions({
-          helper,
-          state: helper.state,
-          createURL: () => '#',
-          instantSearchInstance,
-        })
-      );
-
-      widget.render!(
-        createRenderOptions({
-          results: new SearchResults(helper.state, [
-            createSingleSearchResponse({
-              hits: [],
-              facets: {
-                category: {
-                  c1: 880,
-                  c2: 47,
-                },
-              },
-            }),
-            createSingleSearchResponse({
-              facets: {
-                category: {
-                  c1: 880,
-                  c2: 47,
-                },
-              },
-            }),
-          ]),
-          state: helper.state,
-          helper,
-        })
-      );
-
-      const { refine } = rendering.mock.calls[0][0];
-
-      expect(helper.state).toEqual(
-        new SearchParameters({
-          facets: ['category'],
-          facetsRefinements: {
-            category: [],
-          },
-          index: indexName,
-          maxValuesPerFacet: 10,
-        })
-      );
+    it('calls unmount function', () => {
+      const render = jest.fn();
+      const unmount = jest.fn();
 
-      refine('zimbo');
+      const widget = connectRefinementList(render, unmount)({ attribute: 's' });
 
-      expect(helper.state).toEqual(
-        new SearchParameters({
-          facets: ['category'],
-          facetsRefinements: {
-            category: ['zimbo'],
-          },
-          index: indexName,
-          maxValuesPerFacet: 10,
-        })
-      );
+      widget.dispose!(createDisposeOptions());
 
-      const newState = widget.dispose!(
-        createDisposeOptions({
-          state: helper.state,
-          helper,
-        })
-      );
-
-      expect(newState).toEqual(
-        new SearchParameters({
-          index: indexName,
-        })
-      );
+      expect(unmount).toHaveBeenCalled();
     });
 
-    it('removes refinements completely on dispose (or)', () => {
-      const rendering = jest.fn();
-      const makeWidget = connectRefinementList(rendering);
-      const instantSearchInstance = createInstantSearch();
-
-      const widget = makeWidget({
-        attribute: 'category',
-        operator: 'or',
-      });
-
-      const indexName = 'my-index';
-      const helper = algoliasearchHelper(
-        createSearchClient(),
-        indexName,
-        widget.getWidgetSearchParameters(new SearchParameters({}), {
-          uiState: {},
-        })
-      );
-      helper.search = jest.fn();
-
-      widget.init!(
-        createInitOptions({
-          helper,
-          state: helper.state,
-          createURL: () => '#',
-          instantSearchInstance,
-        })
-      );
-
-      widget.render!(
-        createRenderOptions({
-          results: new SearchResults(helper.state, [
-            createSingleSearchResponse({
-              hits: [],
-              facets: {
-                category: {
-                  c1: 880,
-                  c2: 47,
-                },
-              },
-            }),
-            createSingleSearchResponse({
-              facets: {
-                category: {
-                  c1: 880,
-                  c2: 47,
-                },
-              },
-            }),
-          ]),
-          state: helper.state,
-          helper,
-        })
-      );
-
-      const { refine } = rendering.mock.calls[0][0];
-
-      expect(helper.state).toEqual(
-        new SearchParameters({
-          disjunctiveFacets: ['category'],
-          disjunctiveFacetsRefinements: {
-            category: [],
-          },
-          index: indexName,
-          maxValuesPerFacet: 10,
-        })
-      );
-
-      refine('zimbo');
-
-      expect(helper.state).toEqual(
-        new SearchParameters({
-          disjunctiveFacets: ['category'],
-          disjunctiveFacetsRefinements: {
-            category: ['zimbo'],
-          },
-          index: indexName,
-          maxValuesPerFacet: 10,
-        })
-      );
-
-      const newState = widget.dispose!(
-        createDisposeOptions({
-          state: helper.state,
-          helper,
-        })
-      );
-
-      expect(newState).toEqual(
-        new SearchParameters({
-          index: indexName,
-        })
-      );
+    it('does not throw without the unmount function', () => {
+      const render = () => {};
+      const widget = connectRefinementList(render)({ attribute: 's' });
+      expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
     });
   });
 
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectRelatedProducts.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectRelatedProducts.test.ts
index 87dafe09eb..e28c804972 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectRelatedProducts.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectRelatedProducts.test.ts
@@ -4,12 +4,13 @@
 
 import { createSearchClient } from '@instantsearch/mocks';
 import algoliasearchHelper, { RecommendParameters } from 'algoliasearch-helper';
-
-import { connectRelatedProducts } from '../..';
 import {
+  createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectRelatedProducts } from '../..';
 
 describe('connectRelatedProducts', () => {
   it('throws without render function', () => {
@@ -92,6 +93,28 @@ describe('connectRelatedProducts', () => {
     );
   });
 
+  describe('dispose', () => {
+    it('calls unmount function', () => {
+      const render = jest.fn();
+      const unmount = jest.fn();
+
+      const widget = connectRelatedProducts(
+        render,
+        unmount
+      )({ objectIDs: ['1'] });
+
+      widget.dispose!(createDisposeOptions());
+
+      expect(unmount).toHaveBeenCalled();
+    });
+
+    it('does not throw without the unmount function', () => {
+      const render = () => {};
+      const widget = connectRelatedProducts(render)({ objectIDs: ['1'] });
+      expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
+    });
+  });
+
   describe('getWidgetParameters', () => {
     it('forwards widgetParams to the recommend state', () => {
       const render = () => {};
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectRelevantSort.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectRelevantSort.test.ts
index bc0d1ba947..26f6213a5e 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectRelevantSort.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectRelevantSort.test.ts
@@ -6,13 +6,13 @@ import algoliasearchHelper, {
   SearchParameters,
   SearchResults,
 } from 'algoliasearch-helper';
-
-import { connectRelevantSort, noop } from '../..';
 import {
   createInitOptions,
   createRenderOptions,
   createDisposeOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectRelevantSort, noop } from '../..';
 
 const createHelper = () => {
   return algoliasearchHelper(createSearchClient(), '', {});
@@ -36,27 +36,23 @@ describe('connectRelevantSort', () => {
     );
   });
 
-  it('dispose relevancyStrictness set by the widget', () => {
-    const helper = createHelper();
-    const makeWidget = connectRelevantSort(noop);
-    const widget = makeWidget({});
-    widget.init!(createInitOptions({ helper }));
-    const { refine } = widget.getWidgetRenderState(
-      createRenderOptions({
-        helper,
-      })
-    );
-    refine(10);
-    expect(
-      widget.getWidgetSearchParameters(helper.state, {
-        uiState: {},
-      }).relevancyStrictness
-    ).toEqual(10);
+  describe('dispose', () => {
+    it('calls unmount function', () => {
+      const render = jest.fn();
+      const unmount = jest.fn();
+
+      const widget = connectRelevantSort(render, unmount)({});
 
-    const nextState = widget.dispose!(
-      createDisposeOptions({ state: helper.state })
-    ) as SearchParameters;
-    expect(nextState.relevancyStrictness).toBeUndefined();
+      widget.dispose!(createDisposeOptions());
+
+      expect(unmount).toHaveBeenCalled();
+    });
+
+    it('does not throw without the unmount function', () => {
+      const render = () => {};
+      const widget = connectRelevantSort(render)({});
+      expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
+    });
   });
 
   it('apply relevancyStrictness to helper on refine()', () => {
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectSearchBox.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectSearchBox.test.ts
index 7a2f8def7a..851903458a 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectSearchBox.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectSearchBox.test.ts
@@ -6,13 +6,13 @@ import algoliasearchHelper, {
   SearchResults,
   SearchParameters,
 } from 'algoliasearch-helper';
-
-import { connectSearchBox, instantsearch } from '../..';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectSearchBox, instantsearch } from '../..';
 
 describe('connectSearchBox', () => {
   const getInitializedWidget = (config = {}) => {
@@ -543,52 +543,21 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/search-box/
   });
 
   describe('dispose', () => {
-    it('calls the unmount function', () => {
-      const helper = algoliasearchHelper(createSearchClient(), '');
-
-      const renderFn = () => {};
-      const unmountFn = jest.fn();
-      const makeWidget = connectSearchBox(renderFn, unmountFn);
-      const widget = makeWidget({});
+    it('calls unmount function', () => {
+      const render = jest.fn();
+      const unmount = jest.fn();
 
-      expect(unmountFn).toHaveBeenCalledTimes(0);
+      const widget = connectSearchBox(render, unmount)({});
 
-      widget.dispose!(createDisposeOptions({ helper, state: helper.state }));
+      widget.dispose!(createDisposeOptions());
 
-      expect(unmountFn).toHaveBeenCalledTimes(1);
+      expect(unmount).toHaveBeenCalled();
     });
 
     it('does not throw without the unmount function', () => {
-      const helper = algoliasearchHelper(createSearchClient(), '');
-
-      const renderFn = () => {};
-      const makeWidget = connectSearchBox(renderFn);
-      const widget = makeWidget({});
-
-      expect(() =>
-        widget.dispose!(createDisposeOptions({ helper, state: helper.state }))
-      ).not.toThrow();
-    });
-
-    it('removes the `query` from the `SearchParameters`', () => {
-      const helper = algoliasearchHelper(createSearchClient(), '', {
-        query: 'Apple',
-      });
-
-      const renderFn = () => {};
-      const makeWidget = connectSearchBox(renderFn);
-      const widget = makeWidget({});
-
-      expect(helper.state.query).toBe('Apple');
-
-      const nextState = widget.dispose!(
-        createDisposeOptions({
-          helper,
-          state: helper.state,
-        })
-      ) as SearchParameters;
-
-      expect(nextState.query).toBeUndefined();
+      const render = () => {};
+      const widget = connectSearchBox(render)({});
+      expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
     });
   });
 
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectSortBy.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectSortBy.test.ts
index e0f5f5c26f..2317058425 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectSortBy.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectSortBy.test.ts
@@ -6,14 +6,14 @@ import algoliasearchHelper, {
   SearchResults,
   SearchParameters,
 } from 'algoliasearch-helper';
-
-import { connectSortBy, index } from '../..';
-import { createInstantSearch } from '../../../test/createInstantSearch';
+import { createInstantSearch } from 'instantsearch-core/test/createInstantSearch';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectSortBy, index } from '../..';
 
 import type { SortByRenderState } from '../connectSortBy';
 
@@ -137,19 +137,40 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/sort-by/js/
     );
   });
 
-  it('does not throw without the unmount function', () => {
-    const rendering = jest.fn();
-    const makeWidget = connectSortBy(rendering);
-    const items = [
-      { label: 'Sort products by relevance', value: 'relevance' },
-      { label: 'Sort products by price', value: 'priceASC' },
-    ];
-    const widget = makeWidget({ items });
-    const helper = algoliasearchHelper(createSearchClient(), items[0].value);
+  describe('dispose', () => {
+    it('calls unmount function', () => {
+      const render = jest.fn();
+      const unmount = jest.fn();
 
-    expect(() =>
-      widget.dispose!(createDisposeOptions({ helper, state: helper.state }))
-    ).not.toThrow();
+      const widget = connectSortBy(
+        render,
+        unmount
+      )({
+        items: [
+          {
+            label: 'Sort products by relevance',
+            value: 'relevance',
+          },
+        ],
+      });
+
+      widget.dispose!(createDisposeOptions());
+
+      expect(unmount).toHaveBeenCalled();
+    });
+
+    it('does not throw without the unmount function', () => {
+      const render = () => {};
+      const widget = connectSortBy(render)({
+        items: [
+          {
+            label: 'Sort products by relevance',
+            value: 'relevance',
+          },
+        ],
+      });
+      expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
+    });
   });
 
   it('Renders with transformed items', () => {
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectStats.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectStats.test.ts
index 129a42bc60..9785a972b9 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectStats.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectStats.test.ts
@@ -2,15 +2,14 @@ import {
   createSearchClient,
   createSingleSearchResponse,
 } from '@instantsearch/mocks';
-import jsHelper from 'algoliasearch-helper';
-const SearchResults = jsHelper.SearchResults;
-
-import { connectStats } from '../..';
+import jsHelper, { SearchResults } from 'algoliasearch-helper';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectStats } from '../..';
 
 import type { StatsRenderState } from '../connectStats';
 
@@ -420,13 +419,22 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/stats/js/#c
     }
   });
 
-  it('does not throw without the unmount function', () => {
-    const rendering = () => {};
-    const makeWidget = connectStats(rendering);
-    const widget = makeWidget({});
-    const helper = jsHelper(createSearchClient(), '');
-    expect(() =>
-      widget.dispose!(createDisposeOptions({ helper, state: helper.state }))
-    ).not.toThrow();
+  describe('dispose', () => {
+    it('calls unmount function', () => {
+      const render = jest.fn();
+      const unmount = jest.fn();
+
+      const widget = connectStats(render, unmount)({});
+
+      widget.dispose!(createDisposeOptions());
+
+      expect(unmount).toHaveBeenCalled();
+    });
+
+    it('does not throw without the unmount function', () => {
+      const render = () => {};
+      const widget = connectStats(render)({});
+      expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
+    });
   });
 });
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectToggleRefinement.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectToggleRefinement.test.ts
index 3e5dca78a8..a9c4aee201 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectToggleRefinement.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectToggleRefinement.test.ts
@@ -6,14 +6,14 @@ import jsHelper, {
   SearchResults,
   SearchParameters,
 } from 'algoliasearch-helper';
-
-import { connectToggleRefinement, warnCache } from '../..';
-import { createInstantSearch } from '../../../test/createInstantSearch';
+import { createInstantSearch } from 'instantsearch-core/test/createInstantSearch';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectToggleRefinement, warnCache } from '../..';
 
 import type { ToggleRefinementRenderState } from '../connectToggleRefinement';
 
@@ -310,22 +310,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/toggle-refi
     }
   });
 
-  it('does not throw without the unmount function', () => {
-    const rendering = () => {};
-    const makeWidget = connectToggleRefinement(rendering);
-    const attribute = 'isShippingFree';
-    const widget = makeWidget({
-      attribute,
-    });
-    const config = widget.getWidgetSearchParameters(new SearchParameters({}), {
-      uiState: {},
-    });
-    const helper = jsHelper(createSearchClient(), '', config);
-    expect(() =>
-      widget.dispose!(createDisposeOptions({ helper, state: helper.state }))
-    ).not.toThrow();
-  });
-
   it('Provides a function to add/remove a facet value', () => {
     const rendering = jest.fn();
     const makeWidget = connectToggleRefinement(rendering);
@@ -836,59 +820,24 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/toggle-refi
   });
 
   describe('dispose', () => {
-    test('calls the unmount function', () => {
+    it('calls unmount function', () => {
       const render = jest.fn();
       const unmount = jest.fn();
-      const makeWidget = connectToggleRefinement(render, unmount);
-      const helper = jsHelper(createSearchClient(), '', {});
-      helper.search = jest.fn();
 
-      const attribute = 'freeShipping';
-      const widget = makeWidget({
-        attribute,
-      });
+      const widget = connectToggleRefinement(
+        render,
+        unmount
+      )({ attribute: 's' });
 
-      widget.dispose!(createDisposeOptions({ state: helper.state }));
+      widget.dispose!(createDisposeOptions());
 
-      expect(unmount).toHaveBeenCalledTimes(1);
+      expect(unmount).toHaveBeenCalled();
     });
 
-    test('resets the state', () => {
-      const render = jest.fn();
-      const makeWidget = connectToggleRefinement(render);
-      const indexName = 'indexName';
-      const helper = jsHelper(createSearchClient(), indexName, {
-        disjunctiveFacets: ['freeShipping'],
-        disjunctiveFacetsRefinements: {
-          freeShipping: ['true'],
-        },
-      });
-      helper.search = jest.fn();
-
-      const attribute = 'freeShipping';
-      const widget = makeWidget({
-        attribute,
-      });
-
-      expect(helper.state).toEqual(
-        new SearchParameters({
-          index: indexName,
-          disjunctiveFacets: ['freeShipping'],
-          disjunctiveFacetsRefinements: {
-            freeShipping: ['true'],
-          },
-        })
-      );
-
-      const nextState = widget.dispose!(
-        createDisposeOptions({ state: helper.state })
-      );
-
-      expect(nextState).toEqual(
-        new SearchParameters({
-          index: indexName,
-        })
-      );
+    it('does not throw without the unmount function', () => {
+      const render = () => {};
+      const widget = connectToggleRefinement(render)({ attribute: 's' });
+      expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
     });
   });
 
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectTrendingItems.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectTrendingItems.test.ts
index 9e89ec8085..04cbe95cd1 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectTrendingItems.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectTrendingItems.test.ts
@@ -4,12 +4,13 @@
 
 import { createSearchClient } from '@instantsearch/mocks';
 import algoliasearchHelper, { RecommendParameters } from 'algoliasearch-helper';
-
-import { connectTrendingItems } from '../..';
 import {
+  createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectTrendingItems } from '../..';
 
 describe('connectTrendingItems', () => {
   it('throws without render function', () => {
@@ -170,4 +171,23 @@ describe('connectTrendingItems', () => {
       );
     });
   });
+
+  describe('dispose', () => {
+    it('calls unmount function', () => {
+      const render = jest.fn();
+      const unmount = jest.fn();
+
+      const widget = connectTrendingItems(render, unmount)({});
+
+      widget.dispose!(createDisposeOptions());
+
+      expect(unmount).toHaveBeenCalled();
+    });
+
+    it('does not throw without the unmount function', () => {
+      const render = () => {};
+      const widget = connectTrendingItems(render)({});
+      expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
+    });
+  });
 });
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectVoiceSearch.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectVoiceSearch.test.ts
index 7a2c146742..956ea24b7c 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectVoiceSearch.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectVoiceSearch.test.ts
@@ -1,12 +1,13 @@
 import { createSearchClient } from '@instantsearch/mocks';
+import { wait } from '@instantsearch/testutils';
 import algoliasearchHelper, { SearchParameters } from 'algoliasearch-helper';
-
-import { connectVoiceSearch } from '../..';
 import {
   createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { connectSearchBox, connectVoiceSearch, instantsearch } from '../..';
 
 import type {
   VoiceSearchHelperParams,
@@ -185,30 +186,20 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/voice-searc
   });
 
   describe('dispose', () => {
-    it('calls the unmount function', () => {
-      const helper = algoliasearchHelper(createSearchClient(), '');
-
-      const renderFn = () => {};
-      const unmountFn = jest.fn();
-      const makeWidget = connectVoiceSearch(renderFn, unmountFn);
-      const widget = makeWidget({});
-
-      widget.init!(createInitOptions({ helper }));
+    it('calls unmount function', () => {
+      const render = jest.fn();
+      const unmount = jest.fn();
 
-      expect(unmountFn).toHaveBeenCalledTimes(0);
+      const widget = connectVoiceSearch(render, unmount)({});
 
-      widget.dispose!(createDisposeOptions({ helper, state: helper.state }));
+      widget.dispose!(createDisposeOptions());
 
-      expect(unmountFn).toHaveBeenCalledTimes(1);
+      expect(unmount).toHaveBeenCalled();
     });
 
     it('does not throw without the unmount function', () => {
-      const renderFn = () => {};
-      const makeWidget = connectVoiceSearch(renderFn);
-      const widget = makeWidget({});
-
-      widget.init!(createInitOptions());
-
+      const render = () => {};
+      const widget = connectVoiceSearch(render)({});
       expect(() => widget.dispose!(createDisposeOptions())).not.toThrow();
     });
 
@@ -225,32 +216,12 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/voice-searc
         0
       );
 
-      widget.dispose!(createDisposeOptions({ helper, state: helper.state }));
+      widget.dispose!(createDisposeOptions({}));
 
       expect((widget as any)._voiceSearchHelper.dispose).toHaveBeenCalledTimes(
         1
       );
     });
-
-    it('removes the `query` from the `SearchParameters`', () => {
-      const helper = algoliasearchHelper(createSearchClient(), '', {
-        query: 'Apple',
-      });
-
-      const renderFn = () => {};
-      const makeWidget = connectVoiceSearch(renderFn);
-      const widget = makeWidget({});
-
-      widget.init!(createInitOptions({ helper }));
-
-      expect(helper.state.query).toBe('Apple');
-
-      const nextState = widget.dispose!(
-        createDisposeOptions({ helper, state: helper.state })
-      ) as SearchParameters;
-
-      expect(nextState.query).toBeUndefined();
-    });
   });
 
   describe('getWidgetUiState', () => {
@@ -527,51 +498,68 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/voice-searc
         })
       );
     });
+  });
 
-    it('removes additional parameters when disposed', () => {
-      const { widget, helper, refine } = getInitializedWidget({
-        widgetParams: {
-          additionalQueryParameters: () => {},
-        },
+  describe('interaction with searchbox', () => {
+    it('sets voice parameters only for voice queries', async () => {
+      const searchClient = createSearchClient();
+      const search = instantsearch({ searchClient, indexName: 'indexName' });
+      search.start();
+
+      const voice = connectVoiceSearch(() => {})({
+        additionalQueryParameters: () => ({ exactOnSingleWordQuery: 'word' }),
       });
+      const searchBox = connectSearchBox(() => {})({});
+      search.addWidgets([voice, searchBox]);
 
-      refine('query');
-      const newState = widget.dispose!(
-        createDisposeOptions({ state: helper.state })
-      );
-      expect(newState).toEqual(
-        new SearchParameters({
-          ignorePlurals: undefined,
-          removeStopWords: undefined,
-          optionalWords: undefined,
-          queryLanguages: undefined,
-          index: '',
-        })
-      );
-    });
+      await wait(100);
+      expect(search.client.search).toHaveBeenCalledTimes(1);
+      expect(search.client.search).toHaveBeenLastCalledWith([
+        {
+          indexName: 'indexName',
+          params: { query: '' },
+        },
+      ]);
 
-    it('removes additional parameters and extra parameters when disposed', () => {
-      const { widget, helper, refine } = getInitializedWidget({
-        widgetParams: {
-          additionalQueryParameters: () => ({
-            distinct: true,
-          }),
+      search.renderState.indexName.searchBox?.refine('query');
+
+      await wait(100);
+      expect(search.client.search).toHaveBeenCalledTimes(2);
+      expect(search.client.search).toHaveBeenLastCalledWith([
+        {
+          indexName: 'indexName',
+          params: { query: 'query' },
         },
-      });
+      ]);
 
-      refine('query');
-      const newState = widget.dispose!(
-        createDisposeOptions({ state: helper.state })
-      );
-      expect(newState).toEqual(
-        new SearchParameters({
-          ignorePlurals: undefined,
-          removeStopWords: undefined,
-          optionalWords: undefined,
-          queryLanguages: undefined,
-          index: '',
-        })
-      );
+      // not testing the browser API here
+      (voice as any)._refine('voice query');
+
+      await wait(100);
+      expect(search.client.search).toHaveBeenCalledTimes(3);
+      expect(search.client.search).toHaveBeenLastCalledWith([
+        {
+          indexName: 'indexName',
+          params: {
+            query: 'voice query',
+            ignorePlurals: true,
+            removeStopWords: true,
+            optionalWords: 'voice query',
+            exactOnSingleWordQuery: 'word',
+          },
+        },
+      ]);
+
+      search.removeWidgets([voice]);
+
+      await wait(100);
+      expect(search.client.search).toHaveBeenCalledTimes(4);
+      expect(search.client.search).toHaveBeenLastCalledWith([
+        {
+          indexName: 'indexName',
+          params: { query: 'voice query' },
+        },
+      ]);
     });
   });
 });
diff --git a/packages/instantsearch-core/src/connectors/connectAutocomplete.ts b/packages/instantsearch-core/src/connectors/connectAutocomplete.ts
index e358191e0f..4a61a1913c 100644
--- a/packages/instantsearch-core/src/connectors/connectAutocomplete.ts
+++ b/packages/instantsearch-core/src/connectors/connectAutocomplete.ts
@@ -241,24 +241,8 @@ search.addWidgets([
           });
         },
 
-        dispose({ state }) {
+        dispose() {
           unmountFn();
-
-          const stateWithoutQuery = state.setQueryParameter('query', undefined);
-
-          if (!escapeHTML) {
-            return stateWithoutQuery;
-          }
-
-          return stateWithoutQuery.setQueryParameters(
-            Object.keys(TAG_PLACEHOLDER).reduce(
-              (acc, key) => ({
-                ...acc,
-                [key]: undefined,
-              }),
-              {}
-            )
-          );
         },
       };
     };
diff --git a/packages/instantsearch-core/src/connectors/connectConfigure.ts b/packages/instantsearch-core/src/connectors/connectConfigure.ts
index 0c9ea29c6f..066584009d 100644
--- a/packages/instantsearch-core/src/connectors/connectConfigure.ts
+++ b/packages/instantsearch-core/src/connectors/connectConfigure.ts
@@ -7,12 +7,9 @@ import {
 } from '../lib/public';
 import { mergeSearchParameters } from '../lib/utils';
 
+import type { InstantSearch } from '../instantsearch';
 import type { Connector, WidgetRenderState } from '../types';
-import type {
-  SearchParameters,
-  PlainSearchParameters,
-  AlgoliaSearchHelper,
-} from 'algoliasearch-helper';
+import type { PlainSearchParameters } from 'algoliasearch-helper';
 
 /**
  * Refine the given search parameters.
@@ -39,24 +36,6 @@ const withUsage = createDocumentationMessageGenerator({
   connector: true,
 });
 
-function getInitialSearchParameters(
-  state: SearchParameters,
-  widgetParams: ConfigureConnectorParams
-): SearchParameters {
-  // We leverage the helper internals to remove the `widgetParams` from
-  // the state. The function `setQueryParameters` omits the values that
-  // are `undefined` on the next state.
-  return state.setQueryParameters(
-    Object.keys(widgetParams.searchParameters).reduce(
-      (acc, key) => ({
-        ...acc,
-        [key]: undefined,
-      }),
-      {}
-    )
-  );
-}
-
 export type ConfigureWidgetDescription = {
   $$type: 'ais.configure';
   renderState: ConfigureRenderState;
@@ -66,9 +45,6 @@ export type ConfigureWidgetDescription = {
       ConfigureConnectorParams
     >;
   };
-  indexUiState: {
-    configure: PlainSearchParameters;
-  };
 };
 
 export type ConfigureConnector = Connector<
@@ -93,23 +69,12 @@ export const connectConfigure: ConfigureConnector = function connectConfigure(
 
     const connectorState: ConnectorState = {};
 
-    function refine(helper: AlgoliaSearchHelper): Refine {
+    function refine(search: InstantSearch): Refine {
       return (searchParameters: PlainSearchParameters) => {
-        // Merge new `searchParameters` with the ones set from other widgets
-        const actualState = getInitialSearchParameters(
-          helper.state,
-          widgetParams
-        );
-        const nextSearchParameters = mergeSearchParameters(
-          actualState,
-          new algoliasearchHelper.SearchParameters(searchParameters)
-        );
-
         // Update original `widgetParams.searchParameters` to the new refined one
         widgetParams.searchParameters = searchParameters;
-
-        // Trigger a search with the resolved search parameters
-        helper.setState(nextSearchParameters).search();
+        // Trigger a search with the new parameters
+        search.setUiState((prev) => prev);
       };
     }
 
@@ -139,10 +104,8 @@ export const connectConfigure: ConfigureConnector = function connectConfigure(
         );
       },
 
-      dispose({ state }) {
+      dispose() {
         unmountFn();
-
-        return getInitialSearchParameters(state, widgetParams);
       },
 
       getRenderState(renderState, renderOptions) {
@@ -166,9 +129,9 @@ export const connectConfigure: ConfigureConnector = function connectConfigure(
         };
       },
 
-      getWidgetRenderState({ helper }) {
+      getWidgetRenderState({ instantSearchInstance }) {
         if (!connectorState.refine) {
-          connectorState.refine = refine(helper);
+          connectorState.refine = refine(instantSearchInstance);
         }
 
         return {
@@ -177,24 +140,19 @@ export const connectConfigure: ConfigureConnector = function connectConfigure(
         };
       },
 
-      getWidgetSearchParameters(state, { uiState }) {
+      getWidgetSearchParameters(state) {
         return mergeSearchParameters(
           state,
-          new algoliasearchHelper.SearchParameters({
-            ...uiState.configure,
-            ...widgetParams.searchParameters,
-          })
+          new algoliasearchHelper.SearchParameters(
+            widgetParams.searchParameters
+          )
         );
       },
 
       getWidgetUiState(uiState) {
-        return {
-          ...uiState,
-          configure: {
-            ...uiState.configure,
-            ...widgetParams.searchParameters,
-          },
-        };
+        // Configure is not part of the UI state, its internal state is what applies
+        // the parameters to the search. These are not synced with the routing.
+        return uiState;
       },
     };
   };
diff --git a/packages/instantsearch-core/src/connectors/connectFrequentlyBoughtTogether.ts b/packages/instantsearch-core/src/connectors/connectFrequentlyBoughtTogether.ts
index 176cd811b8..8537d339fb 100644
--- a/packages/instantsearch-core/src/connectors/connectFrequentlyBoughtTogether.ts
+++ b/packages/instantsearch-core/src/connectors/connectFrequentlyBoughtTogether.ts
@@ -212,9 +212,8 @@ export const connectFrequentlyBoughtTogether =
           };
         },
 
-        dispose({ recommendState }) {
+        dispose() {
           unmountFn();
-          return recommendState.removeParams(this.$$id!);
         },
 
         getWidgetParameters(state) {
diff --git a/packages/instantsearch-core/src/connectors/connectGeoSearch.ts b/packages/instantsearch-core/src/connectors/connectGeoSearch.ts
index 0bf37cbcee..5d1adcb5eb 100644
--- a/packages/instantsearch-core/src/connectors/connectGeoSearch.ts
+++ b/packages/instantsearch-core/src/connectors/connectGeoSearch.ts
@@ -382,10 +382,8 @@ export const connectGeoSearch = function connectGeoSearch<
         };
       },
 
-      dispose({ state }) {
+      dispose() {
         unmountFn();
-
-        return state.setQueryParameter('insideBoundingBox', undefined);
       },
 
       getWidgetUiState(uiState, { searchParameters }) {
diff --git a/packages/instantsearch-core/src/connectors/connectHierarchicalMenu.ts b/packages/instantsearch-core/src/connectors/connectHierarchicalMenu.ts
index 37b50b62f8..3aaa6a1315 100644
--- a/packages/instantsearch-core/src/connectors/connectHierarchicalMenu.ts
+++ b/packages/instantsearch-core/src/connectors/connectHierarchicalMenu.ts
@@ -287,12 +287,8 @@ export const connectHierarchicalMenu: HierarchicalMenuConnector =
           );
         },
 
-        dispose({ state }) {
+        dispose() {
           unmountFn();
-
-          return state
-            .removeHierarchicalFacet(hierarchicalFacetName)
-            .setQueryParameter('maxValuesPerFacet', undefined);
         },
 
         getRenderState(renderState, renderOptions) {
diff --git a/packages/instantsearch-core/src/connectors/connectHits.ts b/packages/instantsearch-core/src/connectors/connectHits.ts
index fd2970f1d5..5998fa401d 100644
--- a/packages/instantsearch-core/src/connectors/connectHits.ts
+++ b/packages/instantsearch-core/src/connectors/connectHits.ts
@@ -186,22 +186,8 @@ export const connectHits = function connectHits<TWidgetParams>(
         };
       },
 
-      dispose({ state }) {
+      dispose() {
         unmountFn();
-
-        if (!escapeHTML) {
-          return state;
-        }
-
-        return state.setQueryParameters(
-          Object.keys(TAG_PLACEHOLDER).reduce(
-            (acc, key) => ({
-              ...acc,
-              [key]: undefined,
-            }),
-            {}
-          )
-        );
       },
 
       getWidgetSearchParameters(state, _uiState) {
diff --git a/packages/instantsearch-core/src/connectors/connectHitsPerPage.ts b/packages/instantsearch-core/src/connectors/connectHitsPerPage.ts
index 6f200a225e..053573f165 100644
--- a/packages/instantsearch-core/src/connectors/connectHitsPerPage.ts
+++ b/packages/instantsearch-core/src/connectors/connectHitsPerPage.ts
@@ -247,10 +247,8 @@ You may want to add another entry to the \`items\` option with this value.`
           );
         },
 
-        dispose({ state }) {
+        dispose() {
           unmountFn();
-
-          return state.setQueryParameter('hitsPerPage', undefined);
         },
 
         getRenderState(renderState, renderOptions) {
diff --git a/packages/instantsearch-core/src/connectors/connectInfiniteHits.ts b/packages/instantsearch-core/src/connectors/connectInfiniteHits.ts
index c72105f760..f61443ae95 100644
--- a/packages/instantsearch-core/src/connectors/connectInfiniteHits.ts
+++ b/packages/instantsearch-core/src/connectors/connectInfiniteHits.ts
@@ -430,24 +430,8 @@ export const connectInfiniteHits = function connectInfiniteHits<
         };
       },
 
-      dispose({ state }) {
+      dispose() {
         unmountFn();
-
-        const stateWithoutPage = state.setQueryParameter('page', undefined);
-
-        if (!escapeHTML) {
-          return stateWithoutPage;
-        }
-
-        return stateWithoutPage.setQueryParameters(
-          Object.keys(TAG_PLACEHOLDER).reduce(
-            (acc, key) => ({
-              ...acc,
-              [key]: undefined,
-            }),
-            {}
-          )
-        );
       },
 
       getWidgetUiState(uiState, { searchParameters }) {
diff --git a/packages/instantsearch-core/src/connectors/connectLookingSimilar.ts b/packages/instantsearch-core/src/connectors/connectLookingSimilar.ts
index d55fe03ef7..145a2bab7e 100644
--- a/packages/instantsearch-core/src/connectors/connectLookingSimilar.ts
+++ b/packages/instantsearch-core/src/connectors/connectLookingSimilar.ts
@@ -212,9 +212,8 @@ export const connectLookingSimilar = function connectLookingSimilar<
         };
       },
 
-      dispose({ recommendState }) {
+      dispose() {
         unmountFn();
-        return recommendState.removeParams(this.$$id!);
       },
 
       getWidgetParameters(state) {
diff --git a/packages/instantsearch-core/src/connectors/connectMenu.ts b/packages/instantsearch-core/src/connectors/connectMenu.ts
index 2a0c2fd54e..d0d9c5f4bd 100644
--- a/packages/instantsearch-core/src/connectors/connectMenu.ts
+++ b/packages/instantsearch-core/src/connectors/connectMenu.ts
@@ -227,12 +227,8 @@ export const connectMenu: MenuConnector = function connectMenu(
         );
       },
 
-      dispose({ state }) {
+      dispose() {
         unmountFn();
-
-        return state
-          .removeHierarchicalFacet(attribute)
-          .setQueryParameter('maxValuesPerFacet', undefined);
       },
 
       getRenderState(renderState, renderOptions) {
diff --git a/packages/instantsearch-core/src/connectors/connectNumericMenu.ts b/packages/instantsearch-core/src/connectors/connectNumericMenu.ts
index 968d96fb89..f312a2549a 100644
--- a/packages/instantsearch-core/src/connectors/connectNumericMenu.ts
+++ b/packages/instantsearch-core/src/connectors/connectNumericMenu.ts
@@ -200,9 +200,8 @@ export const connectNumericMenu: NumericMenuConnector =
           );
         },
 
-        dispose({ state }) {
+        dispose() {
           unmountFn();
-          return state.removeNumericRefinement(attribute);
         },
 
         getWidgetUiState(uiState, { searchParameters }) {
diff --git a/packages/instantsearch-core/src/connectors/connectPagination.ts b/packages/instantsearch-core/src/connectors/connectPagination.ts
index 6c278a3dcc..881368854c 100644
--- a/packages/instantsearch-core/src/connectors/connectPagination.ts
+++ b/packages/instantsearch-core/src/connectors/connectPagination.ts
@@ -130,10 +130,8 @@ export const connectPagination: PaginationConnector =
           );
         },
 
-        dispose({ state }) {
+        dispose() {
           unmountFn();
-
-          return state.setQueryParameter('page', undefined);
         },
 
         getWidgetUiState(uiState, { searchParameters }) {
diff --git a/packages/instantsearch-core/src/connectors/connectQueryRules.ts b/packages/instantsearch-core/src/connectors/connectQueryRules.ts
index 9a05a73a80..1bc7c5a8a3 100644
--- a/packages/instantsearch-core/src/connectors/connectQueryRules.ts
+++ b/packages/instantsearch-core/src/connectors/connectQueryRules.ts
@@ -158,8 +158,8 @@ export type QueryRulesConnector = Connector<
 >;
 
 export const connectQueryRules: QueryRulesConnector =
-  function connectQueryRules(render, unmount = noop) {
-    checkRendering(render, withUsage());
+  function connectQueryRules(renderFn, unmountFn = noop) {
+    checkRendering(renderFn, withUsage());
 
     return (widgetParams) => {
       const {
@@ -219,7 +219,7 @@ export const connectQueryRules: QueryRulesConnector =
             helper.on('change', onHelperChange);
           }
 
-          render(
+          renderFn(
             {
               ...this.getWidgetRenderState(initOptions),
               instantSearchInstance,
@@ -231,7 +231,7 @@ export const connectQueryRules: QueryRulesConnector =
         render(renderOptions) {
           const { instantSearchInstance } = renderOptions;
 
-          render(
+          renderFn(
             {
               ...this.getWidgetRenderState(renderOptions),
               instantSearchInstance,
@@ -257,16 +257,8 @@ export const connectQueryRules: QueryRulesConnector =
           };
         },
 
-        dispose({ helper, state }) {
-          unmount();
-
-          if (hasTrackedFilters) {
-            helper.removeListener('change', onHelperChange);
-
-            return state.setQueryParameter('ruleContexts', initialRuleContexts);
-          }
-
-          return state;
+        dispose() {
+          unmountFn();
         },
       };
     };
diff --git a/packages/instantsearch-core/src/connectors/connectRange.ts b/packages/instantsearch-core/src/connectors/connectRange.ts
index e6001724b5..ca6e8d95c6 100644
--- a/packages/instantsearch-core/src/connectors/connectRange.ts
+++ b/packages/instantsearch-core/src/connectors/connectRange.ts
@@ -396,12 +396,8 @@ export const connectRange: RangeConnector = function connectRange(
         };
       },
 
-      dispose({ state }) {
+      dispose() {
         unmountFn();
-
-        return state
-          .removeDisjunctiveFacet(attribute)
-          .removeNumericRefinement(attribute);
       },
 
       getWidgetUiState(uiState, { searchParameters }) {
diff --git a/packages/instantsearch-core/src/connectors/connectRatingMenu.ts b/packages/instantsearch-core/src/connectors/connectRatingMenu.ts
index ef69a7920b..1518e5b777 100644
--- a/packages/instantsearch-core/src/connectors/connectRatingMenu.ts
+++ b/packages/instantsearch-core/src/connectors/connectRatingMenu.ts
@@ -421,10 +421,8 @@ export const connectRatingMenu: RatingMenuConnector =
           };
         },
 
-        dispose({ state }) {
+        dispose() {
           unmountFn();
-
-          return state.removeNumericRefinement(attribute);
         },
 
         getWidgetUiState(uiState, { searchParameters }) {
diff --git a/packages/instantsearch-core/src/connectors/connectRefinementList.ts b/packages/instantsearch-core/src/connectors/connectRefinementList.ts
index 9dad501112..bc14e10025 100644
--- a/packages/instantsearch-core/src/connectors/connectRefinementList.ts
+++ b/packages/instantsearch-core/src/connectors/connectRefinementList.ts
@@ -456,17 +456,8 @@ export const connectRefinementList: RefinementListConnector =
           };
         },
 
-        dispose({ state }) {
+        dispose() {
           unmountFn();
-
-          const withoutMaxValuesPerFacet = state.setQueryParameter(
-            'maxValuesPerFacet',
-            undefined
-          );
-          if (operator === 'and') {
-            return withoutMaxValuesPerFacet.removeFacet(attribute);
-          }
-          return withoutMaxValuesPerFacet.removeDisjunctiveFacet(attribute);
         },
 
         getWidgetUiState(uiState, { searchParameters }) {
diff --git a/packages/instantsearch-core/src/connectors/connectRelatedProducts.ts b/packages/instantsearch-core/src/connectors/connectRelatedProducts.ts
index b848105bb7..45d34552de 100644
--- a/packages/instantsearch-core/src/connectors/connectRelatedProducts.ts
+++ b/packages/instantsearch-core/src/connectors/connectRelatedProducts.ts
@@ -212,9 +212,8 @@ export const connectRelatedProducts = function connectRelatedProducts<
         };
       },
 
-      dispose({ recommendState }) {
+      dispose() {
         unmountFn();
-        return recommendState.removeParams(this.$$id!);
       },
 
       getWidgetParameters(state) {
diff --git a/packages/instantsearch-core/src/connectors/connectRelevantSort.ts b/packages/instantsearch-core/src/connectors/connectRelevantSort.ts
index d0ab509ea0..fce5d6cb3c 100644
--- a/packages/instantsearch-core/src/connectors/connectRelevantSort.ts
+++ b/packages/instantsearch-core/src/connectors/connectRelevantSort.ts
@@ -82,10 +82,8 @@ export const connectRelevantSort: RelevantSortConnector =
           );
         },
 
-        dispose({ state }) {
+        dispose() {
           unmountFn();
-
-          return state.setQueryParameter('relevancyStrictness', undefined);
         },
 
         getRenderState(renderState, renderOptions) {
diff --git a/packages/instantsearch-core/src/connectors/connectSearchBox.ts b/packages/instantsearch-core/src/connectors/connectSearchBox.ts
index ea12129320..c66387860d 100644
--- a/packages/instantsearch-core/src/connectors/connectSearchBox.ts
+++ b/packages/instantsearch-core/src/connectors/connectSearchBox.ts
@@ -115,10 +115,8 @@ export const connectSearchBox: SearchBoxConnector = function connectSearchBox(
         );
       },
 
-      dispose({ state }) {
+      dispose() {
         unmountFn();
-
-        return state.setQueryParameter('query', undefined);
       },
 
       getRenderState(renderState, renderOptions) {
diff --git a/packages/instantsearch-core/src/connectors/connectSortBy.ts b/packages/instantsearch-core/src/connectors/connectSortBy.ts
index d6e0bf261b..4e013fd5c3 100644
--- a/packages/instantsearch-core/src/connectors/connectSortBy.ts
+++ b/packages/instantsearch-core/src/connectors/connectSortBy.ts
@@ -143,12 +143,8 @@ export const connectSortBy: SortByConnector = function connectSortBy(
         );
       },
 
-      dispose({ state }) {
+      dispose() {
         unmountFn();
-
-        return connectorState.initialIndex
-          ? state.setIndex(connectorState.initialIndex)
-          : state;
       },
 
       getRenderState(renderState, renderOptions) {
diff --git a/packages/instantsearch-core/src/connectors/connectToggleRefinement.ts b/packages/instantsearch-core/src/connectors/connectToggleRefinement.ts
index ae67f32ce8..1c5491295e 100644
--- a/packages/instantsearch-core/src/connectors/connectToggleRefinement.ts
+++ b/packages/instantsearch-core/src/connectors/connectToggleRefinement.ts
@@ -304,10 +304,8 @@ export const connectToggleRefinement: ToggleRefinementConnector =
           );
         },
 
-        dispose({ state }) {
+        dispose() {
           unmountFn();
-
-          return state.removeDisjunctiveFacet(attribute);
         },
 
         getRenderState(renderState, renderOptions) {
diff --git a/packages/instantsearch-core/src/connectors/connectTrendingItems.ts b/packages/instantsearch-core/src/connectors/connectTrendingItems.ts
index f580e7547e..a8aea5bf87 100644
--- a/packages/instantsearch-core/src/connectors/connectTrendingItems.ts
+++ b/packages/instantsearch-core/src/connectors/connectTrendingItems.ts
@@ -232,9 +232,8 @@ export const connectTrendingItems = function connectTrendingItems<
         };
       },
 
-      dispose({ recommendState }) {
+      dispose() {
         unmountFn();
-        return recommendState.removeParams(this.$$id!);
       },
 
       getWidgetParameters(state) {
diff --git a/packages/instantsearch-core/src/connectors/connectVoiceSearch.ts b/packages/instantsearch-core/src/connectors/connectVoiceSearch.ts
index f22fb5d165..e66321e40b 100644
--- a/packages/instantsearch-core/src/connectors/connectVoiceSearch.ts
+++ b/packages/instantsearch-core/src/connectors/connectVoiceSearch.ts
@@ -108,6 +108,8 @@ export const connectVoiceSearch: VoiceSearchConnector =
 
                 if (typeof additionalQueryParameters === 'function') {
                   helper.setState(
+                    // These parameters are only set with a refine, so they are not persisted.
+                    // If a searchbox query happens, the parameters are reset.
                     helper.state.setQueryParameters({
                       ignorePlurals: true,
                       removeStopWords: true,
@@ -166,34 +168,10 @@ export const connectVoiceSearch: VoiceSearchConnector =
           };
         },
 
-        dispose({ state }) {
-          (this as any)._voiceSearchHelper.dispose();
+        dispose() {
+          (this as any)._voiceSearchHelper?.dispose();
 
           unmountFn();
-
-          let newState = state;
-          if (typeof additionalQueryParameters === 'function') {
-            const additional = additionalQueryParameters({ query: '' });
-            const toReset = additional
-              ? (
-                  Object.keys(additional) as Array<keyof PlainSearchParameters>
-                ).reduce<PlainSearchParameters>((acc, current) => {
-                  // @ts-ignore search parameters is typed as readonly in v4
-                  acc[current] = undefined;
-                  return acc;
-                }, {})
-              : {};
-            newState = state.setQueryParameters({
-              // @ts-ignore (queryLanguages is not added to algoliasearch v3)
-              queryLanguages: undefined,
-              ignorePlurals: undefined,
-              removeStopWords: undefined,
-              optionalWords: undefined,
-              ...toReset,
-            });
-          }
-
-          return newState.setQueryParameter('query', undefined);
         },
 
         getWidgetUiState(uiState, { searchParameters }) {
diff --git a/packages/instantsearch-core/src/lib/public/__tests__/getWidgetAttribute.test.ts b/packages/instantsearch-core/src/lib/public/__tests__/getWidgetAttribute.test.ts
index 37bd73b0e8..898879be06 100644
--- a/packages/instantsearch-core/src/lib/public/__tests__/getWidgetAttribute.test.ts
+++ b/packages/instantsearch-core/src/lib/public/__tests__/getWidgetAttribute.test.ts
@@ -2,6 +2,8 @@
  * @jest-environment jsdom
  */
 
+import { createInitOptions } from 'instantsearch-core/test/createWidget';
+
 import { getWidgetAttribute } from '..';
 import {
   connectHits,
@@ -9,7 +11,6 @@ import {
   connectHierarchicalMenu,
   connectToggleRefinement,
 } from '../../..';
-import { createInitOptions } from '../../../../test/createWidget';
 
 const hierarchicalMenu = connectHierarchicalMenu(() => {});
 const hits = connectHits(() => {});
diff --git a/packages/instantsearch-core/src/lib/utils/__tests__/createSendEventForFacet.test.ts b/packages/instantsearch-core/src/lib/utils/__tests__/createSendEventForFacet.test.ts
index e3c0785c97..e461d57966 100644
--- a/packages/instantsearch-core/src/lib/utils/__tests__/createSendEventForFacet.test.ts
+++ b/packages/instantsearch-core/src/lib/utils/__tests__/createSendEventForFacet.test.ts
@@ -1,7 +1,7 @@
 import { castToJestMock } from '@instantsearch/testutils/castToJestMock';
 import algoliasearchHelper from 'algoliasearch-helper';
+import { createInstantSearch } from 'instantsearch-core/test/createInstantSearch';
 
-import { createInstantSearch } from '../../../../test/createInstantSearch';
 import { isFacetRefined } from '../../public/isFacetRefined';
 import { createSendEventForFacet } from '../createSendEventForFacet';
 
diff --git a/packages/instantsearch-core/src/lib/utils/__tests__/createSendEventForHits.test.ts b/packages/instantsearch-core/src/lib/utils/__tests__/createSendEventForHits.test.ts
index d0fa7c0e8e..498f5ea2b6 100644
--- a/packages/instantsearch-core/src/lib/utils/__tests__/createSendEventForHits.test.ts
+++ b/packages/instantsearch-core/src/lib/utils/__tests__/createSendEventForHits.test.ts
@@ -2,7 +2,8 @@
  * @jest-environment jsdom
  */
 
-import { createInstantSearch } from '../../../../test/createInstantSearch';
+import { createInstantSearch } from 'instantsearch-core/test/createInstantSearch';
+
 import { createSendEventForHits } from '../createSendEventForHits';
 
 import type { EscapedHits } from '../../../types';
diff --git a/packages/instantsearch-core/src/lib/utils/__tests__/resolveSearchParameters.test.ts b/packages/instantsearch-core/src/lib/utils/__tests__/resolveSearchParameters.test.ts
index 3b1520fe69..2270867265 100644
--- a/packages/instantsearch-core/src/lib/utils/__tests__/resolveSearchParameters.test.ts
+++ b/packages/instantsearch-core/src/lib/utils/__tests__/resolveSearchParameters.test.ts
@@ -1,5 +1,6 @@
+import { createIndexInitOptions } from 'instantsearch-core/test/createWidget';
+
 import { resolveSearchParameters } from '..';
-import { createIndexInitOptions } from '../../../../test/createWidget';
 import { index } from '../../../widgets';
 
 describe('mergeSearchParameters', () => {
diff --git a/packages/instantsearch-core/src/lib/utils/checkIndexUiState.ts b/packages/instantsearch-core/src/lib/utils/checkIndexUiState.ts
index 385b819fd2..0a52d61b73 100644
--- a/packages/instantsearch-core/src/lib/utils/checkIndexUiState.ts
+++ b/packages/instantsearch-core/src/lib/utils/checkIndexUiState.ts
@@ -87,10 +87,6 @@ const stateToWidgetsMap: StateToWidgets = {
     connectors: ['connectHitsPerPage'],
     widgets: ['ais.hitsPerPage'],
   },
-  configure: {
-    connectors: ['connectConfigure'],
-    widgets: ['ais.configure'],
-  },
 };
 
 type CheckIndexUiStateParams = {
diff --git a/packages/instantsearch-core/src/middlewares/__tests__/createInsightsMiddleware.ts b/packages/instantsearch-core/src/middlewares/__tests__/createInsightsMiddleware.ts
index afa82f0345..fd15e44f51 100644
--- a/packages/instantsearch-core/src/middlewares/__tests__/createInsightsMiddleware.ts
+++ b/packages/instantsearch-core/src/middlewares/__tests__/createInsightsMiddleware.ts
@@ -12,6 +12,7 @@ import {
 import { castToJestMock } from '@instantsearch/testutils';
 import { wait } from '@instantsearch/testutils/wait';
 import { fireEvent } from '@testing-library/dom';
+import { createInstantSearch } from 'instantsearch-core/test/createInstantSearch';
 
 import {
   createInsightsMiddleware,
@@ -23,7 +24,6 @@ import {
   instantsearch,
   historyRouter,
 } from '../..';
-import { createInstantSearch } from '../../../test/createInstantSearch';
 
 import type { SearchClient, InsightsProps } from '../../types';
 import type { PlainSearchParameters } from 'algoliasearch-helper';
diff --git a/packages/instantsearch-core/src/routing/__tests__/simpleStateMapping.test.ts b/packages/instantsearch-core/src/routing/__tests__/simpleStateMapping.test.ts
index 8b0486ff1d..56d09d082a 100644
--- a/packages/instantsearch-core/src/routing/__tests__/simpleStateMapping.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/simpleStateMapping.test.ts
@@ -25,30 +25,6 @@ describe('simpleStateMapping', () => {
       });
     });
 
-    it('removes configure', () => {
-      const stateMapping = simpleStateMapping();
-      const actual = stateMapping.stateToRoute({
-        indexName: {
-          query: 'zamboni',
-          refinementList: {
-            color: ['red'],
-          },
-          configure: {
-            advancedSyntax: false,
-          },
-        },
-      });
-
-      expect(actual).toEqual({
-        indexName: {
-          query: 'zamboni',
-          refinementList: {
-            color: ['red'],
-          },
-        },
-      });
-    });
-
     it('passes non-UiState through', () => {
       const stateMapping = simpleStateMapping();
       const actual = stateMapping.stateToRoute({
@@ -96,30 +72,6 @@ describe('simpleStateMapping', () => {
       });
     });
 
-    it('removes configure', () => {
-      const stateMapping = simpleStateMapping();
-      const actual = stateMapping.routeToState({
-        indexName: {
-          query: 'zamboni',
-          refinementList: {
-            color: ['red'],
-          },
-          configure: {
-            advancedSyntax: false,
-          },
-        },
-      });
-
-      expect(actual).toEqual({
-        indexName: {
-          query: 'zamboni',
-          refinementList: {
-            color: ['red'],
-          },
-        },
-      });
-    });
-
     it('passes non-UiState through', () => {
       const stateMapping = simpleStateMapping<{
         [indexId in string]: UiState[indexId] & { spy: string[] };
diff --git a/packages/instantsearch-core/src/routing/__tests__/singleIndexStateMapping.test.ts b/packages/instantsearch-core/src/routing/__tests__/singleIndexStateMapping.test.ts
index d88bc16f31..24c51bfed8 100644
--- a/packages/instantsearch-core/src/routing/__tests__/singleIndexStateMapping.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/singleIndexStateMapping.test.ts
@@ -23,28 +23,6 @@ describe('singleIndexStateMapping', () => {
       });
     });
 
-    it('removes configure', () => {
-      const stateMapping = singleIndexStateMapping('indexName');
-      const actual = stateMapping.stateToRoute({
-        indexName: {
-          query: 'zamboni',
-          refinementList: {
-            color: ['red'],
-          },
-          configure: {
-            advancedSyntax: false,
-          },
-        },
-      });
-
-      expect(actual).toEqual({
-        query: 'zamboni',
-        refinementList: {
-          color: ['red'],
-        },
-      });
-    });
-
     it('passes non-UiState through', () => {
       const stateMapping = singleIndexStateMapping('indexName');
       const actual = stateMapping.stateToRoute({
@@ -135,28 +113,6 @@ describe('singleIndexStateMapping', () => {
       });
     });
 
-    it('removes configure', () => {
-      const stateMapping = singleIndexStateMapping('indexName');
-      const actual = stateMapping.routeToState({
-        query: 'zamboni',
-        refinementList: {
-          color: ['red'],
-        },
-        configure: {
-          advancedSyntax: false,
-        },
-      });
-
-      expect(actual).toEqual({
-        indexName: {
-          query: 'zamboni',
-          refinementList: {
-            color: ['red'],
-          },
-        },
-      });
-    });
-
     it('passes non-UiState through', () => {
       const stateMapping = singleIndexStateMapping<
         UiState & { [indexName: string]: { spy: string[] } }
diff --git a/packages/instantsearch-core/src/routing/simpleStateMapping.ts b/packages/instantsearch-core/src/routing/simpleStateMapping.ts
index 97f57c9162..d39f94a521 100644
--- a/packages/instantsearch-core/src/routing/simpleStateMapping.ts
+++ b/packages/instantsearch-core/src/routing/simpleStateMapping.ts
@@ -1,15 +1,5 @@
-import type { UiState, IndexUiState, StateMapping } from '../types';
+import type { UiState, StateMapping } from '../types';
 
-function getIndexStateWithoutConfigure<TIndexUiState extends IndexUiState>(
-  uiState: TIndexUiState
-): Omit<TIndexUiState, 'configure'> {
-  const { configure, ...trackedUiState } = uiState;
-  return trackedUiState;
-}
-
-// technically a URL could contain any key, since users provide it,
-// which is why the input to this function is UiState, not something
-// which excludes "configure" as this function does.
 export function simpleStateMapping<
   TUiState extends UiState = UiState
 >(): StateMapping<TUiState, TUiState> {
@@ -17,23 +7,11 @@ export function simpleStateMapping<
     $$type: 'ais.simple',
 
     stateToRoute(uiState) {
-      return Object.keys(uiState).reduce(
-        (state, indexId) => ({
-          ...state,
-          [indexId]: getIndexStateWithoutConfigure(uiState[indexId]),
-        }),
-        {} as TUiState
-      );
+      return uiState;
     },
 
     routeToState(routeState = {} as TUiState) {
-      return Object.keys(routeState).reduce(
-        (state, indexId) => ({
-          ...state,
-          [indexId]: getIndexStateWithoutConfigure(routeState[indexId]),
-        }),
-        {} as TUiState
-      );
+      return routeState;
     },
   };
 }
diff --git a/packages/instantsearch-core/src/routing/singleIndexStateMapping.ts b/packages/instantsearch-core/src/routing/singleIndexStateMapping.ts
index 4495ae436f..0315ab4cad 100644
--- a/packages/instantsearch-core/src/routing/singleIndexStateMapping.ts
+++ b/packages/instantsearch-core/src/routing/singleIndexStateMapping.ts
@@ -1,11 +1,4 @@
-import type { StateMapping, IndexUiState, UiState } from '../types';
-
-function getIndexStateWithoutConfigure<TIndexUiState extends IndexUiState>(
-  uiState: TIndexUiState
-): TIndexUiState {
-  const { configure, ...trackedUiState } = uiState;
-  return trackedUiState as TIndexUiState;
-}
+import type { StateMapping, UiState } from '../types';
 
 export function singleIndexStateMapping<TUiState extends UiState = UiState>(
   indexName: keyof TUiState
@@ -13,11 +6,11 @@ export function singleIndexStateMapping<TUiState extends UiState = UiState>(
   return {
     $$type: 'ais.singleIndex',
     stateToRoute(uiState) {
-      return getIndexStateWithoutConfigure(uiState[indexName] || {});
+      return uiState[indexName] || {};
     },
     routeToState(routeState = {} as TUiState[typeof indexName]) {
       return {
-        [indexName]: getIndexStateWithoutConfigure(routeState),
+        [indexName]: routeState,
       } as unknown as TUiState;
     },
   };
diff --git a/packages/instantsearch-core/src/types/ui-state.ts b/packages/instantsearch-core/src/types/ui-state.ts
index b305f47cfc..6883d1a7b8 100644
--- a/packages/instantsearch-core/src/types/ui-state.ts
+++ b/packages/instantsearch-core/src/types/ui-state.ts
@@ -1,6 +1,5 @@
 import type {
   AutocompleteWidgetDescription,
-  ConfigureWidgetDescription,
   GeoSearchWidgetDescription,
   HierarchicalMenuWidgetDescription,
   HitsPerPageWidgetDescription,
@@ -19,7 +18,6 @@ import type {
 } from '../connectors';
 
 type ConnectorUiStates = AutocompleteWidgetDescription['indexUiState'] &
-  ConfigureWidgetDescription['indexUiState'] &
   GeoSearchWidgetDescription['indexUiState'] &
   HierarchicalMenuWidgetDescription['indexUiState'] &
   HitsPerPageWidgetDescription['indexUiState'] &
diff --git a/packages/instantsearch-core/src/types/widget.ts b/packages/instantsearch-core/src/types/widget.ts
index 131de32bae..c9e3da462c 100644
--- a/packages/instantsearch-core/src/types/widget.ts
+++ b/packages/instantsearch-core/src/types/widget.ts
@@ -48,9 +48,6 @@ export type RenderOptions = SharedRenderOptions & {
 };
 
 export type DisposeOptions = {
-  helper: Helper;
-  state: SearchParameters;
-  recommendState: RecommendParameters;
   parent: IndexWidget;
 };
 
diff --git a/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts b/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts
index 2f5d90091d..c600238853 100644
--- a/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts
+++ b/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts
@@ -14,6 +14,12 @@ import algoliasearchHelper, {
   RecommendParameters,
   RecommendResults,
 } from 'algoliasearch-helper';
+import { createInstantSearch } from 'instantsearch-core/test/createInstantSearch';
+import {
+  createWidget,
+  createIndexInitOptions,
+  createDisposeOptions,
+} from 'instantsearch-core/test/createWidget';
 
 import {
   instantsearch,
@@ -23,12 +29,6 @@ import {
   connectRefinementList,
   connectSearchBox,
 } from '../..';
-import { createInstantSearch } from '../../../test/createInstantSearch';
-import {
-  createWidget,
-  createIndexInitOptions,
-  createDisposeOptions,
-} from '../../../test/createWidget';
 
 import type { Widget } from '../../types';
 import type { PlainSearchParameters } from 'algoliasearch-helper';
@@ -36,9 +36,7 @@ import type { PlainSearchParameters } from 'algoliasearch-helper';
 describe('index', () => {
   const createSearchBox = (args: Partial<Widget> = {}): Widget =>
     createWidget({
-      dispose: jest.fn(({ state }) => {
-        return state.setQueryParameter('query', undefined);
-      }),
+      dispose: jest.fn(() => {}),
       getWidgetUiState: jest.fn((uiState, { searchParameters }) => {
         if (!searchParameters.query) {
           return uiState;
@@ -57,9 +55,7 @@ describe('index', () => {
 
   const createPagination = (args: Partial<Widget> = {}): Widget =>
     createWidget({
-      dispose: jest.fn(({ state }) => {
-        return state.setQueryParameter('page', undefined);
-      }),
+      dispose: jest.fn(() => {}),
       getWidgetUiState: jest.fn((uiState, { searchParameters }) => {
         if (!searchParameters.page) {
           return uiState;
@@ -81,29 +77,19 @@ describe('index', () => {
     args: Partial<Widget> = {}
   ): Widget =>
     createWidget({
-      dispose: jest.fn(({ state }) => {
-        return state.setQueryParameters(
-          Object.keys(params).reduce(
-            (acc, key) => ({
-              ...acc,
-              [key]: undefined,
-            }),
-            {}
-          )
-        );
-      }),
+      dispose: jest.fn(() => {}),
       getWidgetUiState(uiState) {
         return {
           ...uiState,
           configure: {
-            ...uiState.configure,
+            ...(uiState as any).configure,
             ...params,
           },
         };
       },
       getWidgetSearchParameters(searchParameters, { uiState }) {
         return searchParameters.setQueryParameters({
-          ...uiState.configure,
+          ...(uiState as any).configure,
           ...params,
         });
       },
@@ -121,9 +107,7 @@ describe('index', () => {
           objectID: 'abc',
         });
       },
-      dispose({ recommendState }) {
-        return recommendState.removeParams(this.$$id!);
-      },
+      dispose() {},
       ...args,
     } as Widget) as unknown as Widget & { $$id: number };
 
@@ -712,16 +696,11 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
           expect(widget.dispose).toHaveBeenCalledTimes(0);
         });
 
-        const stateBefore = instance.getHelper()!.state;
-
         instance.removeWidgets(widgets);
 
         widgets.forEach((widget) => {
           expect(widget.dispose).toHaveBeenCalledTimes(1);
           expect(widget.dispose).toHaveBeenCalledWith({
-            helper: instance.getHelper(),
-            state: stateBefore,
-            recommendState: instance.getHelper()!.recommendState,
             parent: instance,
           });
         });
@@ -1968,7 +1947,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
                   brand: ['Samsung'],
                 },
               },
-            },
+            } as any,
           })
         );
 
@@ -2972,22 +2951,11 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
         expect(widget.dispose).toHaveBeenCalledTimes(0);
       });
 
-      // Save the Helper to be able to simulate the search
-      const helper = instance.getHelper();
-
-      instance.dispose(
-        createDisposeOptions({
-          helper: instantSearchInstance.helper!,
-          state: instantSearchInstance.helper!.state,
-        })
-      );
+      instance.dispose(createDisposeOptions());
 
       widgets.forEach((widget) => {
         expect(widget.dispose).toHaveBeenCalledTimes(1);
         expect(widget.dispose).toHaveBeenCalledWith({
-          state: helper!.state,
-          recommendState: helper!.recommendState,
-          helper,
           parent: instance,
         });
       });
diff --git a/packages/instantsearch-core/src/widgets/index-widget.ts b/packages/instantsearch-core/src/widgets/index-widget.ts
index 8b4fbcfc3f..719a12c620 100644
--- a/packages/instantsearch-core/src/widgets/index-widget.ts
+++ b/packages/instantsearch-core/src/widgets/index-widget.ts
@@ -438,45 +438,34 @@ export const index = (widgetParams: IndexWidgetParams): IndexWidget => {
       });
 
       if (localInstantSearchInstance && Boolean(widgets.length)) {
-        const { cleanedRecommendState } = widgets.reduce(
-          (states, widget) => {
-            // @MAJOR remove the "cleanup" part of the dispose method
-            // the `dispose` method exists at this point we already assert it
-            const next = widget.dispose!({
-              helper: helper!,
-              state: states.cleanedSearchState,
-              recommendState: states.cleanedRecommendState,
-              parent: this,
-            });
-
-            if (next instanceof algoliasearchHelper.RecommendParameters) {
-              states.cleanedRecommendState = next;
-            } else if (next) {
-              states.cleanedSearchState = next;
-            }
+        widgets.forEach((widget) =>
+          widget.dispose!({
+            parent: this,
+          })
+        );
 
-            return states;
-          },
+        helper!.setState(
+          getLocalWidgetsSearchParameters(localWidgets, {
+            uiState: localUiState,
+            initialSearchParameters: new algoliasearchHelper.SearchParameters({
+              index: this.getIndexName(),
+            }),
+          })
+        );
+        helper!.recommendState = getLocalWidgetsRecommendParameters(
+          localWidgets,
           {
-            cleanedSearchState: helper!.state,
-            cleanedRecommendState: helper!.recommendState,
+            uiState: localUiState,
+            initialRecommendParameters:
+              new algoliasearchHelper.RecommendParameters(),
           }
         );
 
-        const newState = getLocalWidgetsSearchParameters(localWidgets, {
-          uiState: localUiState,
-          initialSearchParameters: new algoliasearchHelper.SearchParameters({
-            index: this.getIndexName(),
-          }),
-        });
         localUiState = getLocalWidgetsUiState(localWidgets, {
-          searchParameters: newState,
+          searchParameters: helper!.state,
           helper: helper!,
         });
 
-        helper!.setState(newState);
-        helper!.recommendState = cleanedRecommendState;
-
         if (localWidgets.length) {
           localInstantSearchInstance.scheduleSearch();
         }
@@ -791,9 +780,6 @@ export const index = (widgetParams: IndexWidgetParams): IndexWidget => {
           // because we want to keep the widgets on the instance, to allow idempotent
           // operations on `add` & `remove`.
           widget.dispose({
-            helper,
-            state: helper.state,
-            recommendState: helper.recommendState,
             parent: this,
           });
         }
diff --git a/packages/instantsearch-core/test/createWidget.ts b/packages/instantsearch-core/test/createWidget.ts
index da46a57401..7f9b57c267 100644
--- a/packages/instantsearch-core/test/createWidget.ts
+++ b/packages/instantsearch-core/test/createWidget.ts
@@ -1,6 +1,8 @@
 import { createMultiSearchResponse } from '@instantsearch/mocks';
 import algoliasearchHelper from 'algoliasearch-helper';
 
+import { index } from '../src';
+
 import { createInstantSearch } from './createInstantSearch';
 
 import type {
@@ -81,14 +83,8 @@ export const createRenderOptions = (
 export const createDisposeOptions = (
   args: Partial<DisposeOptions> = {}
 ): DisposeOptions => {
-  const instantSearchInstance = createInstantSearch();
-  const helper = args.helper || instantSearchInstance.helper!;
-
   return {
-    helper,
-    state: helper.state,
-    recommendState: helper.recommendState,
-    parent: instantSearchInstance.mainIndex,
+    parent: index({ indexName: 'indexName' }),
     ...args,
   };
 };
diff --git a/packages/instantsearch.js/src/components/Panel/__tests__/Panel-test.tsx b/packages/instantsearch.js/src/components/Panel/__tests__/Panel-test.tsx
index 4a20dac126..e5641caf82 100644
--- a/packages/instantsearch.js/src/components/Panel/__tests__/Panel-test.tsx
+++ b/packages/instantsearch.js/src/components/Panel/__tests__/Panel-test.tsx
@@ -4,9 +4,9 @@
 /** @jsx h */
 
 import { render, fireEvent } from '@testing-library/preact';
+import { createRenderOptions } from 'instantsearch-core/test/createWidget';
 import { h } from 'preact';
 
-import { createRenderOptions } from '../../../../test/createWidget';
 import Panel from '../Panel';
 
 import type { PanelProps } from '../Panel';
diff --git a/packages/instantsearch.js/src/widgets/dynamic-widgets/__tests__/dynamic-widgets-test.ts b/packages/instantsearch.js/src/widgets/dynamic-widgets/__tests__/dynamic-widgets-test.ts
index 80e4220144..3600a5f4e7 100644
--- a/packages/instantsearch.js/src/widgets/dynamic-widgets/__tests__/dynamic-widgets-test.ts
+++ b/packages/instantsearch.js/src/widgets/dynamic-widgets/__tests__/dynamic-widgets-test.ts
@@ -9,14 +9,14 @@ import {
 import { wait } from '@instantsearch/testutils/wait';
 import { widgetSnapshotSerializer } from '@instantsearch/testutils/widgetSnapshotSerializer';
 import { SearchParameters, SearchResults } from 'algoliasearch-helper';
-
-import { index, searchBox, menu, dynamicWidgets } from '../..';
-import instantsearch from '../../..';
-import { createInstantSearch } from '../../../../test/createInstantSearch';
+import { createInstantSearch } from 'instantsearch-core/test/createInstantSearch';
 import {
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+
+import { index, searchBox, menu, dynamicWidgets } from '../..';
+import instantsearch from '../../..';
 import refinementList from '../../refinement-list/refinement-list';
 
 import type { SearchResponse } from 'instantsearch-core';
diff --git a/packages/instantsearch.js/src/widgets/geo-search/__tests__/geo-search-test.ts b/packages/instantsearch.js/src/widgets/geo-search/__tests__/geo-search-test.ts
index 9f4224eaa0..7554abad65 100644
--- a/packages/instantsearch.js/src/widgets/geo-search/__tests__/geo-search-test.ts
+++ b/packages/instantsearch.js/src/widgets/geo-search/__tests__/geo-search-test.ts
@@ -9,14 +9,13 @@ import {
 } from '@instantsearch/mocks';
 import { castToJestMock } from '@instantsearch/testutils/castToJestMock';
 import algoliasearchHelper, { SearchResults } from 'algoliasearch-helper';
-import { render as preactRender } from 'preact';
-
-import { createInstantSearch } from '../../../../test/createInstantSearch';
+import { createInstantSearch } from 'instantsearch-core/test/createInstantSearch';
 import {
-  createDisposeOptions,
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+import { render as preactRender } from 'preact';
+
 import createHTMLMarker from '../createHTMLMarker';
 import geoSearch from '../geo-search';
 import originalRenderer from '../GeoSearchRenderer';
@@ -366,50 +365,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
     });
   });
 
-  it('expect to unmount', () => {
-    const container = createContainer();
-    const instantSearchInstance = createFakeInstantSearch();
-    const helper = createFakeHelper();
-    const googleReference = createFakeGoogleReference();
-
-    const widget = geoSearch({
-      googleReference,
-      container,
-    });
-
-    widget.init!(
-      createInitOptions({
-        helper,
-        instantSearchInstance,
-        state: helper.state,
-      })
-    );
-
-    widget.render!(
-      createRenderOptions({
-        helper,
-        instantSearchInstance,
-        results: new SearchResults(helper.state, [
-          createSingleSearchResponse({
-            hits: [],
-          }),
-        ]),
-      })
-    );
-
-    expect(render).toHaveBeenCalledTimes(1);
-
-    widget.dispose!(
-      createDisposeOptions({
-        helper,
-        state: helper.state,
-      })
-    );
-
-    expect(render).toHaveBeenCalledTimes(2);
-    expect(render).toHaveBeenCalledWith(null, container);
-  });
-
   describe('setup events', () => {
     it('expect to listen for "idle" once and trigger the registration of the rest of the listeners', () => {
       const container = createContainer();
diff --git a/packages/instantsearch.js/src/widgets/panel/__tests__/panel-test.ts b/packages/instantsearch.js/src/widgets/panel/__tests__/panel-test.ts
index e8a88b1ee6..633ffbb84b 100644
--- a/packages/instantsearch.js/src/widgets/panel/__tests__/panel-test.ts
+++ b/packages/instantsearch.js/src/widgets/panel/__tests__/panel-test.ts
@@ -3,14 +3,13 @@
  */
 
 import { castToJestMock } from '@instantsearch/testutils/castToJestMock';
-import algoliasearchHelper from 'algoliasearch-helper';
-import { render as preactRender } from 'preact';
-
 import {
   createInitOptions,
   createRenderOptions,
   createDisposeOptions,
-} from '../../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+import { render as preactRender } from 'preact';
+
 import panel from '../panel';
 
 import type { PanelProps } from '../../../components/Panel/Panel';
@@ -433,13 +432,10 @@ describe('Lifecycle', () => {
 
   describe('dispose', () => {
     test("returns the state from the widget's dispose function", () => {
-      const nextSearchParameters = new algoliasearchHelper.SearchParameters({
-        facets: ['brands'],
-      });
       const widget = {
         $$type: 'mock.widget',
         init: jest.fn(),
-        dispose: jest.fn(() => nextSearchParameters),
+        dispose: jest.fn(),
       };
       const widgetFactory = () => widget;
 
@@ -447,9 +443,9 @@ describe('Lifecycle', () => {
         container: document.createElement('div'),
       });
 
-      const nextState = widgetWithPanel.dispose!(createDisposeOptions());
+      widgetWithPanel.dispose!(createDisposeOptions());
 
-      expect(nextState).toEqual(nextSearchParameters);
+      expect(widget.dispose).toHaveBeenCalled();
     });
   });
 });
diff --git a/packages/instantsearch.js/src/widgets/query-rule-custom-data/__tests__/query-rule-custom-data-test.ts b/packages/instantsearch.js/src/widgets/query-rule-custom-data/__tests__/query-rule-custom-data-test.ts
index 1caed4e218..71d8a19660 100644
--- a/packages/instantsearch.js/src/widgets/query-rule-custom-data/__tests__/query-rule-custom-data-test.ts
+++ b/packages/instantsearch.js/src/widgets/query-rule-custom-data/__tests__/query-rule-custom-data-test.ts
@@ -5,12 +5,9 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { castToJestMock } from '@instantsearch/testutils/castToJestMock';
 import algoliasearchHelper from 'algoliasearch-helper';
+import { createInitOptions } from 'instantsearch-core/test/createWidget';
 import { render as preactRender } from 'preact';
 
-import {
-  createDisposeOptions,
-  createInitOptions,
-} from '../../../../test/createWidget';
 import queryRuleCustomData from '../query-rule-custom-data';
 
 import type { QueryRuleCustomDataProps } from '../../../components/QueryRuleCustomData/QueryRuleCustomData';
@@ -190,35 +187,4 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/query-rule-
       });
     });
   });
-
-  describe('Lifecycle', () => {
-    describe('unmountFn', () => {
-      test('unmounts the component', () => {
-        const container = document.createElement('div');
-        const helper = createFakeHelper();
-        const widget = queryRuleCustomData({
-          container,
-        });
-
-        widget.init!(
-          createInitOptions({
-            helper,
-            state: helper.state,
-          })
-        );
-
-        expect(render).toHaveBeenCalledTimes(1);
-
-        widget.dispose!(
-          createDisposeOptions({
-            helper,
-            state: helper.state,
-          })
-        );
-
-        expect(render).toHaveBeenCalledTimes(2);
-        expect(render).toHaveBeenCalledWith(null, container);
-      });
-    });
-  });
 });
diff --git a/packages/instantsearch.js/src/widgets/range-slider/__tests__/range-slider-test.ts b/packages/instantsearch.js/src/widgets/range-slider/__tests__/range-slider-test.ts
index dfe6965e1a..3a9b522ef2 100644
--- a/packages/instantsearch.js/src/widgets/range-slider/__tests__/range-slider-test.ts
+++ b/packages/instantsearch.js/src/widgets/range-slider/__tests__/range-slider-test.ts
@@ -11,13 +11,13 @@ import algoliasearchHelper, {
   SearchParameters,
   SearchResults,
 } from 'algoliasearch-helper';
-import { render as preactRender } from 'preact';
-
-import { createInstantSearch } from '../../../../test/createInstantSearch';
+import { createInstantSearch } from 'instantsearch-core/test/createInstantSearch';
 import {
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+import { render as preactRender } from 'preact';
+
 import rangeSlider from '../range-slider';
 
 import type { InstantSearch, Range } from '../../../types';
diff --git a/packages/instantsearch.js/src/widgets/relevant-sort/__tests__/relevant-sort-test.ts b/packages/instantsearch.js/src/widgets/relevant-sort/__tests__/relevant-sort-test.ts
index 51eb9cbb36..ff20760835 100644
--- a/packages/instantsearch.js/src/widgets/relevant-sort/__tests__/relevant-sort-test.ts
+++ b/packages/instantsearch.js/src/widgets/relevant-sort/__tests__/relevant-sort-test.ts
@@ -7,12 +7,12 @@ import {
   createSingleSearchResponse,
 } from '@instantsearch/mocks';
 import algoliasearchHelper, { SearchResults } from 'algoliasearch-helper';
-import { render } from 'preact';
-
 import {
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+import { render } from 'preact';
+
 import relevantSort from '../relevant-sort';
 
 import type { RelevantSortTemplates } from '../relevant-sort';
diff --git a/packages/instantsearch.js/src/widgets/voice-search/__tests__/voice-search-test.ts b/packages/instantsearch.js/src/widgets/voice-search/__tests__/voice-search-test.ts
index f3bdc5cf07..ad7e603e3d 100644
--- a/packages/instantsearch.js/src/widgets/voice-search/__tests__/voice-search-test.ts
+++ b/packages/instantsearch.js/src/widgets/voice-search/__tests__/voice-search-test.ts
@@ -11,12 +11,12 @@ import algoliasearchHelper, {
   SearchResults,
   SearchParameters,
 } from 'algoliasearch-helper';
-import { render as preactRender } from 'preact';
-
 import {
   createInitOptions,
   createRenderOptions,
-} from '../../../../test/createWidget';
+} from 'instantsearch-core/test/createWidget';
+import { render as preactRender } from 'preact';
+
 import voiceSearch from '../voice-search';
 
 import type { VoiceSearchProps } from '../../../components/VoiceSearch/VoiceSearch';
diff --git a/packages/instantsearch.js/stories/geo-search.stories.ts b/packages/instantsearch.js/stories/geo-search.stories.ts
index 4ac7622906..7524eb1a39 100644
--- a/packages/instantsearch.js/stories/geo-search.stories.ts
+++ b/packages/instantsearch.js/stories/geo-search.stories.ts
@@ -490,7 +490,7 @@ stories
           if (hitElement) {
             removeActiveMarkerClassNames();
 
-            const objectID = parseInt(hitElement.id.substr(4), 10);
+            const objectID = parseInt(hitElement.id.slice(4), 10);
             const selector = `.my-custom-marker[data-id="${objectID}"]`;
             const marker = document.querySelector(selector);
 
diff --git a/packages/instantsearch.js/test/createInstantSearch.ts b/packages/instantsearch.js/test/createInstantSearch.ts
deleted file mode 100644
index c4da38cdb3..0000000000
--- a/packages/instantsearch.js/test/createInstantSearch.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { createSearchClient } from '@instantsearch/mocks';
-import algoliasearchHelper from 'algoliasearch-helper';
-
-import { INSTANTSEARCH_FUTURE_DEFAULTS } from '../src/lib/InstantSearch';
-import { defer } from '../src/lib/utils';
-import { index } from '../src/widgets';
-
-import type { InstantSearch } from '../src/types';
-
-export const createInstantSearch = (
-  args: Partial<InstantSearch> = {}
-): InstantSearch => {
-  const { indexName = 'indexName', client = createSearchClient() } = args;
-  const mainHelper = algoliasearchHelper(client, indexName, {});
-  const mainIndex = index({ indexName });
-
-  return {
-    indexName,
-    mainIndex,
-    mainHelper,
-    client,
-    started: false,
-    status: 'idle',
-    error: undefined,
-    start() {
-      this.started = true;
-    },
-    dispose() {
-      this.started = false;
-    },
-    refresh: jest.fn(),
-    helper: mainHelper, // @TODO: use the Helper from the index once the RoutingManger uses the index
-    middleware: [],
-    renderState: {},
-    scheduleStalledRender: defer(jest.fn()),
-    scheduleSearch: defer(jest.fn()),
-    scheduleRender: defer(jest.fn()),
-    _stalledSearchDelay: 200,
-    _searchStalledTimer: null,
-    _initialUiState: {},
-    _initialResults: null,
-    _createURL: jest.fn(() => '#'),
-    _insights: undefined,
-    _hasRecommendWidget: false,
-    _hasSearchWidget: false,
-    onStateChange: null,
-    setUiState: jest.fn(),
-    getUiState: jest.fn(() => ({})),
-    // Since we defer `onInternalStateChange` with our `defer` util which
-    // creates a scoped deferred function, we're not able to spy that method.
-    // We'll therefore need to override it when calling `createInstantSearch`.
-    // See https://github.com/algolia/instantsearch/blob/f3213b2f118d75acac31a1f6cf4640241c438e9d/src/lib/utils/defer.ts#L13-L28
-    onInternalStateChange: jest.fn() as any,
-    createURL: jest.fn(() => '#'),
-    addWidgets: jest.fn(),
-    removeWidgets: jest.fn(),
-    use: jest.fn(),
-    unuse: jest.fn(),
-    // methods from EventEmitter
-    addListener: jest.fn(),
-    removeListener: jest.fn(),
-    on: jest.fn(),
-    once: jest.fn(),
-    removeAllListeners: jest.fn(),
-    setMaxListeners: jest.fn(),
-    listeners: jest.fn(),
-    emit: jest.fn(),
-    listenerCount: jest.fn(),
-    sendEventToInsights: jest.fn(),
-    future: {
-      ...INSTANTSEARCH_FUTURE_DEFAULTS,
-      ...(args.future || {}),
-    },
-    ...args,
-  };
-};
diff --git a/packages/instantsearch.js/test/createWidget.ts b/packages/instantsearch.js/test/createWidget.ts
deleted file mode 100644
index 44bc46cb44..0000000000
--- a/packages/instantsearch.js/test/createWidget.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import { createMultiSearchResponse } from '@instantsearch/mocks';
-import algoliasearchHelper from 'algoliasearch-helper';
-
-import { createInstantSearch } from './createInstantSearch';
-
-import type { SearchResponse } from 'algoliasearch-helper/types/algoliasearch';
-import type {
-  InitOptions,
-  RenderOptions,
-  DisposeOptions,
-  Widget,
-  IndexInitOptions,
-} from 'instantsearch-core';
-
-export const createInitOptions = (
-  args: Partial<InitOptions> = {}
-): InitOptions => {
-  const { instantSearchInstance = createInstantSearch(), ...rest } = args;
-  const helper = args.helper || instantSearchInstance.helper!;
-
-  return {
-    instantSearchInstance,
-    parent: instantSearchInstance.mainIndex,
-    uiState: instantSearchInstance._initialUiState,
-    helper,
-    state: helper.state,
-    renderState: instantSearchInstance.renderState,
-    scopedResults: [],
-    createURL: jest.fn(() => '#'),
-    status: instantSearchInstance.status,
-    error: instantSearchInstance.error,
-    ...rest,
-  };
-};
-
-export const createIndexInitOptions = (
-  args: Partial<IndexInitOptions> = {}
-): IndexInitOptions => {
-  const { instantSearchInstance = createInstantSearch(), ...rest } = args;
-
-  return {
-    instantSearchInstance,
-    parent: instantSearchInstance.mainIndex,
-    uiState: instantSearchInstance._initialUiState,
-    ...rest,
-  };
-};
-
-export const createRenderOptions = (
-  args: Partial<RenderOptions> = {}
-): RenderOptions => {
-  const { instantSearchInstance = createInstantSearch(), ...rest } = args;
-  const response = createMultiSearchResponse();
-  const helper = args.helper || instantSearchInstance.helper!;
-  const results = new algoliasearchHelper.SearchResults(
-    instantSearchInstance.helper!.state,
-    response.results as Array<SearchResponse<any>>
-  );
-
-  return {
-    instantSearchInstance,
-    parent: instantSearchInstance.mainIndex,
-    helper,
-    state: helper.state,
-    renderState: instantSearchInstance.renderState,
-    results,
-    scopedResults: [
-      {
-        indexId: helper.state.index,
-        helper,
-        results,
-      },
-    ],
-    status: instantSearchInstance.status,
-    error: instantSearchInstance.error,
-    createURL: jest.fn(() => '#'),
-    ...rest,
-  };
-};
-
-export const createDisposeOptions = (
-  args: Partial<DisposeOptions> = {}
-): DisposeOptions => {
-  const instantSearchInstance = createInstantSearch();
-  const helper = args.helper || instantSearchInstance.helper!;
-
-  return {
-    helper,
-    state: helper.state,
-    recommendState: helper.recommendState,
-    parent: instantSearchInstance.mainIndex,
-    ...args,
-  };
-};
-
-export const createWidget = (args: Partial<Widget> = {}): Widget =>
-  ({
-    $$type: 'mock.widget',
-    init: jest.fn(),
-    render: jest.fn(),
-    dispose: jest.fn(),
-    ...args,
-  } as unknown as Widget);
diff --git a/packages/react-instantsearch/src/widgets/__tests__/all-widgets.test.tsx b/packages/react-instantsearch/src/widgets/__tests__/all-widgets.test.tsx
index 8fbab91543..8d538afd42 100644
--- a/packages/react-instantsearch/src/widgets/__tests__/all-widgets.test.tsx
+++ b/packages/react-instantsearch/src/widgets/__tests__/all-widgets.test.tsx
@@ -29,7 +29,7 @@ describe('widgets', () => {
 
     test('starts with "ais."', () => {
       widgets.forEach(({ name, widget }) =>
-        expect([name, widget.$$type.substr(0, 4)]).toEqual([name, 'ais.'])
+        expect([name, widget.$$type.slice(0, 4)]).toEqual([name, 'ais.'])
       );
     });
   });
@@ -43,10 +43,7 @@ describe('widgets', () => {
 
     test('starts with "ais."', () => {
       widgets.forEach(({ name, widget }) =>
-        expect([name, widget.$$widgetType!.substr(0, 4)]).toEqual([
-          name,
-          'ais.',
-        ])
+        expect([name, widget.$$widgetType!.slice(0, 4)]).toEqual([name, 'ais.'])
       );
     });
   });
diff --git a/packages/vue-instantsearch/src/util/__tests__/createServerRootMixin.test.js b/packages/vue-instantsearch/src/util/__tests__/createServerRootMixin.test.js
index 938c961b65..2e95a9616a 100644
--- a/packages/vue-instantsearch/src/util/__tests__/createServerRootMixin.test.js
+++ b/packages/vue-instantsearch/src/util/__tests__/createServerRootMixin.test.js
@@ -244,28 +244,20 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/instantsear
 
       await renderToString(wrapper);
 
-      expect(mainIndex.getWidgetUiState({})).toMatchInlineSnapshot(`
-        {
-          "hello": {
-            "configure": {
-              "hitsPerPage": 100,
-            },
-          },
-        }
-      `);
+      expect(mainIndex.getWidgetUiState({})).toEqual({
+        hello: {},
+      });
 
       expect(searchClient.search).toHaveBeenCalledTimes(1);
-      expect(searchClient.search.mock.calls[0][0]).toMatchInlineSnapshot(`
-        [
-          {
-            "indexName": "hello",
-            "params": {
-              "hitsPerPage": 100,
-              "query": "",
-            },
+      expect(searchClient.search.mock.calls[0][0]).toEqual([
+        {
+          indexName: 'hello',
+          params: {
+            hitsPerPage: 100,
+            query: '',
           },
-        ]
-      `);
+        },
+      ]);
     });
 
     it('returns correct results state', () => {
@@ -870,17 +862,15 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/instantsear
         await renderToString(wrapper);
 
         expect(searchClient.search).toHaveBeenCalledTimes(1);
-        expect(searchClient.search.mock.calls[0][0]).toMatchInlineSnapshot(`
-          [
-            {
-              "indexName": "hello",
-              "params": {
-                "hitsPerPage": 100,
-                "query": "",
-              },
+        expect(searchClient.search.mock.calls[0][0]).toEqual([
+          {
+            indexName: 'hello',
+            params: {
+              hitsPerPage: 100,
+              query: '',
             },
-          ]
-        `);
+          },
+        ]);
       });
 
       it('works when component is at root (and therefore has no $vnode)', async () => {
@@ -933,28 +923,20 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/instantsear
 
         await renderToString(wrapper);
 
-        expect(mainIndex.getWidgetUiState({})).toMatchInlineSnapshot(`
-          {
-            "hello": {
-              "configure": {
-                "hitsPerPage": 100,
-              },
-            },
-          }
-        `);
+        expect(mainIndex.getWidgetUiState({})).toEqual({
+          hello: {},
+        });
 
         expect(searchClient.search).toHaveBeenCalledTimes(1);
-        expect(searchClient.search.mock.calls[0][0]).toMatchInlineSnapshot(`
-          [
-            {
-              "indexName": "hello",
-              "params": {
-                "hitsPerPage": 100,
-                "query": "",
-              },
+        expect(searchClient.search.mock.calls[0][0]).toEqual([
+          {
+            indexName: 'hello',
+            params: {
+              hitsPerPage: 100,
+              query: '',
             },
-          ]
-        `);
+          },
+        ]);
       });
     }
   });
@@ -1117,39 +1099,21 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/instantsear
 
       const renderArgs = widget.render.mock.calls[0][0];
 
-      expect(renderArgs).toMatchInlineSnapshot(
-        {
-          helper: expect.anything(),
-          results: expect.anything(),
-          scopedResults: expect.arrayContaining([
-            expect.objectContaining({
-              helper: expect.anything(),
-              indexId: expect.any(String),
-              results: expect.anything(),
-            }),
-          ]),
-          parent: expect.anything(),
-          state: expect.anything(),
-          instantSearchInstance: expect.anything(),
-        },
-        `
-        {
-          "createURL": [Function],
-          "helper": Anything,
-          "instantSearchInstance": Anything,
-          "parent": Anything,
-          "results": Anything,
-          "scopedResults": ArrayContaining [
-            ObjectContaining {
-              "helper": Anything,
-              "indexId": Any<String>,
-              "results": Anything,
-            },
-          ],
-          "state": Anything,
-        }
-      `
-      );
+      expect(renderArgs).toEqual({
+        createURL: expect.any(Function),
+        helper: expect.anything(),
+        results: expect.anything(),
+        scopedResults: expect.arrayContaining([
+          expect.objectContaining({
+            helper: expect.anything(),
+            indexId: expect.any(String),
+            results: expect.anything(),
+          }),
+        ]),
+        parent: expect.anything(),
+        state: expect.anything(),
+        instantSearchInstance: expect.anything(),
+      });
     });
 
     it('uses the results passed to hydrate for rendering', () => {

From 1ad44f1c5a37473be20f450bca2a8d7b3d03d162 Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Wed, 8 Jan 2025 15:43:02 +0100
Subject: [PATCH 35/37] chore: remove no longer needed comments (#6517)

* chore: remove no longer needed comments

- https://github.com/algolia/algoliasearch-helper-js/pull/800 made the todo in numeric menu no longer needed
- template is generic

[FX-3215]

* number
---
 packages/algoliasearch-helper/index.d.ts            |  2 +-
 .../src/connectors/connectCurrentRefinements.ts     |  2 +-
 .../src/connectors/connectNumericMenu.ts            | 13 +++++--------
 .../src/components/Template/Template.tsx            |  1 -
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/packages/algoliasearch-helper/index.d.ts b/packages/algoliasearch-helper/index.d.ts
index 8192a0eef1..7e9678ac20 100644
--- a/packages/algoliasearch-helper/index.d.ts
+++ b/packages/algoliasearch-helper/index.d.ts
@@ -596,7 +596,7 @@ declare namespace algoliasearchHelper {
     removeNumericRefinement(
       attribute: string,
       operator?: string,
-      value?: string
+      value?: number
     ): SearchParameters;
     removeTagRefinement(tag: string): SearchParameters;
     resetPage(): SearchParameters;
diff --git a/packages/instantsearch-core/src/connectors/connectCurrentRefinements.ts b/packages/instantsearch-core/src/connectors/connectCurrentRefinements.ts
index a0eee2f22c..1b7088dd39 100644
--- a/packages/instantsearch-core/src/connectors/connectCurrentRefinements.ts
+++ b/packages/instantsearch-core/src/connectors/connectCurrentRefinements.ts
@@ -349,7 +349,7 @@ function clearRefinementFromState(
       return state.removeNumericRefinement(
         refinement.attribute,
         refinement.operator,
-        String(refinement.value)
+        refinement.value as number
       );
     case 'tag':
       return state.removeTagRefinement(String(refinement.value));
diff --git a/packages/instantsearch-core/src/connectors/connectNumericMenu.ts b/packages/instantsearch-core/src/connectors/connectNumericMenu.ts
index f312a2549a..e0b91e896c 100644
--- a/packages/instantsearch-core/src/connectors/connectNumericMenu.ts
+++ b/packages/instantsearch-core/src/connectors/connectNumericMenu.ts
@@ -34,6 +34,8 @@ export type NumericMenuConnectorParamsItem = {
   end?: number;
 };
 
+type NumericMenuValue = Omit<NumericMenuConnectorParamsItem, 'label'>;
+
 export type NumericMenuRenderStateItem = {
   /**
    *  Name of the option.
@@ -114,7 +116,6 @@ export type NumericMenuWidgetDescription = {
   };
   indexUiState: {
     numericMenu: {
-      // @TODO: this could possibly become `${number}:${number}` later
       [attribute: string]: string;
     };
   };
@@ -169,7 +170,7 @@ export const connectNumericMenu: NumericMenuConnector =
         items.map(({ start, end, label }) => ({
           label,
           value: encodeURI(JSON.stringify({ start, end })),
-          isRefined: isRefined(state, attribute, { start, end, label }),
+          isRefined: isRefined(state, attribute, { start, end }),
         }));
 
       const connectorState: ConnectorState = {};
@@ -346,9 +347,8 @@ export const connectNumericMenu: NumericMenuConnector =
 function isRefined(
   state: SearchParameters,
   attribute: string,
-  option: NumericMenuConnectorParamsItem
+  option: NumericMenuValue
 ) {
-  // @TODO: same as another spot, why is this mixing arrays & elements?
   const currentRefinements = state.getNumericRefinements(attribute);
 
   if (option.start !== undefined && option.end !== undefined) {
@@ -385,10 +385,7 @@ function getRefinedState(
   facetValue: string
 ) {
   let resolvedState = state;
-
-  const refinedOption = JSON.parse(decodeURI(facetValue));
-
-  // @TODO: why is array / element mixed here & hasRefinements; seems wrong?
+  const refinedOption: NumericMenuValue = JSON.parse(decodeURI(facetValue));
   const currentRefinements = resolvedState.getNumericRefinements(attribute);
 
   if (refinedOption.start === undefined && refinedOption.end === undefined) {
diff --git a/packages/instantsearch.js/src/components/Template/Template.tsx b/packages/instantsearch.js/src/components/Template/Template.tsx
index 155c0e2932..9f57084c31 100644
--- a/packages/instantsearch.js/src/components/Template/Template.tsx
+++ b/packages/instantsearch.js/src/components/Template/Template.tsx
@@ -25,7 +25,6 @@ export type TemplateProps = {
 } & PreparedTemplateProps<Templates> &
   Readonly<typeof defaultProps>;
 
-// @TODO: Template should be a generic and receive TData to pass to Templates (to avoid TTemplateData to be set as `any`)
 class Template extends Component<TemplateProps> {
   public static readonly defaultProps = defaultProps;
 

From 0531b36ae27e740739063b915ef8cb8a12f362cc Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Thu, 9 Jan 2025 11:36:15 +0100
Subject: [PATCH 36/37] refactor(instantsearch): replace "helper" with the
 value of "mainHelper" (#6516)

* refactor(instantsearch): remove "helper" in favor of "mainHelper"

[FX-3212]

* refactor(instantsearch): rename "mainHelper" to "helper"

[FX-3212]

BREAKING CHANGE: the value search.helper is what used to be search.mainHelper. search.mainHelper no longer exists. Use either search.helper now or search.mainIndex.getHelper()
---
 .../instantsearch-composition.test.tsx        | 18 ++---
 .../src/__tests__/instantsearch.test.tsx      | 60 +++++++--------
 .../__tests__/connectGeoSearch.test.ts        |  4 +-
 .../instantsearch-core/src/instantsearch.ts   | 47 +++++-------
 .../__tests__/createInsightsMiddleware.ts     | 28 ++++---
 .../middlewares/createInsightsMiddleware.ts   |  6 +-
 packages/instantsearch-core/src/server.ts     |  2 +-
 .../widgets/__tests__/index-widget.test.ts    | 76 +++++++++----------
 .../src/widgets/index-widget.ts               | 18 ++---
 .../test/createInstantSearch.ts               |  5 +-
 .../instantsearch-core/test/createWidget.ts   |  2 +-
 .../__tests__/dynamic-widgets-test.ts         |  4 +-
 .../src/widgets/hits/__tests__/hits.test.tsx  |  1 -
 .../__tests__/infinite-hits.test.tsx          |  1 -
 .../menu-select/__tests__/menu-select-test.ts |  2 +-
 .../src/lib/useInstantSearchApi.ts            |  7 +-
 .../src/InitializePromise.tsx                 | 12 +--
 .../src/TriggerSearch.ts                      |  8 +-
 .../src/components/Stats.vue                  |  5 +-
 .../__tests__/createServerRootMixin.test.js   |  4 +-
 .../src/util/createInstantSearchComponent.js  | 12 +--
 21 files changed, 153 insertions(+), 169 deletions(-)

diff --git a/packages/instantsearch-core/src/__tests__/instantsearch-composition.test.tsx b/packages/instantsearch-core/src/__tests__/instantsearch-composition.test.tsx
index d2a7e9b8b5..f991d9f4b2 100644
--- a/packages/instantsearch-core/src/__tests__/instantsearch-composition.test.tsx
+++ b/packages/instantsearch-core/src/__tests__/instantsearch-composition.test.tsx
@@ -84,10 +84,10 @@ describe('Composition implementation', () => {
 
     search.start();
 
-    search.mainHelper?.searchForFacetValues('brand', 'algolia', 20);
+    search.helper?.searchForFacetValues('brand', 'algolia', 20);
 
     expect(
-      search.mainHelper!.searchForCompositionFacetValues
+      search.helper!.searchForCompositionFacetValues
     ).toHaveBeenNthCalledWith(1, 'brand', 'algolia', 20);
   });
 
@@ -97,10 +97,10 @@ describe('Composition implementation', () => {
 
     search.start();
 
-    search.mainHelper?.searchForFacetValues('brand', 'algolia', 20);
+    search.helper?.searchForFacetValues('brand', 'algolia', 20);
 
     expect(
-      search.mainHelper!.searchForCompositionFacetValues
+      search.helper!.searchForCompositionFacetValues
     ).not.toHaveBeenCalled();
   });
 
@@ -116,7 +116,7 @@ describe('Composition implementation', () => {
 
     await wait(0);
 
-    expect(search.mainHelper!.searchWithComposition).toHaveBeenCalledTimes(1);
+    expect(search.helper!.searchWithComposition).toHaveBeenCalledTimes(1);
   });
 
   describe('when performing a search', () => {
@@ -140,7 +140,7 @@ describe('Composition implementation', () => {
 
       await wait(0);
 
-      expect(search.mainHelper!.searchWithComposition).toHaveBeenCalledTimes(1);
+      expect(search.helper!.searchWithComposition).toHaveBeenCalledTimes(1);
       expect(searchClient.search).toHaveBeenNthCalledWith(1, {
         compositionID: 'my-composition',
         requestBody: { params: { query: '' } },
@@ -164,7 +164,7 @@ describe('Composition implementation', () => {
 
       await wait(0);
 
-      expect(search.mainHelper!.searchWithComposition).toHaveBeenCalledTimes(1);
+      expect(search.helper!.searchWithComposition).toHaveBeenCalledTimes(1);
       expect(searchClient.search).toHaveBeenNthCalledWith(1, {
         compositionID: 'please-do-not-do-that',
         requestBody: { params: { query: '' } },
@@ -191,7 +191,7 @@ describe('Composition implementation', () => {
 
       await wait(0);
 
-      expect(search.mainHelper!.searchWithComposition).toHaveBeenCalledTimes(1);
+      expect(search.helper!.searchWithComposition).toHaveBeenCalledTimes(1);
       expect(searchClient.search).toHaveBeenNthCalledWith(1, {
         compositionID: 'my-composition',
         requestBody: {
@@ -221,7 +221,7 @@ describe('Composition implementation', () => {
 
       await wait(0);
 
-      expect(search.mainHelper!.searchWithComposition).toHaveBeenCalledTimes(1);
+      expect(search.helper!.searchWithComposition).toHaveBeenCalledTimes(1);
       expect(searchClient.search).toHaveBeenNthCalledWith(1, {
         compositionID: 'my-composition',
         requestBody: {
diff --git a/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx b/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
index 387bd3e6ea..b5a299092b 100644
--- a/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
+++ b/packages/instantsearch-core/src/__tests__/instantsearch.test.tsx
@@ -378,7 +378,7 @@ search.addWidgets([
 See https://www.algolia.com/doc/api-reference/widgets/configure/js/`);
   });
 
-  it("exposes helper's last results", async () => {
+  it("helper's results are null", async () => {
     const searchClient = createSearchClient();
 
     const search = new InstantSearch({
@@ -394,8 +394,7 @@ See https://www.algolia.com/doc/api-reference/widgets/configure/js/`);
 
     await wait(0);
 
-    // could be null if we don't pretend the main helper is the one who searched
-    expect(search.helper!.lastResults).not.toBe(null);
+    expect(search.helper!.lastResults).toBe(null);
   });
 
   describe('insights middleware', () => {
@@ -822,9 +821,9 @@ describe('start', () => {
 
     await wait(0);
 
-    expect(
-      search.mainHelper!.searchOnlyWithDerivedHelpers
-    ).toHaveBeenCalledTimes(1);
+    expect(search.helper!.searchOnlyWithDerivedHelpers).toHaveBeenCalledTimes(
+      1
+    );
   });
 
   it('forwards the `initialUiState` to the main index', () => {
@@ -1004,7 +1003,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/instantsear
 `);
   });
 
-  it('keeps a mainHelper already set on the instance (Vue SSR)', () => {
+  it('keeps a helper already set on the instance (Vue SSR)', () => {
     const searchClient = createSearchClient();
     const instance = new InstantSearch({
       indexName: 'indexName',
@@ -1013,17 +1012,17 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/instantsear
 
     const helper = algoliasearchHelper(searchClient, '');
 
-    // explicitly setting the mainHelper before start is used to force render to
+    // explicitly setting the helper before start is used to force render to
     // happen before the results of the first search are done. We need to make
     // sure no extra helper is created, as that can cause certain things (like routing)
     // to be listening to the wrong helper.
-    instance.mainHelper = helper;
+    instance.helper = helper;
 
-    expect(instance.mainHelper).toBe(helper);
+    expect(instance.helper).toBe(helper);
 
     instance.start();
 
-    expect(instance.mainHelper).toBe(helper);
+    expect(instance.helper).toBe(helper);
   });
 
   it('no query for root if indexName is not given', async () => {
@@ -1122,7 +1121,7 @@ describe('dispose', () => {
     await wait(0);
 
     // Simulate a search
-    search.mainHelper!.search();
+    search.helper!.search();
 
     search.dispose();
 
@@ -1195,17 +1194,17 @@ describe('dispose', () => {
 
     search.start();
 
-    const mainHelper = search.mainHelper!;
+    const helper = search.helper!;
 
-    mainHelper.on('searchQueueEmpty', onEventName);
+    helper.on('searchQueueEmpty', onEventName);
 
-    mainHelper.emit('searchQueueEmpty');
+    helper.emit('searchQueueEmpty');
 
     expect(onEventName).toHaveBeenCalledTimes(1);
 
     search.dispose();
 
-    mainHelper.emit('searchQueueEmpty');
+    helper.emit('searchQueueEmpty');
 
     expect(onEventName).toHaveBeenCalledTimes(1);
   });
@@ -1240,7 +1239,7 @@ describe('dispose', () => {
     expect(onRender).toHaveBeenCalledTimes(2);
   });
 
-  it('removes the Helpers references', () => {
+  it('removes the helper references', () => {
     const search = new InstantSearch({
       indexName: 'indexName',
       searchClient: createSearchClient(),
@@ -1248,17 +1247,14 @@ describe('dispose', () => {
 
     search.start();
 
-    expect(search.mainHelper).not.toBe(null);
     expect(search.helper).not.toBe(null);
 
     search.dispose();
 
-    expect(search.mainHelper).toBe(null);
     expect(search.helper).toBe(null);
 
     search.start();
 
-    expect(search.mainHelper).not.toBe(null);
     expect(search.helper).not.toBe(null);
   });
 
@@ -1283,15 +1279,15 @@ describe('scheduleSearch', () => {
 
     search.start();
 
-    const mainHelperSearch = jest.spyOn(search.mainHelper!, 'search');
+    const helperSearch = jest.spyOn(search.helper!, 'search');
 
     search.scheduleSearch();
 
-    expect(mainHelperSearch).toHaveBeenCalledTimes(0);
+    expect(helperSearch).toHaveBeenCalledTimes(0);
 
     await wait(0);
 
-    expect(mainHelperSearch).toHaveBeenCalledTimes(1);
+    expect(helperSearch).toHaveBeenCalledTimes(1);
   });
 
   it('deduplicates the calls to the `search` method', async () => {
@@ -1304,18 +1300,18 @@ describe('scheduleSearch', () => {
 
     search.start();
 
-    const mainHelperSearch = jest.spyOn(search.mainHelper!, 'search');
+    const helperSearch = jest.spyOn(search.helper!, 'search');
 
     search.scheduleSearch();
     search.scheduleSearch();
     search.scheduleSearch();
     search.scheduleSearch();
 
-    expect(mainHelperSearch).toHaveBeenCalledTimes(0);
+    expect(helperSearch).toHaveBeenCalledTimes(0);
 
     await wait(0);
 
-    expect(mainHelperSearch).toHaveBeenCalledTimes(1);
+    expect(helperSearch).toHaveBeenCalledTimes(1);
   });
 });
 
@@ -1418,7 +1414,7 @@ describe('scheduleStalledRender', () => {
     castToJestMock(widget.render!).mockReset();
 
     // Trigger a new search
-    search.mainHelper!.search();
+    search.helper!.search();
 
     // search starts
     await wait(0);
@@ -1456,10 +1452,10 @@ describe('scheduleStalledRender', () => {
     castToJestMock(widget.render!).mockClear();
 
     // Trigger multiple searches
-    search.mainHelper!.search();
-    search.mainHelper!.search();
-    search.mainHelper!.search();
-    search.mainHelper!.search();
+    search.helper!.search();
+    search.helper!.search();
+    search.helper!.search();
+    search.helper!.search();
 
     await wait(0);
 
@@ -1507,7 +1503,7 @@ describe('scheduleStalledRender', () => {
     );
 
     // Trigger a new search
-    search.mainHelper!.search();
+    search.helper!.search();
 
     expect(widget.render).toHaveBeenCalledTimes(1);
     castToJestMock(widget.render!).mockClear();
diff --git a/packages/instantsearch-core/src/connectors/__tests__/connectGeoSearch.test.ts b/packages/instantsearch-core/src/connectors/__tests__/connectGeoSearch.test.ts
index 6a41ad6cb9..711356b85c 100644
--- a/packages/instantsearch-core/src/connectors/__tests__/connectGeoSearch.test.ts
+++ b/packages/instantsearch-core/src/connectors/__tests__/connectGeoSearch.test.ts
@@ -73,7 +73,7 @@ describe('connectGeoSearch', () => {
     const widget = customGeoSearch({});
 
     const instantSearchInstance = createInstantSearch();
-    const helper = instantSearchInstance.mainHelper!;
+    const helper = instantSearchInstance.helper!;
 
     widget.init!(
       createInitOptions({
@@ -160,7 +160,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/geo-search/
     const widget = customGeoSearch({});
 
     const instantSearchInstance = createInstantSearch();
-    const { mainHelper: helper } = instantSearchInstance;
+    const { helper } = instantSearchInstance;
 
     widget.init!(createInitOptions({ instantSearchInstance }));
 
diff --git a/packages/instantsearch-core/src/instantsearch.ts b/packages/instantsearch-core/src/instantsearch.ts
index 13a9c42bd1..c27d119c4f 100644
--- a/packages/instantsearch-core/src/instantsearch.ts
+++ b/packages/instantsearch-core/src/instantsearch.ts
@@ -66,7 +66,6 @@ export class InstantSearch<
   onStateChange: InstantSearchOptions<TUiState>['onStateChange'] | null = null;
   future: NonNullable<InstantSearchOptions<TUiState>['future']>;
   helper: AlgoliaSearchHelper | null;
-  mainHelper: AlgoliaSearchHelper | null;
   mainIndex: IndexWidget;
   started: boolean;
   renderState: RenderState = {};
@@ -75,7 +74,7 @@ export class InstantSearch<
   _initialUiState: TUiState;
   _initialResults: InitialResults | null;
   _createURL: CreateURL<TUiState>;
-  _mainHelperSearch?: AlgoliaSearchHelper['search'];
+  _helperSearch?: AlgoliaSearchHelper['search'];
   _hasSearchWidget: boolean = false;
   _hasRecommendWidget: boolean = false;
   _insights: InstantSearchOptions['insights'];
@@ -153,7 +152,6 @@ See ${createDocumentationLink({
     this.indexName = indexName;
     this.compositionID = compositionID;
     this.helper = null;
-    this.mainHelper = null;
     this.mainIndex = index({
       // we use an index widget to render compositions
       // this only works because there's only one composition index allow for now
@@ -309,16 +307,16 @@ See ${createDocumentationLink({
     // DerivedHelper scoped into the `index` widgets.
     // In Vue InstantSearch' hydrate, a main helper gets set before start, so
     // we need to respect this helper as a way to keep all listeners correct.
-    const mainHelper =
-      this.mainHelper ||
+    const helper =
+      this.helper ||
       algoliasearchHelper(this.client, this.indexName, undefined);
 
     if (this.compositionID) {
-      mainHelper.searchForFacetValues =
-        mainHelper.searchForCompositionFacetValues.bind(mainHelper);
+      helper.searchForFacetValues =
+        helper.searchForCompositionFacetValues.bind(helper);
     }
 
-    mainHelper.search = () => {
+    helper.search = () => {
       this.status = 'loading';
       this.scheduleRender(false);
 
@@ -335,22 +333,22 @@ See ${createDocumentationLink({
       // is impacted.
       if (this._hasSearchWidget) {
         if (this.compositionID) {
-          mainHelper.searchWithComposition();
+          helper.searchWithComposition();
         } else {
-          mainHelper.searchOnlyWithDerivedHelpers();
+          helper.searchOnlyWithDerivedHelpers();
         }
       }
 
       if (this._hasRecommendWidget) {
-        mainHelper.recommend();
+        helper.recommend();
       }
 
-      return mainHelper;
+      return helper;
     };
 
     // Only the "main" Helper emits the `error` event vs the one for `search`
     // and `results` that are also emitted on the derived one.
-    mainHelper.on('error', (error) => {
+    helper.on('error', (error) => {
       if (!(error instanceof Error)) {
         // typescript lies here, error is in some cases { name: string, message: string }
         const err = error as Record<string, any>;
@@ -368,7 +366,7 @@ See ${createDocumentationLink({
       this.emit('error', this.error);
     });
 
-    this.mainHelper = mainHelper;
+    this.helper = helper;
 
     this.middleware.forEach(({ instance }) => {
       instance.subscribe();
@@ -382,7 +380,7 @@ See ${createDocumentationLink({
 
     if (this._initialResults) {
       hydrateSearchClient(this.client, this._initialResults);
-      hydrateRecommendCache(this.mainHelper, this._initialResults);
+      hydrateRecommendCache(this.helper, this._initialResults);
 
       const originalScheduleSearch = this.scheduleSearch;
       // We don't schedule a first search when initial results are provided
@@ -410,10 +408,6 @@ See ${createDocumentationLink({
       this.scheduleSearch();
     }
 
-    // Keep the previous reference for legacy purpose, some pattern use
-    // the direct Helper access `search.helper` (e.g multi-index).
-    this.helper = this.mainIndex.getHelper();
-
     // track we started the search if we add more widgets,
     // to init them directly after add
     this.started = true;
@@ -426,7 +420,7 @@ See ${createDocumentationLink({
     // added when `insights` is unset and the initial results possess `queryID`.
     // Any user-provided middleware will be added later and override this one.
     if (typeof this._insights === 'undefined') {
-      mainHelper.derivedHelpers[0].once('result', () => {
+      helper.derivedHelpers[0].once('result', () => {
         const hasAutomaticInsights = this.mainIndex
           .getScopedResults()
           .some(({ results }) => results?._automaticInsights);
@@ -458,8 +452,7 @@ See ${createDocumentationLink({
     // The helper needs to be reset to perform the next search from a fresh state.
     // If not reset, it would use the state stored before calling `dispose()`.
     this.removeAllListeners();
-    this.mainHelper?.removeAllListeners();
-    this.mainHelper = null;
+    this.helper?.removeAllListeners();
     this.helper = null;
 
     this.middleware.forEach(({ instance }) => {
@@ -469,12 +462,12 @@ See ${createDocumentationLink({
 
   scheduleSearch = defer(() => {
     if (this.started) {
-      this.mainHelper!.search();
+      this.helper!.search();
     }
   });
 
   scheduleRender = defer((shouldResetStatus: boolean = true) => {
-    if (!this.mainHelper?.hasPendingRequests()) {
+    if (!this.helper?.hasPendingRequests()) {
       clearTimeout(this._searchStalledTimer);
       this._searchStalledTimer = null;
 
@@ -504,7 +497,7 @@ See ${createDocumentationLink({
     uiState: TUiState | ((previousUiState: TUiState) => TUiState),
     callOnStateChange = true
   ) {
-    if (!this.mainHelper) {
+    if (!this.helper) {
       throw new Error(
         withUsage('The `start` method needs to be called before `setUiState`.')
       );
@@ -571,13 +564,13 @@ See ${createDocumentationLink({
   }
 
   refresh() {
-    if (!this.mainHelper) {
+    if (!this.helper) {
       throw new Error(
         withUsage('The `start` method needs to be called before `refresh`.')
       );
     }
 
-    this.mainHelper.clearCache().search();
+    this.helper.clearCache().search();
   }
 }
 
diff --git a/packages/instantsearch-core/src/middlewares/__tests__/createInsightsMiddleware.ts b/packages/instantsearch-core/src/middlewares/__tests__/createInsightsMiddleware.ts
index fd15e44f51..b335c21d23 100644
--- a/packages/instantsearch-core/src/middlewares/__tests__/createInsightsMiddleware.ts
+++ b/packages/instantsearch-core/src/middlewares/__tests__/createInsightsMiddleware.ts
@@ -72,8 +72,7 @@ describe('insights', () => {
     }
 
     const getUserToken = () =>
-      (instantSearchInstance.mainHelper!.state as PlainSearchParameters)
-        .userToken;
+      (instantSearchInstance.helper!.state as PlainSearchParameters).userToken;
 
     return {
       analytics,
@@ -103,11 +102,10 @@ describe('insights', () => {
     });
     instantSearchInstance.start();
 
-    const helper = instantSearchInstance.mainHelper!;
+    const helper = instantSearchInstance.helper!;
 
     const getUserToken = () =>
-      (instantSearchInstance.mainHelper!.state as PlainSearchParameters)
-        .userToken;
+      (instantSearchInstance.helper!.state as PlainSearchParameters).userToken;
 
     return {
       analytics,
@@ -452,7 +450,7 @@ describe('insights', () => {
           insightsClient,
         })
       );
-      expect(instantSearchInstance.mainHelper!.state.clickAnalytics).toBe(true);
+      expect(instantSearchInstance.helper!.state.clickAnalytics).toBe(true);
     });
 
     it('applies clickAnalytics if $$automatic: false', () => {
@@ -463,7 +461,7 @@ describe('insights', () => {
           $$automatic: false,
         })
       );
-      expect(instantSearchInstance.mainHelper!.state.clickAnalytics).toBe(true);
+      expect(instantSearchInstance.helper!.state.clickAnalytics).toBe(true);
     });
 
     it('does not apply clickAnalytics if $$automatic: true', () => {
@@ -484,9 +482,9 @@ describe('insights', () => {
       const middleware = createInsightsMiddleware({
         insightsClient,
       })({ instantSearchInstance });
-      instantSearchInstance.mainHelper!.setPage(100);
+      instantSearchInstance.helper!.setPage(100);
       middleware.subscribe();
-      expect(instantSearchInstance.mainHelper!.state.page).toBe(100);
+      expect(instantSearchInstance.helper!.state.page).toBe(100);
     });
 
     it('adds user agent', () => {
@@ -679,7 +677,7 @@ describe('insights', () => {
 
       insightsClient('setUserToken', 'abc');
       instantSearchInstance.start();
-      instantSearchInstance.mainHelper!.setPage(100);
+      instantSearchInstance.helper!.setPage(100);
 
       instantSearchInstance.use(
         createInsightsMiddleware({
@@ -687,7 +685,7 @@ describe('insights', () => {
         })
       );
 
-      expect(instantSearchInstance.mainHelper!.state.page).toBe(100);
+      expect(instantSearchInstance.helper!.state.page).toBe(100);
       expect(getUserToken()).toEqual('abc');
     });
 
@@ -711,7 +709,7 @@ describe('insights', () => {
         createTestEnvironment({ started: false });
 
       instantSearchInstance.start();
-      instantSearchInstance.mainHelper!.setPage(100);
+      instantSearchInstance.helper!.setPage(100);
 
       instantSearchInstance.use(
         createInsightsMiddleware({
@@ -723,7 +721,7 @@ describe('insights', () => {
 
       await wait(0);
 
-      expect(instantSearchInstance.mainHelper!.state.page).toEqual(100);
+      expect(instantSearchInstance.helper!.state.page).toEqual(100);
       expect(getUserToken()).toEqual('def');
     });
 
@@ -1376,7 +1374,7 @@ describe('insights', () => {
         },
       });
 
-      instantSearchInstance.mainHelper!.derivedHelpers[0].emit('result', {
+      instantSearchInstance.helper!.derivedHelpers[0].emit('result', {
         results: { queryId: '2' },
       });
 
@@ -1567,7 +1565,7 @@ describe('insights', () => {
 
     instantSearchInstance
       .helper!.setState({
-        ...instantSearchInstance.mainHelper!.state,
+        ...instantSearchInstance.helper!.state,
         query: 'test',
       })
       .search();
diff --git a/packages/instantsearch-core/src/middlewares/createInsightsMiddleware.ts b/packages/instantsearch-core/src/middlewares/createInsightsMiddleware.ts
index 1503037151..61f7ec9cc5 100644
--- a/packages/instantsearch-core/src/middlewares/createInsightsMiddleware.ts
+++ b/packages/instantsearch-core/src/middlewares/createInsightsMiddleware.ts
@@ -170,7 +170,7 @@ export function createInsightsMiddleware<
       started() {
         insightsClient('addAlgoliaAgent', 'insights-middleware');
 
-        helper = instantSearchInstance.mainHelper!;
+        helper = instantSearchInstance.helper!;
 
         const { queue: queueAtStart } = insightsClient;
 
@@ -324,7 +324,7 @@ export function createInsightsMiddleware<
 
         const viewedObjectIDs = new Set<string>();
         let lastQueryId: string | undefined;
-        instantSearchInstance.mainHelper!.derivedHelpers[0].on(
+        instantSearchInstance.helper!.derivedHelpers[0].on(
           'result',
           ({ results }) => {
             if (
@@ -416,7 +416,7 @@ function getInitialParameters(
     instantSearchInstance._initialResults?.[instantSearchInstance.indexName]
       ?.state || {};
 
-  const stateFromHelper = instantSearchInstance.mainHelper!.state;
+  const stateFromHelper = instantSearchInstance.helper!.state;
 
   return {
     userToken: stateFromInitialResults.userToken || stateFromHelper.userToken,
diff --git a/packages/instantsearch-core/src/server.ts b/packages/instantsearch-core/src/server.ts
index 67cad673a6..9468b68e09 100644
--- a/packages/instantsearch-core/src/server.ts
+++ b/packages/instantsearch-core/src/server.ts
@@ -17,7 +17,7 @@ export function waitForResults(
   search: InstantSearch,
   skipRecommend: boolean = false
 ): Promise<SearchOptions[]> {
-  const helper = search.mainHelper!;
+  const helper = search.helper!;
 
   // Extract search parameters from the search client to use them
   // later during hydration.
diff --git a/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts b/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts
index c600238853..6647181d23 100644
--- a/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts
+++ b/packages/instantsearch-core/src/widgets/__tests__/index-widget.test.ts
@@ -1042,12 +1042,12 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
   describe('init', () => {
     it('forwards the `search` call to the main instance', () => {
       const instance = index({ indexName: 'indexName' });
-      const mainHelper = algoliasearchHelper({} as any, '', {});
+      const helper = algoliasearchHelper({} as any, '', {});
       const instantSearchInstance = createInstantSearch({
-        mainHelper,
+        helper,
       });
 
-      const search = jest.spyOn(mainHelper, 'search').mockImplementation();
+      const search = jest.spyOn(helper, 'search').mockImplementation();
 
       instance.init(
         createIndexInitOptions({
@@ -1064,13 +1064,13 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
 
     it('forwards the `searchForFacetValues` call to the main instance', () => {
       const instance = index({ indexName: 'indexName' });
-      const mainHelper = algoliasearchHelper({} as any, '', {});
+      const helper = algoliasearchHelper({} as any, '', {});
       const instantSearchInstance = createInstantSearch({
-        mainHelper,
+        helper,
       });
 
       const searchForFacetValues = jest
-        .spyOn(mainHelper, 'searchForFacetValues')
+        .spyOn(helper, 'searchForFacetValues')
         .mockImplementation();
 
       instance.init(
@@ -1102,9 +1102,9 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
     it('uses the internal state for the queries', () => {
       const instance = index({ indexName: 'indexName' });
       const searchClient = createSearchClient();
-      const mainHelper = algoliasearchHelper(searchClient, '', {});
+      const helper = algoliasearchHelper(searchClient, '', {});
       const instantSearchInstance = createInstantSearch({
-        mainHelper,
+        helper,
       });
 
       instance.addWidgets([
@@ -1177,9 +1177,9 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
     it('uses the index set by the widget for the queries', () => {
       const instance = index({ indexName: 'indexName' });
       const searchClient = createSearchClient();
-      const mainHelper = algoliasearchHelper(searchClient, '', {});
+      const helper = algoliasearchHelper(searchClient, '', {});
       const instantSearchInstance = createInstantSearch({
-        mainHelper,
+        helper,
       });
 
       instance.addWidgets([
@@ -1215,9 +1215,9 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
       const level1 = index({ indexName: 'level1IndexName' });
       const level2 = index({ indexName: 'level2IndexName' });
       const searchClient = createSearchClient();
-      const mainHelper = algoliasearchHelper(searchClient, '', {});
+      const helper = algoliasearchHelper(searchClient, '', {});
       const instantSearchInstance = createInstantSearch({
-        mainHelper,
+        helper,
       });
 
       level0.addWidgets([
@@ -1308,9 +1308,9 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
     it('uses the internal state for the SFFV queries', () => {
       const instance = index({ indexName: 'indexName' });
       const searchClient = createSearchClient();
-      const mainHelper = algoliasearchHelper(searchClient, '', {});
+      const helper = algoliasearchHelper(searchClient, '', {});
       const instantSearchInstance = createInstantSearch({
-        mainHelper,
+        helper,
       });
 
       instance.addWidgets([
@@ -1447,9 +1447,9 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
         const level2 = index({ indexName: 'level2IndexName' });
         const level3 = index({ indexName: 'level3IndexName' });
         const searchClient = createSearchClient();
-        const mainHelper = algoliasearchHelper(searchClient, '', {});
+        const helper = algoliasearchHelper(searchClient, '', {});
         const instantSearchInstance = createInstantSearch({
-          mainHelper,
+          helper,
         });
 
         level0.addWidgets([
@@ -1658,9 +1658,9 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
         const level2 = index({ indexName: 'level2IndexName' });
         const level3 = index({ indexName: 'level3IndexName' });
         const searchClient = createSearchClient();
-        const mainHelper = algoliasearchHelper(searchClient, '', {});
+        const helper = algoliasearchHelper(searchClient, '', {});
         const instantSearchInstance = createInstantSearch({
-          mainHelper,
+          helper,
         });
 
         level0.addWidgets([
@@ -1785,9 +1785,9 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
         const level2 = index({ indexName: 'level2IndexName' });
         const level3 = index({ indexName: 'level3IndexName' });
         const searchClient = createSearchClient();
-        const mainHelper = algoliasearchHelper(searchClient, '', {});
+        const helper = algoliasearchHelper(searchClient, '', {});
         const instantSearchInstance = createInstantSearch({
-          mainHelper,
+          helper,
         });
 
         level0.addWidgets([
@@ -2269,9 +2269,9 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
       const level0 = index({ indexName: 'level0IndexName' });
 
       const searchClient = createSearchClient();
-      const mainHelper = algoliasearchHelper(searchClient, '', {});
+      const helper = algoliasearchHelper(searchClient, '', {});
       const instantSearchInstance = createInstantSearch({
-        mainHelper,
+        helper,
         _initialUiState: {
           level0IndexName: {
             query: 'something',
@@ -2441,15 +2441,15 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
     test('calls `getRenderState` with the index render state', () => {
       const searchIndex = index({ indexName: 'indexName' });
       const searchClient = createSearchClient();
-      const mainHelper = algoliasearchHelper(searchClient, 'indexName', {});
-      const instantSearchInstance = createInstantSearch({ mainHelper });
+      const helper = algoliasearchHelper(searchClient, 'indexName', {});
+      const instantSearchInstance = createInstantSearch({ helper });
       const searchBox = createSearchBox({
         dependsOn: 'search',
-        getRenderState: jest.fn((renderState, { helper }) => {
+        getRenderState: jest.fn((renderState, { helper: { state } }) => {
           return {
             ...renderState,
             searchBox: {
-              query: helper.state.query || '',
+              query: state.query || '',
               refine: () => {},
               clear: () => {},
               widgetParams: {},
@@ -2554,19 +2554,19 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
       it('derives only once', () => {
         const instance = index({ indexName: 'test' });
 
-        const mainHelper = algoliasearchHelper(createSearchClient(), '');
+        const helper = algoliasearchHelper(createSearchClient(), '');
 
-        const instantSearchInstance = createInstantSearch({ mainHelper });
+        const instantSearchInstance = createInstantSearch({ helper });
 
         expect(instance.getHelper()).toBe(null);
 
         instance.init(createIndexInitOptions({ instantSearchInstance }));
 
-        expect(mainHelper.derivedHelpers.length).toBe(1);
+        expect(helper.derivedHelpers.length).toBe(1);
 
         instance.init(createIndexInitOptions({ instantSearchInstance }));
 
-        expect(mainHelper.derivedHelpers.length).toBe(1);
+        expect(helper.derivedHelpers.length).toBe(1);
       });
     });
   });
@@ -2892,9 +2892,9 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
           })
         ),
       });
-      const mainHelper = algoliasearchHelper(searchClient, '', {});
+      const helper = algoliasearchHelper(searchClient, '', {});
       const instantSearchInstance = createInstantSearch({
-        mainHelper,
+        helper,
       });
 
       const fbt = createFrequentlyBoughtTogether({
@@ -2910,9 +2910,9 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
           parent: null,
         })
       );
-      mainHelper.search();
+      helper.search();
       await wait(0);
-      mainHelper.recommend();
+      helper.recommend();
       await wait(0);
 
       instance.render({
@@ -3066,9 +3066,9 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
     it('removes the DerivedHelper', () => {
       const instance = index({ indexName: 'indexName' });
       const searchClient = createSearchClient();
-      const mainHelper = algoliasearchHelper(searchClient, '', {});
+      const helper = algoliasearchHelper(searchClient, '', {});
       const instantSearchInstance = createInstantSearch({
-        mainHelper,
+        helper,
       });
 
       instance.init(
@@ -3078,11 +3078,11 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/index-widge
         })
       );
 
-      expect(mainHelper.derivedHelpers).toHaveLength(1);
+      expect(helper.derivedHelpers).toHaveLength(1);
 
       instance.dispose(createDisposeOptions());
 
-      expect(mainHelper.derivedHelpers).toHaveLength(0);
+      expect(helper.derivedHelpers).toHaveLength(0);
     });
 
     it('does not crash when calling `dispose` before `init`', () => {
diff --git a/packages/instantsearch-core/src/widgets/index-widget.ts b/packages/instantsearch-core/src/widgets/index-widget.ts
index 719a12c620..b9bba96d73 100644
--- a/packages/instantsearch-core/src/widgets/index-widget.ts
+++ b/packages/instantsearch-core/src/widgets/index-widget.ts
@@ -485,10 +485,10 @@ export const index = (widgetParams: IndexWidgetParams): IndexWidget => {
       localParent = parent;
       localUiState = uiState[indexId] || {};
 
-      // The `mainHelper` is already defined at this point. The instance is created
+      // The helper is already defined at this point. The instance is created
       // inside InstantSearch at the `start` method, which occurs before the `init`
       // step.
-      const mainHelper = instantSearchInstance.mainHelper!;
+      const searchHelper = instantSearchInstance.helper!;
       const parameters = getLocalWidgetsSearchParameters(localWidgets, {
         uiState: localUiState,
         initialSearchParameters: new algoliasearchHelper.SearchParameters({
@@ -527,14 +527,14 @@ export const index = (widgetParams: IndexWidgetParams): IndexWidget => {
 
           // We don't trigger a search when controlled because it becomes the
           // responsibility of `setUiState`.
-          return mainHelper;
+          return searchHelper;
         }
 
-        return mainHelper.search();
+        return searchHelper.search();
       };
 
       helper.searchWithoutTriggeringOnStateChange = () => {
-        return mainHelper.search();
+        return searchHelper.search();
       };
 
       // We use the same pattern for the `searchForFacetValues`.
@@ -546,7 +546,7 @@ export const index = (widgetParams: IndexWidgetParams): IndexWidget => {
       ) => {
         const state = helper!.state.setQueryParameters(userState);
 
-        return mainHelper.searchForFacetValues(
+        return searchHelper.searchForFacetValues(
           facetName,
           facetValue,
           maxFacetHits,
@@ -554,10 +554,10 @@ export const index = (widgetParams: IndexWidgetParams): IndexWidget => {
         );
       };
 
-      derivedHelper = mainHelper.derive(
+      derivedHelper = searchHelper.derive(
         () =>
           mergeSearchParameters(
-            mainHelper.state,
+            searchHelper.state,
             ...resolveSearchParameters(this)
           ),
         () => this.getHelper()!.recommendState
@@ -710,7 +710,7 @@ export const index = (widgetParams: IndexWidgetParams): IndexWidget => {
       // then would no longer be thrown for global handlers.
       if (
         instantSearchInstance.status === 'error' &&
-        !instantSearchInstance.mainHelper!.hasPendingRequests() &&
+        !instantSearchInstance.helper!.hasPendingRequests() &&
         lastValidSearchParameters
       ) {
         helper!.setState(lastValidSearchParameters);
diff --git a/packages/instantsearch-core/test/createInstantSearch.ts b/packages/instantsearch-core/test/createInstantSearch.ts
index 09ef3a1bab..db2d63d115 100644
--- a/packages/instantsearch-core/test/createInstantSearch.ts
+++ b/packages/instantsearch-core/test/createInstantSearch.ts
@@ -9,13 +9,13 @@ export const createInstantSearch = (
   args: Partial<InstantSearch> = {}
 ): InstantSearch => {
   const { indexName = 'indexName', client = createSearchClient() } = args;
-  const mainHelper = algoliasearchHelper(client, indexName, {});
+  const helper = algoliasearchHelper(client, indexName, {});
   const mainIndex = index({ indexName });
 
   return {
     indexName,
     mainIndex,
-    mainHelper,
+    helper,
     client,
     started: false,
     status: 'idle',
@@ -27,7 +27,6 @@ export const createInstantSearch = (
       this.started = false;
     },
     refresh: jest.fn(),
-    helper: mainHelper, // @TODO: use the Helper from the index once the RoutingManger uses the index
     middleware: [],
     renderState: {},
     scheduleStalledRender: defer(jest.fn()),
diff --git a/packages/instantsearch-core/test/createWidget.ts b/packages/instantsearch-core/test/createWidget.ts
index 7f9b57c267..a35b361aab 100644
--- a/packages/instantsearch-core/test/createWidget.ts
+++ b/packages/instantsearch-core/test/createWidget.ts
@@ -55,7 +55,7 @@ export const createRenderOptions = (
   const response = createMultiSearchResponse();
   const helper = args.helper || instantSearchInstance.helper!;
   const results = new algoliasearchHelper.SearchResults(
-    instantSearchInstance.helper!.state,
+    helper.state,
     response.results as Array<SearchResponse<any>>
   );
 
diff --git a/packages/instantsearch.js/src/widgets/dynamic-widgets/__tests__/dynamic-widgets-test.ts b/packages/instantsearch.js/src/widgets/dynamic-widgets/__tests__/dynamic-widgets-test.ts
index 3600a5f4e7..9867eb1890 100644
--- a/packages/instantsearch.js/src/widgets/dynamic-widgets/__tests__/dynamic-widgets-test.ts
+++ b/packages/instantsearch.js/src/widgets/dynamic-widgets/__tests__/dynamic-widgets-test.ts
@@ -185,7 +185,7 @@ describe('dynamicWidgets()', () => {
       indexWidget.init(createInitOptions({ instantSearchInstance }));
 
       // set results to the relevant index, so it renders all children
-      instantSearchInstance.mainHelper!.derivedHelpers[0].lastResults =
+      instantSearchInstance.helper!.derivedHelpers[0].lastResults =
         new SearchResults(
           indexWidget.getWidgetSearchParameters(new SearchParameters(), {
             uiState: {},
@@ -450,7 +450,7 @@ describe('dynamicWidgets()', () => {
       indexWidget.init(createInitOptions({ instantSearchInstance }));
 
       // set results to the relevant index, so it renders all children
-      instantSearchInstance.mainHelper!.derivedHelpers[0].lastResults =
+      instantSearchInstance.helper!.derivedHelpers[0].lastResults =
         new SearchResults(
           indexWidget.getWidgetSearchParameters(new SearchParameters(), {
             uiState: {},
diff --git a/packages/instantsearch.js/src/widgets/hits/__tests__/hits.test.tsx b/packages/instantsearch.js/src/widgets/hits/__tests__/hits.test.tsx
index 391bfafc35..59a62c265b 100644
--- a/packages/instantsearch.js/src/widgets/hits/__tests__/hits.test.tsx
+++ b/packages/instantsearch.js/src/widgets/hits/__tests__/hits.test.tsx
@@ -203,7 +203,6 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/hits/js/"
 
       search.start();
       // prevent warning from insights view event because insightsClient isn't yet loaded
-      // @ts-ignore
       search.helper!.state.userToken = 'userToken';
 
       await wait(0);
diff --git a/packages/instantsearch.js/src/widgets/infinite-hits/__tests__/infinite-hits.test.tsx b/packages/instantsearch.js/src/widgets/infinite-hits/__tests__/infinite-hits.test.tsx
index 22829b8ccb..b0d0a5d44b 100644
--- a/packages/instantsearch.js/src/widgets/infinite-hits/__tests__/infinite-hits.test.tsx
+++ b/packages/instantsearch.js/src/widgets/infinite-hits/__tests__/infinite-hits.test.tsx
@@ -190,7 +190,6 @@ describe('infiniteHits', () => {
 
       search.start();
       // prevent warning from insights view event because insightsClient isn't yet loaded
-      // @ts-ignore
       search.helper!.state.userToken = 'userToken';
 
       await wait(0);
diff --git a/packages/instantsearch.js/src/widgets/menu-select/__tests__/menu-select-test.ts b/packages/instantsearch.js/src/widgets/menu-select/__tests__/menu-select-test.ts
index 56552c8c8f..9d9769126c 100644
--- a/packages/instantsearch.js/src/widgets/menu-select/__tests__/menu-select-test.ts
+++ b/packages/instantsearch.js/src/widgets/menu-select/__tests__/menu-select-test.ts
@@ -215,7 +215,7 @@ describe('menuSelect', () => {
 
       await wait(0);
 
-      expect(search.helper!.state).toEqual(
+      expect(search.mainIndex.getHelper()!.state).toEqual(
         new SearchParameters({
           index: 'test',
           hierarchicalFacets: [{ attributes: ['test'], name: 'test' }],
diff --git a/packages/react-instantsearch-core/src/lib/useInstantSearchApi.ts b/packages/react-instantsearch-core/src/lib/useInstantSearchApi.ts
index 2291ff1496..9920a080b5 100644
--- a/packages/react-instantsearch-core/src/lib/useInstantSearchApi.ts
+++ b/packages/react-instantsearch-core/src/lib/useInstantSearchApi.ts
@@ -141,7 +141,10 @@ export function useInstantSearchApi<TUiState extends UiState, TRouteState>(
     const prevProps = prevPropsRef.current;
 
     if (prevProps.indexName !== props.indexName) {
-      search.helper!.setIndex(props.indexName || '').search();
+      search.mainIndex
+        .getHelper()!
+        .setIndex(props.indexName || '')
+        .search();
       prevPropsRef.current = props;
     }
 
@@ -155,7 +158,7 @@ export function useInstantSearchApi<TUiState extends UiState, TRouteState>(
         ...defaultUserAgents,
         serverContext && serverUserAgent,
       ]);
-      search.mainHelper!.setClient(props.searchClient).search();
+      search.helper!.setClient(props.searchClient).search();
       prevPropsRef.current = props;
     }
 
diff --git a/packages/react-instantsearch-nextjs/src/InitializePromise.tsx b/packages/react-instantsearch-nextjs/src/InitializePromise.tsx
index d492eebd7e..263ccce26d 100644
--- a/packages/react-instantsearch-nextjs/src/InitializePromise.tsx
+++ b/packages/react-instantsearch-nextjs/src/InitializePromise.tsx
@@ -70,16 +70,16 @@ export function InitializePromise({ nonce }: InitializePromiseProps) {
   let requestParamsList: SearchOptions[];
 
   if (search.compositionID) {
-    search.mainHelper!.setClient({
-      ...search.mainHelper!.getClient(),
+    search.helper!.setClient({
+      ...search.helper!.getClient(),
       search(query) {
         requestParamsList = [query.requestBody.params];
         return (search.client as CompositionClient).search(query);
       },
     } as CompositionClient);
   } else {
-    search.mainHelper!.setClient({
-      ...search.mainHelper!.getClient(),
+    search.helper!.setClient({
+      ...search.helper!.getClient(),
       search(queries) {
         requestParamsList = queries.map(({ params }) => params);
         return (search.client as SearchClient).search(queries);
@@ -93,13 +93,13 @@ export function InitializePromise({ nonce }: InitializePromiseProps) {
     new Promise<void>((resolve) => {
       let searchReceived = false;
       let recommendReceived = false;
-      search.mainHelper!.derivedHelpers[0].once('result', () => {
+      search.helper!.derivedHelpers[0].once('result', () => {
         searchReceived = true;
         if (!search._hasRecommendWidget || recommendReceived) {
           resolve();
         }
       });
-      search.mainHelper!.derivedHelpers[0].once('recommend:result', () => {
+      search.helper!.derivedHelpers[0].once('recommend:result', () => {
         recommendReceived = true;
         if (!search._hasSearchWidget || searchReceived) {
           resolve();
diff --git a/packages/react-instantsearch-nextjs/src/TriggerSearch.ts b/packages/react-instantsearch-nextjs/src/TriggerSearch.ts
index 3e2cea4fba..0bc7edb3d0 100644
--- a/packages/react-instantsearch-nextjs/src/TriggerSearch.ts
+++ b/packages/react-instantsearch-nextjs/src/TriggerSearch.ts
@@ -10,12 +10,14 @@ export function TriggerSearch() {
   if (waitForResultsRef?.current?.status === 'pending') {
     if (instantsearch._hasSearchWidget) {
       if (instantsearch.compositionID) {
-        instantsearch.mainHelper?.searchWithComposition();
+        instantsearch.helper?.searchWithComposition();
       } else {
-        instantsearch.mainHelper?.searchOnlyWithDerivedHelpers();
+        instantsearch.helper?.searchOnlyWithDerivedHelpers();
       }
     }
-    instantsearch._hasRecommendWidget && instantsearch.mainHelper?.recommend();
+    if (instantsearch._hasRecommendWidget) {
+      instantsearch.helper?.recommend();
+    }
   }
 
   return null;
diff --git a/packages/vue-instantsearch/src/components/Stats.vue b/packages/vue-instantsearch/src/components/Stats.vue
index e65ce20761..22eb20291f 100644
--- a/packages/vue-instantsearch/src/components/Stats.vue
+++ b/packages/vue-instantsearch/src/components/Stats.vue
@@ -1,9 +1,6 @@
 <template>
   <div v-if="state" :class="suit()">
-    <slot
-      v-bind="state"
-      :results="state.instantSearchInstance.helper.lastResults"
-    >
+    <slot v-bind="state">
       <!-- prettier-ignore -->
       <span :class="suit('text')"
         ><template v-if="state.areHitsSorted"
diff --git a/packages/vue-instantsearch/src/util/__tests__/createServerRootMixin.test.js b/packages/vue-instantsearch/src/util/__tests__/createServerRootMixin.test.js
index 2e95a9616a..be746b2fa0 100644
--- a/packages/vue-instantsearch/src/util/__tests__/createServerRootMixin.test.js
+++ b/packages/vue-instantsearch/src/util/__tests__/createServerRootMixin.test.js
@@ -1026,7 +1026,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/instantsear
       expect(instantsearch.mainIndex.getHelper()).not.toBeNull();
     });
 
-    it('sets helper & mainHelper', () => {
+    it('sets helper', () => {
       const serialized = createSerializedState();
 
       const app = {
@@ -1053,14 +1053,12 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/instantsear
       } = mount(app);
 
       expect(instantsearch.helper).toBe(null);
-      expect(instantsearch.mainHelper).toBe(null);
 
       instantsearch.hydrate({
         hello: serialized,
       });
 
       expect(instantsearch.helper).toEqual(expect.any(AlgoliaSearchHelper));
-      expect(instantsearch.mainHelper).toEqual(expect.any(AlgoliaSearchHelper));
     });
   });
 
diff --git a/packages/vue-instantsearch/src/util/createInstantSearchComponent.js b/packages/vue-instantsearch/src/util/createInstantSearchComponent.js
index ee21d94a6e..40975c187b 100644
--- a/packages/vue-instantsearch/src/util/createInstantSearchComponent.js
+++ b/packages/vue-instantsearch/src/util/createInstantSearchComponent.js
@@ -21,17 +21,17 @@ export const createInstantSearchComponent = (component) => ({
       );
 
       this.instantSearchInstance.client = searchClient;
-      if (this.instantSearchInstance.mainHelper) {
-        this.instantSearchInstance.mainHelper.setClient(searchClient).search();
+      if (this.instantSearchInstance.helper) {
+        this.instantSearchInstance.helper.setClient(searchClient).search();
       }
     },
     indexName(indexName) {
       if (
-        this.instantSearchInstance.helper &&
-        this.instantSearchInstance.mainHelper
+        this.instantSearchInstance.mainIndex &&
+        this.instantSearchInstance.mainIndex.getHelper()
       ) {
-        this.instantSearchInstance.helper.setIndex(indexName || '');
-        this.instantSearchInstance.mainHelper
+        this.instantSearchInstance.mainIndex
+          .getHelper()
           .setIndex(indexName || '')
           .search();
       }

From bafb0cb3149099fef8a2b206940e8d45c54b8a01 Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Mon, 13 Jan 2025 11:15:57 +0100
Subject: [PATCH 37/37] refactor(routing): simplify historyRouter and tests
 (#6503)

refactor(routing): simplify historyRouter
---
 examples/js/e-commerce-umd/polyfills.js       |   2 +-
 examples/js/e-commerce/polyfills.js           |   2 +-
 .../src/__tests__/RoutingManager.test.ts      | 553 ------------------
 .../__tests__/instantsearch-routing.test.ts   | 390 ++++++++++++
 .../historyRouter-integration.test.ts         | 182 +++---
 .../routing/__tests__/historyRouter.test.ts   | 129 +++-
 .../routing-clean/correct-urls.test.ts        |  87 +++
 .../dispose-start.test.ts}                    |   6 +-
 .../routing-clean/duplicate-url.test.ts       |  86 +++
 .../routing-clean/external-influence.test.ts  |  78 +++
 .../modal.test.ts}                            |   4 +-
 .../spa-debounced.test.ts}                    |   4 +-
 .../spa-replace-state.test.ts}                |   4 +-
 .../spa.test.ts}                              |   4 +-
 .../{ => routing}/correct-urls.test.ts        |   2 +-
 .../{ => routing}/dispose-start.test.ts       |   4 +-
 .../{ => routing}/duplicate-url.test.ts       |   2 +-
 .../{ => routing}/external-influence.test.ts  |   2 +-
 .../__tests__/{ => routing}/modal.test.ts     |   2 +-
 .../{ => routing}/spa-debounced.test.ts       |   2 +-
 .../{ => routing}/spa-replace-state.test.ts   |   2 +-
 .../__tests__/{ => routing}/spa.test.ts       |   2 +-
 .../src/routing/historyRouter.ts              | 447 ++++++--------
 23 files changed, 1065 insertions(+), 931 deletions(-)
 delete mode 100644 packages/instantsearch-core/src/__tests__/RoutingManager.test.ts
 create mode 100644 packages/instantsearch-core/src/__tests__/instantsearch-routing.test.ts
 create mode 100644 packages/instantsearch-core/src/routing/__tests__/routing-clean/correct-urls.test.ts
 rename packages/instantsearch-core/src/routing/__tests__/{dispose-start-clean.test.ts => routing-clean/dispose-start.test.ts} (97%)
 create mode 100644 packages/instantsearch-core/src/routing/__tests__/routing-clean/duplicate-url.test.ts
 create mode 100644 packages/instantsearch-core/src/routing/__tests__/routing-clean/external-influence.test.ts
 rename packages/instantsearch-core/src/routing/__tests__/{modal-clean.test.ts => routing-clean/modal.test.ts} (99%)
 rename packages/instantsearch-core/src/routing/__tests__/{spa-debounced-clean.test.ts => routing-clean/spa-debounced.test.ts} (99%)
 rename packages/instantsearch-core/src/routing/__tests__/{spa-replace-state-clean.test.ts => routing-clean/spa-replace-state.test.ts} (99%)
 rename packages/instantsearch-core/src/routing/__tests__/{spa-clean.test.ts => routing-clean/spa.test.ts} (99%)
 rename packages/instantsearch-core/src/routing/__tests__/{ => routing}/correct-urls.test.ts (98%)
 rename packages/instantsearch-core/src/routing/__tests__/{ => routing}/dispose-start.test.ts (97%)
 rename packages/instantsearch-core/src/routing/__tests__/{ => routing}/duplicate-url.test.ts (99%)
 rename packages/instantsearch-core/src/routing/__tests__/{ => routing}/external-influence.test.ts (99%)
 rename packages/instantsearch-core/src/routing/__tests__/{ => routing}/modal.test.ts (99%)
 rename packages/instantsearch-core/src/routing/__tests__/{ => routing}/spa-debounced.test.ts (99%)
 rename packages/instantsearch-core/src/routing/__tests__/{ => routing}/spa-replace-state.test.ts (99%)
 rename packages/instantsearch-core/src/routing/__tests__/{ => routing}/spa.test.ts (99%)

diff --git a/examples/js/e-commerce-umd/polyfills.js b/examples/js/e-commerce-umd/polyfills.js
index 4cb5686a0c..1dbbec8f34 100644
--- a/examples/js/e-commerce-umd/polyfills.js
+++ b/examples/js/e-commerce-umd/polyfills.js
@@ -1,6 +1,6 @@
 /*
  * Polyfill service v3.111.0
- * For detailed credits and licence information see https://polyfill.io.
+ * For detailed credits and license information see https://polyfill.io.
  *
  * Features requested: Array.prototype.find,Array.prototype.findIndex,Array.prototype.includes,Object.assign,Object.entries,Promise,default
  *
diff --git a/examples/js/e-commerce/polyfills.js b/examples/js/e-commerce/polyfills.js
index 4cb5686a0c..1dbbec8f34 100644
--- a/examples/js/e-commerce/polyfills.js
+++ b/examples/js/e-commerce/polyfills.js
@@ -1,6 +1,6 @@
 /*
  * Polyfill service v3.111.0
- * For detailed credits and licence information see https://polyfill.io.
+ * For detailed credits and license information see https://polyfill.io.
  *
  * Features requested: Array.prototype.find,Array.prototype.findIndex,Array.prototype.includes,Object.assign,Object.entries,Promise,default
  *
diff --git a/packages/instantsearch-core/src/__tests__/RoutingManager.test.ts b/packages/instantsearch-core/src/__tests__/RoutingManager.test.ts
deleted file mode 100644
index 16f9cf368d..0000000000
--- a/packages/instantsearch-core/src/__tests__/RoutingManager.test.ts
+++ /dev/null
@@ -1,553 +0,0 @@
-/**
- * @jest-environment jsdom-global
- */
-
-import { createSearchClient } from '@instantsearch/mocks';
-import { wait } from '@instantsearch/testutils/wait';
-import { createWidget } from 'instantsearch-core/test/createWidget';
-import qs from 'qs';
-
-import {
-  instantsearch,
-  historyRouter,
-  connectHitsPerPage,
-  connectSearchBox,
-} from '..';
-
-import type { Router, UiState, StateMapping, IndexUiState } from '../types';
-import type { JSDOM } from 'jsdom';
-
-declare const jsdom: JSDOM;
-
-const createFakeRouter = (args: Partial<Router> = {}): Router => ({
-  onUpdate(..._args) {},
-  write(..._args) {},
-  read() {
-    return {};
-  },
-  createURL(..._args) {
-    return '';
-  },
-  dispose() {
-    return undefined;
-  },
-  ...args,
-});
-
-const createFakeStateMapping = (
-  args: Partial<StateMapping> = {}
-): StateMapping => ({
-  stateToRoute(uiState) {
-    return uiState;
-  },
-  routeToState(routeState) {
-    return routeState;
-  },
-  ...args,
-});
-
-type HistoryState<TEntry> = {
-  index: number;
-  entries: TEntry[];
-  listeners: Array<(value: TEntry) => void>;
-};
-
-const createFakeHistory = <TEntry = Record<string, unknown>>(
-  {
-    index = -1,
-    entries = [],
-    listeners = [],
-  }: HistoryState<TEntry> = {} as HistoryState<TEntry>
-) => {
-  const state: HistoryState<TEntry> = {
-    index,
-    entries,
-    listeners,
-  };
-
-  return {
-    subscribe(listener: (entry: TEntry) => void) {
-      state.listeners.push(listener);
-    },
-    push(value: TEntry) {
-      state.entries.push(value);
-      state.index++;
-    },
-    back() {
-      state.index--;
-      listeners.forEach((listener) => {
-        listener(state.entries[state.index]);
-      });
-    },
-  };
-};
-
-describe('RoutingManager', () => {
-  describe('within instantsearch', () => {
-    test('should write in the router on searchParameters change', async () => {
-      const searchClient = createSearchClient();
-      const router = createFakeRouter({
-        write: jest.fn(),
-      });
-
-      const search = instantsearch({
-        indexName: 'indexName',
-        searchClient,
-        routing: {
-          router,
-        },
-      });
-
-      const widget = createWidget({
-        render: jest.fn(),
-        getWidgetUiState: jest.fn((uiState, { searchParameters }) => ({
-          ...uiState,
-          q: searchParameters.query,
-        })),
-        getWidgetSearchParameters: jest.fn(
-          (searchParameters) => searchParameters
-        ),
-      });
-
-      search.addWidgets([widget]);
-
-      search.start();
-
-      // initialization is done at this point
-      await wait(0);
-
-      expect(widget.render).toHaveBeenCalledTimes(1);
-      expect(widget.getWidgetSearchParameters).toHaveBeenCalledTimes(1);
-
-      await wait(0);
-
-      expect(router.write).toHaveBeenCalledTimes(0);
-
-      search.mainIndex.getHelper()!.setQuery('q'); // routing write updates on change
-
-      await wait(0);
-
-      expect(router.write).toHaveBeenCalledTimes(1);
-      expect(router.write).toHaveBeenCalledWith({
-        indexName: {
-          q: 'q',
-        },
-      });
-    });
-
-    // eslint-disable-next-line jest/no-done-callback
-    test('should update the searchParameters on router state update', (done) => {
-      const searchClient = createSearchClient();
-
-      let onRouterUpdateCallback: (args: UiState) => void;
-      const router = createFakeRouter({
-        onUpdate: (fn) => {
-          onRouterUpdateCallback = fn;
-        },
-      });
-
-      const search = instantsearch({
-        indexName: 'indexName',
-        searchClient,
-        routing: {
-          router,
-        },
-      });
-
-      const widget = createWidget({
-        render: jest.fn(),
-        getWidgetSearchParameters: jest.fn((searchParameters, { uiState }) =>
-          searchParameters.setQuery(uiState.query!)
-        ),
-      });
-
-      search.addWidgets([widget]);
-
-      search.start();
-
-      search.once('render', () => {
-        // initialization is done at this point
-
-        expect(search.mainIndex.getHelper()!.state.query).toBeUndefined();
-
-        // this simulates a router update with a uiState of {query: 'a'}
-        onRouterUpdateCallback({
-          indexName: {
-            query: 'a',
-          },
-        });
-
-        search.once('render', () => {
-          // the router update triggers a new search
-          // and given that the widget reads q as a query parameter
-          expect(search.mainIndex.getHelper()!.state.query).toEqual('a');
-          done();
-        });
-      });
-    });
-
-    test('should keep the UI state up to date on state changes', async () => {
-      const searchClient = createSearchClient();
-      const stateMapping = createFakeStateMapping({});
-      const router = createFakeRouter({
-        write: jest.fn(),
-      });
-
-      const search = instantsearch({
-        indexName: 'indexName',
-        searchClient,
-        routing: {
-          stateMapping,
-          router,
-        },
-      });
-
-      const fakeSearchBox = connectSearchBox(() => {})({});
-      const fakeHitsPerPage = connectHitsPerPage(() => {})({
-        items: [{ default: true, value: 1, label: 'one' }],
-      });
-
-      search.addWidgets([fakeSearchBox, fakeHitsPerPage]);
-
-      search.start();
-
-      await wait(0);
-
-      // Trigger an update - push a change
-      search.renderState.indexName.searchBox!.refine('Apple');
-
-      await wait(0);
-
-      expect(router.write).toHaveBeenCalledTimes(1);
-      expect(router.write).toHaveBeenLastCalledWith({
-        indexName: {
-          query: 'Apple',
-        },
-      });
-
-      await wait(0);
-
-      // Trigger change
-      search.removeWidgets([fakeHitsPerPage]);
-
-      await wait(0);
-
-      // The UI state hasn't changed so `router.write` wasn't called a second
-      // time
-      expect(router.write).toHaveBeenCalledTimes(1);
-    });
-
-    test('should keep the UI state up to date on router.update', async () => {
-      const searchClient = createSearchClient();
-      const stateMapping = createFakeStateMapping({});
-      const history = createFakeHistory<UiState>();
-      const router = createFakeRouter({
-        onUpdate(fn) {
-          history.subscribe((state) => {
-            fn(state);
-          });
-        },
-        write: jest.fn((state) => {
-          history.push(state);
-        }),
-      });
-
-      const search = instantsearch({
-        indexName: 'indexName',
-        searchClient,
-        routing: {
-          router,
-          stateMapping,
-        },
-      });
-
-      const fakeSearchBox = connectSearchBox(() => {})({});
-      const fakeHitsPerPage = connectHitsPerPage(() => {})({
-        items: [{ default: true, value: 1, label: 'one' }],
-      });
-
-      search.addWidgets([fakeSearchBox, fakeHitsPerPage]);
-
-      search.start();
-
-      await wait(0);
-
-      // Trigger an update - push a change
-      search.renderState.indexName.searchBox!.refine('Apple');
-
-      await wait(0);
-
-      expect(router.write).toHaveBeenCalledTimes(1);
-      expect(router.write).toHaveBeenLastCalledWith({
-        indexName: {
-          query: 'Apple',
-        },
-      });
-
-      // Trigger an update - push a change
-      search.renderState.indexName.searchBox!.refine('Apple iPhone');
-
-      await wait(0);
-
-      expect(router.write).toHaveBeenCalledTimes(2);
-      expect(router.write).toHaveBeenLastCalledWith({
-        indexName: {
-          query: 'Apple iPhone',
-        },
-      });
-
-      await wait(0);
-
-      // Trigger an update - Apple iPhone → Apple
-      history.back();
-
-      await wait(0);
-
-      // Trigger change
-      search.removeWidgets([fakeHitsPerPage]);
-
-      await wait(0);
-
-      expect(router.write).toHaveBeenCalledTimes(3);
-      expect(router.write).toHaveBeenLastCalledWith({
-        indexName: {
-          query: 'Apple',
-        },
-      });
-    });
-
-    test('skips duplicate route state entries', async () => {
-      let triggerChange = false;
-      const searchClient = createSearchClient();
-      const stateMapping = createFakeStateMapping({
-        stateToRoute(uiState) {
-          if (triggerChange) {
-            return {
-              ...uiState,
-              indexName: {
-                ...uiState.indexName,
-                triggerChange,
-              },
-            };
-          }
-
-          return uiState;
-        },
-      });
-      const history = createFakeHistory<UiState>();
-      const router = createFakeRouter({
-        onUpdate(fn) {
-          history.subscribe((state) => {
-            fn(state);
-          });
-        },
-        write: jest.fn((state) => {
-          history.push(state);
-        }),
-      });
-
-      const search = instantsearch({
-        indexName: 'indexName',
-        searchClient,
-        routing: {
-          router,
-          stateMapping,
-        },
-      });
-
-      const fakeSearchBox = connectSearchBox(() => {})({});
-      const fakeHitsPerPage1 = connectHitsPerPage(() => {})({
-        items: [{ default: true, value: 1, label: 'one' }],
-      });
-      const fakeHitsPerPage2 = connectHitsPerPage(() => {})({
-        items: [{ default: true, value: 1, label: 'one' }],
-      });
-
-      search.addWidgets([fakeSearchBox, fakeHitsPerPage1, fakeHitsPerPage2]);
-
-      search.start();
-
-      await wait(0);
-
-      // Trigger an update - push a change
-      search.renderState.indexName.searchBox!.refine('Apple');
-
-      await wait(0);
-
-      expect(router.write).toHaveBeenCalledTimes(1);
-      expect(router.write).toHaveBeenLastCalledWith({
-        indexName: {
-          query: 'Apple',
-        },
-      });
-
-      // Trigger change without UI state change
-      search.removeWidgets([fakeHitsPerPage1]);
-
-      await wait(0);
-
-      expect(router.write).toHaveBeenCalledTimes(1);
-
-      await wait(0);
-
-      triggerChange = true;
-      // Trigger change without UI state change but with a route change
-      search.removeWidgets([fakeHitsPerPage2]);
-
-      await wait(0);
-
-      expect(router.write).toHaveBeenCalledTimes(2);
-      expect(router.write).toHaveBeenLastCalledWith({
-        indexName: {
-          query: 'Apple',
-          triggerChange: true,
-        },
-      });
-    });
-  });
-
-  describe('windowTitle', () => {
-    test('should update the window title with URL query params on first render', async () => {
-      jsdom.reconfigure({
-        url: 'https://website.com/?query=query',
-      });
-
-      const setWindowTitle = jest.spyOn(window.document, 'title', 'set');
-      const searchClient = createSearchClient();
-      const stateMapping = createFakeStateMapping({});
-      const router = historyRouter({
-        windowTitle(routeState) {
-          return `Searching for "${routeState.query}"`;
-        },
-      });
-
-      const search = instantsearch({
-        indexName: 'instant_search',
-        searchClient,
-        routing: {
-          router,
-          stateMapping,
-        },
-      });
-
-      const fakeSearchBox = connectSearchBox(() => {})({});
-
-      search.addWidgets([fakeSearchBox]);
-      search.start();
-
-      await wait(0);
-
-      expect(setWindowTitle).toHaveBeenCalledTimes(1);
-      expect(setWindowTitle).toHaveBeenLastCalledWith('Searching for "query"');
-
-      setWindowTitle.mockRestore();
-    });
-  });
-
-  describe('parseURL', () => {
-    const createFakeUrlWithRefinements: ({
-      length,
-    }: {
-      length: number;
-    }) => string = ({ length }) =>
-      [
-        'https://website.com/',
-        Array.from(
-          { length },
-          (_v, i) => `refinementList[brand][${i}]=brand-${i}`
-        ).join('&'),
-      ].join('?');
-
-    test('should parse refinements with more than 20 filters per category as array', () => {
-      jsdom.reconfigure({
-        url: createFakeUrlWithRefinements({ length: 22 }),
-      });
-
-      const router = historyRouter<IndexUiState>();
-      // @ts-expect-error: This method is considered private but we still use it
-      // in the test after the TypeScript migration.
-      // In a next refactor, we can consider changing this test implementation.
-      const parsedUrl = router.parseURL({
-        qsModule: qs,
-        currentURL: new URL(window.location.href),
-      });
-
-      expect(parsedUrl.refinementList!.brand).toBeInstanceOf(Array);
-      expect(parsedUrl).toMatchInlineSnapshot(`
-        {
-          "refinementList": {
-            "brand": [
-              "brand-0",
-              "brand-1",
-              "brand-2",
-              "brand-3",
-              "brand-4",
-              "brand-5",
-              "brand-6",
-              "brand-7",
-              "brand-8",
-              "brand-9",
-              "brand-10",
-              "brand-11",
-              "brand-12",
-              "brand-13",
-              "brand-14",
-              "brand-15",
-              "brand-16",
-              "brand-17",
-              "brand-18",
-              "brand-19",
-              "brand-20",
-              "brand-21",
-            ],
-          },
-        }
-      `);
-    });
-
-    test('should support returning 100 refinements as array', () => {
-      jsdom.reconfigure({
-        url: createFakeUrlWithRefinements({ length: 100 }),
-      });
-
-      const router = historyRouter<IndexUiState>();
-      // @ts-expect-error: This method is considered private but we still use it
-      // in the test after the TypeScript migration.
-      // In a next refactor, we can consider changing this test implementation.
-      const parsedUrl = router.parseURL({
-        qsModule: qs,
-        currentURL: new URL(window.location.href),
-      });
-
-      expect(parsedUrl.refinementList!.brand).toBeInstanceOf(Array);
-    });
-  });
-
-  describe('createURL', () => {
-    it('returns an URL for a `routeState` with refinements', () => {
-      const router = historyRouter<IndexUiState>();
-      const actual = router.createURL({
-        query: 'iPhone',
-        page: 5,
-      });
-
-      expect(actual).toBe('https://website.com/?query=iPhone&page=5');
-    });
-
-    it('returns an URL for an empty `routeState` with index', () => {
-      const router = historyRouter();
-      const actual = router.createURL({
-        indexName: {},
-      });
-
-      expect(actual).toBe('https://website.com/');
-    });
-
-    it('returns an URL for an empty `routeState`', () => {
-      const router = historyRouter();
-      const actual = router.createURL({});
-
-      expect(actual).toBe('https://website.com/');
-    });
-  });
-});
diff --git a/packages/instantsearch-core/src/__tests__/instantsearch-routing.test.ts b/packages/instantsearch-core/src/__tests__/instantsearch-routing.test.ts
new file mode 100644
index 0000000000..9e44116038
--- /dev/null
+++ b/packages/instantsearch-core/src/__tests__/instantsearch-routing.test.ts
@@ -0,0 +1,390 @@
+import { createSearchClient } from '@instantsearch/mocks';
+import { wait } from '@instantsearch/testutils/wait';
+import { createWidget } from 'instantsearch-core/test/createWidget';
+
+import { instantsearch, connectHitsPerPage, connectSearchBox } from '..';
+
+import type { Router, UiState, StateMapping } from '../types';
+
+const createFakeRouter = (args: Partial<Router> = {}): Router => ({
+  onUpdate(..._args) {},
+  write(..._args) {},
+  read() {
+    return {};
+  },
+  createURL(..._args) {
+    return '';
+  },
+  dispose() {
+    return undefined;
+  },
+  ...args,
+});
+
+const createFakeStateMapping = (
+  args: Partial<StateMapping> = {}
+): StateMapping => ({
+  stateToRoute(uiState) {
+    return uiState;
+  },
+  routeToState(routeState) {
+    return routeState;
+  },
+  ...args,
+});
+
+type HistoryState<TEntry> = {
+  index: number;
+  entries: TEntry[];
+  listeners: Array<(value: TEntry) => void>;
+};
+
+const createFakeHistory = <TEntry = Record<string, unknown>>(
+  {
+    index = -1,
+    entries = [],
+    listeners = [],
+  }: HistoryState<TEntry> = {} as HistoryState<TEntry>
+) => {
+  const state: HistoryState<TEntry> = {
+    index,
+    entries,
+    listeners,
+  };
+
+  return {
+    subscribe(listener: (entry: TEntry) => void) {
+      state.listeners.push(listener);
+    },
+    push(value: TEntry) {
+      state.entries.push(value);
+      state.index++;
+    },
+    back() {
+      state.index--;
+      listeners.forEach((listener) => {
+        listener(state.entries[state.index]);
+      });
+    },
+  };
+};
+
+describe('instantsearch custom router', () => {
+  test('should write in the router on searchParameters change', async () => {
+    const searchClient = createSearchClient();
+    const router = createFakeRouter({
+      write: jest.fn(),
+    });
+
+    const search = instantsearch({
+      indexName: 'indexName',
+      searchClient,
+      routing: {
+        router,
+      },
+    });
+
+    const widget = createWidget({
+      render: jest.fn(),
+      getWidgetUiState: jest.fn((uiState, { searchParameters }) => ({
+        ...uiState,
+        q: searchParameters.query,
+      })),
+      getWidgetSearchParameters: jest.fn(
+        (searchParameters) => searchParameters
+      ),
+    });
+
+    search.addWidgets([widget]);
+
+    search.start();
+
+    // initialization is done at this point
+    await wait(0);
+
+    expect(widget.render).toHaveBeenCalledTimes(1);
+    expect(widget.getWidgetSearchParameters).toHaveBeenCalledTimes(1);
+
+    await wait(0);
+
+    expect(router.write).toHaveBeenCalledTimes(0);
+
+    search.mainIndex.getHelper()!.setQuery('q'); // routing write updates on change
+
+    await wait(0);
+
+    expect(router.write).toHaveBeenCalledTimes(1);
+    expect(router.write).toHaveBeenCalledWith({
+      indexName: {
+        q: 'q',
+      },
+    });
+  });
+
+  test('should update the searchParameters on router state update', async () => {
+    const searchClient = createSearchClient();
+
+    let onRouterUpdateCallback: (args: UiState) => void;
+    const router = createFakeRouter({
+      onUpdate: (fn) => {
+        onRouterUpdateCallback = fn;
+      },
+    });
+
+    const search = instantsearch({
+      indexName: 'indexName',
+      searchClient,
+      routing: {
+        router,
+      },
+    });
+
+    const widget = createWidget({
+      render: jest.fn(),
+      getWidgetSearchParameters: jest.fn((searchParameters, { uiState }) =>
+        searchParameters.setQuery(uiState.query!)
+      ),
+    });
+
+    search.addWidgets([widget]);
+
+    search.start();
+
+    await wait(0);
+    // initialization is done at this point
+
+    expect(search.mainIndex.getHelper()!.state.query).toBeUndefined();
+
+    // this simulates a router update with a uiState of {query: 'a'}
+    onRouterUpdateCallback!({
+      indexName: {
+        query: 'a',
+      },
+    });
+
+    await wait(0);
+
+    // the router update triggers a new search
+    // and given that the widget reads q as a query parameter
+    expect(search.mainIndex.getHelper()!.state.query).toEqual('a');
+  });
+
+  test('should keep the UI state up to date on state changes', async () => {
+    const searchClient = createSearchClient();
+    const stateMapping = createFakeStateMapping({});
+    const router = createFakeRouter({
+      write: jest.fn(),
+    });
+
+    const search = instantsearch({
+      indexName: 'indexName',
+      searchClient,
+      routing: {
+        stateMapping,
+        router,
+      },
+    });
+
+    const fakeSearchBox = connectSearchBox(() => {})({});
+    const fakeHitsPerPage = connectHitsPerPage(() => {})({
+      items: [{ default: true, value: 1, label: 'one' }],
+    });
+
+    search.addWidgets([fakeSearchBox, fakeHitsPerPage]);
+
+    search.start();
+
+    await wait(0);
+
+    // Trigger an update - push a change
+    search.renderState.indexName.searchBox!.refine('Apple');
+
+    await wait(0);
+
+    expect(router.write).toHaveBeenCalledTimes(1);
+    expect(router.write).toHaveBeenLastCalledWith({
+      indexName: {
+        query: 'Apple',
+      },
+    });
+
+    await wait(0);
+
+    // Trigger change
+    search.removeWidgets([fakeHitsPerPage]);
+
+    await wait(0);
+
+    // The UI state hasn't changed so `router.write` wasn't called a second
+    // time
+    expect(router.write).toHaveBeenCalledTimes(1);
+  });
+
+  test('should keep the UI state up to date on router.update', async () => {
+    const searchClient = createSearchClient();
+    const stateMapping = createFakeStateMapping({});
+    const history = createFakeHistory<UiState>();
+    const router = createFakeRouter({
+      onUpdate(fn) {
+        history.subscribe((state) => {
+          fn(state);
+        });
+      },
+      write: jest.fn((state) => {
+        history.push(state);
+      }),
+    });
+
+    const search = instantsearch({
+      indexName: 'indexName',
+      searchClient,
+      routing: {
+        router,
+        stateMapping,
+      },
+    });
+
+    const fakeSearchBox = connectSearchBox(() => {})({});
+    const fakeHitsPerPage = connectHitsPerPage(() => {})({
+      items: [{ default: true, value: 1, label: 'one' }],
+    });
+
+    search.addWidgets([fakeSearchBox, fakeHitsPerPage]);
+
+    search.start();
+
+    await wait(0);
+
+    // Trigger an update - push a change
+    search.renderState.indexName.searchBox!.refine('Apple');
+
+    await wait(0);
+
+    expect(router.write).toHaveBeenCalledTimes(1);
+    expect(router.write).toHaveBeenLastCalledWith({
+      indexName: {
+        query: 'Apple',
+      },
+    });
+
+    // Trigger an update - push a change
+    search.renderState.indexName.searchBox!.refine('Apple iPhone');
+
+    await wait(0);
+
+    expect(router.write).toHaveBeenCalledTimes(2);
+    expect(router.write).toHaveBeenLastCalledWith({
+      indexName: {
+        query: 'Apple iPhone',
+      },
+    });
+
+    await wait(0);
+
+    // Trigger an update - Apple iPhone → Apple
+    history.back();
+
+    await wait(0);
+
+    // Trigger change
+    search.removeWidgets([fakeHitsPerPage]);
+
+    await wait(0);
+
+    expect(router.write).toHaveBeenCalledTimes(3);
+    expect(router.write).toHaveBeenLastCalledWith({
+      indexName: {
+        query: 'Apple',
+      },
+    });
+  });
+
+  test('skips duplicate route state entries', async () => {
+    let triggerChange = false;
+    const searchClient = createSearchClient();
+    const stateMapping = createFakeStateMapping({
+      stateToRoute(uiState) {
+        if (triggerChange) {
+          return {
+            ...uiState,
+            indexName: {
+              ...uiState.indexName,
+              triggerChange,
+            },
+          };
+        }
+
+        return uiState;
+      },
+    });
+    const history = createFakeHistory<UiState>();
+    const router = createFakeRouter({
+      onUpdate(fn) {
+        history.subscribe((state) => {
+          fn(state);
+        });
+      },
+      write: jest.fn((state) => {
+        history.push(state);
+      }),
+    });
+
+    const search = instantsearch({
+      indexName: 'indexName',
+      searchClient,
+      routing: {
+        router,
+        stateMapping,
+      },
+    });
+
+    const fakeSearchBox = connectSearchBox(() => {})({});
+    const fakeHitsPerPage1 = connectHitsPerPage(() => {})({
+      items: [{ default: true, value: 1, label: 'one' }],
+    });
+    const fakeHitsPerPage2 = connectHitsPerPage(() => {})({
+      items: [{ default: true, value: 1, label: 'one' }],
+    });
+
+    search.addWidgets([fakeSearchBox, fakeHitsPerPage1, fakeHitsPerPage2]);
+
+    search.start();
+
+    await wait(0);
+
+    // Trigger an update - push a change
+    search.renderState.indexName.searchBox!.refine('Apple');
+
+    await wait(0);
+
+    expect(router.write).toHaveBeenCalledTimes(1);
+    expect(router.write).toHaveBeenLastCalledWith({
+      indexName: {
+        query: 'Apple',
+      },
+    });
+
+    // Trigger change without UI state change
+    search.removeWidgets([fakeHitsPerPage1]);
+
+    await wait(0);
+
+    expect(router.write).toHaveBeenCalledTimes(1);
+
+    await wait(0);
+
+    triggerChange = true;
+    // Trigger change without UI state change but with a route change
+    search.removeWidgets([fakeHitsPerPage2]);
+
+    await wait(0);
+
+    expect(router.write).toHaveBeenCalledTimes(2);
+    expect(router.write).toHaveBeenLastCalledWith({
+      indexName: {
+        query: 'Apple',
+        triggerChange: true,
+      },
+    });
+  });
+});
diff --git a/packages/instantsearch-core/src/routing/__tests__/historyRouter-integration.test.ts b/packages/instantsearch-core/src/routing/__tests__/historyRouter-integration.test.ts
index 99802d69a9..fe4f49f5dc 100644
--- a/packages/instantsearch-core/src/routing/__tests__/historyRouter-integration.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/historyRouter-integration.test.ts
@@ -17,126 +17,128 @@ beforeEach(() => {
 const writeDelay = 10;
 const writeWait = 10 * writeDelay;
 
-test('keeps url with cleanUrlOnDispose: false', async () => {
-  const router = historyRouter({ writeDelay, cleanUrlOnDispose: false });
-
-  const indexName = 'indexName';
-  const search = instantsearch({
-    indexName,
-    searchClient: createSearchClient(),
-    routing: {
-      router,
-    },
-  });
-
-  search.addWidgets([
-    connectPagination(() => {})({}),
-    index({ indexName }).addWidgets([connectSearchBox(() => {})({})]),
-  ]);
+describe('historyRouter({ cleanUrlOnDispose })', () => {
+  test('keeps url with cleanUrlOnDispose: false', async () => {
+    const router = historyRouter({ writeDelay, cleanUrlOnDispose: false });
 
-  search.start();
+    const indexName = 'indexName';
+    const search = instantsearch({
+      indexName,
+      searchClient: createSearchClient(),
+      routing: {
+        router,
+      },
+    });
 
-  expect(window.location.search).toBe('');
+    search.addWidgets([
+      connectPagination(() => {})({}),
+      index({ indexName }).addWidgets([connectSearchBox(() => {})({})]),
+    ]);
 
-  // on nested index
-  search.renderState[indexName].searchBox!.refine('test');
-  // on main index
-  search.renderState[indexName].pagination!.refine(39);
+    search.start();
 
-  await wait(writeWait);
+    expect(window.location.search).toBe('');
 
-  expect(window.location.search).toBe(
-    `?${encodeURI('indexName[page]=40&indexName[query]=test')}`
-  );
+    // on nested index
+    search.renderState[indexName].searchBox!.refine('test');
+    // on main index
+    search.renderState[indexName].pagination!.refine(39);
 
-  search.dispose();
+    await wait(writeWait);
 
-  await wait(writeWait);
+    expect(window.location.search).toBe(
+      `?${encodeURI('indexName[page]=40&indexName[query]=test')}`
+    );
 
-  // URL has not been cleaned
-  expect(window.location.search).toBe(
-    `?${encodeURI('indexName[page]=40&indexName[query]=test')}`
-  );
-});
+    search.dispose();
 
-test('clears url with cleanUrlOnDispose: true', async () => {
-  const router = historyRouter({ writeDelay, cleanUrlOnDispose: true });
+    await wait(writeWait);
 
-  const indexName = 'indexName';
-  const search = instantsearch({
-    indexName,
-    searchClient: createSearchClient(),
-    routing: {
-      router,
-    },
+    // URL has not been cleaned
+    expect(window.location.search).toBe(
+      `?${encodeURI('indexName[page]=40&indexName[query]=test')}`
+    );
   });
 
-  search.addWidgets([
-    connectPagination(() => {})({}),
-    index({ indexName }).addWidgets([connectSearchBox(() => {})({})]),
-  ]);
+  test('clears url with cleanUrlOnDispose: true', async () => {
+    const router = historyRouter({ writeDelay, cleanUrlOnDispose: true });
 
-  search.start();
+    const indexName = 'indexName';
+    const search = instantsearch({
+      indexName,
+      searchClient: createSearchClient(),
+      routing: {
+        router,
+      },
+    });
 
-  expect(window.location.search).toBe('');
+    search.addWidgets([
+      connectPagination(() => {})({}),
+      index({ indexName }).addWidgets([connectSearchBox(() => {})({})]),
+    ]);
 
-  // on nested index
-  search.renderState[indexName].searchBox!.refine('test');
-  // on main index
-  search.renderState[indexName].pagination!.refine(39);
+    search.start();
 
-  await wait(writeWait);
+    expect(window.location.search).toBe('');
 
-  expect(window.location.search).toBe(
-    `?${encodeURI('indexName[page]=40&indexName[query]=test')}`
-  );
+    // on nested index
+    search.renderState[indexName].searchBox!.refine('test');
+    // on main index
+    search.renderState[indexName].pagination!.refine(39);
 
-  search.dispose();
+    await wait(writeWait);
 
-  await wait(writeWait);
+    expect(window.location.search).toBe(
+      `?${encodeURI('indexName[page]=40&indexName[query]=test')}`
+    );
 
-  // URL has been cleaned
-  expect(window.location.search).toBe('');
-});
+    search.dispose();
 
-test('does not clear url with cleanUrlOnDispose: undefined', async () => {
-  const router = historyRouter({ writeDelay });
+    await wait(writeWait);
 
-  const indexName = 'indexName';
-  const search = instantsearch({
-    indexName,
-    searchClient: createSearchClient(),
-    routing: {
-      router,
-    },
+    // URL has been cleaned
+    expect(window.location.search).toBe('');
   });
 
-  search.addWidgets([
-    connectPagination(() => {})({}),
-    index({ indexName }).addWidgets([connectSearchBox(() => {})({})]),
-  ]);
+  test('does not clear url with cleanUrlOnDispose: undefined', async () => {
+    const router = historyRouter({ writeDelay });
 
-  search.start();
+    const indexName = 'indexName';
+    const search = instantsearch({
+      indexName,
+      searchClient: createSearchClient(),
+      routing: {
+        router,
+      },
+    });
 
-  expect(window.location.search).toBe('');
+    search.addWidgets([
+      connectPagination(() => {})({}),
+      index({ indexName }).addWidgets([connectSearchBox(() => {})({})]),
+    ]);
 
-  // on nested index
-  search.renderState[indexName].searchBox!.refine('test');
-  // on main index
-  search.renderState[indexName].pagination!.refine(39);
+    search.start();
 
-  await wait(writeWait);
+    expect(window.location.search).toBe('');
 
-  expect(window.location.search).toBe(
-    `?${encodeURI('indexName[page]=40&indexName[query]=test')}`
-  );
+    // on nested index
+    search.renderState[indexName].searchBox!.refine('test');
+    // on main index
+    search.renderState[indexName].pagination!.refine(39);
 
-  search.dispose();
+    await wait(writeWait);
 
-  await wait(writeWait);
+    expect(window.location.search).toBe(
+      `?${encodeURI('indexName[page]=40&indexName[query]=test')}`
+    );
 
-  // URL has not been cleaned
-  expect(window.location.search).toBe(
-    `?${encodeURI('indexName[page]=40&indexName[query]=test')}`
-  );
+    search.dispose();
+
+    await wait(writeWait);
+
+    // URL has not been cleaned
+    expect(window.location.search).toBe(
+      `?${encodeURI('indexName[page]=40&indexName[query]=test')}`
+    );
+  });
 });
diff --git a/packages/instantsearch-core/src/routing/__tests__/historyRouter.test.ts b/packages/instantsearch-core/src/routing/__tests__/historyRouter.test.ts
index 74a0e8ed52..406632cd47 100644
--- a/packages/instantsearch-core/src/routing/__tests__/historyRouter.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/historyRouter.test.ts
@@ -10,13 +10,14 @@ import {
   instantsearch,
   noop,
   warnCache,
+  connectSearchBox,
 } from '../..';
 
-import type { UiState } from '../../types';
+import type { IndexUiState, UiState } from '../../types';
 
 jest.useFakeTimers();
 
-describe('life cycle', () => {
+describe('historyRouter', () => {
   const originalWindow = (global as any).window;
 
   beforeEach(() => {
@@ -81,7 +82,7 @@ describe('life cycle', () => {
   });
 
   describe('getCurrentURL', () => {
-    test('calls getCurrentURL on windowTitle', () => {
+    test('calls getCurrentURL on load', () => {
       const getCurrentURL = jest.fn(() => new URL(window.location.href));
 
       historyRouter<UiState>({
@@ -366,5 +367,127 @@ describe('life cycle', () => {
         .toWarnDev(`[InstantSearch]: The URL returned by the \`createURL\` function is invalid.
 Please make sure it returns an absolute URL to avoid issues, e.g: \`https://algolia.com/search?query=iphone\`.`);
     });
+
+    it('returns an URL for a `routeState` with refinements', () => {
+      const router = historyRouter<IndexUiState>();
+      const actual = router.createURL({
+        query: 'iPhone',
+        page: 5,
+      });
+
+      expect(actual).toBe('http://localhost/?query=iPhone&page=5');
+    });
+
+    it('returns an URL for an empty `routeState` with index', () => {
+      const router = historyRouter();
+      const actual = router.createURL({
+        indexName: {},
+      });
+
+      expect(actual).toBe('http://localhost/');
+    });
+
+    it('returns an URL for an empty `routeState`', () => {
+      const router = historyRouter();
+      const actual = router.createURL({});
+
+      expect(actual).toBe('http://localhost/');
+    });
+  });
+
+  describe('read', () => {
+    const createFakeUrlWithRefinements: ({
+      length,
+    }: {
+      length: number;
+    }) => string = ({ length }) =>
+      `http://localhost/?${Array.from(
+        { length },
+        (_v, i) => `refinementList[brand][${i}]=brand-${i}`
+      ).join('&')}`;
+
+    test('should parse refinements with more than 20 filters per category as array', () => {
+      history.pushState({}, '', createFakeUrlWithRefinements({ length: 22 }));
+
+      const router = historyRouter<IndexUiState>();
+      const parsedUrl = router.read();
+
+      expect(parsedUrl.refinementList!.brand).toBeInstanceOf(Array);
+      expect(parsedUrl.refinementList!.brand).toHaveLength(22);
+      expect(parsedUrl).toMatchInlineSnapshot(`
+        {
+          "refinementList": {
+            "brand": [
+              "brand-0",
+              "brand-1",
+              "brand-2",
+              "brand-3",
+              "brand-4",
+              "brand-5",
+              "brand-6",
+              "brand-7",
+              "brand-8",
+              "brand-9",
+              "brand-10",
+              "brand-11",
+              "brand-12",
+              "brand-13",
+              "brand-14",
+              "brand-15",
+              "brand-16",
+              "brand-17",
+              "brand-18",
+              "brand-19",
+              "brand-20",
+              "brand-21",
+            ],
+          },
+        }
+      `);
+    });
+
+    test('should support returning 100 refinements as array', () => {
+      history.pushState({}, '', createFakeUrlWithRefinements({ length: 100 }));
+
+      const router = historyRouter<IndexUiState>();
+      const parsedUrl = router.read();
+
+      expect(parsedUrl.refinementList!.brand).toBeInstanceOf(Array);
+      expect(parsedUrl.refinementList!.brand).toHaveLength(100);
+    });
+  });
+
+  describe('windowTitle', () => {
+    test('should update the window title with URL query params on first render', () => {
+      history.pushState({}, '', 'http://localhost/?query=query');
+
+      const setWindowTitle = jest.spyOn(window.document, 'title', 'set');
+      const searchClient = createSearchClient();
+      const router = historyRouter({
+        windowTitle(routeState) {
+          return `Searching for "${routeState.query}"`;
+        },
+      });
+
+      const search = instantsearch({
+        indexName: 'instant_search',
+        searchClient,
+        routing: {
+          router,
+        },
+      });
+
+      const fakeSearchBox = connectSearchBox(() => {})({});
+
+      search.addWidgets([fakeSearchBox]);
+      search.start();
+
+      expect(true).toBe(true);
+
+      expect(setWindowTitle).toHaveBeenCalledTimes(1);
+      expect(setWindowTitle).toHaveBeenLastCalledWith('Searching for "query"');
+
+      setWindowTitle.mockRestore();
+    });
   });
 });
diff --git a/packages/instantsearch-core/src/routing/__tests__/routing-clean/correct-urls.test.ts b/packages/instantsearch-core/src/routing/__tests__/routing-clean/correct-urls.test.ts
new file mode 100644
index 0000000000..34d790db03
--- /dev/null
+++ b/packages/instantsearch-core/src/routing/__tests__/routing-clean/correct-urls.test.ts
@@ -0,0 +1,87 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import { createSearchClient } from '@instantsearch/mocks';
+import { wait } from '@instantsearch/testutils/wait';
+
+import {
+  instantsearch,
+  index,
+  historyRouter,
+  connectPagination,
+  connectSearchBox,
+} from '../../..';
+
+beforeEach(() => {
+  window.history.pushState({}, '', '/');
+});
+
+const writeDelay = 10;
+const writeWait = 10 * writeDelay;
+
+test('correct URL for widgets', async () => {
+  const router = historyRouter({ cleanUrlOnDispose: true, writeDelay });
+
+  const indexName = 'indexName';
+  const search = instantsearch({
+    indexName,
+    searchClient: createSearchClient(),
+    routing: {
+      router,
+    },
+  });
+
+  search.addWidgets([
+    connectPagination(() => {})({}),
+    connectSearchBox(() => {})({}),
+  ]);
+
+  search.start();
+
+  expect(window.location.search).toBe('');
+
+  // on nested index
+  search.renderState[indexName].searchBox!.refine('test');
+  // on main index
+  search.renderState[indexName].pagination!.refine(39);
+
+  await wait(writeWait);
+
+  expect(window.location.search).toBe(
+    `?${encodeURI('indexName[page]=40&indexName[query]=test')}`
+  );
+});
+
+test('correct URL for widgets in indices with repeated indexId', async () => {
+  const router = historyRouter({ cleanUrlOnDispose: true, writeDelay });
+
+  const indexName = 'indexName';
+  const search = instantsearch({
+    indexName,
+    searchClient: createSearchClient(),
+    routing: {
+      router,
+    },
+  });
+
+  search.addWidgets([
+    connectPagination(() => {})({}),
+    index({ indexName }).addWidgets([connectSearchBox(() => {})({})]),
+  ]);
+
+  search.start();
+
+  expect(window.location.search).toBe('');
+
+  // on nested index
+  search.renderState[indexName].searchBox!.refine('test');
+  // on main index
+  search.renderState[indexName].pagination!.refine(39);
+
+  await wait(writeWait);
+
+  expect(window.location.search).toBe(
+    `?${encodeURI('indexName[page]=40&indexName[query]=test')}`
+  );
+});
diff --git a/packages/instantsearch-core/src/routing/__tests__/dispose-start-clean.test.ts b/packages/instantsearch-core/src/routing/__tests__/routing-clean/dispose-start.test.ts
similarity index 97%
rename from packages/instantsearch-core/src/routing/__tests__/dispose-start-clean.test.ts
rename to packages/instantsearch-core/src/routing/__tests__/routing-clean/dispose-start.test.ts
index c3c8028bb2..517ca29770 100644
--- a/packages/instantsearch-core/src/routing/__tests__/dispose-start-clean.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/routing-clean/dispose-start.test.ts
@@ -5,9 +5,9 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
 
-import { instantsearch, historyRouter, connectSearchBox } from '../..';
+import { instantsearch, historyRouter, connectSearchBox } from '../../..';
 
-import type { InstantSearch } from '../..';
+import type { InstantSearch } from '../../..';
 
 /* eslint no-lone-blocks: "off" */
 
@@ -36,8 +36,8 @@ describe('routing back and forth to an InstantSearch instance', () => {
       searchClient: createSearchClient(),
       routing: {
         router: historyRouter({
-          writeDelay,
           cleanUrlOnDispose: true,
+          writeDelay,
         }),
       },
     });
diff --git a/packages/instantsearch-core/src/routing/__tests__/routing-clean/duplicate-url.test.ts b/packages/instantsearch-core/src/routing/__tests__/routing-clean/duplicate-url.test.ts
new file mode 100644
index 0000000000..184166d622
--- /dev/null
+++ b/packages/instantsearch-core/src/routing/__tests__/routing-clean/duplicate-url.test.ts
@@ -0,0 +1,86 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import { createSearchClient } from '@instantsearch/mocks';
+import { wait } from '@instantsearch/testutils/wait';
+
+import {
+  instantsearch,
+  historyRouter,
+  connectPagination,
+  connectSearchBox,
+} from '../../..';
+
+/* eslint no-lone-blocks: "off" */
+
+const writeDelay = 10;
+const writeWait = 10 * writeDelay;
+
+test('does not write the same URL twice', async () => {
+  // -- Flow
+  // 0. page is filtered out via stateMapping
+  // 1. Initial: '/'
+  // 2. Refine query: '/?indexName[query]=Apple' (writes)
+  // 3. Refine page: '/?indexName[query]=Apple' (does not write)
+
+  const pushState = jest.spyOn(window.history, 'pushState');
+
+  const search = instantsearch({
+    indexName: 'indexName',
+    searchClient: createSearchClient(),
+    routing: {
+      stateMapping: {
+        stateToRoute(uiState) {
+          return Object.fromEntries(
+            Object.entries(uiState).map(
+              ([indexId, { page, ...indexUiState }]) => [indexId, indexUiState]
+            )
+          );
+        },
+        routeToState(routeState) {
+          return routeState;
+        },
+      },
+      router: historyRouter({
+        cleanUrlOnDispose: true,
+        writeDelay,
+      }),
+    },
+  });
+
+  // 1. Initial: '/'
+  {
+    search.addWidgets([
+      connectSearchBox(() => {})({}),
+      connectPagination(() => {})({}),
+    ]);
+    search.start();
+
+    await wait(writeWait);
+    expect(window.location.search).toEqual('');
+    expect(pushState).toHaveBeenCalledTimes(0);
+  }
+
+  // 2. Refine query: '/?indexName[query]=Apple'
+  {
+    search.renderState.indexName.searchBox!.refine('Apple');
+
+    await wait(writeWait);
+    expect(window.location.search).toEqual(
+      `?${encodeURI('indexName[query]=Apple')}`
+    );
+    expect(pushState).toHaveBeenCalledTimes(1);
+  }
+
+  // 3. Refine page: '/?indexName[query]=Apple'
+  {
+    search.renderState.indexName.pagination!.refine(2);
+
+    await wait(writeWait);
+    expect(window.location.search).toEqual(
+      `?${encodeURI('indexName[query]=Apple')}`
+    );
+    expect(pushState).toHaveBeenCalledTimes(1);
+  }
+});
diff --git a/packages/instantsearch-core/src/routing/__tests__/routing-clean/external-influence.test.ts b/packages/instantsearch-core/src/routing/__tests__/routing-clean/external-influence.test.ts
new file mode 100644
index 0000000000..62731b57d5
--- /dev/null
+++ b/packages/instantsearch-core/src/routing/__tests__/routing-clean/external-influence.test.ts
@@ -0,0 +1,78 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import { createSearchClient } from '@instantsearch/mocks';
+import { wait } from '@instantsearch/testutils/wait';
+
+import { instantsearch, historyRouter, connectSearchBox } from '../../..';
+
+/* eslint no-lone-blocks: "off" */
+
+const writeDelay = 10;
+const writeWait = 10 * writeDelay;
+
+describe('routing with external influence', () => {
+  test('keeps on working when the URL is updated by another program', async () => {
+    // -- Flow
+    // 1. Initial: '/'
+    // 2. Refine: '/?indexName[query]=Apple'
+    // 3. External influence: '/about'
+    // 4. Refine: '/about?indexName[query]=Samsung'
+
+    const pushState = jest.spyOn(window.history, 'pushState');
+
+    const search = instantsearch({
+      indexName: 'indexName',
+      searchClient: createSearchClient(),
+      routing: {
+        router: historyRouter({
+          cleanUrlOnDispose: true,
+          writeDelay,
+        }),
+      },
+    });
+
+    // 1. Initial: '/'
+    {
+      search.addWidgets([connectSearchBox(() => {})({})]);
+      search.start();
+
+      await wait(writeWait);
+      expect(window.location.search).toEqual('');
+      expect(pushState).toHaveBeenCalledTimes(0);
+    }
+
+    // 2. Refine: '/?indexName[query]=Apple'
+    {
+      search.renderState.indexName.searchBox!.refine('Apple');
+
+      await wait(writeWait);
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Apple')}`
+      );
+      expect(pushState).toHaveBeenCalledTimes(1);
+    }
+
+    // 3. External influence: '/about'
+    {
+      window.history.pushState({}, '', '/about');
+
+      await wait(writeWait);
+      expect(window.location.pathname).toEqual('/about');
+      expect(window.location.search).toEqual('');
+      expect(pushState).toHaveBeenCalledTimes(2);
+    }
+
+    // 4. Refine: '/about?indexName[query]=Samsung'
+    {
+      search.renderState.indexName.searchBox!.refine('Samsung');
+
+      await wait(writeWait);
+      expect(window.location.pathname).toEqual('/about');
+      expect(window.location.search).toEqual(
+        `?${encodeURI('indexName[query]=Samsung')}`
+      );
+    }
+  });
+});
diff --git a/packages/instantsearch-core/src/routing/__tests__/modal-clean.test.ts b/packages/instantsearch-core/src/routing/__tests__/routing-clean/modal.test.ts
similarity index 99%
rename from packages/instantsearch-core/src/routing/__tests__/modal-clean.test.ts
rename to packages/instantsearch-core/src/routing/__tests__/routing-clean/modal.test.ts
index 26a8eafb8e..f30f5d1c3e 100644
--- a/packages/instantsearch-core/src/routing/__tests__/modal-clean.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/routing-clean/modal.test.ts
@@ -5,7 +5,7 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
 
-import { instantsearch, historyRouter, connectSearchBox } from '../..';
+import { instantsearch, historyRouter, connectSearchBox } from '../../..';
 
 /* eslint no-lone-blocks: "off" */
 
@@ -26,8 +26,8 @@ describe('routing with no navigation', () => {
       searchClient: createSearchClient(),
       routing: {
         router: historyRouter({
-          writeDelay,
           cleanUrlOnDispose: true,
+          writeDelay,
         }),
       },
     });
diff --git a/packages/instantsearch-core/src/routing/__tests__/spa-debounced-clean.test.ts b/packages/instantsearch-core/src/routing/__tests__/routing-clean/spa-debounced.test.ts
similarity index 99%
rename from packages/instantsearch-core/src/routing/__tests__/spa-debounced-clean.test.ts
rename to packages/instantsearch-core/src/routing/__tests__/routing-clean/spa-debounced.test.ts
index 3f2f371002..39111eeeb3 100644
--- a/packages/instantsearch-core/src/routing/__tests__/spa-debounced-clean.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/routing-clean/spa-debounced.test.ts
@@ -5,7 +5,7 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
 
-import { instantsearch, historyRouter, connectSearchBox } from '../..';
+import { instantsearch, historyRouter, connectSearchBox } from '../../..';
 
 /* eslint no-lone-blocks: "off" */
 
@@ -29,8 +29,8 @@ describe('routing with debounced third-party client-side router', () => {
       searchClient: createSearchClient(),
       routing: {
         router: historyRouter({
-          writeDelay,
           cleanUrlOnDispose: true,
+          writeDelay,
         }),
       },
     });
diff --git a/packages/instantsearch-core/src/routing/__tests__/spa-replace-state-clean.test.ts b/packages/instantsearch-core/src/routing/__tests__/routing-clean/spa-replace-state.test.ts
similarity index 99%
rename from packages/instantsearch-core/src/routing/__tests__/spa-replace-state-clean.test.ts
rename to packages/instantsearch-core/src/routing/__tests__/routing-clean/spa-replace-state.test.ts
index 83281a1ec1..e78d95441a 100644
--- a/packages/instantsearch-core/src/routing/__tests__/spa-replace-state-clean.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/routing-clean/spa-replace-state.test.ts
@@ -5,7 +5,7 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
 
-import { instantsearch, historyRouter, connectSearchBox } from '../..';
+import { instantsearch, historyRouter, connectSearchBox } from '../../..';
 
 /* eslint no-lone-blocks: "off" */
 
@@ -31,8 +31,8 @@ describe('routing using `replaceState`', () => {
       searchClient: createSearchClient(),
       routing: {
         router: historyRouter({
-          writeDelay,
           cleanUrlOnDispose: true,
+          writeDelay,
         }),
       },
     });
diff --git a/packages/instantsearch-core/src/routing/__tests__/spa-clean.test.ts b/packages/instantsearch-core/src/routing/__tests__/routing-clean/spa.test.ts
similarity index 99%
rename from packages/instantsearch-core/src/routing/__tests__/spa-clean.test.ts
rename to packages/instantsearch-core/src/routing/__tests__/routing-clean/spa.test.ts
index fc01ea85c7..1adb7869de 100644
--- a/packages/instantsearch-core/src/routing/__tests__/spa-clean.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/routing-clean/spa.test.ts
@@ -5,7 +5,7 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
 
-import { instantsearch, historyRouter, connectSearchBox } from '../..';
+import { instantsearch, historyRouter, connectSearchBox } from '../../..';
 
 /* eslint no-lone-blocks: "off" */
 
@@ -29,8 +29,8 @@ describe('routing with third-party client-side router', () => {
       searchClient: createSearchClient(),
       routing: {
         router: historyRouter({
-          writeDelay,
           cleanUrlOnDispose: true,
+          writeDelay,
         }),
       },
     });
diff --git a/packages/instantsearch-core/src/routing/__tests__/correct-urls.test.ts b/packages/instantsearch-core/src/routing/__tests__/routing/correct-urls.test.ts
similarity index 98%
rename from packages/instantsearch-core/src/routing/__tests__/correct-urls.test.ts
rename to packages/instantsearch-core/src/routing/__tests__/routing/correct-urls.test.ts
index 436e1c48e3..e030626209 100644
--- a/packages/instantsearch-core/src/routing/__tests__/correct-urls.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/routing/correct-urls.test.ts
@@ -11,7 +11,7 @@ import {
   historyRouter,
   connectPagination,
   connectSearchBox,
-} from '../..';
+} from '../../..';
 
 beforeEach(() => {
   window.history.pushState({}, '', '/');
diff --git a/packages/instantsearch-core/src/routing/__tests__/dispose-start.test.ts b/packages/instantsearch-core/src/routing/__tests__/routing/dispose-start.test.ts
similarity index 97%
rename from packages/instantsearch-core/src/routing/__tests__/dispose-start.test.ts
rename to packages/instantsearch-core/src/routing/__tests__/routing/dispose-start.test.ts
index 331c701210..8210a85f1e 100644
--- a/packages/instantsearch-core/src/routing/__tests__/dispose-start.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/routing/dispose-start.test.ts
@@ -5,9 +5,9 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
 
-import { instantsearch, historyRouter, connectSearchBox } from '../..';
+import { instantsearch, historyRouter, connectSearchBox } from '../../..';
 
-import type { InstantSearch } from '../..';
+import type { InstantSearch } from '../../..';
 
 /* eslint no-lone-blocks: "off" */
 
diff --git a/packages/instantsearch-core/src/routing/__tests__/duplicate-url.test.ts b/packages/instantsearch-core/src/routing/__tests__/routing/duplicate-url.test.ts
similarity index 99%
rename from packages/instantsearch-core/src/routing/__tests__/duplicate-url.test.ts
rename to packages/instantsearch-core/src/routing/__tests__/routing/duplicate-url.test.ts
index d93f293f76..1c82fea8ee 100644
--- a/packages/instantsearch-core/src/routing/__tests__/duplicate-url.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/routing/duplicate-url.test.ts
@@ -10,7 +10,7 @@ import {
   historyRouter,
   connectPagination,
   connectSearchBox,
-} from '../..';
+} from '../../..';
 
 /* eslint no-lone-blocks: "off" */
 
diff --git a/packages/instantsearch-core/src/routing/__tests__/external-influence.test.ts b/packages/instantsearch-core/src/routing/__tests__/routing/external-influence.test.ts
similarity index 99%
rename from packages/instantsearch-core/src/routing/__tests__/external-influence.test.ts
rename to packages/instantsearch-core/src/routing/__tests__/routing/external-influence.test.ts
index 616546f016..2bbd787ea5 100644
--- a/packages/instantsearch-core/src/routing/__tests__/external-influence.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/routing/external-influence.test.ts
@@ -5,7 +5,7 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
 
-import { instantsearch, historyRouter, connectSearchBox } from '../..';
+import { instantsearch, historyRouter, connectSearchBox } from '../../..';
 
 /* eslint no-lone-blocks: "off" */
 
diff --git a/packages/instantsearch-core/src/routing/__tests__/modal.test.ts b/packages/instantsearch-core/src/routing/__tests__/routing/modal.test.ts
similarity index 99%
rename from packages/instantsearch-core/src/routing/__tests__/modal.test.ts
rename to packages/instantsearch-core/src/routing/__tests__/routing/modal.test.ts
index 3f7dcb606c..02d100e6d5 100644
--- a/packages/instantsearch-core/src/routing/__tests__/modal.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/routing/modal.test.ts
@@ -5,7 +5,7 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
 
-import { instantsearch, historyRouter, connectSearchBox } from '../..';
+import { instantsearch, historyRouter, connectSearchBox } from '../../..';
 
 /* eslint no-lone-blocks: "off" */
 
diff --git a/packages/instantsearch-core/src/routing/__tests__/spa-debounced.test.ts b/packages/instantsearch-core/src/routing/__tests__/routing/spa-debounced.test.ts
similarity index 99%
rename from packages/instantsearch-core/src/routing/__tests__/spa-debounced.test.ts
rename to packages/instantsearch-core/src/routing/__tests__/routing/spa-debounced.test.ts
index 3b58d5dead..37bb76d147 100644
--- a/packages/instantsearch-core/src/routing/__tests__/spa-debounced.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/routing/spa-debounced.test.ts
@@ -5,7 +5,7 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
 
-import { instantsearch, historyRouter, connectSearchBox } from '../..';
+import { instantsearch, historyRouter, connectSearchBox } from '../../..';
 
 /* eslint no-lone-blocks: "off" */
 
diff --git a/packages/instantsearch-core/src/routing/__tests__/spa-replace-state.test.ts b/packages/instantsearch-core/src/routing/__tests__/routing/spa-replace-state.test.ts
similarity index 99%
rename from packages/instantsearch-core/src/routing/__tests__/spa-replace-state.test.ts
rename to packages/instantsearch-core/src/routing/__tests__/routing/spa-replace-state.test.ts
index 25281cc06e..41dcea0bc4 100644
--- a/packages/instantsearch-core/src/routing/__tests__/spa-replace-state.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/routing/spa-replace-state.test.ts
@@ -5,7 +5,7 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
 
-import { instantsearch, historyRouter, connectSearchBox } from '../..';
+import { instantsearch, historyRouter, connectSearchBox } from '../../..';
 
 /* eslint no-lone-blocks: "off" */
 
diff --git a/packages/instantsearch-core/src/routing/__tests__/spa.test.ts b/packages/instantsearch-core/src/routing/__tests__/routing/spa.test.ts
similarity index 99%
rename from packages/instantsearch-core/src/routing/__tests__/spa.test.ts
rename to packages/instantsearch-core/src/routing/__tests__/routing/spa.test.ts
index 3ee8a48362..c719168f53 100644
--- a/packages/instantsearch-core/src/routing/__tests__/spa.test.ts
+++ b/packages/instantsearch-core/src/routing/__tests__/routing/spa.test.ts
@@ -5,7 +5,7 @@
 import { createSearchClient } from '@instantsearch/mocks';
 import { wait } from '@instantsearch/testutils/wait';
 
-import { instantsearch, historyRouter, connectSearchBox } from '../..';
+import { instantsearch, historyRouter, connectSearchBox } from '../../..';
 
 /* eslint no-lone-blocks: "off" */
 
diff --git a/packages/instantsearch-core/src/routing/historyRouter.ts b/packages/instantsearch-core/src/routing/historyRouter.ts
index 929201edbd..52da910c76 100644
--- a/packages/instantsearch-core/src/routing/historyRouter.ts
+++ b/packages/instantsearch-core/src/routing/historyRouter.ts
@@ -41,258 +41,9 @@ const setWindowTitle = (title?: string): void => {
   }
 };
 
-class BrowserHistory<TRouteState> implements Router<TRouteState> {
-  public $$type = 'ais.browser';
-  /**
-   * Transforms a UI state into a title for the page.
-   */
-  private readonly windowTitle?: BrowserHistoryArgs<TRouteState>['windowTitle'];
-  /**
-   * Time in milliseconds before performing a write in the history.
-   * It prevents from adding too many entries in the history and
-   * makes the back button more usable.
-   *
-   * @default 400
-   */
-  private readonly writeDelay: Required<
-    BrowserHistoryArgs<TRouteState>
-  >['writeDelay'];
-  /**
-   * Creates a full URL based on the route state.
-   * The storage adaptor maps all syncable keys to the query string of the URL.
-   */
-  private readonly _createURL: Required<
-    BrowserHistoryArgs<TRouteState>
-  >['createURL'];
-  /**
-   * Parses the URL into a route state.
-   * It should be symmetrical to `createURL`.
-   */
-  private readonly parseURL: Required<
-    BrowserHistoryArgs<TRouteState>
-  >['parseURL'];
-  /**
-   * Returns the location to store in the history.
-   * @default () => new URL(window.location.href)
-   */
-  private readonly getCurrentURL: Required<
-    BrowserHistoryArgs<TRouteState>
-  >['getCurrentURL'];
-
-  private writeTimer?: ReturnType<typeof setTimeout>;
-  private _onPopState?: (event: PopStateEvent) => void;
-
-  /**
-   * Indicates if last action was back/forward in the browser.
-   */
-  private inPopState: boolean = false;
-
-  /**
-   * Indicates whether the history router is disposed or not.
-   */
-  protected isDisposed: boolean = false;
-
-  /**
-   * Indicates the window.history.length before the last call to
-   * window.history.pushState (called in `write`).
-   * It allows to determine if a `pushState` has been triggered elsewhere,
-   * and thus to prevent the `write` method from calling `pushState`.
-   */
-  private latestAcknowledgedHistory: number = 0;
-
-  private _start?: (onUpdate: () => void) => void;
-  private _dispose?: () => void;
-  private _push?: (url: string) => void;
-  private _cleanUrlOnDispose: boolean;
-
-  /**
-   * Initializes a new storage provider that syncs the search state to the URL
-   * using web APIs (`window.location.pushState` and `onpopstate` event).
-   */
-  public constructor({
-    windowTitle,
-    writeDelay = 400,
-    createURL,
-    parseURL,
-    getCurrentURL,
-    start,
-    dispose,
-    push,
-    cleanUrlOnDispose,
-  }: BrowserHistoryArgs<TRouteState>) {
-    this.windowTitle = windowTitle;
-    this.writeTimer = undefined;
-    this.writeDelay = writeDelay;
-    this._createURL = createURL;
-    this.parseURL = parseURL;
-    this.getCurrentURL = getCurrentURL;
-    this._start = start;
-    this._dispose = dispose;
-    this._push = push;
-    this._cleanUrlOnDispose = Boolean(cleanUrlOnDispose);
-
-    safelyRunOnBrowser(({ window }) => {
-      const title = this.windowTitle && this.windowTitle(this.read());
-      setWindowTitle(title);
-
-      this.latestAcknowledgedHistory = window.history.length;
-    });
-  }
-
-  /**
-   * Reads the URL and returns a syncable UI search state.
-   */
-  public read(): TRouteState {
-    return this.parseURL({ qsModule: qs, currentURL: this.getCurrentURL() });
-  }
-
-  /**
-   * Pushes a search state into the URL.
-   */
-  public write(routeState: TRouteState): void {
-    safelyRunOnBrowser(({ window }) => {
-      const url = this.createURL(routeState);
-      const title = this.windowTitle && this.windowTitle(routeState);
-
-      if (this.writeTimer) {
-        clearTimeout(this.writeTimer);
-      }
-
-      this.writeTimer = setTimeout(() => {
-        setWindowTitle(title);
-
-        if (this.shouldWrite(url)) {
-          if (this._push) {
-            this._push(url);
-          } else {
-            window.history.pushState(routeState, title || '', url);
-          }
-          this.latestAcknowledgedHistory = window.history.length;
-        }
-        this.inPopState = false;
-        this.writeTimer = undefined;
-      }, this.writeDelay);
-    });
-  }
-
-  /**
-   * Sets a callback on the `onpopstate` event of the history API of the current page.
-   * It enables the URL sync to keep track of the changes.
-   */
-  public onUpdate(callback: (routeState: TRouteState) => void): void {
-    if (this._start) {
-      this._start(() => {
-        callback(this.read());
-      });
-    }
-
-    this._onPopState = () => {
-      if (this.writeTimer) {
-        clearTimeout(this.writeTimer);
-        this.writeTimer = undefined;
-      }
-
-      this.inPopState = true;
-
-      // We always read the state from the URL because the state of the history
-      // can be incorect in some cases (e.g. using React Router).
-      callback(this.read());
-    };
-
-    safelyRunOnBrowser(({ window }) => {
-      window.addEventListener('popstate', this._onPopState!);
-    });
-  }
-
-  /**
-   * Creates a complete URL from a given syncable UI state.
-   *
-   * It always generates the full URL, not a relative one.
-   * This allows to handle cases like using a <base href>.
-   * See: https://github.com/algolia/instantsearch/issues/790
-   */
-  public createURL(routeState: TRouteState): string {
-    const url = this._createURL({
-      qsModule: qs,
-      routeState,
-      currentURL: this.getCurrentURL(),
-    });
-
-    if (__DEV__) {
-      try {
-        // We just want to check if the URL is valid.
-        // eslint-disable-next-line no-new
-        new URL(url);
-      } catch (e) {
-        warning(
-          false,
-          `The URL returned by the \`createURL\` function is invalid.
-Please make sure it returns an absolute URL to avoid issues, e.g: \`https://algolia.com/search?query=iphone\`.`
-        );
-      }
-    }
-
-    return url;
-  }
-
-  /**
-   * Removes the event listener and cleans up the URL.
-   */
-  public dispose(): void {
-    if (this._dispose) {
-      this._dispose();
-    }
-
-    this.isDisposed = true;
-
-    safelyRunOnBrowser(({ window }) => {
-      if (this._onPopState) {
-        window.removeEventListener('popstate', this._onPopState);
-      }
-    });
-
-    if (this.writeTimer) {
-      clearTimeout(this.writeTimer);
-    }
-
-    if (this._cleanUrlOnDispose) {
-      this.write({} as TRouteState);
-    }
-  }
-
-  public start() {
-    this.isDisposed = false;
-  }
-
-  private shouldWrite(url: string): boolean {
-    return safelyRunOnBrowser(({ window }) => {
-      // When disposed and the cleanUrlOnDispose is set to false, we do not want to write the URL.
-      if (this.isDisposed && !this._cleanUrlOnDispose) {
-        return false;
-      }
-
-      // We do want to `pushState` if:
-      // - the router is not disposed, IS.js needs to update the URL
-      // OR
-      // - the last write was from InstantSearch.js
-      // (unlike a SPA, where it would have last written)
-      const lastPushWasByISAfterDispose = !(
-        this.isDisposed &&
-        this.latestAcknowledgedHistory !== window.history.length
-      );
-
-      return (
-        // When the last state change was through popstate, the IS.js state changes,
-        // but that should not write the URL.
-        !this.inPopState &&
-        // When the previous pushState after dispose was by IS.js, we want to write the URL.
-        lastPushWasByISAfterDispose &&
-        // When the URL is the same as the current one, we do not want to write it.
-        url !== window.location.href
-      );
-    });
-  }
-}
+type HistoryRouter<TRouteState> = Router<TRouteState> & {
+  isDisposed: boolean;
+};
 
 export function historyRouter<TRouteState = UiState>({
   createURL = ({ qsModule, routeState, currentURL }) => {
@@ -334,16 +85,186 @@ export function historyRouter<TRouteState = UiState>({
   dispose,
   push,
   cleanUrlOnDispose,
-}: Partial<BrowserHistoryArgs<TRouteState>> = {}): BrowserHistory<TRouteState> {
-  return new BrowserHistory({
-    createURL,
-    parseURL,
-    writeDelay,
-    windowTitle,
-    getCurrentURL,
-    start,
-    dispose,
-    push,
-    cleanUrlOnDispose,
+}: Partial<BrowserHistoryArgs<TRouteState>> = {}) {
+  let writeTimer: ReturnType<typeof setTimeout> | undefined;
+  let inPopState = false;
+  let onPopState: (() => void) | undefined;
+  let latestAcknowledgedHistory = 0;
+
+  function shouldWrite(
+    url: string,
+    router: HistoryRouter<TRouteState>
+  ): boolean {
+    return safelyRunOnBrowser(({ window }) => {
+      // When disposed and the cleanUrlOnDispose is set to false, we do not want to write the URL.
+      if (router.isDisposed && !cleanUrlOnDispose) {
+        return false;
+      }
+
+      // We do want to `pushState` if:
+      // - the router is not disposed, IS.js needs to update the URL
+      // OR
+      // - the last write was from InstantSearch.js
+      // (unlike a SPA, where it would have last written)
+      const lastPushWasByISAfterDispose = !(
+        router.isDisposed && latestAcknowledgedHistory !== window.history.length
+      );
+
+      return (
+        // When the last state change was through popstate, the IS.js state changes,
+        // but that should not write the URL.
+        !inPopState &&
+        // When the previous pushState after dispose was by IS.js, we want to write the URL.
+        lastPushWasByISAfterDispose &&
+        // When the URL is the same as the current one, we do not want to write it.
+        url !== window.location.href
+      );
+    });
+  }
+
+  const router: HistoryRouter<TRouteState> = {
+    /**
+     * Identifier of the router.
+     */
+    $$type: 'ais.browser',
+
+    /**
+     * Whether the router has been disposed (no longer active).
+     */
+    isDisposed: false,
+
+    /**
+     * Reads the URL and returns a syncable UI search state.
+     */
+    read(): TRouteState {
+      return parseURL({ qsModule: qs, currentURL: getCurrentURL() });
+    },
+
+    /**
+     * Pushes a search state into the URL.
+     */
+    write(routeState: TRouteState): void {
+      safelyRunOnBrowser(({ window }) => {
+        const url = this.createURL(routeState);
+        const title = windowTitle && windowTitle(routeState);
+
+        if (writeTimer) {
+          clearTimeout(writeTimer);
+        }
+
+        writeTimer = setTimeout(() => {
+          setWindowTitle(title);
+
+          if (shouldWrite(url, router)) {
+            if (push) {
+              push(url);
+            } else {
+              window.history.pushState(routeState, title || '', url);
+            }
+            latestAcknowledgedHistory = window.history.length;
+          }
+          inPopState = false;
+          writeTimer = undefined;
+        }, writeDelay);
+      });
+    },
+
+    /**
+     * Sets a callback on the `onpopstate` event of the history API of the current page.
+     * It enables the URL sync to keep track of the changes.
+     */
+    onUpdate(callback: (routeState: TRouteState) => void): void {
+      if (start) {
+        start(() => {
+          callback(this.read());
+        });
+      }
+
+      onPopState = () => {
+        if (writeTimer) {
+          clearTimeout(writeTimer);
+          writeTimer = undefined;
+        }
+
+        inPopState = true;
+
+        // We always read the state from the URL because the state of the history
+        // can be incorrect in some cases (e.g. using React Router).
+        callback(this.read());
+      };
+
+      safelyRunOnBrowser(({ window }) => {
+        window.addEventListener('popstate', onPopState!);
+      });
+    },
+
+    /**
+     * Creates a complete URL from a given syncable UI state.
+     *
+     * It always generates the full URL, not a relative one.
+     * This allows to handle cases like using a <base href>.
+     * See: https://github.com/algolia/instantsearch/issues/790
+     */
+    createURL(routeState: TRouteState): string {
+      const url = createURL({
+        qsModule: qs,
+        routeState,
+        currentURL: getCurrentURL(),
+      });
+
+      if (__DEV__) {
+        try {
+          // We just want to check if the URL is valid.
+          // eslint-disable-next-line no-new
+          new URL(url);
+        } catch (e) {
+          warning(
+            false,
+            `The URL returned by the \`createURL\` function is invalid.
+Please make sure it returns an absolute URL to avoid issues, e.g: \`https://algolia.com/search?query=iphone\`.`
+          );
+        }
+      }
+
+      return url;
+    },
+
+    /**
+     * Removes the event listener and cleans up the URL.
+     */
+    dispose(): void {
+      if (dispose) {
+        dispose();
+      }
+
+      this.isDisposed = true;
+
+      safelyRunOnBrowser(({ window }) => {
+        if (onPopState) {
+          window.removeEventListener('popstate', onPopState);
+        }
+      });
+
+      if (writeTimer) {
+        clearTimeout(writeTimer);
+      }
+
+      if (cleanUrlOnDispose) {
+        this.write({} as TRouteState);
+      }
+    },
+
+    start() {
+      this.isDisposed = false;
+    },
+  };
+
+  safelyRunOnBrowser(({ window }) => {
+    const title = windowTitle && windowTitle(router.read());
+    setWindowTitle(title);
+
+    latestAcknowledgedHistory = window.history.length;
   });
+
+  return router;
 }