@modern-js/server-core 3.0.1 → 3.0.2

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 (18) hide show
  1. package/dist/cjs/adapters/node/plugins/resource.js +3 -2
  2. package/dist/cjs/plugins/render/csrRscRender.js +0 -3
  3. package/dist/cjs/plugins/render/render.js +2 -2
  4. package/dist/cjs/plugins/render/renderRscHandler.js +0 -3
  5. package/dist/cjs/plugins/render/serverActionHandler.js +1 -6
  6. package/dist/esm/adapters/node/plugins/resource.mjs +3 -2
  7. package/dist/esm/plugins/render/csrRscRender.mjs +0 -3
  8. package/dist/esm/plugins/render/render.mjs +2 -2
  9. package/dist/esm/plugins/render/renderRscHandler.mjs +0 -3
  10. package/dist/esm/plugins/render/serverActionHandler.mjs +1 -6
  11. package/dist/esm-node/adapters/node/plugins/resource.mjs +3 -2
  12. package/dist/esm-node/plugins/render/csrRscRender.mjs +0 -3
  13. package/dist/esm-node/plugins/render/render.mjs +2 -2
  14. package/dist/esm-node/plugins/render/renderRscHandler.mjs +0 -3
  15. package/dist/esm-node/plugins/render/serverActionHandler.mjs +1 -6
  16. package/dist/types/adapters/node/plugins/resource.d.ts +1 -1
  17. package/dist/types/types/server.d.ts +1 -3
  18. package/package.json +6 -6
package/dist/cjs/adapters/node/plugins/resource.js CHANGED
@@ -79,7 +79,8 @@ const loadBundle = async (filepath, monitors)=>{
79
79
  const module = await (0, utils_namespaceObject.compatibleRequire)(filepath, false);
80
80
  return module;
81
81
  } catch (e) {
82
- monitors.error(`Load ${filepath} bundle failed, error = %s`, e instanceof Error ? e.stack || e.message : e);
82
+ if (monitors) monitors.error(`Load ${filepath} bundle failed, error = %s`, e instanceof Error ? e.stack || e.message : e);
83
+ else console.error(`Load ${filepath} bundle failed, error = ${e instanceof Error ? e.stack || e.message : e}`);
83
84
  return;
84
85
  }
85
86
  };
@@ -166,7 +167,7 @@ const injectResourcePlugin = ()=>({
166
167
  let htmlTemplatePromise;
167
168
  let manifestPromise;
168
169
  if ((0, utils_namespaceObject.isProd)()) {
169
- manifestPromise = getServerManifest(pwd, routes || [], console);
170
+ manifestPromise = getServerManifest(pwd, routes || [], void 0);
170
171
  htmlTemplatePromise = getHtmlTemplates(pwd, routes || []);
171
172
  }
172
173
  middlewares.push({
package/dist/cjs/plugins/render/csrRscRender.js CHANGED
@@ -62,9 +62,6 @@ const csrRscRender = async (req, options)=>{
62
62
  if (!renderRscStreamHandler) return new Response('Cannot find render handler for RSC', {
63
63
  status: 500
64
64
  });
65
- if (!rscClientManifest) return new Response('Cannot find rsc client manifest', {
66
- status: 500
67
- });
68
65
  const response = await renderRscStreamHandler(req, requestHandlerOptions);
69
66
  return response;
70
67
  };
package/dist/cjs/plugins/render/render.js CHANGED
@@ -240,8 +240,8 @@ var __webpack_exports__ = {};
240
240
  return html.replace(/<\/head>/, `${tag}</head>`);
241
241
  }
242
242
  async function csrRender(request, options) {
243
- const { html, rscClientManifest } = options;
244
- if (!rscClientManifest || process.env.MODERN_DISABLE_INJECT_RSC_DATA || !options.routeInfo.isRSC) return new Response(html, {
243
+ const { html } = options;
244
+ if (process.env.MODERN_DISABLE_INJECT_RSC_DATA || !options.routeInfo.isRSC) return new Response(html, {
245
245
  status: 200,
246
246
  headers: new Headers({
247
247
  'content-type': 'text/html; charset=UTF-8',
package/dist/cjs/plugins/render/renderRscHandler.js CHANGED
@@ -61,9 +61,6 @@ const renderRscHandler = async (req, options)=>{
61
61
  if (!rscPayloadHandler) return new Response('Cannot find request handler for RSC', {
62
62
  status: 500
63
63
  });
64
- if (!rscClientManifest) return new Response('Cannot find rsc client manifest', {
65
- status: 500
66
- });
67
64
  return rscPayloadHandler(req, requestHandlerOptions);
68
65
  };
69
66
  exports.renderRscHandler = __webpack_exports__.renderRscHandler;
package/dist/cjs/plugins/render/serverActionHandler.js CHANGED
@@ -36,12 +36,7 @@ const serverActionHandler = async (req, { serverManifest, routeInfo, rscClientMa
36
36
  if (!handleAction) return new Response('Cannot find server action handler', {
37
37
  status: 500
38
38
  });
39
- if (!rscClientManifest) return new Response('Cannot find rsc client manifest', {
40
- status: 500
41
- });
42
- return handleAction(req, {
43
- clientManifest: rscClientManifest
44
- });
39
+ return handleAction(req);
45
40
  };
46
41
  exports.serverActionHandler = __webpack_exports__.serverActionHandler;
47
42
  for(var __rspack_i in __webpack_exports__)if (-1 === [
package/dist/esm/adapters/node/plugins/resource.mjs CHANGED
@@ -33,7 +33,8 @@ const loadBundle = async (filepath, monitors)=>{
33
33
  const module = await compatibleRequire(filepath, false);
34
34
  return module;
35
35
  } catch (e) {
36
- monitors.error(`Load ${filepath} bundle failed, error = %s`, e instanceof Error ? e.stack || e.message : e);
36
+ if (monitors) monitors.error(`Load ${filepath} bundle failed, error = %s`, e instanceof Error ? e.stack || e.message : e);
37
+ else console.error(`Load ${filepath} bundle failed, error = ${e instanceof Error ? e.stack || e.message : e}`);
37
38
  return;
38
39
  }
39
40
  };
@@ -120,7 +121,7 @@ const injectResourcePlugin = ()=>({
120
121
  let htmlTemplatePromise;
121
122
  let manifestPromise;
122
123
  if (isProd()) {
123
- manifestPromise = getServerManifest(pwd, routes || [], console);
124
+ manifestPromise = getServerManifest(pwd, routes || [], void 0);
124
125
  htmlTemplatePromise = getHtmlTemplates(pwd, routes || []);
125
126
  }
126
127
  middlewares.push({
package/dist/esm/plugins/render/csrRscRender.mjs CHANGED
@@ -34,9 +34,6 @@ const csrRscRender = async (req, options)=>{
34
34
  if (!renderRscStreamHandler) return new Response('Cannot find render handler for RSC', {
35
35
  status: 500
36
36
  });
37
- if (!rscClientManifest) return new Response('Cannot find rsc client manifest', {
38
- status: 500
39
- });
40
37
  const response = await renderRscStreamHandler(req, requestHandlerOptions);
41
38
  return response;
42
39
  };
package/dist/esm/plugins/render/render.mjs CHANGED
@@ -213,8 +213,8 @@ function injectFallbackReasonToHtml({ html, reason, framework }) {
213
213
  return html.replace(/<\/head>/, `${tag}</head>`);
214
214
  }
215
215
  async function csrRender(request, options) {
216
- const { html, rscClientManifest } = options;
217
- if (!rscClientManifest || process.env.MODERN_DISABLE_INJECT_RSC_DATA || !options.routeInfo.isRSC) return new Response(html, {
216
+ const { html } = options;
217
+ if (process.env.MODERN_DISABLE_INJECT_RSC_DATA || !options.routeInfo.isRSC) return new Response(html, {
218
218
  status: 200,
219
219
  headers: new Headers({
220
220
  'content-type': 'text/html; charset=UTF-8',
package/dist/esm/plugins/render/renderRscHandler.mjs CHANGED
@@ -33,9 +33,6 @@ const renderRscHandler = async (req, options)=>{
33
33
  if (!rscPayloadHandler) return new Response('Cannot find request handler for RSC', {
34
34
  status: 500
35
35
  });
36
- if (!rscClientManifest) return new Response('Cannot find rsc client manifest', {
37
- status: 500
38
- });
39
36
  return rscPayloadHandler(req, requestHandlerOptions);
40
37
  };
41
38
  export { renderRscHandler };
package/dist/esm/plugins/render/serverActionHandler.mjs CHANGED
@@ -8,11 +8,6 @@ const serverActionHandler = async (req, { serverManifest, routeInfo, rscClientMa
8
8
  if (!handleAction) return new Response('Cannot find server action handler', {
9
9
  status: 500
10
10
  });
11
- if (!rscClientManifest) return new Response('Cannot find rsc client manifest', {
12
- status: 500
13
- });
14
- return handleAction(req, {
15
- clientManifest: rscClientManifest
16
- });
11
+ return handleAction(req);
17
12
  };
18
13
  export { serverActionHandler };
package/dist/esm-node/adapters/node/plugins/resource.mjs CHANGED
@@ -34,7 +34,8 @@ const loadBundle = async (filepath, monitors)=>{
34
34
  const module = await compatibleRequire(filepath, false);
35
35
  return module;
36
36
  } catch (e) {
37
- monitors.error(`Load ${filepath} bundle failed, error = %s`, e instanceof Error ? e.stack || e.message : e);
37
+ if (monitors) monitors.error(`Load ${filepath} bundle failed, error = %s`, e instanceof Error ? e.stack || e.message : e);
38
+ else console.error(`Load ${filepath} bundle failed, error = ${e instanceof Error ? e.stack || e.message : e}`);
38
39
  return;
39
40
  }
40
41
  };
@@ -121,7 +122,7 @@ const injectResourcePlugin = ()=>({
121
122
  let htmlTemplatePromise;
122
123
  let manifestPromise;
123
124
  if (isProd()) {
124
- manifestPromise = getServerManifest(pwd, routes || [], console);
125
+ manifestPromise = getServerManifest(pwd, routes || [], void 0);
125
126
  htmlTemplatePromise = getHtmlTemplates(pwd, routes || []);
126
127
  }
127
128
  middlewares.push({
package/dist/esm-node/plugins/render/csrRscRender.mjs CHANGED
@@ -35,9 +35,6 @@ const csrRscRender = async (req, options)=>{
35
35
  if (!renderRscStreamHandler) return new Response('Cannot find render handler for RSC', {
36
36
  status: 500
37
37
  });
38
- if (!rscClientManifest) return new Response('Cannot find rsc client manifest', {
39
- status: 500
40
- });
41
38
  const response = await renderRscStreamHandler(req, requestHandlerOptions);
42
39
  return response;
43
40
  };
package/dist/esm-node/plugins/render/render.mjs CHANGED
@@ -214,8 +214,8 @@ function injectFallbackReasonToHtml({ html, reason, framework }) {
214
214
  return html.replace(/<\/head>/, `${tag}</head>`);
215
215
  }
216
216
  async function csrRender(request, options) {
217
- const { html, rscClientManifest } = options;
218
- if (!rscClientManifest || process.env.MODERN_DISABLE_INJECT_RSC_DATA || !options.routeInfo.isRSC) return new Response(html, {
217
+ const { html } = options;
218
+ if (process.env.MODERN_DISABLE_INJECT_RSC_DATA || !options.routeInfo.isRSC) return new Response(html, {
219
219
  status: 200,
220
220
  headers: new Headers({
221
221
  'content-type': 'text/html; charset=UTF-8',
package/dist/esm-node/plugins/render/renderRscHandler.mjs CHANGED
@@ -34,9 +34,6 @@ const renderRscHandler = async (req, options)=>{
34
34
  if (!rscPayloadHandler) return new Response('Cannot find request handler for RSC', {
35
35
  status: 500
36
36
  });
37
- if (!rscClientManifest) return new Response('Cannot find rsc client manifest', {
38
- status: 500
39
- });
40
37
  return rscPayloadHandler(req, requestHandlerOptions);
41
38
  };
42
39
  export { renderRscHandler };
package/dist/esm-node/plugins/render/serverActionHandler.mjs CHANGED
@@ -9,11 +9,6 @@ const serverActionHandler = async (req, { serverManifest, routeInfo, rscClientMa
9
9
  if (!handleAction) return new Response('Cannot find server action handler', {
10
10
  status: 500
11
11
  });
12
- if (!rscClientManifest) return new Response('Cannot find rsc client manifest', {
13
- status: 500
14
- });
15
- return handleAction(req, {
16
- clientManifest: rscClientManifest
17
- });
12
+ return handleAction(req);
18
13
  };
19
14
  export { serverActionHandler };
package/dist/types/adapters/node/plugins/resource.d.ts CHANGED
@@ -2,7 +2,7 @@ import type { Monitors, ServerRoute } from '@modern-js/types';
2
2
  import type { Middleware, ServerEnv, ServerManifest, ServerPlugin } from '../../../types';
3
3
  export declare function getHtmlTemplates(pwd: string, routes: ServerRoute[]): Promise<Record<string, string>>;
4
4
  export declare function injectTemplates(pwd: string, routes?: ServerRoute[], htmlTemplatePromise?: ReturnType<typeof getHtmlTemplates>): Middleware<ServerEnv>;
5
- export declare function getServerManifest(pwd: string, routes: ServerRoute[], monitors: Monitors): Promise<ServerManifest>;
5
+ export declare function getServerManifest(pwd: string, routes: ServerRoute[], monitors?: Monitors): Promise<ServerManifest>;
6
6
  export declare function injectServerManifest(pwd: string, routes?: ServerRoute[], manifestPromise?: Promise<ServerManifest>): Middleware<ServerEnv>;
7
7
  export declare function getRscServerManifest(pwd: string): Promise<any>;
8
8
  export declare function getClientManifest(pwd: string): Promise<any>;
package/dist/types/types/server.d.ts CHANGED
@@ -22,9 +22,7 @@ export type RscPayloadHandlerOptions = Omit<RequestHandlerOptions, 'resource'> &
22
22
  };
23
23
  type ServerRenderBundle = {
24
24
  requestHandler?: Promise<BundleRequestHandler>;
25
- handleAction?: (req: Request, options: {
26
- clientManifest: RscClientManifest;
27
- }) => Promise<Response>;
25
+ handleAction?: (req: Request) => Promise<Response>;
28
26
  rscPayloadHandler?: (req: Request, options: RscPayloadHandlerOptions) => Promise<Response>;
29
27
  renderRscStreamHandler?: (req: Request, options: RscPayloadHandlerOptions) => Promise<Response>;
30
28
  };
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "3.0.1",
18
+ "version": "3.0.2",
19
19
  "types": "./dist/types/index.d.ts",
20
20
  "main": "./dist/cjs/index.js",
21
21
  "exports": {
@@ -71,19 +71,19 @@
71
71
  "flatted": "^3.3.3",
72
72
  "hono": "^4.11.7",
73
73
  "ts-deepmerge": "7.0.3",
74
- "@modern-js/plugin": "3.0.1",
75
- "@modern-js/runtime-utils": "3.0.1",
76
- "@modern-js/utils": "3.0.1"
74
+ "@modern-js/plugin": "3.0.2",
75
+ "@modern-js/utils": "3.0.2",
76
+ "@modern-js/runtime-utils": "3.0.2"
77
77
  },
78
78
  "devDependencies": {
79
- "@rslib/core": "0.19.4",
79
+ "@rslib/core": "0.19.5",
80
80
  "@types/cloneable-readable": "^2.0.3",
81
81
  "@types/merge-deep": "^3.0.3",
82
82
  "@types/node": "^20",
83
83
  "http-proxy-middleware": "^2.0.9",
84
84
  "typescript": "^5",
85
85
  "@modern-js/rslib": "2.68.10",
86
- "@modern-js/types": "3.0.1",
86
+ "@modern-js/types": "3.0.2",
87
87
  "@scripts/rstest-config": "2.66.0"
88
88
  },
89
89
  "sideEffects": false,