@modern-js/plugin-server 2.33.1 → 2.35.0

package/dist/cjs/server.js

@@ -2,17 +2,30 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function() {
+function _export(target, all) {
+  for (var name in all)
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  loadMiddleware: function() {
+    return _utils1.loadMiddleware;
+  },
+  loadServerMod: function() {
+    return _utils1.loadServerMod;
+  },
+  compose: function() {
+    return compose;
+  },
+  default: function() {
     return _default;
   }
 });
 const _define_property = require("@swc/helpers/_/_define_property");
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
 const _utils = require("@modern-js/utils");
-const WEB_APP_NAME = "index";
+const _utils1 = require("./utils");
 var HOOKS;
 (function(HOOKS2) {
   HOOKS2["AFTER_MATCH"] = "afterMatch";
@@ -60,26 +73,20 @@ const _default = () => ({
     const storage = new Storage();
     const transformAPI = createTransformAPI(storage);
     const pwd = (0, _utils.isProd)() ? distDirectory : appDirectory;
-    const webAppPath = _path.default.resolve(pwd, _utils.SERVER_DIR, WEB_APP_NAME);
-    const middlewarePath = _path.default.resolve(pwd, _utils.SERVER_DIR, "_middleware");
     const loadMod = () => {
-      const mod = (0, _utils.requireExistModule)(webAppPath, {
-        interop: false
-      });
-      const middlewareMode = (0, _utils.requireExistModule)(middlewarePath, {
-        interop: false
-      });
-      const { default: defaultExports, middleware, ...hooks } = mod || {};
-      const { middleware: unstableMiddleware = [] } = middlewareMode || {};
+      const { middleware: unstableMiddleware } = (0, _utils1.loadMiddleware)(pwd);
+      const { defaultExports, hooks, middleware } = (0, _utils1.loadServerMod)(pwd);
       if (defaultExports) {
         defaultExports(transformAPI);
       }
-      Object.values(HOOKS).forEach((key) => {
-        const fn = hooks[key];
-        if (fn) {
-          storage.hooks[key] = fn;
-        }
-      });
+      if (hooks) {
+        Object.values(HOOKS).forEach((key) => {
+          const fn = hooks[key];
+          if (fn) {
+            storage.hooks[key] = fn;
+          }
+        });
+      }
       if (middleware) {
         storage.middlewares = [].concat(middleware);
       }

package/dist/cjs/utils.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _export(target, all) {
+  for (var name in all)
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  loadMiddleware: function() {
+    return loadMiddleware;
+  },
+  loadServerMod: function() {
+    return loadServerMod;
+  }
+});
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
+const _utils = require("@modern-js/utils");
+const WEB_APP_NAME = "index";
+const loadMiddleware = (pwd = process.cwd()) => {
+  const middlewarePath = _path.default.resolve(pwd, _utils.SERVER_DIR, "_middleware");
+  const middlewareMode = (0, _utils.requireExistModule)(middlewarePath, {
+    interop: false
+  });
+  const { middleware = [] } = middlewareMode || {};
+  return {
+    middleware
+  };
+};
+const loadServerMod = (pwd = process.cwd()) => {
+  const webAppPath = _path.default.resolve(pwd, _utils.SERVER_DIR, WEB_APP_NAME);
+  const mod = (0, _utils.requireExistModule)(webAppPath, {
+    interop: false
+  });
+  const { default: defaultExports, middleware, ...hooks } = mod || {};
+  return {
+    defaultExports,
+    hooks,
+    middleware
+  };
+};

package/dist/esm/server.js

@@ -1,10 +1,9 @@
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
 import { _ as _create_class } from "@swc/helpers/_/_create_class";
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
-import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
-import path from "path";
-import { isProd, logger, requireExistModule, SERVER_DIR } from "@modern-js/utils";
-var WEB_APP_NAME = "index";
+import { isProd, logger } from "@modern-js/utils";
+import { loadMiddleware, loadServerMod } from "./utils";
+export { loadMiddleware, loadServerMod };
 var HOOKS;
 (function(HOOKS2) {
   HOOKS2["AFTER_MATCH"] = "afterMatch";
@@ -43,7 +42,7 @@ var createTransformAPI = function(storage) {
     }
   });
 };
-var compose = function(middlewares) {
+export var compose = function(middlewares) {
   return function(ctx, resolve, reject) {
     var i = 0;
     var dispatch = function() {
@@ -65,29 +64,20 @@ export default function() {
       var storage = new Storage();
       var transformAPI = createTransformAPI(storage);
       var pwd = isProd() ? distDirectory : appDirectory;
-      var webAppPath = path.resolve(pwd, SERVER_DIR, WEB_APP_NAME);
-      var middlewarePath = path.resolve(pwd, SERVER_DIR, "_middleware");
       var loadMod = function() {
-        var mod = requireExistModule(webAppPath, {
-          interop: false
-        });
-        var middlewareMode = requireExistModule(middlewarePath, {
-          interop: false
-        });
-        var _ref = mod || {}, defaultExports = _ref.default, middleware = _ref.middleware, hooks = _object_without_properties(_ref, [
-          "default",
-          "middleware"
-        ]);
-        var _ref1 = middlewareMode || {}, tmp = _ref1.middleware, unstableMiddleware = tmp === void 0 ? [] : tmp;
+        var _loadMiddleware = loadMiddleware(pwd), unstableMiddleware = _loadMiddleware.middleware;
+        var _loadServerMod = loadServerMod(pwd), defaultExports = _loadServerMod.defaultExports, hooks = _loadServerMod.hooks, middleware = _loadServerMod.middleware;
         if (defaultExports) {
           defaultExports(transformAPI);
         }
-        Object.values(HOOKS).forEach(function(key) {
-          var fn = hooks[key];
-          if (fn) {
-            storage.hooks[key] = fn;
-          }
-        });
+        if (hooks) {
+          Object.values(HOOKS).forEach(function(key) {
+            var fn = hooks[key];
+            if (fn) {
+              storage.hooks[key] = fn;
+            }
+          });
+        }
         if (middleware) {
           storage.middlewares = [].concat(middleware);
         }

package/dist/esm/utils.js

@@ -0,0 +1,31 @@
+import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
+import path from "path";
+import { SERVER_DIR, requireExistModule } from "@modern-js/utils";
+var WEB_APP_NAME = "index";
+export var loadMiddleware = function() {
+  var pwd = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : process.cwd();
+  var middlewarePath = path.resolve(pwd, SERVER_DIR, "_middleware");
+  var middlewareMode = requireExistModule(middlewarePath, {
+    interop: false
+  });
+  var _ref = middlewareMode || {}, _ref_middleware = _ref.middleware, middleware = _ref_middleware === void 0 ? [] : _ref_middleware;
+  return {
+    middleware: middleware
+  };
+};
+export var loadServerMod = function() {
+  var pwd = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : process.cwd();
+  var webAppPath = path.resolve(pwd, SERVER_DIR, WEB_APP_NAME);
+  var mod = requireExistModule(webAppPath, {
+    interop: false
+  });
+  var _ref = mod || {}, defaultExports = _ref.default, middleware = _ref.middleware, hooks = _object_without_properties(_ref, [
+    "default",
+    "middleware"
+  ]);
+  return {
+    defaultExports: defaultExports,
+    hooks: hooks,
+    middleware: middleware
+  };
+};

package/dist/esm-node/server.js

@@ -1,7 +1,7 @@
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
-import path from "path";
-import { isProd, logger, requireExistModule, SERVER_DIR } from "@modern-js/utils";
-const WEB_APP_NAME = "index";
+import { isProd, logger } from "@modern-js/utils";
+import { loadMiddleware, loadServerMod } from "./utils";
+export { loadMiddleware, loadServerMod };
 var HOOKS;
 (function(HOOKS2) {
   HOOKS2["AFTER_MATCH"] = "afterMatch";
@@ -28,7 +28,7 @@ const createTransformAPI = (storage) => new Proxy({}, {
     };
   }
 });
-const compose = (middlewares) => {
+export const compose = (middlewares) => {
   return (ctx, resolve, reject) => {
     let i = 0;
     const dispatch = () => {
@@ -49,26 +49,20 @@ export default () => ({
     const storage = new Storage();
     const transformAPI = createTransformAPI(storage);
     const pwd = isProd() ? distDirectory : appDirectory;
-    const webAppPath = path.resolve(pwd, SERVER_DIR, WEB_APP_NAME);
-    const middlewarePath = path.resolve(pwd, SERVER_DIR, "_middleware");
     const loadMod = () => {
-      const mod = requireExistModule(webAppPath, {
-        interop: false
-      });
-      const middlewareMode = requireExistModule(middlewarePath, {
-        interop: false
-      });
-      const { default: defaultExports, middleware, ...hooks } = mod || {};
-      const { middleware: unstableMiddleware = [] } = middlewareMode || {};
+      const { middleware: unstableMiddleware } = loadMiddleware(pwd);
+      const { defaultExports, hooks, middleware } = loadServerMod(pwd);
       if (defaultExports) {
         defaultExports(transformAPI);
       }
-      Object.values(HOOKS).forEach((key) => {
-        const fn = hooks[key];
-        if (fn) {
-          storage.hooks[key] = fn;
-        }
-      });
+      if (hooks) {
+        Object.values(HOOKS).forEach((key) => {
+          const fn = hooks[key];
+          if (fn) {
+            storage.hooks[key] = fn;
+          }
+        });
+      }
       if (middleware) {
         storage.middlewares = [].concat(middleware);
       }

package/dist/esm-node/utils.js

@@ -0,0 +1,25 @@
+import path from "path";
+import { SERVER_DIR, requireExistModule } from "@modern-js/utils";
+const WEB_APP_NAME = "index";
+export const loadMiddleware = (pwd = process.cwd()) => {
+  const middlewarePath = path.resolve(pwd, SERVER_DIR, "_middleware");
+  const middlewareMode = requireExistModule(middlewarePath, {
+    interop: false
+  });
+  const { middleware = [] } = middlewareMode || {};
+  return {
+    middleware
+  };
+};
+export const loadServerMod = (pwd = process.cwd()) => {
+  const webAppPath = path.resolve(pwd, SERVER_DIR, WEB_APP_NAME);
+  const mod = requireExistModule(webAppPath, {
+    interop: false
+  });
+  const { default: defaultExports, middleware, ...hooks } = mod || {};
+  return {
+    defaultExports,
+    hooks,
+    middleware
+  };
+};

package/dist/types/server.d.ts

@@ -1,3 +1,8 @@
 import type { ServerPlugin } from '@modern-js/server-core';
+import type { MiddlewareContext, NextFunction } from '@modern-js/types';
+import { Hook, Middleware, loadMiddleware, loadServerMod } from './utils';
+export { loadMiddleware, loadServerMod };
+export type { Hook, Middleware };
+export declare const compose: (middlewares: Middleware[]) => (ctx: MiddlewareContext, resolve: (value: void | PromiseLike<void>) => void, reject: (reason?: any) => void) => NextFunction;
 declare const _default: () => ServerPlugin;
 export default _default;

package/dist/types/utils.d.ts

@@ -0,0 +1,20 @@
+import type { HookContext, MiddlewareContext, NextFunction } from '@modern-js/types';
+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[];
+  afterMatch: Hook;
+  afterRender: Hook;
+};
+export declare const loadMiddleware: (pwd?: string) => {
+  middleware: any;
+};
+export declare const loadServerMod: (pwd?: string) => {
+  defaultExports: (args: any) => void;
+  hooks: {
+    afterMatch: Hook;
+    afterRender: Hook;
+  };
+  middleware: Middleware | Middleware[];
+};

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.33.1",
+  "version": "2.35.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.1",
-    "@modern-js/server-utils": "2.33.1",
-    "@modern-js/utils": "2.33.1"
+    "@modern-js/utils": "2.35.0",
+    "@modern-js/server-utils": "2.35.0"
   },
   "devDependencies": {
     "typescript": "^5",
     "@types/jest": "^29",
     "@types/node": "^14",
     "jest": "^29",
-    "@modern-js/core": "2.33.1",
-    "@modern-js/server-core": "2.33.1",
-    "@modern-js/types": "2.33.1",
-    "@modern-js/app-tools": "2.33.1",
-    "@scripts/build": "2.33.1",
-    "@scripts/jest-config": "2.33.1"
+    "@modern-js/app-tools": "2.35.0",
+    "@modern-js/core": "2.35.0",
+    "@modern-js/types": "2.35.0",
+    "@modern-js/server-core": "2.35.0",
+    "@scripts/build": "2.35.0",
+    "@scripts/jest-config": "2.35.0"
   },
   "sideEffects": [
     "*.css",