@modern-js/prod-server 2.64.1 → 2.64.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/cjs/apply.js +9 -7
  2. package/dist/esm/apply.js +11 -9
  3. package/dist/esm-node/apply.js +10 -8
  4. package/dist/types/types.d.ts +0 -1
  5. package/package.json +7 -7
package/dist/cjs/apply.js CHANGED
@@ -24,7 +24,7 @@ module.exports = __toCommonJS(apply_exports);
24
24
  var import_server_core = require("@modern-js/server-core");
25
25
  var import_node = require("@modern-js/server-core/node");
26
26
  var import_utils = require("@modern-js/utils");
27
- function getLogger() {
27
+ function getLogger(_) {
28
28
  if (process.env.DEBUG || process.env.NODE_ENV === "production") {
29
29
  return (0, import_utils.createLogger)({
30
30
  level: process.env.MODERN_SERVER_LOG_LEVEL || "verbose"
@@ -34,19 +34,20 @@ function getLogger() {
34
34
  }
35
35
  }
36
36
  async function applyPlugins(serverBase, options, nodeServer) {
37
- const { pwd, appContext } = options;
37
+ const { pwd, appContext, config } = options;
38
38
  const loadCachePwd = (0, import_utils.isProd)() ? pwd : appContext.appDirectory || pwd;
39
39
  const cacheConfig = await (0, import_node.loadCacheConfig)(loadCachePwd);
40
40
  serverBase.notFound((c) => {
41
- const logger = c.get("logger");
42
- (0, import_server_core.onError)(import_server_core.ErrorDigest.ENOTF, "404 not found", logger, c.req.raw);
41
+ const monitors = c.get("monitors");
42
+ (0, import_server_core.onError)(import_server_core.ErrorDigest.ENOTF, "404 not found", monitors, c.req.raw);
43
43
  return c.html((0, import_server_core.createErrorHtml)(404), 404);
44
44
  });
45
45
  serverBase.onError((err, c) => {
46
- const logger = c.get("logger");
47
- (0, import_server_core.onError)(import_server_core.ErrorDigest.EINTER, err, logger, c.req.raw);
46
+ const monitors = c.get("monitors");
47
+ (0, import_server_core.onError)(import_server_core.ErrorDigest.EINTER, err, monitors, c.req.raw);
48
48
  return c.html((0, import_server_core.createErrorHtml)(500), 500);
49
49
  });
50
+ const loggerOptions = config.server.logger;
50
51
  const plugins = [
51
52
  ...nodeServer ? [
52
53
  (0, import_node.injectNodeSeverPlugin)({
@@ -56,10 +57,11 @@ async function applyPlugins(serverBase, options, nodeServer) {
56
57
  ...(0, import_server_core.createDefaultPlugins)({
57
58
  cacheConfig,
58
59
  staticGenerate: options.staticGenerate,
59
- logger: getLogger()
60
+ logger: loggerOptions === false ? false : getLogger(loggerOptions)
60
61
  }),
61
62
  ...options.plugins || [],
62
63
  (0, import_node.injectResourcePlugin)(),
64
+ (0, import_node.injectRscManifestPlugin)(),
63
65
  (0, import_node.serverStaticPlugin)(),
64
66
  (0, import_server_core.faviconPlugin)(),
65
67
  (0, import_server_core.renderPlugin)()
package/dist/esm/apply.js CHANGED
@@ -2,9 +2,9 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
2
2
  import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
3
3
  import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
4
4
  import { ErrorDigest, createDefaultPlugins, createErrorHtml, faviconPlugin, onError, renderPlugin } from "@modern-js/server-core";
5
- import { injectNodeSeverPlugin, injectResourcePlugin, loadCacheConfig, serverStaticPlugin } from "@modern-js/server-core/node";
5
+ import { injectNodeSeverPlugin, injectResourcePlugin, injectRscManifestPlugin, loadCacheConfig, serverStaticPlugin } from "@modern-js/server-core/node";
6
6
  import { createLogger, isProd } from "@modern-js/utils";
7
- function getLogger() {
7
+ function getLogger(_) {
8
8
  if (process.env.DEBUG || process.env.NODE_ENV === "production") {
9
9
  return createLogger({
10
10
  level: process.env.MODERN_SERVER_LOG_LEVEL || "verbose"
@@ -18,11 +18,11 @@ function applyPlugins(serverBase, options, nodeServer) {
18
18
  }
19
19
  function _applyPlugins() {
20
20
  _applyPlugins = _async_to_generator(function(serverBase, options, nodeServer) {
21
- var pwd, appContext, loadCachePwd, cacheConfig, plugins;
21
+ var pwd, appContext, config, loadCachePwd, cacheConfig, loggerOptions, plugins;
22
22
  return _ts_generator(this, function(_state) {
23
23
  switch (_state.label) {
24
24
  case 0:
25
- pwd = options.pwd, appContext = options.appContext;
25
+ pwd = options.pwd, appContext = options.appContext, config = options.config;
26
26
  loadCachePwd = isProd() ? pwd : appContext.appDirectory || pwd;
27
27
  return [
28
28
  4,
@@ -31,15 +31,16 @@ function _applyPlugins() {
31
31
  case 1:
32
32
  cacheConfig = _state.sent();
33
33
  serverBase.notFound(function(c) {
34
- var logger = c.get("logger");
35
- onError(ErrorDigest.ENOTF, "404 not found", logger, c.req.raw);
34
+ var monitors = c.get("monitors");
35
+ onError(ErrorDigest.ENOTF, "404 not found", monitors, c.req.raw);
36
36
  return c.html(createErrorHtml(404), 404);
37
37
  });
38
38
  serverBase.onError(function(err, c) {
39
- var logger = c.get("logger");
40
- onError(ErrorDigest.EINTER, err, logger, c.req.raw);
39
+ var monitors = c.get("monitors");
40
+ onError(ErrorDigest.EINTER, err, monitors, c.req.raw);
41
41
  return c.html(createErrorHtml(500), 500);
42
42
  });
43
+ loggerOptions = config.server.logger;
43
44
  plugins = _to_consumable_array(nodeServer ? [
44
45
  injectNodeSeverPlugin({
45
46
  nodeServer
@@ -47,9 +48,10 @@ function _applyPlugins() {
47
48
  ] : []).concat(_to_consumable_array(createDefaultPlugins({
48
49
  cacheConfig,
49
50
  staticGenerate: options.staticGenerate,
50
- logger: getLogger()
51
+ logger: loggerOptions === false ? false : getLogger(loggerOptions)
51
52
  })), _to_consumable_array(options.plugins || []), [
52
53
  injectResourcePlugin(),
54
+ injectRscManifestPlugin(),
53
55
  serverStaticPlugin(),
54
56
  faviconPlugin(),
55
57
  renderPlugin()
package/dist/esm-node/apply.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { ErrorDigest, createDefaultPlugins, createErrorHtml, faviconPlugin, onError, renderPlugin } from "@modern-js/server-core";
2
- import { injectNodeSeverPlugin, injectResourcePlugin, loadCacheConfig, serverStaticPlugin } from "@modern-js/server-core/node";
2
+ import { injectNodeSeverPlugin, injectResourcePlugin, injectRscManifestPlugin, loadCacheConfig, serverStaticPlugin } from "@modern-js/server-core/node";
3
3
  import { createLogger, isProd } from "@modern-js/utils";
4
- function getLogger() {
4
+ function getLogger(_) {
5
5
  if (process.env.DEBUG || process.env.NODE_ENV === "production") {
6
6
  return createLogger({
7
7
  level: process.env.MODERN_SERVER_LOG_LEVEL || "verbose"
@@ -11,19 +11,20 @@ function getLogger() {
11
11
  }
12
12
  }
13
13
  async function applyPlugins(serverBase, options, nodeServer) {
14
- const { pwd, appContext } = options;
14
+ const { pwd, appContext, config } = options;
15
15
  const loadCachePwd = isProd() ? pwd : appContext.appDirectory || pwd;
16
16
  const cacheConfig = await loadCacheConfig(loadCachePwd);
17
17
  serverBase.notFound((c) => {
18
- const logger = c.get("logger");
19
- onError(ErrorDigest.ENOTF, "404 not found", logger, c.req.raw);
18
+ const monitors = c.get("monitors");
19
+ onError(ErrorDigest.ENOTF, "404 not found", monitors, c.req.raw);
20
20
  return c.html(createErrorHtml(404), 404);
21
21
  });
22
22
  serverBase.onError((err, c) => {
23
- const logger = c.get("logger");
24
- onError(ErrorDigest.EINTER, err, logger, c.req.raw);
23
+ const monitors = c.get("monitors");
24
+ onError(ErrorDigest.EINTER, err, monitors, c.req.raw);
25
25
  return c.html(createErrorHtml(500), 500);
26
26
  });
27
+ const loggerOptions = config.server.logger;
27
28
  const plugins = [
28
29
  ...nodeServer ? [
29
30
  injectNodeSeverPlugin({
@@ -33,10 +34,11 @@ async function applyPlugins(serverBase, options, nodeServer) {
33
34
  ...createDefaultPlugins({
34
35
  cacheConfig,
35
36
  staticGenerate: options.staticGenerate,
36
- logger: getLogger()
37
+ logger: loggerOptions === false ? false : getLogger(loggerOptions)
37
38
  }),
38
39
  ...options.plugins || [],
39
40
  injectResourcePlugin(),
41
+ injectRscManifestPlugin(),
40
42
  serverStaticPlugin(),
41
43
  faviconPlugin(),
42
44
  renderPlugin()
package/dist/types/types.d.ts CHANGED
@@ -2,7 +2,6 @@ import type { CreateDefaultPluginsOptions, ServerBaseOptions, ServerPlugin } fro
2
2
  import type { Reporter } from '@modern-js/types';
3
3
  import type { Logger } from '@modern-js/utils';
4
4
  interface ProdServerExtraOptions {
5
- logger?: Logger;
6
5
  /** compat modern.server-runtime.config.ts */
7
6
  serverConfigFile?: string;
8
7
  serverConfigPath?: string;
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "2.64.1",
18
+ "version": "2.64.2",
19
19
  "jsnext:source": "./src/index.ts",
20
20
  "types": "./dist/types/index.d.ts",
21
21
  "main": "./dist/cjs/index.js",
@@ -42,9 +42,9 @@
42
42
  "dependencies": {
43
43
  "@swc/helpers": "0.5.13",
44
44
  "source-map-support": "0.5.21",
45
- "@modern-js/runtime-utils": "2.64.1",
46
- "@modern-js/server-core": "2.64.1",
47
- "@modern-js/utils": "2.64.1"
45
+ "@modern-js/runtime-utils": "2.64.2",
46
+ "@modern-js/utils": "2.64.2",
47
+ "@modern-js/server-core": "2.64.2"
48
48
  },
49
49
  "devDependencies": {
50
50
  "@types/jest": "^29",
@@ -55,9 +55,9 @@
55
55
  "lint-staged": "~13.3.0",
56
56
  "tsx": "^3.12.7",
57
57
  "typescript": "~5.0.4",
58
- "@modern-js/types": "2.64.1",
59
- "@scripts/build": "2.64.1",
60
- "@scripts/jest-config": "2.64.1"
58
+ "@modern-js/types": "2.64.2",
59
+ "@scripts/build": "2.64.2",
60
+ "@scripts/jest-config": "2.64.2"
61
61
  },
62
62
  "sideEffects": [],
63
63
  "engines": {