@tramvai/module-router 7.3.0 → 7.4.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.
- package/lib/index.browser.js +1 -0
- package/lib/index.d.ts +1 -0
- package/lib/index.es.js +1 -0
- package/lib/index.js +2 -0
- package/lib/modules/hooks/runActions.browser.js +2 -6
- package/lib/modules/hooks/runActions.es.js +2 -6
- package/lib/modules/hooks/runActions.js +2 -6
- package/lib/modules/utils/stopRunAtError.browser.js +10 -0
- package/lib/modules/utils/stopRunAtError.d.ts +2 -0
- package/lib/modules/utils/stopRunAtError.es.js +10 -0
- package/lib/modules/utils/stopRunAtError.js +14 -0
- package/package.json +18 -18
package/lib/index.browser.js
CHANGED
|
@@ -8,5 +8,6 @@ export { generateForRoot, routerForRoot } from './modules/utils/forRoot.browser.
|
|
|
8
8
|
export { RouterStore, setCurrentNavigation, setUrlOnRehydrate } from './stores/RouterStore.browser.js';
|
|
9
9
|
export { PageErrorStore, setPageErrorEvent } from './stores/PageErrorStore.browser.js';
|
|
10
10
|
export { usePageService } from './hooks/usePageService.browser.js';
|
|
11
|
+
export { stopRunAtError } from './modules/utils/stopRunAtError.browser.js';
|
|
11
12
|
export { PRERENDER_HOOKS_TOKEN, ROUTER_VIEW_TRANSITIONS_ENABLED, afterNavigateHooksToken, afterUpdateCurrentHooksToken, beforeNavigateHooksToken, beforeResolveHooksToken, beforeUpdateCurrentHooksToken, onChangeHooksToken, routeTransformToken, routerBundleInfoAdditionalToken } from './modules/tokens.browser.js';
|
|
12
13
|
export { deserializeError, serializeError } from '@tramvai/safe-strings';
|
package/lib/index.d.ts
CHANGED
|
@@ -7,6 +7,7 @@ export { routerForRoot, generateForRoot } from './modules/utils/forRoot';
|
|
|
7
7
|
export * from './stores/RouterStore';
|
|
8
8
|
export * from './stores/PageErrorStore';
|
|
9
9
|
export * from './hooks/usePageService';
|
|
10
|
+
export { stopRunAtError } from './modules/utils/stopRunAtError';
|
|
10
11
|
export { onChangeHooksToken, beforeNavigateHooksToken, afterNavigateHooksToken, beforeResolveHooksToken, beforeUpdateCurrentHooksToken, afterUpdateCurrentHooksToken, routerBundleInfoAdditionalToken, routeTransformToken, ROUTER_VIEW_TRANSITIONS_ENABLED, PRERENDER_HOOKS_TOKEN, } from './modules/tokens';
|
|
11
12
|
declare module '@tinkoff/router' {
|
|
12
13
|
interface RouteConfig {
|
package/lib/index.es.js
CHANGED
|
@@ -7,5 +7,6 @@ export { generateForRoot, routerForRoot } from './modules/utils/forRoot.es.js';
|
|
|
7
7
|
export { RouterStore, setCurrentNavigation, setUrlOnRehydrate } from './stores/RouterStore.es.js';
|
|
8
8
|
export { PageErrorStore, setPageErrorEvent } from './stores/PageErrorStore.es.js';
|
|
9
9
|
export { usePageService } from './hooks/usePageService.es.js';
|
|
10
|
+
export { stopRunAtError } from './modules/utils/stopRunAtError.es.js';
|
|
10
11
|
export { PRERENDER_HOOKS_TOKEN, ROUTER_VIEW_TRANSITIONS_ENABLED, afterNavigateHooksToken, afterUpdateCurrentHooksToken, beforeNavigateHooksToken, beforeResolveHooksToken, beforeUpdateCurrentHooksToken, onChangeHooksToken, routeTransformToken, routerBundleInfoAdditionalToken } from './modules/tokens.es.js';
|
|
11
12
|
export { deserializeError, serializeError } from '@tramvai/safe-strings';
|
package/lib/index.js
CHANGED
|
@@ -11,6 +11,7 @@ var forRoot = require('./modules/utils/forRoot.js');
|
|
|
11
11
|
var RouterStore = require('./stores/RouterStore.js');
|
|
12
12
|
var PageErrorStore = require('./stores/PageErrorStore.js');
|
|
13
13
|
var usePageService = require('./hooks/usePageService.js');
|
|
14
|
+
var stopRunAtError = require('./modules/utils/stopRunAtError.js');
|
|
14
15
|
var tokens = require('./modules/tokens.js');
|
|
15
16
|
var safeStrings = require('@tramvai/safe-strings');
|
|
16
17
|
|
|
@@ -55,6 +56,7 @@ exports.setUrlOnRehydrate = RouterStore.setUrlOnRehydrate;
|
|
|
55
56
|
exports.PageErrorStore = PageErrorStore.PageErrorStore;
|
|
56
57
|
exports.setPageErrorEvent = PageErrorStore.setPageErrorEvent;
|
|
57
58
|
exports.usePageService = usePageService.usePageService;
|
|
59
|
+
exports.stopRunAtError = stopRunAtError.stopRunAtError;
|
|
58
60
|
exports.PRERENDER_HOOKS_TOKEN = tokens.PRERENDER_HOOKS_TOKEN;
|
|
59
61
|
exports.ROUTER_VIEW_TRANSITIONS_ENABLED = tokens.ROUTER_VIEW_TRANSITIONS_ENABLED;
|
|
60
62
|
exports.afterNavigateHooksToken = tokens.afterNavigateHooksToken;
|
|
@@ -1,12 +1,8 @@
|
|
|
1
1
|
import uniq from '@tinkoff/utils/array/uniq';
|
|
2
|
-
import { isRedirectFoundError
|
|
2
|
+
import { isRedirectFoundError } from '@tinkoff/errors';
|
|
3
3
|
import { ACTION_PARAMETERS } from '@tramvai/core';
|
|
4
|
+
import { stopRunAtError } from '../utils/stopRunAtError.browser.js';
|
|
4
5
|
|
|
5
|
-
const stopRunAtError = (error) => {
|
|
6
|
-
if (isNotFoundError(error) || isRedirectFoundError(error)) {
|
|
7
|
-
return true;
|
|
8
|
-
}
|
|
9
|
-
};
|
|
10
6
|
const getActions = ({ store, router, actionRegistry, actionPageRunner, }) => {
|
|
11
7
|
const route = router.getCurrentRoute();
|
|
12
8
|
const { config: { bundle, pageComponent } = {} } = route;
|
|
@@ -1,12 +1,8 @@
|
|
|
1
1
|
import uniq from '@tinkoff/utils/array/uniq';
|
|
2
|
-
import { isRedirectFoundError
|
|
2
|
+
import { isRedirectFoundError } from '@tinkoff/errors';
|
|
3
3
|
import '@tramvai/core';
|
|
4
|
+
import { stopRunAtError } from '../utils/stopRunAtError.es.js';
|
|
4
5
|
|
|
5
|
-
const stopRunAtError = (error) => {
|
|
6
|
-
if (isNotFoundError(error) || isRedirectFoundError(error)) {
|
|
7
|
-
return true;
|
|
8
|
-
}
|
|
9
|
-
};
|
|
10
6
|
const getActions = ({ store, router, actionRegistry, actionPageRunner, }) => {
|
|
11
7
|
const route = router.getCurrentRoute();
|
|
12
8
|
const { config: { bundle, pageComponent } = {} } = route;
|
|
@@ -5,16 +5,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
|
|
|
5
5
|
var uniq = require('@tinkoff/utils/array/uniq');
|
|
6
6
|
var errors = require('@tinkoff/errors');
|
|
7
7
|
require('@tramvai/core');
|
|
8
|
+
var stopRunAtError = require('../utils/stopRunAtError.js');
|
|
8
9
|
|
|
9
10
|
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
10
11
|
|
|
11
12
|
var uniq__default = /*#__PURE__*/_interopDefaultLegacy(uniq);
|
|
12
13
|
|
|
13
|
-
const stopRunAtError = (error) => {
|
|
14
|
-
if (errors.isNotFoundError(error) || errors.isRedirectFoundError(error)) {
|
|
15
|
-
return true;
|
|
16
|
-
}
|
|
17
|
-
};
|
|
18
14
|
const getActions = ({ store, router, actionRegistry, actionPageRunner, }) => {
|
|
19
15
|
const route = router.getCurrentRoute();
|
|
20
16
|
const { config: { bundle, pageComponent } = {} } = route;
|
|
@@ -30,7 +26,7 @@ const getActions = ({ store, router, actionRegistry, actionPageRunner, }) => {
|
|
|
30
26
|
const runActionsFactory = (deps) => {
|
|
31
27
|
return function runActions() {
|
|
32
28
|
const actions = getActions(deps);
|
|
33
|
-
return deps.actionPageRunner.runActions(actions, stopRunAtError).catch((err) => {
|
|
29
|
+
return deps.actionPageRunner.runActions(actions, stopRunAtError.stopRunAtError).catch((err) => {
|
|
34
30
|
if (errors.isRedirectFoundError(err)) {
|
|
35
31
|
return deps.router.navigate({
|
|
36
32
|
url: err.nextUrl,
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
|
+
|
|
5
|
+
var errors = require('@tinkoff/errors');
|
|
6
|
+
|
|
7
|
+
const stopRunAtError = (error) => {
|
|
8
|
+
if (errors.isNotFoundError(error) || errors.isRedirectFoundError(error)) {
|
|
9
|
+
return true;
|
|
10
|
+
}
|
|
11
|
+
return false;
|
|
12
|
+
};
|
|
13
|
+
|
|
14
|
+
exports.stopRunAtError = stopRunAtError;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tramvai/module-router",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.4.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"browser": {
|
|
@@ -27,28 +27,28 @@
|
|
|
27
27
|
"dependencies": {
|
|
28
28
|
"@tinkoff/errors": "0.8.1",
|
|
29
29
|
"@tinkoff/hook-runner": "0.9.1",
|
|
30
|
-
"@tinkoff/router": "0.7.
|
|
30
|
+
"@tinkoff/router": "0.7.11",
|
|
31
31
|
"@tinkoff/url": "0.13.1",
|
|
32
|
-
"@tramvai/experiments": "7.
|
|
33
|
-
"@tramvai/react": "7.
|
|
32
|
+
"@tramvai/experiments": "7.4.0",
|
|
33
|
+
"@tramvai/react": "7.4.0",
|
|
34
34
|
"@tramvai/safe-strings": "0.10.1",
|
|
35
|
-
"@tramvai/tokens-child-app": "7.
|
|
36
|
-
"@tramvai/tokens-render": "7.
|
|
37
|
-
"@tramvai/tokens-router": "7.
|
|
38
|
-
"@tramvai/tokens-server": "7.
|
|
35
|
+
"@tramvai/tokens-child-app": "7.4.0",
|
|
36
|
+
"@tramvai/tokens-render": "7.4.0",
|
|
37
|
+
"@tramvai/tokens-router": "7.4.0",
|
|
38
|
+
"@tramvai/tokens-server": "7.4.0"
|
|
39
39
|
},
|
|
40
40
|
"peerDependencies": {
|
|
41
|
-
"@tinkoff/dippy": "0.13.
|
|
41
|
+
"@tinkoff/dippy": "0.13.2",
|
|
42
42
|
"@tinkoff/utils": "^2.1.2",
|
|
43
|
-
"@tramvai/cli": "7.
|
|
44
|
-
"@tramvai/core": "7.
|
|
45
|
-
"@tramvai/module-log": "7.
|
|
46
|
-
"@tramvai/module-server": "7.
|
|
47
|
-
"@tramvai/papi": "7.
|
|
48
|
-
"@tramvai/state": "7.
|
|
49
|
-
"@tramvai/test-helpers": "7.
|
|
50
|
-
"@tramvai/test-mocks": "7.
|
|
51
|
-
"@tramvai/tokens-common": "7.
|
|
43
|
+
"@tramvai/cli": "7.4.0",
|
|
44
|
+
"@tramvai/core": "7.4.0",
|
|
45
|
+
"@tramvai/module-log": "7.4.0",
|
|
46
|
+
"@tramvai/module-server": "7.4.0",
|
|
47
|
+
"@tramvai/papi": "7.4.0",
|
|
48
|
+
"@tramvai/state": "7.4.0",
|
|
49
|
+
"@tramvai/test-helpers": "7.4.0",
|
|
50
|
+
"@tramvai/test-mocks": "7.4.0",
|
|
51
|
+
"@tramvai/tokens-common": "7.4.0",
|
|
52
52
|
"react": "*",
|
|
53
53
|
"tslib": "^2.4.0"
|
|
54
54
|
},
|