@midwayjs/bootstrap 3.11.11 → 3.12.0-beta.1

package/dist/bootstrap.js

@@ -5,7 +5,6 @@ const core_1 = require("@midwayjs/core");
 const path_1 = require("path");
 const logger_1 = require("@midwayjs/logger");
 const async_hooks_context_manager_1 = require("@midwayjs/async-hooks-context-manager");
-const util_1 = require("./util");
 const event_bus_1 = require("@midwayjs/event-bus");
 const sticky_1 = require("./sticky");
 class BootstrapStarter {
@@ -32,6 +31,14 @@ class BootstrapStarter {
                 });
             }
         }
+        if (!this.globalOptions.fileLoadMode) {
+            const pkgJSON = await (0, core_1.loadModule)((0, path_1.join)(this.appDir, 'package.json'), {
+                safeLoad: true,
+                enableCache: false,
+            });
+            this.globalOptions.fileLoadMode =
+                (pkgJSON === null || pkgJSON === void 0 ? void 0 : pkgJSON.type) === 'module' ? 'esm' : 'commonjs';
+        }
         this.applicationContext = await (0, core_1.initializeGlobalApplicationContext)({
             asyncContextManager: (0, async_hooks_context_manager_1.createContextManager)(),
             ...this.globalOptions,
@@ -64,7 +71,7 @@ class BootstrapStarter {
         if (this.globalOptions.baseDir) {
             return this.globalOptions.baseDir;
         }
-        if ((0, util_1.isTypeScriptEnvironment)()) {
+        if ((0, core_1.isTypeScriptEnvironment)()) {
             return (0, path_1.join)(this.appDir, 'src');
         }
         else {

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 export * from './interface';
-export { isTypeScriptEnvironment } from './util';
 export { Bootstrap, BootstrapStarter } from './bootstrap';
 export { ClusterManager } from './manager/cp';
 export { AbstractForkManager } from './manager/base';

package/dist/index.js

@@ -14,10 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupStickyMaster = exports.AbstractForkManager = exports.ClusterManager = exports.BootstrapStarter = exports.Bootstrap = exports.isTypeScriptEnvironment = void 0;
+exports.setupStickyMaster = exports.AbstractForkManager = exports.ClusterManager = exports.BootstrapStarter = exports.Bootstrap = void 0;
 __exportStar(require("./interface"), exports);
-var util_1 = require("./util");
-Object.defineProperty(exports, "isTypeScriptEnvironment", { enumerable: true, get: function () { return util_1.isTypeScriptEnvironment; } });
 var bootstrap_1 = require("./bootstrap");
 Object.defineProperty(exports, "Bootstrap", { enumerable: true, get: function () { return bootstrap_1.Bootstrap; } });
 Object.defineProperty(exports, "BootstrapStarter", { enumerable: true, get: function () { return bootstrap_1.BootstrapStarter; } });

package/dist/manager/cp.js

@@ -5,7 +5,7 @@ const event_bus_1 = require("@midwayjs/event-bus");
 const base_1 = require("./base");
 const cluster = require('cluster');
 const util_1 = require("util");
-const util_2 = require("../util");
+const core_1 = require("@midwayjs/core");
 const debug = (0, util_1.debuglog)('midway:bootstrap');
 class ClusterManager extends base_1.AbstractForkManager {
     constructor(options = {}) {
@@ -13,7 +13,7 @@ class ClusterManager extends base_1.AbstractForkManager {
         this.options = options;
         options.args = options.args || [];
         options.execArgv = options.execArgv || [];
-        if ((0, util_2.isTypeScriptEnvironment)()) {
+        if ((0, core_1.isTypeScriptEnvironment)()) {
             options.execArgv.push(...['--require', 'ts-node/register']);
         }
     }

package/dist/manager/thread.js

@@ -4,7 +4,7 @@ exports.ThreadManager = void 0;
 const base_1 = require("./base");
 const worker_threads_1 = require("worker_threads");
 const event_bus_1 = require("@midwayjs/event-bus");
-const util_1 = require("../util");
+const core_1 = require("@midwayjs/core");
 class ThreadManager extends base_1.AbstractForkManager {
     constructor(options = {}) {
         super(options);
@@ -19,7 +19,7 @@ class ThreadManager extends base_1.AbstractForkManager {
     require(${JSON.stringify(this.options.exec)});
   `;
         // 当前是 ts 环境
-        if ((0, util_1.isTypeScriptEnvironment)()) {
+        if ((0, core_1.isTypeScriptEnvironment)()) {
             content = `
     require("ts-node/register/transpile-only");
     ${content}

package/dist/util.d.ts

@@ -1,4 +1,3 @@
 export declare function logDate(): string;
 export declare function sleep(timeout: any): Promise<unknown>;
-export declare function isTypeScriptEnvironment(): boolean;
 //# sourceMappingURL=util.d.ts.map

package/dist/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isTypeScriptEnvironment = exports.sleep = exports.logDate = void 0;
+exports.sleep = exports.logDate = void 0;
 function logDate() {
     const d = new Date();
     let date = d.getDate();
@@ -51,13 +51,4 @@ async function sleep(timeout) {
     });
 }
 exports.sleep = sleep;
-function isTypeScriptEnvironment() {
-    const TS_MODE_PROCESS_FLAG = process.env.MIDWAY_TS_MODE;
-    if ('false' === TS_MODE_PROCESS_FLAG) {
-        return false;
-    }
-    // eslint-disable-next-line node/no-deprecated-api
-    return TS_MODE_PROCESS_FLAG === 'true' || !!require.extensions['.ts'];
-}
-exports.isTypeScriptEnvironment = isTypeScriptEnvironment;
 //# sourceMappingURL=util.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/bootstrap",
-  "version": "3.11.11",
+  "version": "3.12.0-beta.1",
   "description": "midwayjs bootstrap",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -21,14 +21,14 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@midwayjs/async-hooks-context-manager": "^3.11.11",
+    "@midwayjs/async-hooks-context-manager": "^3.11.15",
     "@midwayjs/event-bus": "1.7.0"
   },
   "devDependencies": {
-    "@midwayjs/core": "^3.11.11",
+    "@midwayjs/core": "^3.11.15",
     "@midwayjs/logger": "^2.15.0",
     "request": "2.88.2",
-    "socket.io-client": "4.6.2"
+    "socket.io-client": "4.7.1"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
   "repository": {
@@ -38,5 +38,5 @@
   "engines": {
     "node": ">=12.11.0"
   },
-  "gitHead": "3d2e85a212cfecb5cecb8ab45134fa361fe6cba2"
+  "gitHead": "a603d2348d6141f8f723901498f03a162a037708"
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2013 - Now midwayjs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.