@modern-js/server 1.6.0 → 1.16.0

package/CHANGELOG.md

@@ -1,5 +1,42 @@
 # @modern-js/server
 
+## 1.16.0
+
+### Patch Changes
+
+- 2808ff5a2: fix(dev-server): support enable hmr client by webpack target
+
+  fix(dev-server): 支持通过 webpack target 来判断是否启用 hmr client
+
+- Updated dependencies [641592f52]
+- Updated dependencies [3904b30a5]
+- Updated dependencies [1100dd58c]
+- Updated dependencies [e04e6e76a]
+- Updated dependencies [81c66e4a4]
+- Updated dependencies [2c305b6f5]
+  - @modern-js/utils@1.16.0
+  - @modern-js/webpack@1.16.0
+  - @modern-js/server-utils@1.16.0
+  - @modern-js/prod-server@1.16.0
+
+## 1.15.0
+
+### Patch Changes
+
+- b1f7000: fix: Adjust createServer logic in bff test plugin
+  fix: 调整 BFF 测试中 create server 的逻辑
+- Updated dependencies [8658a78]
+- Updated dependencies [0df4970]
+- Updated dependencies [05d4a4f]
+- Updated dependencies [ad05af9]
+- Updated dependencies [5d53d1c]
+- Updated dependencies [c087148]
+- Updated dependencies [37cd159]
+  - @modern-js/utils@1.15.0
+  - @modern-js/webpack@1.15.0
+  - @modern-js/prod-server@1.15.0
+  - @modern-js/server-utils@1.15.0
+
 ## 1.6.0
 
 ### Minor Changes

package/dist/js/modern/hmr-client/index.js

@@ -8,6 +8,7 @@ import stripAnsi from '@modern-js/utils/strip-ansi';
 import { formatWebpackMessages } from '@modern-js/utils/format';
 import { createSocketUrl } from "./createSocketUrl"; // declare any to fix the type of `module.hot`
 
+// 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
 // runtime error. To prevent confusing behavior, we forcibly reload the entire
@@ -171,11 +172,9 @@ function tryApplyUpdates() {
   }
 
   function handleApplyUpdates(err, updatedModules) {
-    // NOTE: This var is injected by Webpack's DefinePlugin, and is a boolean instead of string.
-    const hasReactRefresh = process.env.FAST_REFRESH;
-    const wantsForcedReload = err || !updatedModules || hadRuntimeError; // React refresh can handle hot-reloading over errors.
+    const wantsForcedReload = err || !updatedModules || hadRuntimeError;
 
-    if (!hasReactRefresh && wantsForcedReload) {
+    if (wantsForcedReload) {
       window.location.reload();
       return;
     }

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

@@ -138,10 +138,10 @@ export class ModernDevServer extends ModernServer {
   }
 
   async onClose() {
-    var _this$socketServer;
+    var _this$watcher, _this$socketServer;
 
     await super.onClose();
-    await this.watcher.close();
+    await ((_this$watcher = this.watcher) === null || _this$watcher === void 0 ? void 0 : _this$watcher.close());
     await new Promise(resolve => {
       if (this.devMiddleware) {
         this.devMiddleware.close(() => {
@@ -241,14 +241,30 @@ export class ModernDevServer extends ModernServer {
     return this.setupDevMiddleware(compiler);
   }
 
+  isClientCompiler(compiler) {
+    const {
+      target
+    } = 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';
+  }
+
   setupDevServerPlugin(compiler) {
     const {
       dev: devConf
-    } = this;
+    } = this; // apply dev server to client compiler, add hmr client to entry.
 
     if (compiler.compilers) {
       compiler.compilers.forEach(target => {
-        if (target.name === 'client') {
+        if (this.isClientCompiler(target)) {
           new DevServerPlugin(devConf).apply(target);
         }
       });

package/dist/js/node/hmr-client/index.js

@@ -14,6 +14,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  *
  * 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
 // runtime error. To prevent confusing behavior, we forcibly reload the entire
@@ -177,11 +178,9 @@ function tryApplyUpdates() {
   }
 
   function handleApplyUpdates(err, updatedModules) {
-    // NOTE: This var is injected by Webpack's DefinePlugin, and is a boolean instead of string.
-    const hasReactRefresh = process.env.FAST_REFRESH;
-    const wantsForcedReload = err || !updatedModules || hadRuntimeError; // React refresh can handle hot-reloading over errors.
+    const wantsForcedReload = err || !updatedModules || hadRuntimeError;
 
-    if (!hasReactRefresh && wantsForcedReload) {
+    if (wantsForcedReload) {
       window.location.reload();
       return;
     }

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

@@ -163,10 +163,10 @@ class ModernDevServer extends _prodServer.ModernServer {
   }
 
   async onClose() {
-    var _this$socketServer;
+    var _this$watcher, _this$socketServer;
 
     await super.onClose();
-    await this.watcher.close();
+    await ((_this$watcher = this.watcher) === null || _this$watcher === void 0 ? void 0 : _this$watcher.close());
     await new Promise(resolve => {
       if (this.devMiddleware) {
         this.devMiddleware.close(() => {
@@ -268,14 +268,30 @@ class ModernDevServer extends _prodServer.ModernServer {
     return this.setupDevMiddleware(compiler);
   }
 
+  isClientCompiler(compiler) {
+    const {
+      target
+    } = 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';
+  }
+
   setupDevServerPlugin(compiler) {
     const {
       dev: devConf
-    } = this;
+    } = this; // apply dev server to client compiler, add hmr client to entry.
 
     if (compiler.compilers) {
       compiler.compilers.forEach(target => {
-        if (target.name === 'client') {
+        if (this.isClientCompiler(target)) {
           new _devServerPlugin.default(devConf).apply(target);
         }
       });

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

@@ -9,7 +9,7 @@ export declare class ModernDevServer extends ModernServer {
   private readonly dev;
   private readonly compiler?;
   private socketServer;
-  private watcher;
+  private watcher?;
   private devMiddleware;
   constructor(options: ModernDevServerOptions);
   private getDevOptions;
@@ -27,6 +27,7 @@ export declare class ModernDevServer extends ModernServer {
     event: WatchEvent;
   }): void;
   private setupCompiler;
+  private isClientCompiler;
   private setupDevServerPlugin;
   private setupHooks;
   private setupDevMiddleware;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.6.0",
+  "version": "1.16.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -30,21 +30,21 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@babel/register": "^7.17.7",
-    "@modern-js/prod-server": "^1.2.1",
-    "@modern-js/server-utils": "^1.2.11",
-    "@modern-js/webpack": "^1.12.2",
-    "@modern-js/utils": "^1.8.0",
+    "@modern-js/prod-server": "1.16.0",
+    "@modern-js/server-utils": "1.16.0",
+    "@modern-js/webpack": "1.16.0",
+    "@modern-js/utils": "1.16.0",
     "devcert": "^1.2.2",
     "minimatch": "^3.0.4",
     "path-to-regexp": "^6.2.0",
     "ws": "^8.2.0"
   },
   "devDependencies": {
-    "@modern-js/core": "1.13.1",
-    "@modern-js/server-core": "1.4.1",
-    "@modern-js/types": "1.6.0",
-    "@scripts/build": "0.0.0",
-    "@scripts/jest-config": "0.0.0",
+    "@modern-js/core": "1.16.0",
+    "@modern-js/server-core": "1.16.0",
+    "@modern-js/types": "1.16.0",
+    "@scripts/build": "1.15.0",
+    "@scripts/jest-config": "1.15.0",
     "@types/jest": "^27",
     "@types/minimatch": "^3.0.5",
     "@types/node": "^14",