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

package/CHANGELOG.md

@@ -1,5 +1,62 @@
 # @modern-js/plugin-server
 
+## 2.0.0-beta.2
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Patch Changes
+
+- 3bbea92b2a: feat: support Hook、Middleware new API
+  feat: 支持 Hook、Middleware 的新 API
+- Updated dependencies [9b915e0c10]
+- Updated dependencies [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [a8642da58f]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [c2bb0f1]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/server-utils@2.0.0-beta.2
+  - @modern-js/utils@2.0.0-beta.2
+  - @modern-js/babel-compiler@2.0.0-beta.2
+
+## 2.0.0-beta.1
+
+### Major Changes
+
+- dda38c9: chore: v2
+
+### Patch Changes
+
+- 3bbea92b2a: feat: support Hook、Middleware new API
+  feat: 支持 Hook、Middleware 的新 API
+- Updated dependencies [9b915e0c10]
+- Updated dependencies [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f]
+- Updated dependencies [a8642da]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712d]
+  - @modern-js/server-utils@2.0.0-beta.1
+  - @modern-js/utils@2.0.0-beta.1
+  - @modern-js/babel-compiler@2.0.0-beta.1
+
 ## 2.0.0-beta.0
 
 ### Major Changes

package/dist/js/modern/cli.js

@@ -9,7 +9,6 @@ export default (() => ({
     config() {
       return {};
     },
-
     async afterBuild() {
       const {
         appDirectory,
@@ -21,32 +20,26 @@ export default (() => ({
       const sharedDir = path.resolve(appDirectory, SHARED_DIR);
       const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
       const sourceDirs = [];
-
       if (fs.existsSync(serverDir)) {
         sourceDirs.push(serverDir);
       }
-
       if (fs.existsSync(sharedDir)) {
         sourceDirs.push(sharedDir);
       }
-
       const {
         server
       } = modernConfig;
       const {
         alias,
-        envVars,
         globalVars
       } = modernConfig.source;
       const {
         babel
       } = modernConfig.tools;
-
       if (sourceDirs.length > 0) {
         await compile(appDirectory, {
           server,
           alias,
-          envVars,
           globalVars,
           babelConfig: babel
         }, {
@@ -56,6 +49,5 @@ export default (() => ({
         });
       }
     }
-
   })
 }));

package/dist/js/modern/server.js

@@ -1,69 +1,50 @@
 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, 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() {
     _defineProperty(this, "middlewares", []);
-
     _defineProperty(this, "hooks", {});
   }
-
   reset() {
     this.middlewares = [];
     this.hooks = {};
   }
-
 }
-
 const createTransformAPI = storage => new Proxy({}, {
   get(target, name) {
     if (name === 'addMiddleware') {
       return fn => storage.middlewares.push(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 => {
@@ -75,46 +56,38 @@ export default (() => ({
     const transformAPI = createTransformAPI(storage);
     const pwd = isProd() ? distDirectory : appDirectory;
     const webAppPath = path.resolve(pwd, SERVER_DIR, WEB_APP_NAME);
-
     const loadMod = () => {
       const mod = requireExistModule(webAppPath, {
         interop: false
       });
-
       const {
-        default: defaultExports,
-        middleware
-      } = mod,
-            hooks = _objectWithoutProperties(mod, _excluded);
-
+          default: defaultExports,
+          middleware
+        } = mod,
+        hooks = _objectWithoutProperties(mod, _excluded);
       if (defaultExports) {
         defaultExports(transformAPI);
-      } // named export hooks will overrides hooks in default export function
-
+      }
 
+      // 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();
         loadMod();
       },
-
       gather({
         addWebMiddleware
       }) {
@@ -122,23 +95,18 @@ export default (() => ({
           addWebMiddleware(mid);
         });
       },
-
       afterMatch(context, next) {
         if (!storage.hooks.afterMatch) {
           return next();
         }
-
         return storage.hooks.afterMatch(context, next);
       },
-
       afterRender(context, next) {
         if (!storage.hooks.afterRender) {
           return next();
         }
-
         return storage.hooks.afterRender(context, next);
       },
-
       prepareWebServer({
         config
       }) {
@@ -157,7 +125,6 @@ export default (() => ({
               if (err) {
                 return reject(err);
               }
-
               return resolve();
             });
             const dispatch = factory(ctx, resolve, reject);
@@ -165,7 +132,6 @@ export default (() => ({
           });
         };
       }
-
     };
   }
 }));

package/dist/js/node/cli.js

@@ -4,68 +4,49 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _fs = _interopRequireDefault(require("fs"));
-
 var _path = _interopRequireDefault(require("path"));
-
 var _serverUtils = require("@modern-js/server-utils");
-
 var _utils = require("@modern-js/utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const TS_CONFIG_FILENAME = 'tsconfig.json';
-
 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 sourceDirs = [];
-
       if (_fs.default.existsSync(serverDir)) {
         sourceDirs.push(serverDir);
       }
-
       if (_fs.default.existsSync(sharedDir)) {
         sourceDirs.push(sharedDir);
       }
-
       const {
         server
       } = modernConfig;
       const {
         alias,
-        envVars,
         globalVars
       } = modernConfig.source;
       const {
         babel
       } = modernConfig.tools;
-
       if (sourceDirs.length > 0) {
         await (0, _serverUtils.compile)(appDirectory, {
           server,
           alias,
-          envVars,
           globalVars,
           babelConfig: babel
         }, {
@@ -75,8 +56,6 @@ var _default = () => ({
         });
       }
     }
-
   })
 });
-
 exports.default = _default;

package/dist/js/node/server.js

@@ -4,78 +4,54 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 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() {
     _defineProperty(this, "middlewares", []);
-
     _defineProperty(this, "hooks", {});
   }
-
   reset() {
     this.middlewares = [];
     this.hooks = {};
   }
-
 }
-
 const createTransformAPI = storage => new Proxy({}, {
   get(target, name) {
     if (name === 'addMiddleware') {
       return fn => storage.middlewares.push(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 => {
@@ -86,48 +62,39 @@ var _default = () => ({
     const storage = new Storage();
     const transformAPI = createTransformAPI(storage);
     const pwd = (0, _utils.isProd)() ? distDirectory : appDirectory;
-
     const webAppPath = _path.default.resolve(pwd, _utils.SERVER_DIR, WEB_APP_NAME);
-
     const loadMod = () => {
       const mod = (0, _utils.requireExistModule)(webAppPath, {
         interop: false
       });
-
       const {
-        default: defaultExports,
-        middleware
-      } = mod,
-            hooks = _objectWithoutProperties(mod, _excluded);
-
+          default: defaultExports,
+          middleware
+        } = mod,
+        hooks = _objectWithoutProperties(mod, _excluded);
       if (defaultExports) {
         defaultExports(transformAPI);
-      } // named export hooks will overrides hooks in default export function
-
+      }
 
+      // 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();
         loadMod();
       },
-
       gather({
         addWebMiddleware
       }) {
@@ -135,23 +102,18 @@ var _default = () => ({
           addWebMiddleware(mid);
         });
       },
-
       afterMatch(context, next) {
         if (!storage.hooks.afterMatch) {
           return next();
         }
-
         return storage.hooks.afterMatch(context, next);
       },
-
       afterRender(context, next) {
         if (!storage.hooks.afterRender) {
           return next();
         }
-
         return storage.hooks.afterRender(context, next);
       },
-
       prepareWebServer({
         config
       }) {
@@ -170,7 +132,6 @@ var _default = () => ({
               if (err) {
                 return reject(err);
               }
-
               return resolve();
             });
             const dispatch = factory(ctx, resolve, reject);
@@ -178,9 +139,7 @@ var _default = () => ({
           });
         };
       }
-
     };
   }
 });
-
 exports.default = _default;

package/dist/js/treeshaking/cli.js

@@ -15,8 +15,7 @@ export default (function () {
         },
         afterBuild: function afterBuild() {
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-            var _api$useAppContext, appDirectory, distDirectory, modernConfig, distDir, serverDir, sharedDir, tsconfigPath, sourceDirs, server, _modernConfig$source, alias, envVars, globalVars, babel;
-
+            var _api$useAppContext, appDirectory, distDirectory, modernConfig, distDir, serverDir, sharedDir, tsconfigPath, sourceDirs, server, _modernConfig$source, alias, globalVars, babel;
             return _regeneratorRuntime().wrap(function _callee$(_context) {
               while (1) {
                 switch (_context.prev = _context.next) {
@@ -28,29 +27,23 @@ export default (function () {
                     sharedDir = path.resolve(appDirectory, SHARED_DIR);
                     tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
                     sourceDirs = [];
-
                     if (fs.existsSync(serverDir)) {
                       sourceDirs.push(serverDir);
                     }
-
                     if (fs.existsSync(sharedDir)) {
                       sourceDirs.push(sharedDir);
                     }
-
                     server = modernConfig.server;
-                    _modernConfig$source = modernConfig.source, alias = _modernConfig$source.alias, envVars = _modernConfig$source.envVars, globalVars = _modernConfig$source.globalVars;
+                    _modernConfig$source = modernConfig.source, alias = _modernConfig$source.alias, globalVars = _modernConfig$source.globalVars;
                     babel = modernConfig.tools.babel;
-
                     if (!(sourceDirs.length > 0)) {
                       _context.next = 15;
                       break;
                     }
-
                     _context.next = 15;
                     return compile(appDirectory, {
                       server: server,
                       alias: alias,
-                      envVars: envVars,
                       globalVars: globalVars,
                       babelConfig: babel
                     }, {
@@ -58,7 +51,6 @@ export default (function () {
                       distDir: distDir,
                       tsconfigPath: tsconfigPath
                     });
-
                   case 15:
                   case "end":
                     return _context.stop();

package/dist/js/treeshaking/server.js

@@ -7,21 +7,16 @@ 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() {
@@ -29,10 +24,8 @@ var Storage = /*#__PURE__*/function () {
       this.hooks = {};
     }
   }]);
-
   return Storage;
 }();
-
 var createTransformAPI = function createTransformAPI(storage) {
   return new Proxy({}, {
     get: function get(target, name) {
@@ -41,7 +34,6 @@ var createTransformAPI = function createTransformAPI(storage) {
           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;
@@ -49,67 +41,53 @@ var createTransformAPI = function createTransformAPI(storage) {
     }
   });
 };
-
 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;
-
+        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
         });
-
         var defaultExports = mod["default"],
-            middleware = mod.middleware,
-            hooks = _objectWithoutProperties(mod, _excluded);
-
+          middleware = mod.middleware,
+          hooks = _objectWithoutProperties(mod, _excluded);
         if (defaultExports) {
           defaultExports(transformAPI);
-        } // named export hooks will overrides hooks in default export function
-
+        }
 
+        // 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 {
         prepare: function prepare() {
           loadMod();
@@ -128,14 +106,12 @@ export default (function () {
           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) {
@@ -149,7 +125,6 @@ export default (function () {
                 if (err) {
                   return reject(err);
                 }
-
                 return resolve();
               });
               var dispatch = factory(ctx, resolve, reject);

package/dist/types/cli.d.ts

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

package/dist/types/server.d.ts

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

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.2",
   "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": "2.0.0-beta.0",
-    "@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.2",
+    "@modern-js/server-utils": "2.0.0-beta.2",
+    "@modern-js/utils": "2.0.0-beta.2"
   },
   "devDependencies": {
-    "@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": "2.0.0-beta.0"
+    "@modern-js/server-core": "2.0.0-beta.2",
+    "@modern-js/core": "2.0.0-beta.2",
+    "@scripts/build": "2.0.0-beta.2",
+    "@modern-js/types": "2.0.0-beta.2",
+    "@scripts/jest-config": "2.0.0-beta.2"
   },
   "sideEffects": [
     "*.css",
@@ -74,9 +74,9 @@
     "registry": "https://registry.npmjs.org/"
   },
   "scripts": {
-    "dev": "modern build --watch",
-    "build": "modern build",
-    "new": "modern new",
+    "dev": "modern-lib build --watch",
+    "build": "modern-lib build",
+    "new": "modern-lib new",
     "test": "jest --passWithNoTests"
   }
 }