@tramvai/module-child-app 1.84.2 → 1.90.1

package/lib/server.browser.js

@@ -5,11 +5,12 @@ import { commandLineListTokens, CHILD_APP_INTERNAL_ROOT_STATE_SUBSCRIPTION_TOKEN
 export * from '@tramvai/tokens-child-app';
 import { ACTION_PAGE_RUNNER_TOKEN, CONTEXT_TOKEN, LOGGER_TOKEN, DISPATCHER_TOKEN, STORE_TOKEN, DISPATCHER_CONTEXT_TOKEN, STORE_MIDDLEWARE, INITIAL_APP_STATE_TOKEN, COMBINE_REDUCERS, ENV_MANAGER_TOKEN, REGISTER_CLEAR_CACHE_TOKEN, CLEAR_CACHE_TOKEN, ENV_USED_TOKEN } from '@tramvai/tokens-common';
 import { RENDER_SLOTS, EXTEND_RENDER } from '@tramvai/tokens-render';
-import { ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN, PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
+import { ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN, PAGE_SERVICE_TOKEN, ROUTER_TOKEN } from '@tramvai/tokens-router';
 import flatten from '@tinkoff/utils/array/flatten';
 import noop from '@tinkoff/utils/function/noop';
 import { Subscription, ChildDispatcherContext, createEvent, createReducer } from '@tramvai/state';
-import React, { createContext, useContext, useMemo, useState, useEffect, createElement } from 'react';
+import { jsx } from 'react/jsx-runtime';
+import { createContext, useContext, useMemo, useState, useEffect, createElement } from 'react';
 import applyOrReturn from '@tinkoff/utils/function/applyOrReturn';
 import { loadModule } from '@tinkoff/module-loader-client';
 import { useDi } from '@tramvai/react';
@@ -330,7 +331,7 @@ const RenderContext = createContext(null);
 
 const extendRender = ({ renderManager, }) => {
     return (render) => {
-        return React.createElement(RenderContext.Provider, { value: renderManager }, render);
+        return jsx(RenderContext.Provider, Object.assign({ value: renderManager }, { children: render }), void 0);
     };
 };
 
@@ -889,6 +890,18 @@ const browserProviders = [
             preloader: CHILD_APP_PRELOAD_MANAGER_TOKEN,
         },
     }),
+    provide({
+        provide: commandLineListTokens$1.customerStart,
+        multi: true,
+        useFactory: ({ router, preloader }) => {
+            router.registerHook('beforeNavigate', () => preloader.clearPreloaded());
+            router.registerHook('beforeUpdateCurrent', () => preloader.clearPreloaded());
+        },
+        deps: {
+            router: ROUTER_TOKEN,
+            preloader: CHILD_APP_PRELOAD_MANAGER_TOKEN,
+        },
+    }),
     provide({
         provide: commandLineListTokens$1.spaTransition,
         multi: true,
@@ -916,7 +929,6 @@ const browserProviders = [
                     runner,
                     status: 'afterSpa',
                 });
-                await preloader.clearPreloaded();
             };
         },
         deps: {

package/lib/server.es.js

@@ -8,7 +8,8 @@ import { RENDER_SLOTS, EXTEND_RENDER, ResourceType, ResourceSlot, RESOURCES_REGI
 import { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
 import flatten from '@tinkoff/utils/array/flatten';
 import { ChildDispatcherContext, createEvent, createReducer } from '@tramvai/state';
-import React, { createContext, useContext, useMemo, useState, useEffect, createElement } from 'react';
+import { jsx } from 'react/jsx-runtime';
+import { createContext, useContext, useMemo, useState, useEffect, createElement } from 'react';
 import applyOrReturn from '@tinkoff/utils/function/applyOrReturn';
 import { combineValidators, isUrl, endsWith } from '@tinkoff/env-validators';
 import { safeDehydrate } from '@tramvai/safe-strings';
@@ -268,7 +269,7 @@ const RenderContext = createContext(null);
 
 const extendRender = ({ renderManager, }) => {
     return (render) => {
-        return React.createElement(RenderContext.Provider, { value: renderManager }, render);
+        return jsx(RenderContext.Provider, Object.assign({ value: renderManager }, { children: render }), void 0);
     };
 };
 

package/lib/server.js

@@ -11,18 +11,18 @@ var tokensRender = require('@tramvai/tokens-render');
 var tokensRouter = require('@tramvai/tokens-router');
 var flatten = require('@tinkoff/utils/array/flatten');
 var state = require('@tramvai/state');
-var React = require('react');
+var jsxRuntime = require('react/jsx-runtime');
+var react = require('react');
 var applyOrReturn = require('@tinkoff/utils/function/applyOrReturn');
 var envValidators = require('@tinkoff/env-validators');
 var safeStrings = require('@tramvai/safe-strings');
 var moduleLoaderServer = require('@tinkoff/module-loader-server');
 var noop = require('@tinkoff/utils/function/noop');
-var react = require('@tramvai/react');
+var react$1 = require('@tramvai/react');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var applyOrReturn__default = /*#__PURE__*/_interopDefaultLegacy(applyOrReturn);
 var noop__default = /*#__PURE__*/_interopDefaultLegacy(noop);
 
@@ -274,11 +274,11 @@ const ChildAppStore = state.createReducer('child-app', initialState).on(setPrelo
     };
 });
 
-const RenderContext = React.createContext(null);
+const RenderContext = react.createContext(null);
 
 const extendRender = ({ renderManager, }) => {
     return (render) => {
-        return React__default["default"].createElement(RenderContext.Provider, { value: renderManager }, render);
+        return jsxRuntime.jsx(RenderContext.Provider, Object.assign({ value: renderManager }, { children: render }), void 0);
     };
 };
 
@@ -967,15 +967,15 @@ const serverProviders = [
 ];
 
 const ChildApp = ({ name, version, tag, props }) => {
-    const renderManager = React.useContext(RenderContext);
-    const resolveExternalConfig = react.useDi(tokensChildApp.CHILD_APP_RESOLVE_CONFIG_TOKEN);
-    const logger = react.useDi(tokensCommon.LOGGER_TOKEN);
+    const renderManager = react.useContext(RenderContext);
+    const resolveExternalConfig = react$1.useDi(tokensChildApp.CHILD_APP_RESOLVE_CONFIG_TOKEN);
+    const logger = react$1.useDi(tokensCommon.LOGGER_TOKEN);
     const log = logger('child-app:render');
-    const [maybeDi, promiseDi] = React.useMemo(() => {
+    const [maybeDi, promiseDi] = react.useMemo(() => {
         return renderManager.getChildDi(resolveExternalConfig({ name, version, tag }));
     }, [name, version, tag, renderManager, resolveExternalConfig]);
-    const [di, setDi] = React.useState(maybeDi);
-    React.useEffect(() => {
+    const [di, setDi] = react.useState(maybeDi);
+    react.useEffect(() => {
         if (!di && promiseDi) {
             // any errors with loading child-app should be handled in some other place
             promiseDi.then(setDi).catch(noop__default["default"]);
@@ -1003,7 +1003,7 @@ const ChildApp = ({ name, version, tag, props }) => {
             });
             return null;
         }
-        return React.createElement(Cmp, {
+        return react.createElement(Cmp, {
             di,
             props,
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-child-app",
-  "version": "1.84.2",
+  "version": "1.90.1",
   "description": "Module for child apps",
   "browser": {
     "./lib/server.js": "./lib/browser.js",
@@ -31,20 +31,20 @@
     "@tinkoff/env-validators": "0.0.3",
     "@tinkoff/module-loader-client": "0.3.25",
     "@tinkoff/module-loader-server": "0.4.41",
-    "@tramvai/child-app-core": "1.84.2",
+    "@tramvai/child-app-core": "1.90.1",
     "@tramvai/safe-strings": "0.4.3",
-    "@tramvai/tokens-child-app": "1.84.2"
+    "@tramvai/tokens-child-app": "1.90.1"
   },
   "devDependencies": {},
   "peerDependencies": {
     "@tinkoff/dippy": "0.7.39",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "1.84.2",
-    "@tramvai/state": "1.84.2",
-    "@tramvai/react": "1.84.2",
-    "@tramvai/tokens-common": "1.84.2",
-    "@tramvai/tokens-render": "1.84.2",
-    "@tramvai/tokens-router": "1.84.2",
+    "@tramvai/core": "1.90.1",
+    "@tramvai/state": "1.90.1",
+    "@tramvai/react": "1.90.1",
+    "@tramvai/tokens-common": "1.90.1",
+    "@tramvai/tokens-render": "1.90.1",
+    "@tramvai/tokens-router": "1.90.1",
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0",
     "object-assign": "^4.1.1",