react-instantsearch-router-nextjs 7.6.0 → 7.7.0

package/dist/cjs/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createInstantSearchRouterNext = createInstantSearchRouterNext;
 var _history = _interopRequireDefault(require("instantsearch.js/cjs/lib/routers/history"));
+var _stripLocaleFromUrl = require("./utils/stripLocaleFromUrl");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }
@@ -62,9 +63,7 @@ function createInstantSearchRouterNext(options) {
         var nextPathname = new URL(window.location.href).pathname;
 
         // We strip the locale from the pathname if it's present
-        if (singletonRouter.locale) {
-          nextPathname = nextPathname.replace(previousPathname === '/' ? singletonRouter.locale : "/".concat(singletonRouter.locale), '');
-        }
+        nextPathname = (0, _stripLocaleFromUrl.stripLocaleFromUrl)(nextPathname, singletonRouter.locale, previousPathname !== '/');
 
         // We only want to trigger a server request when going back/forward to a different page
         return previousPathname !== nextPathname;
@@ -88,12 +87,9 @@ function createInstantSearchRouterNext(options) {
       singletonRouter.beforePopState(ownBeforePopState);
     },
     push: function push(newUrl) {
-      var url = newUrl;
-      // We need to do this because there's an error when using i18n on the root path
-      // it says for example `pages/fr.js` doesn't exist
-      if (singletonRouter.locale) {
-        url = url.replace("/".concat(singletonRouter.locale), '');
-      }
+      // We need to do this because there's an error when using i18n on the
+      // root path it says for example `pages/fr.js` doesn't exist
+      var url = (0, _stripLocaleFromUrl.stripLocaleFromUrl)(newUrl, singletonRouter.locale);
 
       // No need to provide the second argument, Next.js will know what to do
       singletonRouter.push(url, undefined, {

package/dist/cjs/utils/stripLocaleFromUrl.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.stripLocaleFromUrl = stripLocaleFromUrl;
+function stripLocaleFromUrl(url, locale) {
+  var includePrefixSeparator = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  if (!locale) {
+    return url;
+  }
+  return url.replace(new RegExp("".concat(includePrefixSeparator ? '/' : '').concat(locale, "(\\/|\\?|$)")), '$1');
+}

package/dist/es/index.js

@@ -5,6 +5,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 history from "instantsearch.js/es/lib/routers/history.js";
+import { stripLocaleFromUrl } from "./utils/stripLocaleFromUrl.js";
 export function createInstantSearchRouterNext(options) {
   var _ref = options || {},
     beforePopState = _ref.beforePopState,
@@ -55,9 +56,7 @@ export function createInstantSearchRouterNext(options) {
         var nextPathname = new URL(window.location.href).pathname;
 
         // We strip the locale from the pathname if it's present
-        if (singletonRouter.locale) {
-          nextPathname = nextPathname.replace(previousPathname === '/' ? singletonRouter.locale : "/".concat(singletonRouter.locale), '');
-        }
+        nextPathname = stripLocaleFromUrl(nextPathname, singletonRouter.locale, previousPathname !== '/');
 
         // We only want to trigger a server request when going back/forward to a different page
         return previousPathname !== nextPathname;
@@ -81,12 +80,9 @@ export function createInstantSearchRouterNext(options) {
       singletonRouter.beforePopState(ownBeforePopState);
     },
     push: function push(newUrl) {
-      var url = newUrl;
-      // We need to do this because there's an error when using i18n on the root path
-      // it says for example `pages/fr.js` doesn't exist
-      if (singletonRouter.locale) {
-        url = url.replace("/".concat(singletonRouter.locale), '');
-      }
+      // We need to do this because there's an error when using i18n on the
+      // root path it says for example `pages/fr.js` doesn't exist
+      var url = stripLocaleFromUrl(newUrl, singletonRouter.locale);
 
       // No need to provide the second argument, Next.js will know what to do
       singletonRouter.push(url, undefined, {

package/dist/es/utils/stripLocaleFromUrl.d.ts

@@ -0,0 +1 @@
+export declare function stripLocaleFromUrl(url: string, locale: string | undefined, includePrefixSeparator?: boolean): string;

package/dist/es/utils/stripLocaleFromUrl.js

@@ -0,0 +1,7 @@
+export function stripLocaleFromUrl(url, locale) {
+  var includePrefixSeparator = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  if (!locale) {
+    return url;
+  }
+  return url.replace(new RegExp("".concat(includePrefixSeparator ? '/' : '').concat(locale, "(\\/|\\?|$)")), '$1');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-instantsearch-router-nextjs",
-  "version": "7.6.0",
+  "version": "7.7.0",
   "description": "React InstantSearch Router for Next.js",
   "types": "dist/es/index.d.ts",
   "main": "dist/cjs/index.js",
@@ -40,16 +40,18 @@
     "clean": "rm -rf dist",
     "build": "yarn build:cjs && yarn build:es && yarn build:types",
     "build:cjs": "BABEL_ENV=cjs babel src --root-mode upward --extensions '.js,.ts,.tsx' --out-dir dist/cjs --ignore '**/__tests__/**/*','**/__mocks__/**/*' --quiet && ../../scripts/prepare-cjs.sh",
-    "build:es": "BABEL_ENV=es babel src --root-mode upward --extensions '.js,.ts,.tsx' --out-dir dist/es --ignore '**/__tests__/**/*','**/__mocks__/**/*' --quiet",
+    "build:es:base": "BABEL_ENV=es babel src --root-mode upward --extensions '.js,.ts,.tsx' --out-dir dist/es --ignore '**/__tests__/**/*','**/__mocks__/**/*'",
+    "build:es": "yarn build:es:base --quiet",
     "build:types": "tsc -p ./tsconfig.declaration.json --outDir ./dist/es",
     "test:exports": "node ./__tests__/module/is-es-module.mjs && node ./__tests__/module/is-cjs-module.cjs",
     "test:start-server": "yarn workspace example-react-instantsearch-next-routing-example build && yarn workspace example-react-instantsearch-next-routing-example start",
     "test:e2e": "start-server-and-test test:start-server 3000 'wdio run ./wdio.conf.cjs'",
-    "test:e2e:saucelabs": "start-server-and-test test:start-server 3000 'wdio run ./wdio.saucelabs.conf.cjs'"
+    "test:e2e:saucelabs": "start-server-and-test test:start-server 3000 'wdio run ./wdio.saucelabs.conf.cjs'",
+    "watch:es": "yarn --silent build:es:base --watch"
   },
   "dependencies": {
-    "instantsearch.js": "4.65.0",
-    "react-instantsearch-core": "7.6.0"
+    "instantsearch.js": "4.66.0",
+    "react-instantsearch-core": "7.7.0"
   },
   "devDependencies": {
     "@types/jasmine": "3.3.16",
@@ -66,5 +68,5 @@
   "peerDependencies": {
     "next": ">= 9 && < 15"
   },
-  "gitHead": "084aff3d29e15cea8125076c46fb753c83d4dcad"
+  "gitHead": "358f849cba15cbbb415da05feb582b47358aa239"
 }