@modern-js/plugin-server 1.1.0 → 1.1.3

package/.eslintrc.js

@@ -0,0 +1,7 @@
+module.exports = {
+  extends: ['@modern-js'],
+  parserOptions: {
+    project: require.resolve('./tsconfig.json'),
+  },
+  ignorePatterns: ['types.d.ts'],
+};

package/CHANGELOG.md

@@ -1,5 +1,45 @@
 # @modern-js/plugin-server
 
+## 1.1.3
+
+### Patch Changes
+
+- c7dc7f54: migrate to new plugin style
+- 2008fdbd: convert two packages server part, support server load plugin itself
+- Updated dependencies [5bf5868d]
+  - @modern-js/utils@1.3.5
+
+## 1.1.2
+
+### Patch Changes
+
+- 272cab15: refactor server plugin manager
+- Updated dependencies [d9cc5ea9]
+- Updated dependencies [bd819a8d]
+- Updated dependencies [ec4dbffb]
+- Updated dependencies [d099e5c5]
+- Updated dependencies [bada2879]
+- Updated dependencies [24f616ca]
+- Updated dependencies [bd819a8d]
+- Updated dependencies [272cab15]
+  - @modern-js/core@1.4.0
+  - @modern-js/utils@1.3.0
+  - @modern-js/server-core@1.2.2
+
+## 1.1.1
+
+### Patch Changes
+
+- 83166714: change .npmignore
+- Updated dependencies [83166714]
+- Updated dependencies [c3de9882]
+- Updated dependencies [33ff48af]
+  - @modern-js/core@1.3.2
+  - @modern-js/server-plugin@1.2.1
+  - @modern-js/server-utils@1.2.1
+  - @modern-js/babel-compiler@1.2.1
+  - @modern-js/utils@1.2.2
+
 ## 1.1.0
 
 ### Minor Changes

package/dist/js/modern/cli.js

@@ -1,6 +1,5 @@
 import fs from 'fs';
 import path from 'path';
-import { createPlugin, useAppContext, useResolvedConfigContext } from '@modern-js/core';
 import { compiler } from '@modern-js/babel-compiler';
 import { resolveBabelConfig } from '@modern-js/server-utils';
 import { SHARED_DIR, SERVER_DIR } from '@modern-js/utils';
@@ -36,48 +35,47 @@ const compile = async (appDirectory, modernConfig, compileOptions) => {
   });
 };
 
-export default createPlugin(() => ({
-  config() {
-    return {};
-  },
+export default (() => ({
+  name: '@modern-js/plugin-server',
+  setup: api => ({
+    config() {
+      return {};
+    },
 
-  async afterBuild() {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    const {
-      appDirectory,
-      distDirectory
-    } = useAppContext(); // eslint-disable-next-line react-hooks/rules-of-hooks
-
-    const modernConfig = useResolvedConfigContext();
-    const distDir = path.resolve(distDirectory);
-    const serverDir = path.resolve(appDirectory, SERVER_DIR);
-    const sharedDir = path.resolve(appDirectory, SHARED_DIR);
-    const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
-    const patterns = [];
+    async afterBuild() {
+      const {
+        appDirectory,
+        distDirectory
+      } = api.useAppContext();
+      const modernConfig = api.useResolvedConfigContext();
+      const distDir = path.resolve(distDirectory);
+      const serverDir = path.resolve(appDirectory, SERVER_DIR);
+      const sharedDir = path.resolve(appDirectory, SHARED_DIR);
+      const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
+      const patterns = [];
 
-    if (fs.existsSync(serverDir)) {
-      patterns.push({
-        from: serverDir,
-        to: distDir,
-        tsconfigPath
-      });
-    }
+      if (fs.existsSync(serverDir)) {
+        patterns.push({
+          from: serverDir,
+          to: distDir,
+          tsconfigPath
+        });
+      }
 
-    if (fs.existsSync(sharedDir)) {
-      patterns.push({
-        from: sharedDir,
-        to: distDir,
-        tsconfigPath
-      });
-    }
+      if (fs.existsSync(sharedDir)) {
+        patterns.push({
+          from: sharedDir,
+          to: distDir,
+          tsconfigPath
+        });
+      }
 
-    if (patterns.length > 0) {
-      await compile(appDirectory, modernConfig, {
-        patterns
-      });
+      if (patterns.length > 0) {
+        await compile(appDirectory, modernConfig, {
+          patterns
+        });
+      }
     }
-  }
 
-}), {
-  name: '@modern-js/plugin-server'
-});
+  })
+}));

package/dist/js/modern/server.js

@@ -1,6 +1,4 @@
 import path from 'path';
-import { createPlugin } from '@modern-js/server-plugin';
-import { useAppContext } from '@modern-js/core';
 import { isProd, requireExistModule, SERVER_DIR } from '@modern-js/utils';
 const WEB_APP_NAME = 'index';
 
@@ -28,77 +26,78 @@ const createTransformAPI = storage => new Proxy({}, {
 
 });
 
-export default createPlugin(() => {
-  const {
-    appDirectory,
-    distDirectory
-  } = useAppContext();
-  const pwd = isProd() ? distDirectory : appDirectory;
-  const serverPath = path.resolve(pwd, SERVER_DIR);
-  const webAppPath = path.resolve(serverPath, WEB_APP_NAME);
-  const storage = new Storage();
-  const transformAPI = createTransformAPI(storage);
-  const webMod = requireExistModule(webAppPath);
-
-  if (webMod) {
-    webMod(transformAPI);
-  }
-
-  return {
-    reset() {
-      storage.reset();
-      const newWebModule = requireExistModule(webAppPath);
+export default (() => ({
+  name: '@modern-js/plugin-server',
+  setup: api => {
+    const {
+      appDirectory,
+      distDirectory
+    } = api.useAppContext();
+    const pwd = isProd() ? distDirectory : appDirectory;
+    const serverPath = path.resolve(pwd, SERVER_DIR);
+    const webAppPath = path.resolve(serverPath, WEB_APP_NAME);
+    const storage = new Storage();
+    const transformAPI = createTransformAPI(storage);
+    const webMod = requireExistModule(webAppPath);
+
+    if (webMod) {
+      webMod(transformAPI);
+    }
 
-      if (newWebModule) {
-        newWebModule(transformAPI);
+    return {
+      reset() {
+        storage.reset();
+        const newWebModule = requireExistModule(webAppPath);
+
+        if (newWebModule) {
+          newWebModule(transformAPI);
+        }
+      },
+
+      gather({
+        addWebMiddleware
+      }) {
+        storage.middlewares.forEach(mid => {
+          addWebMiddleware(mid);
+        });
+      },
+
+      beforeMatch({
+        context
+      }, next) {
+        var _storage$hooks$before, _storage$hooks;
+
+        return (_storage$hooks$before = (_storage$hooks = storage.hooks).beforeMatch) === null || _storage$hooks$before === void 0 ? void 0 : _storage$hooks$before.call(_storage$hooks, context, next);
+      },
+
+      afterMatch({
+        context,
+        routeAPI
+      }, next) {
+        var _storage$hooks$afterM, _storage$hooks2;
+
+        context.router = routeAPI;
+        return (_storage$hooks$afterM = (_storage$hooks2 = storage.hooks).afterMatch) === null || _storage$hooks$afterM === void 0 ? void 0 : _storage$hooks$afterM.call(_storage$hooks2, context, next);
+      },
+
+      beforeRender({
+        context
+      }, next) {
+        var _storage$hooks$before2, _storage$hooks3;
+
+        return (_storage$hooks$before2 = (_storage$hooks3 = storage.hooks).beforeRender) === null || _storage$hooks$before2 === void 0 ? void 0 : _storage$hooks$before2.call(_storage$hooks3, context, next);
+      },
+
+      afterRender({
+        context,
+        templateAPI
+      }, next) {
+        var _storage$hooks$afterR, _storage$hooks4;
+
+        context.template = templateAPI;
+        return (_storage$hooks$afterR = (_storage$hooks4 = storage.hooks).afterRender) === null || _storage$hooks$afterR === void 0 ? void 0 : _storage$hooks$afterR.call(_storage$hooks4, context, next);
       }
-    },
-
-    gather({
-      addWebMiddleware
-    }) {
-      storage.middlewares.forEach(mid => {
-        addWebMiddleware(mid);
-      });
-    },
-
-    beforeMatch({
-      context
-    }, next) {
-      var _storage$hooks$before, _storage$hooks;
-
-      return (_storage$hooks$before = (_storage$hooks = storage.hooks).beforeMatch) === null || _storage$hooks$before === void 0 ? void 0 : _storage$hooks$before.call(_storage$hooks, context, next);
-    },
-
-    afterMatch({
-      context,
-      routeAPI
-    }, next) {
-      var _storage$hooks$afterM, _storage$hooks2;
-
-      context.router = routeAPI;
-      return (_storage$hooks$afterM = (_storage$hooks2 = storage.hooks).afterMatch) === null || _storage$hooks$afterM === void 0 ? void 0 : _storage$hooks$afterM.call(_storage$hooks2, context, next);
-    },
-
-    beforeRender({
-      context
-    }, next) {
-      var _storage$hooks$before2, _storage$hooks3;
-
-      return (_storage$hooks$before2 = (_storage$hooks3 = storage.hooks).beforeRender) === null || _storage$hooks$before2 === void 0 ? void 0 : _storage$hooks$before2.call(_storage$hooks3, context, next);
-    },
-
-    afterRender({
-      context,
-      templateAPI
-    }, next) {
-      var _storage$hooks$afterR, _storage$hooks4;
-
-      context.template = templateAPI;
-      return (_storage$hooks$afterR = (_storage$hooks4 = storage.hooks).afterRender) === null || _storage$hooks$afterR === void 0 ? void 0 : _storage$hooks$afterR.call(_storage$hooks4, context, next);
-    }
 
-  };
-}, {
-  name: '@modern-js/plugin-server'
-});
+    };
+  }
+}));

package/dist/js/node/cli.js

@@ -9,8 +9,6 @@ var _fs = _interopRequireDefault(require("fs"));
 
 var _path = _interopRequireDefault(require("path"));
 
-var _core = require("@modern-js/core");
-
 var _babelCompiler = require("@modern-js/babel-compiler");
 
 var _serverUtils = require("@modern-js/server-utils");
@@ -51,55 +49,54 @@ const compile = async (appDirectory, modernConfig, compileOptions) => {
   });
 };
 
-var _default = (0, _core.createPlugin)(() => ({
-  config() {
-    return {};
-  },
-
-  async afterBuild() {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    const {
-      appDirectory,
-      distDirectory
-    } = (0, _core.useAppContext)(); // eslint-disable-next-line react-hooks/rules-of-hooks
-
-    const modernConfig = (0, _core.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 patterns = [];
-
-    if (_fs.default.existsSync(serverDir)) {
-      patterns.push({
-        from: serverDir,
-        to: distDir,
-        tsconfigPath
-      });
-    }
-
-    if (_fs.default.existsSync(sharedDir)) {
-      patterns.push({
-        from: sharedDir,
-        to: distDir,
-        tsconfigPath
-      });
-    }
-
-    if (patterns.length > 0) {
-      await compile(appDirectory, modernConfig, {
-        patterns
-      });
+var _default = () => ({
+  name: '@modern-js/plugin-server',
+  setup: api => ({
+    config() {
+      return {};
+    },
+
+    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 patterns = [];
+
+      if (_fs.default.existsSync(serverDir)) {
+        patterns.push({
+          from: serverDir,
+          to: distDir,
+          tsconfigPath
+        });
+      }
+
+      if (_fs.default.existsSync(sharedDir)) {
+        patterns.push({
+          from: sharedDir,
+          to: distDir,
+          tsconfigPath
+        });
+      }
+
+      if (patterns.length > 0) {
+        await compile(appDirectory, modernConfig, {
+          patterns
+        });
+      }
     }
-  }
 
-}), {
-  name: '@modern-js/plugin-server'
+  })
 });
 
 exports.default = _default;

package/dist/js/node/server.js

@@ -7,10 +7,6 @@ exports.default = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
-var _serverPlugin = require("@modern-js/server-plugin");
-
-var _core = require("@modern-js/core");
-
 var _utils = require("@modern-js/utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -41,82 +37,83 @@ const createTransformAPI = storage => new Proxy({}, {
 
 });
 
-var _default = (0, _serverPlugin.createPlugin)(() => {
-  const {
-    appDirectory,
-    distDirectory
-  } = (0, _core.useAppContext)();
-  const pwd = (0, _utils.isProd)() ? distDirectory : appDirectory;
+var _default = () => ({
+  name: '@modern-js/plugin-server',
+  setup: api => {
+    const {
+      appDirectory,
+      distDirectory
+    } = api.useAppContext();
+    const pwd = (0, _utils.isProd)() ? distDirectory : appDirectory;
 
-  const serverPath = _path.default.resolve(pwd, _utils.SERVER_DIR);
+    const serverPath = _path.default.resolve(pwd, _utils.SERVER_DIR);
 
-  const webAppPath = _path.default.resolve(serverPath, WEB_APP_NAME);
+    const webAppPath = _path.default.resolve(serverPath, WEB_APP_NAME);
 
-  const storage = new Storage();
-  const transformAPI = createTransformAPI(storage);
-  const webMod = (0, _utils.requireExistModule)(webAppPath);
-
-  if (webMod) {
-    webMod(transformAPI);
-  }
+    const storage = new Storage();
+    const transformAPI = createTransformAPI(storage);
+    const webMod = (0, _utils.requireExistModule)(webAppPath);
 
-  return {
-    reset() {
-      storage.reset();
-      const newWebModule = (0, _utils.requireExistModule)(webAppPath);
+    if (webMod) {
+      webMod(transformAPI);
+    }
 
-      if (newWebModule) {
-        newWebModule(transformAPI);
+    return {
+      reset() {
+        storage.reset();
+        const newWebModule = (0, _utils.requireExistModule)(webAppPath);
+
+        if (newWebModule) {
+          newWebModule(transformAPI);
+        }
+      },
+
+      gather({
+        addWebMiddleware
+      }) {
+        storage.middlewares.forEach(mid => {
+          addWebMiddleware(mid);
+        });
+      },
+
+      beforeMatch({
+        context
+      }, next) {
+        var _storage$hooks$before, _storage$hooks;
+
+        return (_storage$hooks$before = (_storage$hooks = storage.hooks).beforeMatch) === null || _storage$hooks$before === void 0 ? void 0 : _storage$hooks$before.call(_storage$hooks, context, next);
+      },
+
+      afterMatch({
+        context,
+        routeAPI
+      }, next) {
+        var _storage$hooks$afterM, _storage$hooks2;
+
+        context.router = routeAPI;
+        return (_storage$hooks$afterM = (_storage$hooks2 = storage.hooks).afterMatch) === null || _storage$hooks$afterM === void 0 ? void 0 : _storage$hooks$afterM.call(_storage$hooks2, context, next);
+      },
+
+      beforeRender({
+        context
+      }, next) {
+        var _storage$hooks$before2, _storage$hooks3;
+
+        return (_storage$hooks$before2 = (_storage$hooks3 = storage.hooks).beforeRender) === null || _storage$hooks$before2 === void 0 ? void 0 : _storage$hooks$before2.call(_storage$hooks3, context, next);
+      },
+
+      afterRender({
+        context,
+        templateAPI
+      }, next) {
+        var _storage$hooks$afterR, _storage$hooks4;
+
+        context.template = templateAPI;
+        return (_storage$hooks$afterR = (_storage$hooks4 = storage.hooks).afterRender) === null || _storage$hooks$afterR === void 0 ? void 0 : _storage$hooks$afterR.call(_storage$hooks4, context, next);
       }
-    },
-
-    gather({
-      addWebMiddleware
-    }) {
-      storage.middlewares.forEach(mid => {
-        addWebMiddleware(mid);
-      });
-    },
-
-    beforeMatch({
-      context
-    }, next) {
-      var _storage$hooks$before, _storage$hooks;
-
-      return (_storage$hooks$before = (_storage$hooks = storage.hooks).beforeMatch) === null || _storage$hooks$before === void 0 ? void 0 : _storage$hooks$before.call(_storage$hooks, context, next);
-    },
-
-    afterMatch({
-      context,
-      routeAPI
-    }, next) {
-      var _storage$hooks$afterM, _storage$hooks2;
-
-      context.router = routeAPI;
-      return (_storage$hooks$afterM = (_storage$hooks2 = storage.hooks).afterMatch) === null || _storage$hooks$afterM === void 0 ? void 0 : _storage$hooks$afterM.call(_storage$hooks2, context, next);
-    },
-
-    beforeRender({
-      context
-    }, next) {
-      var _storage$hooks$before2, _storage$hooks3;
-
-      return (_storage$hooks$before2 = (_storage$hooks3 = storage.hooks).beforeRender) === null || _storage$hooks$before2 === void 0 ? void 0 : _storage$hooks$before2.call(_storage$hooks3, context, next);
-    },
-
-    afterRender({
-      context,
-      templateAPI
-    }, next) {
-      var _storage$hooks$afterR, _storage$hooks4;
-
-      context.template = templateAPI;
-      return (_storage$hooks$afterR = (_storage$hooks4 = storage.hooks).afterRender) === null || _storage$hooks$afterR === void 0 ? void 0 : _storage$hooks$afterR.call(_storage$hooks4, context, next);
-    }
 
-  };
-}, {
-  name: '@modern-js/plugin-server'
+    };
+  }
 });
 
 exports.default = _default;

package/dist/js/treeshaking/cli.js

@@ -6,7 +6,6 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 
 import fs from 'fs';
 import path from 'path';
-import { createPlugin, useAppContext, useResolvedConfigContext } from '@modern-js/core';
 import { compiler } from '@modern-js/babel-compiler';
 import { resolveBabelConfig } from '@modern-js/server-utils';
 import { SHARED_DIR, SERVER_DIR } from '@modern-js/utils';
@@ -60,64 +59,65 @@ var compile = /*#__PURE__*/function () {
   };
 }();
 
-export default createPlugin(function () {
+export default (function () {
   return {
-    config: function config() {
-      return {};
-    },
-    afterBuild: function afterBuild() {
-      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _useAppContext, appDirectory, distDirectory, modernConfig, distDir, serverDir, sharedDir, tsconfigPath, patterns;
+    name: '@modern-js/plugin-server',
+    setup: function setup(api) {
+      return {
+        config: function config() {
+          return {};
+        },
+        afterBuild: function afterBuild() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+            var _api$useAppContext, appDirectory, distDirectory, modernConfig, distDir, serverDir, sharedDir, tsconfigPath, patterns;
 
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                // eslint-disable-next-line react-hooks/rules-of-hooks
-                _useAppContext = useAppContext(), appDirectory = _useAppContext.appDirectory, distDirectory = _useAppContext.distDirectory; // eslint-disable-next-line react-hooks/rules-of-hooks
+            return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+              while (1) {
+                switch (_context2.prev = _context2.next) {
+                  case 0:
+                    _api$useAppContext = api.useAppContext(), appDirectory = _api$useAppContext.appDirectory, distDirectory = _api$useAppContext.distDirectory;
+                    modernConfig = api.useResolvedConfigContext();
+                    distDir = path.resolve(distDirectory);
+                    serverDir = path.resolve(appDirectory, SERVER_DIR);
+                    sharedDir = path.resolve(appDirectory, SHARED_DIR);
+                    tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
+                    patterns = [];
 
-                modernConfig = useResolvedConfigContext();
-                distDir = path.resolve(distDirectory);
-                serverDir = path.resolve(appDirectory, SERVER_DIR);
-                sharedDir = path.resolve(appDirectory, SHARED_DIR);
-                tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
-                patterns = [];
+                    if (fs.existsSync(serverDir)) {
+                      patterns.push({
+                        from: serverDir,
+                        to: distDir,
+                        tsconfigPath: tsconfigPath
+                      });
+                    }
 
-                if (fs.existsSync(serverDir)) {
-                  patterns.push({
-                    from: serverDir,
-                    to: distDir,
-                    tsconfigPath: tsconfigPath
-                  });
-                }
-
-                if (fs.existsSync(sharedDir)) {
-                  patterns.push({
-                    from: sharedDir,
-                    to: distDir,
-                    tsconfigPath: tsconfigPath
-                  });
-                }
+                    if (fs.existsSync(sharedDir)) {
+                      patterns.push({
+                        from: sharedDir,
+                        to: distDir,
+                        tsconfigPath: tsconfigPath
+                      });
+                    }
 
-                if (!(patterns.length > 0)) {
-                  _context2.next = 12;
-                  break;
-                }
+                    if (!(patterns.length > 0)) {
+                      _context2.next = 12;
+                      break;
+                    }
 
-                _context2.next = 12;
-                return compile(appDirectory, modernConfig, {
-                  patterns: patterns
-                });
+                    _context2.next = 12;
+                    return compile(appDirectory, modernConfig, {
+                      patterns: patterns
+                    });
 
-              case 12:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2);
-      }))();
+                  case 12:
+                  case "end":
+                    return _context2.stop();
+                }
+              }
+            }, _callee2);
+          }))();
+        }
+      };
     }
   };
-}, {
-  name: '@modern-js/plugin-server'
 });

package/dist/js/treeshaking/server.js

@@ -5,8 +5,6 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
 import path from 'path';
-import { createPlugin } from '@modern-js/server-plugin';
-import { useAppContext } from '@modern-js/core';
 import { isProd, requireExistModule, SERVER_DIR } from '@modern-js/utils';
 var WEB_APP_NAME = 'index';
 
@@ -45,66 +43,69 @@ var createTransformAPI = function createTransformAPI(storage) {
   });
 };
 
-export default createPlugin(function () {
-  var _useAppContext = useAppContext(),
-      appDirectory = _useAppContext.appDirectory,
-      distDirectory = _useAppContext.distDirectory;
-
-  var pwd = isProd() ? distDirectory : appDirectory;
-  var serverPath = path.resolve(pwd, SERVER_DIR);
-  var webAppPath = path.resolve(serverPath, WEB_APP_NAME);
-  var storage = new Storage();
-  var transformAPI = createTransformAPI(storage);
-  var webMod = requireExistModule(webAppPath);
-
-  if (webMod) {
-    webMod(transformAPI);
-  }
-
+export default (function () {
   return {
-    reset: function reset() {
-      storage.reset();
-      var newWebModule = requireExistModule(webAppPath);
-
-      if (newWebModule) {
-        newWebModule(transformAPI);
+    name: '@modern-js/plugin-server',
+    setup: function setup(api) {
+      var _api$useAppContext = api.useAppContext(),
+          appDirectory = _api$useAppContext.appDirectory,
+          distDirectory = _api$useAppContext.distDirectory;
+
+      var pwd = isProd() ? distDirectory : appDirectory;
+      var serverPath = path.resolve(pwd, SERVER_DIR);
+      var webAppPath = path.resolve(serverPath, WEB_APP_NAME);
+      var storage = new Storage();
+      var transformAPI = createTransformAPI(storage);
+      var webMod = requireExistModule(webAppPath);
+
+      if (webMod) {
+        webMod(transformAPI);
       }
-    },
-    gather: function gather(_ref) {
-      var addWebMiddleware = _ref.addWebMiddleware;
-      storage.middlewares.forEach(function (mid) {
-        addWebMiddleware(mid);
-      });
-    },
-    beforeMatch: function beforeMatch(_ref2, next) {
-      var _storage$hooks$before, _storage$hooks;
-
-      var context = _ref2.context;
-      return (_storage$hooks$before = (_storage$hooks = storage.hooks).beforeMatch) === null || _storage$hooks$before === void 0 ? void 0 : _storage$hooks$before.call(_storage$hooks, context, next);
-    },
-    afterMatch: function afterMatch(_ref3, next) {
-      var _storage$hooks$afterM, _storage$hooks2;
-
-      var context = _ref3.context,
-          routeAPI = _ref3.routeAPI;
-      context.router = routeAPI;
-      return (_storage$hooks$afterM = (_storage$hooks2 = storage.hooks).afterMatch) === null || _storage$hooks$afterM === void 0 ? void 0 : _storage$hooks$afterM.call(_storage$hooks2, context, next);
-    },
-    beforeRender: function beforeRender(_ref4, next) {
-      var _storage$hooks$before2, _storage$hooks3;
-
-      var context = _ref4.context;
-      return (_storage$hooks$before2 = (_storage$hooks3 = storage.hooks).beforeRender) === null || _storage$hooks$before2 === void 0 ? void 0 : _storage$hooks$before2.call(_storage$hooks3, context, next);
-    },
-    afterRender: function afterRender(_ref5, next) {
-      var _storage$hooks$afterR, _storage$hooks4;
-
-      var context = _ref5.context,
-          templateAPI = _ref5.templateAPI;
-      context.template = templateAPI;
-      return (_storage$hooks$afterR = (_storage$hooks4 = storage.hooks).afterRender) === null || _storage$hooks$afterR === void 0 ? void 0 : _storage$hooks$afterR.call(_storage$hooks4, context, next);
+
+      return {
+        reset: function reset() {
+          storage.reset();
+          var newWebModule = requireExistModule(webAppPath);
+
+          if (newWebModule) {
+            newWebModule(transformAPI);
+          }
+        },
+        gather: function gather(_ref) {
+          var addWebMiddleware = _ref.addWebMiddleware;
+          storage.middlewares.forEach(function (mid) {
+            addWebMiddleware(mid);
+          });
+        },
+        beforeMatch: function beforeMatch(_ref2, next) {
+          var _storage$hooks$before, _storage$hooks;
+
+          var context = _ref2.context;
+          return (_storage$hooks$before = (_storage$hooks = storage.hooks).beforeMatch) === null || _storage$hooks$before === void 0 ? void 0 : _storage$hooks$before.call(_storage$hooks, context, next);
+        },
+        afterMatch: function afterMatch(_ref3, next) {
+          var _storage$hooks$afterM, _storage$hooks2;
+
+          var context = _ref3.context,
+              routeAPI = _ref3.routeAPI;
+          context.router = routeAPI;
+          return (_storage$hooks$afterM = (_storage$hooks2 = storage.hooks).afterMatch) === null || _storage$hooks$afterM === void 0 ? void 0 : _storage$hooks$afterM.call(_storage$hooks2, context, next);
+        },
+        beforeRender: function beforeRender(_ref4, next) {
+          var _storage$hooks$before2, _storage$hooks3;
+
+          var context = _ref4.context;
+          return (_storage$hooks$before2 = (_storage$hooks3 = storage.hooks).beforeRender) === null || _storage$hooks$before2 === void 0 ? void 0 : _storage$hooks$before2.call(_storage$hooks3, context, next);
+        },
+        afterRender: function afterRender(_ref5, next) {
+          var _storage$hooks$afterR, _storage$hooks4;
+
+          var context = _ref5.context,
+              templateAPI = _ref5.templateAPI;
+          context.template = templateAPI;
+          return (_storage$hooks$afterR = (_storage$hooks4 = storage.hooks).afterRender) === null || _storage$hooks$afterR === void 0 ? void 0 : _storage$hooks$afterR.call(_storage$hooks4, context, next);
+        }
+      };
     }
   };
-}, {
-  name: '@modern-js/plugin-server'
 });

package/dist/types/cli.d.ts

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

package/dist/types/server.d.ts

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

package/jest.config.js

@@ -2,7 +2,6 @@ const sharedConfig = require('@scripts/jest-config');
 
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
-  // eslint-disable-next-line node/no-unsupported-features/es-syntax
   ...sharedConfig,
   rootDir: __dirname,
 };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.0",
+  "version": "1.1.3",
   "types": "./dist/types/server.d.ts",
   "jsnext:source": "./src/server.ts",
   "main": "./dist/js/node/server.js",
@@ -35,15 +35,15 @@
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/babel-compiler": "^1.2.0",
-    "@modern-js/server-utils": "^1.2.0",
-    "@modern-js/utils": "^1.2.0",
-    "@modern-js/server-plugin": "^1.2.0"
+    "@modern-js/babel-compiler": "^1.2.1",
+    "@modern-js/server-utils": "^1.2.1",
+    "@modern-js/utils": "^1.3.5"
   },
   "devDependencies": {
-    "@modern-js/core": "^1.3.0",
+    "@modern-js/server-core": "^1.2.3",
+    "@modern-js/core": "^1.5.0",
     "@scripts/build": "0.0.0",
-    "@modern-js/types": "^1.2.0",
+    "@modern-js/types": "^1.3.5",
     "del-cli": "^4.0.1",
     "typescript": "^4",
     "@types/jest": "^26.0.9",
@@ -51,9 +51,6 @@
     "jest": "^27",
     "@scripts/jest-config": "0.0.0"
   },
-  "peerDependencies": {
-    "@modern-js/core": "^1.3.0"
-  },
   "sideEffects": [
     "*.css",
     "*.less",
@@ -62,8 +59,7 @@
   ],
   "publishConfig": {
     "access": "public",
-    "registry": "https://registry.npmjs.org/",
-    "types": "./dist/types/server.d.ts"
+    "registry": "https://registry.npmjs.org/"
   },
   "scripts": {
     "dev": "modern dev",

package/tests/.eslintrc.js

@@ -0,0 +1,6 @@
+module.exports = {
+  extends: ['@modern-js'],
+  parserOptions: {
+    project: require.resolve('./tsconfig.json'),
+  },
+};

package/tests/fixtures/foo/server/index.ts

@@ -0,0 +1,23 @@
+type Sign = { status: number };
+
+const fn = (sign: Sign) => {
+  sign.status += 1;
+};
+
+export default ({
+  addMiddleware,
+  beforeMatch,
+  beforeRender,
+  afterMatch,
+  afterRender,
+}: any) => {
+  addMiddleware(fn);
+
+  beforeMatch(fn);
+
+  beforeRender(fn);
+
+  afterMatch(fn);
+
+  afterRender(fn);
+};

package/tests/index.test.ts

@@ -0,0 +1,39 @@
+import path from 'path';
+import cliPugin from '../src/cli';
+import serverPlugin from '../src/server';
+
+describe('plugin-server', () => {
+  it('cli', () => {
+    expect(cliPugin).toBeDefined();
+    expect(cliPugin().name).toBe('@modern-js/plugin-server');
+  });
+
+  it('server', () => {
+    expect(serverPlugin).toBeDefined();
+
+    const plugin = serverPlugin();
+    expect(plugin.name).toBe('@modern-js/plugin-server');
+
+    const hooks: any = plugin.setup!({
+      useAppContext: () => ({
+        appDirectory: path.join(__dirname, './fixtures/foo'),
+      }),
+    } as any);
+
+    const sign = { status: 0 };
+    hooks.gather({
+      addWebMiddleware: (fn: any) => {
+        fn(sign);
+      },
+    });
+    expect(sign.status).toBe(1);
+
+    const params = { context: sign };
+    hooks.beforeMatch(params);
+    hooks.afterMatch(params);
+    hooks.beforeRender(params);
+    hooks.afterRender(params);
+    hooks.reset();
+    expect(sign.status).toBe(5);
+  });
+});

package/tests/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "extends": "@modern-js/tsconfig/base",
+  "compilerOptions": {
+    "declaration": false,
+    "jsx": "preserve",
+    "baseUrl": "./",
+    "isolatedModules": true
+  }
+}

package/src/cli.ts

@@ -1,97 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-import {
-  createPlugin,
-  useAppContext,
-  useResolvedConfigContext,
-  NormalizedConfig,
-} from '@modern-js/core';
-import { compiler } from '@modern-js/babel-compiler';
-import { resolveBabelConfig } from '@modern-js/server-utils';
-import { SHARED_DIR, SERVER_DIR } from '@modern-js/utils';
-
-const TS_CONFIG_FILENAME = 'tsconfig.json';
-const FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs'];
-
-interface Pattern {
-  from: string;
-  to: string;
-  tsconfigPath?: string;
-}
-
-interface CompileOptions {
-  patterns: Pattern[];
-}
-
-const compile = async (
-  appDirectory: string,
-  modernConfig: NormalizedConfig,
-  compileOptions: CompileOptions,
-) => {
-  const { patterns } = compileOptions;
-  const results = await Promise.all(
-    patterns.map(pattern => {
-      const { from, to, tsconfigPath } = pattern;
-      const babelConfig = resolveBabelConfig(appDirectory, modernConfig, {
-        tsconfigPath: tsconfigPath ? tsconfigPath : '',
-        syntax: 'es6+',
-        type: 'commonjs',
-      });
-      return compiler(
-        {
-          rootDir: appDirectory,
-          distDir: to,
-          sourceDir: from,
-          extensions: FILE_EXTENSIONS,
-        },
-        babelConfig,
-      );
-    }),
-  );
-  results.forEach(result => {
-    if (result.code === 1) {
-      throw new Error(result.message);
-    }
-  });
-};
-
-export default createPlugin(
-  () => ({
-    config() {
-      return {};
-    },
-    async afterBuild() {
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      const { appDirectory, distDirectory } = useAppContext();
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      const modernConfig = useResolvedConfigContext();
-
-      const distDir = path.resolve(distDirectory);
-      const serverDir = path.resolve(appDirectory, SERVER_DIR);
-      const sharedDir = path.resolve(appDirectory, SHARED_DIR);
-      const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
-
-      const patterns = [];
-      if (fs.existsSync(serverDir)) {
-        patterns.push({
-          from: serverDir,
-          to: distDir,
-          tsconfigPath,
-        });
-      }
-
-      if (fs.existsSync(sharedDir)) {
-        patterns.push({
-          from: sharedDir,
-          to: distDir,
-          tsconfigPath,
-        });
-      }
-
-      if (patterns.length > 0) {
-        await compile(appDirectory, modernConfig, { patterns });
-      }
-    },
-  }),
-  { name: '@modern-js/plugin-server' },
-) as any;

package/src/modern-app-env.d.ts

@@ -1,2 +0,0 @@
-/// <reference types='@modern-js/module-tools' />
-/// <reference types='@modern-js/plugin-testing/type' />

package/src/server.ts

@@ -1,85 +0,0 @@
-import path from 'path';
-import { createPlugin } from '@modern-js/server-plugin';
-import { useAppContext } from '@modern-js/core';
-import { isProd, requireExistModule, SERVER_DIR } from '@modern-js/utils';
-import { ModernServerContext } from '@modern-js/types';
-
-const WEB_APP_NAME = 'index';
-
-type SF = (args: any, next: any) => void;
-class Storage {
-  public middlewares: SF[] = [];
-
-  public hooks: Record<string, SF> = {};
-
-  reset() {
-    this.middlewares = [];
-    this.hooks = {};
-  }
-}
-
-const createTransformAPI = (storage: Storage) =>
-  new Proxy(
-    {},
-    {
-      get(target: any, name: string) {
-        if (name === 'addMiddleware') {
-          return (fn: SF) => storage.middlewares.push(fn);
-        }
-        return (fn: SF) => (storage.hooks[name] = fn);
-      },
-    },
-  );
-
-type AfterMatchContext = ModernServerContext & { router: any };
-type AfterRenderContext = ModernServerContext & { template: any };
-
-export default createPlugin(
-  () => {
-    const { appDirectory, distDirectory } = useAppContext();
-    const pwd = isProd() ? distDirectory : appDirectory;
-
-    const serverPath = path.resolve(pwd, SERVER_DIR);
-    const webAppPath = path.resolve(serverPath, WEB_APP_NAME);
-
-    const storage = new Storage();
-    const transformAPI = createTransformAPI(storage);
-
-    const webMod = requireExistModule(webAppPath);
-    if (webMod) {
-      webMod(transformAPI);
-    }
-
-    return {
-      reset() {
-        storage.reset();
-        const newWebModule = requireExistModule(webAppPath);
-        if (newWebModule) {
-          newWebModule(transformAPI);
-        }
-      },
-      gather({ addWebMiddleware }) {
-        storage.middlewares.forEach(mid => {
-          addWebMiddleware(mid);
-        });
-      },
-      beforeMatch({ context }, next) {
-        return storage.hooks.beforeMatch?.(context, next);
-      },
-      afterMatch({ context, routeAPI }, next) {
-        (context as AfterMatchContext).router = routeAPI;
-        return storage.hooks.afterMatch?.(context, next);
-      },
-      beforeRender({ context }, next) {
-        return storage.hooks.beforeRender?.(context, next);
-      },
-      afterRender({ context, templateAPI }, next) {
-        (context as AfterRenderContext).template = templateAPI;
-        return storage.hooks.afterRender?.(context, next);
-      },
-    };
-  },
-  {
-    name: '@modern-js/plugin-server',
-  },
-) as any;