@modern-js/plugin-server 2.58.1 → 2.58.2

package/dist/cjs/cli.js

@@ -54,7 +54,7 @@ const serverPlugin = () => ({
       };
     },
     async afterBuild() {
-      const { appDirectory, distDirectory } = api.useAppContext();
+      const { appDirectory, distDirectory, moduleType } = api.useAppContext();
       if (checkHasCache(appDirectory)) {
         return;
       }
@@ -64,9 +64,9 @@ const serverPlugin = () => ({
       const sharedDir = import_path.default.resolve(appDirectory, import_utils.SHARED_DIR);
       const tsconfigPath = import_path.default.resolve(appDirectory, TS_CONFIG_FILENAME);
       const sourceDirs = [];
-      if (import_fs_extra.default.existsSync(serverDir)) {
+      if (await import_fs_extra.default.pathExists(serverDir)) {
         sourceDirs.push(serverDir);
-        if (import_fs_extra.default.existsSync(sharedDir)) {
+        if (await import_fs_extra.default.pathExists(sharedDir)) {
           sourceDirs.push(sharedDir);
         }
       }
@@ -81,7 +81,8 @@ const serverPlugin = () => ({
         }, {
           sourceDirs,
           distDir,
-          tsconfigPath
+          tsconfigPath,
+          moduleType
         });
       }
     }

package/dist/cjs/server.js

@@ -80,9 +80,9 @@ var server_default = () => ({
     const storage = new Storage();
     const transformAPI = createTransformAPI(storage);
     const pwd = (0, import_utils.isProd)() ? distDirectory : appDirectory;
-    const loadMod = () => {
-      const { middleware: unstableMiddleware } = (0, import_utils2.loadMiddleware)(pwd);
-      const { defaultExports, hooks, middleware, unstableMiddleware: unstableMiddlewares } = (0, import_utils2.loadServerMod)(pwd);
+    const loadMod = async () => {
+      const { middleware: unstableMiddleware } = await (0, import_utils2.loadMiddleware)(pwd);
+      const { defaultExports, hooks, middleware, unstableMiddleware: unstableMiddlewares } = await (0, import_utils2.loadServerMod)(pwd);
       if (defaultExports) {
         defaultExports(transformAPI);
       }
@@ -102,12 +102,12 @@ var server_default = () => ({
     };
     let factory;
     return {
-      prepare() {
-        loadMod();
+      async prepare() {
+        await loadMod();
       },
-      reset() {
+      async reset() {
         storage.reset();
-        loadMod();
+        await loadMod();
         factory = getFactory(storage);
       },
       afterMatch(context, next) {

package/dist/cjs/utils.js

@@ -35,9 +35,9 @@ module.exports = __toCommonJS(utils_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 const WEB_APP_NAME = "index";
-const loadMiddleware = (pwd = process.cwd()) => {
+const loadMiddleware = async (pwd = process.cwd()) => {
   const middlewarePath = import_path.default.resolve(pwd, import_utils.SERVER_DIR, "_middleware");
-  const middlewareMode = (0, import_utils.requireExistModule)(middlewarePath, {
+  const middlewareMode = await (0, import_utils.requireExistModule)(middlewarePath, {
     interop: false
   });
   const { middleware = [] } = middlewareMode || {};
@@ -45,9 +45,9 @@ const loadMiddleware = (pwd = process.cwd()) => {
     middleware
   };
 };
-const loadServerMod = (pwd = process.cwd()) => {
+const loadServerMod = async (pwd = process.cwd()) => {
   const webAppPath = import_path.default.resolve(pwd, import_utils.SERVER_DIR, WEB_APP_NAME);
-  const mod = (0, import_utils.requireExistModule)(webAppPath, {
+  const mod = await (0, import_utils.requireExistModule)(webAppPath, {
     interop: false
   });
   const { default: defaultExports, middleware, unstableMiddleware, ...hooks } = mod || {};

package/dist/esm/cli.js

@@ -26,11 +26,11 @@ var serverPlugin = function() {
         },
         afterBuild: function afterBuild() {
           return _async_to_generator(function() {
-            var _api_useAppContext, appDirectory, distDirectory, modernConfig, distDir, serverDir, sharedDir, tsconfigPath, sourceDirs, server, alias, babel;
+            var _api_useAppContext, appDirectory, distDirectory, moduleType, modernConfig, distDir, serverDir, sharedDir, tsconfigPath, sourceDirs, server, alias, babel;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
-                  _api_useAppContext = api.useAppContext(), appDirectory = _api_useAppContext.appDirectory, distDirectory = _api_useAppContext.distDirectory;
+                  _api_useAppContext = api.useAppContext(), appDirectory = _api_useAppContext.appDirectory, distDirectory = _api_useAppContext.distDirectory, moduleType = _api_useAppContext.moduleType;
                   if (checkHasCache(appDirectory)) {
                     return [
                       2
@@ -42,19 +42,34 @@ var serverPlugin = function() {
                   sharedDir = path.resolve(appDirectory, SHARED_DIR);
                   tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
                   sourceDirs = [];
-                  if (fs.existsSync(serverDir)) {
-                    sourceDirs.push(serverDir);
-                    if (fs.existsSync(sharedDir)) {
-                      sourceDirs.push(sharedDir);
-                    }
+                  return [
+                    4,
+                    fs.pathExists(serverDir)
+                  ];
+                case 1:
+                  if (!_state.sent())
+                    return [
+                      3,
+                      3
+                    ];
+                  sourceDirs.push(serverDir);
+                  return [
+                    4,
+                    fs.pathExists(sharedDir)
+                  ];
+                case 2:
+                  if (_state.sent()) {
+                    sourceDirs.push(sharedDir);
                   }
+                  _state.label = 3;
+                case 3:
                   server = modernConfig.server;
                   alias = modernConfig.source.alias;
                   babel = modernConfig.tools.babel;
                   if (!(sourceDirs.length > 0))
                     return [
                       3,
-                      2
+                      5
                     ];
                   return [
                     4,
@@ -65,13 +80,14 @@ var serverPlugin = function() {
                     }, {
                       sourceDirs,
                       distDir,
-                      tsconfigPath
+                      tsconfigPath,
+                      moduleType
                     })
                   ];
-                case 1:
+                case 4:
                   _state.sent();
-                  _state.label = 2;
-                case 2:
+                  _state.label = 5;
+                case 5:
                   return [
                     2
                   ];

package/dist/esm/server.js

@@ -1,5 +1,7 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { isProd, logger } from "@modern-js/utils";
 import { loadMiddleware, loadServerMod } from "./utils";
 var HOOKS;
@@ -66,35 +68,88 @@ 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, unstableMiddlewares = _loadServerMod.unstableMiddleware;
-        if (defaultExports) {
-          defaultExports(transformAPI);
-        }
-        if (hooks) {
-          Object.values(HOOKS).forEach(function(key) {
-            var fn = hooks[key];
-            if (fn) {
-              storage.hooks[key] = fn;
+        var _ref = _async_to_generator(function() {
+          var _storage_unstableMiddlewares, _ref2, unstableMiddleware, _ref1, defaultExports, hooks, middleware, unstableMiddlewares;
+          return _ts_generator(this, function(_state) {
+            switch (_state.label) {
+              case 0:
+                return [
+                  4,
+                  loadMiddleware(pwd)
+                ];
+              case 1:
+                _ref2 = _state.sent(), unstableMiddleware = _ref2.middleware;
+                return [
+                  4,
+                  loadServerMod(pwd)
+                ];
+              case 2:
+                _ref1 = _state.sent(), defaultExports = _ref1.defaultExports, hooks = _ref1.hooks, middleware = _ref1.middleware, unstableMiddlewares = _ref1.unstableMiddleware;
+                if (defaultExports) {
+                  defaultExports(transformAPI);
+                }
+                if (hooks) {
+                  Object.values(HOOKS).forEach(function(key) {
+                    var fn = hooks[key];
+                    if (fn) {
+                      storage.hooks[key] = fn;
+                    }
+                  });
+                }
+                if (middleware) {
+                  storage.middlewares = [].concat(middleware);
+                }
+                storage.middlewares = storage.middlewares.concat(unstableMiddleware);
+                (_storage_unstableMiddlewares = storage.unstableMiddlewares).push.apply(_storage_unstableMiddlewares, _to_consumable_array(unstableMiddlewares || []));
+                return [
+                  2
+                ];
             }
           });
-        }
-        if (middleware) {
-          storage.middlewares = [].concat(middleware);
-        }
-        storage.middlewares = storage.middlewares.concat(unstableMiddleware);
-        (_storage_unstableMiddlewares = storage.unstableMiddlewares).push.apply(_storage_unstableMiddlewares, _to_consumable_array(unstableMiddlewares || []));
-      };
+        });
+        return function loadMod2() {
+          return _ref.apply(this, arguments);
+        };
+      }();
       var factory;
       return {
         prepare: function prepare() {
-          loadMod();
+          return _async_to_generator(function() {
+            return _ts_generator(this, function(_state) {
+              switch (_state.label) {
+                case 0:
+                  return [
+                    4,
+                    loadMod()
+                  ];
+                case 1:
+                  _state.sent();
+                  return [
+                    2
+                  ];
+              }
+            });
+          })();
         },
         reset: function reset() {
-          storage.reset();
-          loadMod();
-          factory = getFactory(storage);
+          return _async_to_generator(function() {
+            return _ts_generator(this, function(_state) {
+              switch (_state.label) {
+                case 0:
+                  storage.reset();
+                  return [
+                    4,
+                    loadMod()
+                  ];
+                case 1:
+                  _state.sent();
+                  factory = getFactory(storage);
+                  return [
+                    2
+                  ];
+              }
+            });
+          })();
         },
         afterMatch: function afterMatch(context, next) {
           if (!storage.hooks.afterMatch) {

package/dist/esm/utils.js

@@ -1,36 +1,78 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { SERVER_DIR, requireExistModule } from "@modern-js/utils";
 var WEB_APP_NAME = "index";
 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 = _async_to_generator(function() {
+    var pwd, middlewarePath, middlewareMode, _ref2, _ref_middleware, middleware;
+    var _arguments = arguments;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          pwd = _arguments.length > 0 && _arguments[0] !== void 0 ? _arguments[0] : process.cwd();
+          middlewarePath = path.resolve(pwd, SERVER_DIR, "_middleware");
+          return [
+            4,
+            requireExistModule(middlewarePath, {
+              interop: false
+            })
+          ];
+        case 1:
+          middlewareMode = _state.sent();
+          _ref2 = middlewareMode || {}, _ref_middleware = _ref2.middleware, middleware = _ref_middleware === void 0 ? [] : _ref_middleware;
+          return [
+            2,
+            {
+              middleware
+            }
+          ];
+      }
+    });
   });
-  var _ref = middlewareMode || {}, _ref_middleware = _ref.middleware, middleware = _ref_middleware === void 0 ? [] : _ref_middleware;
-  return {
-    middleware
+  return function loadMiddleware2() {
+    return _ref.apply(this, arguments);
   };
-};
+}();
 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 = _async_to_generator(function() {
+    var pwd, webAppPath, mod, _ref2, defaultExports, middleware, unstableMiddleware, hooks;
+    var _arguments = arguments;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          pwd = _arguments.length > 0 && _arguments[0] !== void 0 ? _arguments[0] : process.cwd();
+          webAppPath = path.resolve(pwd, SERVER_DIR, WEB_APP_NAME);
+          return [
+            4,
+            requireExistModule(webAppPath, {
+              interop: false
+            })
+          ];
+        case 1:
+          mod = _state.sent();
+          _ref2 = mod || {}, defaultExports = _ref2.default, middleware = _ref2.middleware, unstableMiddleware = _ref2.unstableMiddleware, hooks = _object_without_properties(_ref2, [
+            "default",
+            "middleware",
+            "unstableMiddleware"
+          ]);
+          return [
+            2,
+            {
+              defaultExports,
+              unstableMiddleware,
+              hooks,
+              middleware
+            }
+          ];
+      }
+    });
   });
-  var _ref = mod || {}, defaultExports = _ref.default, middleware = _ref.middleware, unstableMiddleware = _ref.unstableMiddleware, hooks = _object_without_properties(_ref, [
-    "default",
-    "middleware",
-    "unstableMiddleware"
-  ]);
-  return {
-    defaultExports,
-    unstableMiddleware,
-    hooks,
-    middleware
+  return function loadServerMod2() {
+    return _ref.apply(this, arguments);
   };
-};
+}();
 export {
   loadMiddleware,
   loadServerMod

package/dist/esm-node/cli.js

@@ -20,7 +20,7 @@ const serverPlugin = () => ({
       };
     },
     async afterBuild() {
-      const { appDirectory, distDirectory } = api.useAppContext();
+      const { appDirectory, distDirectory, moduleType } = api.useAppContext();
       if (checkHasCache(appDirectory)) {
         return;
       }
@@ -30,9 +30,9 @@ const serverPlugin = () => ({
       const sharedDir = path.resolve(appDirectory, SHARED_DIR);
       const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
       const sourceDirs = [];
-      if (fs.existsSync(serverDir)) {
+      if (await fs.pathExists(serverDir)) {
         sourceDirs.push(serverDir);
-        if (fs.existsSync(sharedDir)) {
+        if (await fs.pathExists(sharedDir)) {
           sourceDirs.push(sharedDir);
         }
       }
@@ -47,7 +47,8 @@ const serverPlugin = () => ({
         }, {
           sourceDirs,
           distDir,
-          tsconfigPath
+          tsconfigPath,
+          moduleType
         });
       }
     }

package/dist/esm-node/server.js

@@ -54,9 +54,9 @@ var server_default = () => ({
     const storage = new Storage();
     const transformAPI = createTransformAPI(storage);
     const pwd = isProd() ? distDirectory : appDirectory;
-    const loadMod = () => {
-      const { middleware: unstableMiddleware } = loadMiddleware(pwd);
-      const { defaultExports, hooks, middleware, unstableMiddleware: unstableMiddlewares } = loadServerMod(pwd);
+    const loadMod = async () => {
+      const { middleware: unstableMiddleware } = await loadMiddleware(pwd);
+      const { defaultExports, hooks, middleware, unstableMiddleware: unstableMiddlewares } = await loadServerMod(pwd);
       if (defaultExports) {
         defaultExports(transformAPI);
       }
@@ -76,12 +76,12 @@ var server_default = () => ({
     };
     let factory;
     return {
-      prepare() {
-        loadMod();
+      async prepare() {
+        await loadMod();
       },
-      reset() {
+      async reset() {
         storage.reset();
-        loadMod();
+        await loadMod();
         factory = getFactory(storage);
       },
       afterMatch(context, next) {

package/dist/esm-node/utils.js

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

package/dist/types/server.d.ts

@@ -1,6 +1,6 @@
 import type { ServerPlugin } from '@modern-js/server-core';
 import type { MiddlewareContext, NextFunction } from '@modern-js/types';
-import { Hook, Middleware, loadMiddleware, loadServerMod } from './utils';
+import { type Hook, type 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;

package/dist/types/utils.d.ts

@@ -8,10 +8,10 @@ export type ServerMod = {
     afterMatch: Hook;
     afterRender: Hook;
 };
-export declare const loadMiddleware: (pwd?: string) => {
+export declare const loadMiddleware: (pwd?: string) => Promise<{
     middleware: any;
-};
-export declare const loadServerMod: (pwd?: string) => {
+}>;
+export declare const loadServerMod: (pwd?: string) => Promise<{
     defaultExports: (args: any) => void;
     unstableMiddleware: any[];
     hooks: {
@@ -19,4 +19,4 @@ export declare const loadServerMod: (pwd?: string) => {
         afterRender: Hook;
     };
     middleware: Middleware[];
-};
+}>;

package/package.json

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