react-instantsearch-nextjs 0.4.1 → 0.4.2

package/dist/cjs/InstantSearchNext.js

@@ -27,20 +27,6 @@ function InstantSearchNext(_ref) {
     instantSearchProps = _objectWithoutProperties(_ref, _excluded);
   var isMounting = (0, _react.useRef)(true);
   var isServer = typeof window === 'undefined';
-  var hasRouteChanged = (0, _react.useMemo)(function () {
-    // On server, always return false
-    if (isServer) {
-      return false;
-    }
-
-    // On client, route has changed if initialResults have been cleaned up
-    var hasInitialResults = window[InstantSearchInitialResults] !== undefined;
-    return !hasInitialResults;
-  }, [isServer]);
-
-  // We only want to trigger a search from a server environment
-  // or if a Next.js route change has happened on the client
-  var shouldTriggerSearch = isServer || hasRouteChanged;
   (0, _react.useEffect)(function () {
     isMounting.current = false;
     return function () {
@@ -57,18 +43,30 @@ function InstantSearchNext(_ref) {
     }
   });
   var routing = (0, _useInstantSearchRouting.useInstantSearchRouting)(passedRouting, isMounting);
+  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(ServerOrHydrationProvider, {
+    isServer: isServer
+  }, /*#__PURE__*/_react.default.createElement(_reactInstantsearchCore.InstantSearch, _extends({}, instantSearchProps, {
+    routing: routing
+  }), isServer && /*#__PURE__*/_react.default.createElement(_InitializePromise.InitializePromise, {
+    nonce: nonce
+  }), children, isServer && _ref2));
+}
+function ServerOrHydrationProvider(_ref3) {
+  var isServer = _ref3.isServer,
+    children = _ref3.children;
   var promiseRef = (0, _react.useRef)(null);
   var initialResults = (0, _utils.safelyRunOnBrowser)(function () {
     return window[InstantSearchInitialResults];
   });
-  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;
+
+  // If we're not on the server and we don't need to hydrate, we don't need SSR context
+  if (!isServer && !initialResults) {
+    return children;
+  }
   return /*#__PURE__*/_react.default.createElement(_reactInstantsearchCore.InstantSearchRSCContext.Provider, {
     value: promiseRef
   }, /*#__PURE__*/_react.default.createElement(_reactInstantsearchCore.InstantSearchSSRProvider, {
     initialResults: initialResults
-  }, /*#__PURE__*/_react.default.createElement(_reactInstantsearchCore.InstantSearch, _extends({}, instantSearchProps, {
-    routing: routing
-  }), shouldTriggerSearch && /*#__PURE__*/_react.default.createElement(_InitializePromise.InitializePromise, {
-    nonce: nonce
-  }), children, shouldTriggerSearch && _ref2)));
+  }, children));
 }

package/dist/es/InstantSearchNext.js

@@ -3,7 +3,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 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 { safelyRunOnBrowser } from "instantsearch.js/es/lib/utils/index.js";
-import React, { useEffect, useMemo, useRef } from 'react';
+import React, { useEffect, useRef } from 'react';
 import { InstantSearch, InstantSearchRSCContext, InstantSearchSSRProvider } from 'react-instantsearch-core';
 import { InitializePromise } from "./InitializePromise.js";
 import { TriggerSearch } from "./TriggerSearch.js";
@@ -18,20 +18,6 @@ export function InstantSearchNext(_ref) {
     instantSearchProps = _objectWithoutProperties(_ref, _excluded);
   var isMounting = useRef(true);
   var isServer = typeof window === 'undefined';
-  var hasRouteChanged = useMemo(function () {
-    // On server, always return false
-    if (isServer) {
-      return false;
-    }
-
-    // On client, route has changed if initialResults have been cleaned up
-    var hasInitialResults = window[InstantSearchInitialResults] !== undefined;
-    return !hasInitialResults;
-  }, [isServer]);
-
-  // We only want to trigger a search from a server environment
-  // or if a Next.js route change has happened on the client
-  var shouldTriggerSearch = isServer || hasRouteChanged;
   useEffect(function () {
     isMounting.current = false;
     return function () {
@@ -48,18 +34,30 @@ export function InstantSearchNext(_ref) {
     }
   });
   var routing = useInstantSearchRouting(passedRouting, isMounting);
+  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(ServerOrHydrationProvider, {
+    isServer: isServer
+  }, /*#__PURE__*/React.createElement(InstantSearch, _extends({}, instantSearchProps, {
+    routing: routing
+  }), isServer && /*#__PURE__*/React.createElement(InitializePromise, {
+    nonce: nonce
+  }), children, isServer && _ref2));
+}
+function ServerOrHydrationProvider(_ref3) {
+  var isServer = _ref3.isServer,
+    children = _ref3.children;
   var promiseRef = useRef(null);
   var initialResults = safelyRunOnBrowser(function () {
     return window[InstantSearchInitialResults];
   });
-  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;
+
+  // If we're not on the server and we don't need to hydrate, we don't need SSR context
+  if (!isServer && !initialResults) {
+    return children;
+  }
   return /*#__PURE__*/React.createElement(InstantSearchRSCContext.Provider, {
     value: promiseRef
   }, /*#__PURE__*/React.createElement(InstantSearchSSRProvider, {
     initialResults: initialResults
-  }, /*#__PURE__*/React.createElement(InstantSearch, _extends({}, instantSearchProps, {
-    routing: routing
-  }), shouldTriggerSearch && /*#__PURE__*/React.createElement(InitializePromise, {
-    nonce: nonce
-  }), children, shouldTriggerSearch && _ref2)));
+  }, children));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-instantsearch-nextjs",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "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.77.0",
+    "instantsearch.js": "4.77.1",
     "next": "15.1.4",
-    "react-instantsearch-core": "7.15.0"
+    "react-instantsearch-core": "7.15.1"
   },
   "peerDependencies": {
     "next": ">= 13.4 < 16",
     "react-instantsearch": ">= 7.1.0 < 8"
   },
-  "gitHead": "d3e46fedc5bba4482cfc5aadaf9b9c436681e93f"
+  "gitHead": "3d0c6cbcb894a0b38a81485bc98de6244b70b97e"
 }