react-instantsearch-nextjs 0.2.5 → 0.3.1

package/dist/cjs/InitializePromise.js

@@ -1,6 +1,5 @@
 "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
 });
@@ -13,8 +12,15 @@ var _reactInstantsearchCore = require("react-instantsearch-core");
 var _htmlEscape = require("./htmlEscape");
 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; }
-var _ref2 = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
-function InitializePromise() {
+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 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); }
+var _ref3 = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
+function InitializePromise(_ref) {
+  var nonce = _ref.nonce;
   var _search = (0, _reactInstantsearchCore.useInstantSearchContext)();
   var waitForResultsRef = (0, _reactInstantsearchCore.useRSCContext)();
   var insertHTML = (0, _react.useContext)(_navigation.ServerInsertedHTMLContext) || function () {
@@ -24,19 +30,31 @@ function InitializePromise() {
   // Extract search parameters from the search client to use them
   // later during hydration.
   var requestParamsList;
-  _search.mainHelper.setClient({
+  _search.mainHelper.setClient(_objectSpread(_objectSpread({}, _search.mainHelper.getClient()), {}, {
     search: function search(queries) {
-      requestParamsList = queries.map(function (_ref) {
-        var params = _ref.params;
+      requestParamsList = queries.map(function (_ref2) {
+        var params = _ref2.params;
         return params;
       });
       return _search.client.search(queries);
     }
-  });
+  }));
+  (0, _utils.resetWidgetId)();
   var waitForResults = function waitForResults() {
     return new Promise(function (resolve) {
-      _search.mainHelper.derivedHelpers[0].on('result', function () {
-        resolve();
+      var searchReceived = false;
+      var recommendReceived = false;
+      _search.mainHelper.derivedHelpers[0].once('result', function () {
+        searchReceived = true;
+        if (!_search._hasRecommendWidget || recommendReceived) {
+          resolve();
+        }
+      });
+      _search.mainHelper.derivedHelpers[0].once('recommend:result', function () {
+        recommendReceived = true;
+        if (!_search._hasSearchWidget || searchReceived) {
+          resolve();
+        }
       });
     });
   };
@@ -45,10 +63,11 @@ function InitializePromise() {
     var results = (0, _server.getInitialResults)(_search.mainIndex, requestParamsList);
     insertHTML(function () {
       if (inserted) {
-        return _ref2;
+        return _ref3;
       }
       inserted = true;
       return /*#__PURE__*/_react.default.createElement("script", {
+        nonce: nonce,
         dangerouslySetInnerHTML: {
           __html: "window[Symbol.for(\"InstantSearchInitialResults\")] = ".concat((0, _htmlEscape.htmlEscapeJsonString)(JSON.stringify(results)))
         }

package/dist/cjs/InstantSearchNext.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.InstantSearchNext = InstantSearchNext;
 var _utils = require("instantsearch.js/cjs/lib/utils");
+var _headers = require("next/headers");
 var _react = _interopRequireWildcard(require("react"));
 var _reactInstantsearchCore = require("react-instantsearch-core");
 var _InitializePromise = require("./InitializePromise");
@@ -19,8 +20,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; }
 var InstantSearchInitialResults = Symbol.for('InstantSearchInitialResults');
-var _ref2 = /*#__PURE__*/_react.default.createElement(_InitializePromise.InitializePromise, null);
-var _ref3 = /*#__PURE__*/_react.default.createElement(_TriggerSearch.TriggerSearch, null);
+var _ref2 = /*#__PURE__*/_react.default.createElement(_TriggerSearch.TriggerSearch, null);
 function InstantSearchNext(_ref) {
   var children = _ref.children,
     passedRouting = _ref.routing,
@@ -45,5 +45,7 @@ function InstantSearchNext(_ref) {
     initialResults: initialResults
   }, /*#__PURE__*/_react.default.createElement(_reactInstantsearchCore.InstantSearch, _extends({}, instantSearchProps, {
     routing: routing
-  }), !initialResults && _ref2, children, !initialResults && _ref3)));
+  }), !initialResults && /*#__PURE__*/_react.default.createElement(_InitializePromise.InitializePromise, {
+    nonce: (0, _headers.headers)().get('x-nonce') || undefined
+  }), children, !initialResults && _ref2)));
 }

package/dist/cjs/TriggerSearch.js

@@ -10,8 +10,9 @@ function TriggerSearch() {
   var instantsearch = (0, _reactInstantsearchCore.useInstantSearchContext)();
   var waitForResultsRef = (0, _reactInstantsearchCore.useRSCContext)();
   if ((waitForResultsRef === null || waitForResultsRef === void 0 ? void 0 : (_waitForResultsRef$cu = waitForResultsRef.current) === null || _waitForResultsRef$cu === void 0 ? void 0 : _waitForResultsRef$cu.status) === 'pending') {
-    var _instantsearch$mainHe;
-    (_instantsearch$mainHe = instantsearch.mainHelper) === null || _instantsearch$mainHe === void 0 ? void 0 : _instantsearch$mainHe.searchOnlyWithDerivedHelpers();
+    var _instantsearch$mainHe, _instantsearch$mainHe2;
+    instantsearch._hasSearchWidget && ((_instantsearch$mainHe = instantsearch.mainHelper) === null || _instantsearch$mainHe === void 0 ? void 0 : _instantsearch$mainHe.searchOnlyWithDerivedHelpers());
+    instantsearch._hasRecommendWidget && ((_instantsearch$mainHe2 = instantsearch.mainHelper) === null || _instantsearch$mainHe2 === void 0 ? void 0 : _instantsearch$mainHe2.recommend());
   }
   return null;
 }

package/dist/es/InitializePromise.d.ts

@@ -1 +1,10 @@
-export declare function InitializePromise(): null;
+type InitializePromiseProps = {
+    /**
+     * The nonce to use for the injected script tag.
+     *
+     * @see https://nextjs.org/docs/app/building-your-application/configuring/content-security-policy#nonces
+     */
+    nonce?: string;
+};
+export declare function InitializePromise({ nonce }: InitializePromiseProps): null;
+export {};

package/dist/es/InitializePromise.js

@@ -1,11 +1,18 @@
+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 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); }
 import { getInitialResults } from "instantsearch.js/es/lib/server.js";
-import { walkIndex } from "instantsearch.js/es/lib/utils/index.js";
+import { resetWidgetId, walkIndex } from "instantsearch.js/es/lib/utils/index.js";
 import { ServerInsertedHTMLContext } from "next/navigation.js";
 import React, { useContext } from 'react';
 import { useInstantSearchContext, useRSCContext, wrapPromiseWithState } from 'react-instantsearch-core';
 import { htmlEscapeJsonString } from "./htmlEscape.js";
-var _ref2 = /*#__PURE__*/React.createElement(React.Fragment, null);
-export function InitializePromise() {
+var _ref3 = /*#__PURE__*/React.createElement(React.Fragment, null);
+export function InitializePromise(_ref) {
+  var nonce = _ref.nonce;
   var _search = useInstantSearchContext();
   var waitForResultsRef = useRSCContext();
   var insertHTML = useContext(ServerInsertedHTMLContext) || function () {
@@ -15,19 +22,31 @@ export function InitializePromise() {
   // Extract search parameters from the search client to use them
   // later during hydration.
   var requestParamsList;
-  _search.mainHelper.setClient({
+  _search.mainHelper.setClient(_objectSpread(_objectSpread({}, _search.mainHelper.getClient()), {}, {
     search: function search(queries) {
-      requestParamsList = queries.map(function (_ref) {
-        var params = _ref.params;
+      requestParamsList = queries.map(function (_ref2) {
+        var params = _ref2.params;
         return params;
       });
       return _search.client.search(queries);
     }
-  });
+  }));
+  resetWidgetId();
   var waitForResults = function waitForResults() {
     return new Promise(function (resolve) {
-      _search.mainHelper.derivedHelpers[0].on('result', function () {
-        resolve();
+      var searchReceived = false;
+      var recommendReceived = false;
+      _search.mainHelper.derivedHelpers[0].once('result', function () {
+        searchReceived = true;
+        if (!_search._hasRecommendWidget || recommendReceived) {
+          resolve();
+        }
+      });
+      _search.mainHelper.derivedHelpers[0].once('recommend:result', function () {
+        recommendReceived = true;
+        if (!_search._hasSearchWidget || searchReceived) {
+          resolve();
+        }
       });
     });
   };
@@ -36,10 +55,11 @@ export function InitializePromise() {
     var results = getInitialResults(_search.mainIndex, requestParamsList);
     insertHTML(function () {
       if (inserted) {
-        return _ref2;
+        return _ref3;
       }
       inserted = true;
       return /*#__PURE__*/React.createElement("script", {
+        nonce: nonce,
         dangerouslySetInnerHTML: {
           __html: "window[Symbol.for(\"InstantSearchInitialResults\")] = ".concat(htmlEscapeJsonString(JSON.stringify(results)))
         }

package/dist/es/InstantSearchNext.js

@@ -3,6 +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 { headers } from "next/headers.js";
 import React, { useEffect, useRef } from 'react';
 import { InstantSearch, InstantSearchRSCContext, InstantSearchSSRProvider } from 'react-instantsearch-core';
 import { InitializePromise } from "./InitializePromise.js";
@@ -10,8 +11,7 @@ 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);
-var _ref3 = /*#__PURE__*/React.createElement(TriggerSearch, null);
+var _ref2 = /*#__PURE__*/React.createElement(TriggerSearch, null);
 export function InstantSearchNext(_ref) {
   var children = _ref.children,
     passedRouting = _ref.routing,
@@ -36,5 +36,7 @@ export function InstantSearchNext(_ref) {
     initialResults: initialResults
   }, /*#__PURE__*/React.createElement(InstantSearch, _extends({}, instantSearchProps, {
     routing: routing
-  }), !initialResults && _ref2, children, !initialResults && _ref3)));
+  }), !initialResults && /*#__PURE__*/React.createElement(InitializePromise, {
+    nonce: headers().get('x-nonce') || undefined
+  }), children, !initialResults && _ref2)));
 }

package/dist/es/TriggerSearch.js

@@ -4,8 +4,9 @@ export function TriggerSearch() {
   var instantsearch = useInstantSearchContext();
   var waitForResultsRef = useRSCContext();
   if ((waitForResultsRef === null || waitForResultsRef === void 0 ? void 0 : (_waitForResultsRef$cu = waitForResultsRef.current) === null || _waitForResultsRef$cu === void 0 ? void 0 : _waitForResultsRef$cu.status) === 'pending') {
-    var _instantsearch$mainHe;
-    (_instantsearch$mainHe = instantsearch.mainHelper) === null || _instantsearch$mainHe === void 0 ? void 0 : _instantsearch$mainHe.searchOnlyWithDerivedHelpers();
+    var _instantsearch$mainHe, _instantsearch$mainHe2;
+    instantsearch._hasSearchWidget && ((_instantsearch$mainHe = instantsearch.mainHelper) === null || _instantsearch$mainHe === void 0 ? void 0 : _instantsearch$mainHe.searchOnlyWithDerivedHelpers());
+    instantsearch._hasRecommendWidget && ((_instantsearch$mainHe2 = instantsearch.mainHelper) === null || _instantsearch$mainHe2 === void 0 ? void 0 : _instantsearch$mainHe2.recommend());
   }
   return null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-instantsearch-nextjs",
-  "version": "0.2.5",
+  "version": "0.3.1",
   "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.69.0",
+    "instantsearch.js": "4.71.0",
     "next": "13.5.1",
-    "react-instantsearch-core": "7.9.0"
+    "react-instantsearch-core": "7.11.0"
   },
   "peerDependencies": {
     "next": ">= 13.4 && < 15",
     "react-instantsearch": ">= 7.1.0 && < 8"
   },
-  "gitHead": "95ec6c4ce746c77eeb92fab1e42b5f833f3f04bc"
+  "gitHead": "3707501a19e582e8263a3ae5a9d51ff3f5263361"
 }