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

package/dist/js/node/dev-tools/watcher/dependency-tree.js

@@ -4,16 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.defaultIgnores = exports.DependencyTree = void 0;
-
 var _minimatch = _interopRequireDefault(require("minimatch"));
-
 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; }
-
 const defaultIgnores = ['**/bower_components/**', '**/coverage/**', '**/node_modules/**', '**/.*/**', '**/*.d.ts', '**/*.log'];
 exports.defaultIgnores = defaultIgnores;
-
 /**
  * `require.cache` already is a dependency tree, however require cache's
  * `module.parent` is the module that first required. so we have to implement
@@ -22,26 +17,23 @@ exports.defaultIgnores = defaultIgnores;
 class DependencyTree {
   constructor() {
     _defineProperty(this, "tree", void 0);
-
     _defineProperty(this, "ignore", void 0);
-
     this.tree = new Map();
     this.ignore = [...defaultIgnores];
   }
-
   getNode(path) {
     return this.tree.get(path);
   }
+
   /**
    * update dependency tree
    *
    * @param cache
    */
-
-
   update(cache) {
-    this.tree.clear(); // insert all module that not ignored
+    this.tree.clear();
 
+    // insert all module that not ignored
     Object.keys(cache).forEach(path => {
       if (!this.shouldIgnore(path)) {
         const module = cache[path];
@@ -51,8 +43,9 @@ class DependencyTree {
           children: new Set()
         });
       }
-    }); // update treeNode parent and children
+    });
 
+    // update treeNode parent and children
     for (const treeNode of this.tree.values()) {
       const {
         parent
@@ -60,19 +53,15 @@ class DependencyTree {
       const {
         children
       } = treeNode.module;
-
       if (parent && !this.shouldIgnore(parent.filename)) {
         const parentTreeNode = this.tree.get(parent.filename);
-
         if (parentTreeNode) {
           treeNode.parent.add(parentTreeNode);
         }
       }
-
       children.forEach(child => {
         if (!this.shouldIgnore(child.filename)) {
           const childTreeNode = this.tree.get(child.filename);
-
           if (childTreeNode) {
             treeNode.children.add(childTreeNode);
             childTreeNode.parent.add(treeNode);
@@ -81,11 +70,8 @@ class DependencyTree {
       });
     }
   }
-
   shouldIgnore(path) {
     return !path || Boolean(this.ignore.find(rule => _minimatch.default.match([path], rule).length > 0));
   }
-
 }
-
 exports.DependencyTree = DependencyTree;

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

@@ -4,30 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.mergeWatchOptions = exports.getWatchedFiles = exports.defaultWatchOptions = exports.default = void 0;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _utils = require("@modern-js/utils");
-
 var _dependencyTree = require("./dependency-tree");
-
 var _statsCache = require("./stats-cache");
-
 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 defaultWatchOptions = {
   // 初始化的时候不触发 add、addDir 事件
   ignoreInitial: true,
   ignored: /api\/typings\/.*/
 };
 exports.defaultWatchOptions = defaultWatchOptions;
-
 const getWatchedFiles = watcher => {
   const watched = watcher.getWatched();
   const files = [];
@@ -38,44 +28,32 @@ const getWatchedFiles = watcher => {
   });
   return files;
 };
-
 exports.getWatchedFiles = getWatchedFiles;
-
 const mergeWatchOptions = options => {
   const watchOptions = _objectSpread({}, options);
-
   if (watchOptions) {
     const {
       ignored
     } = watchOptions;
     const finalIgnored = ignored ? [defaultWatchOptions.ignored, ...(Array.isArray(ignored) ? ignored : [ignored])] : ignored;
-
     if (finalIgnored) {
       watchOptions.ignored = finalIgnored;
     }
   }
-
   const finalWatchOptions = _objectSpread(_objectSpread({}, defaultWatchOptions), watchOptions);
-
   return finalWatchOptions;
 };
-
 exports.mergeWatchOptions = mergeWatchOptions;
-
 class Watcher {
   constructor() {
     _defineProperty(this, "dependencyTree", null);
-
     _defineProperty(this, "watcher", void 0);
   }
-
   listen(files, options, callback) {
     const watched = files.filter(Boolean);
     const filenames = watched.map(filename => filename.replace(/\\/g, '/'));
     const cache = new _statsCache.StatsCache();
-
     const watcher = _utils.chokidar.watch(filenames, options);
-
     watcher.on('ready', () => {
       cache.add(getWatchedFiles(watcher));
     });
@@ -97,35 +75,25 @@ class Watcher {
     });
     this.watcher = watcher;
   }
-
   createDepTree() {
     this.dependencyTree = new _dependencyTree.DependencyTree();
   }
-
   updateDepTree() {
     var _this$dependencyTree;
-
     (_this$dependencyTree = this.dependencyTree) === null || _this$dependencyTree === void 0 ? void 0 : _this$dependencyTree.update(require.cache);
   }
-
   cleanDepCache(filepath) {
     var _this$dependencyTree2;
-
     const node = (_this$dependencyTree2 = this.dependencyTree) === null || _this$dependencyTree2 === void 0 ? void 0 : _this$dependencyTree2.getNode(filepath);
-
     if (node && require.cache[filepath]) {
       delete require.cache[filepath];
-
       for (const parentNode of node.parent.values()) {
         this.cleanDepCache(parentNode.module.filename);
       }
     }
   }
-
   close() {
     return this.watcher.close();
   }
-
 }
-
 exports.default = Watcher;

package/dist/js/node/dev-tools/watcher/stats-cache.js

@@ -4,32 +4,23 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.StatsCache = void 0;
-
 var _fs = _interopRequireDefault(require("fs"));
-
 var _crypto = _interopRequireDefault(require("crypto"));
-
 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 StatsCache {
   constructor() {
     _defineProperty(this, "cachedHash", {});
-
     _defineProperty(this, "cachedSize", {});
   }
-
   add(files) {
     const {
       cachedHash,
       cachedSize
     } = this;
-
     for (const filename of files) {
       if (_fs.default.existsSync(filename)) {
         const stats = _fs.default.statSync(filename);
-
         if (stats.isFile() && !cachedHash[filename]) {
           cachedHash[filename] = this.hash(stats, filename);
           cachedSize[filename] = stats.size;
@@ -37,60 +28,46 @@ class StatsCache {
       }
     }
   }
-
   refresh(filename) {
     const {
       cachedHash,
       cachedSize
     } = this;
-
     if (_fs.default.existsSync(filename)) {
       const stats = _fs.default.statSync(filename);
-
       if (stats.isFile()) {
         cachedHash[filename] = this.hash(stats, filename);
         cachedSize[filename] = stats.size;
       }
     }
   }
-
   del(filename) {
     if (this.cachedHash[filename]) {
       delete this.cachedHash[filename];
       delete this.cachedSize[filename];
     }
   }
-
   isDiff(filename) {
     const {
       cachedHash,
       cachedSize
     } = this;
-
     const stats = _fs.default.statSync(filename);
-
     const hash = cachedHash[filename];
     const size = cachedSize[filename];
-
     if (stats.size !== size) {
       return true;
     }
-
     if (this.hash(stats, filename) !== hash) {
       return true;
     }
-
     return false;
   }
-
   has(filename) {
     return Boolean(this.cachedHash[filename]);
   }
-
   hash(stats, filename) {
     return _crypto.default.createHash('md5').update(_fs.default.readFileSync(filename)).digest('hex');
   }
-
 }
-
 exports.StatsCache = StatsCache;

package/dist/js/node/index.js

@@ -10,16 +10,12 @@ Object.defineProperty(exports, "Server", {
   }
 });
 exports.default = void 0;
-
 var _server = require("./server");
-
 var _default = options => {
   if (options == null) {
     throw new Error('can not start mserver without options');
   }
-
   const server = new _server.DevServer(options);
   return server.init();
 };
-
 exports.default = _default;

package/dist/js/node/server/dev-server.js

@@ -4,57 +4,38 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ModernDevServer = void 0;
-
 var _http = require("http");
-
 var _path = _interopRequireDefault(require("path"));
-
 var _https = require("https");
-
 var _utils = require("@modern-js/utils");
-
 var _prodServer = require("@modern-js/prod-server");
-
 var _constants = require("@modern-js/utils/constants");
-
 var _constants2 = require("../constants");
-
 var _mock = require("../dev-tools/mock");
-
 var _register = require("../dev-tools/register");
-
 var _watcher = _interopRequireWildcard(require("../dev-tools/watcher"));
-
 var _devMiddleware = _interopRequireDefault(require("../dev-tools/dev-middleware"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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 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; }
-
 class ModernDevServer extends _prodServer.ModernServer {
   constructor(options) {
-    super(options); // dev server should work in pwd
+    super(options);
 
+    // dev server should work in pwd
     _defineProperty(this, "mockHandler", null);
-
     _defineProperty(this, "dev", void 0);
-
     _defineProperty(this, "devMiddleware", void 0);
-
     _defineProperty(this, "watcher", void 0);
+    this.workDir = this.pwd;
 
-    this.workDir = this.pwd; // set dev server options, like webpack-dev-server
-
-    this.dev = this.getDevOptions(options); // create dev middleware instance
+    // set dev server options, like webpack-dev-server
+    this.dev = this.getDevOptions(options);
 
+    // create dev middleware instance
     this.devMiddleware = new _devMiddleware.default({
       dev: this.dev,
       compiler: options.compiler,
@@ -62,7 +43,6 @@ class ModernDevServer extends _prodServer.ModernServer {
     });
     (0, _register.enableRegister)(this.pwd, this.conf);
   }
-
   getDevOptions(options) {
     const devOptions = typeof options.dev === 'boolean' ? {} : options.dev;
     const defaultOptions = (0, _constants2.getDefaultDevOptions)();
@@ -70,7 +50,6 @@ class ModernDevServer extends _prodServer.ModernServer {
       client: _objectSpread(_objectSpread({}, defaultOptions.client), devOptions === null || devOptions === void 0 ? void 0 : devOptions.client)
     });
   }
-
   addMiddlewareHandler(handlers) {
     handlers.forEach(handler => {
       this.addHandler((ctx, next) => {
@@ -82,7 +61,6 @@ class ModernDevServer extends _prodServer.ModernServer {
       });
     });
   }
-
   applySetupMiddlewares() {
     const setupMiddlewares = this.dev.setupMiddlewares || [];
     const serverOptions = {
@@ -100,38 +78,40 @@ class ModernDevServer extends _prodServer.ModernServer {
       befores,
       afters
     };
-  } // Complete the preparation of services
-
+  }
 
+  // Complete the preparation of services
   async onInit(runner, app) {
     this.runner = runner;
     const {
       dev
-    } = this; // Order: devServer.before => setupMiddlewares.unshift => internal middlewares => setupMiddlewares.push => devServer.after
+    } = this;
 
+    // Order: devServer.before => setupMiddlewares.unshift => internal middlewares => setupMiddlewares.push => devServer.after
     const {
       befores,
       afters
-    } = this.applySetupMiddlewares(); // before dev handler
+    } = this.applySetupMiddlewares();
 
+    // before dev handler
     const beforeHandlers = await this.setupBeforeDevMiddleware();
     this.addMiddlewareHandler([...beforeHandlers, ...befores]);
-    await this.applyDefaultMiddlewares(app); // after dev handler
+    await this.applyDefaultMiddlewares(app);
 
+    // after dev handler
     const afterHandlers = await this.setupAfterDevMiddleware();
     this.addMiddlewareHandler([...afters, ...afterHandlers]);
-    await super.onInit(runner, app); // watch mock/ server/ api/ dir file change
+    await super.onInit(runner, app);
 
+    // watch mock/ server/ api/ dir file change
     if (dev.watch) {
       this.startWatcher();
       app.on('close', async () => {
         var _this$watcher;
-
         await ((_this$watcher = this.watcher) === null || _this$watcher === void 0 ? void 0 : _this$watcher.close());
       });
     }
   }
-
   async applyDefaultMiddlewares(app) {
     const {
       pwd,
@@ -140,23 +120,22 @@ class ModernDevServer extends _prodServer.ModernServer {
     } = this;
     this.addHandler((ctx, next) => {
       // allow hmr request cross-domain, because the user may use global proxy
+      ctx.res.setHeader('Access-Control-Allow-Origin', '*');
       if (ctx.path.includes('hot-update')) {
-        ctx.res.setHeader('Access-Control-Allow-Origin', '*');
         ctx.res.setHeader('Access-Control-Allow-Credentials', 'false');
-      } // 用户在 devServer 上配置的 headers 不会对 html 的请求生效，加入下面代码，使配置的 headers 对所有请求生效
-
+      }
 
+      // 用户在 devServer 上配置的 headers 不会对 html 的请求生效，加入下面代码，使配置的 headers 对所有请求生效
       const confHeaders = dev.headers;
-
       if (confHeaders) {
         for (const [key, value] of Object.entries(confHeaders)) {
           ctx.res.setHeader(key, value);
         }
       }
-
       next();
-    }); // mock handler
+    });
 
+    // mock handler
     this.mockHandler = (0, _mock.createMockHandler)({
       pwd
     });
@@ -166,17 +145,17 @@ class ModernDevServer extends _prodServer.ModernServer {
       } else {
         next();
       }
-    }); // dev proxy handler, each proxy has own handler
+    });
 
+    // dev proxy handler, each proxy has own handler
     const proxyHandlers = (0, _prodServer.createProxyHandler)(dev.proxy);
-
     if (proxyHandlers) {
       proxyHandlers.forEach(handler => {
         this.addHandler(handler);
       });
-    } // do webpack build / plugin apply / socket server when pass compiler instance
-
+    }
 
+    // do webpack build / plugin apply / socket server when pass compiler instance
     devMiddleware.init(app);
     devMiddleware.on('change', stats => {
       // Reset only when client compile done
@@ -193,14 +172,12 @@ class ModernDevServer extends _prodServer.ModernServer {
         req,
         res
       } = ctx;
-
       if (devMiddleware.middleware) {
         devMiddleware.middleware(req, res, next);
       } else {
         next();
       }
     });
-
     if (dev.historyApiFallback) {
       const {
         default: connectHistoryApiFallback
@@ -209,41 +186,37 @@ class ModernDevServer extends _prodServer.ModernServer {
       this.addHandler((ctx, next) => historyApiFallbackMiddleware(ctx.req, ctx.res, next));
     }
   }
-
   onRepack(options = {}) {
     // reset the routing management instance every times the service starts
     if (Array.isArray(options.routes)) {
       this.router.reset(this.filterRoutes(options.routes));
-    } // clean ssr bundle cache
-
+    }
 
-    this.cleanSSRCache(); // reset static file
+    // clean ssr bundle cache
+    this.cleanSSRCache();
 
+    // reset static file
     this.reader.updateFile();
     super.onRepack(options);
   }
-
   async createHTTPServer(handler) {
     const {
       dev
     } = this;
     const devHttpsOption = typeof dev === 'object' && dev.https;
-
     if (devHttpsOption) {
       const {
         genHttpsOptions
       } = require("../dev-tools/https");
-
       const httpsOptions = await genHttpsOptions(devHttpsOption);
       return (0, _https.createServer)(httpsOptions, handler);
     } else {
       return (0, _http.createServer)(handler);
     }
   }
-
-  warmupSSRBundle() {// not warmup ssr bundle on development
+  warmupSSRBundle() {
+    // not warmup ssr bundle on development
   }
-
   onServerChange({
     filepath,
     event
@@ -254,11 +227,8 @@ class ModernDevServer extends _prodServer.ModernServer {
     const {
       mock
     } = _prodServer.AGGRED_DIR;
-
     const mockPath = _path.default.normalize(_path.default.join(pwd, mock));
-
     this.runner.reset();
-
     if (filepath.startsWith(mockPath)) {
       this.mockHandler = (0, _mock.createMockHandler)({
         pwd
@@ -268,11 +238,12 @@ class ModernDevServer extends _prodServer.ModernServer {
         const success = this.runner.onApiChange([{
           filename: filepath,
           event
-        }]); // onApiChange 钩子被调用，且返回 true，则表示无需重新编译
+        }]);
+
+        // onApiChange 钩子被调用，且返回 true，则表示无需重新编译
         // onApiChange 的类型是 WaterFall,WaterFall 钩子的返回值类型目前有问题
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-expect-error
-
         if (success !== true) {
           super.onServerChange({
             filepath
@@ -283,13 +254,11 @@ class ModernDevServer extends _prodServer.ModernServer {
       }
     }
   }
-
   createContext(req, res) {
     return super.createContext(req, res, {
       etag: true
     });
   }
-
   async setupBeforeDevMiddleware() {
     const {
       runner,
@@ -300,7 +269,6 @@ class ModernDevServer extends _prodServer.ModernServer {
     const pluginMids = await runner.beforeDevServer(conf);
     return [...setupMids, ...pluginMids].flat();
   }
-
   async setupAfterDevMiddleware() {
     const {
       runner,
@@ -311,7 +279,6 @@ class ModernDevServer extends _prodServer.ModernServer {
     const pluginMids = await runner.afterDevServer(conf);
     return [...pluginMids, ...setupMids].flat();
   }
-
   cleanSSRCache() {
     const {
       distDir
@@ -319,22 +286,17 @@ class ModernDevServer extends _prodServer.ModernServer {
     const bundles = this.router.getBundles();
     bundles.forEach(bundle => {
       const filepath = _path.default.join(distDir, bundle);
-
       if (require.cache[filepath]) {
         delete require.cache[filepath];
       }
     });
-
     const loadable = _path.default.join(distDir, _constants.LOADABLE_STATS_FILE);
-
     if (require.cache[loadable]) {
       delete require.cache[loadable];
     }
   }
-
   startWatcher() {
     var _this$conf$server;
-
     const {
       pwd
     } = this;
@@ -345,8 +307,9 @@ class ModernDevServer extends _prodServer.ModernServer {
     const watchOptions = (0, _watcher.mergeWatchOptions)((_this$conf$server = this.conf.server) === null || _this$conf$server === void 0 ? void 0 : _this$conf$server.watchOptions);
     const defaultWatchedPaths = defaultWatched.map(p => _path.default.normalize(_path.default.join(pwd, p)));
     const watcher = new _watcher.default();
-    watcher.createDepTree(); // 监听文件变动，如果有变动则给 client，也就是 start 启动的插件发消息
+    watcher.createDepTree();
 
+    // 监听文件变动，如果有变动则给 client，也就是 start 启动的插件发消息
     watcher.listen(defaultWatchedPaths, watchOptions, (filepath, event) => {
       watcher.updateDepTree();
       watcher.cleanDepCache(filepath);
@@ -357,7 +320,5 @@ class ModernDevServer extends _prodServer.ModernServer {
     });
     this.watcher = watcher;
   }
-
 }
-
 exports.ModernDevServer = ModernDevServer;

package/dist/js/node/server/index.js

@@ -4,24 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DevServer = void 0;
-
 var _prodServer = require("@modern-js/prod-server");
-
 var _devServer = require("./dev-server");
-
 const createDevServer = options => {
   return new _devServer.ModernDevServer(options);
 };
-
 class DevServer extends _prodServer.Server {
   constructor(options) {
     super(options);
-
     if (options.dev) {
       this.serverImpl = createDevServer;
     }
   }
-
 }
-
 exports.DevServer = DevServer;

package/dist/types/dev-tools/mock/getMockData.d.ts

@@ -11,8 +11,6 @@ export declare type MockApi = {
 };
 declare const createFunctionDataHandler: (method: string, handler: (req: IncomingMessage, res: ServerResponse, next: NextFunction) => void) => (context: ModernServerContext, next: NextFunction) => Promise<void>;
 declare const createStaticDataHandler: (method: string, handler: Record<string, any>) => (context: ModernServerContext) => void;
-
 declare const _default: (filepath: string) => MockApi[];
-
 export default _default;
 export declare const getMatched: (context: ModernServerContext, mockApiList: MockApi[]) => MockApi | undefined;