Merge branch 'master' into feat/import-process

examples/js/calendar-widget/package.json

@@ -12,7 +12,7 @@
     "instantsearch.js": "4.49.1"
   },
   "devDependencies": {
-    "@babel/core": "7.12.0",
+    "@babel/core": "7.15.0",
     "@parcel/packager-raw-url": "2.8.0",
     "@parcel/transformer-webmanifest": "2.8.0",
     "parcel": "2.8.0"

examples/js/e-commerce/package.json

@@ -13,7 +13,7 @@
     "instantsearch.js": "4.49.1"
   },
   "devDependencies": {
-    "@babel/core": "7.12.0",
+    "@babel/core": "7.15.0",
     "@parcel/packager-raw-url": "2.8.0",
     "@parcel/transformer-webmanifest": "2.8.0",
     "parcel": "2.8.0"

examples/js/media/package.json

@@ -13,7 +13,7 @@
     "instantsearch.js": "4.49.1"
   },
   "devDependencies": {
-    "@babel/core": "7.12.0",
+    "@babel/core": "7.15.0",
     "@parcel/packager-raw-url": "2.8.0",
     "@parcel/transformer-webmanifest": "2.8.0",
     "parcel": "2.8.0"

examples/js/tourism/package.json

@@ -12,7 +12,7 @@
     "instantsearch.js": "4.49.1"
   },
   "devDependencies": {
-    "@babel/core": "7.12.0",
+    "@babel/core": "7.15.0",
     "@parcel/packager-raw-url": "2.8.0",
     "@parcel/transformer-webmanifest": "2.8.0",
     "parcel": "2.8.0"

package.json

@@ -27,7 +27,7 @@
   },
   "devDependencies": {
     "@babel/cli": "7.8.4",
-    "@babel/core": "7.12.0",
+    "@babel/core": "7.15.0",
     "@babel/plugin-proposal-class-properties": "7.8.3",
     "@babel/plugin-transform-react-constant-elements": "7.9.0",
     "@babel/preset-env": "7.9.6",

packages/instantsearch.js/src/connectors/answers/__tests__/connectAnswers-test.ts

@@ -11,6 +11,8 @@ import connectAnswers from '../connectAnswers';
 
 const defaultRenderDebounceTime = 10;
 const defaultSearchDebounceTime = 10;
+const waitForDebounceTime =
+  defaultRenderDebounceTime + defaultSearchDebounceTime + 80;
 
 describe('connectAnswers', () => {
   describe('Usage', () => {
@@ -236,7 +238,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/answers/js/
       false
     );
 
-    await wait(30); // 10(render debounce) + 10(search debounce) + 10(just to make sure)
+    await wait(waitForDebounceTime);
 
     // render with hits
     const expectedHits = [{ title: '', objectID: 'a', __position: 1 }];
@@ -299,8 +301,8 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/answers/js/
     // no debounce for rendering loader
     expect(renderFn).toHaveBeenCalledTimes(3);
 
-    // wait for debounce
-    await wait(30);
+    await wait(waitForDebounceTime);
+
     const expectedHits = [{ title: '', objectID: 'a', __position: 1 }];
     expect(renderFn).toHaveBeenCalledTimes(4);
     expect(renderFn).toHaveBeenNthCalledWith(
@@ -312,8 +314,8 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/answers/js/
       false
     );
 
-    // wait
-    await wait(30);
+    await wait(waitForDebounceTime);
+
     // but no more rendering
     expect(renderFn).toHaveBeenCalledTimes(4);
   });
@@ -421,7 +423,8 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/answers/js/
         },
       });
 
-      await wait(30);
+      await wait(waitForDebounceTime);
+
       const expectedHits = [{ title: '', objectID: 'a', __position: 1 }];
       expect(
         widget.getWidgetRenderState(

packages/instantsearch.js/src/lib/__tests__/routing/correct-urls.test.ts

@@ -13,8 +13,10 @@ beforeEach(() => {
   window.history.pushState({}, '', '/');
 });
 
+const writeDelay = 10;
+const writeWait = 10 * writeDelay;
+
 test('correct URL for widgets', async () => {
-  const writeDelay = 10;
   const router = historyRouter({ writeDelay });
 
   const indexName = 'indexName';
@@ -40,15 +42,14 @@ test('correct URL for widgets', async () => {
   // on main index
   search.renderState[indexName].pagination!.refine(39);
 
-  await wait(20);
+  await wait(writeWait);
 
   expect(window.location.search).toBe(
     `?${encodeURI('indexName[page]=40&indexName[query]=test')}`
   );
 });
 
 test('correct URL for widgets in indices with repeated indexId', async () => {
-  const writeDelay = 10;
   const router = historyRouter({ writeDelay });
 
   const indexName = 'indexName';
@@ -74,7 +75,7 @@ test('correct URL for widgets in indices with repeated indexId', async () => {
   // on main index
   search.renderState[indexName].pagination!.refine(39);
 
-  await wait(20);
+  await wait(writeWait);
 
   expect(window.location.search).toBe(
     `?${encodeURI('indexName[page]=40&indexName[query]=test')}`

packages/instantsearch.js/src/lib/__tests__/routing/dispose-start-test.ts

@@ -12,7 +12,7 @@ import type InstantSearch from '../../InstantSearch';
 /* eslint no-lone-blocks: "off" */
 
 const writeDelay = 10;
-const writeWait = 1.5 * writeDelay;
+const writeWait = 10 * writeDelay;
 
 const addWidgetsAndStart = (search: InstantSearch) => {
   search.addWidgets([connectSearchBox(() => {})({})]);

packages/instantsearch.js/src/lib/__tests__/routing/duplicate-url-test.ts

@@ -11,7 +11,7 @@ import { connectPagination, connectSearchBox } from '../../../connectors';
 /* eslint no-lone-blocks: "off" */
 
 const writeDelay = 10;
-const writeWait = 1.5 * writeDelay;
+const writeWait = 10 * writeDelay;
 
 test('does not write the same URL twice', async () => {
   // -- Flow

packages/instantsearch.js/src/lib/__tests__/routing/external-influence-test.ts

@@ -11,7 +11,7 @@ import { connectSearchBox } from '../../../connectors';
 /* eslint no-lone-blocks: "off" */
 
 const writeDelay = 10;
-const writeWait = 1.5 * writeDelay;
+const writeWait = 10 * writeDelay;
 
 describe('routing with external influence', () => {
   test('keeps on working when the URL is updated by another program', async () => {

packages/instantsearch.js/src/lib/__tests__/routing/modal-test.ts

@@ -11,7 +11,7 @@ import { connectSearchBox } from '../../../connectors';
 /* eslint no-lone-blocks: "off" */
 
 const writeDelay = 10;
-const writeWait = 1.5 * writeDelay;
+const writeWait = 10 * writeDelay;
 
 describe('routing with no navigation', () => {
   test('cleans the URL when InstantSearch is disposed within the same page', async () => {

packages/instantsearch.js/src/lib/__tests__/routing/spa-debounced-test.ts

@@ -11,7 +11,7 @@ import { connectSearchBox } from '../../../connectors';
 /* eslint no-lone-blocks: "off" */
 
 const writeDelay = 10;
-const writeWait = 1.5 * writeDelay;
+const writeWait = 10 * writeDelay;
 
 describe('routing with debounced third-party client-side router', () => {
   test('does not clean the URL after navigating', async () => {

packages/instantsearch.js/src/lib/__tests__/routing/spa-replace-state-test.ts

@@ -11,7 +11,7 @@ import { connectSearchBox } from '../../../connectors';
 /* eslint no-lone-blocks: "off" */
 
 const writeDelay = 10;
-const writeWait = 1.5 * writeDelay;
+const writeWait = 10 * writeDelay;
 
 describe('routing using `replaceState`', () => {
   // We can't assert whether another router did update the URL

packages/instantsearch.js/src/lib/__tests__/routing/spa-test.ts

@@ -11,7 +11,7 @@ import { connectSearchBox } from '../../../connectors';
 /* eslint no-lone-blocks: "off" */
 
 const writeDelay = 10;
-const writeWait = 1.5 * writeDelay;
+const writeWait = 10 * writeDelay;
 
 describe('routing with third-party client-side router', () => {
   test('does not clean the URL after navigating', async () => {

packages/instantsearch.js/src/widgets/answers/__tests__/answers-test.ts

@@ -151,7 +151,7 @@ See documentation: https://www.algolia.com/doc/api-reference/widgets/answers/js/
       );
       expect(answersContainer.querySelector('.root')).toHaveClass('empty');
 
-      await wait(30);
+      await wait(100);
 
       // debounced render
       expect(answersContainer.querySelector('.root')).not.toHaveClass('empty');