@tramvai/module-router 5.22.0 → 5.40.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/lib/modules/common.browser.js +5 -3
  2. package/lib/modules/common.es.js +5 -3
  3. package/lib/modules/common.js +3 -1
  4. package/package.json +17 -17
package/lib/modules/common.browser.js CHANGED
@@ -1,8 +1,8 @@
1
1
  import flatten from '@tinkoff/utils/array/flatten';
2
- import { provide, commandLineListTokens } from '@tramvai/core';
2
+ import { provide, optional, commandLineListTokens } from '@tramvai/core';
3
3
  import { setLogger } from '@tinkoff/router';
4
4
  import { LOGGER_TOKEN, COMBINE_REDUCERS } from '@tramvai/tokens-common';
5
- import { ROUTER_TOKEN, ROUTES_TOKEN, ROUTE_RESOLVE_TOKEN, ROUTER_GUARD_TOKEN, ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN } from '@tramvai/tokens-router';
5
+ import { ROUTER_TOKEN, ROUTES_TOKEN, ROUTE_RESOLVE_TOKEN, ROUTER_PLUGIN, ROUTER_GUARD_TOKEN, ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN } from '@tramvai/tokens-router';
6
6
  import { RENDER_SLOTS, ResourceType, ResourceSlot } from '@tramvai/tokens-render';
7
7
  import { routerClassToken, additionalRouterParameters, routeTransformToken, onChangeHooksToken, beforeResolveHooksToken, beforeNavigateHooksToken, afterNavigateHooksToken, beforeUpdateCurrentHooksToken, afterUpdateCurrentHooksToken } from './tokens.browser.js';
8
8
  import { RouterStore } from '../stores/RouterStore.browser.js';
@@ -18,13 +18,14 @@ const providers = [
18
18
  ...providers$1,
19
19
  provide({
20
20
  provide: ROUTER_TOKEN,
21
- useFactory: ({ RouterClass, routes, routeTransform, routeResolve, additionalParameters }) => {
21
+ useFactory: ({ RouterClass, routes, routeTransform, routeResolve, additionalParameters, plugins, }) => {
22
22
  const router = new RouterClass({
23
23
  ...additionalParameters,
24
24
  trailingSlash: true,
25
25
  mergeSlashes: true,
26
26
  enableViewTransitions: process.env.__TRAMVAI_VIEW_TRANSITIONS === 'true',
27
27
  routes: flatten(routes ?? []).map(routeTransform),
28
+ plugins,
28
29
  });
29
30
  if (routeResolve) {
30
31
  router.registerHook('beforeResolve', async (navigation) => {
@@ -56,6 +57,7 @@ const providers = [
56
57
  token: ROUTE_RESOLVE_TOKEN,
57
58
  optional: true,
58
59
  },
60
+ plugins: optional(ROUTER_PLUGIN),
59
61
  },
60
62
  }),
61
63
  provide({
package/lib/modules/common.es.js CHANGED
@@ -1,8 +1,8 @@
1
1
  import flatten from '@tinkoff/utils/array/flatten';
2
- import { provide, commandLineListTokens } from '@tramvai/core';
2
+ import { provide, optional, commandLineListTokens } from '@tramvai/core';
3
3
  import { setLogger } from '@tinkoff/router';
4
4
  import { LOGGER_TOKEN, COMBINE_REDUCERS } from '@tramvai/tokens-common';
5
- import { ROUTER_TOKEN, ROUTES_TOKEN, ROUTE_RESOLVE_TOKEN, ROUTER_GUARD_TOKEN, ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN } from '@tramvai/tokens-router';
5
+ import { ROUTER_TOKEN, ROUTES_TOKEN, ROUTE_RESOLVE_TOKEN, ROUTER_PLUGIN, ROUTER_GUARD_TOKEN, ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN } from '@tramvai/tokens-router';
6
6
  import { RENDER_SLOTS, ResourceType, ResourceSlot } from '@tramvai/tokens-render';
7
7
  import { routerClassToken, additionalRouterParameters, routeTransformToken, onChangeHooksToken, beforeResolveHooksToken, beforeNavigateHooksToken, afterNavigateHooksToken, beforeUpdateCurrentHooksToken, afterUpdateCurrentHooksToken } from './tokens.es.js';
8
8
  import { RouterStore } from '../stores/RouterStore.es.js';
@@ -18,13 +18,14 @@ const providers = [
18
18
  ...providers$1,
19
19
  provide({
20
20
  provide: ROUTER_TOKEN,
21
- useFactory: ({ RouterClass, routes, routeTransform, routeResolve, additionalParameters }) => {
21
+ useFactory: ({ RouterClass, routes, routeTransform, routeResolve, additionalParameters, plugins, }) => {
22
22
  const router = new RouterClass({
23
23
  ...additionalParameters,
24
24
  trailingSlash: true,
25
25
  mergeSlashes: true,
26
26
  enableViewTransitions: process.env.__TRAMVAI_VIEW_TRANSITIONS === 'true',
27
27
  routes: flatten(routes ?? []).map(routeTransform),
28
+ plugins,
28
29
  });
29
30
  if (routeResolve) {
30
31
  router.registerHook('beforeResolve', async (navigation) => {
@@ -56,6 +57,7 @@ const providers = [
56
57
  token: ROUTE_RESOLVE_TOKEN,
57
58
  optional: true,
58
59
  },
60
+ plugins: optional(ROUTER_PLUGIN),
59
61
  },
60
62
  }),
61
63
  provide({
package/lib/modules/common.js CHANGED
@@ -26,13 +26,14 @@ const providers = [
26
26
  ...fileSystemPages.providers,
27
27
  core.provide({
28
28
  provide: tokensRouter.ROUTER_TOKEN,
29
- useFactory: ({ RouterClass, routes, routeTransform, routeResolve, additionalParameters }) => {
29
+ useFactory: ({ RouterClass, routes, routeTransform, routeResolve, additionalParameters, plugins, }) => {
30
30
  const router = new RouterClass({
31
31
  ...additionalParameters,
32
32
  trailingSlash: true,
33
33
  mergeSlashes: true,
34
34
  enableViewTransitions: process.env.__TRAMVAI_VIEW_TRANSITIONS === 'true',
35
35
  routes: flatten__default["default"](routes ?? []).map(routeTransform),
36
+ plugins,
36
37
  });
37
38
  if (routeResolve) {
38
39
  router.registerHook('beforeResolve', async (navigation) => {
@@ -64,6 +65,7 @@ const providers = [
64
65
  token: tokensRouter.ROUTE_RESOLVE_TOKEN,
65
66
  optional: true,
66
67
  },
68
+ plugins: core.optional(tokensRouter.ROUTER_PLUGIN),
67
69
  },
68
70
  }),
69
71
  core.provide({
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tramvai/module-router",
3
- "version": "5.22.0",
3
+ "version": "5.40.0",
4
4
  "description": "",
5
5
  "main": "lib/index.js",
6
6
  "browser": {
@@ -26,27 +26,27 @@
26
26
  },
27
27
  "dependencies": {
28
28
  "@tinkoff/errors": "0.6.2",
29
- "@tinkoff/router": "0.5.65",
29
+ "@tinkoff/router": "0.5.96",
30
30
  "@tinkoff/url": "0.11.2",
31
- "@tramvai/react": "5.22.0",
31
+ "@tramvai/react": "5.40.0",
32
32
  "@tramvai/safe-strings": "0.8.4",
33
- "@tramvai/tokens-child-app": "5.22.0",
34
- "@tramvai/tokens-render": "5.22.0",
35
- "@tramvai/tokens-router": "5.22.0",
36
- "@tramvai/tokens-server": "5.22.0",
37
- "@tramvai/experiments": "5.22.0"
33
+ "@tramvai/tokens-child-app": "5.40.0",
34
+ "@tramvai/tokens-render": "5.40.0",
35
+ "@tramvai/tokens-router": "5.40.0",
36
+ "@tramvai/tokens-server": "5.40.0",
37
+ "@tramvai/experiments": "5.40.0"
38
38
  },
39
39
  "peerDependencies": {
40
40
  "@tinkoff/utils": "^2.1.2",
41
- "@tramvai/cli": "5.22.0",
42
- "@tramvai/core": "5.22.0",
43
- "@tramvai/module-log": "5.22.0",
44
- "@tramvai/module-server": "5.22.0",
45
- "@tramvai/papi": "5.22.0",
46
- "@tramvai/state": "5.22.0",
47
- "@tramvai/test-helpers": "5.22.0",
48
- "@tramvai/test-mocks": "5.22.0",
49
- "@tramvai/tokens-common": "5.22.0",
41
+ "@tramvai/cli": "5.40.0",
42
+ "@tramvai/core": "5.40.0",
43
+ "@tramvai/module-log": "5.40.0",
44
+ "@tramvai/module-server": "5.40.0",
45
+ "@tramvai/papi": "5.40.0",
46
+ "@tramvai/state": "5.40.0",
47
+ "@tramvai/test-helpers": "5.40.0",
48
+ "@tramvai/test-mocks": "5.40.0",
49
+ "@tramvai/tokens-common": "5.40.0",
50
50
  "@tinkoff/dippy": "0.11.3",
51
51
  "react": "*",
52
52
  "tslib": "^2.4.0"