@modern-js/prod-server 2.53.0 → 2.54.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.
- package/dist/cjs/apply.js +75 -0
- package/dist/cjs/index.js +19 -12
- package/dist/cjs/netlify.js +7 -10
- package/dist/esm/apply.js +65 -0
- package/dist/esm/index.js +20 -20
- package/dist/esm/netlify.js +6 -8
- package/dist/esm-node/apply.js +51 -0
- package/dist/esm-node/index.js +16 -11
- package/dist/esm-node/netlify.js +5 -7
- package/dist/types/apply.d.ts +5 -0
- package/dist/types/index.d.ts +5 -3
- package/dist/types/netlify.d.ts +0 -1
- package/dist/types/types.d.ts +7 -3
- package/package.json +8 -8
- package/dist/cjs/init.js +0 -70
- package/dist/esm/init.js +0 -72
- package/dist/esm-node/init.js +0 -46
- package/dist/types/init.d.ts +0 -4
|
@@ -0,0 +1,75 @@
|
|
|
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 apply_exports = {};
|
|
20
|
+
__export(apply_exports, {
|
|
21
|
+
applyPlugins: () => applyPlugins
|
|
22
|
+
});
|
|
23
|
+
module.exports = __toCommonJS(apply_exports);
|
|
24
|
+
var import_server_core = require("@modern-js/server-core");
|
|
25
|
+
var import_node = require("@modern-js/server-core/node");
|
|
26
|
+
var import_utils = require("@modern-js/utils");
|
|
27
|
+
function getLogger() {
|
|
28
|
+
if (process.env.DEBUG || process.env.NODE_ENV === "production") {
|
|
29
|
+
return (0, import_utils.createLogger)({
|
|
30
|
+
level: "verbose"
|
|
31
|
+
});
|
|
32
|
+
} else {
|
|
33
|
+
return (0, import_utils.createLogger)();
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
async function applyPlugins(serverBase, options, nodeServer) {
|
|
37
|
+
const { pwd, appContext } = options;
|
|
38
|
+
const loadCachePwd = (0, import_utils.isProd)() ? pwd : appContext.appDirectory || pwd;
|
|
39
|
+
const cacheConfig = (0, import_node.loadCacheConfig)(loadCachePwd);
|
|
40
|
+
serverBase.notFound((c) => {
|
|
41
|
+
const logger = c.get("logger");
|
|
42
|
+
(0, import_server_core.onError)(logger, import_server_core.ErrorDigest.ENOTF, "404 not found", c.req.raw);
|
|
43
|
+
return c.html((0, import_server_core.createErrorHtml)(404), 404);
|
|
44
|
+
});
|
|
45
|
+
serverBase.onError((err, c) => {
|
|
46
|
+
const logger = c.get("logger");
|
|
47
|
+
(0, import_server_core.onError)(logger, import_server_core.ErrorDigest.EINTER, err, c.req.raw);
|
|
48
|
+
return c.html((0, import_server_core.createErrorHtml)(500), 500);
|
|
49
|
+
});
|
|
50
|
+
const plugins = [
|
|
51
|
+
...options.plugins || [],
|
|
52
|
+
(0, import_server_core.monitorPlugin)({
|
|
53
|
+
logger: getLogger()
|
|
54
|
+
}),
|
|
55
|
+
(0, import_server_core.processedByPlugin)(),
|
|
56
|
+
(0, import_server_core.logPlugin)(),
|
|
57
|
+
(0, import_node.injectResourcePlugin)(),
|
|
58
|
+
(0, import_node.serverStaticPlugin)(),
|
|
59
|
+
(0, import_server_core.faviconPlugin)(),
|
|
60
|
+
(0, import_server_core.renderPlugin)({
|
|
61
|
+
staticGenerate: options.staticGenerate,
|
|
62
|
+
cacheConfig
|
|
63
|
+
})
|
|
64
|
+
];
|
|
65
|
+
if (nodeServer) {
|
|
66
|
+
plugins.unshift((0, import_node.injectNodeSeverPlugin)({
|
|
67
|
+
nodeServer
|
|
68
|
+
}));
|
|
69
|
+
}
|
|
70
|
+
serverBase.addPlugins(plugins);
|
|
71
|
+
}
|
|
72
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
73
|
+
0 && (module.exports = {
|
|
74
|
+
applyPlugins
|
|
75
|
+
});
|
package/dist/cjs/index.js
CHANGED
|
@@ -18,27 +18,34 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
18
18
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
19
|
var src_exports = {};
|
|
20
20
|
__export(src_exports, {
|
|
21
|
+
applyPlugins: () => import_apply2.applyPlugins,
|
|
21
22
|
createProdServer: () => createProdServer,
|
|
22
|
-
|
|
23
|
+
loadServerConfig: () => import_node2.loadServerConfig,
|
|
24
|
+
loadServerPlugins: () => import_node2.loadServerPlugins
|
|
23
25
|
});
|
|
24
26
|
module.exports = __toCommonJS(src_exports);
|
|
25
|
-
var import_node = require("@modern-js/server-core/
|
|
26
|
-
var
|
|
27
|
-
var
|
|
28
|
-
var
|
|
27
|
+
var import_node = require("@modern-js/server-core/node");
|
|
28
|
+
var import_server_core = require("@modern-js/server-core");
|
|
29
|
+
var import_apply = require("./apply");
|
|
30
|
+
var import_apply2 = require("./apply");
|
|
31
|
+
var import_node2 = require("@modern-js/server-core/node");
|
|
29
32
|
const createProdServer = async (options) => {
|
|
30
|
-
const server = (0, import_base.createServerBase)(options);
|
|
31
33
|
await (0, import_node.loadServerEnv)(options);
|
|
32
|
-
|
|
34
|
+
const serverConfig = (0, import_node.loadServerConfig)(options.pwd, options.serverConfigFile, options.serverConfigPath);
|
|
35
|
+
const serverBaseOptions = options;
|
|
36
|
+
if (serverConfig) {
|
|
37
|
+
serverBaseOptions.serverConfig = serverConfig;
|
|
38
|
+
}
|
|
39
|
+
const server = (0, import_server_core.createServerBase)(serverBaseOptions);
|
|
33
40
|
const nodeServer = await (0, import_node.createNodeServer)(server.handle.bind(server));
|
|
34
|
-
await
|
|
35
|
-
|
|
36
|
-
});
|
|
37
|
-
await (0, import_init.initProdMiddlewares)(server, options);
|
|
41
|
+
await (0, import_apply.applyPlugins)(server, options, nodeServer);
|
|
42
|
+
await server.init();
|
|
38
43
|
return nodeServer;
|
|
39
44
|
};
|
|
40
45
|
// Annotate the CommonJS export names for ESM import in node:
|
|
41
46
|
0 && (module.exports = {
|
|
47
|
+
applyPlugins,
|
|
42
48
|
createProdServer,
|
|
43
|
-
|
|
49
|
+
loadServerConfig,
|
|
50
|
+
loadServerPlugins
|
|
44
51
|
});
|
package/dist/cjs/netlify.js
CHANGED
|
@@ -18,25 +18,22 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
18
18
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
19
|
var netlify_exports = {};
|
|
20
20
|
__export(netlify_exports, {
|
|
21
|
-
createNetlifyFunction: () => createNetlifyFunction
|
|
22
|
-
initProdMiddlewares: () => import_init2.initProdMiddlewares
|
|
21
|
+
createNetlifyFunction: () => createNetlifyFunction
|
|
23
22
|
});
|
|
24
23
|
module.exports = __toCommonJS(netlify_exports);
|
|
25
|
-
var import_node = require("@modern-js/server-core/
|
|
26
|
-
var
|
|
27
|
-
var
|
|
28
|
-
var import_init2 = require("./init");
|
|
24
|
+
var import_node = require("@modern-js/server-core/node");
|
|
25
|
+
var import_server_core = require("@modern-js/server-core");
|
|
26
|
+
var import_apply = require("./apply");
|
|
29
27
|
const createNetlifyFunction = async (options) => {
|
|
30
|
-
const server = (0,
|
|
28
|
+
const server = (0, import_server_core.createServerBase)(options);
|
|
31
29
|
await (0, import_node.loadServerEnv)(options);
|
|
30
|
+
await (0, import_apply.applyPlugins)(server, options);
|
|
32
31
|
await server.init();
|
|
33
|
-
await (0, import_init.initProdMiddlewares)(server, options);
|
|
34
32
|
return (request, context) => {
|
|
35
33
|
return server.handle(request, context);
|
|
36
34
|
};
|
|
37
35
|
};
|
|
38
36
|
// Annotate the CommonJS export names for ESM import in node:
|
|
39
37
|
0 && (module.exports = {
|
|
40
|
-
createNetlifyFunction
|
|
41
|
-
initProdMiddlewares
|
|
38
|
+
createNetlifyFunction
|
|
42
39
|
});
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
|
|
2
|
+
import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
|
|
3
|
+
import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
|
|
4
|
+
import { ErrorDigest, createErrorHtml, faviconPlugin, logPlugin, monitorPlugin, onError, processedByPlugin, renderPlugin } from "@modern-js/server-core";
|
|
5
|
+
import { serverStaticPlugin, injectResourcePlugin, loadCacheConfig, injectNodeSeverPlugin } from "@modern-js/server-core/node";
|
|
6
|
+
import { createLogger, isProd } from "@modern-js/utils";
|
|
7
|
+
function getLogger() {
|
|
8
|
+
if (process.env.DEBUG || process.env.NODE_ENV === "production") {
|
|
9
|
+
return createLogger({
|
|
10
|
+
level: "verbose"
|
|
11
|
+
});
|
|
12
|
+
} else {
|
|
13
|
+
return createLogger();
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
function applyPlugins(serverBase, options, nodeServer) {
|
|
17
|
+
return _applyPlugins.apply(this, arguments);
|
|
18
|
+
}
|
|
19
|
+
function _applyPlugins() {
|
|
20
|
+
_applyPlugins = _async_to_generator(function(serverBase, options, nodeServer) {
|
|
21
|
+
var pwd, appContext, loadCachePwd, cacheConfig, plugins;
|
|
22
|
+
return _ts_generator(this, function(_state) {
|
|
23
|
+
pwd = options.pwd, appContext = options.appContext;
|
|
24
|
+
loadCachePwd = isProd() ? pwd : appContext.appDirectory || pwd;
|
|
25
|
+
cacheConfig = loadCacheConfig(loadCachePwd);
|
|
26
|
+
serverBase.notFound(function(c) {
|
|
27
|
+
var logger = c.get("logger");
|
|
28
|
+
onError(logger, ErrorDigest.ENOTF, "404 not found", c.req.raw);
|
|
29
|
+
return c.html(createErrorHtml(404), 404);
|
|
30
|
+
});
|
|
31
|
+
serverBase.onError(function(err, c) {
|
|
32
|
+
var logger = c.get("logger");
|
|
33
|
+
onError(logger, ErrorDigest.EINTER, err, c.req.raw);
|
|
34
|
+
return c.html(createErrorHtml(500), 500);
|
|
35
|
+
});
|
|
36
|
+
plugins = _to_consumable_array(options.plugins || []).concat([
|
|
37
|
+
monitorPlugin({
|
|
38
|
+
logger: getLogger()
|
|
39
|
+
}),
|
|
40
|
+
processedByPlugin(),
|
|
41
|
+
logPlugin(),
|
|
42
|
+
injectResourcePlugin(),
|
|
43
|
+
serverStaticPlugin(),
|
|
44
|
+
faviconPlugin(),
|
|
45
|
+
renderPlugin({
|
|
46
|
+
staticGenerate: options.staticGenerate,
|
|
47
|
+
cacheConfig
|
|
48
|
+
})
|
|
49
|
+
]);
|
|
50
|
+
if (nodeServer) {
|
|
51
|
+
plugins.unshift(injectNodeSeverPlugin({
|
|
52
|
+
nodeServer
|
|
53
|
+
}));
|
|
54
|
+
}
|
|
55
|
+
serverBase.addPlugins(plugins);
|
|
56
|
+
return [
|
|
57
|
+
2
|
|
58
|
+
];
|
|
59
|
+
});
|
|
60
|
+
});
|
|
61
|
+
return _applyPlugins.apply(this, arguments);
|
|
62
|
+
}
|
|
63
|
+
export {
|
|
64
|
+
applyPlugins
|
|
65
|
+
};
|
package/dist/esm/index.js
CHANGED
|
@@ -1,47 +1,45 @@
|
|
|
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 { createNodeServer, loadServerEnv } from "@modern-js/server-core/
|
|
4
|
-
import { createServerBase } from "@modern-js/server-core
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
3
|
+
import { createNodeServer, loadServerConfig, loadServerEnv } from "@modern-js/server-core/node";
|
|
4
|
+
import { createServerBase } from "@modern-js/server-core";
|
|
5
|
+
import { applyPlugins } from "./apply";
|
|
6
|
+
import { applyPlugins as applyPlugins2 } from "./apply";
|
|
7
|
+
import { loadServerPlugins, loadServerConfig as loadServerConfig2 } from "@modern-js/server-core/node";
|
|
7
8
|
var createProdServer = function() {
|
|
8
9
|
var _ref = _async_to_generator(function(options) {
|
|
9
|
-
var server, nodeServer;
|
|
10
|
+
var serverConfig, serverBaseOptions, server, nodeServer;
|
|
10
11
|
return _ts_generator(this, function(_state) {
|
|
11
12
|
switch (_state.label) {
|
|
12
13
|
case 0:
|
|
13
|
-
server = createServerBase(options);
|
|
14
14
|
return [
|
|
15
15
|
4,
|
|
16
16
|
loadServerEnv(options)
|
|
17
17
|
];
|
|
18
18
|
case 1:
|
|
19
19
|
_state.sent();
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
20
|
+
serverConfig = loadServerConfig(options.pwd, options.serverConfigFile, options.serverConfigPath);
|
|
21
|
+
serverBaseOptions = options;
|
|
22
|
+
if (serverConfig) {
|
|
23
|
+
serverBaseOptions.serverConfig = serverConfig;
|
|
24
|
+
}
|
|
25
|
+
server = createServerBase(serverBaseOptions);
|
|
26
26
|
return [
|
|
27
27
|
4,
|
|
28
28
|
createNodeServer(server.handle.bind(server))
|
|
29
29
|
];
|
|
30
|
-
case
|
|
30
|
+
case 2:
|
|
31
31
|
nodeServer = _state.sent();
|
|
32
32
|
return [
|
|
33
33
|
4,
|
|
34
|
-
server
|
|
35
|
-
app: nodeServer
|
|
36
|
-
})
|
|
34
|
+
applyPlugins(server, options, nodeServer)
|
|
37
35
|
];
|
|
38
|
-
case
|
|
36
|
+
case 3:
|
|
39
37
|
_state.sent();
|
|
40
38
|
return [
|
|
41
39
|
4,
|
|
42
|
-
|
|
40
|
+
server.init()
|
|
43
41
|
];
|
|
44
|
-
case
|
|
42
|
+
case 4:
|
|
45
43
|
_state.sent();
|
|
46
44
|
return [
|
|
47
45
|
2,
|
|
@@ -55,6 +53,8 @@ var createProdServer = function() {
|
|
|
55
53
|
};
|
|
56
54
|
}();
|
|
57
55
|
export {
|
|
56
|
+
applyPlugins2 as applyPlugins,
|
|
58
57
|
createProdServer,
|
|
59
|
-
|
|
58
|
+
loadServerConfig2 as loadServerConfig,
|
|
59
|
+
loadServerPlugins
|
|
60
60
|
};
|
package/dist/esm/netlify.js
CHANGED
|
@@ -1,9 +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 { loadServerEnv } from "@modern-js/server-core/
|
|
4
|
-
import { createServerBase } from "@modern-js/server-core
|
|
5
|
-
import {
|
|
6
|
-
import { initProdMiddlewares as initProdMiddlewares2 } from "./init";
|
|
3
|
+
import { loadServerEnv } from "@modern-js/server-core/node";
|
|
4
|
+
import { createServerBase } from "@modern-js/server-core";
|
|
5
|
+
import { applyPlugins } from "./apply";
|
|
7
6
|
var createNetlifyFunction = function() {
|
|
8
7
|
var _ref = _async_to_generator(function(options) {
|
|
9
8
|
var server;
|
|
@@ -19,13 +18,13 @@ var createNetlifyFunction = function() {
|
|
|
19
18
|
_state.sent();
|
|
20
19
|
return [
|
|
21
20
|
4,
|
|
22
|
-
server
|
|
21
|
+
applyPlugins(server, options)
|
|
23
22
|
];
|
|
24
23
|
case 2:
|
|
25
24
|
_state.sent();
|
|
26
25
|
return [
|
|
27
26
|
4,
|
|
28
|
-
|
|
27
|
+
server.init()
|
|
29
28
|
];
|
|
30
29
|
case 3:
|
|
31
30
|
_state.sent();
|
|
@@ -43,6 +42,5 @@ var createNetlifyFunction = function() {
|
|
|
43
42
|
};
|
|
44
43
|
}();
|
|
45
44
|
export {
|
|
46
|
-
createNetlifyFunction
|
|
47
|
-
initProdMiddlewares2 as initProdMiddlewares
|
|
45
|
+
createNetlifyFunction
|
|
48
46
|
};
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import { ErrorDigest, createErrorHtml, faviconPlugin, logPlugin, monitorPlugin, onError, processedByPlugin, renderPlugin } from "@modern-js/server-core";
|
|
2
|
+
import { serverStaticPlugin, injectResourcePlugin, loadCacheConfig, injectNodeSeverPlugin } from "@modern-js/server-core/node";
|
|
3
|
+
import { createLogger, isProd } from "@modern-js/utils";
|
|
4
|
+
function getLogger() {
|
|
5
|
+
if (process.env.DEBUG || process.env.NODE_ENV === "production") {
|
|
6
|
+
return createLogger({
|
|
7
|
+
level: "verbose"
|
|
8
|
+
});
|
|
9
|
+
} else {
|
|
10
|
+
return createLogger();
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
async function applyPlugins(serverBase, options, nodeServer) {
|
|
14
|
+
const { pwd, appContext } = options;
|
|
15
|
+
const loadCachePwd = isProd() ? pwd : appContext.appDirectory || pwd;
|
|
16
|
+
const cacheConfig = loadCacheConfig(loadCachePwd);
|
|
17
|
+
serverBase.notFound((c) => {
|
|
18
|
+
const logger = c.get("logger");
|
|
19
|
+
onError(logger, ErrorDigest.ENOTF, "404 not found", c.req.raw);
|
|
20
|
+
return c.html(createErrorHtml(404), 404);
|
|
21
|
+
});
|
|
22
|
+
serverBase.onError((err, c) => {
|
|
23
|
+
const logger = c.get("logger");
|
|
24
|
+
onError(logger, ErrorDigest.EINTER, err, c.req.raw);
|
|
25
|
+
return c.html(createErrorHtml(500), 500);
|
|
26
|
+
});
|
|
27
|
+
const plugins = [
|
|
28
|
+
...options.plugins || [],
|
|
29
|
+
monitorPlugin({
|
|
30
|
+
logger: getLogger()
|
|
31
|
+
}),
|
|
32
|
+
processedByPlugin(),
|
|
33
|
+
logPlugin(),
|
|
34
|
+
injectResourcePlugin(),
|
|
35
|
+
serverStaticPlugin(),
|
|
36
|
+
faviconPlugin(),
|
|
37
|
+
renderPlugin({
|
|
38
|
+
staticGenerate: options.staticGenerate,
|
|
39
|
+
cacheConfig
|
|
40
|
+
})
|
|
41
|
+
];
|
|
42
|
+
if (nodeServer) {
|
|
43
|
+
plugins.unshift(injectNodeSeverPlugin({
|
|
44
|
+
nodeServer
|
|
45
|
+
}));
|
|
46
|
+
}
|
|
47
|
+
serverBase.addPlugins(plugins);
|
|
48
|
+
}
|
|
49
|
+
export {
|
|
50
|
+
applyPlugins
|
|
51
|
+
};
|
package/dist/esm-node/index.js
CHANGED
|
@@ -1,19 +1,24 @@
|
|
|
1
|
-
import { createNodeServer, loadServerEnv } from "@modern-js/server-core/
|
|
2
|
-
import { createServerBase } from "@modern-js/server-core
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
1
|
+
import { createNodeServer, loadServerConfig, loadServerEnv } from "@modern-js/server-core/node";
|
|
2
|
+
import { createServerBase } from "@modern-js/server-core";
|
|
3
|
+
import { applyPlugins } from "./apply";
|
|
4
|
+
import { applyPlugins as applyPlugins2 } from "./apply";
|
|
5
|
+
import { loadServerPlugins, loadServerConfig as loadServerConfig2 } from "@modern-js/server-core/node";
|
|
5
6
|
const createProdServer = async (options) => {
|
|
6
|
-
const server = createServerBase(options);
|
|
7
7
|
await loadServerEnv(options);
|
|
8
|
-
|
|
8
|
+
const serverConfig = loadServerConfig(options.pwd, options.serverConfigFile, options.serverConfigPath);
|
|
9
|
+
const serverBaseOptions = options;
|
|
10
|
+
if (serverConfig) {
|
|
11
|
+
serverBaseOptions.serverConfig = serverConfig;
|
|
12
|
+
}
|
|
13
|
+
const server = createServerBase(serverBaseOptions);
|
|
9
14
|
const nodeServer = await createNodeServer(server.handle.bind(server));
|
|
10
|
-
await server
|
|
11
|
-
|
|
12
|
-
});
|
|
13
|
-
await initProdMiddlewares(server, options);
|
|
15
|
+
await applyPlugins(server, options, nodeServer);
|
|
16
|
+
await server.init();
|
|
14
17
|
return nodeServer;
|
|
15
18
|
};
|
|
16
19
|
export {
|
|
20
|
+
applyPlugins2 as applyPlugins,
|
|
17
21
|
createProdServer,
|
|
18
|
-
|
|
22
|
+
loadServerConfig2 as loadServerConfig,
|
|
23
|
+
loadServerPlugins
|
|
19
24
|
};
|
package/dist/esm-node/netlify.js
CHANGED
|
@@ -1,17 +1,15 @@
|
|
|
1
|
-
import { loadServerEnv } from "@modern-js/server-core/
|
|
2
|
-
import { createServerBase } from "@modern-js/server-core
|
|
3
|
-
import {
|
|
4
|
-
import { initProdMiddlewares as initProdMiddlewares2 } from "./init";
|
|
1
|
+
import { loadServerEnv } from "@modern-js/server-core/node";
|
|
2
|
+
import { createServerBase } from "@modern-js/server-core";
|
|
3
|
+
import { applyPlugins } from "./apply";
|
|
5
4
|
const createNetlifyFunction = async (options) => {
|
|
6
5
|
const server = createServerBase(options);
|
|
7
6
|
await loadServerEnv(options);
|
|
7
|
+
await applyPlugins(server, options);
|
|
8
8
|
await server.init();
|
|
9
|
-
await initProdMiddlewares(server, options);
|
|
10
9
|
return (request, context) => {
|
|
11
10
|
return server.handle(request, context);
|
|
12
11
|
};
|
|
13
12
|
};
|
|
14
13
|
export {
|
|
15
|
-
createNetlifyFunction
|
|
16
|
-
initProdMiddlewares2 as initProdMiddlewares
|
|
14
|
+
createNetlifyFunction
|
|
17
15
|
};
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
import { ServerBase, NodeServer } from '@modern-js/server-core';
|
|
3
|
+
import { ProdServerOptions } from './types';
|
|
4
|
+
export type ApplyPlugins = typeof applyPlugins;
|
|
5
|
+
export declare function applyPlugins(serverBase: ServerBase, options: ProdServerOptions, nodeServer?: NodeServer): Promise<void>;
|
package/dist/types/index.d.ts
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
/// <reference types="node" />
|
|
3
3
|
import { ProdServerOptions } from './types';
|
|
4
|
-
export {
|
|
4
|
+
export { applyPlugins, type ApplyPlugins } from './apply';
|
|
5
|
+
export { loadServerPlugins, loadServerConfig, } from '@modern-js/server-core/node';
|
|
6
|
+
export type { ServerPlugin } from '@modern-js/server-core';
|
|
5
7
|
export type { ProdServerOptions, BaseEnv } from './types';
|
|
6
8
|
export declare const createProdServer: (options: ProdServerOptions) => Promise<(import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse> | import("https").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>) & {
|
|
7
|
-
getRequestListener: () => (req: import("http").IncomingMessage, res: import("@modern-js/server-core/dist/types/
|
|
8
|
-
getRequestHandler: () => import("@modern-js/server-core/dist/types/
|
|
9
|
+
getRequestListener: () => (req: import("http").IncomingMessage, res: import("@modern-js/server-core/dist/types/types").NodeResponse) => Promise<void>;
|
|
10
|
+
getRequestHandler: () => import("@modern-js/server-core/dist/types/types").RequestHandler;
|
|
9
11
|
}>;
|
package/dist/types/netlify.d.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
1
|
import { ProdServerOptions } from './types';
|
|
2
|
-
export { initProdMiddlewares, type InitProdMiddlewares } from './init';
|
|
3
2
|
export type { ProdServerOptions, BaseEnv } from './types';
|
|
4
3
|
export declare const createNetlifyFunction: (options: ProdServerOptions) => Promise<(request: Request, context: unknown) => Response | Promise<Response>>;
|
package/dist/types/types.d.ts
CHANGED
|
@@ -1,10 +1,14 @@
|
|
|
1
|
-
import { ServerBaseOptions,
|
|
1
|
+
import { ServerBaseOptions, RenderPluginOptions, ServerPlugin } from '@modern-js/server-core';
|
|
2
2
|
import { Reporter } from '@modern-js/types';
|
|
3
3
|
import { Logger } from '@modern-js/utils';
|
|
4
|
-
interface
|
|
4
|
+
interface ProdServerExtraOptions {
|
|
5
5
|
logger?: Logger;
|
|
6
|
+
/** compat modern.server-runtime.config.ts */
|
|
7
|
+
serverConfigFile?: string;
|
|
8
|
+
serverConfigPath?: string;
|
|
9
|
+
plugins?: ServerPlugin[];
|
|
6
10
|
}
|
|
7
|
-
export type ProdServerOptions = ServerBaseOptions
|
|
11
|
+
export type ProdServerOptions = Exclude<ServerBaseOptions, 'serverConfig'> & ProdServerExtraOptions & RenderPluginOptions;
|
|
8
12
|
export type BaseEnv = {
|
|
9
13
|
Variables: {
|
|
10
14
|
logger: Logger;
|
package/package.json
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"modern",
|
|
16
16
|
"modern.js"
|
|
17
17
|
],
|
|
18
|
-
"version": "2.
|
|
18
|
+
"version": "2.54.0",
|
|
19
19
|
"jsnext:source": "./src/index.ts",
|
|
20
20
|
"types": "./dist/types/index.d.ts",
|
|
21
21
|
"main": "./dist/cjs/index.js",
|
|
@@ -41,9 +41,9 @@
|
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
43
|
"@swc/helpers": "0.5.3",
|
|
44
|
-
"@modern-js/server-core": "2.
|
|
45
|
-
"@modern-js/utils": "2.
|
|
46
|
-
"@modern-js/
|
|
44
|
+
"@modern-js/server-core": "2.54.0",
|
|
45
|
+
"@modern-js/runtime-utils": "2.54.0",
|
|
46
|
+
"@modern-js/utils": "2.54.0"
|
|
47
47
|
},
|
|
48
48
|
"devDependencies": {
|
|
49
49
|
"@types/merge-deep": "^3.0.0",
|
|
@@ -56,10 +56,10 @@
|
|
|
56
56
|
"tsx": "^3.12.7",
|
|
57
57
|
"@types/jest": "^29",
|
|
58
58
|
"typescript": "~5.0.4",
|
|
59
|
-
"@modern-js/eslint-config": "2.
|
|
60
|
-
"@scripts/build": "2.
|
|
61
|
-
"@
|
|
62
|
-
"@
|
|
59
|
+
"@modern-js/eslint-config": "2.54.0",
|
|
60
|
+
"@scripts/build": "2.54.0",
|
|
61
|
+
"@modern-js/types": "2.54.0",
|
|
62
|
+
"@scripts/jest-config": "2.54.0"
|
|
63
63
|
},
|
|
64
64
|
"sideEffects": [],
|
|
65
65
|
"engines": {
|
package/dist/cjs/init.js
DELETED
|
@@ -1,70 +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 init_exports = {};
|
|
20
|
-
__export(init_exports, {
|
|
21
|
-
initProdMiddlewares: () => initProdMiddlewares
|
|
22
|
-
});
|
|
23
|
-
module.exports = __toCommonJS(init_exports);
|
|
24
|
-
var import_base = require("@modern-js/server-core/base");
|
|
25
|
-
var import_utils = require("@modern-js/utils");
|
|
26
|
-
var import_node = require("@modern-js/server-core/base/node");
|
|
27
|
-
function getLogger() {
|
|
28
|
-
if (process.env.DEBUG || process.env.NODE_ENV === "production") {
|
|
29
|
-
return (0, import_utils.createLogger)({
|
|
30
|
-
level: "verbose"
|
|
31
|
-
});
|
|
32
|
-
} else {
|
|
33
|
-
return (0, import_utils.createLogger)();
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
const initProdMiddlewares = async (server, options) => {
|
|
37
|
-
const { config, pwd, routes, logger: inputLogger } = options;
|
|
38
|
-
const logger = inputLogger || getLogger();
|
|
39
|
-
const staticMiddleware = (0, import_node.createStaticMiddleware)({
|
|
40
|
-
pwd,
|
|
41
|
-
output: (config === null || config === void 0 ? void 0 : config.output) || {},
|
|
42
|
-
html: (config === null || config === void 0 ? void 0 : config.html) || {},
|
|
43
|
-
routes
|
|
44
|
-
});
|
|
45
|
-
server.all("*", import_base.processedBy);
|
|
46
|
-
server.all("*", (0, import_base.injectReporter)());
|
|
47
|
-
server.all("*", (0, import_base.injectLogger)(logger));
|
|
48
|
-
server.all("*", (0, import_base.logHandler)());
|
|
49
|
-
server.all("*", (0, import_node.injectServerManifest)(pwd, routes));
|
|
50
|
-
server.all("*", (0, import_node.injectTemplates)(pwd, routes));
|
|
51
|
-
server.notFound((c) => {
|
|
52
|
-
const logger2 = c.get("logger");
|
|
53
|
-
(0, import_base.onError)(logger2, import_base.ErrorDigest.ENOTF, "404 not found", c.req.raw);
|
|
54
|
-
return c.html((0, import_base.createErrorHtml)(404), 404);
|
|
55
|
-
});
|
|
56
|
-
server.onError((err, c) => {
|
|
57
|
-
const logger2 = c.get("logger");
|
|
58
|
-
(0, import_base.onError)(logger2, import_base.ErrorDigest.EINTER, err, c.req.raw);
|
|
59
|
-
return c.html((0, import_base.createErrorHtml)(500), 500);
|
|
60
|
-
});
|
|
61
|
-
server.get("*", staticMiddleware);
|
|
62
|
-
server.get("*", import_base.favionFallbackMiddleware);
|
|
63
|
-
await (0, import_node.bindBFFHandler)(server, options);
|
|
64
|
-
await (0, import_base.bindRenderHandler)(server, options);
|
|
65
|
-
return server;
|
|
66
|
-
};
|
|
67
|
-
// Annotate the CommonJS export names for ESM import in node:
|
|
68
|
-
0 && (module.exports = {
|
|
69
|
-
initProdMiddlewares
|
|
70
|
-
});
|
package/dist/esm/init.js
DELETED
|
@@ -1,72 +0,0 @@
|
|
|
1
|
-
import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
|
|
2
|
-
import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
|
|
3
|
-
import { bindRenderHandler, favionFallbackMiddleware, injectReporter, injectLogger, createErrorHtml, logHandler, processedBy, onError, ErrorDigest } from "@modern-js/server-core/base";
|
|
4
|
-
import { createLogger } from "@modern-js/utils";
|
|
5
|
-
import { injectTemplates, bindBFFHandler, injectServerManifest, createStaticMiddleware } from "@modern-js/server-core/base/node";
|
|
6
|
-
function getLogger() {
|
|
7
|
-
if (process.env.DEBUG || process.env.NODE_ENV === "production") {
|
|
8
|
-
return createLogger({
|
|
9
|
-
level: "verbose"
|
|
10
|
-
});
|
|
11
|
-
} else {
|
|
12
|
-
return createLogger();
|
|
13
|
-
}
|
|
14
|
-
}
|
|
15
|
-
var initProdMiddlewares = function() {
|
|
16
|
-
var _ref = _async_to_generator(function(server, options) {
|
|
17
|
-
var config, pwd, routes, inputLogger, logger, staticMiddleware;
|
|
18
|
-
return _ts_generator(this, function(_state) {
|
|
19
|
-
switch (_state.label) {
|
|
20
|
-
case 0:
|
|
21
|
-
config = options.config, pwd = options.pwd, routes = options.routes, inputLogger = options.logger;
|
|
22
|
-
logger = inputLogger || getLogger();
|
|
23
|
-
staticMiddleware = createStaticMiddleware({
|
|
24
|
-
pwd,
|
|
25
|
-
output: (config === null || config === void 0 ? void 0 : config.output) || {},
|
|
26
|
-
html: (config === null || config === void 0 ? void 0 : config.html) || {},
|
|
27
|
-
routes
|
|
28
|
-
});
|
|
29
|
-
server.all("*", processedBy);
|
|
30
|
-
server.all("*", injectReporter());
|
|
31
|
-
server.all("*", injectLogger(logger));
|
|
32
|
-
server.all("*", logHandler());
|
|
33
|
-
server.all("*", injectServerManifest(pwd, routes));
|
|
34
|
-
server.all("*", injectTemplates(pwd, routes));
|
|
35
|
-
server.notFound(function(c) {
|
|
36
|
-
var logger2 = c.get("logger");
|
|
37
|
-
onError(logger2, ErrorDigest.ENOTF, "404 not found", c.req.raw);
|
|
38
|
-
return c.html(createErrorHtml(404), 404);
|
|
39
|
-
});
|
|
40
|
-
server.onError(function(err, c) {
|
|
41
|
-
var logger2 = c.get("logger");
|
|
42
|
-
onError(logger2, ErrorDigest.EINTER, err, c.req.raw);
|
|
43
|
-
return c.html(createErrorHtml(500), 500);
|
|
44
|
-
});
|
|
45
|
-
server.get("*", staticMiddleware);
|
|
46
|
-
server.get("*", favionFallbackMiddleware);
|
|
47
|
-
return [
|
|
48
|
-
4,
|
|
49
|
-
bindBFFHandler(server, options)
|
|
50
|
-
];
|
|
51
|
-
case 1:
|
|
52
|
-
_state.sent();
|
|
53
|
-
return [
|
|
54
|
-
4,
|
|
55
|
-
bindRenderHandler(server, options)
|
|
56
|
-
];
|
|
57
|
-
case 2:
|
|
58
|
-
_state.sent();
|
|
59
|
-
return [
|
|
60
|
-
2,
|
|
61
|
-
server
|
|
62
|
-
];
|
|
63
|
-
}
|
|
64
|
-
});
|
|
65
|
-
});
|
|
66
|
-
return function initProdMiddlewares2(server, options) {
|
|
67
|
-
return _ref.apply(this, arguments);
|
|
68
|
-
};
|
|
69
|
-
}();
|
|
70
|
-
export {
|
|
71
|
-
initProdMiddlewares
|
|
72
|
-
};
|
package/dist/esm-node/init.js
DELETED
|
@@ -1,46 +0,0 @@
|
|
|
1
|
-
import { bindRenderHandler, favionFallbackMiddleware, injectReporter, injectLogger, createErrorHtml, logHandler, processedBy, onError, ErrorDigest } from "@modern-js/server-core/base";
|
|
2
|
-
import { createLogger } from "@modern-js/utils";
|
|
3
|
-
import { injectTemplates, bindBFFHandler, injectServerManifest, createStaticMiddleware } from "@modern-js/server-core/base/node";
|
|
4
|
-
function getLogger() {
|
|
5
|
-
if (process.env.DEBUG || process.env.NODE_ENV === "production") {
|
|
6
|
-
return createLogger({
|
|
7
|
-
level: "verbose"
|
|
8
|
-
});
|
|
9
|
-
} else {
|
|
10
|
-
return createLogger();
|
|
11
|
-
}
|
|
12
|
-
}
|
|
13
|
-
const initProdMiddlewares = async (server, options) => {
|
|
14
|
-
const { config, pwd, routes, logger: inputLogger } = options;
|
|
15
|
-
const logger = inputLogger || getLogger();
|
|
16
|
-
const staticMiddleware = createStaticMiddleware({
|
|
17
|
-
pwd,
|
|
18
|
-
output: (config === null || config === void 0 ? void 0 : config.output) || {},
|
|
19
|
-
html: (config === null || config === void 0 ? void 0 : config.html) || {},
|
|
20
|
-
routes
|
|
21
|
-
});
|
|
22
|
-
server.all("*", processedBy);
|
|
23
|
-
server.all("*", injectReporter());
|
|
24
|
-
server.all("*", injectLogger(logger));
|
|
25
|
-
server.all("*", logHandler());
|
|
26
|
-
server.all("*", injectServerManifest(pwd, routes));
|
|
27
|
-
server.all("*", injectTemplates(pwd, routes));
|
|
28
|
-
server.notFound((c) => {
|
|
29
|
-
const logger2 = c.get("logger");
|
|
30
|
-
onError(logger2, ErrorDigest.ENOTF, "404 not found", c.req.raw);
|
|
31
|
-
return c.html(createErrorHtml(404), 404);
|
|
32
|
-
});
|
|
33
|
-
server.onError((err, c) => {
|
|
34
|
-
const logger2 = c.get("logger");
|
|
35
|
-
onError(logger2, ErrorDigest.EINTER, err, c.req.raw);
|
|
36
|
-
return c.html(createErrorHtml(500), 500);
|
|
37
|
-
});
|
|
38
|
-
server.get("*", staticMiddleware);
|
|
39
|
-
server.get("*", favionFallbackMiddleware);
|
|
40
|
-
await bindBFFHandler(server, options);
|
|
41
|
-
await bindRenderHandler(server, options);
|
|
42
|
-
return server;
|
|
43
|
-
};
|
|
44
|
-
export {
|
|
45
|
-
initProdMiddlewares
|
|
46
|
-
};
|
package/dist/types/init.d.ts
DELETED
|
@@ -1,4 +0,0 @@
|
|
|
1
|
-
import { ServerBase } from '@modern-js/server-core/base';
|
|
2
|
-
import { ProdServerOptions, BaseEnv } from './types';
|
|
3
|
-
export type InitProdMiddlewares = typeof initProdMiddlewares;
|
|
4
|
-
export declare const initProdMiddlewares: (server: ServerBase<BaseEnv>, options: ProdServerOptions) => Promise<ServerBase<BaseEnv>>;
|