@modern-js/prod-server 2.49.2 → 2.49.3-alpha.0

package/dist/cjs/init.js

@@ -24,7 +24,6 @@ module.exports = __toCommonJS(init_exports);
 var import_base = require("@modern-js/server-core/base");
 var import_utils = require("@modern-js/utils");
 var import_node = require("@modern-js/server-core/base/node");
-var import_error = require("./error");
 function getLogger() {
   if (process.env.DEBUG || process.env.NODE_ENV === "production") {
     return (0, import_utils.createLogger)({
@@ -51,12 +50,12 @@ const initProdMiddlewares = async (server, options) => {
   server.all("*", (0, import_node.injectTemplates)(pwd, routes));
   server.notFound((c) => {
     const logger2 = c.get("logger");
-    (0, import_error.onError)(logger2, import_error.ErrorDigest.ENOTF, "404 not found", c.req.raw);
+    (0, import_base.onError)(logger2, import_base.ErrorDigest.ENOTF, "404 not found", c.req.raw);
     return c.html((0, import_base.createErrorHtml)(404), 404);
   });
   server.onError((err, c) => {
     const logger2 = c.get("logger");
-    (0, import_error.onError)(logger2, import_error.ErrorDigest.EINTER, err, c.req.raw);
+    (0, import_base.onError)(logger2, import_base.ErrorDigest.EINTER, err, c.req.raw);
     return c.html((0, import_base.createErrorHtml)(500), 500);
   });
   server.get("*", staticMiddleware);

package/dist/cjs/{error.js → netlify.js}

@@ -16,24 +16,27 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var error_exports = {};
-__export(error_exports, {
-  ErrorDigest: () => ErrorDigest,
-  onError: () => onError
+var netlify_exports = {};
+__export(netlify_exports, {
+  createNetlifyFunction: () => createNetlifyFunction,
+  initProdMiddlewares: () => import_init2.initProdMiddlewares
 });
-module.exports = __toCommonJS(error_exports);
-var ErrorDigest;
-(function(ErrorDigest2) {
-  ErrorDigest2["ENOTF"] = "Page could not be found";
-  ErrorDigest2["EINTER"] = "Internal server error";
-})(ErrorDigest || (ErrorDigest = {}));
-function onError(logger, digest, error, req) {
-  const headers = req === null || req === void 0 ? void 0 : req.headers;
-  headers === null || headers === void 0 ? void 0 : headers.delete("cookie");
-  logger.error(req ? `Server Error - ${digest}, error = %s, req.url = %s, req.headers = %o` : `Server Error - ${digest}, error = %s`, error instanceof Error ? error.stack || error.message : error, req === null || req === void 0 ? void 0 : req.url, headers);
-}
+module.exports = __toCommonJS(netlify_exports);
+var import_node = require("@modern-js/server-core/base/node");
+var import_base = require("@modern-js/server-core/base");
+var import_init = require("./init");
+var import_init2 = require("./init");
+const createNetlifyFunction = async (options) => {
+  const server = (0, import_base.createServerBase)(options);
+  await (0, import_node.loadServerEnv)(options);
+  await server.init();
+  await (0, import_init.initProdMiddlewares)(server, options);
+  return (request) => {
+    return server.handle(request);
+  };
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ErrorDigest,
-  onError
+  createNetlifyFunction,
+  initProdMiddlewares
 });

package/dist/esm/init.js

@@ -1,9 +1,8 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { bindRenderHandler, favionFallbackMiddleware, injectReporter, injectLogger, createErrorHtml, logHandler, processedBy } from "@modern-js/server-core/base";
+import { bindRenderHandler, favionFallbackMiddleware, injectReporter, injectLogger, createErrorHtml, logHandler, processedBy, onError, ErrorDigest } from "@modern-js/server-core/base";
 import { createLogger } from "@modern-js/utils";
 import { injectTemplates, bindBFFHandler, injectServerManifest, createStaticMiddleware } from "@modern-js/server-core/base/node";
-import { ErrorDigest, onError } from "./error";
 function getLogger() {
   if (process.env.DEBUG || process.env.NODE_ENV === "production") {
     return createLogger({

package/dist/esm/netlify.js

@@ -0,0 +1,48 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import { loadServerEnv } from "@modern-js/server-core/base/node";
+import { createServerBase } from "@modern-js/server-core/base";
+import { initProdMiddlewares } from "./init";
+import { initProdMiddlewares as initProdMiddlewares2 } from "./init";
+var createNetlifyFunction = function() {
+  var _ref = _async_to_generator(function(options) {
+    var server;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          server = createServerBase(options);
+          return [
+            4,
+            loadServerEnv(options)
+          ];
+        case 1:
+          _state.sent();
+          return [
+            4,
+            server.init()
+          ];
+        case 2:
+          _state.sent();
+          return [
+            4,
+            initProdMiddlewares(server, options)
+          ];
+        case 3:
+          _state.sent();
+          return [
+            2,
+            function(request) {
+              return server.handle(request);
+            }
+          ];
+      }
+    });
+  });
+  return function createNetlifyFunction2(options) {
+    return _ref.apply(this, arguments);
+  };
+}();
+export {
+  createNetlifyFunction,
+  initProdMiddlewares2 as initProdMiddlewares
+};

package/dist/esm-node/init.js

@@ -1,7 +1,6 @@
-import { bindRenderHandler, favionFallbackMiddleware, injectReporter, injectLogger, createErrorHtml, logHandler, processedBy } from "@modern-js/server-core/base";
+import { bindRenderHandler, favionFallbackMiddleware, injectReporter, injectLogger, createErrorHtml, logHandler, processedBy, onError, ErrorDigest } from "@modern-js/server-core/base";
 import { createLogger } from "@modern-js/utils";
 import { injectTemplates, bindBFFHandler, injectServerManifest, createStaticMiddleware } from "@modern-js/server-core/base/node";
-import { ErrorDigest, onError } from "./error";
 function getLogger() {
   if (process.env.DEBUG || process.env.NODE_ENV === "production") {
     return createLogger({

package/dist/esm-node/netlify.js

@@ -0,0 +1,17 @@
+import { loadServerEnv } from "@modern-js/server-core/base/node";
+import { createServerBase } from "@modern-js/server-core/base";
+import { initProdMiddlewares } from "./init";
+import { initProdMiddlewares as initProdMiddlewares2 } from "./init";
+const createNetlifyFunction = async (options) => {
+  const server = createServerBase(options);
+  await loadServerEnv(options);
+  await server.init();
+  await initProdMiddlewares(server, options);
+  return (request) => {
+    return server.handle(request);
+  };
+};
+export {
+  createNetlifyFunction,
+  initProdMiddlewares2 as initProdMiddlewares
+};

package/dist/types/netlify.d.ts

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

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.49.2",
+  "version": "2.49.3-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -37,8 +37,8 @@
   "dependencies": {
     "@swc/helpers": "0.5.3",
     "@modern-js/server-core": "2.49.2",
-    "@modern-js/runtime-utils": "2.49.2",
-    "@modern-js/utils": "2.49.2"
+    "@modern-js/utils": "2.49.2",
+    "@modern-js/runtime-utils": "2.49.2"
   },
   "devDependencies": {
     "@types/merge-deep": "^3.0.0",
@@ -51,10 +51,10 @@
     "tsx": "^3.12.7",
     "@types/jest": "^29",
     "typescript": "~5.0.4",
-    "@modern-js/eslint-config": "2.49.2",
     "@scripts/build": "2.49.2",
+    "@modern-js/types": "2.49.2",
     "@scripts/jest-config": "2.49.2",
-    "@modern-js/types": "2.49.2"
+    "@modern-js/eslint-config": "2.49.2"
   },
   "sideEffects": [],
   "engines": {

package/dist/esm/error.js

@@ -1,15 +0,0 @@
-import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
-var ErrorDigest;
-(function(ErrorDigest2) {
-  ErrorDigest2["ENOTF"] = "Page could not be found";
-  ErrorDigest2["EINTER"] = "Internal server error";
-})(ErrorDigest || (ErrorDigest = {}));
-function onError(logger, digest, error, req) {
-  var headers = req === null || req === void 0 ? void 0 : req.headers;
-  headers === null || headers === void 0 ? void 0 : headers.delete("cookie");
-  logger.error(req ? "Server Error - ".concat(digest, ", error = %s, req.url = %s, req.headers = %o") : "Server Error - ".concat(digest, ", error = %s"), _instanceof(error, Error) ? error.stack || error.message : error, req === null || req === void 0 ? void 0 : req.url, headers);
-}
-export {
-  ErrorDigest,
-  onError
-};

package/dist/esm-node/error.js

@@ -1,14 +0,0 @@
-var ErrorDigest;
-(function(ErrorDigest2) {
-  ErrorDigest2["ENOTF"] = "Page could not be found";
-  ErrorDigest2["EINTER"] = "Internal server error";
-})(ErrorDigest || (ErrorDigest = {}));
-function onError(logger, digest, error, req) {
-  const headers = req === null || req === void 0 ? void 0 : req.headers;
-  headers === null || headers === void 0 ? void 0 : headers.delete("cookie");
-  logger.error(req ? `Server Error - ${digest}, error = %s, req.url = %s, req.headers = %o` : `Server Error - ${digest}, error = %s`, error instanceof Error ? error.stack || error.message : error, req === null || req === void 0 ? void 0 : req.url, headers);
-}
-export {
-  ErrorDigest,
-  onError
-};

package/dist/types/error.d.ts

@@ -1,6 +0,0 @@
-import { Logger } from '@modern-js/types';
-export declare enum ErrorDigest {
-    ENOTF = "Page could not be found",
-    EINTER = "Internal server error"
-}
-export declare function onError(logger: Logger, digest: ErrorDigest, error: Error | string, req?: Request): void;