@tramvai/module-router 1.74.0 → 1.76.0

package/lib/index.browser.js

@@ -4,10 +4,10 @@ export { Link, Provider, useNavigate, useRoute, useRouter, useUrl } from '@tinko
 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';
+import { EXTEND_RENDER, TRAMVAI_RENDER_MODE } from '@tramvai/tokens-render';
 import { createEvent, createReducer } from '@tramvai/state';
 import flatten from '@tinkoff/utils/array/flatten';
 import { createToken } from '@tinkoff/dippy';
-import { EXTEND_RENDER } from '@tramvai/tokens-render';
 import identity from '@tinkoff/utils/function/identity';
 import compose from '@tinkoff/utils/function/compose';
 import replace from '@tinkoff/utils/string/replace';
@@ -451,17 +451,23 @@ const providers = [
     provide({
         provide: commandLineListTokens.customerStart,
         multi: true,
-        useFactory: ({ router, store }) => {
-            return function routerInit() {
+        useFactory: ({ router, store, renderMode }) => {
+            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({
-                    // @todo разобраться, почему не подходит тип Route
-                    to: store.getState(RouterStore).currentRoute,
+                    to: currentRoute,
                 });
             };
         },
         deps: {
             router: ROUTER_TOKEN,
             store: STORE_TOKEN,
+            renderMode: TRAMVAI_RENDER_MODE,
         },
     }),
     provide({
@@ -488,12 +494,19 @@ const providers = [
         // рендера реакта, т.к. экшены могут повлиять на рендер
         provide: commandLineListTokens.clear,
         multi: true,
-        useFactory: runActionsFactory,
+        useFactory: (deps) => {
+            // in client-side rendering mode, action already was executed
+            if (deps.renderMode === 'client') {
+                return;
+            }
+            return runActionsFactory(deps);
+        },
         deps: {
             store: STORE_TOKEN,
             router: ROUTER_TOKEN,
             actionRegistry: ACTION_REGISTRY_TOKEN,
             actionPageRunner: ACTION_PAGE_RUNNER_TOKEN,
+            renderMode: TRAMVAI_RENDER_MODE,
         },
     }),
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-router",
-  "version": "1.74.0",
+  "version": "1.76.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.74.0",
-    "@tramvai/tokens-router": "1.74.0",
-    "@tramvai/tokens-server": "1.74.0",
-    "@tramvai/experiments": "1.74.0"
+    "@tramvai/tokens-render": "1.76.0",
+    "@tramvai/tokens-router": "1.76.0",
+    "@tramvai/tokens-server": "1.76.0",
+    "@tramvai/experiments": "1.76.0"
   },
   "peerDependencies": {
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "1.74.0",
-    "@tramvai/core": "1.74.0",
-    "@tramvai/module-log": "1.74.0",
-    "@tramvai/module-server": "1.74.0",
-    "@tramvai/papi": "1.74.0",
-    "@tramvai/state": "1.74.0",
-    "@tramvai/test-helpers": "1.74.0",
-    "@tramvai/test-mocks": "1.74.0",
-    "@tramvai/tokens-common": "1.74.0",
+    "@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",
     "@tinkoff/dippy": "0.7.38",
     "react": "*",
     "tslib": "^2.0.3"