@modern-js/server 1.4.15 → 1.4.16

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # @modern-js/server
 
+## 1.4.16
+
+### Patch Changes
+
+- f7cbc771: feat: prebundle webpack-dev-middleware
+- cdc2df9c: fix(server): remove launch-editor
+- b39b399e: lock devcert version
+- 430d417e: optimize server side hot reload
+- 437367c6: fix(server): hmr not working when using proxy
+- Updated dependencies [5f7fccf0]
+- Updated dependencies [02b0a22e]
+- Updated dependencies [da65bf12]
+- Updated dependencies [8854c600]
+- Updated dependencies [d57e7622]
+- Updated dependencies [f7cbc771]
+- Updated dependencies [6451a098]
+- Updated dependencies [f5c48c3f]
+- Updated dependencies [430d417e]
+- Updated dependencies [658b4dd5]
+- Updated dependencies [d5a2cfd8]
+- Updated dependencies [45d5643a]
+- Updated dependencies [0d161fa8]
+- Updated dependencies [437367c6]
+- Updated dependencies [280eebf9]
+- Updated dependencies [2ba8d62f]
+- Updated dependencies [7394df61]
+  - @modern-js/webpack@1.9.0
+  - @modern-js/bff-utils@1.2.8
+  - @modern-js/utils@1.7.6
+  - @modern-js/prod-server@1.1.6
+  - @modern-js/server-utils@1.2.9
+
 ## 1.4.15
 
 ### Patch Changes

package/dist/js/modern/constants.js

@@ -1,17 +1,20 @@
-import { HMR_SOCK_PATH } from '@modern-js/utils';
-export const DEFAULT_DEV_OPTIONS = {
-  client: {
-    port: '8080',
-    overlay: false,
-    logging: 'none',
-    path: HMR_SOCK_PATH,
-    host: 'localhost'
-  },
-  https: false,
-  devMiddleware: {
-    writeToDisk: true
-  },
-  watch: true,
-  hot: true,
-  liveReload: true
+import { getIpv4Interfaces, HMR_SOCK_PATH } from '@modern-js/utils';
+export const getDefaultDevOptions = () => {
+  const network = getIpv4Interfaces().find(item => !item.internal);
+  return {
+    client: {
+      port: '8080',
+      overlay: false,
+      logging: 'none',
+      path: HMR_SOCK_PATH,
+      host: (network === null || network === void 0 ? void 0 : network.address) || 'localhost'
+    },
+    https: false,
+    devMiddleware: {
+      writeToDisk: true
+    },
+    watch: true,
+    hot: true,
+    liveReload: true
+  };
 };

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

@@ -1,11 +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 Webpack from 'webpack';
-import { DEFAULT_DEV_OPTIONS } from "../constants";
 const {
   EntryPlugin
 } = Webpack;
@@ -18,14 +13,11 @@ export default class DevServerPlugin {
 
   apply(compiler) {
     const {
-      options
-    } = this;
-
-    const client = _objectSpread(_objectSpread({}, DEFAULT_DEV_OPTIONS.client), options.client);
-
-    const host = `&host=${client.host}`;
-    const path = `&path=${client.path}`;
-    const port = `&port=${client.port}`;
+      client
+    } = this.options;
+    const host = client.host ? `&host=${client.host}` : '';
+    const path = client.path ? `&path=${client.path}` : '';
+    const port = client.port ? `&port=${client.port}` : '';
     const clientEntry = `${require.resolve('@modern-js/hmr-client')}?${host}${path}${port}`;
     const additionalEntries = [clientEntry]; // use a hook to add entries if available
 

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

@@ -8,13 +8,12 @@ import { createServer } from 'http';
 import path from 'path';
 import { createServer as createHttpsServer } from 'https';
 import { API_DIR, SERVER_DIR, SHARED_DIR } from '@modern-js/utils';
-import webpackDevMiddleware from 'webpack-dev-middleware';
+import webpackDevMiddleware from '@modern-js/webpack/webpack-dev-middleware';
 import { createProxyHandler, ModernServer, AGGRED_DIR } from '@modern-js/prod-server';
-import { DEFAULT_DEV_OPTIONS } from "../constants";
+import { getDefaultDevOptions } from "../constants";
 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";
 export class ModernDevServer extends ModernServer {
@@ -37,8 +36,16 @@ export class ModernDevServer extends ModernServer {
 
     this.compiler = options.compiler; // set dev server options, like webpack-dev-server
 
-    this.dev = _objectSpread(_objectSpread({}, DEFAULT_DEV_OPTIONS), typeof options.dev === 'boolean' ? {} : options.dev);
+    this.dev = this.getDevOptions(options);
     enableRegister(this.pwd, this.conf);
+  }
+
+  getDevOptions(options) {
+    const devOptions = typeof options.dev === 'boolean' ? {} : options.dev;
+    const defaultOptions = getDefaultDevOptions();
+    return _objectSpread(_objectSpread(_objectSpread({}, defaultOptions), devOptions), {}, {
+      client: _objectSpread(_objectSpread({}, defaultOptions.client), devOptions === null || devOptions === void 0 ? void 0 : devOptions.client)
+    });
   } // Complete the preparation of services
 
 
@@ -86,9 +93,7 @@ export class ModernDevServer extends ModernServer {
 
     if (compiler) {
       // init socket server
-      this.socketServer = new SocketServer(dev); // open file in editor.
-
-      this.addHandler(createLaunchEditorHandler()); // setup compiler in server, also add dev-middleware to handler static file in memory
+      this.socketServer = new SocketServer(dev); // setup compiler in server, also add dev-middleware to handler static file in memory
 
       const devMiddlewareHandler = this.setupCompiler(compiler);
       this.addHandler(devMiddlewareHandler);
@@ -138,9 +143,7 @@ export class ModernDevServer extends ModernServer {
 
     this.cleanSSRCache(); // reset static file
 
-    this.reader.updateFile(); // emit reset hook
-
-    this.runner.reset();
+    this.reader.updateFile();
     super.onRepack(options);
   }
 

package/dist/js/node/constants.js

@@ -3,24 +3,28 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DEFAULT_DEV_OPTIONS = void 0;
+exports.getDefaultDevOptions = void 0;
 
 var _utils = require("@modern-js/utils");
 
-const DEFAULT_DEV_OPTIONS = {
-  client: {
-    port: '8080',
-    overlay: false,
-    logging: 'none',
-    path: _utils.HMR_SOCK_PATH,
-    host: 'localhost'
-  },
-  https: false,
-  devMiddleware: {
-    writeToDisk: true
-  },
-  watch: true,
-  hot: true,
-  liveReload: true
+const getDefaultDevOptions = () => {
+  const network = (0, _utils.getIpv4Interfaces)().find(item => !item.internal);
+  return {
+    client: {
+      port: '8080',
+      overlay: false,
+      logging: 'none',
+      path: _utils.HMR_SOCK_PATH,
+      host: (network === null || network === void 0 ? void 0 : network.address) || 'localhost'
+    },
+    https: false,
+    devMiddleware: {
+      writeToDisk: true
+    },
+    watch: true,
+    hot: true,
+    liveReload: true
+  };
 };
-exports.DEFAULT_DEV_OPTIONS = DEFAULT_DEV_OPTIONS;
+
+exports.getDefaultDevOptions = getDefaultDevOptions;

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

@@ -7,14 +7,8 @@ exports.default = void 0;
 
 var _webpack = _interopRequireDefault(require("webpack"));
 
-var _constants = require("../constants");
-
 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 {
@@ -30,14 +24,11 @@ class DevServerPlugin {
 
   apply(compiler) {
     const {
-      options
-    } = this;
-
-    const client = _objectSpread(_objectSpread({}, _constants.DEFAULT_DEV_OPTIONS.client), options.client);
-
-    const host = `&host=${client.host}`;
-    const path = `&path=${client.path}`;
-    const port = `&port=${client.port}`;
+      client
+    } = this.options;
+    const host = client.host ? `&host=${client.host}` : '';
+    const path = client.path ? `&path=${client.path}` : '';
+    const port = client.port ? `&port=${client.port}` : '';
     const clientEntry = `${require.resolve('@modern-js/hmr-client')}?${host}${path}${port}`;
     const additionalEntries = [clientEntry]; // use a hook to add entries if available
 

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

@@ -13,7 +13,7 @@ var _https = require("https");
 
 var _utils = require("@modern-js/utils");
 
-var _webpackDevMiddleware = _interopRequireDefault(require("webpack-dev-middleware"));
+var _webpackDevMiddleware = _interopRequireDefault(require("@modern-js/webpack/webpack-dev-middleware"));
 
 var _prodServer = require("@modern-js/prod-server");
 
@@ -25,8 +25,6 @@ var _socketServer = _interopRequireDefault(require("../dev-tools/socket-server")
 
 var _devServerPlugin = _interopRequireDefault(require("../dev-tools/dev-server-plugin"));
 
-var _launchEditor = require("../dev-tools/launch-editor");
-
 var _register = require("../dev-tools/babel/register");
 
 var _watcher = _interopRequireDefault(require("../dev-tools/watcher"));
@@ -59,8 +57,16 @@ class ModernDevServer extends _prodServer.ModernServer {
 
     this.compiler = options.compiler; // set dev server options, like webpack-dev-server
 
-    this.dev = _objectSpread(_objectSpread({}, _constants.DEFAULT_DEV_OPTIONS), typeof options.dev === 'boolean' ? {} : options.dev);
+    this.dev = this.getDevOptions(options);
     (0, _register.enableRegister)(this.pwd, this.conf);
+  }
+
+  getDevOptions(options) {
+    const devOptions = typeof options.dev === 'boolean' ? {} : options.dev;
+    const defaultOptions = (0, _constants.getDefaultDevOptions)();
+    return _objectSpread(_objectSpread(_objectSpread({}, defaultOptions), devOptions), {}, {
+      client: _objectSpread(_objectSpread({}, defaultOptions.client), devOptions === null || devOptions === void 0 ? void 0 : devOptions.client)
+    });
   } // Complete the preparation of services
 
 
@@ -108,9 +114,7 @@ class ModernDevServer extends _prodServer.ModernServer {
 
     if (compiler) {
       // init socket server
-      this.socketServer = new _socketServer.default(dev); // open file in editor.
-
-      this.addHandler((0, _launchEditor.createLaunchEditorHandler)()); // setup compiler in server, also add dev-middleware to handler static file in memory
+      this.socketServer = new _socketServer.default(dev); // setup compiler in server, also add dev-middleware to handler static file in memory
 
       const devMiddlewareHandler = this.setupCompiler(compiler);
       this.addHandler(devMiddlewareHandler);
@@ -160,9 +164,7 @@ class ModernDevServer extends _prodServer.ModernServer {
 
     this.cleanSSRCache(); // reset static file
 
-    this.reader.updateFile(); // emit reset hook
-
-    this.runner.reset();
+    this.reader.updateFile();
     super.onRepack(options);
   }
 

package/dist/types/constants.d.ts

@@ -1,2 +1,2 @@
 import { DevServerOptions } from './types';
-export declare const DEFAULT_DEV_OPTIONS: DevServerOptions;
+export declare const getDefaultDevOptions: () => DevServerOptions;

package/dist/types/server/dev-server.d.ts

@@ -10,6 +10,7 @@ export declare class ModernDevServer extends ModernServer {
   private watcher;
   private devMiddleware;
   constructor(options: ModernDevServerOptions);
+  private getDevOptions;
   onInit(runner: ServerHookRunner): Promise<void>;
   onClose(): Promise<void>;
   onRepack(options?: BuildOptions): void;

package/dist/types/types.d.ts

@@ -2,11 +2,11 @@ import { ModernServerOptions } from '@modern-js/prod-server';
 import type Webpack from 'webpack';
 export declare type DevServerOptions = {
   client: {
-    port: string;
-    overlay: boolean;
-    logging: string;
-    path: string;
-    host: string;
+    path?: string;
+    port?: string;
+    host?: string;
+    logging?: string;
+    overlay?: boolean;
     progress?: boolean;
   };
   devMiddleware: {

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.15",
+  "version": "1.4.16",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -30,37 +30,32 @@
   "dependencies": {
     "@babel/core": "^7.17.0",
     "@babel/register": "^7.15.3",
-    "@modern-js/bff-utils": "^1.2.6",
+    "@modern-js/bff-utils": "^1.2.8",
     "@modern-js/hmr-client": "^1.2.7",
-    "@modern-js/prod-server": "^1.1.5",
-    "@modern-js/server-utils": "^1.2.6",
-    "@modern-js/utils": "^1.7.4",
-    "devcert": "^1.1.3",
-    "launch-editor": "^2.2.1",
+    "@modern-js/prod-server": "^1.1.6",
+    "@modern-js/server-utils": "^1.2.9",
+    "@modern-js/webpack": "^1.9.0",
+    "@modern-js/utils": "^1.7.6",
+    "devcert": "1.2.0",
     "minimatch": "^3.0.4",
     "path-to-regexp": "^6.2.0",
-    "webpack-dev-middleware": "^5.0.0",
     "ws": "^8.2.0"
   },
   "devDependencies": {
-    "@modern-js/core": "1.10.3",
+    "@modern-js/core": "1.11.1",
     "@modern-js/server-core": "1.3.5",
-    "@modern-js/types": "1.5.3",
+    "@modern-js/types": "1.5.4",
     "@scripts/build": "0.0.0",
     "@scripts/jest-config": "0.0.0",
     "@types/jest": "^27",
     "@types/minimatch": "^3.0.5",
     "@types/node": "^14",
-    "@types/webpack-dev-middleware": "^5.0.2",
     "@types/ws": "^7.4.7",
     "jest": "^27",
     "typescript": "^4",
     "webpack": "^5.71.0",
     "websocket": "^1"
   },
-  "peerDependencies": {
-    "webpack": "^5.54.0"
-  },
   "sideEffects": false,
   "modernConfig": {
     "output": {

package/dist/js/modern/dev-tools/launch-editor/index.js

@@ -1,25 +0,0 @@
-import { LAUNCH_EDITOR_ENDPOINT, logger } from '@modern-js/utils';
-export const createLaunchEditorHandler = // eslint-disable-next-line consistent-return
-() => (ctx, next) => {
-  if (ctx.url.startsWith(LAUNCH_EDITOR_ENDPOINT)) {
-    const {
-      filename,
-      line = 1,
-      column = 1
-    } = ctx.query;
-
-    if (!filename) {
-      ctx.status = 500;
-      ctx.res.end(`launch-editor-middleware: required query param "filename" is missing.`);
-    } else {
-      require('launch-editor')(`${filename}:${line}:${column}`, 'code', (file, errorMessage) => {
-        logger.error(`Launch ${file} in editor failed.\n${errorMessage}`);
-      });
-
-      ctx.status = 200;
-      ctx.res.end();
-    }
-  } else {
-    return next();
-  }
-};

package/dist/js/node/dev-tools/launch-editor/index.js

@@ -1,35 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createLaunchEditorHandler = void 0;
-
-var _utils = require("@modern-js/utils");
-
-const createLaunchEditorHandler = // eslint-disable-next-line consistent-return
-() => (ctx, next) => {
-  if (ctx.url.startsWith(_utils.LAUNCH_EDITOR_ENDPOINT)) {
-    const {
-      filename,
-      line = 1,
-      column = 1
-    } = ctx.query;
-
-    if (!filename) {
-      ctx.status = 500;
-      ctx.res.end(`launch-editor-middleware: required query param "filename" is missing.`);
-    } else {
-      require('launch-editor')(`${filename}:${line}:${column}`, 'code', (file, errorMessage) => {
-        _utils.logger.error(`Launch ${file} in editor failed.\n${errorMessage}`);
-      });
-
-      ctx.status = 200;
-      ctx.res.end();
-    }
-  } else {
-    return next();
-  }
-};
-
-exports.createLaunchEditorHandler = createLaunchEditorHandler;

package/dist/types/dev-tools/launch-editor/index.d.ts

@@ -1,2 +0,0 @@
-import { ModernServerContext, NextFunction } from '@modern-js/types';
-export declare const createLaunchEditorHandler: () => (ctx: ModernServerContext, next: NextFunction) => void;