@midwayjs/web 3.1.4 → 3.1.7-alpha.0

package/dist/cluster.js

@@ -1,4 +1,5 @@
 "use strict";
+var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@midwayjs/core");
 const path_1 = require("path");
@@ -13,7 +14,7 @@ function runInAgent() {
 process.env['EGG_CLUSTER_MODE'] = 'true';
 const isAgent = runInAgent();
 debug('[egg]: run with egg-scripts in worker and init midway container in cluster mode');
-const appDir = process.cwd();
+const appDir = (_b = (_a = JSON.parse(process.argv[2])) === null || _a === void 0 ? void 0 : _a.baseDir) !== null && _b !== void 0 ? _b : process.cwd();
 let baseDir;
 if ((0, utils_1.isTypeScriptEnvironment)()) {
     baseDir = (0, path_1.join)(appDir, 'src');
@@ -21,11 +22,10 @@ if ((0, utils_1.isTypeScriptEnvironment)()) {
 else {
     baseDir = (0, path_1.join)(appDir, 'dist');
 }
-(0, core_1.initializeGlobalApplicationContext)({
+(0, core_1.prepareGlobalApplicationContext)({
     appDir,
     baseDir,
     ignore: ['**/app/extend/**'],
-    lazyInitializeFramework: true,
 });
 if (!isAgent) {
     debug('[egg]: run with egg-scripts in worker and init midway container complete');

package/dist/framework/web.d.ts

@@ -1,8 +1,8 @@
 import { BaseFramework, IMidwayBootstrapOptions, RouterInfo, WebControllerGenerator } from '@midwayjs/core';
 import { MidwayFrameworkType } from '@midwayjs/decorator';
-import { IMidwayWebConfigurationOptions } from '../interface';
+import { IMidwayWebConfigurationOptions, Application, Context } from '../interface';
 import { EggRouter } from '@eggjs/router';
-import { Application, Context, EggLogger } from 'egg';
+import { EggLogger } from 'egg';
 declare class EggControllerGenerator extends WebControllerGenerator<EggRouter> {
     readonly app: any;
     constructor(app: any);

package/dist/interface.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
-import { Context as EggContext, Application as EggApplication, EggAppConfig } from 'egg';
-import { IMidwayContainer, IMidwayContext, Context as IMidwayBaseContext, IMidwayApplication, IMidwayBaseApplication, IConfigurationOptions, NextFunction as BaseNextFunction } from '@midwayjs/core';
+import { Context as EggContext, Application as EggApplication } from 'egg';
+import { IMidwayContainer, IMidwayContext, IMidwayApplication, IConfigurationOptions, NextFunction as BaseNextFunction } from '@midwayjs/core';
 import { DefaultState, Middleware } from 'koa';
 import { ILogger, LoggerOptions } from '@midwayjs/logger';
 export interface IMidwayWebBaseApplication {
@@ -10,20 +10,6 @@ export interface IMidwayWebBaseApplication {
     generateMiddleware?(middlewareId: any): Promise<Middleware<DefaultState, EggContext>>;
     createLogger(name: string, options: LoggerOptions): ILogger;
 }
-declare module 'egg' {
-    interface EggAppInfo {
-        appDir: string;
-    }
-    interface Application extends IMidwayBaseApplication<Context>, IMidwayWebBaseApplication {
-        createAnonymousContext(...args: any[]): EggContext;
-        getCoreLogger(): EggLogger & ILogger;
-        getLogger(name?: string): EggLogger & ILogger;
-        createLogger(name: string, options: LoggerOptions): EggLogger & ILogger;
-    }
-    interface Context<ResponseBodyT = any> extends IMidwayBaseContext {
-        getLogger(name?: string): ILogger;
-    }
-}
 export declare type IMidwayWebApplication = IMidwayApplication<Context, EggApplication & IMidwayWebBaseApplication>;
 export interface Application extends IMidwayWebApplication {
 }
@@ -85,9 +71,4 @@ export declare type MidwayWebMiddleware = Middleware<DefaultState, Context>;
 export interface IWebMiddleware {
     resolve(): MidwayWebMiddleware;
 }
-declare module '@midwayjs/core/dist/interface' {
-    interface MidwayConfig extends PowerPartial<EggAppConfig> {
-        egg?: IMidwayWebConfigurationOptions;
-    }
-}
 //# sourceMappingURL=interface.d.ts.map

package/dist/logger.js

@@ -11,10 +11,7 @@ const util_1 = require("util");
 const debug = (0, util_1.debuglog)('midway:debug');
 const isWindows = os.platform() === 'win32';
 function isEmptyFile(p) {
-    const content = (0, fs_1.readFileSync)(p, {
-        encoding: 'utf8',
-    });
-    return content === null || content === undefined || content === '';
+    return (0, fs_1.statSync)(p).size === 0;
 }
 const levelTransform = level => {
     if (!level) {

package/index.d.ts

@@ -0,0 +1,36 @@
+import {
+  Context as IMidwayBaseContext,
+  IMidwayBaseApplication,
+} from '@midwayjs/core';
+import {
+  IMidwayWebBaseApplication,
+  IMidwayWebConfigurationOptions,
+} from './dist';
+
+export * from './dist/index';
+
+declare module 'egg' {
+  interface EggAppInfo {
+    appDir: string;
+  }
+
+  // 这里再次覆盖和 egg 不同的定义，不然 egg 插件里可能会报错
+  interface Application
+    extends IMidwayBaseApplication<Context>,
+      IMidwayWebBaseApplication {
+    createAnonymousContext(...args: any[]): EggContext;
+    getCoreLogger(): EggLogger & ILogger;
+    getLogger(name?: string): EggLogger & ILogger;
+    createLogger(name: string, options: LoggerOptions): EggLogger & ILogger;
+  }
+
+  interface Context<ResponseBodyT = any> extends IMidwayBaseContext {
+    getLogger(name?: string): ILogger;
+  }
+}
+
+declare module '@midwayjs/core' {
+  interface MidwayConfig extends PowerPartial<EggAppConfig> {
+    egg?: IMidwayWebConfigurationOptions;
+  }
+}

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@midwayjs/web",
-  "version": "3.1.4",
+  "version": "3.1.7-alpha.0",
   "description": "Midway Web Framework for Egg.js",
   "main": "dist/index",
-  "typings": "dist/index.d.ts",
+  "typings": "index.d.ts",
   "scripts": {
     "build": "tsc",
     "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
@@ -23,13 +23,14 @@
     "agent.js",
     "app.js",
     "dist/**/*.js",
-    "dist/**/*.d.ts"
+    "dist/**/*.d.ts",
+    "index.d.ts"
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.10",
+    "@midwayjs/decorator": "^3.1.6",
     "@midwayjs/logger": "^2.15.0",
-    "@midwayjs/mock": "^3.1.2",
+    "@midwayjs/mock": "^3.1.7-alpha.0",
     "axios": "0.26.1",
     "dayjs": "1.10.8",
     "egg-logger": "2.7.1",
@@ -46,7 +47,7 @@
   },
   "dependencies": {
     "@eggjs/router": "^2.0.0",
-    "@midwayjs/core": "^3.1.2",
+    "@midwayjs/core": "^3.1.7-alpha.0",
     "egg": "^2.28.0",
     "egg-cluster": "^1.27.1",
     "find-up": "5.0.0",
@@ -60,5 +61,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "ca98130962ab629a65912870f82f64bd0e44566d"
+  "gitHead": "8cb6db25f7eb794d9c61aaf69a43ac6506a289b5"
 }