From 77e791457ddfb2ef8134fbf78cec3756933c99bc Mon Sep 17 00:00:00 2001 From: Haroen Viaene Date: Mon, 30 Dec 2024 15:43:09 +0100 Subject: [PATCH] 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 --- .../e-commerce/components/PriceSlider.tsx | 5 +- .../react/e-commerce/components/Ratings.tsx | 4 +- packages/algolia-experiences/src/banner.tsx | 2 +- .../src/components/Breadcrumb/Breadcrumb.tsx | 2 +- .../ClearRefinements/ClearRefinements.tsx | 2 +- .../CurrentRefinements/CurrentRefinements.tsx | 2 +- .../src/components/MenuSelect/MenuSelect.tsx | 2 +- .../src/components/RangeInput/RangeInput.tsx | 5 +- .../RefinementList/RefinementList.tsx | 2 +- .../src/components/Slider/Slider.tsx | 2 +- .../ToggleRefinement/ToggleRefinement.tsx | 2 +- .../components/VoiceSearch/VoiceSearch.tsx | 2 +- .../autocomplete/connectAutocomplete.ts | 7 - .../breadcrumb/connectBreadcrumb.ts | 8 - .../connectClearRefinements.ts | 7 - .../connectors/configure/connectConfigure.ts | 7 - .../connectCurrentRefinements.ts | 9 - .../dynamic-widgets/connectDynamicWidgets.ts | 7 - .../connectFrequentlyBoughtTogether.ts | 7 - .../connectors/geo-search/connectGeoSearch.ts | 8 - .../connectHierarchicalMenu.ts | 8 - .../hits-per-page/connectHitsPerPage.ts | 8 - .../src/connectors/hits/connectHits.ts | 7 - .../instantsearch.js/src/connectors/index.ts | 278 ++++++++++++++++-- .../infinite-hits/connectInfiniteHits.ts | 9 - .../looking-similar/connectLookingSimilar.ts | 7 - .../src/connectors/menu/connectMenu.ts | 8 - .../numeric-menu/connectNumericMenu.ts | 7 - .../pagination/connectPagination.ts | 7 - .../connectors/powered-by/connectPoweredBy.ts | 7 - .../query-rules/connectQueryRules.ts | 9 - .../src/connectors/range/connectRange.ts | 9 - .../rating-menu/connectRatingMenu.ts | 7 - .../refinement-list/connectRefinementList.ts | 8 - .../connectRelatedProducts.ts | 7 - .../relevant-sort/connectRelevantSort.ts | 7 - .../connectors/search-box/connectSearchBox.ts | 7 - .../src/connectors/sort-by/connectSortBy.ts | 8 - .../src/connectors/stats/connectStats.ts | 7 - .../connectToggleRefinement.ts | 8 - .../trending-items/connectTrendingItems.ts | 7 - .../voice-search/connectVoiceSearch.ts | 9 - packages/instantsearch.js/src/index.ts | 4 +- .../middlewares/createInsightsMiddleware.ts | 17 -- .../middlewares/createMetadataMiddleware.ts | 1 - .../src/middlewares/createRouterMiddleware.ts | 2 - .../instantsearch.js/src/middlewares/index.ts | 17 +- .../src/widgets/__tests__/index.test.ts | 2 +- .../src/widgets/breadcrumb/breadcrumb.tsx | 4 +- .../clear-refinements/clear-refinements.tsx | 4 +- .../src/widgets/configure/configure.ts | 4 +- .../current-refinements.tsx | 4 +- .../dynamic-widgets/dynamic-widgets.ts | 4 +- .../frequently-bought-together.tsx | 4 +- .../widgets/geo-search/GeoSearchRenderer.d.ts | 2 +- .../src/widgets/geo-search/geo-search.ts | 4 +- .../hierarchical-menu/hierarchical-menu.tsx | 4 +- .../widgets/hits-per-page/hits-per-page.tsx | 4 +- .../src/widgets/hits/hits.tsx | 4 +- .../instantsearch.js/src/widgets/index.ts | 4 +- .../src/widgets/index/index.ts | 9 - .../widgets/infinite-hits/infinite-hits.tsx | 4 +- .../looking-similar/looking-similar.tsx | 4 +- .../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/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 | 4 +- .../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 | 4 +- .../src/widgets/voice-search/voice-search.tsx | 4 +- .../instantsearch.js/test/createWidget.ts | 6 +- .../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/widgets/infinite-hits/options.ts | 4 +- tsconfig.v3.json | 18 +- 89 files changed, 362 insertions(+), 387 deletions(-) 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/clear-refinements/connectClearRefinements.ts delete mode 100644 packages/instantsearch.js/src/connectors/configure/connectConfigure.ts delete mode 100644 packages/instantsearch.js/src/connectors/current-refinements/connectCurrentRefinements.ts delete mode 100644 packages/instantsearch.js/src/connectors/dynamic-widgets/connectDynamicWidgets.ts delete mode 100644 packages/instantsearch.js/src/connectors/frequently-bought-together/connectFrequentlyBoughtTogether.ts delete mode 100644 packages/instantsearch.js/src/connectors/geo-search/connectGeoSearch.ts delete mode 100644 packages/instantsearch.js/src/connectors/hierarchical-menu/connectHierarchicalMenu.ts delete mode 100644 packages/instantsearch.js/src/connectors/hits-per-page/connectHitsPerPage.ts delete mode 100644 packages/instantsearch.js/src/connectors/hits/connectHits.ts delete mode 100644 packages/instantsearch.js/src/connectors/infinite-hits/connectInfiniteHits.ts delete mode 100644 packages/instantsearch.js/src/connectors/looking-similar/connectLookingSimilar.ts delete mode 100644 packages/instantsearch.js/src/connectors/menu/connectMenu.ts delete mode 100644 packages/instantsearch.js/src/connectors/numeric-menu/connectNumericMenu.ts delete mode 100644 packages/instantsearch.js/src/connectors/pagination/connectPagination.ts delete mode 100644 packages/instantsearch.js/src/connectors/powered-by/connectPoweredBy.ts delete mode 100644 packages/instantsearch.js/src/connectors/query-rules/connectQueryRules.ts delete mode 100644 packages/instantsearch.js/src/connectors/range/connectRange.ts delete mode 100644 packages/instantsearch.js/src/connectors/rating-menu/connectRatingMenu.ts delete mode 100644 packages/instantsearch.js/src/connectors/refinement-list/connectRefinementList.ts delete mode 100644 packages/instantsearch.js/src/connectors/related-products/connectRelatedProducts.ts delete mode 100644 packages/instantsearch.js/src/connectors/relevant-sort/connectRelevantSort.ts delete mode 100644 packages/instantsearch.js/src/connectors/search-box/connectSearchBox.ts delete mode 100644 packages/instantsearch.js/src/connectors/sort-by/connectSortBy.ts delete mode 100644 packages/instantsearch.js/src/connectors/stats/connectStats.ts delete mode 100644 packages/instantsearch.js/src/connectors/toggle-refinement/connectToggleRefinement.ts delete mode 100644 packages/instantsearch.js/src/connectors/trending-items/connectTrendingItems.ts delete mode 100644 packages/instantsearch.js/src/connectors/voice-search/connectVoiceSearch.ts delete mode 100644 packages/instantsearch.js/src/middlewares/createInsightsMiddleware.ts delete mode 100644 packages/instantsearch.js/src/middlewares/createMetadataMiddleware.ts delete mode 100644 packages/instantsearch.js/src/middlewares/createRouterMiddleware.ts delete mode 100644 packages/instantsearch.js/src/widgets/index/index.ts 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/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/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/MenuSelect/MenuSelect.tsx b/packages/instantsearch.js/src/components/MenuSelect/MenuSelect.tsx index e81b4d22ae..8ac28b949b 100644 --- a/packages/instantsearch.js/src/components/MenuSelect/MenuSelect.tsx +++ b/packages/instantsearch.js/src/components/MenuSelect/MenuSelect.tsx @@ -5,7 +5,7 @@ import { h } from 'preact'; 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, 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/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 5ada3088c6..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 '../../connectors/voice-search/connectVoiceSearch'; +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 59938c2a26..0000000000 --- a/packages/instantsearch.js/src/connectors/autocomplete/connectAutocomplete.ts +++ /dev/null @@ -1,7 +0,0 @@ -export { connectAutocomplete as default } from 'instantsearch-core'; -export type { - AutocompleteConnector, - AutocompleteRenderState, - AutocompleteWidgetDescription, - AutocompleteConnectorParams, -} from 'instantsearch-core'; 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 f384bb887f..0000000000 --- a/packages/instantsearch.js/src/connectors/breadcrumb/connectBreadcrumb.ts +++ /dev/null @@ -1,8 +0,0 @@ -export { connectBreadcrumb as default } from 'instantsearch-core'; -export type { - BreadcrumbConnector, - BreadcrumbRenderState, - BreadcrumbWidgetDescription, - BreadcrumbConnectorParams, - BreadcrumbConnectorParamsItem, -} from 'instantsearch-core'; diff --git a/packages/instantsearch.js/src/connectors/clear-refinements/connectClearRefinements.ts b/packages/instantsearch.js/src/connectors/clear-refinements/connectClearRefinements.ts deleted file mode 100644 index 1efabb4b08..0000000000 --- a/packages/instantsearch.js/src/connectors/clear-refinements/connectClearRefinements.ts +++ /dev/null @@ -1,7 +0,0 @@ -export { connectClearRefinements as default } from 'instantsearch-core'; -export type { - ClearRefinementsConnector, - ClearRefinementsRenderState, - ClearRefinementsWidgetDescription, - ClearRefinementsConnectorParams, -} from 'instantsearch-core'; diff --git a/packages/instantsearch.js/src/connectors/configure/connectConfigure.ts b/packages/instantsearch.js/src/connectors/configure/connectConfigure.ts deleted file mode 100644 index 5fa741cc6d..0000000000 --- a/packages/instantsearch.js/src/connectors/configure/connectConfigure.ts +++ /dev/null @@ -1,7 +0,0 @@ -export { connectConfigure as default } from 'instantsearch-core'; -export type { - ConfigureConnector, - ConfigureRenderState, - ConfigureWidgetDescription, - ConfigureConnectorParams, -} from 'instantsearch-core'; diff --git a/packages/instantsearch.js/src/connectors/current-refinements/connectCurrentRefinements.ts b/packages/instantsearch.js/src/connectors/current-refinements/connectCurrentRefinements.ts deleted file mode 100644 index 4164d62c05..0000000000 --- a/packages/instantsearch.js/src/connectors/current-refinements/connectCurrentRefinements.ts +++ /dev/null @@ -1,9 +0,0 @@ -export { connectCurrentRefinements as default } from 'instantsearch-core'; -export type { - CurrentRefinementsConnector, - CurrentRefinementsRenderState, - CurrentRefinementsWidgetDescription, - CurrentRefinementsConnectorParams, - CurrentRefinementsConnectorParamsItem, - CurrentRefinementsConnectorParamsRefinement, -} from 'instantsearch-core'; diff --git a/packages/instantsearch.js/src/connectors/dynamic-widgets/connectDynamicWidgets.ts b/packages/instantsearch.js/src/connectors/dynamic-widgets/connectDynamicWidgets.ts deleted file mode 100644 index 4acb18db92..0000000000 --- a/packages/instantsearch.js/src/connectors/dynamic-widgets/connectDynamicWidgets.ts +++ /dev/null @@ -1,7 +0,0 @@ -export { connectDynamicWidgets as default } from 'instantsearch-core'; -export type { - DynamicWidgetsConnector, - DynamicWidgetsRenderState, - DynamicWidgetsWidgetDescription, - DynamicWidgetsConnectorParams, -} from 'instantsearch-core'; 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 eddcc60983..0000000000 --- a/packages/instantsearch.js/src/connectors/frequently-bought-together/connectFrequentlyBoughtTogether.ts +++ /dev/null @@ -1,7 +0,0 @@ -export { connectFrequentlyBoughtTogether as default } from 'instantsearch-core'; -export type { - FrequentlyBoughtTogetherConnector, - FrequentlyBoughtTogetherRenderState, - FrequentlyBoughtTogetherWidgetDescription, - FrequentlyBoughtTogetherConnectorParams, -} from 'instantsearch-core'; diff --git a/packages/instantsearch.js/src/connectors/geo-search/connectGeoSearch.ts b/packages/instantsearch.js/src/connectors/geo-search/connectGeoSearch.ts deleted file mode 100644 index e7987bf4d1..0000000000 --- a/packages/instantsearch.js/src/connectors/geo-search/connectGeoSearch.ts +++ /dev/null @@ -1,8 +0,0 @@ -export { connectGeoSearch as default } from 'instantsearch-core'; -export type { - GeoSearchConnector, - GeoSearchRenderState, - GeoSearchWidgetDescription, - GeoSearchConnectorParams, - GeoHit, -} from 'instantsearch-core'; diff --git a/packages/instantsearch.js/src/connectors/hierarchical-menu/connectHierarchicalMenu.ts b/packages/instantsearch.js/src/connectors/hierarchical-menu/connectHierarchicalMenu.ts deleted file mode 100644 index e5c75e7ac5..0000000000 --- a/packages/instantsearch.js/src/connectors/hierarchical-menu/connectHierarchicalMenu.ts +++ /dev/null @@ -1,8 +0,0 @@ -export { connectHierarchicalMenu as default } from 'instantsearch-core'; -export type { - HierarchicalMenuConnector, - HierarchicalMenuRenderState, - HierarchicalMenuWidgetDescription, - HierarchicalMenuConnectorParams, - HierarchicalMenuItem, -} from 'instantsearch-core'; 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 2bba90b74d..0000000000 --- a/packages/instantsearch.js/src/connectors/hits-per-page/connectHitsPerPage.ts +++ /dev/null @@ -1,8 +0,0 @@ -export { connectHitsPerPage as default } from 'instantsearch-core'; -export type { - HitsPerPageConnector, - HitsPerPageRenderState, - HitsPerPageWidgetDescription, - HitsPerPageConnectorParams, - HitsPerPageConnectorParamsItem, -} from 'instantsearch-core'; diff --git a/packages/instantsearch.js/src/connectors/hits/connectHits.ts b/packages/instantsearch.js/src/connectors/hits/connectHits.ts deleted file mode 100644 index ab816b846d..0000000000 --- a/packages/instantsearch.js/src/connectors/hits/connectHits.ts +++ /dev/null @@ -1,7 +0,0 @@ -export { connectHits as default } from 'instantsearch-core'; -export type { - HitsConnector, - HitsRenderState, - HitsWidgetDescription, - HitsConnectorParams, -} from 'instantsearch-core'; diff --git a/packages/instantsearch.js/src/connectors/index.ts b/packages/instantsearch.js/src/connectors/index.ts index d31ac83b40..6ed5e8ca29 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, + InfiniteHitsCachedItems, +} 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/infinite-hits/connectInfiniteHits.ts b/packages/instantsearch.js/src/connectors/infinite-hits/connectInfiniteHits.ts deleted file mode 100644 index 4d74937b4b..0000000000 --- a/packages/instantsearch.js/src/connectors/infinite-hits/connectInfiniteHits.ts +++ /dev/null @@ -1,9 +0,0 @@ -export { connectInfiniteHits as default } from 'instantsearch-core'; -export type { - InfiniteHitsConnector, - InfiniteHitsRenderState, - InfiniteHitsWidgetDescription, - InfiniteHitsConnectorParams, - InfiniteHitsCache, - InfiniteHitsCachedItems, -} from 'instantsearch-core'; diff --git a/packages/instantsearch.js/src/connectors/looking-similar/connectLookingSimilar.ts b/packages/instantsearch.js/src/connectors/looking-similar/connectLookingSimilar.ts deleted file mode 100644 index 4f02c7bbab..0000000000 --- a/packages/instantsearch.js/src/connectors/looking-similar/connectLookingSimilar.ts +++ /dev/null @@ -1,7 +0,0 @@ -export { connectLookingSimilar as default } from 'instantsearch-core'; -export type { - LookingSimilarConnector, - LookingSimilarRenderState, - LookingSimilarWidgetDescription, - LookingSimilarConnectorParams, -} from 'instantsearch-core'; diff --git a/packages/instantsearch.js/src/connectors/menu/connectMenu.ts b/packages/instantsearch.js/src/connectors/menu/connectMenu.ts deleted file mode 100644 index faafb65b52..0000000000 --- a/packages/instantsearch.js/src/connectors/menu/connectMenu.ts +++ /dev/null @@ -1,8 +0,0 @@ -export { connectMenu as default } from 'instantsearch-core'; -export type { - MenuConnector, - MenuRenderState, - MenuWidgetDescription, - MenuConnectorParams, - MenuItem, -} from 'instantsearch-core'; diff --git a/packages/instantsearch.js/src/connectors/numeric-menu/connectNumericMenu.ts b/packages/instantsearch.js/src/connectors/numeric-menu/connectNumericMenu.ts deleted file mode 100644 index c995b3a93d..0000000000 --- a/packages/instantsearch.js/src/connectors/numeric-menu/connectNumericMenu.ts +++ /dev/null @@ -1,7 +0,0 @@ -export { connectNumericMenu as default } from 'instantsearch-core'; -export type { - NumericMenuConnector, - NumericMenuRenderState, - NumericMenuWidgetDescription, - NumericMenuConnectorParams, -} 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 badccbeaf6..0000000000 --- a/packages/instantsearch.js/src/connectors/pagination/connectPagination.ts +++ /dev/null @@ -1,7 +0,0 @@ -export { connectPagination as default } from 'instantsearch-core'; -export type { - PaginationConnector, - PaginationRenderState, - PaginationWidgetDescription, - PaginationConnectorParams, -} from 'instantsearch-core'; diff --git a/packages/instantsearch.js/src/connectors/powered-by/connectPoweredBy.ts b/packages/instantsearch.js/src/connectors/powered-by/connectPoweredBy.ts deleted file mode 100644 index e585952223..0000000000 --- a/packages/instantsearch.js/src/connectors/powered-by/connectPoweredBy.ts +++ /dev/null @@ -1,7 +0,0 @@ -export { connectPoweredBy as default } from 'instantsearch-core'; -export type { - PoweredByConnector, - PoweredByRenderState, - PoweredByWidgetDescription, - PoweredByConnectorParams, -} from 'instantsearch-core'; diff --git a/packages/instantsearch.js/src/connectors/query-rules/connectQueryRules.ts b/packages/instantsearch.js/src/connectors/query-rules/connectQueryRules.ts deleted file mode 100644 index 795c41ffc7..0000000000 --- a/packages/instantsearch.js/src/connectors/query-rules/connectQueryRules.ts +++ /dev/null @@ -1,9 +0,0 @@ -export { connectQueryRules as default } from 'instantsearch-core'; -export type { - QueryRulesConnector, - QueryRulesRenderState, - QueryRulesWidgetDescription, - QueryRulesConnectorParams, - ParamTrackedFilters, - ParamTransformRuleContexts, -} from 'instantsearch-core'; diff --git a/packages/instantsearch.js/src/connectors/range/connectRange.ts b/packages/instantsearch.js/src/connectors/range/connectRange.ts deleted file mode 100644 index 9a893924e1..0000000000 --- a/packages/instantsearch.js/src/connectors/range/connectRange.ts +++ /dev/null @@ -1,9 +0,0 @@ -export { connectRange as default } from 'instantsearch-core'; -export type { - RangeConnector, - RangeRenderState, - RangeWidgetDescription, - RangeConnectorParams, - Range, - RangeBoundaries, -} from 'instantsearch-core'; 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 152ff778e9..0000000000 --- a/packages/instantsearch.js/src/connectors/rating-menu/connectRatingMenu.ts +++ /dev/null @@ -1,7 +0,0 @@ -export { connectRatingMenu as default } from 'instantsearch-core'; -export type { - RatingMenuConnector, - RatingMenuRenderState, - RatingMenuWidgetDescription, - RatingMenuConnectorParams, -} from 'instantsearch-core'; diff --git a/packages/instantsearch.js/src/connectors/refinement-list/connectRefinementList.ts b/packages/instantsearch.js/src/connectors/refinement-list/connectRefinementList.ts deleted file mode 100644 index a82e4e4124..0000000000 --- a/packages/instantsearch.js/src/connectors/refinement-list/connectRefinementList.ts +++ /dev/null @@ -1,8 +0,0 @@ -export { connectRefinementList as default } from 'instantsearch-core'; -export type { - RefinementListConnector, - RefinementListRenderState, - RefinementListWidgetDescription, - RefinementListConnectorParams, - RefinementListItem, -} from 'instantsearch-core'; diff --git a/packages/instantsearch.js/src/connectors/related-products/connectRelatedProducts.ts b/packages/instantsearch.js/src/connectors/related-products/connectRelatedProducts.ts deleted file mode 100644 index 387cf2dff0..0000000000 --- a/packages/instantsearch.js/src/connectors/related-products/connectRelatedProducts.ts +++ /dev/null @@ -1,7 +0,0 @@ -export { connectRelatedProducts as default } from 'instantsearch-core'; -export type { - RelatedProductsConnector, - RelatedProductsRenderState, - RelatedProductsWidgetDescription, - RelatedProductsConnectorParams, -} from 'instantsearch-core'; 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 39d05e26eb..0000000000 --- a/packages/instantsearch.js/src/connectors/relevant-sort/connectRelevantSort.ts +++ /dev/null @@ -1,7 +0,0 @@ -export { connectRelevantSort as default } from 'instantsearch-core'; -export type { - RelevantSortConnector, - RelevantSortRenderState, - RelevantSortWidgetDescription, - RelevantSortConnectorParams, -} from 'instantsearch-core'; diff --git a/packages/instantsearch.js/src/connectors/search-box/connectSearchBox.ts b/packages/instantsearch.js/src/connectors/search-box/connectSearchBox.ts deleted file mode 100644 index 7cead3df84..0000000000 --- a/packages/instantsearch.js/src/connectors/search-box/connectSearchBox.ts +++ /dev/null @@ -1,7 +0,0 @@ -export { connectSearchBox as default } from 'instantsearch-core'; -export type { - SearchBoxConnector, - SearchBoxRenderState, - SearchBoxWidgetDescription, - SearchBoxConnectorParams, -} from 'instantsearch-core'; diff --git a/packages/instantsearch.js/src/connectors/sort-by/connectSortBy.ts b/packages/instantsearch.js/src/connectors/sort-by/connectSortBy.ts deleted file mode 100644 index 3b78e5b57d..0000000000 --- a/packages/instantsearch.js/src/connectors/sort-by/connectSortBy.ts +++ /dev/null @@ -1,8 +0,0 @@ -export { connectSortBy as default } from 'instantsearch-core'; -export type { - SortByConnector, - SortByRenderState, - SortByWidgetDescription, - SortByConnectorParams, - SortByItem, -} from 'instantsearch-core'; diff --git a/packages/instantsearch.js/src/connectors/stats/connectStats.ts b/packages/instantsearch.js/src/connectors/stats/connectStats.ts deleted file mode 100644 index 0e024b4f66..0000000000 --- a/packages/instantsearch.js/src/connectors/stats/connectStats.ts +++ /dev/null @@ -1,7 +0,0 @@ -export { connectStats as default } from 'instantsearch-core'; -export type { - StatsConnector, - StatsRenderState, - StatsWidgetDescription, - StatsConnectorParams, -} from 'instantsearch-core'; diff --git a/packages/instantsearch.js/src/connectors/toggle-refinement/connectToggleRefinement.ts b/packages/instantsearch.js/src/connectors/toggle-refinement/connectToggleRefinement.ts deleted file mode 100644 index f482392acd..0000000000 --- a/packages/instantsearch.js/src/connectors/toggle-refinement/connectToggleRefinement.ts +++ /dev/null @@ -1,8 +0,0 @@ -export { connectToggleRefinement as default } from 'instantsearch-core'; -export type { - ToggleRefinementConnector, - ToggleRefinementRenderState, - ToggleRefinementWidgetDescription, - ToggleRefinementConnectorParams, - ToggleRefinementValue, -} from 'instantsearch-core'; diff --git a/packages/instantsearch.js/src/connectors/trending-items/connectTrendingItems.ts b/packages/instantsearch.js/src/connectors/trending-items/connectTrendingItems.ts deleted file mode 100644 index 8ff902b1ca..0000000000 --- a/packages/instantsearch.js/src/connectors/trending-items/connectTrendingItems.ts +++ /dev/null @@ -1,7 +0,0 @@ -export { connectTrendingItems as default } from 'instantsearch-core'; -export type { - TrendingItemsConnector, - TrendingItemsRenderState, - TrendingItemsWidgetDescription, - TrendingItemsConnectorParams, -} from 'instantsearch-core'; 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 7a86a88aa8..0000000000 --- a/packages/instantsearch.js/src/connectors/voice-search/connectVoiceSearch.ts +++ /dev/null @@ -1,9 +0,0 @@ -export { connectVoiceSearch as default } from 'instantsearch-core'; -export type { - VoiceSearchConnector, - VoiceSearchRenderState, - VoiceSearchWidgetDescription, - VoiceSearchConnectorParams, - VoiceListeningState, - CreateVoiceSearchHelper, -} from 'instantsearch-core'; diff --git a/packages/instantsearch.js/src/index.ts b/packages/instantsearch.js/src/index.ts index 1fa00a6386..0d20530e13 100644 --- a/packages/instantsearch.js/src/index.ts +++ b/packages/instantsearch.js/src/index.ts @@ -1,10 +1,10 @@ -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'; diff --git a/packages/instantsearch.js/src/middlewares/createInsightsMiddleware.ts b/packages/instantsearch.js/src/middlewares/createInsightsMiddleware.ts deleted file mode 100644 index 231cc74779..0000000000 --- a/packages/instantsearch.js/src/middlewares/createInsightsMiddleware.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { createInsightsMiddleware } from 'instantsearch-core'; - -import type { InsightsClient } from 'instantsearch-core'; - -export type { - InsightsClient, - InsightsMethod, - InsightsEvent, - InsightsProps, -} from 'instantsearch-core'; - -export type InsightsClientWithGlobals = InsightsClient & { - shouldAddScript?: boolean; - version?: string; -}; -export type CreateInsightsMiddleware = typeof createInsightsMiddleware; -export { createInsightsMiddleware }; diff --git a/packages/instantsearch.js/src/middlewares/createMetadataMiddleware.ts b/packages/instantsearch.js/src/middlewares/createMetadataMiddleware.ts deleted file mode 100644 index b0077e98bd..0000000000 --- a/packages/instantsearch.js/src/middlewares/createMetadataMiddleware.ts +++ /dev/null @@ -1 +0,0 @@ -export { createMetadataMiddleware } from 'instantsearch-core'; diff --git a/packages/instantsearch.js/src/middlewares/createRouterMiddleware.ts b/packages/instantsearch.js/src/middlewares/createRouterMiddleware.ts deleted file mode 100644 index 4ee13b138c..0000000000 --- a/packages/instantsearch.js/src/middlewares/createRouterMiddleware.ts +++ /dev/null @@ -1,2 +0,0 @@ -export { createRouterMiddleware } from 'instantsearch-core'; -export type { RouterProps } from 'instantsearch-core'; 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/widgets/__tests__/index.test.ts b/packages/instantsearch.js/src/widgets/__tests__/index.test.ts index de81facefc..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 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/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 8019c36ad9..ea7ecf7539 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, 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/geo-search.ts b/packages/instantsearch.js/src/widgets/geo-search/geo-search.ts index f0628b3443..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,7 +19,7 @@ import type { GeoSearchConnectorParams, GeoSearchWidgetDescription, GeoHit, -} from '../../connectors/geo-search/connectGeoSearch'; +} from '../../connectors'; import type { GeoLoc, Template, Widget, WidgetFactory } from '../../types'; import type { HTMLMarkerArguments } from './createHTMLMarker'; 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 466459c5dc..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,7 +4,7 @@ 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, @@ -15,7 +15,7 @@ import type { HitsPerPageConnectorParams, HitsPerPageRenderState, HitsPerPageWidgetDescription, -} from '../../connectors/hits-per-page/connectHitsPerPage'; +} from '../../connectors'; import type { ComponentCSSClasses, WidgetFactory } from '../../types'; const withUsage = createDocumentationMessageGenerator({ diff --git a/packages/instantsearch.js/src/widgets/hits/hits.tsx b/packages/instantsearch.js/src/widgets/hits/hits.tsx index f11ea7934e..5bedc34b01 100644 --- a/packages/instantsearch.js/src/widgets/hits/hits.tsx +++ b/packages/instantsearch.js/src/widgets/hits/hits.tsx @@ -4,7 +4,7 @@ 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, @@ -17,7 +17,7 @@ import type { HitsConnectorParams, HitsRenderState, HitsWidgetDescription, -} from '../../connectors/hits/connectHits'; +} from '../../connectors'; import type { PreparedTemplateProps } from '../../lib/templating'; import type { Template, 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/index.ts b/packages/instantsearch.js/src/widgets/index/index.ts deleted file mode 100644 index 4308099ecb..0000000000 --- a/packages/instantsearch.js/src/widgets/index/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -export { index as default } from 'instantsearch-core'; - -export type { - IndexInitOptions, - IndexRenderOptions, - IndexWidget, - IndexWidgetDescription, - IndexWidgetParams, -} from 'instantsearch-core'; 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 372ccdf1db..8b8e0f591c 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, 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 1a14d3c3e7..8093f60e0b 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, 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/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 d15e83741a..fa57194c2b 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,7 +15,7 @@ import type { RelatedProductsWidgetDescription, RelatedProductsConnectorParams, RelatedProductsRenderState, -} from '../../connectors/related-products/connectRelatedProducts'; +} from '../../connectors'; import type { PreparedTemplateProps } from '../../lib/templating'; import type { Template, 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 1bbd453409..cf69a79510 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 9d5b6fa176..e8e5d9f8a2 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, 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 17d2498e9c..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,7 +21,7 @@ import type { VoiceSearchConnectorParams, VoiceSearchRenderState, VoiceSearchWidgetDescription, -} from '../../connectors/voice-search/connectVoiceSearch'; +} from '../../connectors'; import type { WidgetFactory, Template, Renderer } from '../../types'; import type { PlainSearchParameters } from 'algoliasearch-helper'; import type { CreateVoiceSearchHelper } from 'instantsearch-core'; diff --git a/packages/instantsearch.js/test/createWidget.ts b/packages/instantsearch.js/test/createWidget.ts index 72a70c0c02..44bc46cb44 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 = {} 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/widgets/infinite-hits/options.ts b/tests/common/widgets/infinite-hits/options.ts index e21f220835..cd63064bef 100644 --- a/tests/common/widgets/infinite-hits/options.ts +++ b/tests/common/widgets/infinite-hits/options.ts @@ -13,11 +13,11 @@ 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, InfiniteHitsCachedItems, -} 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. 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" ] }