@modern-js/server-core 2.47.1-alpha.0 → 2.48.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 (142) hide show
  1. package/dist/cjs/index.js +4 -6
  2. package/dist/cjs/{core/loadPlugins.js → loadPlugins.js} +1 -1
  3. package/dist/cjs/{core/plugin.js → plugin.js} +3 -1
  4. package/dist/esm/index.js +2 -3
  5. package/dist/esm/{core/loadPlugins.js → loadPlugins.js} +1 -1
  6. package/dist/esm/{core/plugin.js → plugin.js} +3 -1
  7. package/dist/types/index.d.ts +2 -3
  8. package/dist/types/{core/loadPlugins.d.ts → loadPlugins.d.ts} +1 -1
  9. package/dist/types/{core/plugin.d.ts → plugin.d.ts} +35 -32
  10. package/package.json +6 -29
  11. package/dist/cjs/base/adapters/node/bff.js +0 -69
  12. package/dist/cjs/base/adapters/node/hono.js +0 -62
  13. package/dist/cjs/base/adapters/node/index.js +0 -32
  14. package/dist/cjs/base/adapters/node/loadServer.js +0 -56
  15. package/dist/cjs/base/adapters/node/middlewares/index.js +0 -26
  16. package/dist/cjs/base/adapters/node/middlewares/mock.js +0 -113
  17. package/dist/cjs/base/adapters/node/middlewares/serverStatic.js +0 -105
  18. package/dist/cjs/base/adapters/node/middlewares/templates.js +0 -65
  19. package/dist/cjs/base/adapters/node/node.js +0 -121
  20. package/dist/cjs/base/adapters/node/polyfills/index.js +0 -24
  21. package/dist/cjs/base/adapters/node/polyfills/install.js +0 -57
  22. package/dist/cjs/base/adapters/node/polyfills/stream.js +0 -159
  23. package/dist/cjs/base/constants.js +0 -55
  24. package/dist/cjs/base/index.js +0 -73
  25. package/dist/cjs/base/middlewares/customServer/base.js +0 -115
  26. package/dist/cjs/base/middlewares/customServer/context.js +0 -78
  27. package/dist/cjs/base/middlewares/customServer/index.js +0 -138
  28. package/dist/cjs/base/middlewares/customServer/routerApi.js +0 -48
  29. package/dist/cjs/base/middlewares/customServer/template.js +0 -60
  30. package/dist/cjs/base/middlewares/dataHandler.js +0 -69
  31. package/dist/cjs/base/middlewares/faviconFallback.js +0 -34
  32. package/dist/cjs/base/middlewares/index.js +0 -28
  33. package/dist/cjs/base/middlewares/monitor.js +0 -75
  34. package/dist/cjs/base/middlewares/renderHandler/index.js +0 -92
  35. package/dist/cjs/base/middlewares/renderHandler/render.js +0 -90
  36. package/dist/cjs/base/middlewares/renderHandler/serverTiming.js +0 -43
  37. package/dist/cjs/base/middlewares/renderHandler/ssrCache.js +0 -173
  38. package/dist/cjs/base/middlewares/renderHandler/ssrRender.js +0 -183
  39. package/dist/cjs/base/serverBase.js +0 -167
  40. package/dist/cjs/base/utils/debug.js +0 -29
  41. package/dist/cjs/base/utils/entry.js +0 -30
  42. package/dist/cjs/base/utils/env.js +0 -45
  43. package/dist/cjs/base/utils/error.js +0 -65
  44. package/dist/cjs/base/utils/index.js +0 -40
  45. package/dist/cjs/base/utils/middlewareCollector.js +0 -54
  46. package/dist/cjs/base/utils/path.js +0 -46
  47. package/dist/cjs/base/utils/request.js +0 -65
  48. package/dist/cjs/base/utils/serverConfig.js +0 -71
  49. package/dist/cjs/base/utils/transformStream.js +0 -38
  50. package/dist/cjs/base/utils/warmup.js +0 -43
  51. package/dist/cjs/core/hono.js +0 -16
  52. package/dist/cjs/core/index.js +0 -24
  53. package/dist/cjs/core/render.js +0 -16
  54. package/dist/cjs/core/server.js +0 -22
  55. package/dist/esm/base/adapters/node/bff.js +0 -45
  56. package/dist/esm/base/adapters/node/hono.js +0 -37
  57. package/dist/esm/base/adapters/node/index.js +0 -6
  58. package/dist/esm/base/adapters/node/loadServer.js +0 -22
  59. package/dist/esm/base/adapters/node/middlewares/index.js +0 -3
  60. package/dist/esm/base/adapters/node/middlewares/mock.js +0 -79
  61. package/dist/esm/base/adapters/node/middlewares/serverStatic.js +0 -71
  62. package/dist/esm/base/adapters/node/middlewares/templates.js +0 -31
  63. package/dist/esm/base/adapters/node/node.js +0 -95
  64. package/dist/esm/base/adapters/node/polyfills/index.js +0 -2
  65. package/dist/esm/base/adapters/node/polyfills/install.js +0 -33
  66. package/dist/esm/base/adapters/node/polyfills/stream.js +0 -132
  67. package/dist/esm/base/constants.js +0 -29
  68. package/dist/esm/base/index.js +0 -32
  69. package/dist/esm/base/middlewares/customServer/base.js +0 -91
  70. package/dist/esm/base/middlewares/customServer/context.js +0 -51
  71. package/dist/esm/base/middlewares/customServer/index.js +0 -114
  72. package/dist/esm/base/middlewares/customServer/routerApi.js +0 -24
  73. package/dist/esm/base/middlewares/customServer/template.js +0 -36
  74. package/dist/esm/base/middlewares/dataHandler.js +0 -35
  75. package/dist/esm/base/middlewares/faviconFallback.js +0 -10
  76. package/dist/esm/base/middlewares/index.js +0 -4
  77. package/dist/esm/base/middlewares/monitor.js +0 -49
  78. package/dist/esm/base/middlewares/renderHandler/index.js +0 -67
  79. package/dist/esm/base/middlewares/renderHandler/render.js +0 -66
  80. package/dist/esm/base/middlewares/renderHandler/serverTiming.js +0 -19
  81. package/dist/esm/base/middlewares/renderHandler/ssrCache.js +0 -149
  82. package/dist/esm/base/middlewares/renderHandler/ssrRender.js +0 -149
  83. package/dist/esm/base/serverBase.js +0 -143
  84. package/dist/esm/base/utils/debug.js +0 -5
  85. package/dist/esm/base/utils/entry.js +0 -6
  86. package/dist/esm/base/utils/env.js +0 -20
  87. package/dist/esm/base/utils/error.js +0 -41
  88. package/dist/esm/base/utils/index.js +0 -10
  89. package/dist/esm/base/utils/middlewareCollector.js +0 -29
  90. package/dist/esm/base/utils/path.js +0 -12
  91. package/dist/esm/base/utils/request.js +0 -38
  92. package/dist/esm/base/utils/serverConfig.js +0 -35
  93. package/dist/esm/base/utils/transformStream.js +0 -14
  94. package/dist/esm/base/utils/warmup.js +0 -9
  95. package/dist/esm/core/hono.js +0 -0
  96. package/dist/esm/core/index.js +0 -2
  97. package/dist/esm/core/render.js +0 -0
  98. package/dist/esm/core/server.js +0 -1
  99. package/dist/types/base/adapters/node/bff.d.ts +0 -4
  100. package/dist/types/base/adapters/node/hono.d.ts +0 -30
  101. package/dist/types/base/adapters/node/index.d.ts +0 -6
  102. package/dist/types/base/adapters/node/loadServer.d.ts +0 -3
  103. package/dist/types/base/adapters/node/middlewares/index.d.ts +0 -3
  104. package/dist/types/base/adapters/node/middlewares/mock.d.ts +0 -5
  105. package/dist/types/base/adapters/node/middlewares/serverStatic.d.ts +0 -9
  106. package/dist/types/base/adapters/node/middlewares/templates.d.ts +0 -3
  107. package/dist/types/base/adapters/node/node.d.ts +0 -12
  108. package/dist/types/base/adapters/node/polyfills/index.d.ts +0 -2
  109. package/dist/types/base/adapters/node/polyfills/install.d.ts +0 -1
  110. package/dist/types/base/adapters/node/polyfills/stream.d.ts +0 -18
  111. package/dist/types/base/constants.d.ts +0 -23
  112. package/dist/types/base/index.d.ts +0 -9
  113. package/dist/types/base/middlewares/customServer/base.d.ts +0 -3
  114. package/dist/types/base/middlewares/customServer/context.d.ts +0 -7
  115. package/dist/types/base/middlewares/customServer/index.d.ts +0 -13
  116. package/dist/types/base/middlewares/customServer/routerApi.d.ts +0 -9
  117. package/dist/types/base/middlewares/customServer/template.d.ts +0 -11
  118. package/dist/types/base/middlewares/dataHandler.d.ts +0 -3
  119. package/dist/types/base/middlewares/faviconFallback.d.ts +0 -2
  120. package/dist/types/base/middlewares/index.d.ts +0 -4
  121. package/dist/types/base/middlewares/monitor.d.ts +0 -7
  122. package/dist/types/base/middlewares/renderHandler/index.d.ts +0 -9
  123. package/dist/types/base/middlewares/renderHandler/render.d.ts +0 -12
  124. package/dist/types/base/middlewares/renderHandler/serverTiming.d.ts +0 -7
  125. package/dist/types/base/middlewares/renderHandler/ssrCache.d.ts +0 -17
  126. package/dist/types/base/middlewares/renderHandler/ssrRender.d.ts +0 -18
  127. package/dist/types/base/serverBase.d.ts +0 -49
  128. package/dist/types/base/utils/debug.d.ts +0 -1
  129. package/dist/types/base/utils/entry.d.ts +0 -2
  130. package/dist/types/base/utils/env.d.ts +0 -2
  131. package/dist/types/base/utils/error.d.ts +0 -1
  132. package/dist/types/base/utils/index.d.ts +0 -10
  133. package/dist/types/base/utils/middlewareCollector.d.ts +0 -12
  134. package/dist/types/base/utils/path.d.ts +0 -3
  135. package/dist/types/base/utils/request.d.ts +0 -12
  136. package/dist/types/base/utils/serverConfig.d.ts +0 -14
  137. package/dist/types/base/utils/transformStream.d.ts +0 -2
  138. package/dist/types/base/utils/warmup.d.ts +0 -1
  139. package/dist/types/core/hono.d.ts +0 -1
  140. package/dist/types/core/index.d.ts +0 -2
  141. package/dist/types/core/render.d.ts +0 -11
  142. package/dist/types/core/server.d.ts +0 -71
package/dist/cjs/index.js CHANGED
@@ -15,16 +15,14 @@ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "defau
15
15
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
16
16
  var src_exports = {};
17
17
  module.exports = __toCommonJS(src_exports);
18
- __reExport(src_exports, require("./core/plugin"), module.exports);
19
- __reExport(src_exports, require("./core/render"), module.exports);
18
+ __reExport(src_exports, require("./plugin"), module.exports);
20
19
  __reExport(src_exports, require("@modern-js/plugin"), module.exports);
21
- __reExport(src_exports, require("./core/loadPlugins"), module.exports);
20
+ __reExport(src_exports, require("./loadPlugins"), module.exports);
22
21
  __reExport(src_exports, require("./types/config"), module.exports);
23
22
  // Annotate the CommonJS export names for ESM import in node:
24
23
  0 && (module.exports = {
25
- ...require("./core/plugin"),
26
- ...require("./core/render"),
24
+ ...require("./plugin"),
27
25
  ...require("@modern-js/plugin"),
28
- ...require("./core/loadPlugins"),
26
+ ...require("./loadPlugins"),
29
27
  ...require("./types/config")
30
28
  });
@@ -22,7 +22,7 @@ __export(loadPlugins_exports, {
22
22
  });
23
23
  module.exports = __toCommonJS(loadPlugins_exports);
24
24
  var import_utils = require("@modern-js/utils");
25
- var import_plugin = require("../core/plugin");
25
+ var import_plugin = require("./plugin");
26
26
  const resolvePlugin = (p, appDirectory) => {
27
27
  const isPluginInstance = typeof p !== "string";
28
28
  if (isPluginInstance) {
@@ -35,9 +35,10 @@ const prepare = (0, import_plugin.createWaterfall)();
35
35
  const prepareLoaderHandler = (0, import_plugin.createAsyncPipeline)();
36
36
  const prepareWebServer = (0, import_plugin.createAsyncPipeline)();
37
37
  const prepareApiServer = (0, import_plugin.createAsyncPipeline)();
38
- const onApiChange = (0, import_plugin.createAsyncWaterfall)();
38
+ const onApiChange = (0, import_plugin.createWaterfall)();
39
39
  const repack = (0, import_plugin.createWaterfall)();
40
40
  const beforeServerInit = (0, import_plugin.createAsyncWaterfall)();
41
+ const afterServerInit = (0, import_plugin.createAsyncWaterfall)();
41
42
  const setupCompiler = (0, import_plugin.createParallelWorkflow)();
42
43
  const beforeRouteSet = (0, import_plugin.createAsyncPipeline)();
43
44
  const afterRouteSet = (0, import_plugin.createAsyncPipeline)();
@@ -81,6 +82,7 @@ const serverHooks = {
81
82
  repack,
82
83
  onApiChange,
83
84
  beforeServerInit,
85
+ afterServerInit,
84
86
  setupCompiler,
85
87
  beforeRouteSet,
86
88
  afterRouteSet,
package/dist/esm/index.js CHANGED
@@ -1,5 +1,4 @@
1
- export * from "./core/plugin";
2
- export * from "./core/render";
1
+ export * from "./plugin";
3
2
  export * from "@modern-js/plugin";
4
- export * from "./core/loadPlugins";
3
+ export * from "./loadPlugins";
5
4
  export * from "./types/config";
@@ -1,5 +1,5 @@
1
1
  import { compatRequire, getInternalPlugins, tryResolve } from "@modern-js/utils";
2
- import { createPlugin } from "../core/plugin";
2
+ import { createPlugin } from "./plugin";
3
3
  const resolvePlugin = (p, appDirectory) => {
4
4
  const isPluginInstance = typeof p !== "string";
5
5
  if (isPluginInstance) {
@@ -5,9 +5,10 @@ const prepare = createWaterfall();
5
5
  const prepareLoaderHandler = createAsyncPipeline();
6
6
  const prepareWebServer = createAsyncPipeline();
7
7
  const prepareApiServer = createAsyncPipeline();
8
- const onApiChange = createAsyncWaterfall();
8
+ const onApiChange = createWaterfall();
9
9
  const repack = createWaterfall();
10
10
  const beforeServerInit = createAsyncWaterfall();
11
+ const afterServerInit = createAsyncWaterfall();
11
12
  const setupCompiler = createParallelWorkflow();
12
13
  const beforeRouteSet = createAsyncPipeline();
13
14
  const afterRouteSet = createAsyncPipeline();
@@ -51,6 +52,7 @@ const serverHooks = {
51
52
  repack,
52
53
  onApiChange,
53
54
  beforeServerInit,
55
+ afterServerInit,
54
56
  setupCompiler,
55
57
  beforeRouteSet,
56
58
  afterRouteSet,
@@ -1,5 +1,4 @@
1
- export * from './core/plugin';
2
- export * from './core/render';
1
+ export * from './plugin';
3
2
  export * from '@modern-js/plugin';
4
- export * from './core/loadPlugins';
3
+ export * from './loadPlugins';
5
4
  export * from './types/config';
@@ -1,5 +1,5 @@
1
1
  import { InternalPlugins } from '@modern-js/types';
2
- import { createPlugin, ServerPlugin } from '../core/plugin';
2
+ import { createPlugin, ServerPlugin } from './plugin';
3
3
  export declare const loadPlugins: (appDirectory: string, configPlugins: ServerPlugin[], options: {
4
4
  internalPlugins?: InternalPlugins;
5
5
  }) => ReturnType<typeof createPlugin>[];
@@ -1,15 +1,13 @@
1
1
  /// <reference types="node" />
2
- import type { IncomingMessage, ServerResponse } from 'node:http';
2
+ /// <reference types="node" />
3
+ import { IncomingMessage, ServerResponse } from 'http';
4
+ import { Readable } from 'stream';
3
5
  import type { Component } from 'react';
4
- import { CommonAPI, ToThreads, AsyncSetup, PluginOptions, ToRunners } from '@modern-js/plugin';
6
+ import { CommonAPI, ToThreads, AsyncSetup, PluginOptions } from '@modern-js/plugin';
5
7
  import type { ModernServerContext, BaseSSRServerContext, AfterMatchContext, AfterRenderContext, MiddlewareContext, ISAppContext, ServerRoute, HttpMethodDecider, ServerInitHookContext, AfterStreamingRenderContext } from '@modern-js/types';
6
- import type { BffUserConfig, ServerOptions, UserConfig } from '../types/config';
7
- import { HonoMiddleware } from './hono';
8
- import { Render } from './render';
8
+ import type { BffUserConfig, ServerOptions, UserConfig } from './types/config';
9
9
  export type WebAdapter = (ctx: MiddlewareContext) => void | Promise<void>;
10
- export type NodeRequest = IncomingMessage;
11
- export type NodeResponse = ServerResponse;
12
- export type Adapter = (req: NodeRequest, res: NodeResponse) => void | Promise<void>;
10
+ export type Adapter = (req: IncomingMessage, res: ServerResponse) => void | Promise<void>;
13
11
  export type WebServerStartInput = {
14
12
  pwd: string;
15
13
  config: Record<string, any>;
@@ -22,7 +20,7 @@ export type APIServerStartInput = {
22
20
  config?: {
23
21
  middleware?: Array<any>;
24
22
  };
25
- render?: Render | null;
23
+ render?: (req: IncomingMessage, res: ServerResponse, url?: string) => Promise<string | Readable | null>;
26
24
  };
27
25
  type Change = {
28
26
  filename: string;
@@ -61,11 +59,12 @@ declare const serverHooks: {
61
59
  serverRoutes: ServerRoute[];
62
60
  distDir: string;
63
61
  }, LoaderHandler>;
64
- prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter | null>;
65
- prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, HonoMiddleware>;
62
+ prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter>;
63
+ prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
66
64
  repack: import("@modern-js/plugin").Waterfall<void>;
67
- onApiChange: import("@modern-js/plugin").AsyncWaterfall<Change[]>;
65
+ onApiChange: import("@modern-js/plugin").Waterfall<Change[]>;
68
66
  beforeServerInit: import("@modern-js/plugin").AsyncWaterfall<ServerInitHookContext>;
67
+ afterServerInit: import("@modern-js/plugin").AsyncWaterfall<ServerInitHookContext>;
69
68
  setupCompiler: import("@modern-js/plugin").ParallelWorkflow<Record<string, unknown>, any[]>;
70
69
  beforeRouteSet: import("@modern-js/plugin").AsyncPipeline<Route[], Route[]>;
71
70
  afterRouteSet: import("@modern-js/plugin").AsyncPipeline<unknown, unknown>;
@@ -112,8 +111,6 @@ declare const serverHooks: {
112
111
  export type ServerHooks = typeof serverHooks;
113
112
  /** All hook callbacks of server plugin. */
114
113
  export type ServerHookCallbacks = ToThreads<ServerHooks>;
115
- /** The ServerHook Runner type */
116
- export type ServerHookRunner = ToRunners<ServerHooks>;
117
114
  /** All apis for server plugin. */
118
115
  export type PluginAPI = typeof pluginAPI & CommonAPI<ServerHooks>;
119
116
  export declare const createServerManager: () => import("@modern-js/plugin").AsyncManager<{
@@ -127,11 +124,12 @@ export declare const createServerManager: () => import("@modern-js/plugin").Asyn
127
124
  serverRoutes: ServerRoute[];
128
125
  distDir: string;
129
126
  }, LoaderHandler>;
130
- prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter | null>;
131
- prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, HonoMiddleware>;
127
+ prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter>;
128
+ prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
132
129
  repack: import("@modern-js/plugin").Waterfall<void>;
133
- onApiChange: import("@modern-js/plugin").AsyncWaterfall<Change[]>;
130
+ onApiChange: import("@modern-js/plugin").Waterfall<Change[]>;
134
131
  beforeServerInit: import("@modern-js/plugin").AsyncWaterfall<ServerInitHookContext>;
132
+ afterServerInit: import("@modern-js/plugin").AsyncWaterfall<ServerInitHookContext>;
135
133
  setupCompiler: import("@modern-js/plugin").ParallelWorkflow<Record<string, unknown>, any[]>;
136
134
  beforeRouteSet: import("@modern-js/plugin").AsyncPipeline<Route[], Route[]>;
137
135
  afterRouteSet: import("@modern-js/plugin").AsyncPipeline<unknown, unknown>;
@@ -189,11 +187,12 @@ export declare const serverManager: import("@modern-js/plugin").AsyncManager<{
189
187
  serverRoutes: ServerRoute[];
190
188
  distDir: string;
191
189
  }, LoaderHandler>;
192
- prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter | null>;
193
- prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, HonoMiddleware>;
190
+ prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter>;
191
+ prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
194
192
  repack: import("@modern-js/plugin").Waterfall<void>;
195
- onApiChange: import("@modern-js/plugin").AsyncWaterfall<Change[]>;
193
+ onApiChange: import("@modern-js/plugin").Waterfall<Change[]>;
196
194
  beforeServerInit: import("@modern-js/plugin").AsyncWaterfall<ServerInitHookContext>;
195
+ afterServerInit: import("@modern-js/plugin").AsyncWaterfall<ServerInitHookContext>;
197
196
  setupCompiler: import("@modern-js/plugin").ParallelWorkflow<Record<string, unknown>, any[]>;
198
197
  beforeRouteSet: import("@modern-js/plugin").AsyncPipeline<Route[], Route[]>;
199
198
  afterRouteSet: import("@modern-js/plugin").AsyncPipeline<unknown, unknown>;
@@ -257,11 +256,12 @@ export declare const createPlugin: (setup?: AsyncSetup<{
257
256
  serverRoutes: ServerRoute[];
258
257
  distDir: string;
259
258
  }, LoaderHandler>;
260
- prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter | null>;
261
- prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, HonoMiddleware>;
259
+ prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter>;
260
+ prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
262
261
  repack: import("@modern-js/plugin").Waterfall<void>;
263
- onApiChange: import("@modern-js/plugin").AsyncWaterfall<Change[]>;
262
+ onApiChange: import("@modern-js/plugin").Waterfall<Change[]>;
264
263
  beforeServerInit: import("@modern-js/plugin").AsyncWaterfall<ServerInitHookContext>;
264
+ afterServerInit: import("@modern-js/plugin").AsyncWaterfall<ServerInitHookContext>;
265
265
  setupCompiler: import("@modern-js/plugin").ParallelWorkflow<Record<string, unknown>, any[]>;
266
266
  beforeRouteSet: import("@modern-js/plugin").AsyncPipeline<Route[], Route[]>;
267
267
  afterRouteSet: import("@modern-js/plugin").AsyncPipeline<unknown, unknown>;
@@ -318,11 +318,12 @@ export declare const createPlugin: (setup?: AsyncSetup<{
318
318
  serverRoutes: ServerRoute[];
319
319
  distDir: string;
320
320
  }, LoaderHandler>;
321
- prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter | null>;
322
- prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, HonoMiddleware>;
321
+ prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter>;
322
+ prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
323
323
  repack: import("@modern-js/plugin").Waterfall<void>;
324
- onApiChange: import("@modern-js/plugin").AsyncWaterfall<Change[]>;
324
+ onApiChange: import("@modern-js/plugin").Waterfall<Change[]>;
325
325
  beforeServerInit: import("@modern-js/plugin").AsyncWaterfall<ServerInitHookContext>;
326
+ afterServerInit: import("@modern-js/plugin").AsyncWaterfall<ServerInitHookContext>;
326
327
  setupCompiler: import("@modern-js/plugin").ParallelWorkflow<Record<string, unknown>, any[]>;
327
328
  beforeRouteSet: import("@modern-js/plugin").AsyncPipeline<Route[], Route[]>;
328
329
  afterRouteSet: import("@modern-js/plugin").AsyncPipeline<unknown, unknown>;
@@ -375,11 +376,12 @@ export declare const createPlugin: (setup?: AsyncSetup<{
375
376
  serverRoutes: ServerRoute[];
376
377
  distDir: string;
377
378
  }, LoaderHandler>;
378
- prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter | null>;
379
- prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, HonoMiddleware>;
379
+ prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter>;
380
+ prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
380
381
  repack: import("@modern-js/plugin").Waterfall<void>;
381
- onApiChange: import("@modern-js/plugin").AsyncWaterfall<Change[]>;
382
+ onApiChange: import("@modern-js/plugin").Waterfall<Change[]>;
382
383
  beforeServerInit: import("@modern-js/plugin").AsyncWaterfall<ServerInitHookContext>;
384
+ afterServerInit: import("@modern-js/plugin").AsyncWaterfall<ServerInitHookContext>;
383
385
  setupCompiler: import("@modern-js/plugin").ParallelWorkflow<Record<string, unknown>, any[]>;
384
386
  beforeRouteSet: import("@modern-js/plugin").AsyncPipeline<Route[], Route[]>;
385
387
  afterRouteSet: import("@modern-js/plugin").AsyncPipeline<unknown, unknown>;
@@ -436,11 +438,12 @@ export declare const createPlugin: (setup?: AsyncSetup<{
436
438
  serverRoutes: ServerRoute[];
437
439
  distDir: string;
438
440
  }, LoaderHandler>;
439
- prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter | null>;
440
- prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, HonoMiddleware>;
441
+ prepareWebServer: import("@modern-js/plugin").AsyncPipeline<WebServerStartInput, WebAdapter>;
442
+ prepareApiServer: import("@modern-js/plugin").AsyncPipeline<APIServerStartInput, Adapter>;
441
443
  repack: import("@modern-js/plugin").Waterfall<void>;
442
- onApiChange: import("@modern-js/plugin").AsyncWaterfall<Change[]>;
444
+ onApiChange: import("@modern-js/plugin").Waterfall<Change[]>;
443
445
  beforeServerInit: import("@modern-js/plugin").AsyncWaterfall<ServerInitHookContext>;
446
+ afterServerInit: import("@modern-js/plugin").AsyncWaterfall<ServerInitHookContext>;
444
447
  setupCompiler: import("@modern-js/plugin").ParallelWorkflow<Record<string, unknown>, any[]>;
445
448
  beforeRouteSet: import("@modern-js/plugin").AsyncPipeline<Route[], Route[]>;
446
449
  afterRouteSet: import("@modern-js/plugin").AsyncPipeline<unknown, unknown>;
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "2.47.1-alpha.0",
18
+ "version": "2.48.0",
19
19
  "jsnext:source": "./src/index.ts",
20
20
  "types": "./dist/types/index.d.ts",
21
21
  "main": "./dist/cjs/index.js",
@@ -29,46 +29,23 @@
29
29
  "require": "./dist/cjs/index.js"
30
30
  },
31
31
  "default": "./dist/cjs/index.js"
32
- },
33
- "./base": {
34
- "types": "./dist/types/base/index.d.ts",
35
- "jsnext:source": "./src/base/index.ts",
36
- "default": "./dist/cjs/base/index.js"
37
- }
38
- },
39
- "typesVersions": {
40
- "*": {
41
- ".": [
42
- "./dist/types/index.d.ts"
43
- ],
44
- "base": [
45
- "./dist/types/base/index.d.ts"
46
- ]
47
32
  }
48
33
  },
49
34
  "dependencies": {
50
35
  "@swc/helpers": "0.5.3",
51
- "path-browserify": "1.0.1",
52
- "@web-std/fetch": "^4.2.1",
53
- "@web-std/stream": "^1.0.3",
54
- "hono": "^3.12.2",
55
- "isbot": "3.8.0",
56
- "merge-deep": "^3.0.3",
57
- "@modern-js/plugin": "2.47.0",
58
- "@modern-js/runtime-utils": "2.47.0",
59
- "@modern-js/utils": "2.47.0"
36
+ "@modern-js/plugin": "2.48.0",
37
+ "@modern-js/utils": "2.48.0"
60
38
  },
61
39
  "devDependencies": {
62
40
  "@types/jest": "^29",
63
- "@types/merge-deep": "^3.0.0",
64
41
  "@types/node": "^14",
65
42
  "http-proxy-middleware": "^2.0.4",
66
43
  "jest": "^29",
67
44
  "ts-jest": "^29.1.0",
68
45
  "typescript": "^5",
69
- "@scripts/build": "2.47.0",
70
- "@modern-js/types": "2.47.0",
71
- "@scripts/jest-config": "2.47.0"
46
+ "@modern-js/types": "2.48.0",
47
+ "@scripts/build": "2.48.0",
48
+ "@scripts/jest-config": "2.48.0"
72
49
  },
73
50
  "sideEffects": false,
74
51
  "publishConfig": {
@@ -1,69 +0,0 @@
1
- "use strict";
2
- var __defProp = Object.defineProperty;
3
- var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
- var __getOwnPropNames = Object.getOwnPropertyNames;
5
- var __hasOwnProp = Object.prototype.hasOwnProperty;
6
- var __export = (target, all) => {
7
- for (var name in all)
8
- __defProp(target, name, { get: all[name], enumerable: true });
9
- };
10
- var __copyProps = (to, from, except, desc) => {
11
- if (from && typeof from === "object" || typeof from === "function") {
12
- for (let key of __getOwnPropNames(from))
13
- if (!__hasOwnProp.call(to, key) && key !== except)
14
- __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
15
- }
16
- return to;
17
- };
18
- var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
19
- var bff_exports = {};
20
- __export(bff_exports, {
21
- bindBFFHandler: () => bindBFFHandler
22
- });
23
- module.exports = __toCommonJS(bff_exports);
24
- var import_utils = require("@modern-js/utils");
25
- var import_middlewares = require("../../../base/middlewares");
26
- var import_utils2 = require("../../utils");
27
- const bindBFFHandler = async (server, options) => {
28
- const prefix = options.config.bff.prefix || "/api";
29
- const { enableHandleWeb } = options.config.bff;
30
- const { httpMethodDecider } = options.config.bff;
31
- const runtimeEnv = (0, import_utils2.getRuntimeEnv)();
32
- if (runtimeEnv !== "node") {
33
- return;
34
- }
35
- const { getMiddlewares, ...collector } = (0, import_utils2.createMiddlewareCollecter)();
36
- const { runner } = server;
37
- await runner.gather(collector);
38
- const webOnly = await (0, import_utils.isWebOnly)();
39
- let handler;
40
- const renderHandler = (0, import_middlewares.getRenderHandler)(options);
41
- if (webOnly) {
42
- handler = async (c, next) => {
43
- c.body("");
44
- await next();
45
- };
46
- } else {
47
- handler = await server.runner.prepareApiServer({
48
- pwd: options.pwd,
49
- prefix,
50
- render: renderHandler,
51
- httpMethodDecider
52
- }, {
53
- onLast: () => null
54
- });
55
- }
56
- if (handler) {
57
- server.all(`*`, (c, next) => {
58
- if (!c.req.path.startsWith(prefix) && !enableHandleWeb) {
59
- return next();
60
- } else {
61
- return handler(c, next);
62
- }
63
- });
64
- }
65
- };
66
- // Annotate the CommonJS export names for ESM import in node:
67
- 0 && (module.exports = {
68
- bindBFFHandler
69
- });
@@ -1,62 +0,0 @@
1
- "use strict";
2
- var __defProp = Object.defineProperty;
3
- var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
- var __getOwnPropNames = Object.getOwnPropertyNames;
5
- var __hasOwnProp = Object.prototype.hasOwnProperty;
6
- var __export = (target, all) => {
7
- for (var name in all)
8
- __defProp(target, name, { get: all[name], enumerable: true });
9
- };
10
- var __copyProps = (to, from, except, desc) => {
11
- if (from && typeof from === "object" || typeof from === "function") {
12
- for (let key of __getOwnPropNames(from))
13
- if (!__hasOwnProp.call(to, key) && key !== except)
14
- __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
15
- }
16
- return to;
17
- };
18
- var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
19
- var hono_exports = {};
20
- __export(hono_exports, {
21
- connectMid2HonoMid: () => connectMid2HonoMid,
22
- httpCallBack2HonoMid: () => httpCallBack2HonoMid
23
- });
24
- module.exports = __toCommonJS(hono_exports);
25
- const httpCallBack2HonoMid = (handler) => {
26
- return async (context, next) => {
27
- const { req, res } = context.env.node;
28
- req.__honoRequest = context.req;
29
- req.__templates = context.get("templates") || {};
30
- await handler(req, res);
31
- if (res.headersSent) {
32
- context.finalized = true;
33
- } else {
34
- await next();
35
- }
36
- };
37
- };
38
- const noop = () => {
39
- };
40
- const connectMid2HonoMid = (handler) => {
41
- return async (context, next) => {
42
- return new Promise((resolve, reject) => {
43
- const { req, res } = context.env.node;
44
- if (handler.length < 3) {
45
- resolve(handler(req, res, noop));
46
- } else {
47
- handler(req, res, (err) => {
48
- if (err) {
49
- reject(err);
50
- } else {
51
- resolve(next());
52
- }
53
- });
54
- }
55
- });
56
- };
57
- };
58
- // Annotate the CommonJS export names for ESM import in node:
59
- 0 && (module.exports = {
60
- connectMid2HonoMid,
61
- httpCallBack2HonoMid
62
- });
@@ -1,32 +0,0 @@
1
- "use strict";
2
- var __defProp = Object.defineProperty;
3
- var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
- var __getOwnPropNames = Object.getOwnPropertyNames;
5
- var __hasOwnProp = Object.prototype.hasOwnProperty;
6
- var __copyProps = (to, from, except, desc) => {
7
- if (from && typeof from === "object" || typeof from === "function") {
8
- for (let key of __getOwnPropNames(from))
9
- if (!__hasOwnProp.call(to, key) && key !== except)
10
- __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
11
- }
12
- return to;
13
- };
14
- var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
15
- var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
16
- var node_exports = {};
17
- module.exports = __toCommonJS(node_exports);
18
- __reExport(node_exports, require("./loadServer"), module.exports);
19
- __reExport(node_exports, require("./hono"), module.exports);
20
- __reExport(node_exports, require("./node"), module.exports);
21
- __reExport(node_exports, require("./bff"), module.exports);
22
- __reExport(node_exports, require("./middlewares"), module.exports);
23
- __reExport(node_exports, require("./polyfills"), module.exports);
24
- // Annotate the CommonJS export names for ESM import in node:
25
- 0 && (module.exports = {
26
- ...require("./loadServer"),
27
- ...require("./hono"),
28
- ...require("./node"),
29
- ...require("./bff"),
30
- ...require("./middlewares"),
31
- ...require("./polyfills")
32
- });
@@ -1,56 +0,0 @@
1
- "use strict";
2
- var __create = Object.create;
3
- var __defProp = Object.defineProperty;
4
- var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
5
- var __getOwnPropNames = Object.getOwnPropertyNames;
6
- var __getProtoOf = Object.getPrototypeOf;
7
- var __hasOwnProp = Object.prototype.hasOwnProperty;
8
- var __export = (target, all) => {
9
- for (var name in all)
10
- __defProp(target, name, { get: all[name], enumerable: true });
11
- };
12
- var __copyProps = (to, from, except, desc) => {
13
- if (from && typeof from === "object" || typeof from === "function") {
14
- for (let key of __getOwnPropNames(from))
15
- if (!__hasOwnProp.call(to, key) && key !== except)
16
- __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
17
- }
18
- return to;
19
- };
20
- var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
21
- // If the importer is in node compatibility mode or this is not an ESM
22
- // file that has been converted to a CommonJS file using a Babel-
23
- // compatible transform (i.e. "__esModule" has not been set), then set
24
- // "default" to the CommonJS "module.exports" for node compatibility.
25
- isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
26
- mod
27
- ));
28
- var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
29
- var loadServer_exports = {};
30
- __export(loadServer_exports, {
31
- loadServerEnv: () => loadServerEnv
32
- });
33
- module.exports = __toCommonJS(loadServer_exports);
34
- var import_path = __toESM(require("path"));
35
- var import_utils = require("@modern-js/utils");
36
- async function loadServerEnv(options) {
37
- const { pwd } = options;
38
- const serverEnv = process.env.MODERN_ENV;
39
- const defaultEnvPath = import_path.default.resolve(pwd, `.env`);
40
- const serverEnvPath = import_path.default.resolve(pwd, `.env.${serverEnv}`);
41
- for (const envPath of [
42
- serverEnvPath,
43
- defaultEnvPath
44
- ]) {
45
- if (await import_utils.fs.pathExists(envPath) && !(await import_utils.fs.stat(envPath)).isDirectory()) {
46
- const envConfig = import_utils.dotenv.config({
47
- path: envPath
48
- });
49
- (0, import_utils.dotenvExpand)(envConfig);
50
- }
51
- }
52
- }
53
- // Annotate the CommonJS export names for ESM import in node:
54
- 0 && (module.exports = {
55
- loadServerEnv
56
- });
@@ -1,26 +0,0 @@
1
- "use strict";
2
- var __defProp = Object.defineProperty;
3
- var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
- var __getOwnPropNames = Object.getOwnPropertyNames;
5
- var __hasOwnProp = Object.prototype.hasOwnProperty;
6
- var __copyProps = (to, from, except, desc) => {
7
- if (from && typeof from === "object" || typeof from === "function") {
8
- for (let key of __getOwnPropNames(from))
9
- if (!__hasOwnProp.call(to, key) && key !== except)
10
- __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
11
- }
12
- return to;
13
- };
14
- var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
15
- var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
16
- var middlewares_exports = {};
17
- module.exports = __toCommonJS(middlewares_exports);
18
- __reExport(middlewares_exports, require("./mock"), module.exports);
19
- __reExport(middlewares_exports, require("./serverStatic"), module.exports);
20
- __reExport(middlewares_exports, require("./templates"), module.exports);
21
- // Annotate the CommonJS export names for ESM import in node:
22
- 0 && (module.exports = {
23
- ...require("./mock"),
24
- ...require("./serverStatic"),
25
- ...require("./templates")
26
- });