@modern-js/server 2.0.0-beta.0 → 2.0.0-beta.1

package/dist/js/node/dev-tools/dev-middleware/index.js

@@ -4,26 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _events = require("events");
-
 var _webpackDevMiddleware = _interopRequireDefault(require("@modern-js/utils/webpack-dev-middleware"));
-
 var _devServerPlugin = _interopRequireDefault(require("./dev-server-plugin"));
-
 var _socketServer = _interopRequireDefault(require("./socket-server"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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 noop = () => {// noop
+const noop = () => {
+  // noop
 };
-
 class DevMiddleware extends _events.EventEmitter {
   constructor({
     compiler,
@@ -31,48 +22,43 @@ class DevMiddleware extends _events.EventEmitter {
     devMiddleware
   }) {
     super();
-
     _defineProperty(this, "middleware", void 0);
-
     _defineProperty(this, "compiler", void 0);
-
     _defineProperty(this, "devOptions", void 0);
-
     _defineProperty(this, "socketServer", void 0);
-
     this.compiler = compiler;
-    this.devOptions = dev; // init socket server
+    this.devOptions = dev;
 
-    this.socketServer = new _socketServer.default(dev); // Todo: should remove after abstract dev middleware
+    // init socket server
+    this.socketServer = new _socketServer.default(dev);
 
+    // Todo: should remove after abstract dev middleware
     if (this.compiler) {
       // setup compiler in server, also add dev-middleware to handler static file in memory
       // set up plugin to each compiler
-      this.setupDevServerPlugin(); // register hooks for each compilation, update socket stats if recompiled
-
-      this.setupHooks(); // start dev middleware
-
+      this.setupDevServerPlugin();
+      // register hooks for each compilation, update socket stats if recompiled
+      this.setupHooks();
+      // start dev middleware
       this.middleware = this.setupDevMiddleware(devMiddleware);
     }
   }
-
   init(app) {
     app.on('listening', () => {
       this.socketServer.prepare(app);
     });
     app.on('close', async () => {
       var _this$middleware;
-
       (_this$middleware = this.middleware) === null || _this$middleware === void 0 ? void 0 : _this$middleware.close(noop);
       this.socketServer.close();
     });
   }
-
   setupDevServerPlugin() {
     const {
       devOptions
-    } = this; // apply dev server to client compiler, add hmr client to entry.
+    } = this;
 
+    // apply dev server to client compiler, add hmr client to entry.
     if (this.compiler.compilers) {
       this.compiler.compilers.forEach(target => {
         if (this.isClientCompiler(target)) {
@@ -83,21 +69,17 @@ class DevMiddleware extends _events.EventEmitter {
       new _devServerPlugin.default(devOptions).apply(this.compiler);
     }
   }
-
   sockWrite(type, data) {
     this.socketServer.sockWrite(type, data);
   }
-
   setupHooks() {
     const invalidPlugin = () => {
       this.socketServer.sockWrite('invalid');
     };
-
     const addHooks = compiler => {
       if (compiler.name === 'server') {
         return;
       }
-
       const {
         compile,
         invalid,
@@ -110,14 +92,12 @@ class DevMiddleware extends _events.EventEmitter {
         this.emit('change', stats);
       });
     };
-
     if (this.compiler.compilers) {
       this.compiler.compilers.forEach(addHooks);
     } else {
       addHooks(this.compiler);
     }
   }
-
   setupDevMiddleware(devMiddleware = _webpackDevMiddleware.default) {
     const {
       devOptions
@@ -128,23 +108,19 @@ class DevMiddleware extends _events.EventEmitter {
     }, devOptions.devMiddleware));
     return middleware;
   }
-
   isClientCompiler(compiler) {
     const {
       target
-    } = compiler.options; // if target not contains `node`, it's a client compiler
+    } = compiler.options;
 
+    // if target not contains `node`, it's a client compiler
     if (target) {
       if (Array.isArray(target)) {
         return !target.includes('node');
       }
-
       return target !== 'node';
     }
-
     return compiler.name === 'client';
   }
-
 }
-
 exports.default = DevMiddleware;

package/dist/js/node/dev-tools/dev-middleware/socket-server.js

@@ -4,47 +4,35 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _ws = _interopRequireDefault(require("ws"));
-
 var _utils = require("@modern-js/utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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; }
-
 class SocketServer {
   constructor(options) {
     _defineProperty(this, "wsServer", void 0);
-
     _defineProperty(this, "sockets", []);
-
     _defineProperty(this, "options", void 0);
-
     _defineProperty(this, "app", void 0);
-
     _defineProperty(this, "stats", void 0);
-
     _defineProperty(this, "timer", null);
-
     this.options = options;
-  } // create socket, install socket handler, bind socket event
-
+  }
 
+  // create socket, install socket handler, bind socket event
   prepare(app) {
     var _this$options$client;
-
     this.app = app;
     this.wsServer = new _ws.default.Server({
       noServer: true,
       path: (_this$options$client = this.options.client) === null || _this$options$client === void 0 ? void 0 : _this$options$client.path
-    }); // listen upgrade event to handle socket
+    });
 
+    // listen upgrade event to handle socket
     this.app.on('upgrade', (req, sock, head) => {
       if (!this.wsServer.shouldHandle(req)) {
         return;
       }
-
       this.wsServer.handleUpgrade(req, sock, head, connection => {
         this.wsServer.emit('connection', connection, req);
       });
@@ -56,12 +44,12 @@ class SocketServer {
     this.timer = setInterval(() => {
       this.wsServer.clients.forEach(socket => {
         const extWs = socket;
-
         if (!extWs.isAlive) {
           extWs.terminate();
         } else {
           extWs.isAlive = false;
-          extWs.ping(() => {// empty
+          extWs.ping(() => {
+            // empty
           });
         }
       });
@@ -70,13 +58,12 @@ class SocketServer {
       this.onConnect(socket);
     });
   }
-
   updateStats(stats) {
     this.stats = stats;
     this.sendStats();
-  } // write message to each socket
-
+  }
 
+  // write message to each socket
   sockWrite(type, data) {
     this.sockets.forEach(socket => {
       this.send(socket, JSON.stringify({
@@ -85,67 +72,56 @@ class SocketServer {
       }));
     });
   }
-
   singleWrite(socket, type, data) {
     this.send(socket, JSON.stringify({
       type,
       data
     }));
   }
-
   close() {
     this.sockets.forEach(socket => {
       socket.close();
     });
-
     if (this.timer) {
       clearInterval(this.timer);
       this.timer = null;
     }
   }
-
   onConnect(socket) {
     const connection = socket;
     connection.isAlive = true;
     connection.on('pong', () => {
       connection.isAlive = true;
     });
-
     if (!connection) {
       return;
     }
-
     this.sockets.push(connection);
     connection.on('close', () => {
       const idx = this.sockets.indexOf(connection);
-
       if (idx >= 0) {
         this.sockets.splice(idx, 1);
       }
     });
-
     if (this.options.hot || this.options.hot === 'only') {
       this.singleWrite(connection, 'hot');
     }
-
     if (this.options.liveReload) {
       this.singleWrite(connection, 'liveReload');
-    } // send first stats to active client sock if stats exist
-
+    }
 
+    // send first stats to active client sock if stats exist
     if (this.stats) {
       this.sendStats(true);
     }
-  } // get standard stats
-
+  }
 
+  // get standard stats
   getStats() {
     const curStats = this.stats;
-
     if (!curStats) {
       return null;
     }
-
     const defaultStats = {
       all: false,
       hash: true,
@@ -155,24 +131,21 @@ class SocketServer {
       errorDetails: false
     };
     return curStats.toJson(defaultStats);
-  } // determine what message should send by stats
-
+  }
 
+  // determine what message should send by stats
   sendStats(force = false) {
-    const stats = this.getStats(); // this should never happened
+    const stats = this.getStats();
 
+    // this should never happened
     if (!stats) {
       return null;
     }
-
     const shouldEmit = !force && stats && (!stats.errors || stats.errors.length === 0) && stats.assets && stats.assets.every(asset => !asset.emitted);
-
     if (shouldEmit) {
       return this.sockWrite('still-ok');
     }
-
     this.sockWrite('hash', stats.hash);
-
     if (stats.errors && stats.errors.length > 0) {
       return this.sockWrite('errors', stats.errors);
     } else if (stats.warnings && stats.warnings.length > 0) {
@@ -180,17 +153,14 @@ class SocketServer {
     } else {
       return this.sockWrite('ok');
     }
-  } // send message to connecting socket
-
+  }
 
+  // send message to connecting socket
   send(connection, message) {
     if (connection.readyState !== 1) {
       return;
     }
-
     connection.send(message);
   }
-
 }
-
 exports.default = SocketServer;

package/dist/js/node/dev-tools/https/index.js

@@ -4,22 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.genHttpsOptions = void 0;
-
 var devcert = _interopRequireWildcard(require("devcert"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 const genHttpsOptions = async userOptions => {
   const httpsOptions = typeof userOptions === 'boolean' ? {} : userOptions;
-
   if (!httpsOptions.key || !httpsOptions.cert) {
     const selfsign = await devcert.certificateFor(['localhost']);
     return selfsign;
   }
-
   return httpsOptions;
 };
-
 exports.genHttpsOptions = genHttpsOptions;

package/dist/js/node/dev-tools/mock/getMockData.js

@@ -4,22 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getMatched = exports.default = void 0;
-
 var _utils = require("@modern-js/utils");
-
 var _pathToRegexp = require("path-to-regexp");
-
 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; }
-
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-const VALID_METHODS = ['get', 'post', 'put', 'delete', 'patch']; // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
+const VALID_METHODS = ['get', 'post', 'put', 'delete', 'patch'];
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const BODY_PARSED_METHODS = ['post', 'put', 'delete', 'patch'];
-
 const createFunctionDataHandler = (method, handler) => async (context, next) => {
   const {
     req,
@@ -27,7 +20,6 @@ const createFunctionDataHandler = (method, handler) => async (context, next) =>
   } = context;
   return handler(req, res, next);
 };
-
 const createStaticDataHandler = (method, handler) => context => {
   const {
     res
@@ -35,19 +27,14 @@ const createStaticDataHandler = (method, handler) => context => {
   res.setHeader('Content-Type', 'application/json');
   res.end(JSON.stringify(handler));
 };
-
 const allowTypes = ['object', 'function'];
-
 const normalizeConfig = mockConfig => Object.keys(mockConfig).reduce((acc, key) => {
   const handler = mockConfig[key];
   const type = typeof handler;
-
   if (!allowTypes.includes(type)) {
     throw new Error(`mock value of ${key} should be object or function, but got ${type}`);
   }
-
   const meta = parseKey(key);
-
   if (type === 'object') {
     acc.push(_objectSpread(_objectSpread({}, meta), {}, {
       handler: createStaticDataHandler(meta.method, handler)
@@ -57,44 +44,35 @@ const normalizeConfig = mockConfig => Object.keys(mockConfig).reduce((acc, key)
       handler: createFunctionDataHandler(meta.method, handler)
     }));
   }
-
   return acc;
 }, []);
-
 const _blank = ' ';
-
 const parseKey = key => {
   // 'Method /pathname' | '/pathname'
   const splitted = key.split(_blank).filter(Boolean);
-
   if (splitted.length > 1) {
     const [method, pathname] = splitted;
     return {
       method: method.toLowerCase(),
       path: pathname
     };
-  } // default return get method
-
+  }
 
+  // default return get method
   return {
     method: 'get',
     path: key
   };
 };
-
 var _default = filepath => {
   const mockModule = (0, _utils.compatRequire)(filepath);
-
   if (!mockModule) {
     throw new Error(`Mock file ${filepath} parsed failed!`);
   }
-
   const data = normalizeConfig(mockModule);
   return data;
 };
-
 exports.default = _default;
-
 const getMatched = (context, mockApiList) => {
   const {
     path: targetPathname,
@@ -105,17 +83,14 @@ const getMatched = (context, mockApiList) => {
       method,
       path: pathname
     } = mockApi;
-
     if (method.toLowerCase() === targetMethod.toLowerCase()) {
       return (0, _pathToRegexp.match)(pathname, {
         encode: encodeURI,
         decode: decodeURIComponent
       })(targetPathname);
     }
-
     return false;
   });
   return matched;
 };
-
 exports.getMatched = getMatched;

package/dist/js/node/dev-tools/mock/index.js

@@ -4,59 +4,42 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createMockHandler = void 0;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _utils = require("@modern-js/utils");
-
 var _prodServer = require("@modern-js/prod-server");
-
 var _getMockData = _interopRequireWildcard(require("./getMockData"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const createMockHandler = ({
   pwd
 }) => {
   const exts = ['.ts', '.js'];
   let filepath = '';
-
   for (const ext of exts) {
     const maybeMatch = _path.default.join(pwd, `${_prodServer.AGGRED_DIR.mock}/index${ext}`);
-
     if (_utils.fs.existsSync(maybeMatch)) {
       filepath = maybeMatch;
       break;
     }
   }
-
   if (!filepath) {
     return null;
   }
-
   const apiList = (0, _getMockData.default)(filepath);
-
   if (!apiList || apiList.length === 0) {
     return null;
   }
-
   return async (context, next) => {
     const {
       res
     } = context;
     const matched = (0, _getMockData.getMatched)(context, apiList);
-
     if (!matched) {
       return next();
     }
-
     res.setHeader('Access-Control-Allow-Origin', '*');
     return matched.handler(context, next);
   };
 };
-
 exports.createMockHandler = createMockHandler;

package/dist/js/node/dev-tools/register/index.js

@@ -4,57 +4,38 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.enableRegister = void 0;
-
 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 }; }
-
 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 debug = (0, _utils.createDebugger)('server');
-
 const checkDep = (depName, paths) => {
   let packagePath = '';
-
   try {
     packagePath = require.resolve(depName, {
       paths
     });
   } catch (error) {}
-
   return Boolean(packagePath);
 };
-
-const enableRegister = (projectRoot, config // eslint-disable-next-line consistent-return
+const enableRegister = (projectRoot, config
+// eslint-disable-next-line consistent-return
 ) => {
   const registerDirs = ['./api', './server', './config/mock', './shared'];
   const TS_CONFIG_FILENAME = `tsconfig.json`;
-
   const tsconfigPath = _path.default.resolve(projectRoot, TS_CONFIG_FILENAME);
-
   const isTsProject = _utils.fs.existsSync(tsconfigPath);
-
   const existTsNode = checkDep('ts-node', [projectRoot]);
   const existTsConfigPaths = checkDep('tsconfig-paths', [projectRoot]);
-
   if (isTsProject && existTsNode && existTsConfigPaths) {
     var _config$output;
-
     debug('use ts-node');
     const distPath = (config === null || config === void 0 ? void 0 : (_config$output = config.output) === null || _config$output === void 0 ? void 0 : _config$output.path) || 'dist';
-
     const tsNode = require('ts-node');
-
     const tsConfigPaths = require('tsconfig-paths');
-
     const {
       alias
     } = config.source;
@@ -68,15 +49,12 @@ const enableRegister = (projectRoot, config // eslint-disable-next-line consiste
     } = aliasConfig;
     const tsPaths = Object.keys(paths).reduce((o, key) => {
       let tsPath = paths[key];
-
       if (typeof tsPath === 'string' && _path.default.isAbsolute(tsPath)) {
         tsPath = _path.default.relative(absoluteBaseUrl, tsPath);
       }
-
       if (typeof tsPath === 'string') {
         tsPath = [tsPath];
       }
-
       return _objectSpread(_objectSpread({}, o), {}, {
         [`${key}`]: tsPath
       });
@@ -94,7 +72,6 @@ const enableRegister = (projectRoot, config // eslint-disable-next-line consiste
     });
   } else {
     var _config$tools, _config$server;
-
     debug('use @babel/register');
     const babelConfig = (0, _serverUtils.resolveBabelConfig)(projectRoot, _objectSpread(_objectSpread({}, config.source), {}, {
       babelConfig: (_config$tools = config.tools) === null || _config$tools === void 0 ? void 0 : _config$tools.babel,
@@ -113,7 +90,6 @@ const enableRegister = (projectRoot, config // eslint-disable-next-line consiste
         if (filePath.includes(`node_modules${_path.default.sep}.modern-js`)) {
           return true;
         }
-
         return registerDirs.some(registerDir => filePath.startsWith(_path.default.join(projectRoot, registerDir)));
       }],
       extensions: ['.js', '.ts'],
@@ -123,5 +99,4 @@ const enableRegister = (projectRoot, config // eslint-disable-next-line consiste
     }));
   }
 };
-
 exports.enableRegister = enableRegister;