@modern-js/plugin-server 1.21.2 → 2.0.0-beta.0

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @modern-js/plugin-server
 
+## 2.0.0-beta.0
+
+### Major Changes
+
+- dda38c9: chore: v2
+
+### Patch Changes
+
+- 3bbea92b2: feat: support Hook、Middleware new API
+  feat: 支持 Hook、Middleware 的新 API
+- Updated dependencies [9b915e0c1]
+- Updated dependencies [edd1cfb1a]
+- Updated dependencies [cc971eabf]
+- Updated dependencies [5b9049f]
+- Updated dependencies [a8642da]
+- Updated dependencies [b8bbe036c]
+- Updated dependencies [d5a31df78]
+- Updated dependencies [dda38c9]
+- Updated dependencies [3bbea92b2]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be95]
+- Updated dependencies [14b712d]
+  - @modern-js/server-utils@2.0.0-beta.0
+  - @modern-js/utils@2.0.0-beta.0
+  - @modern-js/babel-compiler@2.0.0-beta.0
+
 ## 1.21.2
 
 ### Patch Changes

package/dist/js/modern/server.js

@@ -1,8 +1,20 @@
+const _excluded = ["default", "middleware"];
+
+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]; } } 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; }
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import path from 'path';
-import { isProd, requireExistModule, SERVER_DIR } from '@modern-js/utils';
+import { isProd, logger, requireExistModule, SERVER_DIR } from '@modern-js/utils';
 const WEB_APP_NAME = 'index';
+var HOOKS;
+
+(function (HOOKS) {
+  HOOKS["AFTER_MATCH"] = "afterMatch";
+  HOOKS["AFTER_RENDER"] = "afterRender";
+})(HOOKS || (HOOKS = {}));
 
 class Storage {
   constructor() {
@@ -24,11 +36,34 @@ const createTransformAPI = storage => new Proxy({}, {
       return fn => storage.middlewares.push(fn);
     }
 
-    return fn => storage.hooks[name] = fn;
+    return fn => {
+      logger.warn('declare hook in default export is to be deprecated, use named export instead');
+      storage.hooks[name] = fn;
+    };
   }
 
 });
 
+const compose = middlewares => {
+  return (ctx, resolve, reject) => {
+    let i = 0;
+
+    const dispatch = () => {
+      var _handler, _handler$catch;
+
+      const 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 (() => ({
   name: '@modern-js/plugin-server',
   setup: api => {
@@ -38,26 +73,46 @@ export default (() => ({
     } = api.useAppContext();
     const storage = new Storage();
     const transformAPI = createTransformAPI(storage);
-    let webAppPath = '';
-    return {
-      prepare() {
-        const pwd = isProd() ? distDirectory : appDirectory;
-        const serverPath = path.resolve(pwd, SERVER_DIR);
-        webAppPath = path.resolve(serverPath, WEB_APP_NAME);
-        const webMod = requireExistModule(webAppPath);
+    const pwd = isProd() ? distDirectory : appDirectory;
+    const webAppPath = path.resolve(pwd, SERVER_DIR, WEB_APP_NAME);
+
+    const loadMod = () => {
+      const mod = requireExistModule(webAppPath, {
+        interop: false
+      });
 
-        if (webMod) {
-          webMod(transformAPI);
+      const {
+        default: defaultExports,
+        middleware
+      } = mod,
+            hooks = _objectWithoutProperties(mod, _excluded);
+
+      if (defaultExports) {
+        defaultExports(transformAPI);
+      } // named export hooks will overrides hooks in default export function
+
+
+      Object.values(HOOKS).forEach(key => {
+        const fn = hooks[key];
+
+        if (fn) {
+          storage.hooks[key] = fn;
         }
+      });
+
+      if (middleware) {
+        storage.middlewares = [].concat(middleware);
+      }
+    };
+
+    return {
+      prepare() {
+        loadMod();
       },
 
       reset() {
         storage.reset();
-        const newWebModule = requireExistModule(webAppPath);
-
-        if (newWebModule) {
-          newWebModule(transformAPI);
-        }
+        loadMod();
       },
 
       gather({
@@ -68,48 +123,47 @@ export default (() => ({
         });
       },
 
-      beforeMatch({
-        context
-      }, next) {
-        if (!storage.hooks.beforeMatch) {
-          return next();
-        }
-
-        return storage.hooks.beforeMatch(context, next);
-      },
-
-      afterMatch({
-        context,
-        routeAPI
-      }, next) {
+      afterMatch(context, next) {
         if (!storage.hooks.afterMatch) {
           return next();
         }
 
-        context.router = routeAPI;
         return storage.hooks.afterMatch(context, next);
       },
 
-      beforeRender({
-        context
-      }, next) {
-        if (!storage.hooks.beforeRender) {
-          return next();
-        }
-
-        return storage.hooks.beforeRender(context, next);
-      },
-
-      afterRender({
-        context,
-        templateAPI
-      }, next) {
+      afterRender(context, next) {
         if (!storage.hooks.afterRender) {
           return next();
         }
 
-        context.template = templateAPI;
         return storage.hooks.afterRender(context, next);
+      },
+
+      prepareWebServer({
+        config
+      }) {
+        const {
+          middleware
+        } = config;
+        const factory = compose(middleware);
+        return ctx => {
+          const {
+            source: {
+              res
+            }
+          } = ctx;
+          return new Promise((resolve, reject) => {
+            res.on('finish', err => {
+              if (err) {
+                return reject(err);
+              }
+
+              return resolve();
+            });
+            const dispatch = factory(ctx, resolve, reject);
+            dispatch();
+          });
+        };
       }
 
     };

package/dist/js/node/server.js

@@ -9,11 +9,23 @@ var _path = _interopRequireDefault(require("path"));
 
 var _utils = require("@modern-js/utils");
 
+const _excluded = ["default", "middleware"];
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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]; } } 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; }
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 const WEB_APP_NAME = 'index';
+var HOOKS;
+
+(function (HOOKS) {
+  HOOKS["AFTER_MATCH"] = "afterMatch";
+  HOOKS["AFTER_RENDER"] = "afterRender";
+})(HOOKS || (HOOKS = {}));
 
 class Storage {
   constructor() {
@@ -35,11 +47,35 @@ const createTransformAPI = storage => new Proxy({}, {
       return fn => storage.middlewares.push(fn);
     }
 
-    return fn => storage.hooks[name] = fn;
+    return fn => {
+      _utils.logger.warn('declare hook in default export is to be deprecated, use named export instead');
+
+      storage.hooks[name] = fn;
+    };
   }
 
 });
 
+const compose = middlewares => {
+  return (ctx, resolve, reject) => {
+    let i = 0;
+
+    const dispatch = () => {
+      var _handler, _handler$catch;
+
+      const 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;
+  };
+};
+
 var _default = () => ({
   name: '@modern-js/plugin-server',
   setup: api => {
@@ -49,28 +85,47 @@ var _default = () => ({
     } = api.useAppContext();
     const storage = new Storage();
     const transformAPI = createTransformAPI(storage);
-    let webAppPath = '';
-    return {
-      prepare() {
-        const pwd = (0, _utils.isProd)() ? distDirectory : appDirectory;
+    const pwd = (0, _utils.isProd)() ? distDirectory : appDirectory;
 
-        const serverPath = _path.default.resolve(pwd, _utils.SERVER_DIR);
+    const webAppPath = _path.default.resolve(pwd, _utils.SERVER_DIR, WEB_APP_NAME);
 
-        webAppPath = _path.default.resolve(serverPath, WEB_APP_NAME);
-        const webMod = (0, _utils.requireExistModule)(webAppPath);
+    const loadMod = () => {
+      const mod = (0, _utils.requireExistModule)(webAppPath, {
+        interop: false
+      });
 
-        if (webMod) {
-          webMod(transformAPI);
+      const {
+        default: defaultExports,
+        middleware
+      } = mod,
+            hooks = _objectWithoutProperties(mod, _excluded);
+
+      if (defaultExports) {
+        defaultExports(transformAPI);
+      } // named export hooks will overrides hooks in default export function
+
+
+      Object.values(HOOKS).forEach(key => {
+        const fn = hooks[key];
+
+        if (fn) {
+          storage.hooks[key] = fn;
         }
+      });
+
+      if (middleware) {
+        storage.middlewares = [].concat(middleware);
+      }
+    };
+
+    return {
+      prepare() {
+        loadMod();
       },
 
       reset() {
         storage.reset();
-        const newWebModule = (0, _utils.requireExistModule)(webAppPath);
-
-        if (newWebModule) {
-          newWebModule(transformAPI);
-        }
+        loadMod();
       },
 
       gather({
@@ -81,48 +136,47 @@ var _default = () => ({
         });
       },
 
-      beforeMatch({
-        context
-      }, next) {
-        if (!storage.hooks.beforeMatch) {
-          return next();
-        }
-
-        return storage.hooks.beforeMatch(context, next);
-      },
-
-      afterMatch({
-        context,
-        routeAPI
-      }, next) {
+      afterMatch(context, next) {
         if (!storage.hooks.afterMatch) {
           return next();
         }
 
-        context.router = routeAPI;
         return storage.hooks.afterMatch(context, next);
       },
 
-      beforeRender({
-        context
-      }, next) {
-        if (!storage.hooks.beforeRender) {
-          return next();
-        }
-
-        return storage.hooks.beforeRender(context, next);
-      },
-
-      afterRender({
-        context,
-        templateAPI
-      }, next) {
+      afterRender(context, next) {
         if (!storage.hooks.afterRender) {
           return next();
         }
 
-        context.template = templateAPI;
         return storage.hooks.afterRender(context, next);
+      },
+
+      prepareWebServer({
+        config
+      }) {
+        const {
+          middleware
+        } = config;
+        const factory = compose(middleware);
+        return ctx => {
+          const {
+            source: {
+              res
+            }
+          } = ctx;
+          return new Promise((resolve, reject) => {
+            res.on('finish', err => {
+              if (err) {
+                return reject(err);
+              }
+
+              return resolve();
+            });
+            const dispatch = factory(ctx, resolve, reject);
+            dispatch();
+          });
+        };
       }
 
     };

package/dist/js/treeshaking/server.js

@@ -1,9 +1,17 @@
+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, requireExistModule, SERVER_DIR } from '@modern-js/utils';
+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() {
@@ -35,12 +43,33 @@ var createTransformAPI = function createTransformAPI(storage) {
       }
 
       return function (fn) {
-        return storage.hooks[name] = fn;
+        logger.warn('declare hook in default export is to be deprecated, use named export instead');
+        storage.hooks[name] = fn;
       };
     }
   });
 };
 
+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',
@@ -51,25 +80,43 @@ export default (function () {
 
       var storage = new Storage();
       var transformAPI = createTransformAPI(storage);
-      var webAppPath = '';
-      return {
-        prepare: function prepare() {
-          var pwd = isProd() ? distDirectory : appDirectory;
-          var serverPath = path.resolve(pwd, SERVER_DIR);
-          webAppPath = path.resolve(serverPath, WEB_APP_NAME);
-          var webMod = requireExistModule(webAppPath);
+      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
+        });
+
+        var defaultExports = mod["default"],
+            middleware = mod.middleware,
+            hooks = _objectWithoutProperties(mod, _excluded);
+
+        if (defaultExports) {
+          defaultExports(transformAPI);
+        } // named export hooks will overrides hooks in default export function
 
-          if (webMod) {
-            webMod(transformAPI);
+
+        Object.values(HOOKS).forEach(function (key) {
+          var fn = hooks[key];
+
+          if (fn) {
+            storage.hooks[key] = fn;
           }
+        });
+
+        if (middleware) {
+          storage.middlewares = [].concat(middleware);
+        }
+      };
+
+      return {
+        prepare: function prepare() {
+          loadMod();
         },
         reset: function reset() {
           storage.reset();
-          var newWebModule = requireExistModule(webAppPath);
-
-          if (newWebModule) {
-            newWebModule(transformAPI);
-          }
+          loadMod();
         },
         gather: function gather(_ref) {
           var addWebMiddleware = _ref.addWebMiddleware;
@@ -77,45 +124,38 @@ export default (function () {
             addWebMiddleware(mid);
           });
         },
-        beforeMatch: function beforeMatch(_ref2, next) {
-          var context = _ref2.context;
-
-          if (!storage.hooks.beforeMatch) {
-            return next();
-          }
-
-          return storage.hooks.beforeMatch(context, next);
-        },
-        afterMatch: function afterMatch(_ref3, next) {
-          var context = _ref3.context,
-              routeAPI = _ref3.routeAPI;
-
+        afterMatch: function afterMatch(context, next) {
           if (!storage.hooks.afterMatch) {
             return next();
           }
 
-          context.router = routeAPI;
           return storage.hooks.afterMatch(context, next);
         },
-        beforeRender: function beforeRender(_ref4, next) {
-          var context = _ref4.context;
-
-          if (!storage.hooks.beforeRender) {
-            return next();
-          }
-
-          return storage.hooks.beforeRender(context, next);
-        },
-        afterRender: function afterRender(_ref5, next) {
-          var context = _ref5.context,
-              templateAPI = _ref5.templateAPI;
-
+        afterRender: function afterRender(context, next) {
           if (!storage.hooks.afterRender) {
             return next();
           }
 
-          context.template = templateAPI;
           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 resolve();
+              });
+              var dispatch = factory(ctx, resolve, reject);
+              dispatch();
+            });
+          };
         }
       };
     }

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.21.2",
+  "version": "2.0.0-beta.0",
   "types": "./dist/types/server.d.ts",
   "jsnext:source": "./src/server.ts",
   "main": "./dist/js/node/server.js",
@@ -48,20 +48,20 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/babel-compiler": "1.21.2",
-    "@modern-js/server-utils": "1.21.2",
-    "@modern-js/utils": "1.21.2"
+    "@modern-js/babel-compiler": "2.0.0-beta.0",
+    "@modern-js/server-utils": "2.0.0-beta.0",
+    "@modern-js/utils": "2.0.0-beta.0"
   },
   "devDependencies": {
-    "@modern-js/server-core": "1.21.2",
-    "@modern-js/core": "1.21.2",
-    "@scripts/build": "1.21.2",
-    "@modern-js/types": "1.21.2",
+    "@modern-js/server-core": "2.0.0-beta.0",
+    "@modern-js/core": "2.0.0-beta.0",
+    "@scripts/build": "2.0.0-beta.0",
+    "@modern-js/types": "2.0.0-beta.0",
     "typescript": "^4",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",
-    "@scripts/jest-config": "1.21.2"
+    "@scripts/jest-config": "2.0.0-beta.0"
   },
   "sideEffects": [
     "*.css",
@@ -73,33 +73,10 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "wireit": {
-    "build": {
-      "command": "modern build",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json"
-      ],
-      "output": [
-        "dist/**/*"
-      ]
-    },
-    "test": {
-      "command": "jest --passWithNoTests",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json",
-        "tests/**/*"
-      ],
-      "output": []
-    }
-  },
   "scripts": {
-    "dev": "modern dev",
-    "build": "wireit",
+    "dev": "modern build --watch",
+    "build": "modern build",
     "new": "modern new",
-    "test": "wireit"
+    "test": "jest --passWithNoTests"
   }
 }