@modern-js/runtime 2.62.1 → 2.63.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/dist/cjs/core/browser/index.js +6 -6
  2. package/dist/esm/core/browser/index.js +6 -6
  3. package/dist/esm-node/core/browser/index.js +6 -6
  4. package/package.json +11 -11
package/dist/cjs/core/browser/index.js CHANGED
@@ -91,7 +91,7 @@ async function render(App, id) {
91
91
  if (isClientArgs(id)) {
92
92
  var _ssrData_data, _ssrData_data1;
93
93
  const ssrData = getSSRData();
94
- const loadersData = (ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data = ssrData.data) === null || _ssrData_data === void 0 ? void 0 : _ssrData_data.loadersData) || {};
94
+ const loadersData = ((_ssrData_data = ssrData.data) === null || _ssrData_data === void 0 ? void 0 : _ssrData_data.loadersData) || {};
95
95
  const initialLoadersState = Object.keys(loadersData).reduce((res, key) => {
96
96
  const loaderData = loadersData[key];
97
97
  if ((loaderData === null || loaderData === void 0 ? void 0 : loaderData.loading) !== false) {
@@ -106,11 +106,11 @@ async function render(App, id) {
106
106
  }),
107
107
  // garfish plugin params
108
108
  _internalRouterBaseName: App.props.basename,
109
- ...ssrData ? {
110
- ssrContext: ssrData === null || ssrData === void 0 ? void 0 : ssrData.context
111
- } : {}
109
+ ...{
110
+ ssrContext: ssrData.context
111
+ }
112
112
  });
113
- context.initialData = ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data1 = ssrData.data) === null || _ssrData_data1 === void 0 ? void 0 : _ssrData_data1.initialData;
113
+ context.initialData = (_ssrData_data1 = ssrData.data) === null || _ssrData_data1 === void 0 ? void 0 : _ssrData_data1.initialData;
114
114
  const initialData = await runBeforeRender(context);
115
115
  if (initialData) {
116
116
  context.initialData = initialData;
@@ -124,7 +124,7 @@ async function render(App, id) {
124
124
  const hydrateFunc = IS_REACT18 ? hydrateWithReact18 : hydrateWithReact17;
125
125
  return hydrateFunc(App2, rootElement, callback);
126
126
  }
127
- if (ssrData) {
127
+ if (window._SSR_DATA) {
128
128
  return (0, import_hydrate.hydrateRoot)(App, context, ModernRender, ModernHydrate);
129
129
  }
130
130
  return ModernRender((0, import_wrapper.wrapRuntimeContextProvider)(App, context));
package/dist/esm/core/browser/index.js CHANGED
@@ -122,7 +122,7 @@ function _render() {
122
122
  return _ModernHydrate.apply(this, arguments);
123
123
  };
124
124
  ssrData = getSSRData();
125
- loadersData = (ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data = ssrData.data) === null || _ssrData_data === void 0 ? void 0 : _ssrData_data.loadersData) || {};
125
+ loadersData = ((_ssrData_data = ssrData.data) === null || _ssrData_data === void 0 ? void 0 : _ssrData_data.loadersData) || {};
126
126
  initialLoadersState = Object.keys(loadersData).reduce(function(res, key) {
127
127
  var loaderData = loadersData[key];
128
128
  if ((loaderData === null || loaderData === void 0 ? void 0 : loaderData.loading) !== false) {
@@ -137,10 +137,10 @@ function _render() {
137
137
  }),
138
138
  // garfish plugin params
139
139
  _internalRouterBaseName: App.props.basename
140
- }, ssrData ? {
141
- ssrContext: ssrData === null || ssrData === void 0 ? void 0 : ssrData.context
142
- } : {}));
143
- context.initialData = ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data1 = ssrData.data) === null || _ssrData_data1 === void 0 ? void 0 : _ssrData_data1.initialData;
140
+ }, {
141
+ ssrContext: ssrData.context
142
+ }));
143
+ context.initialData = (_ssrData_data1 = ssrData.data) === null || _ssrData_data1 === void 0 ? void 0 : _ssrData_data1.initialData;
144
144
  return [
145
145
  4,
146
146
  runBeforeRender(context)
@@ -151,7 +151,7 @@ function _render() {
151
151
  context.initialData = initialData;
152
152
  }
153
153
  rootElement = id && typeof id !== "string" ? id : document.getElementById(id || "root");
154
- if (ssrData) {
154
+ if (window._SSR_DATA) {
155
155
  return [
156
156
  2,
157
157
  hydrateRoot(App, context, ModernRender, ModernHydrate)
package/dist/esm-node/core/browser/index.js CHANGED
@@ -58,7 +58,7 @@ async function render(App, id) {
58
58
  if (isClientArgs(id)) {
59
59
  var _ssrData_data, _ssrData_data1;
60
60
  const ssrData = getSSRData();
61
- const loadersData = (ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data = ssrData.data) === null || _ssrData_data === void 0 ? void 0 : _ssrData_data.loadersData) || {};
61
+ const loadersData = ((_ssrData_data = ssrData.data) === null || _ssrData_data === void 0 ? void 0 : _ssrData_data.loadersData) || {};
62
62
  const initialLoadersState = Object.keys(loadersData).reduce((res, key) => {
63
63
  const loaderData = loadersData[key];
64
64
  if ((loaderData === null || loaderData === void 0 ? void 0 : loaderData.loading) !== false) {
@@ -73,11 +73,11 @@ async function render(App, id) {
73
73
  }),
74
74
  // garfish plugin params
75
75
  _internalRouterBaseName: App.props.basename,
76
- ...ssrData ? {
77
- ssrContext: ssrData === null || ssrData === void 0 ? void 0 : ssrData.context
78
- } : {}
76
+ ...{
77
+ ssrContext: ssrData.context
78
+ }
79
79
  });
80
- context.initialData = ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data1 = ssrData.data) === null || _ssrData_data1 === void 0 ? void 0 : _ssrData_data1.initialData;
80
+ context.initialData = (_ssrData_data1 = ssrData.data) === null || _ssrData_data1 === void 0 ? void 0 : _ssrData_data1.initialData;
81
81
  const initialData = await runBeforeRender(context);
82
82
  if (initialData) {
83
83
  context.initialData = initialData;
@@ -91,7 +91,7 @@ async function render(App, id) {
91
91
  const hydrateFunc = IS_REACT18 ? hydrateWithReact18 : hydrateWithReact17;
92
92
  return hydrateFunc(App2, rootElement, callback);
93
93
  }
94
- if (ssrData) {
94
+ if (window._SSR_DATA) {
95
95
  return hydrateRoot(App, context, ModernRender, ModernHydrate);
96
96
  }
97
97
  return ModernRender(wrapRuntimeContextProvider(App, context));
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "2.62.1",
18
+ "version": "2.63.0",
19
19
  "engines": {
20
20
  "node": ">=14.17.6"
21
21
  },
@@ -200,11 +200,11 @@
200
200
  "react-is": "^18",
201
201
  "react-side-effect": "^2.1.1",
202
202
  "styled-components": "^5.3.1",
203
- "@modern-js/plugin": "2.62.1",
204
- "@modern-js/runtime-utils": "2.62.1",
205
- "@modern-js/plugin-data-loader": "2.62.1",
206
- "@modern-js/types": "2.62.1",
207
- "@modern-js/utils": "2.62.1"
203
+ "@modern-js/plugin": "2.63.0",
204
+ "@modern-js/plugin-data-loader": "2.63.0",
205
+ "@modern-js/types": "2.63.0",
206
+ "@modern-js/utils": "2.63.0",
207
+ "@modern-js/runtime-utils": "2.63.0"
208
208
  },
209
209
  "peerDependencies": {
210
210
  "react": ">=17",
@@ -212,7 +212,7 @@
212
212
  },
213
213
  "devDependencies": {
214
214
  "@remix-run/web-fetch": "^4.1.3",
215
- "@rsbuild/core": "~1.1.0",
215
+ "@rsbuild/core": "~1.1.5",
216
216
  "@testing-library/react": "^13.4.0",
217
217
  "@types/cookie": "0.6.0",
218
218
  "@types/invariant": "^2.2.30",
@@ -228,10 +228,10 @@
228
228
  "ts-node": "^10.9.1",
229
229
  "typescript": "^5",
230
230
  "webpack": "^5.96.1",
231
- "@modern-js/app-tools": "2.62.1",
232
- "@modern-js/core": "2.62.1",
233
- "@scripts/build": "2.62.1",
234
- "@scripts/jest-config": "2.62.1"
231
+ "@modern-js/app-tools": "2.63.0",
232
+ "@scripts/jest-config": "2.63.0",
233
+ "@modern-js/core": "2.63.0",
234
+ "@scripts/build": "2.63.0"
235
235
  },
236
236
  "sideEffects": false,
237
237
  "publishConfig": {