@tramvai/module-child-app 2.24.3 → 2.25.1

package/lib/browser/providers.d.ts

@@ -1,7 +1,2 @@
 import type { Provider } from '@tinkoff/dippy';
-declare global {
-    interface Window {
-        childAppInitialState: string;
-    }
-}
 export declare const browserProviders: Provider[];

package/lib/server.browser.js

@@ -331,7 +331,7 @@ const RenderContext = createContext(null);
 
 const extendRender = ({ renderManager, }) => {
     return (render) => {
-        return jsx(RenderContext.Provider, Object.assign({ value: renderManager }, { children: render }), void 0);
+        return jsx(RenderContext.Provider, { value: renderManager, children: render });
     };
 };
 
@@ -833,6 +833,8 @@ const runCommand = async ({ status, runner, preloader, }) => {
     }));
 };
 
+const GLOBAL_CHILD_STATE = '__TRAMVAI_CHILD_STATE__';
+
 const browserProviders = [
     provide({
         provide: CHILD_APP_LOADER_TOKEN,
@@ -855,7 +857,7 @@ const browserProviders = [
     }),
     provide({
         provide: CHILD_APP_COMMON_INITIAL_STATE_TOKEN,
-        useFactory: () => JSON.parse(window.childAppInitialState || '{}'),
+        useFactory: () => JSON.parse(document.getElementById(GLOBAL_CHILD_STATE).textContent || '{}'),
     }),
     provide({
         provide: CHILD_APP_RENDER_MANAGER_TOKEN,

package/lib/server.es.js

@@ -13,7 +13,7 @@ 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';
+import { safeStringify } from '@tramvai/safe-strings';
 import { ServerLoader as ServerLoader$1 } from '@tinkoff/module-loader-server';
 import noop from '@tinkoff/utils/function/noop';
 
@@ -269,7 +269,7 @@ const RenderContext = createContext(null);
 
 const extendRender = ({ renderManager, }) => {
     return (render) => {
-        return jsx(RenderContext.Provider, Object.assign({ value: renderManager }, { children: render }), void 0);
+        return jsx(RenderContext.Provider, { value: renderManager, children: render });
     };
 };
 
@@ -838,6 +838,8 @@ const registerChildAppRenderSlots = ({ logger, diManager, resolveFullConfig, pre
     return result;
 };
 
+const GLOBAL_CHILD_STATE = '__TRAMVAI_CHILD_STATE__';
+
 const serverProviders = [
     provide({
         provide: ENV_USED_TOKEN,
@@ -885,9 +887,9 @@ const serverProviders = [
         useFactory: ({ stateManager, preloader, store }) => {
             store.dispatch(setPreloaded(preloader.getPreloadedList()));
             return {
-                type: ResourceType.inlineScript,
+                type: ResourceType.asIs,
                 slot: ResourceSlot.BODY_END,
-                payload: `var childAppInitialState = '${safeDehydrate(stateManager.getState())}'`,
+                payload: `<script id="${GLOBAL_CHILD_STATE}" type="application/json">${safeStringify(stateManager.getState())}</script>`,
             };
         },
         deps: {

package/lib/server.js

@@ -278,7 +278,7 @@ const RenderContext = react.createContext(null);
 
 const extendRender = ({ renderManager, }) => {
     return (render) => {
-        return jsxRuntime.jsx(RenderContext.Provider, Object.assign({ value: renderManager }, { children: render }), void 0);
+        return jsxRuntime.jsx(RenderContext.Provider, { value: renderManager, children: render });
     };
 };
 
@@ -847,6 +847,8 @@ const registerChildAppRenderSlots = ({ logger, diManager, resolveFullConfig, pre
     return result;
 };
 
+const GLOBAL_CHILD_STATE = '__TRAMVAI_CHILD_STATE__';
+
 const serverProviders = [
     core.provide({
         provide: tokensCommon.ENV_USED_TOKEN,
@@ -894,9 +896,9 @@ const serverProviders = [
         useFactory: ({ stateManager, preloader, store }) => {
             store.dispatch(setPreloaded(preloader.getPreloadedList()));
             return {
-                type: tokensRender.ResourceType.inlineScript,
+                type: tokensRender.ResourceType.asIs,
                 slot: tokensRender.ResourceSlot.BODY_END,
-                payload: `var childAppInitialState = '${safeStrings.safeDehydrate(stateManager.getState())}'`,
+                payload: `<script id="${GLOBAL_CHILD_STATE}" type="application/json">${safeStrings.safeStringify(stateManager.getState())}</script>`,
             };
         },
         deps: {

package/lib/shared/constants.d.ts

@@ -0,0 +1 @@
+export declare const GLOBAL_CHILD_STATE = "__TRAMVAI_CHILD_STATE__";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-child-app",
-  "version": "2.24.3",
+  "version": "2.25.1",
   "description": "Module for child apps",
   "browser": {
     "./lib/server.js": "./lib/browser.js",
@@ -28,27 +28,27 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@tinkoff/env-validators": "0.1.2",
-    "@tinkoff/module-loader-client": "0.4.2",
-    "@tinkoff/module-loader-server": "0.5.2",
-    "@tramvai/child-app-core": "2.24.3",
-    "@tramvai/safe-strings": "0.5.2",
-    "@tramvai/tokens-child-app": "2.24.3"
+    "@tinkoff/env-validators": "0.1.3",
+    "@tinkoff/module-loader-client": "0.4.3",
+    "@tinkoff/module-loader-server": "0.5.3",
+    "@tramvai/child-app-core": "2.25.1",
+    "@tramvai/safe-strings": "0.5.4",
+    "@tramvai/tokens-child-app": "2.25.1"
   },
   "devDependencies": {},
   "peerDependencies": {
-    "@tinkoff/dippy": "0.8.3",
+    "@tinkoff/dippy": "0.8.5",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "2.24.3",
-    "@tramvai/state": "2.24.3",
-    "@tramvai/react": "2.24.3",
-    "@tramvai/tokens-common": "2.24.3",
-    "@tramvai/tokens-render": "2.24.3",
-    "@tramvai/tokens-router": "2.24.3",
+    "@tramvai/core": "2.25.1",
+    "@tramvai/state": "2.25.1",
+    "@tramvai/react": "2.25.1",
+    "@tramvai/tokens-common": "2.25.1",
+    "@tramvai/tokens-render": "2.25.1",
+    "@tramvai/tokens-router": "2.25.1",
     "react": ">=16.14.0",
     "react-dom": ">=16.14.0",
     "object-assign": "^4.1.1",
-    "tslib": "^2.0.3"
+    "tslib": "^2.4.0"
   },
   "module": "lib/server.es.js"
 }