@modern-js/plugin-server 2.49.4 → 2.51.0

package/dist/cjs/server.js

@@ -34,10 +34,12 @@ var HOOKS;
 class Storage {
   reset() {
     this.middlewares = [];
+    this.unstableMiddlewares = [];
     this.hooks = {};
   }
   constructor() {
     this.middlewares = [];
+    this.unstableMiddlewares = [];
     this.hooks = {};
   }
 }
@@ -66,6 +68,11 @@ const compose = (middlewares) => {
     return dispatch;
   };
 };
+function getFactory(storage) {
+  const { middlewares } = storage;
+  const factory = compose(middlewares);
+  return factory;
+}
 var server_default = () => ({
   name: "@modern-js/plugin-server",
   setup: (api) => {
@@ -75,7 +82,7 @@ var server_default = () => ({
     const pwd = (0, import_utils.isProd)() ? distDirectory : appDirectory;
     const loadMod = () => {
       const { middleware: unstableMiddleware } = (0, import_utils2.loadMiddleware)(pwd);
-      const { defaultExports, hooks, middleware } = (0, import_utils2.loadServerMod)(pwd);
+      const { defaultExports, hooks, middleware, unstableMiddleware: unstableMiddlewares } = (0, import_utils2.loadServerMod)(pwd);
       if (defaultExports) {
         defaultExports(transformAPI);
       }
@@ -91,7 +98,9 @@ var server_default = () => ({
         storage.middlewares = [].concat(middleware);
       }
       storage.middlewares = storage.middlewares.concat(unstableMiddleware);
+      storage.unstableMiddlewares.push(...unstableMiddlewares || []);
     };
+    let factory;
     return {
       prepare() {
         loadMod();
@@ -99,6 +108,7 @@ var server_default = () => ({
       reset() {
         storage.reset();
         loadMod();
+        factory = getFactory(storage);
       },
       afterMatch(context, next) {
         if (!storage.hooks.afterMatch) {
@@ -113,8 +123,11 @@ var server_default = () => ({
         return storage.hooks.afterRender(context, next);
       },
       prepareWebServer() {
-        const { middlewares } = storage;
-        const factory = compose(middlewares);
+        const { unstableMiddlewares } = storage;
+        if (unstableMiddlewares.length > 0) {
+          return unstableMiddlewares;
+        }
+        factory = getFactory(storage);
         return (ctx) => {
           const { source: { res } } = ctx;
           return new Promise((resolve, reject) => {

package/dist/cjs/utils.js

@@ -50,9 +50,10 @@ const loadServerMod = (pwd = process.cwd()) => {
   const mod = (0, import_utils.requireExistModule)(webAppPath, {
     interop: false
   });
-  const { default: defaultExports, middleware, ...hooks } = mod || {};
+  const { default: defaultExports, middleware, unstableMiddleware, ...hooks } = mod || {};
   return {
     defaultExports,
+    unstableMiddleware,
     hooks,
     middleware
   };

package/dist/esm/server.js

@@ -1,4 +1,5 @@
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
+import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { isProd, logger } from "@modern-js/utils";
 import { loadMiddleware, loadServerMod } from "./utils";
 var HOOKS;
@@ -11,11 +12,13 @@ var Storage = /* @__PURE__ */ function() {
   function Storage2() {
     _class_call_check(this, Storage2);
     this.middlewares = [];
+    this.unstableMiddlewares = [];
     this.hooks = {};
   }
   var _proto = Storage2.prototype;
   _proto.reset = function reset() {
     this.middlewares = [];
+    this.unstableMiddlewares = [];
     this.hooks = {};
   };
   return Storage2;
@@ -49,6 +52,11 @@ var compose = function(middlewares) {
     return dispatch;
   };
 };
+function getFactory(storage) {
+  var middlewares = storage.middlewares;
+  var factory = compose(middlewares);
+  return factory;
+}
 function server_default() {
   return {
     name: "@modern-js/plugin-server",
@@ -58,8 +66,9 @@ function server_default() {
       var transformAPI = createTransformAPI(storage);
       var pwd = isProd() ? distDirectory : appDirectory;
       var loadMod = function() {
+        var _storage_unstableMiddlewares;
         var _loadMiddleware = loadMiddleware(pwd), unstableMiddleware = _loadMiddleware.middleware;
-        var _loadServerMod = loadServerMod(pwd), defaultExports = _loadServerMod.defaultExports, hooks = _loadServerMod.hooks, middleware = _loadServerMod.middleware;
+        var _loadServerMod = loadServerMod(pwd), defaultExports = _loadServerMod.defaultExports, hooks = _loadServerMod.hooks, middleware = _loadServerMod.middleware, unstableMiddlewares = _loadServerMod.unstableMiddleware;
         if (defaultExports) {
           defaultExports(transformAPI);
         }
@@ -75,7 +84,9 @@ function server_default() {
           storage.middlewares = [].concat(middleware);
         }
         storage.middlewares = storage.middlewares.concat(unstableMiddleware);
+        (_storage_unstableMiddlewares = storage.unstableMiddlewares).push.apply(_storage_unstableMiddlewares, _to_consumable_array(unstableMiddlewares || []));
       };
+      var factory;
       return {
         prepare: function prepare() {
           loadMod();
@@ -83,6 +94,7 @@ function server_default() {
         reset: function reset() {
           storage.reset();
           loadMod();
+          factory = getFactory(storage);
         },
         afterMatch: function afterMatch(context, next) {
           if (!storage.hooks.afterMatch) {
@@ -97,8 +109,11 @@ function server_default() {
           return storage.hooks.afterRender(context, next);
         },
         prepareWebServer: function prepareWebServer() {
-          var middlewares = storage.middlewares;
-          var factory = compose(middlewares);
+          var unstableMiddlewares = storage.unstableMiddlewares;
+          if (unstableMiddlewares.length > 0) {
+            return unstableMiddlewares;
+          }
+          factory = getFactory(storage);
           return function(ctx) {
             var res = ctx.source.res;
             return new Promise(function(resolve, reject) {

package/dist/esm/utils.js

@@ -19,12 +19,14 @@ var loadServerMod = function() {
   var mod = requireExistModule(webAppPath, {
     interop: false
   });
-  var _ref = mod || {}, defaultExports = _ref.default, middleware = _ref.middleware, hooks = _object_without_properties(_ref, [
+  var _ref = mod || {}, defaultExports = _ref.default, middleware = _ref.middleware, unstableMiddleware = _ref.unstableMiddleware, hooks = _object_without_properties(_ref, [
     "default",
-    "middleware"
+    "middleware",
+    "unstableMiddleware"
   ]);
   return {
     defaultExports,
+    unstableMiddleware,
     hooks,
     middleware
   };

package/dist/esm-node/server.js

@@ -8,10 +8,12 @@ var HOOKS;
 class Storage {
   reset() {
     this.middlewares = [];
+    this.unstableMiddlewares = [];
     this.hooks = {};
   }
   constructor() {
     this.middlewares = [];
+    this.unstableMiddlewares = [];
     this.hooks = {};
   }
 }
@@ -40,6 +42,11 @@ const compose = (middlewares) => {
     return dispatch;
   };
 };
+function getFactory(storage) {
+  const { middlewares } = storage;
+  const factory = compose(middlewares);
+  return factory;
+}
 var server_default = () => ({
   name: "@modern-js/plugin-server",
   setup: (api) => {
@@ -49,7 +56,7 @@ var server_default = () => ({
     const pwd = isProd() ? distDirectory : appDirectory;
     const loadMod = () => {
       const { middleware: unstableMiddleware } = loadMiddleware(pwd);
-      const { defaultExports, hooks, middleware } = loadServerMod(pwd);
+      const { defaultExports, hooks, middleware, unstableMiddleware: unstableMiddlewares } = loadServerMod(pwd);
       if (defaultExports) {
         defaultExports(transformAPI);
       }
@@ -65,7 +72,9 @@ var server_default = () => ({
         storage.middlewares = [].concat(middleware);
       }
       storage.middlewares = storage.middlewares.concat(unstableMiddleware);
+      storage.unstableMiddlewares.push(...unstableMiddlewares || []);
     };
+    let factory;
     return {
       prepare() {
         loadMod();
@@ -73,6 +82,7 @@ var server_default = () => ({
       reset() {
         storage.reset();
         loadMod();
+        factory = getFactory(storage);
       },
       afterMatch(context, next) {
         if (!storage.hooks.afterMatch) {
@@ -87,8 +97,11 @@ var server_default = () => ({
         return storage.hooks.afterRender(context, next);
       },
       prepareWebServer() {
-        const { middlewares } = storage;
-        const factory = compose(middlewares);
+        const { unstableMiddlewares } = storage;
+        if (unstableMiddlewares.length > 0) {
+          return unstableMiddlewares;
+        }
+        factory = getFactory(storage);
         return (ctx) => {
           const { source: { res } } = ctx;
           return new Promise((resolve, reject) => {

package/dist/esm-node/utils.js

@@ -16,9 +16,10 @@ const loadServerMod = (pwd = process.cwd()) => {
   const mod = requireExistModule(webAppPath, {
     interop: false
   });
-  const { default: defaultExports, middleware, ...hooks } = mod || {};
+  const { default: defaultExports, middleware, unstableMiddleware, ...hooks } = mod || {};
   return {
     defaultExports,
+    unstableMiddleware,
     hooks,
     middleware
   };

package/dist/types/utils.d.ts

@@ -3,7 +3,8 @@ export type Hook = (ctx: HookContext, next: NextFunction) => void;
 export type Middleware = (ctx: MiddlewareContext, next: NextFunction) => void;
 export type ServerMod = {
     default: (args: any) => void;
-    middleware: Middleware | Middleware[];
+    middleware: Middleware[];
+    unstableMiddleware: any[];
     afterMatch: Hook;
     afterRender: Hook;
 };
@@ -12,9 +13,10 @@ export declare const loadMiddleware: (pwd?: string) => {
 };
 export declare const loadServerMod: (pwd?: string) => {
     defaultExports: (args: any) => void;
+    unstableMiddleware: any[];
     hooks: {
         afterMatch: Hook;
         afterRender: Hook;
     };
-    middleware: Middleware | Middleware[];
+    middleware: Middleware[];
 };

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.49.4",
+  "version": "2.51.0",
   "types": "./dist/types/cli.d.ts",
   "jsnext:source": "./src/cli",
   "main": "./dist/cjs/cli.js",
@@ -51,20 +51,20 @@
   },
   "dependencies": {
     "@swc/helpers": "0.5.3",
-    "@modern-js/utils": "2.49.4",
-    "@modern-js/server-utils": "2.49.4"
+    "@modern-js/utils": "2.51.0",
+    "@modern-js/server-utils": "2.51.0"
   },
   "devDependencies": {
     "typescript": "^5",
     "@types/jest": "^29",
     "@types/node": "^14",
     "jest": "^29",
-    "@modern-js/server-core": "2.49.4",
-    "@modern-js/core": "2.49.4",
-    "@modern-js/app-tools": "2.49.4",
-    "@scripts/build": "2.49.4",
-    "@scripts/jest-config": "2.49.4",
-    "@modern-js/types": "2.49.4"
+    "@modern-js/server-core": "2.51.0",
+    "@modern-js/app-tools": "2.51.0",
+    "@modern-js/core": "2.51.0",
+    "@scripts/build": "2.51.0",
+    "@scripts/jest-config": "2.51.0",
+    "@modern-js/types": "2.51.0"
   },
   "sideEffects": [
     "*.css",