@modern-js/runtime 2.62.1 → 2.63.1

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 (10) hide show
  1. package/dist/cjs/cli/template.js +1 -1
  2. package/dist/cjs/core/browser/index.js +6 -6
  3. package/dist/cjs/router/runtime/plugin.node.js +4 -2
  4. package/dist/esm/cli/template.js +1 -1
  5. package/dist/esm/core/browser/index.js +6 -6
  6. package/dist/esm/router/runtime/plugin.node.js +5 -3
  7. package/dist/esm-node/cli/template.js +1 -1
  8. package/dist/esm-node/core/browser/index.js +6 -6
  9. package/dist/esm-node/router/runtime/plugin.node.js +4 -2
  10. package/package.json +11 -11
package/dist/cjs/cli/template.js CHANGED
@@ -89,7 +89,7 @@ const runtimeGlobalContext = ({ srcDirectory, internalSrcAlias, metaName, entry,
89
89
  return `import { setGlobalContext } from '@${metaName}/runtime/context'
90
90
 
91
91
  import App from '${// We need to get the path of App.tsx here, but the entry is `src/entry.tsx`
92
- (0, import_utils.formatImportPath)(customEntry ? entry.replace("entry.tsx", "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(".tsx", ""))}';
92
+ (0, import_utils.formatImportPath)(customEntry ? entry.replace(/entry\.[tj]sx/, "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(/\.[tj]sx/, ""))}';
93
93
 
94
94
  setGlobalContext({
95
95
  App,
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/cjs/router/runtime/plugin.node.js CHANGED
@@ -109,9 +109,11 @@ const routerPlugin = (userConfig = {}) => {
109
109
  if (routerContext instanceof Response) {
110
110
  return interrupt(routerContext);
111
111
  }
112
- if (routerContext.statusCode >= 500 && routerContext.statusCode < 600 && loaderFailureMode === "clientRender") {
112
+ if (routerContext.statusCode >= 500 && routerContext.statusCode < 600 && // TODO: if loaderFailureMode is not 'errroBoundary', error log will not be printed.
113
+ loaderFailureMode === "clientRender") {
113
114
  routerContext.statusCode = 200;
114
- throw routerContext.errors[0];
115
+ const errors = Object.values(routerContext.errors);
116
+ throw errors[0];
115
117
  }
116
118
  const router = (0, import_router.createStaticRouter)(routes, routerContext);
117
119
  context.routerContext = routerContext;
package/dist/esm/cli/template.js CHANGED
@@ -44,7 +44,7 @@ var runtimeRegister = function(param) {
44
44
  };
45
45
  var runtimeGlobalContext = function(param) {
46
46
  var srcDirectory = param.srcDirectory, internalSrcAlias = param.internalSrcAlias, metaName = param.metaName, entry = param.entry, customEntry = param.customEntry;
47
- return "import { setGlobalContext } from '@".concat(metaName, "/runtime/context'\n\nimport App from '").concat(formatImportPath(customEntry ? entry.replace("entry.tsx", "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(".tsx", "")), "';\n\nsetGlobalContext({\n App,\n});");
47
+ return "import { setGlobalContext } from '@".concat(metaName, "/runtime/context'\n\nimport App from '").concat(formatImportPath(customEntry ? entry.replace(/entry\.[tj]sx/, "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(/\.[tj]sx/, "")), "';\n\nsetGlobalContext({\n App,\n});");
48
48
  };
49
49
  export {
50
50
  index,
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/router/runtime/plugin.node.js CHANGED
@@ -40,7 +40,7 @@ var routerPlugin = function() {
40
40
  return {
41
41
  beforeRender: function beforeRender(context, interrupt) {
42
42
  return _async_to_generator(function() {
43
- var _context_ssrContext, _context_ssrContext_onTiming, _context_ssrContext1, pluginConfig, _merge, _merge_basename, basename, routesConfig, createRoutes, _context_ssrContext2, request, ssrMode, nonce, _context_ssrContext_loaderFailureMode, loaderFailureMode, baseUrl, _basename, reporter, requestContext, runner, routes, query, remixRequest, end, routerContext, cost, router;
43
+ var _context_ssrContext, _context_ssrContext_onTiming, _context_ssrContext1, pluginConfig, _merge, _merge_basename, basename, routesConfig, createRoutes, _context_ssrContext2, request, ssrMode, nonce, _context_ssrContext_loaderFailureMode, loaderFailureMode, baseUrl, _basename, reporter, requestContext, runner, routes, query, remixRequest, end, routerContext, cost, errors, router;
44
44
  return _ts_generator(this, function(_state) {
45
45
  switch (_state.label) {
46
46
  case 0:
@@ -98,9 +98,11 @@ var routerPlugin = function() {
98
98
  interrupt(routerContext)
99
99
  ];
100
100
  }
101
- if (routerContext.statusCode >= 500 && routerContext.statusCode < 600 && loaderFailureMode === "clientRender") {
101
+ if (routerContext.statusCode >= 500 && routerContext.statusCode < 600 && // TODO: if loaderFailureMode is not 'errroBoundary', error log will not be printed.
102
+ loaderFailureMode === "clientRender") {
102
103
  routerContext.statusCode = 200;
103
- throw routerContext.errors[0];
104
+ errors = Object.values(routerContext.errors);
105
+ throw errors[0];
104
106
  }
105
107
  router = createStaticRouter(routes, routerContext);
106
108
  context.routerContext = routerContext;
package/dist/esm-node/cli/template.js CHANGED
@@ -53,7 +53,7 @@ const runtimeGlobalContext = ({ srcDirectory, internalSrcAlias, metaName, entry,
53
53
  return `import { setGlobalContext } from '@${metaName}/runtime/context'
54
54
 
55
55
  import App from '${// We need to get the path of App.tsx here, but the entry is `src/entry.tsx`
56
- formatImportPath(customEntry ? entry.replace("entry.tsx", "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(".tsx", ""))}';
56
+ formatImportPath(customEntry ? entry.replace(/entry\.[tj]sx/, "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(/\.[tj]sx/, ""))}';
57
57
 
58
58
  setGlobalContext({
59
59
  App,
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/dist/esm-node/router/runtime/plugin.node.js CHANGED
@@ -75,9 +75,11 @@ const routerPlugin = (userConfig = {}) => {
75
75
  if (routerContext instanceof Response) {
76
76
  return interrupt(routerContext);
77
77
  }
78
- if (routerContext.statusCode >= 500 && routerContext.statusCode < 600 && loaderFailureMode === "clientRender") {
78
+ if (routerContext.statusCode >= 500 && routerContext.statusCode < 600 && // TODO: if loaderFailureMode is not 'errroBoundary', error log will not be printed.
79
+ loaderFailureMode === "clientRender") {
79
80
  routerContext.statusCode = 200;
80
- throw routerContext.errors[0];
81
+ const errors = Object.values(routerContext.errors);
82
+ throw errors[0];
81
83
  }
82
84
  const router = createStaticRouter(routes, routerContext);
83
85
  context.routerContext = routerContext;
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.1",
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-data-loader": "2.63.1",
204
+ "@modern-js/runtime-utils": "2.63.1",
205
+ "@modern-js/plugin": "2.63.1",
206
+ "@modern-js/types": "2.63.1",
207
+ "@modern-js/utils": "2.63.1"
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.8",
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.1",
232
+ "@scripts/build": "2.63.1",
233
+ "@modern-js/core": "2.63.1",
234
+ "@scripts/jest-config": "2.63.1"
235
235
  },
236
236
  "sideEffects": false,
237
237
  "publishConfig": {