@modern-js/plugin-express 2.52.0 → 2.54.0

package/dist/cjs/cli/index.js

@@ -54,9 +54,9 @@ const expressPlugin = () => ({
           }
         };
       },
-      collectServerPlugins({ plugins }) {
+      _internalServerPlugins({ plugins }) {
         plugins.push({
-          "@modern-js/plugin-express": "@modern-js/plugin-express/server"
+          name: "@modern-js/plugin-express/server"
         });
         return {
           plugins

package/dist/cjs/plugin.js

@@ -36,7 +36,7 @@ var import_express = __toESM(require("express"));
 var import_cookie_parser = __toESM(require("cookie-parser"));
 var import_utils = require("@modern-js/utils");
 var import_finalhandler = __toESM(require("finalhandler"));
-var import_node = require("@modern-js/server-core/base/node");
+var import_node = require("@modern-js/server-core/node");
 var import_context = require("./context");
 var import_registerRoutes = __toESM(require("./registerRoutes"));
 const findAppModule = async (apiDir) => {
@@ -104,7 +104,7 @@ const createApp = async ({ apiDir, middlewares, mode, apiHandlerInfos, render })
   }
   if (render) {
     app.use(async (req, res, next) => {
-      const response = await render(req.__honoRequest, {
+      const response = await render(req.__honoRequest.raw, {
         logger: import_utils.logger,
         nodeReq: req,
         templates: req.__templates,
@@ -141,18 +141,19 @@ var plugin_default = () => {
       "@modern-js/plugin-server"
     ],
     setup: (api) => ({
-      async onApiChange(changes) {
-        const appContext = api.useAppContext();
-        const middlewares = appContext.apiMiddlewares;
-        const apiHandlerInfos = appContext.apiHandlerInfos;
-        app = await createApp({
-          apiDir,
-          middlewares,
-          mode,
-          apiHandlerInfos,
-          render: renderHtml
-        });
-        return changes;
+      async reset({ event }) {
+        if (event.type === "file-change") {
+          const appContext = api.useAppContext();
+          const middlewares = appContext.apiMiddlewares;
+          const apiHandlerInfos = appContext.apiHandlerInfos;
+          app = await createApp({
+            apiDir,
+            middlewares,
+            mode,
+            apiHandlerInfos,
+            render: renderHtml
+          });
+        }
       },
       async prepareApiServer({ pwd, render }) {
         var _userConfig_bff;

package/dist/esm/cli/index.js

@@ -21,10 +21,10 @@ var expressPlugin = function() {
             }
           };
         },
-        collectServerPlugins: function collectServerPlugins(param) {
+        _internalServerPlugins: function _internalServerPlugins(param) {
           var plugins = param.plugins;
           plugins.push({
-            "@modern-js/plugin-express": "@modern-js/plugin-express/server"
+            name: "@modern-js/plugin-express/server"
           });
           return {
             plugins

package/dist/esm/plugin.js

@@ -5,7 +5,7 @@ import express from "express";
 import cookieParser from "cookie-parser";
 import { fs, compatRequire, logger } from "@modern-js/utils";
 import finalhandler from "finalhandler";
-import { httpCallBack2HonoMid, sendResponse } from "@modern-js/server-core/base/node";
+import { httpCallBack2HonoMid, sendResponse } from "@modern-js/server-core/node";
 import { run } from "./context";
 import registerRoutes from "./registerRoutes";
 var findAppModule = function() {
@@ -175,7 +175,7 @@ var createApp = function() {
                     case 0:
                       return [
                         4,
-                        render(req.__honoRequest, {
+                        render(req.__honoRequest.raw, {
                           logger,
                           nodeReq: req,
                           templates: req.__templates,
@@ -237,12 +237,18 @@ function plugin_default() {
     ],
     setup: function(api) {
       return {
-        onApiChange: function onApiChange(changes) {
+        reset: function reset(param) {
+          var event = param.event;
           return _async_to_generator(function() {
             var appContext, middlewares, apiHandlerInfos;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
+                  if (!(event.type === "file-change"))
+                    return [
+                      3,
+                      2
+                    ];
                   appContext = api.useAppContext();
                   middlewares = appContext.apiMiddlewares;
                   apiHandlerInfos = appContext.apiHandlerInfos;
@@ -258,9 +264,10 @@ function plugin_default() {
                   ];
                 case 1:
                   app = _state.sent();
+                  _state.label = 2;
+                case 2:
                   return [
-                    2,
-                    changes
+                    2
                   ];
               }
             });

package/dist/esm-node/cli/index.js

@@ -20,9 +20,9 @@ const expressPlugin = () => ({
           }
         };
       },
-      collectServerPlugins({ plugins }) {
+      _internalServerPlugins({ plugins }) {
         plugins.push({
-          "@modern-js/plugin-express": "@modern-js/plugin-express/server"
+          name: "@modern-js/plugin-express/server"
         });
         return {
           plugins

package/dist/esm-node/plugin.js

@@ -3,7 +3,7 @@ import express from "express";
 import cookieParser from "cookie-parser";
 import { fs, compatRequire, logger } from "@modern-js/utils";
 import finalhandler from "finalhandler";
-import { httpCallBack2HonoMid, sendResponse } from "@modern-js/server-core/base/node";
+import { httpCallBack2HonoMid, sendResponse } from "@modern-js/server-core/node";
 import { run } from "./context";
 import registerRoutes from "./registerRoutes";
 const findAppModule = async (apiDir) => {
@@ -71,7 +71,7 @@ const createApp = async ({ apiDir, middlewares, mode, apiHandlerInfos, render })
   }
   if (render) {
     app.use(async (req, res, next) => {
-      const response = await render(req.__honoRequest, {
+      const response = await render(req.__honoRequest.raw, {
         logger,
         nodeReq: req,
         templates: req.__templates,
@@ -108,18 +108,19 @@ var plugin_default = () => {
       "@modern-js/plugin-server"
     ],
     setup: (api) => ({
-      async onApiChange(changes) {
-        const appContext = api.useAppContext();
-        const middlewares = appContext.apiMiddlewares;
-        const apiHandlerInfos = appContext.apiHandlerInfos;
-        app = await createApp({
-          apiDir,
-          middlewares,
-          mode,
-          apiHandlerInfos,
-          render: renderHtml
-        });
-        return changes;
+      async reset({ event }) {
+        if (event.type === "file-change") {
+          const appContext = api.useAppContext();
+          const middlewares = appContext.apiMiddlewares;
+          const apiHandlerInfos = appContext.apiHandlerInfos;
+          app = await createApp({
+            apiDir,
+            middlewares,
+            mode,
+            apiHandlerInfos,
+            render: renderHtml
+          });
+        }
       },
       async prepareApiServer({ pwd, render }) {
         var _userConfig_bff;

package/dist/types/plugin.d.ts

@@ -1,10 +1,10 @@
-import type { ServerPlugin } from '@modern-js/server-core';
+import type { ServerManifest, ServerPlugin, InternalRequest } from '@modern-js/server-core';
 declare global {
     namespace Express {
         interface Request {
-            __honoRequest: globalThis.Request;
+            __honoRequest: InternalRequest;
             __templates: Record<string, string>;
-            __serverManifest: any;
+            __serverManifest: ServerManifest;
         }
     }
 }

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.52.0",
+  "version": "2.54.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "main": "./dist/cjs/cli/index.js",
@@ -49,10 +49,10 @@
     "reflect-metadata": "^0.1.13",
     "type-is": "^1.6.18",
     "@swc/helpers": "0.5.3",
-    "@modern-js/bff-core": "2.52.0",
-    "@modern-js/types": "2.52.0",
-    "@modern-js/bff-runtime": "2.52.0",
-    "@modern-js/utils": "2.52.0"
+    "@modern-js/bff-core": "2.54.0",
+    "@modern-js/bff-runtime": "2.54.0",
+    "@modern-js/types": "2.54.0",
+    "@modern-js/utils": "2.54.0"
   },
   "devDependencies": {
     "@types/cookie-parser": "^1.4.2",
@@ -68,11 +68,11 @@
     "supertest": "^6.1.6",
     "typescript": "^5",
     "zod": "^3.22.3",
-    "@modern-js/app-tools": "2.52.0",
-    "@modern-js/server-core": "2.52.0",
-    "@scripts/build": "2.52.0",
-    "@modern-js/core": "2.52.0",
-    "@scripts/jest-config": "2.52.0"
+    "@modern-js/core": "2.54.0",
+    "@modern-js/app-tools": "2.54.0",
+    "@modern-js/server-core": "2.54.0",
+    "@scripts/build": "2.54.0",
+    "@scripts/jest-config": "2.54.0"
   },
   "peerDependencies": {
     "express": "^4.17.1"