@modern-js/plugin-server 2.0.0-beta.3 → 2.0.0-beta.6

package/dist/js/treeshaking/server.js

@@ -1,138 +1,199 @@
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-var _excluded = ["default", "middleware"];
-import path from 'path';
-import { isProd, logger, requireExistModule, SERVER_DIR } from '@modern-js/utils';
-var WEB_APP_NAME = 'index';
-var HOOKS;
-(function (HOOKS) {
-  HOOKS["AFTER_MATCH"] = "afterMatch";
-  HOOKS["AFTER_RENDER"] = "afterRender";
-})(HOOKS || (HOOKS = {}));
-var Storage = /*#__PURE__*/function () {
-  function Storage() {
-    _classCallCheck(this, Storage);
-    _defineProperty(this, "middlewares", []);
-    _defineProperty(this, "hooks", {});
-  }
-  _createClass(Storage, [{
-    key: "reset",
-    value: function reset() {
-      this.middlewares = [];
-      this.hooks = {};
+function _classCallCheck(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+        throw new TypeError("Cannot call a class as a function");
     }
-  }]);
-  return Storage;
-}();
-var createTransformAPI = function createTransformAPI(storage) {
-  return new Proxy({}, {
-    get: function get(target, name) {
-      if (name === 'addMiddleware') {
-        return function (fn) {
-          return storage.middlewares.push(fn);
-        };
-      }
-      return function (fn) {
-        logger.warn('declare hook in default export is to be deprecated, use named export instead');
-        storage.hooks[name] = fn;
-      };
+}
+function _defineProperties(target, props) {
+    for(var i = 0; i < props.length; i++){
+        var descriptor = props[i];
+        descriptor.enumerable = descriptor.enumerable || false;
+        descriptor.configurable = true;
+        if ("value" in descriptor) descriptor.writable = true;
+        Object.defineProperty(target, descriptor.key, descriptor);
     }
-  });
-};
-var compose = function compose(middlewares) {
-  return function (ctx, resolve, reject) {
-    var i = 0;
-    var dispatch = function dispatch() {
-      var _handler, _handler$catch;
-      var handler = middlewares[i++];
-      if (!handler) {
-        return resolve();
-      }
-      return (_handler = handler(ctx, dispatch)) === null || _handler === void 0 ? void 0 : (_handler$catch = _handler["catch"]) === null || _handler$catch === void 0 ? void 0 : _handler$catch.call(_handler, reject);
-    };
-    return dispatch;
-  };
-};
-export default (function () {
-  return {
-    name: '@modern-js/plugin-server',
-    setup: function setup(api) {
-      var _api$useAppContext = api.useAppContext(),
-        appDirectory = _api$useAppContext.appDirectory,
-        distDirectory = _api$useAppContext.distDirectory;
-      var storage = new Storage();
-      var transformAPI = createTransformAPI(storage);
-      var pwd = isProd() ? distDirectory : appDirectory;
-      var webAppPath = path.resolve(pwd, SERVER_DIR, WEB_APP_NAME);
-      var loadMod = function loadMod() {
-        var mod = requireExistModule(webAppPath, {
-          interop: false
+}
+function _createClass(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties(Constructor, staticProps);
+    return Constructor;
+}
+function _defineProperty(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
         });
-        var defaultExports = mod["default"],
-          middleware = mod.middleware,
-          hooks = _objectWithoutProperties(mod, _excluded);
-        if (defaultExports) {
-          defaultExports(transformAPI);
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _objectWithoutProperties(source, excluded) {
+    if (source == null) return {};
+    var target = _objectWithoutPropertiesLoose(source, excluded);
+    var key, i;
+    if (Object.getOwnPropertySymbols) {
+        var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
+        for(i = 0; i < sourceSymbolKeys.length; i++){
+            key = sourceSymbolKeys[i];
+            if (excluded.indexOf(key) >= 0) continue;
+            if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
+            target[key] = source[key];
         }
-
-        // named export hooks will overrides hooks in default export function
-        Object.values(HOOKS).forEach(function (key) {
-          var fn = hooks[key];
-          if (fn) {
-            storage.hooks[key] = fn;
-          }
-        });
-        if (middleware) {
-          storage.middlewares = [].concat(middleware);
+    }
+    return target;
+}
+function _objectWithoutPropertiesLoose(source, excluded) {
+    if (source == null) return {};
+    var target = {};
+    var sourceKeys = Object.keys(source);
+    var key, i;
+    for(i = 0; i < sourceKeys.length; i++){
+        key = sourceKeys[i];
+        if (excluded.indexOf(key) >= 0) continue;
+        target[key] = source[key];
+    }
+    return target;
+}
+import path from "path";
+import { isProd, logger, requireExistModule, SERVER_DIR } from "@modern-js/utils";
+var WEB_APP_NAME = "index";
+var HOOKS = /* @__PURE__ */ function(HOOKS2) {
+    HOOKS2["AFTER_MATCH"] = "afterMatch";
+    HOOKS2["AFTER_RENDER"] = "afterRender";
+    return HOOKS2;
+}(HOOKS || {});
+var Storage = /*#__PURE__*/ function() {
+    "use strict";
+    function Storage() {
+        _classCallCheck(this, Storage);
+        _defineProperty(this, "middlewares", []);
+        _defineProperty(this, "hooks", {});
+    }
+    _createClass(Storage, [
+        {
+            key: "reset",
+            value: function reset() {
+                this.middlewares = [];
+                this.hooks = {};
+            }
         }
-      };
-      return {
-        prepare: function prepare() {
-          loadMod();
-        },
-        reset: function reset() {
-          storage.reset();
-          loadMod();
-        },
-        gather: function gather(_ref) {
-          var addWebMiddleware = _ref.addWebMiddleware;
-          storage.middlewares.forEach(function (mid) {
-            addWebMiddleware(mid);
-          });
-        },
-        afterMatch: function afterMatch(context, next) {
-          if (!storage.hooks.afterMatch) {
-            return next();
-          }
-          return storage.hooks.afterMatch(context, next);
-        },
-        afterRender: function afterRender(context, next) {
-          if (!storage.hooks.afterRender) {
-            return next();
-          }
-          return storage.hooks.afterRender(context, next);
-        },
-        prepareWebServer: function prepareWebServer(_ref2) {
-          var config = _ref2.config;
-          var middleware = config.middleware;
-          var factory = compose(middleware);
-          return function (ctx) {
-            var res = ctx.source.res;
-            return new Promise(function (resolve, reject) {
-              res.on('finish', function (err) {
-                if (err) {
-                  return reject(err);
-                }
+    ]);
+    return Storage;
+}();
+var createTransformAPI = function(storage) {
+    return new Proxy({}, {
+        get: function get(target, name) {
+            if (name === "addMiddleware") {
+                return function(fn) {
+                    return storage.middlewares.push(fn);
+                };
+            }
+            return function(fn) {
+                logger.warn("declare hook in default export is to be deprecated, use named export instead");
+                storage.hooks[name] = fn;
+            };
+        }
+    });
+};
+var compose = function(middlewares) {
+    return function(ctx, resolve, reject) {
+        var i = 0;
+        var dispatch = function() {
+            var ref, ref1;
+            var handler = middlewares[i++];
+            if (!handler) {
                 return resolve();
-              });
-              var dispatch = factory(ctx, resolve, reject);
-              dispatch();
-            });
-          };
+            }
+            return (ref = handler(ctx, dispatch)) === null || ref === void 0 ? void 0 : (ref1 = ref.catch) === null || ref1 === void 0 ? void 0 : ref1.call(ref, reject);
+        };
+        return dispatch;
+    };
+};
+var server_default = function() {
+    return {
+        name: "@modern-js/plugin-server",
+        setup: function(api) {
+            var ref = api.useAppContext(), appDirectory = ref.appDirectory, distDirectory = ref.distDirectory;
+            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 = _objectWithoutProperties(_ref, [
+                    "default",
+                    "middleware"
+                ]);
+                var ref = middlewareMode || {}, tmp = ref.middleware, unstableMiddleware = tmp === void 0 ? [] : tmp;
+                if (defaultExports) {
+                    defaultExports(transformAPI);
+                }
+                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);
+            };
+            return {
+                prepare: function prepare() {
+                    loadMod();
+                },
+                reset: function reset() {
+                    storage.reset();
+                    loadMod();
+                },
+                gather: function gather(param) {
+                    var addWebMiddleware = param.addWebMiddleware;
+                    storage.middlewares.forEach(function(mid) {
+                        addWebMiddleware(mid);
+                    });
+                },
+                afterMatch: function afterMatch(context, next) {
+                    if (!storage.hooks.afterMatch) {
+                        return next();
+                    }
+                    return storage.hooks.afterMatch(context, next);
+                },
+                afterRender: function afterRender(context, next) {
+                    if (!storage.hooks.afterRender) {
+                        return next();
+                    }
+                    return storage.hooks.afterRender(context, next);
+                },
+                prepareWebServer: function prepareWebServer(param) {
+                    var config = param.config;
+                    var middleware = config.middleware;
+                    var factory = compose(middleware);
+                    return function(ctx) {
+                        var res = ctx.source.res;
+                        return new Promise(function(resolve, reject) {
+                            res.on("finish", function(err) {
+                                if (err) {
+                                    return reject(err);
+                                }
+                                return resolve();
+                            });
+                            var dispatch = factory(ctx, resolve, reject);
+                            dispatch();
+                        });
+                    };
+                }
+            };
         }
-      };
-    }
-  };
-});
+    };
+};
+export { server_default as default };

package/dist/types/cli.d.ts

@@ -1,7 +1,6 @@
 import type { CliPlugin } from '@modern-js/core';
-import { UserConfig } from '@modern-js/server-core';
-declare const _default: () => CliPlugin<{
-  userConfig: UserConfig;
-  normalizedConfig: Required<UserConfig>;
-}>;
+import type { AppTools } from '@modern-js/app-tools';
+
+declare const _default: () => CliPlugin<AppTools>;
+
 export default _default;

package/dist/types/server.d.ts

@@ -1,3 +1,5 @@
 import type { ServerPlugin } from '@modern-js/server-core';
+
 declare const _default: () => ServerPlugin;
+
 export default _default;

package/package.json

@@ -11,18 +11,14 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.3",
-  "types": "./dist/types/server.d.ts",
-  "jsnext:source": "./src/server.ts",
-  "main": "./dist/js/node/server.js",
+  "version": "2.0.0-beta.6",
+  "types": "./dist/types/cli.d.ts",
+  "jsnext:source": "./src/cli",
+  "main": "./dist/js/node/cli.js",
   "exports": {
     ".": {
-      "node": {
-        "jsnext:source": "./src/server.ts",
-        "import": "./dist/js/modern/server.js",
-        "require": "./dist/js/node/server.js"
-      },
-      "default": "./dist/js/treeshaking/server.js"
+      "jsnext:source": "./src/cli.ts",
+      "default": "./dist/js/node/cli.js"
     },
     "./cli": {
       "jsnext:source": "./src/cli.ts",
@@ -48,20 +44,21 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/babel-compiler": "2.0.0-beta.3",
-    "@modern-js/server-utils": "2.0.0-beta.3",
-    "@modern-js/utils": "2.0.0-beta.3"
+    "@modern-js/server-utils": "2.0.0-beta.6",
+    "@modern-js/utils": "2.0.0-beta.6",
+    "@modern-js/babel-compiler": "2.0.0-beta.6"
   },
   "devDependencies": {
     "typescript": "^4",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",
-    "@modern-js/server-core": "2.0.0-beta.3",
-    "@modern-js/core": "2.0.0-beta.3",
-    "@scripts/build": "2.0.0-beta.3",
-    "@modern-js/types": "2.0.0-beta.3",
-    "@scripts/jest-config": "2.0.0-beta.3"
+    "@modern-js/server-core": "2.0.0-beta.6",
+    "@modern-js/app-tools": "2.0.0-beta.6",
+    "@modern-js/core": "2.0.0-beta.6",
+    "@scripts/build": "2.0.0-beta.6",
+    "@modern-js/types": "2.0.0-beta.6",
+    "@scripts/jest-config": "2.0.0-beta.6"
   },
   "sideEffects": [
     "*.css",