@modern-js/server 1.4.1 → 1.4.4-beta.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @modern-js/server
 
+## 1.4.3
+
+### Patch Changes
+
+- deeaa602: support svg/proxy/multi-version in unbundled
+- fab92861: fix: @modern-js/core phantom dep
+- Updated dependencies [deeaa602]
+- Updated dependencies [54786e58]
+  - @modern-js/hmr-client@1.2.2
+  - @modern-js/utils@1.3.2
+  - @modern-js/core@1.4.3
+
+## 1.4.2
+
+### Patch Changes
+
+- 735b2a81: prevent ssr compiler to send socket message
+- Updated dependencies [b376c8d6]
+- Updated dependencies [e62c4efd]
+- Updated dependencies [e2a8233f]
+  - @modern-js/core@1.4.2
+
 ## 1.4.1
 
 ### Patch Changes

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

@@ -1,6 +1,6 @@
 import path from 'path';
 import { fs } from '@modern-js/utils';
-import { AGGRED_DIR } from "../../constants";
+import { AGGRED_DIR } from '@modern-js/prod-server';
 import getMockData, { getMatched } from "./getMockData";
 export const createMockHandler = ({
   pwd

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

@@ -1,6 +1,5 @@
 import ws from 'ws';
 import { logger } from '@modern-js/utils';
-import { noop } from "../utils";
 export default class SocketServer {
   constructor(options) {
     this.wsServer = void 0;
@@ -8,6 +7,7 @@ export default class SocketServer {
     this.options = void 0;
     this.app = void 0;
     this.stats = void 0;
+    this.timer = null;
     this.options = options;
   } // create socket, install socket handler, bind socket event
 
@@ -32,7 +32,7 @@ export default class SocketServer {
       // only dev server, use default logger
       logger.error(err);
     });
-    setInterval(() => {
+    this.timer = setInterval(() => {
       this.wsServer.clients.forEach(socket => {
         const extWs = socket;
 
@@ -40,54 +40,13 @@ export default class SocketServer {
           extWs.terminate();
         } else {
           extWs.isAlive = false;
-          extWs.ping(noop);
+          extWs.ping(() => {// empty
+          });
         }
       });
     }, 30000);
     this.wsServer.on('connection', 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.client.logging) {
-        this.sockWrite('logging', this.options.client.logging);
-      }
-
-      if (this.options.hot || this.options.hot === 'only') {
-        this.sockWrite('hot');
-      }
-
-      if (this.options.liveReload) {
-        this.sockWrite('liveReload');
-      }
-
-      if (this.options.client.progress) {
-        this.sockWrite('progress', this.options.client.progress);
-      }
-
-      if (this.options.client.overlay) {
-        this.sockWrite('overlay', this.options.client.overlay);
-      } // send first stats to active client sock if stats exist
-
-
-      if (this.stats) {
-        this.sendStats(true);
-      }
+      this.onConnect(socket);
     });
   }
 
@@ -106,10 +65,68 @@ export default 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.client.logging) {
+      this.singleWrite(connection, 'logging', this.options.client.logging);
+    }
+
+    if (this.options.hot || this.options.hot === 'only') {
+      this.singleWrite(connection, 'hot');
+    }
+
+    if (this.options.liveReload) {
+      this.singleWrite(connection, 'liveReload');
+    }
+
+    if (this.options.client.progress) {
+      this.singleWrite(connection, 'progress', this.options.client.progress);
+    }
+
+    if (this.options.client.overlay) {
+      this.singleWrite(connection, 'overlay', this.options.client.overlay);
+    } // send first stats to active client sock if stats exist
+
+
+    if (this.stats) {
+      this.sendStats(true);
+    }
   } // get standard stats
 
 

package/dist/js/modern/index.js

@@ -1,4 +1,4 @@
-import { Server } from "./server";
+import { DevServer as Server } from "./server";
 export { Server };
 export default (options => {
   if (options == null) {

package/dist/js/modern/server/{dev-server/dev-server.js → dev-server.js}

@@ -9,16 +9,13 @@ import path from 'path';
 import { createServer as createHttpsServer } from 'https';
 import { API_DIR, HMR_SOCK_PATH, SERVER_DIR, SHARED_DIR } from '@modern-js/utils';
 import webpackDevMiddleware from 'webpack-dev-middleware';
-import { ModernServer } from "../modern-server";
-import { createMockHandler } from "../../dev-tools/mock";
-import { createProxyHandler } from "../../libs/proxy";
-import SocketServer from "../../dev-tools/socket-server";
-import DevServerPlugin from "../../dev-tools/dev-server-plugin";
-import { createLaunchEditorHandler } from "../../dev-tools/launch-editor";
-import { enableRegister } from "../../dev-tools/babel/register";
-import * as reader from "../../libs/render/reader";
-import Watcher from "../../dev-tools/watcher";
-import { AGGRED_DIR } from "../../constants";
+import { createProxyHandler, ModernServer, AGGRED_DIR } from '@modern-js/prod-server';
+import { createMockHandler } from "../dev-tools/mock";
+import SocketServer from "../dev-tools/socket-server";
+import DevServerPlugin from "../dev-tools/dev-server-plugin";
+import { createLaunchEditorHandler } from "../dev-tools/launch-editor";
+import { enableRegister } from "../dev-tools/babel/register";
+import Watcher from "../dev-tools/watcher";
 const DEFAULT_DEV_OPTIONS = {
   client: {
     port: '8080',
@@ -37,8 +34,7 @@ const DEFAULT_DEV_OPTIONS = {
 };
 export class ModernDevServer extends ModernServer {
   constructor(options) {
-    super(options); // set webpack compiler
-
+    super(options);
     this.devProxyHandler = null;
     this.mockHandler = null;
     this.dev = void 0;
@@ -46,6 +42,8 @@ export class ModernDevServer extends ModernServer {
     this.socketServer = void 0;
     this.watcher = void 0;
     this.devMiddleware = void 0;
+    this.workDir = this.pwd; // set webpack compiler
+
     this.compiler = options.compiler; // set dev server options, like webpack-dev-server
 
     this.dev = typeof options.dev === 'boolean' ? DEFAULT_DEV_OPTIONS : _objectSpread(_objectSpread({}, DEFAULT_DEV_OPTIONS), options.dev);
@@ -107,7 +105,7 @@ export class ModernDevServer extends ModernServer {
     this.router.reset(this.filterRoutes(options.routes || this.presetRoutes || []));
     this.cleanSSRCache(); // reset static file
 
-    reader.updateFile();
+    this.reader.updateFile();
     this.runner.reset();
   }
 
@@ -143,13 +141,16 @@ export class ModernDevServer extends ModernServer {
     if (devHttpsOption) {
       const {
         genHttpsOptions
-      } = require("../../dev-tools/https");
+      } = require("../dev-tools/https");
 
       const httpsOptions = await genHttpsOptions(devHttpsOption);
       return createHttpsServer(httpsOptions, handler);
     } else {
       return createServer(handler);
     }
+  }
+
+  warmupSSRBundle() {// empty
   } // set up plugin to each compiler
   // register hooks for each compilation, update socket stats if recompiled
   // start dev middleware
@@ -183,6 +184,10 @@ export class ModernDevServer extends ModernServer {
     };
 
     const addHooks = compiler => {
+      if (compiler.name === 'server') {
+        return;
+      }
+
       const {
         compile,
         invalid,

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

@@ -1,147 +1,24 @@
-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; }
+import { Server } from '@modern-js/prod-server';
+import { ModernDevServer } from "./dev-server";
+import { ModernAPIDevServer, ModernSSRDevServer } from "./dev-server-split";
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import path from 'path';
-import { serverManager, AppContext, ConfigContext } from '@modern-js/server-core';
-import { compatRequire, logger as defaultLogger } from '@modern-js/utils';
-import { initAppContext, initAppDir, loadUserConfig } from '@modern-js/core';
-import { metrics as defaultMetrics } from "../libs/metrics";
-import { ModernServer } from "./modern-server";
-import { ModernAPIServer, ModernSSRServer, ModernWebServer } from "./modern-server-split";
-export class Server {
-  constructor(options) {
-    this.options = void 0;
-    this.server = void 0;
-    this.app = void 0;
-    this.runner = void 0;
-    this.options = options;
-  }
-
-  getRequestHandler() {
-    return (req, res, next) => {
-      const requestHandler = this.server.getRequestHandler();
-      return requestHandler(req, res, next);
-    };
+const createDevServer = options => {
+  if (options.apiOnly) {
+    return new ModernAPIDevServer(options);
+  } else if (options.ssrOnly) {
+    return new ModernSSRDevServer(options);
+  } else {
+    return new ModernDevServer(options);
   }
+};
 
-  ready(readyOptions = {}) {
-    this.server.ready(readyOptions);
-  }
-
-  async init() {
-    const {
-      options
-    } = this;
-    options.logger = options.logger || defaultLogger;
-    options.metrics = options.metrics || defaultMetrics; // initialize server
+export class DevServer extends Server {
+  constructor(options) {
+    super(options);
 
     if (options.dev) {
-      this.server = this.createDevServer();
-    } else {
-      this.server = this.createProdServer();
-    } // check if https is configured when start dev server
-
-
-    this.app = await this.server.createHTTPServer(this.getRequestHandler());
-    this.runner = await this.createHookRunner(); // runner can only be used after server init
-
-    await this.server.init(this.runner);
-    return this;
-  }
-
-  listen(port = 8080, listener) {
-    this.app.listen(process.env.PORT || port, () => {
-      if (listener) {
-        listener();
-      }
-
-      this.listener(this.app);
-    });
-  }
-
-  listener(app) {
-    this.server.onListening(app);
-  }
-
-  async close() {
-    await this.server.close();
-    await new Promise(resolve => this.app.close(() => {
-      resolve();
-    }));
-  }
-
-  createProdServer() {
-    const {
-      options
-    } = this;
-
-    if (options.apiOnly) {
-      return new ModernAPIServer(options);
-    } else if (options.ssrOnly) {
-      return new ModernSSRServer(options);
-    } else if (options.webOnly) {
-      return new ModernWebServer(options);
-    } else {
-      return new ModernServer(options);
-    }
-  }
-
-  createDevServer() {
-    const {
-      options
-    } = this;
-
-    const {
-      ModernAPIDevServer,
-      ModernSSRDevServer,
-      ModernDevServer
-    } = require("./dev-server");
-
-    if (options.apiOnly) {
-      return new ModernAPIDevServer(options);
-    } else if (options.ssrOnly) {
-      return new ModernSSRDevServer(options);
-    } else {
-      return new ModernDevServer(options);
+      this.serverImpl = createDevServer;
     }
   }
 
-  async createHookRunner() {
-    var _options$plugins;
-
-    const {
-      options
-    } = this;
-    serverManager.clear();
-    (_options$plugins = options.plugins) === null || _options$plugins === void 0 ? void 0 : _options$plugins.forEach(p => {
-      serverManager.usePlugin(compatRequire(p.pluginPath));
-    });
-    const appContext = await this.initAppContext();
-    serverManager.run(() => {
-      var _options$config$outpu;
-
-      ConfigContext.set(this.options.config);
-      AppContext.set(_objectSpread(_objectSpread({}, appContext), {}, {
-        distDirectory: path.join(options.pwd, ((_options$config$outpu = options.config.output) === null || _options$config$outpu === void 0 ? void 0 : _options$config$outpu.path) || 'dist')
-      }));
-    });
-    return serverManager.init({});
-  }
-
-  async initAppContext() {
-    var _this$options$plugins;
-
-    const appDirectory = await initAppDir();
-    const loaded = await loadUserConfig(appDirectory);
-    const plugins = (_this$options$plugins = this.options.plugins) === null || _this$options$plugins === void 0 ? void 0 : _this$options$plugins.map(p => ({
-      server: p,
-      cli: undefined
-    }));
-    const appContext = initAppContext(appDirectory, plugins || [], loaded.filePath);
-    return appContext;
-  }
-
 }

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

@@ -9,7 +9,7 @@ var _path = _interopRequireDefault(require("path"));
 
 var _utils = require("@modern-js/utils");
 
-var _constants = require("../../constants");
+var _prodServer = require("@modern-js/prod-server");
 
 var _getMockData = _interopRequireWildcard(require("./getMockData"));
 
@@ -26,7 +26,7 @@ const createMockHandler = ({
   let filepath = '';
 
   for (const ext of exts) {
-    const maybeMatch = _path.default.join(pwd, `${_constants.AGGRED_DIR.mock}/index${ext}`);
+    const maybeMatch = _path.default.join(pwd, `${_prodServer.AGGRED_DIR.mock}/index${ext}`);
 
     if (_utils.fs.existsSync(maybeMatch)) {
       filepath = maybeMatch;

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

@@ -9,8 +9,6 @@ var _ws = _interopRequireDefault(require("ws"));
 
 var _utils = require("@modern-js/utils");
 
-var _utils2 = require("../utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 class SocketServer {
@@ -20,6 +18,7 @@ class SocketServer {
     this.options = void 0;
     this.app = void 0;
     this.stats = void 0;
+    this.timer = null;
     this.options = options;
   } // create socket, install socket handler, bind socket event
 
@@ -44,7 +43,7 @@ class SocketServer {
       // only dev server, use default logger
       _utils.logger.error(err);
     });
-    setInterval(() => {
+    this.timer = setInterval(() => {
       this.wsServer.clients.forEach(socket => {
         const extWs = socket;
 
@@ -52,54 +51,13 @@ class SocketServer {
           extWs.terminate();
         } else {
           extWs.isAlive = false;
-          extWs.ping(_utils2.noop);
+          extWs.ping(() => {// empty
+          });
         }
       });
     }, 30000);
     this.wsServer.on('connection', 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.client.logging) {
-        this.sockWrite('logging', this.options.client.logging);
-      }
-
-      if (this.options.hot || this.options.hot === 'only') {
-        this.sockWrite('hot');
-      }
-
-      if (this.options.liveReload) {
-        this.sockWrite('liveReload');
-      }
-
-      if (this.options.client.progress) {
-        this.sockWrite('progress', this.options.client.progress);
-      }
-
-      if (this.options.client.overlay) {
-        this.sockWrite('overlay', this.options.client.overlay);
-      } // send first stats to active client sock if stats exist
-
-
-      if (this.stats) {
-        this.sendStats(true);
-      }
+      this.onConnect(socket);
     });
   }
 
@@ -118,10 +76,68 @@ 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.client.logging) {
+      this.singleWrite(connection, 'logging', this.options.client.logging);
+    }
+
+    if (this.options.hot || this.options.hot === 'only') {
+      this.singleWrite(connection, 'hot');
+    }
+
+    if (this.options.liveReload) {
+      this.singleWrite(connection, 'liveReload');
+    }
+
+    if (this.options.client.progress) {
+      this.singleWrite(connection, 'progress', this.options.client.progress);
+    }
+
+    if (this.options.client.overlay) {
+      this.singleWrite(connection, 'overlay', this.options.client.overlay);
+    } // send first stats to active client sock if stats exist
+
+
+    if (this.stats) {
+      this.sendStats(true);
+    }
   } // get standard stats
 
 

package/dist/js/node/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "Server", {
   enumerable: true,
   get: function () {
-    return _server.Server;
+    return _server.DevServer;
   }
 });
 exports.default = void 0;
@@ -18,7 +18,7 @@ var _default = options => {
     throw new Error('can not start mserver without options');
   }
 
-  const server = new _server.Server(options);
+  const server = new _server.DevServer(options);
   return server.init();
 };