@tramvai/module-router 1.76.0 → 1.77.0

package/lib/index.browser.js

@@ -1,6 +1,7 @@
 import { provide, commandLineListTokens, Module, DI_TOKEN, COMMAND_LINE_RUNNER_TOKEN } from '@tramvai/core';
 import { Provider, setLogger, NoSpaRouter, Router } from '@tinkoff/router';
 export { Link, Provider, useNavigate, useRoute, useRouter, useUrl } from '@tinkoff/router';
+import noop from '@tinkoff/utils/function/noop';
 import { LOGGER_TOKEN, BUNDLE_MANAGER_TOKEN, ACTION_REGISTRY_TOKEN, RESPONSE_MANAGER_TOKEN, CONTEXT_TOKEN, COMPONENT_REGISTRY_TOKEN, COMBINE_REDUCERS, STORE_TOKEN, ACTION_PAGE_RUNNER_TOKEN } from '@tramvai/tokens-common';
 import { ROUTER_GUARD_TOKEN, ROUTE_TRANSFORM_TOKEN, ROUTER_TOKEN, ROUTES_TOKEN, ROUTE_RESOLVE_TOKEN, ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN, PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
 export * from '@tramvai/tokens-router';
@@ -15,7 +16,6 @@ import React from 'react';
 import { isFileSystemPageComponent, fileSystemPagesEnabled, getStaticFileSystemPages, fileSystemPageToRoute } from '@tramvai/experiments';
 import uniq from '@tinkoff/utils/array/uniq';
 import { isRedirectFoundError, isNotFoundError } from '@tinkoff/errors';
-import noop from '@tinkoff/utils/function/noop';
 import { __decorate } from 'tslib';
 
 const setCurrentNavigation = createEvent('SET_CURRENT_ROUTE');
@@ -451,14 +451,9 @@ const providers = [
     provide({
         provide: commandLineListTokens.customerStart,
         multi: true,
-        useFactory: ({ router, store, renderMode }) => {
+        useFactory: ({ router, store }) => {
             return async function routerInit() {
                 const currentRoute = store.getState(RouterStore).currentRoute;
-                // in client-side rendering mode, run navigation before hydration,
-                // because currentRoute from initialState can be undefined or incorrect
-                if (renderMode === 'client') {
-                    await router.navigate(window.location.href);
-                }
                 return router.rehydrate({
                     to: currentRoute,
                 });
@@ -467,7 +462,6 @@ const providers = [
         deps: {
             router: ROUTER_TOKEN,
             store: STORE_TOKEN,
-            renderMode: TRAMVAI_RENDER_MODE,
         },
     }),
     provide({
@@ -495,9 +489,11 @@ const providers = [
         provide: commandLineListTokens.clear,
         multi: true,
         useFactory: (deps) => {
-            // in client-side rendering mode, action already was executed
-            if (deps.renderMode === 'client') {
-                return;
+            const currentRoute = deps.store.getState(RouterStore).currentRoute;
+            // in client-side rendering mode, action will be executed on first navigation
+            if (deps.renderMode === 'client' &&
+                (!currentRoute || (currentRoute && currentRoute.actualPath !== window.location.pathname))) {
+                return noop;
             }
             return runActionsFactory(deps);
         },
@@ -509,6 +505,28 @@ const providers = [
             renderMode: TRAMVAI_RENDER_MODE,
         },
     }),
+    provide({
+        provide: commandLineListTokens.clear,
+        multi: true,
+        useFactory: (deps) => {
+            return async function csrFirstNavigation() {
+                const currentRoute = deps.store.getState(RouterStore).currentRoute;
+                // in client-side rendering mode, if current route inconsistent with current location,
+                // run navigation to current location.
+                if (deps.renderMode === 'client' &&
+                    (!currentRoute || (currentRoute && currentRoute.actualPath !== window.location.pathname))) {
+                    return deps.router.navigate(window.location.href);
+                }
+            };
+        },
+        deps: {
+            store: STORE_TOKEN,
+            router: ROUTER_TOKEN,
+            actionRegistry: ACTION_REGISTRY_TOKEN,
+            actionPageRunner: ACTION_PAGE_RUNNER_TOKEN,
+            renderMode: TRAMVAI_RENDER_MODE,
+        },
+    }),
 ];
 
 const generateForRoot = (mainModule) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-router",
-  "version": "1.76.0",
+  "version": "1.77.0",
   "description": "",
   "main": "lib/index.js",
   "browser": {
@@ -25,22 +25,22 @@
     "@tinkoff/errors": "0.2.18",
     "@tinkoff/router": "0.1.70",
     "@tinkoff/url": "0.7.37",
-    "@tramvai/tokens-render": "1.76.0",
-    "@tramvai/tokens-router": "1.76.0",
-    "@tramvai/tokens-server": "1.76.0",
-    "@tramvai/experiments": "1.76.0"
+    "@tramvai/tokens-render": "1.77.0",
+    "@tramvai/tokens-router": "1.77.0",
+    "@tramvai/tokens-server": "1.77.0",
+    "@tramvai/experiments": "1.77.0"
   },
   "peerDependencies": {
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "1.76.0",
-    "@tramvai/core": "1.76.0",
-    "@tramvai/module-log": "1.76.0",
-    "@tramvai/module-server": "1.76.0",
-    "@tramvai/papi": "1.76.0",
-    "@tramvai/state": "1.76.0",
-    "@tramvai/test-helpers": "1.76.0",
-    "@tramvai/test-mocks": "1.76.0",
-    "@tramvai/tokens-common": "1.76.0",
+    "@tramvai/cli": "1.77.0",
+    "@tramvai/core": "1.77.0",
+    "@tramvai/module-log": "1.77.0",
+    "@tramvai/module-server": "1.77.0",
+    "@tramvai/papi": "1.77.0",
+    "@tramvai/state": "1.77.0",
+    "@tramvai/test-helpers": "1.77.0",
+    "@tramvai/test-mocks": "1.77.0",
+    "@tramvai/tokens-common": "1.77.0",
     "@tinkoff/dippy": "0.7.38",
     "react": "*",
     "tslib": "^2.0.3"