@modern-js/server-core 2.48.5-alpha.0 → 2.48.5-alpha.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.
- package/dist/cjs/base/adapters/node/bff.js +4 -3
- package/dist/cjs/base/index.js +4 -2
- package/dist/cjs/{core/hono.js → base/middlewares/frameworkHeader.js} +17 -2
- package/dist/cjs/base/middlewares/index.js +3 -1
- package/dist/cjs/base/middlewares/renderHandler/render.js +2 -1
- package/dist/cjs/base/serverBase.js +11 -11
- package/dist/cjs/base/utils/index.js +0 -11
- package/dist/cjs/core/plugin.js +0 -39
- package/dist/esm/base/adapters/node/bff.js +4 -4
- package/dist/esm/base/index.js +3 -2
- package/dist/esm/base/middlewares/frameworkHeader.js +27 -0
- package/dist/esm/base/middlewares/index.js +1 -0
- package/dist/esm/base/middlewares/renderHandler/render.js +2 -1
- package/dist/esm/base/serverBase.js +11 -11
- package/dist/esm/base/utils/index.js +0 -6
- package/dist/esm/core/plugin.js +0 -39
- package/dist/esm-node/base/adapters/node/bff.js +4 -3
- package/dist/esm-node/base/index.js +3 -2
- package/dist/esm-node/base/middlewares/frameworkHeader.js +7 -0
- package/dist/esm-node/base/middlewares/index.js +1 -0
- package/dist/esm-node/base/middlewares/renderHandler/render.js +2 -1
- package/dist/esm-node/base/serverBase.js +11 -11
- package/dist/esm-node/base/utils/index.js +0 -6
- package/dist/esm-node/core/plugin.js +0 -39
- package/dist/types/base/adapters/node/bff.d.ts +1 -2
- package/dist/types/base/adapters/node/hono.d.ts +3 -3
- package/dist/types/base/adapters/node/loadServer.d.ts +1 -1
- package/dist/types/base/adapters/node/middlewares/serverManifest.d.ts +2 -2
- package/dist/types/base/adapters/node/middlewares/templates.d.ts +2 -2
- package/dist/types/base/index.d.ts +3 -3
- package/dist/types/base/middlewares/customServer/base.d.ts +2 -2
- package/dist/types/base/middlewares/customServer/context.d.ts +3 -3
- package/dist/types/base/middlewares/frameworkHeader.d.ts +2 -0
- package/dist/types/base/middlewares/index.d.ts +1 -0
- package/dist/types/base/middlewares/monitor.d.ts +5 -5
- package/dist/types/base/middlewares/renderHandler/index.d.ts +1 -2
- package/dist/types/base/middlewares/renderHandler/ssrCache.d.ts +1 -2
- package/dist/types/base/middlewares/renderHandler/ssrRender.d.ts +1 -2
- package/dist/types/base/serverBase.d.ts +22 -4
- package/dist/types/base/utils/index.d.ts +0 -1
- package/dist/types/core/plugin.d.ts +10 -298
- package/dist/types/core/server.d.ts +2 -64
- package/package.json +5 -5
- package/dist/esm/core/hono.js +0 -0
- package/dist/esm-node/core/hono.js +0 -0
- package/dist/types/core/hono.d.ts +0 -1
|
@@ -25,9 +25,10 @@ var import_utils = require("@modern-js/utils");
|
|
|
25
25
|
var import_middlewares = require("../../../base/middlewares");
|
|
26
26
|
var import_utils2 = require("../../utils");
|
|
27
27
|
const bindBFFHandler = async (server, options) => {
|
|
28
|
-
|
|
29
|
-
const
|
|
30
|
-
const
|
|
28
|
+
var _options_config_bff, _options_config, _options_config1, _options_config_bff1, _options_config2;
|
|
29
|
+
const prefix = (options === null || options === void 0 ? void 0 : (_options_config = options.config) === null || _options_config === void 0 ? void 0 : (_options_config_bff = _options_config.bff) === null || _options_config_bff === void 0 ? void 0 : _options_config_bff.prefix) || "/api";
|
|
30
|
+
const enableHandleWeb = options === null || options === void 0 ? void 0 : (_options_config1 = options.config) === null || _options_config1 === void 0 ? void 0 : _options_config1.bff.enableHandleWeb;
|
|
31
|
+
const httpMethodDecider = options === null || options === void 0 ? void 0 : (_options_config2 = options.config) === null || _options_config2 === void 0 ? void 0 : (_options_config_bff1 = _options_config2.bff) === null || _options_config_bff1 === void 0 ? void 0 : _options_config_bff1.httpMethodDecider;
|
|
31
32
|
const runtimeEnv = (0, import_utils2.getRuntimeEnv)();
|
|
32
33
|
if (runtimeEnv !== "node") {
|
|
33
34
|
return;
|
package/dist/cjs/base/index.js
CHANGED
|
@@ -26,7 +26,8 @@ __export(base_exports, {
|
|
|
26
26
|
getRenderHandler: () => import_middlewares.getRenderHandler,
|
|
27
27
|
injectLogger: () => import_middlewares.injectLogger,
|
|
28
28
|
injectReporter: () => import_middlewares.injectReporter,
|
|
29
|
-
logHandler: () => import_middlewares.logHandler
|
|
29
|
+
logHandler: () => import_middlewares.logHandler,
|
|
30
|
+
processedBy: () => import_middlewares.processedBy
|
|
30
31
|
});
|
|
31
32
|
module.exports = __toCommonJS(base_exports);
|
|
32
33
|
var import_utils = require("./utils");
|
|
@@ -43,5 +44,6 @@ var import_serverBase = require("./serverBase");
|
|
|
43
44
|
getRenderHandler,
|
|
44
45
|
injectLogger,
|
|
45
46
|
injectReporter,
|
|
46
|
-
logHandler
|
|
47
|
+
logHandler,
|
|
48
|
+
processedBy
|
|
47
49
|
});
|
|
@@ -3,6 +3,10 @@ var __defProp = Object.defineProperty;
|
|
|
3
3
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
4
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
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
|
+
};
|
|
6
10
|
var __copyProps = (to, from, except, desc) => {
|
|
7
11
|
if (from && typeof from === "object" || typeof from === "function") {
|
|
8
12
|
for (let key of __getOwnPropNames(from))
|
|
@@ -12,5 +16,16 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
12
16
|
return to;
|
|
13
17
|
};
|
|
14
18
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
15
|
-
var
|
|
16
|
-
|
|
19
|
+
var frameworkHeader_exports = {};
|
|
20
|
+
__export(frameworkHeader_exports, {
|
|
21
|
+
processedBy: () => processedBy
|
|
22
|
+
});
|
|
23
|
+
module.exports = __toCommonJS(frameworkHeader_exports);
|
|
24
|
+
const processedBy = async (ctx, next) => {
|
|
25
|
+
await next();
|
|
26
|
+
ctx.header("X-Processed-By", "Modern.js");
|
|
27
|
+
};
|
|
28
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
29
|
+
0 && (module.exports = {
|
|
30
|
+
processedBy
|
|
31
|
+
});
|
|
@@ -19,10 +19,12 @@ __reExport(middlewares_exports, require("./faviconFallback"), module.exports);
|
|
|
19
19
|
__reExport(middlewares_exports, require("./monitor"), module.exports);
|
|
20
20
|
__reExport(middlewares_exports, require("./renderHandler"), module.exports);
|
|
21
21
|
__reExport(middlewares_exports, require("./logger"), module.exports);
|
|
22
|
+
__reExport(middlewares_exports, require("./frameworkHeader"), module.exports);
|
|
22
23
|
// Annotate the CommonJS export names for ESM import in node:
|
|
23
24
|
0 && (module.exports = {
|
|
24
25
|
...require("./faviconFallback"),
|
|
25
26
|
...require("./monitor"),
|
|
26
27
|
...require("./renderHandler"),
|
|
27
|
-
...require("./logger")
|
|
28
|
+
...require("./logger"),
|
|
29
|
+
...require("./frameworkHeader")
|
|
28
30
|
});
|
|
@@ -21,6 +21,7 @@ __export(render_exports, {
|
|
|
21
21
|
createRender: () => createRender
|
|
22
22
|
});
|
|
23
23
|
module.exports = __toCommonJS(render_exports);
|
|
24
|
+
var import_universal = require("@modern-js/utils/universal");
|
|
24
25
|
var import_constants = require("../../../base/constants");
|
|
25
26
|
var import_utils = require("../../utils");
|
|
26
27
|
var import_dataHandler = require("./dataHandler");
|
|
@@ -92,7 +93,7 @@ function matchRoute(req, routes) {
|
|
|
92
93
|
}
|
|
93
94
|
function getRenderMode(req, framework, isSSR, forceCSR, nodeReq) {
|
|
94
95
|
const query = (0, import_utils.parseQuery)(req);
|
|
95
|
-
const fallbackHeader = `x-${(0,
|
|
96
|
+
const fallbackHeader = `x-${(0, import_universal.cutNameByHyphen)(framework)}-ssr-fallback`;
|
|
96
97
|
if (isSSR) {
|
|
97
98
|
if (query.__loader) {
|
|
98
99
|
return "data";
|
|
@@ -151,37 +151,37 @@ class ServerBase {
|
|
|
151
151
|
});
|
|
152
152
|
}
|
|
153
153
|
get all() {
|
|
154
|
-
return this.app.all;
|
|
154
|
+
return this.app.all.bind(this.app);
|
|
155
155
|
}
|
|
156
156
|
get use() {
|
|
157
|
-
return this.app.use;
|
|
157
|
+
return this.app.use.bind(this.app);
|
|
158
158
|
}
|
|
159
159
|
get get() {
|
|
160
|
-
return this.app.get;
|
|
160
|
+
return this.app.get.bind(this.app);
|
|
161
161
|
}
|
|
162
162
|
get post() {
|
|
163
|
-
return this.app.post;
|
|
163
|
+
return this.app.post.bind(this.app);
|
|
164
164
|
}
|
|
165
165
|
get put() {
|
|
166
|
-
return this.app.put;
|
|
166
|
+
return this.app.put.bind(this.app);
|
|
167
167
|
}
|
|
168
168
|
get delete() {
|
|
169
|
-
return this.app.delete;
|
|
169
|
+
return this.app.delete.bind(this.app);
|
|
170
170
|
}
|
|
171
171
|
get patch() {
|
|
172
|
-
return this.app.patch;
|
|
172
|
+
return this.app.patch.bind(this.app);
|
|
173
173
|
}
|
|
174
174
|
get handle() {
|
|
175
|
-
return this.app.fetch;
|
|
175
|
+
return this.app.fetch.bind(this.app);
|
|
176
176
|
}
|
|
177
177
|
get request() {
|
|
178
|
-
return this.app.request;
|
|
178
|
+
return this.app.request.bind(this.app);
|
|
179
179
|
}
|
|
180
180
|
get notFound() {
|
|
181
|
-
return this.app.notFound;
|
|
181
|
+
return this.app.notFound.bind(this.app);
|
|
182
182
|
}
|
|
183
183
|
get onError() {
|
|
184
|
-
return this.app.onError;
|
|
184
|
+
return this.app.onError.bind(this.app);
|
|
185
185
|
}
|
|
186
186
|
constructor(options) {
|
|
187
187
|
this.serverConfig = {};
|
|
@@ -3,10 +3,6 @@ var __defProp = Object.defineProperty;
|
|
|
3
3
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
4
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
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
6
|
var __copyProps = (to, from, except, desc) => {
|
|
11
7
|
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
8
|
for (let key of __getOwnPropNames(from))
|
|
@@ -18,9 +14,6 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
18
14
|
var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
|
|
19
15
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
20
16
|
var utils_exports = {};
|
|
21
|
-
__export(utils_exports, {
|
|
22
|
-
cutNameByHyphen: () => cutNameByHyphen
|
|
23
|
-
});
|
|
24
17
|
module.exports = __toCommonJS(utils_exports);
|
|
25
18
|
__reExport(utils_exports, require("./env"), module.exports);
|
|
26
19
|
__reExport(utils_exports, require("./request"), module.exports);
|
|
@@ -29,12 +22,8 @@ __reExport(utils_exports, require("./middlewareCollector"), module.exports);
|
|
|
29
22
|
__reExport(utils_exports, require("./error"), module.exports);
|
|
30
23
|
__reExport(utils_exports, require("./warmup"), module.exports);
|
|
31
24
|
__reExport(utils_exports, require("./entry"), module.exports);
|
|
32
|
-
const cutNameByHyphen = (s) => {
|
|
33
|
-
return s.split(/[-_]/)[0];
|
|
34
|
-
};
|
|
35
25
|
// Annotate the CommonJS export names for ESM import in node:
|
|
36
26
|
0 && (module.exports = {
|
|
37
|
-
cutNameByHyphen,
|
|
38
27
|
...require("./env"),
|
|
39
28
|
...require("./request"),
|
|
40
29
|
...require("./transformStream"),
|
package/dist/cjs/core/plugin.js
CHANGED
|
@@ -32,33 +32,14 @@ var import_plugin = require("@modern-js/plugin");
|
|
|
32
32
|
const gather = (0, import_plugin.createParallelWorkflow)();
|
|
33
33
|
const config = (0, import_plugin.createWaterfall)();
|
|
34
34
|
const prepare = (0, import_plugin.createWaterfall)();
|
|
35
|
-
const prepareLoaderHandler = (0, import_plugin.createAsyncPipeline)();
|
|
36
35
|
const prepareWebServer = (0, import_plugin.createAsyncPipeline)();
|
|
37
36
|
const prepareApiServer = (0, import_plugin.createAsyncPipeline)();
|
|
38
37
|
const onApiChange = (0, import_plugin.createAsyncWaterfall)();
|
|
39
38
|
const repack = (0, import_plugin.createWaterfall)();
|
|
40
39
|
const beforeServerInit = (0, import_plugin.createAsyncWaterfall)();
|
|
41
|
-
const setupCompiler = (0, import_plugin.createParallelWorkflow)();
|
|
42
|
-
const beforeRouteSet = (0, import_plugin.createAsyncPipeline)();
|
|
43
|
-
const afterRouteSet = (0, import_plugin.createAsyncPipeline)();
|
|
44
|
-
const beforeProdServer = (0, import_plugin.createParallelWorkflow)();
|
|
45
|
-
const afterProdServer = (0, import_plugin.createParallelWorkflow)();
|
|
46
|
-
const listen = (0, import_plugin.createParallelWorkflow)();
|
|
47
|
-
const beforeServerReset = (0, import_plugin.createParallelWorkflow)();
|
|
48
|
-
const afterServerReset = (0, import_plugin.createParallelWorkflow)();
|
|
49
|
-
const extendSSRContext = (0, import_plugin.createAsyncWaterfall)();
|
|
50
|
-
const extendContext = (0, import_plugin.createAsyncPipeline)();
|
|
51
|
-
const handleError = (0, import_plugin.createParallelWorkflow)();
|
|
52
|
-
const handleSSRFallback = (0, import_plugin.createParallelWorkflow)();
|
|
53
|
-
const beforeMatch = (0, import_plugin.createAsyncPipeline)();
|
|
54
40
|
const afterMatch = (0, import_plugin.createAsyncPipeline)();
|
|
55
|
-
const prefetch = (0, import_plugin.createParallelWorkflow)();
|
|
56
|
-
const renderToString = (0, import_plugin.createAsyncPipeline)();
|
|
57
|
-
const beforeRender = (0, import_plugin.createAsyncPipeline)();
|
|
58
41
|
const afterRender = (0, import_plugin.createAsyncPipeline)();
|
|
59
42
|
const afterStreamingRender = (0, import_plugin.createAsyncPipeline)();
|
|
60
|
-
const beforeSend = (0, import_plugin.createAsyncPipeline)();
|
|
61
|
-
const afterSend = (0, import_plugin.createParallelWorkflow)();
|
|
62
43
|
const reset = (0, import_plugin.createParallelWorkflow)();
|
|
63
44
|
const AppContext = (0, import_plugin.createContext)({});
|
|
64
45
|
const setAppContext = (value) => AppContext.set(value);
|
|
@@ -75,34 +56,14 @@ const serverHooks = {
|
|
|
75
56
|
gather,
|
|
76
57
|
config,
|
|
77
58
|
prepare,
|
|
78
|
-
prepareLoaderHandler,
|
|
79
59
|
prepareWebServer,
|
|
80
60
|
prepareApiServer,
|
|
81
61
|
repack,
|
|
82
62
|
onApiChange,
|
|
83
63
|
beforeServerInit,
|
|
84
|
-
setupCompiler,
|
|
85
|
-
beforeRouteSet,
|
|
86
|
-
afterRouteSet,
|
|
87
|
-
beforeProdServer,
|
|
88
|
-
afterProdServer,
|
|
89
|
-
listen,
|
|
90
|
-
beforeServerReset,
|
|
91
|
-
afterServerReset,
|
|
92
|
-
// request hook
|
|
93
|
-
extendSSRContext,
|
|
94
|
-
extendContext,
|
|
95
|
-
handleError,
|
|
96
|
-
handleSSRFallback,
|
|
97
|
-
beforeMatch,
|
|
98
64
|
afterMatch,
|
|
99
|
-
prefetch,
|
|
100
|
-
renderToString,
|
|
101
|
-
beforeRender,
|
|
102
65
|
afterRender,
|
|
103
66
|
afterStreamingRender,
|
|
104
|
-
beforeSend,
|
|
105
|
-
afterSend,
|
|
106
67
|
reset
|
|
107
68
|
};
|
|
108
69
|
const createServerManager = () => (0, import_plugin.createAsyncManager)(serverHooks, pluginAPI);
|
|
@@ -6,13 +6,13 @@ import { getRenderHandler } from "../../../base/middlewares";
|
|
|
6
6
|
import { createMiddlewareCollecter, getRuntimeEnv } from "../../utils";
|
|
7
7
|
var bindBFFHandler = function() {
|
|
8
8
|
var _ref = _async_to_generator(function(server, options) {
|
|
9
|
-
var prefix, enableHandleWeb, httpMethodDecider, runtimeEnv, _createMiddlewareCollecter, getMiddlewares, collector, runner, webOnly, handler, renderHandler, _tmp;
|
|
9
|
+
var _options_config_bff, _options_config, _options_config1, _options_config_bff1, _options_config2, prefix, enableHandleWeb, httpMethodDecider, runtimeEnv, _createMiddlewareCollecter, getMiddlewares, collector, runner, webOnly, handler, renderHandler, _tmp;
|
|
10
10
|
return _ts_generator(this, function(_state) {
|
|
11
11
|
switch (_state.label) {
|
|
12
12
|
case 0:
|
|
13
|
-
prefix = options.config.bff.prefix || "/api";
|
|
14
|
-
enableHandleWeb = options.config.bff.enableHandleWeb;
|
|
15
|
-
httpMethodDecider = options.config.bff.httpMethodDecider;
|
|
13
|
+
prefix = (options === null || options === void 0 ? void 0 : (_options_config = options.config) === null || _options_config === void 0 ? void 0 : (_options_config_bff = _options_config.bff) === null || _options_config_bff === void 0 ? void 0 : _options_config_bff.prefix) || "/api";
|
|
14
|
+
enableHandleWeb = options === null || options === void 0 ? void 0 : (_options_config1 = options.config) === null || _options_config1 === void 0 ? void 0 : _options_config1.bff.enableHandleWeb;
|
|
15
|
+
httpMethodDecider = options === null || options === void 0 ? void 0 : (_options_config2 = options.config) === null || _options_config2 === void 0 ? void 0 : (_options_config_bff1 = _options_config2.bff) === null || _options_config_bff1 === void 0 ? void 0 : _options_config_bff1.httpMethodDecider;
|
|
16
16
|
runtimeEnv = getRuntimeEnv();
|
|
17
17
|
if (runtimeEnv !== "node") {
|
|
18
18
|
return [
|
package/dist/esm/base/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createErrorHtml } from "./utils";
|
|
2
2
|
import { AGGRED_DIR } from "./constants";
|
|
3
|
-
import { favionFallbackMiddleware, injectReporter, injectLogger, getRenderHandler, bindRenderHandler, logHandler } from "./middlewares";
|
|
3
|
+
import { favionFallbackMiddleware, injectReporter, injectLogger, getRenderHandler, bindRenderHandler, logHandler, processedBy } from "./middlewares";
|
|
4
4
|
import { createServerBase } from "./serverBase";
|
|
5
5
|
export {
|
|
6
6
|
AGGRED_DIR,
|
|
@@ -11,5 +11,6 @@ export {
|
|
|
11
11
|
getRenderHandler,
|
|
12
12
|
injectLogger,
|
|
13
13
|
injectReporter,
|
|
14
|
-
logHandler
|
|
14
|
+
logHandler,
|
|
15
|
+
processedBy
|
|
15
16
|
};
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
|
|
2
|
+
import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
|
|
3
|
+
var processedBy = function() {
|
|
4
|
+
var _ref = _async_to_generator(function(ctx, next) {
|
|
5
|
+
return _ts_generator(this, function(_state) {
|
|
6
|
+
switch (_state.label) {
|
|
7
|
+
case 0:
|
|
8
|
+
return [
|
|
9
|
+
4,
|
|
10
|
+
next()
|
|
11
|
+
];
|
|
12
|
+
case 1:
|
|
13
|
+
_state.sent();
|
|
14
|
+
ctx.header("X-Processed-By", "Modern.js");
|
|
15
|
+
return [
|
|
16
|
+
2
|
|
17
|
+
];
|
|
18
|
+
}
|
|
19
|
+
});
|
|
20
|
+
});
|
|
21
|
+
return function processedBy2(ctx, next) {
|
|
22
|
+
return _ref.apply(this, arguments);
|
|
23
|
+
};
|
|
24
|
+
}();
|
|
25
|
+
export {
|
|
26
|
+
processedBy
|
|
27
|
+
};
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
|
|
2
2
|
import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
|
|
3
|
+
import { cutNameByHyphen } from "@modern-js/utils/universal";
|
|
3
4
|
import { REPLACE_REG } from "../../../base/constants";
|
|
4
|
-
import { createErrorHtml, sortRoutes,
|
|
5
|
+
import { createErrorHtml, sortRoutes, parseQuery, transformResponse, getPathname } from "../../utils";
|
|
5
6
|
import { dataHandler } from "./dataHandler";
|
|
6
7
|
import { ssrRender } from "./ssrRender";
|
|
7
8
|
function createRender(_) {
|
|
@@ -304,67 +304,67 @@ var ServerBase = /* @__PURE__ */ function() {
|
|
|
304
304
|
{
|
|
305
305
|
key: "all",
|
|
306
306
|
get: function get() {
|
|
307
|
-
return this.app.all;
|
|
307
|
+
return this.app.all.bind(this.app);
|
|
308
308
|
}
|
|
309
309
|
},
|
|
310
310
|
{
|
|
311
311
|
key: "use",
|
|
312
312
|
get: function get() {
|
|
313
|
-
return this.app.use;
|
|
313
|
+
return this.app.use.bind(this.app);
|
|
314
314
|
}
|
|
315
315
|
},
|
|
316
316
|
{
|
|
317
317
|
key: "get",
|
|
318
318
|
get: function get() {
|
|
319
|
-
return this.app.get;
|
|
319
|
+
return this.app.get.bind(this.app);
|
|
320
320
|
}
|
|
321
321
|
},
|
|
322
322
|
{
|
|
323
323
|
key: "post",
|
|
324
324
|
get: function get() {
|
|
325
|
-
return this.app.post;
|
|
325
|
+
return this.app.post.bind(this.app);
|
|
326
326
|
}
|
|
327
327
|
},
|
|
328
328
|
{
|
|
329
329
|
key: "put",
|
|
330
330
|
get: function get() {
|
|
331
|
-
return this.app.put;
|
|
331
|
+
return this.app.put.bind(this.app);
|
|
332
332
|
}
|
|
333
333
|
},
|
|
334
334
|
{
|
|
335
335
|
key: "delete",
|
|
336
336
|
get: function get() {
|
|
337
|
-
return this.app.delete;
|
|
337
|
+
return this.app.delete.bind(this.app);
|
|
338
338
|
}
|
|
339
339
|
},
|
|
340
340
|
{
|
|
341
341
|
key: "patch",
|
|
342
342
|
get: function get() {
|
|
343
|
-
return this.app.patch;
|
|
343
|
+
return this.app.patch.bind(this.app);
|
|
344
344
|
}
|
|
345
345
|
},
|
|
346
346
|
{
|
|
347
347
|
key: "handle",
|
|
348
348
|
get: function get() {
|
|
349
|
-
return this.app.fetch;
|
|
349
|
+
return this.app.fetch.bind(this.app);
|
|
350
350
|
}
|
|
351
351
|
},
|
|
352
352
|
{
|
|
353
353
|
key: "request",
|
|
354
354
|
get: function get() {
|
|
355
|
-
return this.app.request;
|
|
355
|
+
return this.app.request.bind(this.app);
|
|
356
356
|
}
|
|
357
357
|
},
|
|
358
358
|
{
|
|
359
359
|
key: "notFound",
|
|
360
360
|
get: function get() {
|
|
361
|
-
return this.app.notFound;
|
|
361
|
+
return this.app.notFound.bind(this.app);
|
|
362
362
|
}
|
|
363
363
|
},
|
|
364
364
|
{
|
|
365
365
|
key: "onError",
|
|
366
366
|
get: function get() {
|
|
367
|
-
return this.app.onError;
|
|
367
|
+
return this.app.onError.bind(this.app);
|
|
368
368
|
}
|
|
369
369
|
}
|
|
370
370
|
]);
|
package/dist/esm/core/plugin.js
CHANGED
|
@@ -2,33 +2,14 @@ import { createContext, createAsyncManager, createAsyncPipeline, createAsyncWate
|
|
|
2
2
|
var gather = createParallelWorkflow();
|
|
3
3
|
var config = createWaterfall();
|
|
4
4
|
var prepare = createWaterfall();
|
|
5
|
-
var prepareLoaderHandler = createAsyncPipeline();
|
|
6
5
|
var prepareWebServer = createAsyncPipeline();
|
|
7
6
|
var prepareApiServer = createAsyncPipeline();
|
|
8
7
|
var onApiChange = createAsyncWaterfall();
|
|
9
8
|
var repack = createWaterfall();
|
|
10
9
|
var beforeServerInit = createAsyncWaterfall();
|
|
11
|
-
var setupCompiler = createParallelWorkflow();
|
|
12
|
-
var beforeRouteSet = createAsyncPipeline();
|
|
13
|
-
var afterRouteSet = createAsyncPipeline();
|
|
14
|
-
var beforeProdServer = createParallelWorkflow();
|
|
15
|
-
var afterProdServer = createParallelWorkflow();
|
|
16
|
-
var listen = createParallelWorkflow();
|
|
17
|
-
var beforeServerReset = createParallelWorkflow();
|
|
18
|
-
var afterServerReset = createParallelWorkflow();
|
|
19
|
-
var extendSSRContext = createAsyncWaterfall();
|
|
20
|
-
var extendContext = createAsyncPipeline();
|
|
21
|
-
var handleError = createParallelWorkflow();
|
|
22
|
-
var handleSSRFallback = createParallelWorkflow();
|
|
23
|
-
var beforeMatch = createAsyncPipeline();
|
|
24
10
|
var afterMatch = createAsyncPipeline();
|
|
25
|
-
var prefetch = createParallelWorkflow();
|
|
26
|
-
var renderToString = createAsyncPipeline();
|
|
27
|
-
var beforeRender = createAsyncPipeline();
|
|
28
11
|
var afterRender = createAsyncPipeline();
|
|
29
12
|
var afterStreamingRender = createAsyncPipeline();
|
|
30
|
-
var beforeSend = createAsyncPipeline();
|
|
31
|
-
var afterSend = createParallelWorkflow();
|
|
32
13
|
var reset = createParallelWorkflow();
|
|
33
14
|
var AppContext = createContext({});
|
|
34
15
|
var setAppContext = function(value) {
|
|
@@ -51,34 +32,14 @@ var serverHooks = {
|
|
|
51
32
|
gather,
|
|
52
33
|
config,
|
|
53
34
|
prepare,
|
|
54
|
-
prepareLoaderHandler,
|
|
55
35
|
prepareWebServer,
|
|
56
36
|
prepareApiServer,
|
|
57
37
|
repack,
|
|
58
38
|
onApiChange,
|
|
59
39
|
beforeServerInit,
|
|
60
|
-
setupCompiler,
|
|
61
|
-
beforeRouteSet,
|
|
62
|
-
afterRouteSet,
|
|
63
|
-
beforeProdServer,
|
|
64
|
-
afterProdServer,
|
|
65
|
-
listen,
|
|
66
|
-
beforeServerReset,
|
|
67
|
-
afterServerReset,
|
|
68
|
-
// request hook
|
|
69
|
-
extendSSRContext,
|
|
70
|
-
extendContext,
|
|
71
|
-
handleError,
|
|
72
|
-
handleSSRFallback,
|
|
73
|
-
beforeMatch,
|
|
74
40
|
afterMatch,
|
|
75
|
-
prefetch,
|
|
76
|
-
renderToString,
|
|
77
|
-
beforeRender,
|
|
78
41
|
afterRender,
|
|
79
42
|
afterStreamingRender,
|
|
80
|
-
beforeSend,
|
|
81
|
-
afterSend,
|
|
82
43
|
reset
|
|
83
44
|
};
|
|
84
45
|
var createServerManager = function() {
|
|
@@ -2,9 +2,10 @@ import { isWebOnly } from "@modern-js/utils";
|
|
|
2
2
|
import { getRenderHandler } from "../../../base/middlewares";
|
|
3
3
|
import { createMiddlewareCollecter, getRuntimeEnv } from "../../utils";
|
|
4
4
|
const bindBFFHandler = async (server, options) => {
|
|
5
|
-
|
|
6
|
-
const
|
|
7
|
-
const
|
|
5
|
+
var _options_config_bff, _options_config, _options_config1, _options_config_bff1, _options_config2;
|
|
6
|
+
const prefix = (options === null || options === void 0 ? void 0 : (_options_config = options.config) === null || _options_config === void 0 ? void 0 : (_options_config_bff = _options_config.bff) === null || _options_config_bff === void 0 ? void 0 : _options_config_bff.prefix) || "/api";
|
|
7
|
+
const enableHandleWeb = options === null || options === void 0 ? void 0 : (_options_config1 = options.config) === null || _options_config1 === void 0 ? void 0 : _options_config1.bff.enableHandleWeb;
|
|
8
|
+
const httpMethodDecider = options === null || options === void 0 ? void 0 : (_options_config2 = options.config) === null || _options_config2 === void 0 ? void 0 : (_options_config_bff1 = _options_config2.bff) === null || _options_config_bff1 === void 0 ? void 0 : _options_config_bff1.httpMethodDecider;
|
|
8
9
|
const runtimeEnv = getRuntimeEnv();
|
|
9
10
|
if (runtimeEnv !== "node") {
|
|
10
11
|
return;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createErrorHtml } from "./utils";
|
|
2
2
|
import { AGGRED_DIR } from "./constants";
|
|
3
|
-
import { favionFallbackMiddleware, injectReporter, injectLogger, getRenderHandler, bindRenderHandler, logHandler } from "./middlewares";
|
|
3
|
+
import { favionFallbackMiddleware, injectReporter, injectLogger, getRenderHandler, bindRenderHandler, logHandler, processedBy } from "./middlewares";
|
|
4
4
|
import { createServerBase } from "./serverBase";
|
|
5
5
|
export {
|
|
6
6
|
AGGRED_DIR,
|
|
@@ -11,5 +11,6 @@ export {
|
|
|
11
11
|
getRenderHandler,
|
|
12
12
|
injectLogger,
|
|
13
13
|
injectReporter,
|
|
14
|
-
logHandler
|
|
14
|
+
logHandler,
|
|
15
|
+
processedBy
|
|
15
16
|
};
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
import { cutNameByHyphen } from "@modern-js/utils/universal";
|
|
1
2
|
import { REPLACE_REG } from "../../../base/constants";
|
|
2
|
-
import { createErrorHtml, sortRoutes,
|
|
3
|
+
import { createErrorHtml, sortRoutes, parseQuery, transformResponse, getPathname } from "../../utils";
|
|
3
4
|
import { dataHandler } from "./dataHandler";
|
|
4
5
|
import { ssrRender } from "./ssrRender";
|
|
5
6
|
async function createRender({ routes, pwd, metaName, staticGenerate, forceCSR, nonce }) {
|
|
@@ -117,37 +117,37 @@ class ServerBase {
|
|
|
117
117
|
});
|
|
118
118
|
}
|
|
119
119
|
get all() {
|
|
120
|
-
return this.app.all;
|
|
120
|
+
return this.app.all.bind(this.app);
|
|
121
121
|
}
|
|
122
122
|
get use() {
|
|
123
|
-
return this.app.use;
|
|
123
|
+
return this.app.use.bind(this.app);
|
|
124
124
|
}
|
|
125
125
|
get get() {
|
|
126
|
-
return this.app.get;
|
|
126
|
+
return this.app.get.bind(this.app);
|
|
127
127
|
}
|
|
128
128
|
get post() {
|
|
129
|
-
return this.app.post;
|
|
129
|
+
return this.app.post.bind(this.app);
|
|
130
130
|
}
|
|
131
131
|
get put() {
|
|
132
|
-
return this.app.put;
|
|
132
|
+
return this.app.put.bind(this.app);
|
|
133
133
|
}
|
|
134
134
|
get delete() {
|
|
135
|
-
return this.app.delete;
|
|
135
|
+
return this.app.delete.bind(this.app);
|
|
136
136
|
}
|
|
137
137
|
get patch() {
|
|
138
|
-
return this.app.patch;
|
|
138
|
+
return this.app.patch.bind(this.app);
|
|
139
139
|
}
|
|
140
140
|
get handle() {
|
|
141
|
-
return this.app.fetch;
|
|
141
|
+
return this.app.fetch.bind(this.app);
|
|
142
142
|
}
|
|
143
143
|
get request() {
|
|
144
|
-
return this.app.request;
|
|
144
|
+
return this.app.request.bind(this.app);
|
|
145
145
|
}
|
|
146
146
|
get notFound() {
|
|
147
|
-
return this.app.notFound;
|
|
147
|
+
return this.app.notFound.bind(this.app);
|
|
148
148
|
}
|
|
149
149
|
get onError() {
|
|
150
|
-
return this.app.onError;
|
|
150
|
+
return this.app.onError.bind(this.app);
|
|
151
151
|
}
|
|
152
152
|
constructor(options) {
|
|
153
153
|
this.serverConfig = {};
|