@modern-js/plugin-server 2.35.1 → 2.36.0

package/dist/cjs/cli.js

@@ -1,27 +1,41 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
   for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  serverPlugin: function() {
-    return serverPlugin;
-  },
-  default: function() {
-    return _default;
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var cli_exports = {};
+__export(cli_exports, {
+  default: () => cli_default,
+  serverPlugin: () => serverPlugin
 });
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _fs = /* @__PURE__ */ _interop_require_default._(require("fs"));
-const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
-const _serverutils = require("@modern-js/server-utils");
-const _utils = require("@modern-js/utils");
+module.exports = __toCommonJS(cli_exports);
+var import_fs = __toESM(require("fs"));
+var import_path = __toESM(require("path"));
+var import_server_utils = require("@modern-js/server-utils");
+var import_utils = require("@modern-js/utils");
 const TS_CONFIG_FILENAME = "tsconfig.json";
 const serverPlugin = () => ({
   name: "@modern-js/plugin-server",
@@ -32,22 +46,22 @@ const serverPlugin = () => ({
     async afterBuild() {
       const { appDirectory, distDirectory } = api.useAppContext();
       const modernConfig = api.useResolvedConfigContext();
-      const distDir = _path.default.resolve(distDirectory);
-      const serverDir = _path.default.resolve(appDirectory, _utils.SERVER_DIR);
-      const sharedDir = _path.default.resolve(appDirectory, _utils.SHARED_DIR);
-      const tsconfigPath = _path.default.resolve(appDirectory, TS_CONFIG_FILENAME);
+      const distDir = import_path.default.resolve(distDirectory);
+      const serverDir = import_path.default.resolve(appDirectory, import_utils.SERVER_DIR);
+      const sharedDir = import_path.default.resolve(appDirectory, import_utils.SHARED_DIR);
+      const tsconfigPath = import_path.default.resolve(appDirectory, TS_CONFIG_FILENAME);
       const sourceDirs = [];
-      if (_fs.default.existsSync(serverDir)) {
+      if (import_fs.default.existsSync(serverDir)) {
         sourceDirs.push(serverDir);
       }
-      if (_fs.default.existsSync(sharedDir)) {
+      if (import_fs.default.existsSync(sharedDir)) {
         sourceDirs.push(sharedDir);
       }
       const { server } = modernConfig;
       const { alias } = modernConfig.source;
       const { babel } = modernConfig.tools;
       if (sourceDirs.length > 0) {
-        await (0, _serverutils.compile)(appDirectory, {
+        await (0, import_server_utils.compile)(appDirectory, {
           server,
           alias,
           babelConfig: babel
@@ -68,4 +82,8 @@ const serverPlugin = () => ({
     }
   })
 });
-const _default = serverPlugin;
+var cli_default = serverPlugin;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  serverPlugin
+});

package/dist/cjs/server.js

@@ -1,31 +1,32 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __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;
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var server_exports = {};
+__export(server_exports, {
+  compose: () => compose,
+  default: () => server_default,
+  loadMiddleware: () => import_utils2.loadMiddleware,
+  loadServerMod: () => import_utils2.loadServerMod
 });
-const _define_property = require("@swc/helpers/_/_define_property");
-const _utils = require("@modern-js/utils");
-const _utils1 = require("./utils");
+module.exports = __toCommonJS(server_exports);
+var import_define_property = require("@swc/helpers/_/_define_property");
+var import_utils = require("@modern-js/utils");
+var import_utils2 = require("./utils");
 var HOOKS;
 (function(HOOKS2) {
   HOOKS2["AFTER_MATCH"] = "afterMatch";
@@ -37,8 +38,8 @@ class Storage {
     this.hooks = {};
   }
   constructor() {
-    _define_property._(this, "middlewares", []);
-    _define_property._(this, "hooks", {});
+    (0, import_define_property._)(this, "middlewares", []);
+    (0, import_define_property._)(this, "hooks", {});
   }
 }
 const createTransformAPI = (storage) => new Proxy({}, {
@@ -47,7 +48,7 @@ const createTransformAPI = (storage) => new Proxy({}, {
       return (fn) => storage.middlewares.push(fn);
     }
     return (fn) => {
-      _utils.logger.warn("declare hook in default export is to be deprecated, use named export instead");
+      import_utils.logger.warn("declare hook in default export is to be deprecated, use named export instead");
       storage.hooks[name] = fn;
     };
   }
@@ -66,16 +67,16 @@ const compose = (middlewares) => {
     return dispatch;
   };
 };
-const _default = () => ({
+var server_default = () => ({
   name: "@modern-js/plugin-server",
   setup: (api) => {
     const { appDirectory, distDirectory } = api.useAppContext();
     const storage = new Storage();
     const transformAPI = createTransformAPI(storage);
-    const pwd = (0, _utils.isProd)() ? distDirectory : appDirectory;
+    const pwd = (0, import_utils.isProd)() ? distDirectory : appDirectory;
     const loadMod = () => {
-      const { middleware: unstableMiddleware } = (0, _utils1.loadMiddleware)(pwd);
-      const { defaultExports, hooks, middleware } = (0, _utils1.loadServerMod)(pwd);
+      const { middleware: unstableMiddleware } = (0, import_utils2.loadMiddleware)(pwd);
+      const { defaultExports, hooks, middleware } = (0, import_utils2.loadServerMod)(pwd);
       if (defaultExports) {
         defaultExports(transformAPI);
       }
@@ -137,3 +138,9 @@ const _default = () => ({
     };
   }
 });
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  compose,
+  loadMiddleware,
+  loadServerMod
+});

package/dist/cjs/utils.js

@@ -1,29 +1,43 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __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;
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var utils_exports = {};
+__export(utils_exports, {
+  loadMiddleware: () => loadMiddleware,
+  loadServerMod: () => 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");
+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 middlewarePath = _path.default.resolve(pwd, _utils.SERVER_DIR, "_middleware");
-  const middlewareMode = (0, _utils.requireExistModule)(middlewarePath, {
+  const middlewarePath = import_path.default.resolve(pwd, import_utils.SERVER_DIR, "_middleware");
+  const middlewareMode = (0, import_utils.requireExistModule)(middlewarePath, {
     interop: false
   });
   const { middleware = [] } = middlewareMode || {};
@@ -32,8 +46,8 @@ const loadMiddleware = (pwd = process.cwd()) => {
   };
 };
 const loadServerMod = (pwd = process.cwd()) => {
-  const webAppPath = _path.default.resolve(pwd, _utils.SERVER_DIR, WEB_APP_NAME);
-  const mod = (0, _utils.requireExistModule)(webAppPath, {
+  const webAppPath = import_path.default.resolve(pwd, import_utils.SERVER_DIR, WEB_APP_NAME);
+  const mod = (0, import_utils.requireExistModule)(webAppPath, {
     interop: false
   });
   const { default: defaultExports, middleware, ...hooks } = mod || {};
@@ -43,3 +57,8 @@ const loadServerMod = (pwd = process.cwd()) => {
     middleware
   };
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  loadMiddleware,
+  loadServerMod
+});

package/dist/esm/cli.js

@@ -5,7 +5,7 @@ import path from "path";
 import { compile } from "@modern-js/server-utils";
 import { SHARED_DIR, SERVER_DIR } from "@modern-js/utils";
 var TS_CONFIG_FILENAME = "tsconfig.json";
-export var serverPlugin = function() {
+var serverPlugin = function() {
   return {
     name: "@modern-js/plugin-server",
     setup: function(api) {
@@ -43,13 +43,13 @@ export var serverPlugin = function() {
                   return [
                     4,
                     compile(appDirectory, {
-                      server: server,
-                      alias: alias,
+                      server,
+                      alias,
                       babelConfig: babel
                     }, {
-                      sourceDirs: sourceDirs,
-                      distDir: distDir,
-                      tsconfigPath: tsconfigPath
+                      sourceDirs,
+                      distDir,
+                      tsconfigPath
                     })
                   ];
                 case 1:
@@ -69,11 +69,15 @@ export var serverPlugin = function() {
             "@modern-js/plugin-server": "@modern-js/plugin-server/server"
           });
           return {
-            plugins: plugins
+            plugins
           };
         }
       };
     }
   };
 };
-export default serverPlugin;
+var cli_default = serverPlugin;
+export {
+  cli_default as default,
+  serverPlugin
+};

package/dist/esm/server.js

@@ -3,7 +3,6 @@ import { _ as _create_class } from "@swc/helpers/_/_create_class";
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { isProd, logger } from "@modern-js/utils";
 import { loadMiddleware, loadServerMod } from "./utils";
-export { loadMiddleware, loadServerMod };
 var HOOKS;
 (function(HOOKS2) {
   HOOKS2["AFTER_MATCH"] = "afterMatch";
@@ -42,7 +41,7 @@ var createTransformAPI = function(storage) {
     }
   });
 };
-export var compose = function(middlewares) {
+var compose = function(middlewares) {
   return function(ctx, resolve, reject) {
     var i = 0;
     var dispatch = function() {
@@ -56,7 +55,7 @@ export var compose = function(middlewares) {
     return dispatch;
   };
 };
-export default function() {
+function server_default() {
   return {
     name: "@modern-js/plugin-server",
     setup: function(api) {
@@ -132,3 +131,9 @@ export default function() {
   };
 }
 ;
+export {
+  compose,
+  server_default as default,
+  loadMiddleware,
+  loadServerMod
+};

package/dist/esm/utils.js

@@ -2,7 +2,7 @@ import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_
 import path from "path";
 import { SERVER_DIR, requireExistModule } from "@modern-js/utils";
 var WEB_APP_NAME = "index";
-export var loadMiddleware = function() {
+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, {
@@ -10,10 +10,10 @@ export var loadMiddleware = function() {
   });
   var _ref = middlewareMode || {}, _ref_middleware = _ref.middleware, middleware = _ref_middleware === void 0 ? [] : _ref_middleware;
   return {
-    middleware: middleware
+    middleware
   };
 };
-export var loadServerMod = function() {
+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, {
@@ -24,8 +24,12 @@ export var loadServerMod = function() {
     "middleware"
   ]);
   return {
-    defaultExports: defaultExports,
-    hooks: hooks,
-    middleware: middleware
+    defaultExports,
+    hooks,
+    middleware
   };
 };
+export {
+  loadMiddleware,
+  loadServerMod
+};

package/dist/esm-node/cli.js

@@ -3,7 +3,7 @@ import path from "path";
 import { compile } from "@modern-js/server-utils";
 import { SHARED_DIR, SERVER_DIR } from "@modern-js/utils";
 const TS_CONFIG_FILENAME = "tsconfig.json";
-export const serverPlugin = () => ({
+const serverPlugin = () => ({
   name: "@modern-js/plugin-server",
   setup: (api) => ({
     config() {
@@ -48,4 +48,8 @@ export const serverPlugin = () => ({
     }
   })
 });
-export default serverPlugin;
+var cli_default = serverPlugin;
+export {
+  cli_default as default,
+  serverPlugin
+};

package/dist/esm-node/server.js

@@ -1,7 +1,6 @@
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 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 +27,7 @@ const createTransformAPI = (storage) => new Proxy({}, {
     };
   }
 });
-export const compose = (middlewares) => {
+const compose = (middlewares) => {
   return (ctx, resolve, reject) => {
     let i = 0;
     const dispatch = () => {
@@ -42,7 +41,7 @@ export const compose = (middlewares) => {
     return dispatch;
   };
 };
-export default () => ({
+var server_default = () => ({
   name: "@modern-js/plugin-server",
   setup: (api) => {
     const { appDirectory, distDirectory } = api.useAppContext();
@@ -113,3 +112,9 @@ export default () => ({
     };
   }
 });
+export {
+  compose,
+  server_default as default,
+  loadMiddleware,
+  loadServerMod
+};

package/dist/esm-node/utils.js

@@ -1,7 +1,7 @@
 import path from "path";
 import { SERVER_DIR, requireExistModule } from "@modern-js/utils";
 const WEB_APP_NAME = "index";
-export const loadMiddleware = (pwd = process.cwd()) => {
+const loadMiddleware = (pwd = process.cwd()) => {
   const middlewarePath = path.resolve(pwd, SERVER_DIR, "_middleware");
   const middlewareMode = requireExistModule(middlewarePath, {
     interop: false
@@ -11,7 +11,7 @@ export const loadMiddleware = (pwd = process.cwd()) => {
     middleware
   };
 };
-export const loadServerMod = (pwd = process.cwd()) => {
+const loadServerMod = (pwd = process.cwd()) => {
   const webAppPath = path.resolve(pwd, SERVER_DIR, WEB_APP_NAME);
   const mod = requireExistModule(webAppPath, {
     interop: false
@@ -23,3 +23,7 @@ export const loadServerMod = (pwd = process.cwd()) => {
     middleware
   };
 };
+export {
+  loadMiddleware,
+  loadServerMod
+};

package/package.json

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