Skip to content

Commit ee1a251

Browse files
authored
refactor(vue): replace instantsearch.js with instantsearch-core (#6440)
* refactor(vue): replace instantsearch.js with instantsearch-core [FX-3069] BREAKING CHANGE: if you are using any internal instantsearch.js functions, ensure to update to instantsearch-core to avoid duplication * fix! * fix for vue 2 * hup * prevent double search
1 parent 8a4d0cb commit ee1a251

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+162
-195
lines changed

examples/vue/default-theme/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"dependencies": {
1111
"algoliasearch": "5.1.1",
1212
"core-js": "2",
13-
"instantsearch.js": "4.75.3",
13+
"instantsearch-core": "0.1.0",
1414
"vue": "2.7.14",
1515
"vue-instantsearch": "4.19.9"
1616
},

examples/vue/default-theme/src/App.vue

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,7 @@
124124

125125
<script>
126126
import { liteClient as algoliasearch } from 'algoliasearch/lite';
127-
import { history as historyRouter } from 'instantsearch.js/es/lib/routers';
128-
import { simple as simpleMapping } from 'instantsearch.js/es/lib/stateMappings';
127+
import { historyRouter, simpleStateMapping } from 'instantsearch-core';
129128
130129
import './App.css';
131130
@@ -140,7 +139,7 @@ export default {
140139
router: historyRouter({
141140
cleanUrlOnDispose: false,
142141
}),
143-
stateMapping: simpleMapping(),
142+
stateMapping: simpleStateMapping(),
144143
},
145144
};
146145
},

examples/vue/e-commerce/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"dependencies": {
1111
"algoliasearch": "5.1.1",
1212
"core-js": "2",
13-
"instantsearch.js": "4.75.3",
13+
"instantsearch-core": "0.1.0",
1414
"vue": "2.7.14",
1515
"vue-instantsearch": "4.19.9",
1616
"vue-slider-component": "3.0.32"

examples/vue/e-commerce/src/routing.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable camelcase */
22
/* eslint-disable complexity */
3-
import { history as historyRouter } from 'instantsearch.js/es/lib/routers';
3+
import { historyRouter } from 'instantsearch-core';
44

55
const hitsPerPageItemsValue = [16, 32, 64];
66

examples/vue/e-commerce/src/widgets/ClearRefinements.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</template>
1212

1313
<script>
14-
import { connectClearRefinements } from 'instantsearch.js/es/connectors';
14+
import { connectClearRefinements } from 'instantsearch-core';
1515
import { createWidgetMixin } from 'vue-instantsearch';
1616
1717
export default {

examples/vue/e-commerce/src/widgets/NoResults.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
</template>
116116

117117
<script>
118-
import { connectHits } from 'instantsearch.js/es/connectors';
118+
import { connectHits } from 'instantsearch-core';
119119
import { createWidgetMixin } from 'vue-instantsearch';
120120
121121
export default {

examples/vue/getting-started/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"dependencies": {
1010
"algoliasearch": "5.1.1",
1111
"core-js": "2",
12-
"instantsearch.js": "4.75.3",
12+
"instantsearch-core": "0.1.0",
1313
"vue": "2.7.14",
1414
"vue-instantsearch": "4.19.9"
1515
},

examples/vue/media/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"dependencies": {
1111
"algoliasearch": "5.1.1",
1212
"core-js": "2",
13-
"instantsearch.js": "4.75.3",
13+
"instantsearch-core": "0.1.0",
1414
"vue": "2.7.14",
1515
"vue-instantsearch": "4.19.9"
1616
},

examples/vue/media/src/App.vue

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@
113113

114114
<script>
115115
import { liteClient as algoliasearch } from 'algoliasearch/lite';
116-
import { history as historyRouter } from 'instantsearch.js/es/lib/routers';
117-
import { simple as simpleMapping } from 'instantsearch.js/es/lib/stateMappings';
116+
import { historyRouter, simpleStateMapping } from 'instantsearch-core';
118117
119118
import './App.css';
120119
@@ -129,7 +128,7 @@ export default {
129128
router: historyRouter({
130129
cleanUrlOnDispose: false,
131130
}),
132-
stateMapping: simpleMapping(),
131+
stateMapping: simpleStateMapping(),
133132
},
134133
};
135134
},

packages/vue-instantsearch/__mocks__/instantsearch.js/es.js

Lines changed: 0 additions & 73 deletions
This file was deleted.

packages/vue-instantsearch/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
},
3838
"dependencies": {
3939
"instantsearch-ui-components": "0.9.0",
40-
"instantsearch.js": "4.75.3",
40+
"instantsearch-core": "0.1.0",
4141
"mitt": "^2.1.0"
4242
},
4343
"peerDependencies": {

packages/vue-instantsearch/src/__tests__/common-connectors.test.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
connectRatingMenu,
1515
connectRefinementList,
1616
connectToggleRefinement,
17-
} from 'instantsearch.js/es/connectors';
17+
} from 'instantsearch-core';
1818

1919
import { nextTick, mountApp } from '../../test/utils';
2020
import {
@@ -24,7 +24,6 @@ import {
2424
createWidgetMixin,
2525
} from '../instantsearch';
2626
import { renderCompat } from '../util/vue-compat';
27-
jest.unmock('instantsearch.js/es');
2827

2928
const testSetups = {
3029
async createRefinementListConnectorTests({

packages/vue-instantsearch/src/__tests__/common-shared.test.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*/
44
import { runTestSuites } from '@instantsearch/tests/common';
55
import * as testSuites from '@instantsearch/tests/shared';
6-
import { connectMenu, connectPagination } from 'instantsearch.js/es/connectors';
6+
import { connectMenu, connectPagination } from 'instantsearch-core';
77

88
import { nextTick, mountApp } from '../../test/utils';
99
import {
@@ -14,7 +14,6 @@ import {
1414
createWidgetMixin,
1515
} from '../instantsearch';
1616
import { renderCompat } from '../util/vue-compat';
17-
jest.unmock('instantsearch.js/es');
1817

1918
const testSetups = {
2019
async createSharedTests({ instantSearchOptions, widgetParams }) {

packages/vue-instantsearch/src/__tests__/common-widgets.test.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ import {
3232
} from '../instantsearch';
3333
import { renderCompat } from '../util/vue-compat';
3434

35-
jest.unmock('instantsearch.js/es');
36-
3735
/**
3836
* prevent rethrowing InstantSearch errors, so tests can be asserted.
3937
* IRL this isn't needed, as the error doesn't stop execution.
@@ -327,8 +325,8 @@ const testSetups = {
327325

328326
return {
329327
algoliaAgents: [
330-
`instantsearch.js (${
331-
require('../../../instantsearch.js/package.json').version
328+
`instantsearch-core (${
329+
require('../../../instantsearch-core/package.json').version
332330
})`,
333331
`Vue InstantSearch (${
334332
require('../../../vue-instantsearch/package.json').version

packages/vue-instantsearch/src/__tests__/index.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*/
44

55
/* eslint-disable jest/no-conditional-expect */
6+
import { createSearchClient } from '@instantsearch/mocks';
67

78
import { mount } from '../../test/utils';
89
import InstantSearch from '../instantsearch';
@@ -86,11 +87,7 @@ function getAllComponents() {
8687
{
8788
props: {
8889
indexName: 'instant_search',
89-
searchClient: {
90-
search() {
91-
return new Promise({ results: [] });
92-
},
93-
},
90+
searchClient: createSearchClient(),
9491
},
9592
},
9693
[

packages/vue-instantsearch/src/components/Autocomplete.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</template>
2121

2222
<script>
23-
import { connectAutocomplete } from 'instantsearch.js/es/connectors';
23+
import { connectAutocomplete } from 'instantsearch-core';
2424
2525
import { createSuitMixin } from '../mixins/suit';
2626
import { createWidgetMixin } from '../mixins/widget';

packages/vue-instantsearch/src/components/Breadcrumb.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
</template>
5656

5757
<script>
58-
import { connectBreadcrumb } from 'instantsearch.js/es/connectors';
58+
import { connectBreadcrumb } from 'instantsearch-core';
5959
6060
import { createPanelConsumerMixin } from '../mixins/panel';
6161
import { createSuitMixin } from '../mixins/suit';

packages/vue-instantsearch/src/components/ClearRefinements.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</template>
2020

2121
<script>
22-
import { connectClearRefinements } from 'instantsearch.js/es/connectors';
22+
import { connectClearRefinements } from 'instantsearch-core';
2323
2424
import { createPanelConsumerMixin } from '../mixins/panel';
2525
import { createSuitMixin } from '../mixins/suit';

packages/vue-instantsearch/src/components/Configure.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { connectConfigure } from 'instantsearch.js/es/connectors';
1+
import { connectConfigure } from 'instantsearch-core';
22

33
import { createSuitMixin } from '../mixins/suit';
44
import { createWidgetMixin } from '../mixins/widget';

packages/vue-instantsearch/src/components/CurrentRefinements.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
</template>
5252

5353
<script>
54-
import { connectCurrentRefinements } from 'instantsearch.js/es/connectors';
54+
import { connectCurrentRefinements } from 'instantsearch-core';
5555
5656
import { createPanelConsumerMixin } from '../mixins/panel';
5757
import { createSuitMixin } from '../mixins/suit';

packages/vue-instantsearch/src/components/DynamicWidgets.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { connectDynamicWidgets } from 'instantsearch.js/es/connectors';
1+
import { connectDynamicWidgets } from 'instantsearch-core';
22

33
import { createSuitMixin } from '../mixins/suit';
44
import { createWidgetMixin } from '../mixins/widget';

packages/vue-instantsearch/src/components/HierarchicalMenu.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</template>
4040

4141
<script>
42-
import { connectHierarchicalMenu } from 'instantsearch.js/es/connectors';
42+
import { connectHierarchicalMenu } from 'instantsearch-core';
4343
4444
import { createPanelConsumerMixin } from '../mixins/panel';
4545
import { createSuitMixin } from '../mixins/suit';

packages/vue-instantsearch/src/components/Highlighter.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { createHighlightComponent } from 'instantsearch-ui-components';
21
import {
32
getHighlightedParts,
43
getPropertyByPath,
54
unescape,
6-
} from 'instantsearch.js/es/lib/utils';
5+
} from 'instantsearch-core';
6+
import { createHighlightComponent } from 'instantsearch-ui-components';
77

88
import { createElement, Fragment } from '../util/pragma';
99

packages/vue-instantsearch/src/components/Hits.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import { connectHits } from 'instantsearch-core';
12
import { createHitsComponent } from 'instantsearch-ui-components';
2-
import { connectHits } from 'instantsearch.js/es/connectors';
33

44
import { createSuitMixin } from '../mixins/suit';
55
import { createWidgetMixin } from '../mixins/widget';

packages/vue-instantsearch/src/components/HitsPerPage.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</template>
2727

2828
<script>
29-
import { connectHitsPerPage } from 'instantsearch.js/es/connectors';
29+
import { connectHitsPerPage } from 'instantsearch-core';
3030
3131
import { createPanelConsumerMixin } from '../mixins/panel';
3232
import { createSuitMixin } from '../mixins/suit';

packages/vue-instantsearch/src/components/Index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import indexWidget from 'instantsearch.js/es/widgets/index/index';
1+
import { index as indexWidget } from 'instantsearch-core';
22

33
import { createSuitMixin } from '../mixins/suit';
44
import { createWidgetMixin } from '../mixins/widget';

packages/vue-instantsearch/src/components/InfiniteHits.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
</template>
101101

102102
<script>
103-
import { connectInfiniteHits } from 'instantsearch.js/es/connectors';
103+
import { connectInfiniteHits } from 'instantsearch-core';
104104
105105
import { createSuitMixin } from '../mixins/suit';
106106
import { createWidgetMixin } from '../mixins/widget';

packages/vue-instantsearch/src/components/InstantSearch.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import instantsearch from 'instantsearch.js/es';
1+
import { instantsearch } from 'instantsearch-core';
22

33
import { createInstantSearchComponent } from '../util/createInstantSearchComponent';
44
import { renderCompat, getDefaultSlot } from '../util/vue-compat';

packages/vue-instantsearch/src/components/Menu.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
</template>
4949

5050
<script>
51-
import { connectMenu } from 'instantsearch.js/es/connectors';
51+
import { connectMenu } from 'instantsearch-core';
5252
5353
import { createPanelConsumerMixin } from '../mixins/panel';
5454
import { createSuitMixin } from '../mixins/suit';

packages/vue-instantsearch/src/components/MenuSelect.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</template>
3535

3636
<script>
37-
import { connectMenu } from 'instantsearch.js/es/connectors';
37+
import { connectMenu } from 'instantsearch-core';
3838
3939
import { createPanelConsumerMixin } from '../mixins/panel';
4040
import { createSuitMixin } from '../mixins/suit';

packages/vue-instantsearch/src/components/NumericMenu.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</template>
3535

3636
<script>
37-
import { connectNumericMenu } from 'instantsearch.js/es/connectors';
37+
import { connectNumericMenu } from 'instantsearch-core';
3838
3939
import { createPanelConsumerMixin } from '../mixins/panel';
4040
import { createSuitMixin } from '../mixins/suit';

packages/vue-instantsearch/src/components/Pagination.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
</template>
166166

167167
<script>
168-
import { connectPagination } from 'instantsearch.js/es/connectors';
168+
import { connectPagination } from 'instantsearch-core';
169169
170170
import { createPanelConsumerMixin } from '../mixins/panel';
171171
import { createSuitMixin } from '../mixins/suit';

0 commit comments

Comments
 (0)