react-instantsearch-nextjs 0.1.14 → 0.2.0

package/dist/cjs/InstantSearchNext.js

@@ -1,29 +1,21 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.InstantSearchNext = InstantSearchNext;
-var _history = _interopRequireDefault(require("instantsearch.js/cjs/lib/routers/history"));
 var _utils = require("instantsearch.js/cjs/lib/utils");
-var _headers = require("next/headers");
-var _navigation = require("next/navigation");
 var _react = _interopRequireWildcard(require("react"));
 var _reactInstantsearchCore = require("react-instantsearch-core");
 var _InitializePromise = require("./InitializePromise");
 var _TriggerSearch = require("./TriggerSearch");
+var _useInstantSearchRouting = require("./useInstantSearchRouting");
 var _warn = require("./warn");
 var _excluded = ["children", "routing"];
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 var InstantSearchInitialResults = Symbol.for('InstantSearchInitialResults');
@@ -33,45 +25,19 @@ function InstantSearchNext(_ref) {
   var children = _ref.children,
     passedRouting = _ref.routing,
     instantSearchProps = _objectWithoutProperties(_ref, _excluded);
-  var pathname = (0, _navigation.usePathname)();
-  var searchParams = (0, _navigation.useSearchParams)();
-  var router = (0, _navigation.useRouter)();
   var isMounting = (0, _react.useRef)(true);
   (0, _react.useEffect)(function () {
     isMounting.current = false;
+    return function () {
+      // This is to make sure that they're not reused if mounting again on a different route
+      delete window[InstantSearchInitialResults];
+    };
   }, []);
+  var routing = (0, _useInstantSearchRouting.useInstantSearchRouting)(passedRouting, isMounting);
   var promiseRef = (0, _react.useRef)(null);
   var initialResults = (0, _utils.safelyRunOnBrowser)(function () {
     return window[InstantSearchInitialResults];
   });
-  var routing = passedRouting && {};
-  if (routing) {
-    var browserHistoryOptions = {};
-    browserHistoryOptions.getLocation = function () {
-      if (typeof window === 'undefined') {
-        var url = "".concat((0, _headers.headers)().get('x-forwarded-proto') || 'http', "://").concat((0, _headers.headers)().get('host')).concat(pathname, "?").concat(searchParams);
-        return new URL(url);
-      }
-      if (isMounting.current) {
-        return new URL("".concat(window.location.protocol, "//").concat(window.location.host).concat(pathname, "?").concat(searchParams));
-      }
-      return window.location;
-    };
-    browserHistoryOptions.push = function push(url) {
-      // This is to skip the push with empty routeState on dispose as it would clear params set on a <Link>
-      if (this.isDisposed) {
-        return;
-      }
-      router.push(url, {
-        scroll: false
-      });
-    };
-    if (_typeof(passedRouting) === 'object') {
-      browserHistoryOptions = _objectSpread(_objectSpread({}, browserHistoryOptions), passedRouting.router);
-      routing.stateMapping = passedRouting.stateMapping;
-    }
-    routing.router = (0, _history.default)(browserHistoryOptions);
-  }
   process.env.NODE_ENV === 'development' ? (0, _warn.warn)(false, "InstantSearchNext relies on experimental APIs and may break in the future.\nThis message will only be displayed in development mode.") : void 0;
   return /*#__PURE__*/_react.default.createElement(_reactInstantsearchCore.InstantSearchRSCContext.Provider, {
     value: promiseRef

package/dist/cjs/useInstantSearchRouting.js

@@ -0,0 +1,61 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useInstantSearchRouting = useInstantSearchRouting;
+var _history = _interopRequireDefault(require("instantsearch.js/cjs/lib/routers/history"));
+var _headers = require("next/headers");
+var _navigation = require("next/navigation");
+var _react = require("react");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function useInstantSearchRouting(passedRouting, isMounting) {
+  var pathname = (0, _navigation.usePathname)();
+  var searchParams = (0, _navigation.useSearchParams)();
+  var router = (0, _navigation.useRouter)();
+  var routingRef = (0, _react.useRef)();
+  var onUpdateRef = (0, _react.useRef)();
+  (0, _react.useEffect)(function () {
+    if (onUpdateRef.current) {
+      onUpdateRef.current();
+    }
+  }, [pathname, searchParams]);
+  if (passedRouting && !routingRef.current) {
+    var browserHistoryOptions = {};
+    browserHistoryOptions.getLocation = function () {
+      if (typeof window === 'undefined') {
+        var url = "".concat((0, _headers.headers)().get('x-forwarded-proto') || 'http', "://").concat((0, _headers.headers)().get('host')).concat(pathname, "?").concat(searchParams);
+        return new URL(url);
+      }
+      if (isMounting.current) {
+        return new URL("".concat(window.location.protocol, "//").concat(window.location.host).concat(pathname, "?").concat(searchParams));
+      }
+      return window.location;
+    };
+    browserHistoryOptions.push = function push(url) {
+      // This is to skip the push with empty routeState on dispose as it would clear params set on a <Link>
+      if (this.isDisposed) {
+        return;
+      }
+      router.push(url, {
+        scroll: false
+      });
+    };
+    browserHistoryOptions.start = function start(onUpdate) {
+      onUpdateRef.current = onUpdate;
+    };
+    routingRef.current = {};
+    if (_typeof(passedRouting) === 'object') {
+      browserHistoryOptions = _objectSpread(_objectSpread({}, browserHistoryOptions), passedRouting.router);
+      routingRef.current.stateMapping = passedRouting.stateMapping;
+    }
+    routingRef.current.router = (0, _history.default)(browserHistoryOptions);
+  }
+  return routingRef.current;
+}

package/dist/es/InstantSearchNext.js

@@ -1,21 +1,13 @@
 var _excluded = ["children", "routing"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import historyRouter from "instantsearch.js/es/lib/routers/history.js";
 import { safelyRunOnBrowser } from "instantsearch.js/es/lib/utils/index.js";
-import { headers } from "next/headers.js";
-import { usePathname, useSearchParams, useRouter } from "next/navigation.js";
 import React, { useEffect, useRef } from 'react';
 import { InstantSearch, InstantSearchRSCContext, InstantSearchSSRProvider } from 'react-instantsearch-core';
 import { InitializePromise } from "./InitializePromise.js";
 import { TriggerSearch } from "./TriggerSearch.js";
+import { useInstantSearchRouting } from "./useInstantSearchRouting.js";
 import { warn } from "./warn.js";
 var InstantSearchInitialResults = Symbol.for('InstantSearchInitialResults');
 var _ref2 = /*#__PURE__*/React.createElement(InitializePromise, null);
@@ -24,45 +16,19 @@ export function InstantSearchNext(_ref) {
   var children = _ref.children,
     passedRouting = _ref.routing,
     instantSearchProps = _objectWithoutProperties(_ref, _excluded);
-  var pathname = usePathname();
-  var searchParams = useSearchParams();
-  var router = useRouter();
   var isMounting = useRef(true);
   useEffect(function () {
     isMounting.current = false;
+    return function () {
+      // This is to make sure that they're not reused if mounting again on a different route
+      delete window[InstantSearchInitialResults];
+    };
   }, []);
+  var routing = useInstantSearchRouting(passedRouting, isMounting);
   var promiseRef = useRef(null);
   var initialResults = safelyRunOnBrowser(function () {
     return window[InstantSearchInitialResults];
   });
-  var routing = passedRouting && {};
-  if (routing) {
-    var browserHistoryOptions = {};
-    browserHistoryOptions.getLocation = function () {
-      if (typeof window === 'undefined') {
-        var url = "".concat(headers().get('x-forwarded-proto') || 'http', "://").concat(headers().get('host')).concat(pathname, "?").concat(searchParams);
-        return new URL(url);
-      }
-      if (isMounting.current) {
-        return new URL("".concat(window.location.protocol, "//").concat(window.location.host).concat(pathname, "?").concat(searchParams));
-      }
-      return window.location;
-    };
-    browserHistoryOptions.push = function push(url) {
-      // This is to skip the push with empty routeState on dispose as it would clear params set on a <Link>
-      if (this.isDisposed) {
-        return;
-      }
-      router.push(url, {
-        scroll: false
-      });
-    };
-    if (_typeof(passedRouting) === 'object') {
-      browserHistoryOptions = _objectSpread(_objectSpread({}, browserHistoryOptions), passedRouting.router);
-      routing.stateMapping = passedRouting.stateMapping;
-    }
-    routing.router = historyRouter(browserHistoryOptions);
-  }
   process.env.NODE_ENV === 'development' ? warn(false, "InstantSearchNext relies on experimental APIs and may break in the future.\nThis message will only be displayed in development mode.") : void 0;
   return /*#__PURE__*/React.createElement(InstantSearchRSCContext.Provider, {
     value: promiseRef

package/dist/es/useInstantSearchRouting.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+import type { InstantSearchNextProps } from './InstantSearchNext';
+import type { UiState } from 'instantsearch.js';
+export declare function useInstantSearchRouting<TUiState extends UiState = UiState, TRouteState = TUiState>(passedRouting: InstantSearchNextProps<TUiState, TRouteState>['routing'], isMounting: React.MutableRefObject<boolean>): boolean | import("instantsearch.js/es/middlewares").RouterProps<TUiState, TRouteState> | undefined;

package/dist/es/useInstantSearchRouting.js

@@ -0,0 +1,54 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+import historyRouter from "instantsearch.js/es/lib/routers/history.js";
+import { headers } from "next/headers.js";
+import { usePathname, useSearchParams, useRouter } from "next/navigation.js";
+import { useRef, useEffect } from 'react';
+export function useInstantSearchRouting(passedRouting, isMounting) {
+  var pathname = usePathname();
+  var searchParams = useSearchParams();
+  var router = useRouter();
+  var routingRef = useRef();
+  var onUpdateRef = useRef();
+  useEffect(function () {
+    if (onUpdateRef.current) {
+      onUpdateRef.current();
+    }
+  }, [pathname, searchParams]);
+  if (passedRouting && !routingRef.current) {
+    var browserHistoryOptions = {};
+    browserHistoryOptions.getLocation = function () {
+      if (typeof window === 'undefined') {
+        var url = "".concat(headers().get('x-forwarded-proto') || 'http', "://").concat(headers().get('host')).concat(pathname, "?").concat(searchParams);
+        return new URL(url);
+      }
+      if (isMounting.current) {
+        return new URL("".concat(window.location.protocol, "//").concat(window.location.host).concat(pathname, "?").concat(searchParams));
+      }
+      return window.location;
+    };
+    browserHistoryOptions.push = function push(url) {
+      // This is to skip the push with empty routeState on dispose as it would clear params set on a <Link>
+      if (this.isDisposed) {
+        return;
+      }
+      router.push(url, {
+        scroll: false
+      });
+    };
+    browserHistoryOptions.start = function start(onUpdate) {
+      onUpdateRef.current = onUpdate;
+    };
+    routingRef.current = {};
+    if (_typeof(passedRouting) === 'object') {
+      browserHistoryOptions = _objectSpread(_objectSpread({}, browserHistoryOptions), passedRouting.router);
+      routingRef.current.stateMapping = passedRouting.stateMapping;
+    }
+    routingRef.current.router = historyRouter(browserHistoryOptions);
+  }
+  return routingRef.current;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-instantsearch-nextjs",
-  "version": "0.1.14",
+  "version": "0.2.0",
   "description": "React InstantSearch SSR utilities for Next.js",
   "types": "dist/es/index.d.ts",
   "main": "dist/cjs/index.js",
@@ -49,13 +49,13 @@
     "watch:es": "yarn --silent build:es:base --watch"
   },
   "devDependencies": {
-    "instantsearch.js": "4.66.0",
+    "instantsearch.js": "4.66.1",
     "next": "13.5.1",
-    "react-instantsearch-core": "7.7.0"
+    "react-instantsearch-core": "7.7.1"
   },
   "peerDependencies": {
     "next": ">= 13.4 && < 15",
     "react-instantsearch": ">= 7.1.0 && < 8"
   },
-  "gitHead": "358f849cba15cbbb415da05feb582b47358aa239"
+  "gitHead": "d309ca3333476a842be080fcb01b8be925aad204"
 }