@modern-js/prod-server 2.58.1 → 2.58.3

package/dist/cjs/apply.js

@@ -36,7 +36,7 @@ function getLogger() {
 async function applyPlugins(serverBase, options, nodeServer) {
   const { pwd, appContext } = options;
   const loadCachePwd = (0, import_utils.isProd)() ? pwd : appContext.appDirectory || pwd;
-  const cacheConfig = (0, import_node.loadCacheConfig)(loadCachePwd);
+  const cacheConfig = await (0, import_node.loadCacheConfig)(loadCachePwd);
   serverBase.notFound((c) => {
     const logger = c.get("logger");
     (0, import_server_core.onError)(import_server_core.ErrorDigest.ENOTF, "404 not found", logger, c.req.raw);

package/dist/cjs/index.js

@@ -34,8 +34,8 @@ __export(src_exports, {
   loadServerRuntimeConfig: () => import_node2.loadServerRuntimeConfig
 });
 module.exports = __toCommonJS(src_exports);
-var import_node = require("@modern-js/server-core/node");
 var import_server_core = require("@modern-js/server-core");
+var import_node = require("@modern-js/server-core/node");
 var import_source_map_support = __toESM(require("source-map-support"));
 var import_apply = require("./apply");
 var import_apply2 = require("./apply");
@@ -48,7 +48,7 @@ const createProdServer = async (options) => {
   if (serverCliConfig) {
     serverBaseOptions.config = serverCliConfig;
   }
-  const serverRuntimeConfig = (0, import_node.loadServerRuntimeConfig)(options.pwd, options.serverConfigFile, options.serverConfigPath);
+  const serverRuntimeConfig = await (0, import_node.loadServerRuntimeConfig)(options.pwd, options.serverConfigFile, options.serverConfigPath);
   if (serverRuntimeConfig) {
     serverBaseOptions.serverConfig = serverRuntimeConfig;
   }

package/dist/cjs/netlify.js

@@ -21,8 +21,8 @@ __export(netlify_exports, {
   createNetlifyFunction: () => createNetlifyFunction
 });
 module.exports = __toCommonJS(netlify_exports);
-var import_node = require("@modern-js/server-core/node");
 var import_server_core = require("@modern-js/server-core");
+var import_node = require("@modern-js/server-core/node");
 var import_apply = require("./apply");
 const createNetlifyFunction = async (options) => {
   const serverCliConfig = (0, import_node.loadServerCliConfig)(options.pwd, options.config);

package/dist/esm/apply.js

@@ -1,8 +1,8 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { ErrorDigest, createErrorHtml, onError, renderPlugin, createDefaultPlugins, faviconPlugin } from "@modern-js/server-core";
-import { serverStaticPlugin, injectResourcePlugin, loadCacheConfig, injectNodeSeverPlugin } from "@modern-js/server-core/node";
+import { ErrorDigest, createDefaultPlugins, createErrorHtml, faviconPlugin, onError, renderPlugin } from "@modern-js/server-core";
+import { injectNodeSeverPlugin, injectResourcePlugin, loadCacheConfig, serverStaticPlugin } from "@modern-js/server-core/node";
 import { createLogger, isProd } from "@modern-js/utils";
 function getLogger() {
   if (process.env.DEBUG || process.env.NODE_ENV === "production") {
@@ -20,37 +20,45 @@ function _applyPlugins() {
   _applyPlugins = _async_to_generator(function(serverBase, options, nodeServer) {
     var pwd, appContext, loadCachePwd, cacheConfig, plugins;
     return _ts_generator(this, function(_state) {
-      pwd = options.pwd, appContext = options.appContext;
-      loadCachePwd = isProd() ? pwd : appContext.appDirectory || pwd;
-      cacheConfig = loadCacheConfig(loadCachePwd);
-      serverBase.notFound(function(c) {
-        var logger = c.get("logger");
-        onError(ErrorDigest.ENOTF, "404 not found", logger, c.req.raw);
-        return c.html(createErrorHtml(404), 404);
-      });
-      serverBase.onError(function(err, c) {
-        var logger = c.get("logger");
-        onError(ErrorDigest.EINTER, err, logger, c.req.raw);
-        return c.html(createErrorHtml(500), 500);
-      });
-      plugins = _to_consumable_array(nodeServer ? [
-        injectNodeSeverPlugin({
-          nodeServer
-        })
-      ] : []).concat(_to_consumable_array(createDefaultPlugins({
-        cacheConfig,
-        staticGenerate: options.staticGenerate,
-        logger: getLogger()
-      })), _to_consumable_array(options.plugins || []), [
-        injectResourcePlugin(),
-        serverStaticPlugin(),
-        faviconPlugin(),
-        renderPlugin()
-      ]);
-      serverBase.addPlugins(plugins);
-      return [
-        2
-      ];
+      switch (_state.label) {
+        case 0:
+          pwd = options.pwd, appContext = options.appContext;
+          loadCachePwd = isProd() ? pwd : appContext.appDirectory || pwd;
+          return [
+            4,
+            loadCacheConfig(loadCachePwd)
+          ];
+        case 1:
+          cacheConfig = _state.sent();
+          serverBase.notFound(function(c) {
+            var logger = c.get("logger");
+            onError(ErrorDigest.ENOTF, "404 not found", logger, c.req.raw);
+            return c.html(createErrorHtml(404), 404);
+          });
+          serverBase.onError(function(err, c) {
+            var logger = c.get("logger");
+            onError(ErrorDigest.EINTER, err, logger, c.req.raw);
+            return c.html(createErrorHtml(500), 500);
+          });
+          plugins = _to_consumable_array(nodeServer ? [
+            injectNodeSeverPlugin({
+              nodeServer
+            })
+          ] : []).concat(_to_consumable_array(createDefaultPlugins({
+            cacheConfig,
+            staticGenerate: options.staticGenerate,
+            logger: getLogger()
+          })), _to_consumable_array(options.plugins || []), [
+            injectResourcePlugin(),
+            serverStaticPlugin(),
+            faviconPlugin(),
+            renderPlugin()
+          ]);
+          serverBase.addPlugins(plugins);
+          return [
+            2
+          ];
+      }
     });
   });
   return _applyPlugins.apply(this, arguments);

package/dist/esm/index.js

@@ -1,7 +1,7 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { createNodeServer, loadServerRuntimeConfig, loadServerCliConfig, loadServerEnv } from "@modern-js/server-core/node";
 import { createServerBase } from "@modern-js/server-core";
+import { createNodeServer, loadServerCliConfig, loadServerEnv, loadServerRuntimeConfig } from "@modern-js/server-core/node";
 import sourceMapSupport from "source-map-support";
 import { applyPlugins } from "./apply";
 sourceMapSupport.install();
@@ -24,7 +24,12 @@ var createProdServer = function() {
           if (serverCliConfig) {
             serverBaseOptions.config = serverCliConfig;
           }
-          serverRuntimeConfig = loadServerRuntimeConfig(options.pwd, options.serverConfigFile, options.serverConfigPath);
+          return [
+            4,
+            loadServerRuntimeConfig(options.pwd, options.serverConfigFile, options.serverConfigPath)
+          ];
+        case 2:
+          serverRuntimeConfig = _state.sent();
           if (serverRuntimeConfig) {
             serverBaseOptions.serverConfig = serverRuntimeConfig;
           }
@@ -33,19 +38,19 @@ var createProdServer = function() {
             4,
             createNodeServer(server.handle.bind(server))
           ];
-        case 2:
+        case 3:
           nodeServer = _state.sent();
           return [
             4,
             applyPlugins(server, options, nodeServer)
           ];
-        case 3:
+        case 4:
           _state.sent();
           return [
             4,
             server.init()
           ];
-        case 4:
+        case 5:
           _state.sent();
           return [
             2,

package/dist/esm/netlify.js

@@ -1,7 +1,7 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { loadServerCliConfig, loadServerEnv } from "@modern-js/server-core/node";
 import { createServerBase } from "@modern-js/server-core";
+import { loadServerCliConfig, loadServerEnv } from "@modern-js/server-core/node";
 import { applyPlugins } from "./apply";
 var createNetlifyFunction = function() {
   var _ref = _async_to_generator(function(options) {

package/dist/esm-node/apply.js

@@ -1,5 +1,5 @@
-import { ErrorDigest, createErrorHtml, onError, renderPlugin, createDefaultPlugins, faviconPlugin } from "@modern-js/server-core";
-import { serverStaticPlugin, injectResourcePlugin, loadCacheConfig, injectNodeSeverPlugin } from "@modern-js/server-core/node";
+import { ErrorDigest, createDefaultPlugins, createErrorHtml, faviconPlugin, onError, renderPlugin } from "@modern-js/server-core";
+import { injectNodeSeverPlugin, injectResourcePlugin, loadCacheConfig, serverStaticPlugin } from "@modern-js/server-core/node";
 import { createLogger, isProd } from "@modern-js/utils";
 function getLogger() {
   if (process.env.DEBUG || process.env.NODE_ENV === "production") {
@@ -13,7 +13,7 @@ function getLogger() {
 async function applyPlugins(serverBase, options, nodeServer) {
   const { pwd, appContext } = options;
   const loadCachePwd = isProd() ? pwd : appContext.appDirectory || pwd;
-  const cacheConfig = loadCacheConfig(loadCachePwd);
+  const cacheConfig = await loadCacheConfig(loadCachePwd);
   serverBase.notFound((c) => {
     const logger = c.get("logger");
     onError(ErrorDigest.ENOTF, "404 not found", logger, c.req.raw);

package/dist/esm-node/index.js

@@ -1,5 +1,5 @@
-import { createNodeServer, loadServerRuntimeConfig, loadServerCliConfig, loadServerEnv } from "@modern-js/server-core/node";
 import { createServerBase } from "@modern-js/server-core";
+import { createNodeServer, loadServerCliConfig, loadServerEnv, loadServerRuntimeConfig } from "@modern-js/server-core/node";
 import sourceMapSupport from "source-map-support";
 import { applyPlugins } from "./apply";
 sourceMapSupport.install();
@@ -12,7 +12,7 @@ const createProdServer = async (options) => {
   if (serverCliConfig) {
     serverBaseOptions.config = serverCliConfig;
   }
-  const serverRuntimeConfig = loadServerRuntimeConfig(options.pwd, options.serverConfigFile, options.serverConfigPath);
+  const serverRuntimeConfig = await loadServerRuntimeConfig(options.pwd, options.serverConfigFile, options.serverConfigPath);
   if (serverRuntimeConfig) {
     serverBaseOptions.serverConfig = serverRuntimeConfig;
   }

package/dist/esm-node/netlify.js

@@ -1,5 +1,5 @@
-import { loadServerCliConfig, loadServerEnv } from "@modern-js/server-core/node";
 import { createServerBase } from "@modern-js/server-core";
+import { loadServerCliConfig, loadServerEnv } from "@modern-js/server-core/node";
 import { applyPlugins } from "./apply";
 const createNetlifyFunction = async (options) => {
   const serverCliConfig = loadServerCliConfig(options.pwd, options.config);

package/dist/types/apply.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { ServerBase, NodeServer } from '@modern-js/server-core';
-import { ProdServerOptions } from './types';
+import { type NodeServer, type ServerBase } from '@modern-js/server-core';
+import type { ProdServerOptions } from './types';
 export type ApplyPlugins = typeof applyPlugins;
 export declare function applyPlugins(serverBase: ServerBase, options: ProdServerOptions, nodeServer?: NodeServer): Promise<void>;

package/dist/types/index.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { ProdServerOptions } from './types';
+import type { ProdServerOptions } from './types';
 export { applyPlugins, type ApplyPlugins } from './apply';
 export { loadServerPlugins, loadServerRuntimeConfig, } from '@modern-js/server-core/node';
 export type { ServerPlugin } from '@modern-js/server-core';

package/dist/types/netlify.d.ts

@@ -1,3 +1,3 @@
-import { ProdServerOptions } from './types';
+import type { ProdServerOptions } from './types';
 export type { ProdServerOptions, BaseEnv } from './types';
 export declare const createNetlifyFunction: (options: ProdServerOptions) => Promise<(request: Request, context: unknown) => Response | Promise<Response>>;

package/dist/types/types.d.ts

@@ -1,6 +1,6 @@
-import { ServerBaseOptions, CreateDefaultPluginsOptions, ServerPlugin } from '@modern-js/server-core';
-import { Reporter } from '@modern-js/types';
-import { Logger } from '@modern-js/utils';
+import type { CreateDefaultPluginsOptions, ServerBaseOptions, ServerPlugin } from '@modern-js/server-core';
+import type { Reporter } from '@modern-js/types';
+import type { Logger } from '@modern-js/utils';
 interface ProdServerExtraOptions {
     logger?: Logger;
     /** compat modern.server-runtime.config.ts */

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.58.1",
+  "version": "2.58.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -42,9 +42,9 @@
   "dependencies": {
     "@swc/helpers": "0.5.3",
     "source-map-support": "0.5.21",
-    "@modern-js/runtime-utils": "2.58.1",
-    "@modern-js/server-core": "2.58.1",
-    "@modern-js/utils": "2.58.1"
+    "@modern-js/runtime-utils": "2.58.3",
+    "@modern-js/server-core": "2.58.3",
+    "@modern-js/utils": "2.58.3"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -58,10 +58,9 @@
     "rimraf": "^3.0.2",
     "tsx": "^3.12.7",
     "typescript": "~5.0.4",
-    "@modern-js/eslint-config": "2.58.1",
-    "@modern-js/types": "2.58.1",
-    "@scripts/jest-config": "2.58.1",
-    "@scripts/build": "2.58.1"
+    "@modern-js/types": "2.58.3",
+    "@scripts/jest-config": "2.58.3",
+    "@scripts/build": "2.58.3"
   },
   "sideEffects": [],
   "engines": {