@modern-js/runtime 2.68.4 → 2.68.6

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 (7) hide show
  1. package/dist/cjs/document/cli/index.js +3 -3
  2. package/dist/cjs/router/runtime/utils.js +5 -1
  3. package/dist/esm/document/cli/index.js +23 -3
  4. package/dist/esm/router/runtime/utils.js +2 -1
  5. package/dist/esm-node/document/cli/index.js +3 -3
  6. package/dist/esm-node/router/runtime/utils.js +5 -1
  7. package/package.json +12 -12
package/dist/cjs/document/cli/index.js CHANGED
@@ -40,7 +40,7 @@ var import_react = __toESM(require("react"));
40
40
  var import_server = __toESM(require("react-dom/server"));
41
41
  var import_DocumentContext = require("../DocumentContext");
42
42
  var import_constants = require("../constants");
43
- const debug = (0, import_utils.createDebugger)("html_genarate");
43
+ const debug = (0, import_utils.createDebugger)("html_generate");
44
44
  const getDocumenByEntryName = function(entrypoints, entryName, fallbackDir) {
45
45
  var _entrypoints_find;
46
46
  const entryDir = (_entrypoints_find = entrypoints.find((item) => item.entryName === entryName)) === null || _entrypoints_find === void 0 ? void 0 : _entrypoints_find.absoluteEntryDir;
@@ -159,7 +159,7 @@ const documentPlugin = () => ({
159
159
  partialsContent.partialsHead = partialsByEntrypoint[entryName].head.join("\n");
160
160
  partialsContent.partialsBody = partialsByEntrypoint[entryName].body.join("\n");
161
161
  }
162
- html = html.replace(import_constants.TOP_PARTICALS_SEPARATOR, partialsContent.partialsTop).replace(import_constants.HEAD_PARTICALS_SEPARATOR, partialsContent.partialsHead).replace(import_constants.BODY_PARTICALS_SEPARATOR, partialsContent.partialsBody);
162
+ html = html.replace(import_constants.TOP_PARTICALS_SEPARATOR, () => partialsContent.partialsTop).replace(import_constants.HEAD_PARTICALS_SEPARATOR, () => partialsContent.partialsHead).replace(import_constants.BODY_PARTICALS_SEPARATOR, () => partialsContent.partialsBody);
163
163
  const links = [
164
164
  htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName === "link").join("")
165
165
  ].join("");
@@ -179,7 +179,7 @@ const documentPlugin = () => ({
179
179
  if (html.includes(import_constants.DOCUMENT_COMMENT_PLACEHOLDER_START) && html.includes(import_constants.DOCUMENT_COMMENT_PLACEHOLDER_END)) {
180
180
  html = html.replace(new RegExp(`${import_constants.DOCUMENT_COMMENT_PLACEHOLDER_START}(.*?)${import_constants.DOCUMENT_COMMENT_PLACEHOLDER_END}`, "g"), (_scriptStr, $1) => `${decodeURIComponent($1)}`);
181
181
  }
182
- const finalHtml = `<!DOCTYPE html>${html}`.replace(import_constants.DOCUMENT_META_PLACEHOLDER, metas).replace(import_constants.DOCUMENT_SSR_PLACEHOLDER, import_constants.HTML_SEPARATOR).replace(import_constants.DOCUMENT_SCRIPTS_PLACEHOLDER, scripts).replace(import_constants.DOCUMENT_LINKS_PLACEHOLDER, links).replace(import_constants.DOCUMENT_CHUNKSMAP_PLACEHOLDER, import_constants.PLACEHOLDER_REPLACER_MAP[import_constants.DOCUMENT_CHUNKSMAP_PLACEHOLDER]).replace(import_constants.DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, import_constants.PLACEHOLDER_REPLACER_MAP[import_constants.DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]).replace(import_constants.DOCUMENT_TITLE_PLACEHOLDER, titles);
182
+ const finalHtml = `<!DOCTYPE html>${html}`.replace(import_constants.DOCUMENT_META_PLACEHOLDER, () => metas).replace(import_constants.DOCUMENT_SSR_PLACEHOLDER, () => import_constants.HTML_SEPARATOR).replace(import_constants.DOCUMENT_SCRIPTS_PLACEHOLDER, () => scripts).replace(import_constants.DOCUMENT_LINKS_PLACEHOLDER, () => links).replace(import_constants.DOCUMENT_CHUNKSMAP_PLACEHOLDER, () => import_constants.PLACEHOLDER_REPLACER_MAP[import_constants.DOCUMENT_CHUNKSMAP_PLACEHOLDER]).replace(import_constants.DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, () => import_constants.PLACEHOLDER_REPLACER_MAP[import_constants.DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]).replace(import_constants.DOCUMENT_TITLE_PLACEHOLDER, () => titles);
183
183
  return finalHtml;
184
184
  };
185
185
  };
package/dist/cjs/router/runtime/utils.js CHANGED
@@ -101,6 +101,7 @@ function getRouteObjects(routes, { globalApp, ssrMode, props }) {
101
101
  const routeObjects = [];
102
102
  for (const route of routes) {
103
103
  if (route.type === "nested") {
104
+ var _route_config;
104
105
  const nestedRouteObject = {
105
106
  path: route.path,
106
107
  id: route.id,
@@ -108,7 +109,10 @@ function getRouteObjects(routes, { globalApp, ssrMode, props }) {
108
109
  action: route.action,
109
110
  hasErrorBoundary: route.hasErrorBoundary,
110
111
  shouldRevalidate: route.shouldRevalidate,
111
- handle: route.handle,
112
+ handle: {
113
+ ...route.handle,
114
+ ...typeof route.config === "object" ? (_route_config = route.config) === null || _route_config === void 0 ? void 0 : _route_config.handle : {}
115
+ },
112
116
  index: route.index,
113
117
  hasClientLoader: !!route.clientData,
114
118
  Component: route.component ? route.component : void 0,
package/dist/esm/document/cli/index.js CHANGED
@@ -9,7 +9,7 @@ import React from "react";
9
9
  import ReactDomServer from "react-dom/server";
10
10
  import { DocumentContext } from "../DocumentContext";
11
11
  import { BODY_PARTICALS_SEPARATOR, DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_COMMENT_PLACEHOLDER_END, DOCUMENT_COMMENT_PLACEHOLDER_START, DOCUMENT_FILE_NAME, DOCUMENT_LINKS_PLACEHOLDER, DOCUMENT_META_PLACEHOLDER, DOCUMENT_SCRIPTS_PLACEHOLDER, DOCUMENT_SCRIPT_ATTRIBUTES_END, DOCUMENT_SCRIPT_ATTRIBUTES_START, DOCUMENT_SCRIPT_PLACEHOLDER_END, DOCUMENT_SCRIPT_PLACEHOLDER_START, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, DOCUMENT_SSR_PLACEHOLDER, DOCUMENT_STYLE_PLACEHOLDER_END, DOCUMENT_STYLE_PLACEHOLDER_START, DOCUMENT_TITLE_PLACEHOLDER, DOC_EXT, HEAD_PARTICALS_SEPARATOR, HTML_SEPARATOR, PLACEHOLDER_REPLACER_MAP, TOP_PARTICALS_SEPARATOR } from "../constants";
12
- var debug = createDebugger("html_genarate");
12
+ var debug = createDebugger("html_generate");
13
13
  var getDocumenByEntryName = function getDocumenByEntryName2(entrypoints, entryName, fallbackDir) {
14
14
  var _entrypoints_find;
15
15
  var entryDir = (_entrypoints_find = entrypoints.find(function(item) {
@@ -173,7 +173,13 @@ var documentPlugin = function() {
173
173
  partialsContent.partialsHead = partialsByEntrypoint[entryName].head.join("\n");
174
174
  partialsContent.partialsBody = partialsByEntrypoint[entryName].body.join("\n");
175
175
  }
176
- html = html.replace(TOP_PARTICALS_SEPARATOR, partialsContent.partialsTop).replace(HEAD_PARTICALS_SEPARATOR, partialsContent.partialsHead).replace(BODY_PARTICALS_SEPARATOR, partialsContent.partialsBody);
176
+ html = html.replace(TOP_PARTICALS_SEPARATOR, function() {
177
+ return partialsContent.partialsTop;
178
+ }).replace(HEAD_PARTICALS_SEPARATOR, function() {
179
+ return partialsContent.partialsHead;
180
+ }).replace(BODY_PARTICALS_SEPARATOR, function() {
181
+ return partialsContent.partialsBody;
182
+ });
177
183
  links = [
178
184
  htmlWebpackPlugin.tags.headTags.filter(function(item) {
179
185
  return item.tagName === "link";
@@ -205,7 +211,21 @@ var documentPlugin = function() {
205
211
  return "".concat(decodeURIComponent($1));
206
212
  });
207
213
  }
208
- finalHtml = "<!DOCTYPE html>".concat(html).replace(DOCUMENT_META_PLACEHOLDER, metas).replace(DOCUMENT_SSR_PLACEHOLDER, HTML_SEPARATOR).replace(DOCUMENT_SCRIPTS_PLACEHOLDER, scripts).replace(DOCUMENT_LINKS_PLACEHOLDER, links).replace(DOCUMENT_CHUNKSMAP_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP[DOCUMENT_CHUNKSMAP_PLACEHOLDER]).replace(DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP[DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]).replace(DOCUMENT_TITLE_PLACEHOLDER, titles);
214
+ finalHtml = "<!DOCTYPE html>".concat(html).replace(DOCUMENT_META_PLACEHOLDER, function() {
215
+ return metas;
216
+ }).replace(DOCUMENT_SSR_PLACEHOLDER, function() {
217
+ return HTML_SEPARATOR;
218
+ }).replace(DOCUMENT_SCRIPTS_PLACEHOLDER, function() {
219
+ return scripts;
220
+ }).replace(DOCUMENT_LINKS_PLACEHOLDER, function() {
221
+ return links;
222
+ }).replace(DOCUMENT_CHUNKSMAP_PLACEHOLDER, function() {
223
+ return PLACEHOLDER_REPLACER_MAP[DOCUMENT_CHUNKSMAP_PLACEHOLDER];
224
+ }).replace(DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, function() {
225
+ return PLACEHOLDER_REPLACER_MAP[DOCUMENT_SSRDATASCRIPT_PLACEHOLDER];
226
+ }).replace(DOCUMENT_TITLE_PLACEHOLDER, function() {
227
+ return titles;
228
+ });
209
229
  return [
210
230
  2,
211
231
  finalHtml
package/dist/esm/router/runtime/utils.js CHANGED
@@ -87,6 +87,7 @@ function getRouteObjects(routes, param) {
87
87
  for (var _iterator = routes[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
88
88
  var route = _step.value;
89
89
  if (route.type === "nested") {
90
+ var _route_config;
90
91
  var nestedRouteObject = {
91
92
  path: route.path,
92
93
  id: route.id,
@@ -94,7 +95,7 @@ function getRouteObjects(routes, param) {
94
95
  action: route.action,
95
96
  hasErrorBoundary: route.hasErrorBoundary,
96
97
  shouldRevalidate: route.shouldRevalidate,
97
- handle: route.handle,
98
+ handle: _object_spread({}, route.handle, _type_of(route.config) === "object" ? (_route_config = route.config) === null || _route_config === void 0 ? void 0 : _route_config.handle : {}),
98
99
  index: route.index,
99
100
  hasClientLoader: !!route.clientData,
100
101
  Component: route.component ? route.component : void 0,
package/dist/esm-node/document/cli/index.js CHANGED
@@ -5,7 +5,7 @@ import React from "react";
5
5
  import ReactDomServer from "react-dom/server";
6
6
  import { DocumentContext } from "../DocumentContext";
7
7
  import { BODY_PARTICALS_SEPARATOR, DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_COMMENT_PLACEHOLDER_END, DOCUMENT_COMMENT_PLACEHOLDER_START, DOCUMENT_FILE_NAME, DOCUMENT_LINKS_PLACEHOLDER, DOCUMENT_META_PLACEHOLDER, DOCUMENT_SCRIPTS_PLACEHOLDER, DOCUMENT_SCRIPT_ATTRIBUTES_END, DOCUMENT_SCRIPT_ATTRIBUTES_START, DOCUMENT_SCRIPT_PLACEHOLDER_END, DOCUMENT_SCRIPT_PLACEHOLDER_START, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, DOCUMENT_SSR_PLACEHOLDER, DOCUMENT_STYLE_PLACEHOLDER_END, DOCUMENT_STYLE_PLACEHOLDER_START, DOCUMENT_TITLE_PLACEHOLDER, DOC_EXT, HEAD_PARTICALS_SEPARATOR, HTML_SEPARATOR, PLACEHOLDER_REPLACER_MAP, TOP_PARTICALS_SEPARATOR } from "../constants";
8
- const debug = createDebugger("html_genarate");
8
+ const debug = createDebugger("html_generate");
9
9
  const getDocumenByEntryName = function(entrypoints, entryName, fallbackDir) {
10
10
  var _entrypoints_find;
11
11
  const entryDir = (_entrypoints_find = entrypoints.find((item) => item.entryName === entryName)) === null || _entrypoints_find === void 0 ? void 0 : _entrypoints_find.absoluteEntryDir;
@@ -124,7 +124,7 @@ const documentPlugin = () => ({
124
124
  partialsContent.partialsHead = partialsByEntrypoint[entryName].head.join("\n");
125
125
  partialsContent.partialsBody = partialsByEntrypoint[entryName].body.join("\n");
126
126
  }
127
- html = html.replace(TOP_PARTICALS_SEPARATOR, partialsContent.partialsTop).replace(HEAD_PARTICALS_SEPARATOR, partialsContent.partialsHead).replace(BODY_PARTICALS_SEPARATOR, partialsContent.partialsBody);
127
+ html = html.replace(TOP_PARTICALS_SEPARATOR, () => partialsContent.partialsTop).replace(HEAD_PARTICALS_SEPARATOR, () => partialsContent.partialsHead).replace(BODY_PARTICALS_SEPARATOR, () => partialsContent.partialsBody);
128
128
  const links = [
129
129
  htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName === "link").join("")
130
130
  ].join("");
@@ -144,7 +144,7 @@ const documentPlugin = () => ({
144
144
  if (html.includes(DOCUMENT_COMMENT_PLACEHOLDER_START) && html.includes(DOCUMENT_COMMENT_PLACEHOLDER_END)) {
145
145
  html = html.replace(new RegExp(`${DOCUMENT_COMMENT_PLACEHOLDER_START}(.*?)${DOCUMENT_COMMENT_PLACEHOLDER_END}`, "g"), (_scriptStr, $1) => `${decodeURIComponent($1)}`);
146
146
  }
147
- const finalHtml = `<!DOCTYPE html>${html}`.replace(DOCUMENT_META_PLACEHOLDER, metas).replace(DOCUMENT_SSR_PLACEHOLDER, HTML_SEPARATOR).replace(DOCUMENT_SCRIPTS_PLACEHOLDER, scripts).replace(DOCUMENT_LINKS_PLACEHOLDER, links).replace(DOCUMENT_CHUNKSMAP_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP[DOCUMENT_CHUNKSMAP_PLACEHOLDER]).replace(DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, PLACEHOLDER_REPLACER_MAP[DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]).replace(DOCUMENT_TITLE_PLACEHOLDER, titles);
147
+ const finalHtml = `<!DOCTYPE html>${html}`.replace(DOCUMENT_META_PLACEHOLDER, () => metas).replace(DOCUMENT_SSR_PLACEHOLDER, () => HTML_SEPARATOR).replace(DOCUMENT_SCRIPTS_PLACEHOLDER, () => scripts).replace(DOCUMENT_LINKS_PLACEHOLDER, () => links).replace(DOCUMENT_CHUNKSMAP_PLACEHOLDER, () => PLACEHOLDER_REPLACER_MAP[DOCUMENT_CHUNKSMAP_PLACEHOLDER]).replace(DOCUMENT_SSRDATASCRIPT_PLACEHOLDER, () => PLACEHOLDER_REPLACER_MAP[DOCUMENT_SSRDATASCRIPT_PLACEHOLDER]).replace(DOCUMENT_TITLE_PLACEHOLDER, () => titles);
148
148
  return finalHtml;
149
149
  };
150
150
  };
package/dist/esm-node/router/runtime/utils.js CHANGED
@@ -60,6 +60,7 @@ function getRouteObjects(routes, { globalApp, ssrMode, props }) {
60
60
  const routeObjects = [];
61
61
  for (const route of routes) {
62
62
  if (route.type === "nested") {
63
+ var _route_config;
63
64
  const nestedRouteObject = {
64
65
  path: route.path,
65
66
  id: route.id,
@@ -67,7 +68,10 @@ function getRouteObjects(routes, { globalApp, ssrMode, props }) {
67
68
  action: route.action,
68
69
  hasErrorBoundary: route.hasErrorBoundary,
69
70
  shouldRevalidate: route.shouldRevalidate,
70
- handle: route.handle,
71
+ handle: {
72
+ ...route.handle,
73
+ ...typeof route.config === "object" ? (_route_config = route.config) === null || _route_config === void 0 ? void 0 : _route_config.handle : {}
74
+ },
71
75
  index: route.index,
72
76
  hasClientLoader: !!route.clientData,
73
77
  Component: route.component ? route.component : void 0,
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "2.68.4",
18
+ "version": "2.68.6",
19
19
  "engines": {
20
20
  "node": ">=14.17.6"
21
21
  },
@@ -219,13 +219,13 @@
219
219
  "react-is": "^18",
220
220
  "react-side-effect": "^2.1.2",
221
221
  "styled-components": "^5.3.1",
222
- "@modern-js/plugin": "2.68.4",
223
- "@modern-js/render": "2.68.4",
224
- "@modern-js/plugin-data-loader": "2.68.4",
225
- "@modern-js/plugin-v2": "2.68.4",
226
- "@modern-js/runtime-utils": "2.68.4",
227
- "@modern-js/types": "2.68.4",
228
- "@modern-js/utils": "2.68.4"
222
+ "@modern-js/plugin": "2.68.6",
223
+ "@modern-js/plugin-data-loader": "2.68.6",
224
+ "@modern-js/plugin-v2": "2.68.6",
225
+ "@modern-js/render": "2.68.6",
226
+ "@modern-js/runtime-utils": "2.68.6",
227
+ "@modern-js/types": "2.68.6",
228
+ "@modern-js/utils": "2.68.6"
229
229
  },
230
230
  "peerDependencies": {
231
231
  "react": ">=17",
@@ -233,7 +233,7 @@
233
233
  },
234
234
  "devDependencies": {
235
235
  "@remix-run/web-fetch": "^4.1.3",
236
- "@rsbuild/core": "1.4.9",
236
+ "@rsbuild/core": "1.4.11",
237
237
  "@testing-library/react": "^13.4.0",
238
238
  "@types/cookie": "0.6.0",
239
239
  "@types/invariant": "^2.2.30",
@@ -249,10 +249,10 @@
249
249
  "ts-node": "^10.9.1",
250
250
  "typescript": "^5",
251
251
  "webpack": "^5.99.8",
252
- "@modern-js/app-tools": "2.68.4",
253
- "@scripts/jest-config": "2.66.0",
252
+ "@modern-js/app-tools": "2.68.6",
254
253
  "@scripts/build": "2.66.0",
255
- "@modern-js/core": "2.68.4"
254
+ "@scripts/jest-config": "2.66.0",
255
+ "@modern-js/core": "2.68.6"
256
256
  },
257
257
  "sideEffects": false,
258
258
  "publishConfig": {