@tramvai/module-router 2.70.0 → 2.70.1

package/lib/index.browser.js

@@ -2,7 +2,7 @@ import { provide, commandLineListTokens, createToken as createToken$1, Module, D
 import { Provider, setLogger, NoSpaRouter, Router, useNavigate, useRoute } from '@tinkoff/router';
 export { 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, DISPATCHER_TOKEN, DISPATCHER_CONTEXT_TOKEN, CONTEXT_TOKEN, COMPONENT_REGISTRY_TOKEN, COMBINE_REDUCERS, STORE_TOKEN, ENV_MANAGER_TOKEN, ACTION_PAGE_RUNNER_TOKEN } from '@tramvai/tokens-common';
+import { LOGGER_TOKEN, BUNDLE_MANAGER_TOKEN, ACTION_REGISTRY_TOKEN, RESPONSE_MANAGER_TOKEN, DISPATCHER_TOKEN, DISPATCHER_CONTEXT_TOKEN, CONTEXT_TOKEN, COMPONENT_REGISTRY_TOKEN, COMBINE_REDUCERS, STORE_TOKEN, ACTION_PAGE_RUNNER_TOKEN } from '@tramvai/tokens-common';
 import { ROUTER_GUARD_TOKEN, PAGE_SERVICE_TOKEN, ROUTE_TRANSFORM_TOKEN, ROUTER_TOKEN, ROUTES_TOKEN, ROUTE_RESOLVE_TOKEN, ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN, LINK_PREFETCH_MANAGER_TOKEN } from '@tramvai/tokens-router';
 export * from '@tramvai/tokens-router';
 import { EXTEND_RENDER, TRAMVAI_RENDER_MODE } from '@tramvai/tokens-render';
@@ -599,13 +599,8 @@ const providers = [
     provide({
         provide: commandLineListTokens.customerStart,
         multi: true,
-        useFactory: ({ router, store, envManager }) => {
+        useFactory: ({ router, store }) => {
             return async function routerInit() {
-                // run full navigation flow for CSR fallback on application start
-                if (envManager.get('TRAMVAI_FORCE_CLIENT_SIDE_RENDERING') === 'true') {
-                    router.start();
-                    return router.navigate({ url: window.location.href, replace: true });
-                }
                 const currentRoute = store.getState(RouterStore).currentRoute;
                 return router.rehydrate({
                     to: currentRoute,
@@ -615,7 +610,6 @@ const providers = [
         deps: {
             router: ROUTER_TOKEN,
             store: STORE_TOKEN,
-            envManager: ENV_MANAGER_TOKEN,
         },
     }),
     provide({
@@ -623,12 +617,8 @@ const providers = [
         // после этого уже можно будет делать переходы и т.д.
         provide: commandLineListTokens.clear,
         multi: true,
-        useFactory: ({ router, store, envManager }) => {
+        useFactory: ({ router, store }) => {
             return function routerStart() {
-                // router already started for CSR fallback on this stage
-                if (envManager.get('TRAMVAI_FORCE_CLIENT_SIDE_RENDERING') === 'true') {
-                    return;
-                }
                 const routerState = store.getState().router;
                 if (routerState.currentUrl.href !== window.location.href) {
                     store.dispatch(setUrlOnRehydrate(router.getCurrentUrl()));
@@ -639,7 +629,6 @@ const providers = [
         deps: {
             router: ROUTER_TOKEN,
             store: STORE_TOKEN,
-            envManager: ENV_MANAGER_TOKEN,
         },
     }),
     provide({
@@ -648,8 +637,10 @@ const providers = [
         provide: commandLineListTokens.clear,
         multi: true,
         useFactory: (deps) => {
-            // actions already executed for CSR fallback before this stage
-            if (deps.envManager.get('TRAMVAI_FORCE_CLIENT_SIDE_RENDERING') === 'true') {
+            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);
@@ -660,7 +651,28 @@ const providers = [
             actionRegistry: ACTION_REGISTRY_TOKEN,
             actionPageRunner: ACTION_PAGE_RUNNER_TOKEN,
             renderMode: TRAMVAI_RENDER_MODE,
-            envManager: ENV_MANAGER_TOKEN,
+        },
+    }),
+    provide({
+        provide: commandLineListTokens.clear,
+        multi: true,
+        useFactory: ({ store, router, renderMode }) => {
+            return async function csrFirstNavigation() {
+                const currentRoute = store.getState(RouterStore).currentRoute;
+                // in client-side rendering mode, if current route inconsistent with current location,
+                // run navigation to current location.
+                if (renderMode === 'client' &&
+                    (!currentRoute || (currentRoute && currentRoute.actualPath !== window.location.pathname))) {
+                    // replace because otherwice we will push in the history the same url twice,
+                    // and history.back will return to the same url
+                    return router.navigate({ url: window.location.href, replace: true });
+                }
+            };
+        },
+        deps: {
+            store: STORE_TOKEN,
+            router: ROUTER_TOKEN,
+            renderMode: TRAMVAI_RENDER_MODE,
         },
     }),
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-router",
-  "version": "2.70.0",
+  "version": "2.70.1",
   "description": "",
   "main": "lib/index.js",
   "browser": {
@@ -29,24 +29,24 @@
     "@tinkoff/errors": "0.3.5",
     "@tinkoff/router": "0.2.7",
     "@tinkoff/url": "0.8.4",
-    "@tramvai/react": "2.70.0",
-    "@tramvai/tokens-child-app": "2.70.0",
-    "@tramvai/tokens-render": "2.70.0",
-    "@tramvai/tokens-router": "2.70.0",
-    "@tramvai/tokens-server": "2.70.0",
-    "@tramvai/experiments": "2.70.0"
+    "@tramvai/react": "2.70.1",
+    "@tramvai/tokens-child-app": "2.70.1",
+    "@tramvai/tokens-render": "2.70.1",
+    "@tramvai/tokens-router": "2.70.1",
+    "@tramvai/tokens-server": "2.70.1",
+    "@tramvai/experiments": "2.70.1"
   },
   "peerDependencies": {
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "2.70.0",
-    "@tramvai/core": "2.70.0",
-    "@tramvai/module-log": "2.70.0",
-    "@tramvai/module-server": "2.70.0",
-    "@tramvai/papi": "2.70.0",
-    "@tramvai/state": "2.70.0",
-    "@tramvai/test-helpers": "2.70.0",
-    "@tramvai/test-mocks": "2.70.0",
-    "@tramvai/tokens-common": "2.70.0",
+    "@tramvai/cli": "2.70.1",
+    "@tramvai/core": "2.70.1",
+    "@tramvai/module-log": "2.70.1",
+    "@tramvai/module-server": "2.70.1",
+    "@tramvai/papi": "2.70.1",
+    "@tramvai/state": "2.70.1",
+    "@tramvai/test-helpers": "2.70.1",
+    "@tramvai/test-mocks": "2.70.1",
+    "@tramvai/tokens-common": "2.70.1",
     "@tinkoff/dippy": "0.8.12",
     "react": "*",
     "tslib": "^2.4.0"