@midwayjs/core 4.0.0-beta.12 → 4.0.0-beta.14

package/dist/common/fileDetector.d.ts

@@ -13,6 +13,7 @@ export declare class CommonJSFileDetector extends AbstractFileDetector<{
     pattern?: string | string[];
     ignore?: string | string[];
     conflictCheck?: boolean;
+    importQuery?: boolean | string | (() => string);
 }> {
     private duplicateModuleCheckSet;
     run(container: IMidwayGlobalContainer, namespace: string): Promise<void>;

package/dist/common/fileDetector.js

@@ -8,6 +8,7 @@ const constants_1 = require("../constants");
 const util_1 = require("../util");
 const decorator_1 = require("../decorator");
 const util_2 = require("util");
+const path_1 = require("path");
 const debug = (0, util_2.debuglog)('midway:debug');
 class AbstractFileDetector {
     options;
@@ -82,7 +83,21 @@ class CommonJSFileDetector extends AbstractFileDetector {
     async loadAsync(container, namespace) {
         this.options = this.options || {};
         const loadDirs = [].concat(this.options.loadDir ?? container.get('baseDir'));
-        const importQuery = `${Date.now()}_${Math.random()}`;
+        let importQuery;
+        const envImportQueryEnabled = process.env.MIDWAY_HMR_IMPORT_QUERY === '1';
+        const envImportQueryFile = process.env.MIDWAY_HMR_IMPORT_QUERY_FILE;
+        if (typeof this.options.importQuery === 'function') {
+            importQuery = this.options.importQuery();
+        }
+        else if (typeof this.options.importQuery === 'string') {
+            importQuery = this.options.importQuery;
+        }
+        else if (this.options.importQuery) {
+            importQuery = `${Date.now()}_${Math.random()}`;
+        }
+        else if (envImportQueryEnabled && !envImportQueryFile) {
+            importQuery = `${Date.now()}_${Math.random()}`;
+        }
         for (const dir of loadDirs) {
             const fileResults = (0, glob_1.run)(DEFAULT_GLOB_PATTERN.concat(this.options.pattern || []), {
                 cwd: dir,
@@ -104,9 +119,18 @@ class CommonJSFileDetector extends AbstractFileDetector {
                 }
             };
             for (const file of fileResults) {
+                let currentImportQuery = importQuery;
+                if (!this.options.importQuery &&
+                    envImportQueryEnabled &&
+                    envImportQueryFile) {
+                    currentImportQuery =
+                        (0, path_1.resolve)(file) === (0, path_1.resolve)(envImportQueryFile)
+                            ? `${Date.now()}_${Math.random()}`
+                            : undefined;
+                }
                 const exports = await (0, util_1.loadModule)(file, {
                     loadMode: 'esm',
-                    importQuery,
+                    importQuery: currentImportQuery,
                 });
                 // add module to set
                 container.bindClass(exports, {

package/dist/service/middlewareService.js

@@ -108,7 +108,7 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
                              * 2、如果 result 有值（非 undefined），则不管什么情况，都会覆盖当前 body，注意，这里有可能赋值 null，导致 status 为 204，会在中间件处进行修正
                              * 3、如果 result 没值，且 ctx.body 已经赋值，则向 result 赋值
                              */
-                            if (result !== undefined) {
+                            if (result !== undefined && result !== context['body']) {
                                 context['body'] = result;
                             }
                             else if (context['body'] !== undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "4.0.0-beta.12",
+  "version": "4.0.0-beta.14",
   "description": "midway core",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -62,5 +62,5 @@
       "types": "./dist/functional/index.d.ts"
     }
   },
-  "gitHead": "1c48179b7c827ba8ec9351e9b6c36ec1726d3e11"
+  "gitHead": "52335cb1baa00754fffd48487f6153a3b2f1f50a"
 }