@tramvai/module-router 1.82.3 → 1.85.0

package/lib/index.browser.js

@@ -509,22 +509,20 @@ const providers = [
     provide({
         provide: commandLineListTokens.clear,
         multi: true,
-        useFactory: (deps) => {
+        useFactory: ({ store, router, renderMode }) => {
             return async function csrFirstNavigation() {
-                const currentRoute = deps.store.getState(RouterStore).currentRoute;
+                const currentRoute = 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' &&
+                if (renderMode === 'client' &&
                     (!currentRoute || (currentRoute && currentRoute.actualPath !== window.location.pathname))) {
-                    return deps.router.navigate(window.location.href);
+                    return 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,
         },
     }),
@@ -563,17 +561,31 @@ const NoSpaRouterModule = /* @__PURE__ */ Module({
     _a$1.forRoot = generateForRoot(_a$1),
     _a$1));
 
-const runCommands = ({ commandLineRunner, di, }) => {
+const runCommandsSpa = ({ commandLineRunner, di, }) => {
     return async () => {
         await commandLineRunner.run('client', 'spa', [], di);
     };
 };
+const runCommandsAfterSpa = ({ commandLineRunner, di, }) => {
+    return async () => {
+        await commandLineRunner.run('client', 'afterSpa', [], di);
+    };
+};
 
 const spaHooks = [
     {
         provide: beforeNavigateHooksToken,
         multi: true,
-        useFactory: runCommands,
+        useFactory: runCommandsSpa,
+        deps: {
+            di: DI_TOKEN,
+            commandLineRunner: COMMAND_LINE_RUNNER_TOKEN,
+        },
+    },
+    {
+        provide: afterNavigateHooksToken,
+        multi: true,
+        useFactory: runCommandsAfterSpa,
         deps: {
             di: DI_TOKEN,
             commandLineRunner: COMMAND_LINE_RUNNER_TOKEN,
@@ -600,13 +612,11 @@ const spaHooks = [
         },
     },
     {
-        provide: commandLineListTokens.customerStart,
+        provide: commandLineListTokens.afterSpaTransition,
         multi: true,
         useFactory: ({ spaMode, ...deps }) => {
             if (spaMode === 'after') {
-                return function installRouterRunActions() {
-                    deps.router.registerHook('afterNavigate', runActionsFactory(deps));
-                };
+                return runActionsFactory(deps);
             }
             return noop;
         },

package/lib/modules/hooks/spa/runCommands.d.ts

@@ -1,6 +1,10 @@
 import type { DI_TOKEN, COMMAND_LINE_RUNNER_TOKEN } from '@tramvai/core';
 import type { NavigationHook } from '@tinkoff/router';
-export declare const runCommands: ({ commandLineRunner, di, }: {
+export declare const runCommandsSpa: ({ commandLineRunner, di, }: {
+    di: typeof DI_TOKEN;
+    commandLineRunner: typeof COMMAND_LINE_RUNNER_TOKEN;
+}) => NavigationHook;
+export declare const runCommandsAfterSpa: ({ commandLineRunner, di, }: {
     di: typeof DI_TOKEN;
     commandLineRunner: typeof COMMAND_LINE_RUNNER_TOKEN;
 }) => NavigationHook;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-router",
-  "version": "1.82.3",
+  "version": "1.85.0",
   "description": "",
   "main": "lib/index.js",
   "browser": {
@@ -25,23 +25,23 @@
     "@tinkoff/errors": "0.2.20",
     "@tinkoff/router": "0.1.71",
     "@tinkoff/url": "0.7.37",
-    "@tramvai/tokens-child-app": "1.82.3",
-    "@tramvai/tokens-render": "1.82.3",
-    "@tramvai/tokens-router": "1.82.3",
-    "@tramvai/tokens-server": "1.82.3",
-    "@tramvai/experiments": "1.82.3"
+    "@tramvai/tokens-child-app": "1.85.0",
+    "@tramvai/tokens-render": "1.85.0",
+    "@tramvai/tokens-router": "1.85.0",
+    "@tramvai/tokens-server": "1.85.0",
+    "@tramvai/experiments": "1.85.0"
   },
   "peerDependencies": {
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "1.82.3",
-    "@tramvai/core": "1.82.3",
-    "@tramvai/module-log": "1.82.3",
-    "@tramvai/module-server": "1.82.3",
-    "@tramvai/papi": "1.82.3",
-    "@tramvai/state": "1.82.3",
-    "@tramvai/test-helpers": "1.82.3",
-    "@tramvai/test-mocks": "1.82.3",
-    "@tramvai/tokens-common": "1.82.3",
+    "@tramvai/cli": "1.85.0",
+    "@tramvai/core": "1.85.0",
+    "@tramvai/module-log": "1.85.0",
+    "@tramvai/module-server": "1.85.0",
+    "@tramvai/papi": "1.85.0",
+    "@tramvai/state": "1.85.0",
+    "@tramvai/test-helpers": "1.85.0",
+    "@tramvai/test-mocks": "1.85.0",
+    "@tramvai/tokens-common": "1.85.0",
     "@tinkoff/dippy": "0.7.39",
     "react": "*",
     "tslib": "^2.0.3"