@tramvai/module-router 1.55.3 → 1.57.1

package/lib/index.browser.js

@@ -421,7 +421,7 @@ const stopRunAtError = (error) => {
         return true;
     }
 };
-const runActionsFactory = ({ router, actionRegistry, actionPageRunner, }) => {
+const runActionsFactory = ({ store, router, actionRegistry, actionPageRunner, }) => {
     return function runActions() {
         const route = router.getCurrentRoute();
         const { config: { bundle, pageComponent } = {} } = route;
@@ -490,6 +490,7 @@ const providers = [
         multi: true,
         useFactory: runActionsFactory,
         deps: {
+            store: STORE_TOKEN,
             router: ROUTER_TOKEN,
             actionRegistry: ACTION_REGISTRY_TOKEN,
             actionPageRunner: ACTION_PAGE_RUNNER_TOKEN,
@@ -556,6 +557,7 @@ const spaHooks = [
             return noop;
         },
         deps: {
+            store: STORE_TOKEN,
             router: ROUTER_TOKEN,
             actionRegistry: ACTION_REGISTRY_TOKEN,
             actionPageRunner: ACTION_PAGE_RUNNER_TOKEN,
@@ -577,6 +579,7 @@ const spaHooks = [
             return noop;
         },
         deps: {
+            store: STORE_TOKEN,
             router: ROUTER_TOKEN,
             actionRegistry: ACTION_REGISTRY_TOKEN,
             actionPageRunner: ACTION_PAGE_RUNNER_TOKEN,

package/lib/index.es.js

@@ -1,8 +1,8 @@
 import { __decorate } from 'tslib';
 import { provide, commandLineListTokens, Module } from '@tramvai/core';
-import { Provider, setLogger, Router } from '@tinkoff/router';
+import { Provider, setLogger, isWildcard, isHistoryFallback, Router } from '@tinkoff/router';
 export { Link, Provider, useNavigate, useRoute, useRouter, useUrl } from '@tinkoff/router';
-import { LOGGER_TOKEN, BUNDLE_MANAGER_TOKEN, ACTION_REGISTRY_TOKEN, RESPONSE_MANAGER_TOKEN, CONTEXT_TOKEN, COMPONENT_REGISTRY_TOKEN, COMBINE_REDUCERS, REQUEST_MANAGER_TOKEN, ACTION_PAGE_RUNNER_TOKEN } from '@tramvai/tokens-common';
+import { LOGGER_TOKEN, BUNDLE_MANAGER_TOKEN, ACTION_REGISTRY_TOKEN, RESPONSE_MANAGER_TOKEN, CONTEXT_TOKEN, COMPONENT_REGISTRY_TOKEN, COMBINE_REDUCERS, REQUEST_MANAGER_TOKEN, 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 flatten from '@tinkoff/utils/array/flatten';
@@ -455,7 +455,7 @@ const stopRunAtError = (error) => {
         return true;
     }
 };
-const runActionsFactory = ({ router, actionRegistry, actionPageRunner, }) => {
+const runActionsFactory = ({ store, router, actionRegistry, actionPageRunner, }) => {
     return function runActions() {
         const route = router.getCurrentRoute();
         const { config: { bundle, pageComponent } = {} } = route;
@@ -536,6 +536,7 @@ const bundleInfo = ({ routes, routeTransform, }) => {
                 .concat((_b = (await loadAdditional())) !== null && _b !== void 0 ? _b : [])
                 .map(routeTransform)
                 .map(prop('path'))
+                .filter((path) => !isWildcard(path) && !isHistoryFallback(path))
                 .sort());
         },
         deps: {
@@ -620,6 +621,7 @@ NoSpaRouterModule = NoSpaRouterModule_1 = __decorate([
                 multi: true,
                 useFactory: runActionsFactory,
                 deps: {
+                    store: STORE_TOKEN,
                     router: ROUTER_TOKEN,
                     actionRegistry: ACTION_REGISTRY_TOKEN,
                     actionPageRunner: ACTION_PAGE_RUNNER_TOKEN,

package/lib/index.js

@@ -467,7 +467,7 @@ const stopRunAtError = (error) => {
         return true;
     }
 };
-const runActionsFactory = ({ router, actionRegistry, actionPageRunner, }) => {
+const runActionsFactory = ({ store, router, actionRegistry, actionPageRunner, }) => {
     return function runActions() {
         const route = router.getCurrentRoute();
         const { config: { bundle, pageComponent } = {} } = route;
@@ -548,6 +548,7 @@ const bundleInfo = ({ routes, routeTransform, }) => {
                 .concat((_b = (await loadAdditional())) !== null && _b !== void 0 ? _b : [])
                 .map(routeTransform)
                 .map(prop__default["default"]('path'))
+                .filter((path) => !router.isWildcard(path) && !router.isHistoryFallback(path))
                 .sort());
         },
         deps: {
@@ -632,6 +633,7 @@ exports.NoSpaRouterModule = NoSpaRouterModule_1 = tslib.__decorate([
                 multi: true,
                 useFactory: runActionsFactory,
                 deps: {
+                    store: tokensCommon.STORE_TOKEN,
                     router: tokensRouter.ROUTER_TOKEN,
                     actionRegistry: tokensCommon.ACTION_REGISTRY_TOKEN,
                     actionPageRunner: tokensCommon.ACTION_PAGE_RUNNER_TOKEN,

package/lib/modules/hooks/runActions.d.ts

@@ -1,6 +1,7 @@
-import type { ACTION_REGISTRY_TOKEN, ACTION_PAGE_RUNNER_TOKEN } from '@tramvai/tokens-common';
+import type { ACTION_REGISTRY_TOKEN, ACTION_PAGE_RUNNER_TOKEN, STORE_TOKEN } from '@tramvai/tokens-common';
 import type { ROUTER_TOKEN } from '@tramvai/tokens-router';
-export declare const runActionsFactory: ({ router, actionRegistry, actionPageRunner, }: {
+export declare const runActionsFactory: ({ store, router, actionRegistry, actionPageRunner, }: {
+    store: typeof STORE_TOKEN;
     router: typeof ROUTER_TOKEN;
     actionRegistry: typeof ACTION_REGISTRY_TOKEN;
     actionPageRunner: typeof ACTION_PAGE_RUNNER_TOKEN;

package/lib/services/page.d.ts

@@ -21,7 +21,7 @@ export declare class PageService implements PageServiceInterface {
     go(to: number, options?: HistoryOptions): Promise<void>;
     addComponent(name: string, component: any): void;
     getComponent(name: string): any;
-    resolveComponentFromConfig(property: 'page' | 'layout' | 'header' | 'footer'): any;
+    resolveComponentFromConfig(property: 'page' | 'layout' | 'header' | 'footer' | 'errorBoundary'): any;
     private getComponentsGroupName;
 }
 export {};

package/package.json

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