@modern-js/prod-server 2.69.5 → 2.69.6

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 (4) hide show
  1. package/dist/cjs/apply.js +5 -3
  2. package/dist/esm/apply.js +5 -4
  3. package/dist/esm-node/apply.js +5 -3
  4. package/package.json +5 -5
package/dist/cjs/apply.js CHANGED
@@ -34,8 +34,10 @@ function getLogger(_) {
34
34
  }
35
35
  }
36
36
  async function applyPlugins(serverBase, options, nodeServer) {
37
- var _options_serverConfig;
38
- const { pwd, appContext, config, logger: optLogger } = options;
37
+ var _config_server, _serverConfig_server, _options_serverConfig;
38
+ const { pwd, appContext, config, logger: optLogger, serverConfig } = options;
39
+ var _config_server_rsc, _ref;
40
+ const enableRsc = (_ref = (_config_server_rsc = (_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.rsc) !== null && _config_server_rsc !== void 0 ? _config_server_rsc : serverConfig === null || serverConfig === void 0 ? void 0 : (_serverConfig_server = serverConfig.server) === null || _serverConfig_server === void 0 ? void 0 : _serverConfig_server.rsc) !== null && _ref !== void 0 ? _ref : false;
39
41
  const serverErrorHandler = (_options_serverConfig = options.serverConfig) === null || _options_serverConfig === void 0 ? void 0 : _options_serverConfig.onError;
40
42
  const loadCachePwd = (0, import_utils.isProd)() ? pwd : appContext.appDirectory || pwd;
41
43
  const cacheConfig = await (0, import_node.loadCacheConfig)(loadCachePwd);
@@ -84,7 +86,7 @@ async function applyPlugins(serverBase, options, nodeServer) {
84
86
  (0, import_server_core.injectConfigMiddlewarePlugin)(middlewares, renderMiddlewares),
85
87
  ...options.plugins || [],
86
88
  (0, import_node.injectResourcePlugin)(),
87
- (0, import_node.injectRscManifestPlugin)(),
89
+ (0, import_node.injectRscManifestPlugin)(enableRsc),
88
90
  (0, import_node.serverStaticPlugin)(),
89
91
  (0, import_server_core.faviconPlugin)(),
90
92
  (0, import_server_core.renderPlugin)()
package/dist/esm/apply.js CHANGED
@@ -19,11 +19,12 @@ function applyPlugins(serverBase, options, nodeServer) {
19
19
  }
20
20
  function _applyPlugins() {
21
21
  _applyPlugins = _async_to_generator(function(serverBase, options, nodeServer) {
22
- var _options_serverConfig, pwd, appContext, config, optLogger, serverErrorHandler, loadCachePwd, cacheConfig, loggerOptions, _ref, middlewares, renderMiddlewares, plugins;
22
+ var _config_server, _serverConfig_server, _options_serverConfig, pwd, appContext, config, optLogger, serverConfig, _config_server_rsc, _ref, enableRsc, serverErrorHandler, loadCachePwd, cacheConfig, loggerOptions, _ref1, middlewares, renderMiddlewares, plugins;
23
23
  return _ts_generator(this, function(_state) {
24
24
  switch (_state.label) {
25
25
  case 0:
26
- pwd = options.pwd, appContext = options.appContext, config = options.config, optLogger = options.logger;
26
+ pwd = options.pwd, appContext = options.appContext, config = options.config, optLogger = options.logger, serverConfig = options.serverConfig;
27
+ enableRsc = (_ref = (_config_server_rsc = (_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.rsc) !== null && _config_server_rsc !== void 0 ? _config_server_rsc : serverConfig === null || serverConfig === void 0 ? void 0 : (_serverConfig_server = serverConfig.server) === null || _serverConfig_server === void 0 ? void 0 : _serverConfig_server.rsc) !== null && _ref !== void 0 ? _ref : false;
27
28
  serverErrorHandler = (_options_serverConfig = options.serverConfig) === null || _options_serverConfig === void 0 ? void 0 : _options_serverConfig.onError;
28
29
  loadCachePwd = isProd() ? pwd : appContext.appDirectory || pwd;
29
30
  return [
@@ -108,7 +109,7 @@ function _applyPlugins() {
108
109
  };
109
110
  }());
110
111
  loggerOptions = config.server.logger;
111
- _ref = options.serverConfig || {}, middlewares = _ref.middlewares, renderMiddlewares = _ref.renderMiddlewares;
112
+ _ref1 = options.serverConfig || {}, middlewares = _ref1.middlewares, renderMiddlewares = _ref1.renderMiddlewares;
112
113
  plugins = _to_consumable_array(nodeServer ? [
113
114
  injectNodeSeverPlugin({
114
115
  nodeServer
@@ -121,7 +122,7 @@ function _applyPlugins() {
121
122
  injectConfigMiddlewarePlugin(middlewares, renderMiddlewares)
122
123
  ], _to_consumable_array(options.plugins || []), [
123
124
  injectResourcePlugin(),
124
- injectRscManifestPlugin(),
125
+ injectRscManifestPlugin(enableRsc),
125
126
  serverStaticPlugin(),
126
127
  faviconPlugin(),
127
128
  renderPlugin()
package/dist/esm-node/apply.js CHANGED
@@ -11,8 +11,10 @@ function getLogger(_) {
11
11
  }
12
12
  }
13
13
  async function applyPlugins(serverBase, options, nodeServer) {
14
- var _options_serverConfig;
15
- const { pwd, appContext, config, logger: optLogger } = options;
14
+ var _config_server, _serverConfig_server, _options_serverConfig;
15
+ const { pwd, appContext, config, logger: optLogger, serverConfig } = options;
16
+ var _config_server_rsc, _ref;
17
+ const enableRsc = (_ref = (_config_server_rsc = (_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.rsc) !== null && _config_server_rsc !== void 0 ? _config_server_rsc : serverConfig === null || serverConfig === void 0 ? void 0 : (_serverConfig_server = serverConfig.server) === null || _serverConfig_server === void 0 ? void 0 : _serverConfig_server.rsc) !== null && _ref !== void 0 ? _ref : false;
16
18
  const serverErrorHandler = (_options_serverConfig = options.serverConfig) === null || _options_serverConfig === void 0 ? void 0 : _options_serverConfig.onError;
17
19
  const loadCachePwd = isProd() ? pwd : appContext.appDirectory || pwd;
18
20
  const cacheConfig = await loadCacheConfig(loadCachePwd);
@@ -61,7 +63,7 @@ async function applyPlugins(serverBase, options, nodeServer) {
61
63
  injectConfigMiddlewarePlugin(middlewares, renderMiddlewares),
62
64
  ...options.plugins || [],
63
65
  injectResourcePlugin(),
64
- injectRscManifestPlugin(),
66
+ injectRscManifestPlugin(enableRsc),
65
67
  serverStaticPlugin(),
66
68
  faviconPlugin(),
67
69
  renderPlugin()
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "2.69.5",
18
+ "version": "2.69.6",
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.17",
44
- "@modern-js/server-core": "2.69.5",
45
- "@modern-js/utils": "2.69.5",
46
- "@modern-js/runtime-utils": "2.69.5"
44
+ "@modern-js/runtime-utils": "2.69.6",
45
+ "@modern-js/server-core": "2.69.6",
46
+ "@modern-js/utils": "2.69.6"
47
47
  },
48
48
  "devDependencies": {
49
49
  "@types/jest": "^29",
@@ -53,8 +53,8 @@
53
53
  "lint-staged": "~13.3.0",
54
54
  "tsx": "^3.12.7",
55
55
  "typescript": "~5.0.4",
56
+ "@modern-js/types": "2.69.6",
56
57
  "@scripts/build": "2.66.0",
57
- "@modern-js/types": "2.69.5",
58
58
  "@scripts/jest-config": "2.66.0"
59
59
  },
60
60
  "sideEffects": [],