@modern-js/plugin-server 0.0.0-canary-202112061746 → 0.0.0-runtime-2021112193858

package/CHANGELOG.md

@@ -0,0 +1,38 @@
+# @modern-js/plugin-server
+
+## 0.0.0-runtime-2021112193858
+
+### Patch Changes
+
+- 8698465e: fix: dependence version
+- Updated dependencies [8698465e]
+- Updated dependencies [e04914ce]
+- Updated dependencies [e04914ce]
+  - @modern-js/core@0.0.0-runtime-2021112193858
+  - @modern-js/server-plugin@0.0.0-runtime-2021112193858
+  - @modern-js/server-utils@0.0.0-runtime-2021112193858
+  - @modern-js/babel-compiler@0.0.0-runtime-2021112193858
+  - @modern-js/utils@0.0.0-runtime-2021112193858
+
+## 1.0.1
+
+### Patch Changes
+
+- 085a6a58: refactor server plugin
+- 085a6a58: refactor server plugin
+- 085a6a58: refactor server conifg
+- 085a6a58: support server runtime
+- 085a6a58: feat: refactor server plugin
+- Updated dependencies [085a6a58]
+- Updated dependencies [085a6a58]
+- Updated dependencies [085a6a58]
+- Updated dependencies [d280ea33]
+- Updated dependencies [d4fcc73a]
+- Updated dependencies [085a6a58]
+- Updated dependencies [ed1f6b12]
+- Updated dependencies [a5ebbb00]
+- Updated dependencies [085a6a58]
+  - @modern-js/core@1.1.3
+  - @modern-js/server-plugin@1.1.2
+  - @modern-js/server-utils@1.1.2
+  - @modern-js/utils@1.1.3

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Modern.js
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,30 +1,30 @@
-# Your Package
 
-## Get Started
+<p align="center">
+  <a href="https://modernjs.dev" target="blank"><img src="https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png" width="300" alt="Modern.js Logo" /></a>
+</p>
+<p align="center">
+现代 Web 工程体系
+  <br/>
+  <a href="https://modernjs.dev" target="blank">
+    modernjs.dev
+  </a>
+</p>
+<p align="center">
+  The meta-framework suite designed from scratch for frontend-focused modern web development
+</p>
 
-按开发环境的要求，运行和调试项目
+# Introduction
 
-运行和调试组件
+> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.
 
-```
-pnpm run dev
-```
+- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)
 
-运行测试用例
+## Getting Started
 
-```
-pnpm run test
-```
+- [Quick Start](https://modernjs.dev/docs/start)
+- [Guides](https://modernjs.dev/docs/guides)
+- [API References](https://modernjs.dev/docs/apis)
 
-按照社区规范和最佳实践，生成构建产物
-
-```
-pnpm run build
-```
-
-继续创建更多项目要素
-
-```
-pnpm run new
-```
+## Contributing
 
+- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)

package/dist/js/modern/{index.js → cli.js}

@@ -3,8 +3,7 @@ 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';
-const SERVER_DIR = './server';
-const SHARED_DIR = './shared';
+import { SHARED_DIR, SERVER_DIR } from '@modern-js/utils';
 const TS_CONFIG_FILENAME = 'tsconfig.json';
 const FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs'];
 

package/dist/js/modern/server.js

@@ -1,8 +1,13 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(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 { createPlugin } from '@modern-js/server-plugin';
 import { useAppContext } from '@modern-js/core';
-import { requireModule } from "./requireModule";
-const SERVER_DIR_PATH = 'server';
+import { isProd, requireExistModule, SERVER_DIR } from '@modern-js/utils';
 const WEB_APP_NAME = 'index';
 
 class Storage {
@@ -31,13 +36,15 @@ const createTransformAPI = storage => new Proxy({}, {
 
 export default createPlugin(() => {
   const {
-    appDirectory
+    appDirectory,
+    distDirectory
   } = useAppContext();
-  const serverPath = path.resolve(appDirectory, SERVER_DIR_PATH);
+  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 = requireModule(webAppPath);
+  const webMod = requireExistModule(webAppPath);
 
   if (webMod) {
     webMod(transformAPI);
@@ -46,7 +53,7 @@ export default createPlugin(() => {
   return {
     reset() {
       storage.reset();
-      const newWebModule = requireModule(webAppPath);
+      const newWebModule = requireExistModule(webAppPath);
 
       if (newWebModule) {
         newWebModule(transformAPI);
@@ -66,21 +73,18 @@ export default createPlugin(() => {
     }, 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);
+      return (_storage$hooks$before = (_storage$hooks = storage.hooks).beforeMatch) === null || _storage$hooks$before === void 0 ? void 0 : _storage$hooks$before.call(_storage$hooks, _objectSpread({}, context), next);
     },
 
     afterMatch({
       context,
-      routeApi
+      routeAPI
     }, next) {
       var _storage$hooks$afterM, _storage$hooks2;
 
-      return (_storage$hooks$afterM = (_storage$hooks2 = storage.hooks).afterMatch) === null || _storage$hooks$afterM === void 0 ? void 0 : _storage$hooks$afterM.call(_storage$hooks2, {
-        context,
-        routeApi
-      }, next);
+      return (_storage$hooks$afterM = (_storage$hooks2 = storage.hooks).afterMatch) === null || _storage$hooks$afterM === void 0 ? void 0 : _storage$hooks$afterM.call(_storage$hooks2, _objectSpread(_objectSpread({}, context), {}, {
+        routeAPI
+      }), next);
     },
 
     beforeRender({
@@ -88,9 +92,7 @@ export default createPlugin(() => {
     }, 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);
+      return (_storage$hooks$before2 = (_storage$hooks3 = storage.hooks).beforeRender) === null || _storage$hooks$before2 === void 0 ? void 0 : _storage$hooks$before2.call(_storage$hooks3, _objectSpread({}, context), next);
     },
 
     afterRender({
@@ -99,10 +101,9 @@ export default createPlugin(() => {
     }, next) {
       var _storage$hooks$afterR, _storage$hooks4;
 
-      return (_storage$hooks$afterR = (_storage$hooks4 = storage.hooks).afterRender) === null || _storage$hooks$afterR === void 0 ? void 0 : _storage$hooks$afterR.call(_storage$hooks4, {
-        context,
+      return (_storage$hooks$afterR = (_storage$hooks4 = storage.hooks).afterRender) === null || _storage$hooks$afterR === void 0 ? void 0 : _storage$hooks$afterR.call(_storage$hooks4, _objectSpread(_objectSpread({}, context), {}, {
         templateAPI
-      }, next);
+      }), next);
     }
 
   };

package/dist/js/node/{index.js → cli.js}

@@ -15,10 +15,10 @@ var _babelCompiler = require("@modern-js/babel-compiler");
 
 var _serverUtils = require("@modern-js/server-utils");
 
+var _utils = require("@modern-js/utils");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const SERVER_DIR = './server';
-const SHARED_DIR = './shared';
 const TS_CONFIG_FILENAME = 'tsconfig.json';
 const FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs'];
 
@@ -67,9 +67,9 @@ var _default = (0, _core.createPlugin)(() => ({
 
     const distDir = _path.default.resolve(distDirectory);
 
-    const serverDir = _path.default.resolve(appDirectory, SERVER_DIR);
+    const serverDir = _path.default.resolve(appDirectory, _utils.SERVER_DIR);
 
-    const sharedDir = _path.default.resolve(appDirectory, SHARED_DIR);
+    const sharedDir = _path.default.resolve(appDirectory, _utils.SHARED_DIR);
 
     const tsconfigPath = _path.default.resolve(appDirectory, TS_CONFIG_FILENAME);
 

package/dist/js/node/server.js

@@ -11,11 +11,16 @@ var _serverPlugin = require("@modern-js/server-plugin");
 
 var _core = require("@modern-js/core");
 
-var _requireModule = require("./requireModule");
+var _utils = require("@modern-js/utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const SERVER_DIR_PATH = 'server';
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(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';
 
 class Storage {
@@ -44,16 +49,18 @@ const createTransformAPI = storage => new Proxy({}, {
 
 var _default = (0, _serverPlugin.createPlugin)(() => {
   const {
-    appDirectory
+    appDirectory,
+    distDirectory
   } = (0, _core.useAppContext)();
+  const pwd = (0, _utils.isProd)() ? distDirectory : appDirectory;
 
-  const serverPath = _path.default.resolve(appDirectory, SERVER_DIR_PATH);
+  const serverPath = _path.default.resolve(pwd, _utils.SERVER_DIR);
 
   const webAppPath = _path.default.resolve(serverPath, WEB_APP_NAME);
 
   const storage = new Storage();
   const transformAPI = createTransformAPI(storage);
-  const webMod = (0, _requireModule.requireModule)(webAppPath);
+  const webMod = (0, _utils.requireExistModule)(webAppPath);
 
   if (webMod) {
     webMod(transformAPI);
@@ -62,7 +69,7 @@ var _default = (0, _serverPlugin.createPlugin)(() => {
   return {
     reset() {
       storage.reset();
-      const newWebModule = (0, _requireModule.requireModule)(webAppPath);
+      const newWebModule = (0, _utils.requireExistModule)(webAppPath);
 
       if (newWebModule) {
         newWebModule(transformAPI);
@@ -82,21 +89,18 @@ var _default = (0, _serverPlugin.createPlugin)(() => {
     }, 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);
+      return (_storage$hooks$before = (_storage$hooks = storage.hooks).beforeMatch) === null || _storage$hooks$before === void 0 ? void 0 : _storage$hooks$before.call(_storage$hooks, _objectSpread({}, context), next);
     },
 
     afterMatch({
       context,
-      routeApi
+      routeAPI
     }, next) {
       var _storage$hooks$afterM, _storage$hooks2;
 
-      return (_storage$hooks$afterM = (_storage$hooks2 = storage.hooks).afterMatch) === null || _storage$hooks$afterM === void 0 ? void 0 : _storage$hooks$afterM.call(_storage$hooks2, {
-        context,
-        routeApi
-      }, next);
+      return (_storage$hooks$afterM = (_storage$hooks2 = storage.hooks).afterMatch) === null || _storage$hooks$afterM === void 0 ? void 0 : _storage$hooks$afterM.call(_storage$hooks2, _objectSpread(_objectSpread({}, context), {}, {
+        routeAPI
+      }), next);
     },
 
     beforeRender({
@@ -104,9 +108,7 @@ var _default = (0, _serverPlugin.createPlugin)(() => {
     }, 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);
+      return (_storage$hooks$before2 = (_storage$hooks3 = storage.hooks).beforeRender) === null || _storage$hooks$before2 === void 0 ? void 0 : _storage$hooks$before2.call(_storage$hooks3, _objectSpread({}, context), next);
     },
 
     afterRender({
@@ -115,10 +117,9 @@ var _default = (0, _serverPlugin.createPlugin)(() => {
     }, next) {
       var _storage$hooks$afterR, _storage$hooks4;
 
-      return (_storage$hooks$afterR = (_storage$hooks4 = storage.hooks).afterRender) === null || _storage$hooks$afterR === void 0 ? void 0 : _storage$hooks$afterR.call(_storage$hooks4, {
-        context,
+      return (_storage$hooks$afterR = (_storage$hooks4 = storage.hooks).afterRender) === null || _storage$hooks$afterR === void 0 ? void 0 : _storage$hooks$afterR.call(_storage$hooks4, _objectSpread(_objectSpread({}, context), {}, {
         templateAPI
-      }, next);
+      }), next);
     }
 
   };

package/dist/js/treeshaking/{index.js → cli.js}

@@ -9,8 +9,7 @@ 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';
-var SERVER_DIR = './server';
-var SHARED_DIR = './shared';
+import { SHARED_DIR, SERVER_DIR } from '@modern-js/utils';
 var TS_CONFIG_FILENAME = 'tsconfig.json';
 var FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs'];
 

package/dist/js/treeshaking/server.js

@@ -1,14 +1,19 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(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; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 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); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+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 { requireModule } from "./requireModule";
-var SERVER_DIR_PATH = 'server';
+import { isProd, requireExistModule, SERVER_DIR } from '@modern-js/utils';
 var WEB_APP_NAME = 'index';
 
 var Storage = /*#__PURE__*/function () {
@@ -48,13 +53,15 @@ var createTransformAPI = function createTransformAPI(storage) {
 
 export default createPlugin(function () {
   var _useAppContext = useAppContext(),
-      appDirectory = _useAppContext.appDirectory;
+      appDirectory = _useAppContext.appDirectory,
+      distDirectory = _useAppContext.distDirectory;
 
-  var serverPath = path.resolve(appDirectory, SERVER_DIR_PATH);
+  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 = requireModule(webAppPath);
+  var webMod = requireExistModule(webAppPath);
 
   if (webMod) {
     webMod(transformAPI);
@@ -63,7 +70,7 @@ export default createPlugin(function () {
   return {
     reset: function reset() {
       storage.reset();
-      var newWebModule = requireModule(webAppPath);
+      var newWebModule = requireExistModule(webAppPath);
 
       if (newWebModule) {
         newWebModule(transformAPI);
@@ -79,37 +86,31 @@ export default createPlugin(function () {
       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: context
-      }, next);
+      return (_storage$hooks$before = (_storage$hooks = storage.hooks).beforeMatch) === null || _storage$hooks$before === void 0 ? void 0 : _storage$hooks$before.call(_storage$hooks, _objectSpread({}, context), next);
     },
     afterMatch: function afterMatch(_ref3, next) {
       var _storage$hooks$afterM, _storage$hooks2;
 
       var context = _ref3.context,
-          routeApi = _ref3.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: context,
-        routeApi: routeApi
-      }, next);
+          routeAPI = _ref3.routeAPI;
+      return (_storage$hooks$afterM = (_storage$hooks2 = storage.hooks).afterMatch) === null || _storage$hooks$afterM === void 0 ? void 0 : _storage$hooks$afterM.call(_storage$hooks2, _objectSpread(_objectSpread({}, context), {}, {
+        routeAPI: routeAPI
+      }), 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: context
-      }, next);
+      return (_storage$hooks$before2 = (_storage$hooks3 = storage.hooks).beforeRender) === null || _storage$hooks$before2 === void 0 ? void 0 : _storage$hooks$before2.call(_storage$hooks3, _objectSpread({}, context), next);
     },
     afterRender: function afterRender(_ref5, next) {
       var _storage$hooks$afterR, _storage$hooks4;
 
       var context = _ref5.context,
           templateAPI = _ref5.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: context,
+      return (_storage$hooks$afterR = (_storage$hooks4 = storage.hooks).afterRender) === null || _storage$hooks$afterR === void 0 ? void 0 : _storage$hooks$afterR.call(_storage$hooks4, _objectSpread(_objectSpread({}, context), {}, {
         templateAPI: templateAPI
-      }, next);
+      }), next);
     }
   };
 }, {

package/package.json

@@ -1,49 +1,48 @@
 {
   "name": "@modern-js/plugin-server",
-  "version": "0.0.0-canary-202112061746",
-  "jsnext:source": "./src/index.ts",
-  "types": "./dist/types/index.d.ts",
-  "main": "./dist/js/node/index.js",
-  "module": "./dist/js/treeshaking/index.js",
-  "jsnext:modern": "./dist/js/modern/index.js",
+  "description": "The meta-framework suite designed from scratch for frontend-focused modern web development.",
+  "homepage": "https://modernjs.dev",
+  "bugs": "https://github.com/modern-js-dev/modern.js/issues",
+  "repository": "modern-js-dev/modern.js",
+  "license": "MIT",
+  "keywords": [
+    "react",
+    "framework",
+    "modern",
+    "modern.js"
+  ],
+  "version": "0.0.0-runtime-2021112193858",
+  "types": "./dist/types/server.d.ts",
+  "main": "./dist/js/node/server.js",
   "exports": {
     ".": {
       "node": {
-        "import": "./dist/js/modern/index.js",
-        "require": "./dist/js/node/index.js"
+        "import": "./dist/js/modern/server.js",
+        "require": "./dist/js/node/server.js"
       },
-      "default": "./dist/js/treeshaking/index.js"
+      "default": "./dist/js/treeshaking/server.js"
     },
-    "./cli": "./dist/js/node/index.js",
+    "./cli": "./dist/js/node/cli.js",
     "./server": "./dist/js/node/server.js"
   },
-  "scripts": {
-    "prepare": "modern build",
-    "prepublishOnly": "modern build --platform",
-    "dev": "modern dev",
-    "build": "modern build",
-    "new": "modern new",
-    "test": "modern test --passWithNoTests"
-  },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/babel-compiler": "^1.1.2",
-    "@modern-js/server-utils": "^1.1.1",
-    "@modern-js/utils": "^1.1.2",
-    "@modern-js/server-plugin": "^1.1.1"
+    "@modern-js/babel-compiler": "^0.0.0-runtime-2021112193858",
+    "@modern-js/server-utils": "^0.0.0-runtime-2021112193858",
+    "@modern-js/utils": "^0.0.0-runtime-2021112193858",
+    "@modern-js/server-plugin": "^0.0.0-runtime-2021112193858"
   },
   "devDependencies": {
-    "@modern-js/core": "^1.1.2",
-    "@modern-js/plugin-jarvis": "^1.0.0",
-    "@modern-js/module-tools": "^1.0.0",
-    "@modern-js/plugin-testing": "^1.0.0",
+    "@modern-js/core": "^0.0.0-runtime-2021112193858",
+    "@modern-js/module-tools": "^0.0.0-runtime-2021112193858",
+    "@modern-js/plugin-testing": "^0.0.0-runtime-2021112193858",
     "del-cli": "^4.0.1",
-    "typescript": "^4",
+    "typescript": "^4.4.4",
     "@types/jest": "^26.0.9",
     "@types/node": "^14"
   },
   "peerDependencies": {
-    "@modern-js/core": "^1.1.2"
+    "@modern-js/core": "^0.0.0-runtime-2021112193858"
   },
   "sideEffects": [
     "*.css",
@@ -54,5 +53,11 @@
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
+  },
+  "scripts": {
+    "dev": "modern dev",
+    "build": "modern build",
+    "new": "modern new",
+    "test": "modern test --passWithNoTests"
   }
-}
+}

package/src/{index.ts → cli.ts}

@@ -8,9 +8,8 @@ import {
 } 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 SERVER_DIR = './server';
-const SHARED_DIR = './shared';
 const TS_CONFIG_FILENAME = 'tsconfig.json';
 const FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs'];
 

package/src/server.ts

@@ -1,13 +1,11 @@
 import path from 'path';
 import { createPlugin } from '@modern-js/server-plugin';
 import { useAppContext } from '@modern-js/core';
-import { requireModule } from './requireModule';
+import { isProd, requireExistModule, SERVER_DIR } from '@modern-js/utils';
 
-const SERVER_DIR_PATH = 'server';
 const WEB_APP_NAME = 'index';
 
 type SF = (args: any, next: any) => void;
-
 class Storage {
   public middlewares: SF[] = [];
 
@@ -34,15 +32,16 @@ const createTransformAPI = (storage: Storage) =>
 
 export default createPlugin(
   () => {
-    const { appDirectory } = useAppContext();
+    const { appDirectory, distDirectory } = useAppContext();
+    const pwd = isProd() ? distDirectory : appDirectory;
 
-    const serverPath = path.resolve(appDirectory, SERVER_DIR_PATH);
+    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 = requireModule(webAppPath);
+    const webMod = requireExistModule(webAppPath);
     if (webMod) {
       webMod(transformAPI);
     }
@@ -50,7 +49,7 @@ export default createPlugin(
     return {
       reset() {
         storage.reset();
-        const newWebModule = requireModule(webAppPath);
+        const newWebModule = requireExistModule(webAppPath);
         if (newWebModule) {
           newWebModule(transformAPI);
         }
@@ -61,16 +60,16 @@ export default createPlugin(
         });
       },
       beforeMatch({ context }, next) {
-        return storage.hooks.beforeMatch?.({ context }, next);
+        return storage.hooks.beforeMatch?.({ ...context }, next);
       },
-      afterMatch({ context, routeApi }, next) {
-        return storage.hooks.afterMatch?.({ context, routeApi }, next);
+      afterMatch({ context, routeAPI }, next) {
+        return storage.hooks.afterMatch?.({ ...context, routeAPI }, next);
       },
       beforeRender({ context }, next) {
-        return storage.hooks.beforeRender?.({ context }, next);
+        return storage.hooks.beforeRender?.({ ...context }, next);
       },
       afterRender({ context, templateAPI }, next) {
-        return storage.hooks.afterRender?.({ context, templateAPI }, next);
+        return storage.hooks.afterRender?.({ ...context, templateAPI }, next);
       },
     };
   },

package/dist/js/modern/requireModule.js

@@ -1,12 +0,0 @@
-import { findExists, compatRequire } from '@modern-js/utils';
-const FILE_EXTENSIONS = ['.ts', '.js'];
-export const requireModule = filename => {
-  const exist = findExists(FILE_EXTENSIONS.map(ext => `${filename}${ext}`));
-
-  if (!exist) {
-    return null;
-  } // throw errors directly if require fail
-
-
-  return compatRequire(exist);
-};

package/dist/js/node/requireModule.js

@@ -1,23 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.requireModule = void 0;
-
-var _utils = require("@modern-js/utils");
-
-const FILE_EXTENSIONS = ['.ts', '.js'];
-
-const requireModule = filename => {
-  const exist = (0, _utils.findExists)(FILE_EXTENSIONS.map(ext => `${filename}${ext}`));
-
-  if (!exist) {
-    return null;
-  } // throw errors directly if require fail
-
-
-  return (0, _utils.compatRequire)(exist);
-};
-
-exports.requireModule = requireModule;

package/dist/js/treeshaking/requireModule.js

@@ -1,14 +0,0 @@
-import { findExists, compatRequire } from '@modern-js/utils';
-var FILE_EXTENSIONS = ['.ts', '.js'];
-export var requireModule = function requireModule(filename) {
-  var exist = findExists(FILE_EXTENSIONS.map(function (ext) {
-    return "".concat(filename).concat(ext);
-  }));
-
-  if (!exist) {
-    return null;
-  } // throw errors directly if require fail
-
-
-  return compatRequire(exist);
-};

package/dist/types/requireModule.d.ts

@@ -1 +0,0 @@
-export declare const requireModule: (filename: string) => any;

package/src/requireModule.ts

@@ -1,14 +0,0 @@
-import { findExists, compatRequire } from '@modern-js/utils';
-
-const FILE_EXTENSIONS = ['.ts', '.js'];
-
-export const requireModule = (filename: string) => {
-  const exist = findExists(FILE_EXTENSIONS.map(ext => `${filename}${ext}`));
-
-  if (!exist) {
-    return null;
-  }
-
-  // throw errors directly if require fail
-  return compatRequire(exist);
-};

package/tests/.eslintrc.js

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

package/tests/index.test.ts

@@ -1,9 +0,0 @@
-import main from '@/index';
-
-describe('Default cases', () => {
-  test('Have returns', () => {
-    const drink = jest.fn(main);
-    drink();
-    expect(drink).toHaveReturned();
-  });
-});

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

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

package/tests/tsconfig.json

@@ -1,7 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "baseUrl": "../"
-  },
-  "include": ["**/*"]
-}