@midwayjs/core 3.12.0 → 3.12.2

package/dist/setup.d.ts

@@ -9,10 +9,10 @@ export declare function destroyGlobalApplicationContext(applicationContext: IMid
  * prepare applicationContext
  * @param globalOptions
  */
-export declare function prepareGlobalApplicationContext(globalOptions: IMidwayBootstrapOptions): Promise<IMidwayContainer | MidwayContainer>;
+export declare function prepareGlobalApplicationContextAsync(globalOptions: IMidwayBootstrapOptions): Promise<IMidwayContainer | MidwayContainer>;
 /**
- * prepare applicationContext, it use in egg framework.
+ * prepare applicationContext, it use in egg framework, hooks and serverless function generator
  * @param globalOptions
  */
-export declare function prepareGlobalApplicationContextSync(globalOptions: IMidwayBootstrapOptions): IMidwayContainer | MidwayContainer;
+export declare function prepareGlobalApplicationContext(globalOptions: IMidwayBootstrapOptions): IMidwayContainer | MidwayContainer;
 //# sourceMappingURL=setup.d.ts.map

package/dist/setup.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareGlobalApplicationContextSync = exports.prepareGlobalApplicationContext = exports.destroyGlobalApplicationContext = exports.initializeGlobalApplicationContext = void 0;
+exports.prepareGlobalApplicationContext = exports.prepareGlobalApplicationContextAsync = exports.destroyGlobalApplicationContext = exports.initializeGlobalApplicationContext = void 0;
 const _1 = require("./");
 const config_default_1 = require("./config/config.default");
 const decorator_1 = require("./decorator");
@@ -17,7 +17,7 @@ function printStepDebugInfo(stepInfo) {
  * @param globalOptions
  */
 async function initializeGlobalApplicationContext(globalOptions) {
-    const applicationContext = await prepareGlobalApplicationContext(globalOptions);
+    const applicationContext = await prepareGlobalApplicationContextAsync(globalOptions);
     printStepDebugInfo('Init logger');
     // init logger
     const loggerService = await applicationContext.getAsync(_1.MidwayLoggerService, [
@@ -71,7 +71,7 @@ exports.destroyGlobalApplicationContext = destroyGlobalApplicationContext;
  * prepare applicationContext
  * @param globalOptions
  */
-async function prepareGlobalApplicationContext(globalOptions) {
+async function prepareGlobalApplicationContextAsync(globalOptions) {
     var _a, _b, _c, _d, _e;
     printStepDebugInfo('Ready to create applicationContext');
     debug('[core]: start "initializeGlobalApplicationContext"');
@@ -174,12 +174,12 @@ async function prepareGlobalApplicationContext(globalOptions) {
     applicationContext.get(_1.MidwayMiddlewareService, [applicationContext]);
     return applicationContext;
 }
-exports.prepareGlobalApplicationContext = prepareGlobalApplicationContext;
+exports.prepareGlobalApplicationContextAsync = prepareGlobalApplicationContextAsync;
 /**
- * prepare applicationContext, it use in egg framework.
+ * prepare applicationContext, it use in egg framework, hooks and serverless function generator
  * @param globalOptions
  */
-function prepareGlobalApplicationContextSync(globalOptions) {
+function prepareGlobalApplicationContext(globalOptions) {
     var _a, _b, _c, _d;
     printStepDebugInfo('Ready to create applicationContext');
     debug('[core]: start "initializeGlobalApplicationContext"');
@@ -269,5 +269,5 @@ function prepareGlobalApplicationContextSync(globalOptions) {
     applicationContext.get(_1.MidwayMiddlewareService, [applicationContext]);
     return applicationContext;
 }
-exports.prepareGlobalApplicationContextSync = prepareGlobalApplicationContextSync;
+exports.prepareGlobalApplicationContext = prepareGlobalApplicationContext;
 //# sourceMappingURL=setup.js.map

package/dist/util/index.js

@@ -12,6 +12,7 @@ const uuid_1 = require("./uuid");
 const flatted_1 = require("./flatted");
 const crypto = require("crypto");
 const types_1 = require("./types");
+const url_1 = require("url");
 const debug = (0, util_1.debuglog)('midway:debug');
 /**
  * @since 2.0.0
@@ -54,6 +55,7 @@ const safeRequire = (p, enabledCache = true) => {
     }
 };
 exports.safeRequire = safeRequire;
+const innerLoadModuleCache = {};
 /**
  * load module, and it can be chosen commonjs or esm mode
  * @param p
@@ -68,6 +70,7 @@ const loadModule = async (p, options = {}) => {
     if (p.startsWith(`.${path_1.sep}`) || p.startsWith(`..${path_1.sep}`)) {
         p = (0, path_1.resolve)((0, path_1.dirname)(module.parent.filename), p);
     }
+    debug(`[core]: load module ${p}, cache: ${options.enableCache}, mode: ${options.loadMode}, safeLoad: ${options.safeLoad}`);
     try {
         if (options.enableCache) {
             if (options.loadMode === 'commonjs') {
@@ -76,12 +79,21 @@ const loadModule = async (p, options = {}) => {
             else {
                 // if json file, import need add options
                 if (p.endsWith('.json')) {
-                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                    // @ts-ignore
-                    return (await import(p, { assert: { type: 'json' } })).default;
+                    /**
+                     * attention: import json not support under nodejs 16
+                     * use readFileSync instead
+                     */
+                    if (!innerLoadModuleCache[p]) {
+                        // return (await import(p, { assert: { type: 'json' } })).default;
+                        const content = (0, fs_1.readFileSync)(p, {
+                            encoding: 'utf-8',
+                        });
+                        innerLoadModuleCache[p] = JSON.parse(content);
+                    }
+                    return innerLoadModuleCache[p];
                 }
                 else {
-                    return await import(p);
+                    return await import((0, url_1.pathToFileURL)(p).href);
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.12.0",
+  "version": "3.12.2",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -42,5 +42,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "0e9a08cd078c4c4dedfa753a8c1025806cc0b0a2"
+  "gitHead": "2f385d135df1dcb65bfdfd25a0c97476773f8315"
 }