@tinkoff/router 0.1.74 → 0.1.77

package/lib/index.browser.js

@@ -366,7 +366,9 @@ class AbstractRouter {
                 pathname = makePath(currentRoute.path, { ...currentRoute.params, ...params });
             }
         }
-        pathname = this.normalizePathname(pathname);
+        if (isSameHost(resultUrl)) {
+            pathname = this.normalizePathname(pathname);
+        }
         return convertRawUrl(rawAssignUrl(resultUrl, {
             pathname,
             search: url ? resultUrl.search : '',
@@ -770,8 +772,11 @@ class ClientRouter extends AbstractRouter {
         // in case we didn't find any matched route just force hard page navigation
         const prevUrl = (_b = (_a = navigation.fromUrl) === null || _a === void 0 ? void 0 : _a.href) !== null && _b !== void 0 ? _b : window.location.href;
         const nextUrl = navigation.url.href;
-        // prevent redirect cycle on the same page
-        if (prevUrl !== nextUrl) {
+        const isNoSpaNavigation = navigation.from && !navigation.to;
+        // prevent redirect cycle on the same page,
+        // except cases when we run no-spa navigations,
+        // because we need hard reload in this cases
+        if (isNoSpaNavigation ? true : prevUrl !== nextUrl) {
             if (navigation.replace) {
                 window.location.replace(nextUrl);
             }

package/lib/index.es.js

@@ -366,7 +366,9 @@ class AbstractRouter {
                 pathname = makePath(currentRoute.path, { ...currentRoute.params, ...params });
             }
         }
-        pathname = this.normalizePathname(pathname);
+        if (isSameHost(resultUrl)) {
+            pathname = this.normalizePathname(pathname);
+        }
         return convertRawUrl(rawAssignUrl(resultUrl, {
             pathname,
             search: url ? resultUrl.search : '',
@@ -1000,8 +1002,11 @@ class ClientRouter extends AbstractRouter {
         // in case we didn't find any matched route just force hard page navigation
         const prevUrl = (_b = (_a = navigation.fromUrl) === null || _a === void 0 ? void 0 : _a.href) !== null && _b !== void 0 ? _b : window.location.href;
         const nextUrl = navigation.url.href;
-        // prevent redirect cycle on the same page
-        if (prevUrl !== nextUrl) {
+        const isNoSpaNavigation = navigation.from && !navigation.to;
+        // prevent redirect cycle on the same page,
+        // except cases when we run no-spa navigations,
+        // because we need hard reload in this cases
+        if (isNoSpaNavigation ? true : prevUrl !== nextUrl) {
             if (navigation.replace) {
                 window.location.replace(nextUrl);
             }

package/lib/index.js

@@ -381,7 +381,9 @@ class AbstractRouter {
                 pathname = makePath(currentRoute.path, { ...currentRoute.params, ...params });
             }
         }
-        pathname = this.normalizePathname(pathname);
+        if (isSameHost(resultUrl)) {
+            pathname = this.normalizePathname(pathname);
+        }
         return url.convertRawUrl(url.rawAssignUrl(resultUrl, {
             pathname,
             search: url$1 ? resultUrl.search : '',
@@ -1015,8 +1017,11 @@ class ClientRouter extends AbstractRouter {
         // in case we didn't find any matched route just force hard page navigation
         const prevUrl = (_b = (_a = navigation.fromUrl) === null || _a === void 0 ? void 0 : _a.href) !== null && _b !== void 0 ? _b : window.location.href;
         const nextUrl = navigation.url.href;
-        // prevent redirect cycle on the same page
-        if (prevUrl !== nextUrl) {
+        const isNoSpaNavigation = navigation.from && !navigation.to;
+        // prevent redirect cycle on the same page,
+        // except cases when we run no-spa navigations,
+        // because we need hard reload in this cases
+        if (isNoSpaNavigation ? true : prevUrl !== nextUrl) {
             if (navigation.replace) {
                 window.location.replace(nextUrl);
             }

package/lib/utils.d.ts

@@ -3,6 +3,6 @@ import type { NavigateOptions, NavigationHook, NavigationSyncHook, NavigationGua
 export declare const isFilePath: (pathname: string) => boolean;
 export declare const normalizeTrailingSlash: (pathname: string, trailingSlash?: boolean) => string;
 export declare const normalizeManySlashes: (hrefOrPath: string) => string;
-export declare const isSameHost: import("@tinkoff/utils/typings/types").Func<true> | ((url: Url) => boolean);
+export declare const isSameHost: import("@tinkoff/utils/typings/types").Func<true> | ((url: Url | URL) => boolean);
 export declare const makeNavigateOptions: (options: string | NavigateOptions) => NavigateOptions;
 export declare const registerHook: <T extends NavigationHook | NavigationSyncHook | NavigationGuard>(hooksSet: Set<T>, hook: T) => () => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinkoff/router",
-  "version": "0.1.74",
+  "version": "0.1.77",
   "description": "router",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -22,12 +22,12 @@
     "build-for-publish": "true"
   },
   "dependencies": {
-    "@tinkoff/react-hooks": "0.0.25",
+    "@tinkoff/react-hooks": "0.0.26",
     "@tinkoff/url": "0.7.38",
     "@tinkoff/utils": "^2.1.2"
   },
   "peerDependencies": {
-    "react": ">=16.8.0",
+    "react": ">=16.14.0",
     "tslib": "^2.0.3"
   },
   "sideEffects": false,