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

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

@@ -1,9 +1,6 @@
 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 { createServer } from 'http';
 import path from 'path';
 import { createServer as createHttpsServer } from 'https';
@@ -17,20 +14,19 @@ import Watcher, { mergeWatchOptions } from "../dev-tools/watcher";
 import DevMiddleware from "../dev-tools/dev-middleware";
 export class ModernDevServer extends 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({
       dev: this.dev,
       compiler: options.compiler,
@@ -38,7 +34,6 @@ export class ModernDevServer extends ModernServer {
     });
     enableRegister(this.pwd, this.conf);
   }
-
   getDevOptions(options) {
     const devOptions = typeof options.dev === 'boolean' ? {} : options.dev;
     const defaultOptions = getDefaultDevOptions();
@@ -46,7 +41,6 @@ export class ModernDevServer extends ModernServer {
       client: _objectSpread(_objectSpread({}, defaultOptions.client), devOptions === null || devOptions === void 0 ? void 0 : devOptions.client)
     });
   }
-
   addMiddlewareHandler(handlers) {
     handlers.forEach(handler => {
       this.addHandler((ctx, next) => {
@@ -58,7 +52,6 @@ export class ModernDevServer extends ModernServer {
       });
     });
   }
-
   applySetupMiddlewares() {
     const setupMiddlewares = this.dev.setupMiddlewares || [];
     const serverOptions = {
@@ -76,38 +69,40 @@ export class ModernDevServer extends 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,
@@ -117,23 +112,21 @@ export class ModernDevServer extends ModernServer {
     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-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 = createMockHandler({
       pwd
     });
@@ -143,17 +136,17 @@ export class ModernDevServer extends ModernServer {
       } else {
         next();
       }
-    }); // dev proxy handler, each proxy has own handler
+    });
 
+    // dev proxy handler, each proxy has own handler
     const proxyHandlers = 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
@@ -170,14 +163,12 @@ export class ModernDevServer extends ModernServer {
         req,
         res
       } = ctx;
-
       if (devMiddleware.middleware) {
         devMiddleware.middleware(req, res, next);
       } else {
         next();
       }
     });
-
     if (dev.historyApiFallback) {
       const {
         default: connectHistoryApiFallback
@@ -186,41 +177,37 @@ export class ModernDevServer extends 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 createHttpsServer(httpsOptions, handler);
     } else {
       return createServer(handler);
     }
   }
-
-  warmupSSRBundle() {// not warmup ssr bundle on development
+  warmupSSRBundle() {
+    // not warmup ssr bundle on development
   }
-
   onServerChange({
     filepath,
     event
@@ -233,7 +220,6 @@ export class ModernDevServer extends ModernServer {
     } = AGGRED_DIR;
     const mockPath = path.normalize(path.join(pwd, mock));
     this.runner.reset();
-
     if (filepath.startsWith(mockPath)) {
       this.mockHandler = createMockHandler({
         pwd
@@ -243,11 +229,12 @@ export class ModernDevServer extends 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
@@ -258,13 +245,11 @@ export class ModernDevServer extends ModernServer {
       }
     }
   }
-
   createContext(req, res) {
     return super.createContext(req, res, {
       etag: true
     });
   }
-
   async setupBeforeDevMiddleware() {
     const {
       runner,
@@ -275,7 +260,6 @@ export class ModernDevServer extends ModernServer {
     const pluginMids = await runner.beforeDevServer(conf);
     return [...setupMids, ...pluginMids].flat();
   }
-
   async setupAfterDevMiddleware() {
     const {
       runner,
@@ -286,7 +270,6 @@ export class ModernDevServer extends ModernServer {
     const pluginMids = await runner.afterDevServer(conf);
     return [...pluginMids, ...setupMids].flat();
   }
-
   cleanSSRCache() {
     const {
       distDir
@@ -294,19 +277,17 @@ export class ModernDevServer extends ModernServer {
     const bundles = this.router.getBundles();
     bundles.forEach(bundle => {
       const filepath = path.join(distDir, bundle);
-
       if (require.cache[filepath]) {
         delete require.cache[filepath];
       }
     });
     const loadable = path.join(distDir, LOADABLE_STATS_FILE);
-
     if (require.cache[loadable]) {
       delete require.cache[loadable];
     }
   }
-
   startWatcher() {
+    var _this$conf$server;
     const {
       pwd
     } = this;
@@ -314,11 +295,12 @@ export class ModernDevServer extends ModernServer {
       mock
     } = AGGRED_DIR;
     const defaultWatched = [`${mock}/**/*`, `${SERVER_DIR}/**/*`, `${API_DIR}/**`, `${SHARED_DIR}/**/*`];
-    const watchOptions = mergeWatchOptions(this.conf.server.watchOptions);
+    const watchOptions = 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.normalize(path.join(pwd, p)));
     const watcher = new Watcher();
-    watcher.createDepTree(); // 监听文件变动，如果有变动则给 client，也就是 start 启动的插件发消息
+    watcher.createDepTree();
 
+    // 监听文件变动，如果有变动则给 client，也就是 start 启动的插件发消息
     watcher.listen(defaultWatchedPaths, watchOptions, (filepath, event) => {
       watcher.updateDepTree();
       watcher.cleanDepCache(filepath);
@@ -329,5 +311,4 @@ export class ModernDevServer extends ModernServer {
     });
     this.watcher = watcher;
   }
-
 }

package/dist/js/modern/server/index.js

@@ -1,17 +1,13 @@
 import { Server } from '@modern-js/prod-server';
 import { ModernDevServer } from "./dev-server";
-
 const createDevServer = options => {
   return new ModernDevServer(options);
 };
-
 export class DevServer extends Server {
   constructor(options) {
     super(options);
-
     if (options.dev) {
       this.serverImpl = createDevServer;
     }
   }
-
 }

package/dist/js/node/constants.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getDefaultDevOptions = void 0;
-
 var _utils = require("@modern-js/utils");
-
 const getDefaultDevOptions = () => {
   const network = (0, _utils.getIpv4Interfaces)().find(item => !item.internal);
   return {
@@ -24,5 +22,4 @@ const getDefaultDevOptions = () => {
     liveReload: true
   };
 };
-
 exports.getDefaultDevOptions = getDefaultDevOptions;

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

@@ -4,16 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 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 DevServerPlugin {
   constructor(options) {
     _defineProperty(this, "options", void 0);
-
     this.options = options;
   }
-
   injectHMRClient(compiler) {
     const {
       client
@@ -21,32 +17,29 @@ class DevServerPlugin {
     const host = client !== null && client !== void 0 && client.host ? `&host=${client.host}` : '';
     const path = client !== null && client !== void 0 && client.path ? `&path=${client.path}` : '';
     const port = client !== null && client !== void 0 && client.port ? `&port=${client.port}` : '';
-    const clientEntry = `${require.resolve("./hmr-client")}?${host}${path}${port}`; // use a hook to add entries if available
+    const clientEntry = `${require.resolve("./hmr-client")}?${host}${path}${port}`;
 
+    // use a hook to add entries if available
     new compiler.webpack.EntryPlugin(compiler.context, clientEntry, {
       name: undefined
     }).apply(compiler);
   }
-
   apply(compiler) {
     if (this.options.hot || this.options.liveReload) {
       this.injectHMRClient(compiler);
-    } // Todo remove, client must inject.
-
+    }
 
+    // Todo remove, client must inject.
     const compilerOptions = compiler.options;
     const {
       HotModuleReplacementPlugin
     } = compiler.webpack;
     compilerOptions.plugins = compilerOptions.plugins || [];
-
     if (!compilerOptions.plugins.find(p => p.constructor === HotModuleReplacementPlugin)) {
       // apply the HMR plugin, if it didn't exist before.
       const plugin = new HotModuleReplacementPlugin();
       plugin.apply(compiler);
     }
   }
-
 }
-
 exports.default = DevServerPlugin;

package/dist/js/node/dev-tools/dev-middleware/hmr-client/createSocketUrl.js

@@ -5,23 +5,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createSocketUrl = createSocketUrl;
 exports.formatURL = formatURL;
-
 var _constants = require("@modern-js/utils/constants");
-
 function createSocketUrl(resourceQuery) {
   // ?host=localhost&port=8080&path=modern_js_hmr_ws
   const searchParams = resourceQuery.substr(1).split('&');
   const options = {};
-
   for (const pair of searchParams) {
     const ary = pair.split('=');
     options[ary[0]] = decodeURIComponent(ary[1]);
   }
-
   const currentLocation = self.location;
   return getSocketUrl(options, currentLocation);
 }
-
 function formatURL({
   port,
   protocol,
@@ -36,13 +31,12 @@ function formatURL({
     url.protocol = protocol;
     url.pathname = pathname;
     return url.toString();
-  } // compatible with IE11
-
+  }
 
+  // compatible with IE11
   const colon = protocol.indexOf(':') === -1 ? ':' : '';
   return `${protocol}${colon}//${hostname}:${port}${pathname}`;
 }
-
 function getSocketUrl(urlParts, location) {
   const {
     host,

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

@@ -1,19 +1,16 @@
 "use strict";
 
 var _stripAnsi = _interopRequireDefault(require("@modern-js/utils/strip-ansi"));
-
 var _format = require("@modern-js/utils/format");
-
 var _createSocketUrl = require("./createSocketUrl");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
  * This has been adapted from `create-react-app`, authored by Facebook, Inc.
  * see: https://github.com/facebookincubator/create-react-app/tree/master/packages/react-dev-utils
  *
  * Tips: this package will be bundled and running in the browser, do not import from the entry of @modern-js/utils.
  */
+
 // TODO hadRuntimeError should be fixed.
 // We need to keep track of if there has been a runtime error.
 // Essentially, we cannot guarantee application state was not corrupted by the
@@ -21,24 +18,25 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // application. This is handled below when we are notified of a compile (code
 // change).
 // See https://github.com/facebook/create-react-app/issues/3096
-const hadRuntimeError = false; // Connect to Dev Server
+const hadRuntimeError = false;
 
+// Connect to Dev Server
 const socketUrl = (0, _createSocketUrl.createSocketUrl)(__resourceQuery);
-const connection = new WebSocket(socketUrl); // Unlike WebpackDevServer client, we won't try to reconnect
+const connection = new WebSocket(socketUrl);
+
+// Unlike WebpackDevServer client, we won't try to reconnect
 // to avoid spamming the console. Disconnect usually happens
 // when developer stops the server.
-
 connection.onclose = function () {
   if (typeof console !== 'undefined' && typeof console.info === 'function') {
     console.info('The development server has disconnected.\nRefresh the page if necessary.');
   }
-}; // Remember some state related to hot module replacement.
-
+};
 
+// Remember some state related to hot module replacement.
 let isFirstCompilation = true;
 let mostRecentCompilationHash = null;
 let hasCompileErrors = false;
-
 function clearOutdatedErrors() {
   // Clean up outdated compile errors, if any.
   // eslint-disable-next-line node/no-unsupported-features/node-builtins, no-console
@@ -48,154 +46,144 @@ function clearOutdatedErrors() {
       console.clear();
     }
   }
-} // Successful compilation.
-
+}
 
+// Successful compilation.
 function handleSuccess() {
   clearOutdatedErrors();
   const isHotUpdate = !isFirstCompilation;
   isFirstCompilation = false;
-  hasCompileErrors = false; // Attempt to apply hot updates or reload.
+  hasCompileErrors = false;
 
+  // Attempt to apply hot updates or reload.
   if (isHotUpdate) {
     tryApplyUpdates();
   }
-} // Compilation with warnings (e.g. ESLint).
-
+}
 
+// Compilation with warnings (e.g. ESLint).
 function handleWarnings(warnings) {
   clearOutdatedErrors();
   const isHotUpdate = !isFirstCompilation;
   isFirstCompilation = false;
   hasCompileErrors = false;
-
   function printWarnings() {
     // Print warnings to the console.
     const formatted = (0, _format.formatWebpackMessages)({
       warnings,
       errors: []
     });
-
     if (typeof console !== 'undefined' && typeof console.warn === 'function') {
       for (let i = 0; i < formatted.warnings.length; i++) {
         if (i === 5) {
           console.warn('There were more warnings in other files.\n' + 'You can find a complete log in the terminal.');
           break;
         }
-
         console.warn((0, _stripAnsi.default)(formatted.warnings[i]));
       }
     }
   }
+  printWarnings();
 
-  printWarnings(); // Attempt to apply hot updates or reload.
-
+  // Attempt to apply hot updates or reload.
   if (isHotUpdate) {
     tryApplyUpdates();
   }
-} // Compilation with errors (e.g. syntax error or missing modules).
-
+}
 
+// Compilation with errors (e.g. syntax error or missing modules).
 function handleErrors(errors) {
   clearOutdatedErrors();
   isFirstCompilation = false;
-  hasCompileErrors = true; // "Massage" webpack messages.
+  hasCompileErrors = true;
 
+  // "Massage" webpack messages.
   const formatted = (0, _format.formatWebpackMessages)({
     errors,
     warnings: []
-  }); // Also log them to the console.
+  });
 
+  // Also log them to the console.
   if (typeof console !== 'undefined' && typeof console.error === 'function') {
     for (const error of formatted.errors) {
       console.error((0, _stripAnsi.default)(error));
     }
-  } // Do not attempt to reload now.
-  // We will reload on next success instead.
-
-} // There is a newer version of the code available.
+  }
 
+  // Do not attempt to reload now.
+  // We will reload on next success instead.
+}
 
+// There is a newer version of the code available.
 function handleAvailableHash(hash) {
   // Update last known compilation hash.
   mostRecentCompilationHash = hash;
-} // Handle messages from the server.
-
+}
 
+// Handle messages from the server.
 connection.onmessage = function (e) {
   const message = JSON.parse(e.data);
-
   switch (message.type) {
     case 'hash':
       handleAvailableHash(message.data);
       break;
-
     case 'still-ok':
     case 'ok':
       handleSuccess();
       break;
-
     case 'content-changed':
       // Triggered when a file from `contentBase` changed.
       window.location.reload();
       break;
-
     case 'warnings':
       handleWarnings(message.data);
       break;
-
     case 'errors':
       handleErrors(message.data);
       break;
-
-    default: // Do nothing.
-
+    default:
+    // Do nothing.
   }
-}; // Is there a newer version of this code available?
-
+};
 
+// Is there a newer version of this code available?
 function isUpdateAvailable() {
   // __webpack_hash__ is the hash of the current compilation.
   // It's a global variable injected by webpack.
   return mostRecentCompilationHash !== __webpack_hash__;
-} // webpack disallows updates in other states.
-
+}
 
+// webpack disallows updates in other states.
 function canApplyUpdates() {
   return module.hot.status() === 'idle';
-} // Attempt to update code on the fly, fall back to a hard reload.
-
+}
 
+// Attempt to update code on the fly, fall back to a hard reload.
 function tryApplyUpdates() {
   if (!module.hot) {
     // HotModuleReplacementPlugin is not in webpack configuration.
     window.location.reload();
     return;
   }
-
   if (!isUpdateAvailable() || !canApplyUpdates()) {
     return;
   }
-
   function handleApplyUpdates(err, updatedModules) {
     const wantsForcedReload = err || !updatedModules || hadRuntimeError;
-
     if (wantsForcedReload) {
       window.location.reload();
       return;
     }
-
     if (isUpdateAvailable()) {
       // While we were updating, there was a new update! Do it again.
       tryApplyUpdates();
     }
-  } // https://webpack.github.io/docs/hot-module-replacement.html#check
-
+  }
 
-  const result = module.hot.check(
-  /* autoApply */
-  true, handleApplyUpdates); // // webpack 2 returns a Promise instead of invoking a callback
+  // https://webpack.github.io/docs/hot-module-replacement.html#check
+  const result = module.hot.check( /* autoApply */true, handleApplyUpdates);
 
+  // // webpack 2 returns a Promise instead of invoking a callback
   if (result !== null && result !== void 0 && result.then) {
     result.then(updatedModules => {
       handleApplyUpdates(null, updatedModules);