@midwayjs/core 4.0.0-beta.8 → 4.0.0-beta.9

package/dist/decorator/decoratorManager.js

@@ -8,7 +8,7 @@ const pathFileUtil_1 = require("../util/pathFileUtil");
 const metadataManager_1 = require("./metadataManager");
 const types_1 = require("../util/types");
 const error_1 = require("../error");
-const debug = require('util').debuglog('midway:core');
+const debug = require('util').debuglog('midway:debug');
 /**
  * This class is used to manage the decorator data of the class
  *
@@ -54,7 +54,7 @@ class DecoratorManager {
                     meta.id = identifier;
                     // save class id and uuid
                     metadataManager_1.MetadataManager.defineMetadata(constant_1.PROVIDE_KEY, meta, target);
-                    debug(`update provide: ${target.name} -> ${meta.uuid}`);
+                    debug(`[core]: Update provide: ${target.name} -> ${meta.uuid}`);
                 }
             }
         }
@@ -68,7 +68,7 @@ class DecoratorManager {
                 uuid,
                 name: (0, camelCase_1.camelCase)(target.name),
             }, target);
-            debug(`save provide: ${target.name} -> ${uuid}`);
+            debug(`[core]: Save provide: ${target.name} -> ${uuid}`);
         }
         return target;
     }

package/dist/util/index.d.ts

@@ -28,6 +28,7 @@ export declare const loadModule: (p: string, options?: {
     loadMode?: "commonjs" | "esm";
     safeLoad?: boolean;
     warnOnLoadError?: boolean;
+    extraModuleRoot?: string[];
 }) => Promise<any>;
 /**
  * load module sync, and it must be commonjs mode

package/dist/util/index.js

@@ -96,7 +96,22 @@ const loadModule = async (p, options = {}) => {
     try {
         if (options.enableCache) {
             if (options.loadMode === 'commonjs') {
-                return require(p);
+                try {
+                    return require(p);
+                }
+                catch (_) {
+                    for (const extraPath of [
+                        process.cwd(),
+                        ...(options.extraModuleRoot || []),
+                    ]) {
+                        try {
+                            return require(require.resolve(p, { paths: [extraPath] }));
+                        }
+                        catch (_) {
+                            // do nothing
+                        }
+                    }
+                }
             }
             else {
                 // if json file, import need add options

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "4.0.0-beta.8",
+  "version": "4.0.0-beta.9",
   "description": "midway core",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -22,7 +22,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/logger": "^3.0.0",
+    "@midwayjs/logger": "^4.0.0",
     "eventsource": "2.0.2",
     "koa": "3.0.3",
     "mm": "3.4.0",
@@ -61,5 +61,5 @@
       "types": "./dist/functional/index.d.ts"
     }
   },
-  "gitHead": "355e55949fdd132b0bdcb4830222a0a027e92ded"
+  "gitHead": "771e83974ef9f3d78c296e4ee0c8c68db44f6b31"
 }