@midwayjs/web 4.0.0-beta.7 → 4.0.0-beta.9

package/dist/base.js

@@ -35,10 +35,12 @@ function getFramework() {
 const createAppWorkerLoader = () => {
     const AppWorkerLoader = require(getFramework())?.AppWorkerLoader || require('egg').AppWorkerLoader;
     class EggAppWorkerLoader extends AppWorkerLoader {
-        constructor() {
-            super(...arguments);
-            this.useEggSocketIO = false;
-        }
+        app;
+        framework;
+        bootstrap;
+        useEggSocketIO = false;
+        applicationContext;
+        lifecycleService;
         getEggPaths() {
             if (!this.appDir) {
                 // 这里的逻辑是为了兼容老 cluster 模式

package/dist/configuration.js

@@ -13,6 +13,10 @@ exports.EggConfiguration = void 0;
 const core_1 = require("@midwayjs/core");
 const path_1 = require("path");
 let EggConfiguration = class EggConfiguration {
+    baseDir;
+    appDir;
+    app;
+    decoratorService;
     init() {
         this.decoratorService.registerParameterHandler(core_1.WEB_ROUTER_PARAM_KEY, options => {
             return (0, core_1.extractKoaLikeValue)(options.metadata.type, options.metadata.propertyData, options.originParamType)(options.originArgs[0], options.originArgs[1]);

package/dist/decorator.js

@@ -1,16 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RunInEggAgent = exports.AgentApp = void 0;
+exports.AgentApp = AgentApp;
+exports.RunInEggAgent = RunInEggAgent;
 const core_1 = require("@midwayjs/core");
 const interface_1 = require("./interface");
 function AgentApp() {
     return core_1.DecoratorManager.createCustomPropertyDecorator(interface_1.EGG_AGENT_APP_KEY, {});
 }
-exports.AgentApp = AgentApp;
 function RunInEggAgent() {
     return function (target) {
         core_1.DecoratorManager.saveModule(interface_1.RUN_IN_AGENT_KEY, target);
     };
 }
-exports.RunInEggAgent = RunInEggAgent;
 //# sourceMappingURL=decorator.js.map

package/dist/framework/lifecycle.js

@@ -15,9 +15,12 @@ const functional_1 = require("@midwayjs/core/functional");
 const util_1 = require("util");
 const debug = (0, util_1.debuglog)('midway:debug');
 let MidwayWebLifeCycleService = class MidwayWebLifeCycleService {
+    applicationContext;
+    frameworkService;
+    configService;
+    lifecycleInstanceList = [];
     constructor(applicationContext) {
         this.applicationContext = applicationContext;
-        this.lifecycleInstanceList = [];
     }
     async init() {
         // run lifecycle

package/dist/framework/web.js

@@ -18,6 +18,8 @@ const util_1 = require("util");
 const net_1 = require("net");
 const debug = (0, util_1.debuglog)('midway:debug');
 class EggControllerGenerator extends core_1.WebControllerGenerator {
+    app;
+    webRouterService;
     constructor(app, webRouterService) {
         super(app, webRouterService);
         this.app = app;
@@ -33,10 +35,13 @@ class EggControllerGenerator extends core_1.WebControllerGenerator {
     }
 }
 let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
-    constructor() {
-        super(...arguments);
-        this.isClusterMode = false;
-    }
+    loggers;
+    generator;
+    server;
+    agent;
+    isClusterMode = false;
+    webRouterService;
+    appDir;
     configure() {
         process.env.EGG_TYPESCRIPT = 'true';
         if (process.env['EGG_CLUSTER_MODE'] === 'true') {
@@ -98,6 +103,7 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
         ]);
         this.generator = new EggControllerGenerator(this.app, this.webRouterService);
         this.overwriteApplication('app');
+        this.app.loader.app = this.app;
         this.app.loader.loadOrigin();
         // 这里拦截 app.use 方法，让他可以加到 midway 的 middlewareManager 中
         this.app.originUse = this.app.use;

package/dist/index.js

@@ -14,7 +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.startCluster = exports.Configuration = exports.Agent = exports.Application = exports.createAgentWorkerLoader = exports.createAppWorkerLoader = exports.createEggAgent = exports.createEggApplication = exports.Framework = void 0;
+exports.Configuration = exports.Agent = exports.Application = exports.createAgentWorkerLoader = exports.createAppWorkerLoader = exports.createEggAgent = exports.createEggApplication = exports.Framework = void 0;
+exports.startCluster = startCluster;
 const egg_cluster_1 = require("egg-cluster");
 const path_1 = require("path");
 __exportStar(require("./interface"), exports);
@@ -41,5 +42,4 @@ function startCluster(serverConfig, callback) {
     serverConfig['require'].push((0, path_1.join)(__dirname, 'cluster'));
     return (0, egg_cluster_1.startCluster)(serverConfig, callback);
 }
-exports.startCluster = startCluster;
 //# sourceMappingURL=index.js.map

package/dist/interface.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 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';

package/dist/logger.d.ts

@@ -34,6 +34,6 @@ declare class MidwayLoggers extends Map<string, ILogger> {
         };
     };
 }
-export declare const createLoggers: (app: Application, processType: 'agent' | 'app') => MidwayLoggers;
+export declare const createLoggers: (app: Application, processType: "agent" | "app") => MidwayLoggers;
 export {};
 //# sourceMappingURL=logger.d.ts.map

package/dist/logger.js

@@ -46,6 +46,8 @@ function cleanUndefinedProperty(obj) {
     });
 }
 class MidwayLoggers extends Map {
+    app;
+    loggerService;
     /**
      * @constructor
      * - logger

package/dist/utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initializeAgentApplicationContext = exports.getCurrentDateString = exports.findLernaRoot = exports.parseNormalDir = void 0;
+exports.getCurrentDateString = exports.findLernaRoot = exports.parseNormalDir = void 0;
+exports.initializeAgentApplicationContext = initializeAgentApplicationContext;
 const path_1 = require("path");
 const find_up_1 = require("find-up");
 const fs_1 = require("fs");
@@ -64,10 +65,10 @@ async function initializeAgentApplicationContext(agent) {
     agentFramework['logger'] = agent.coreLogger;
     agentFramework['appLogger'] = agent.logger;
     agentFramework.app = agent;
-    agentFramework.configService = applicationContext.get(core_1.MidwayConfigService);
-    agentFramework.environmentService = applicationContext.get(core_1.MidwayEnvironmentService);
-    agentFramework.loggerService = applicationContext.get(core_1.MidwayLoggerService);
-    agentFramework.informationService = applicationContext.get(core_1.MidwayInformationService);
+    agentFramework['configService'] = applicationContext.get(core_1.MidwayConfigService);
+    agentFramework['environmentService'] = applicationContext.get(core_1.MidwayEnvironmentService);
+    agentFramework['loggerService'] = applicationContext.get(core_1.MidwayLoggerService);
+    agentFramework['informationService'] = applicationContext.get(core_1.MidwayInformationService);
     agentFramework.overwriteApplication('agent');
     // init decorator service
     const decoratorService = (0, core_1.getCurrentApplicationContext)().get(core_1.MidwayDecoratorService);
@@ -115,5 +116,4 @@ async function initializeAgentApplicationContext(agent) {
     }
     return applicationContext;
 }
-exports.initializeAgentApplicationContext = initializeAgentApplicationContext;
 //# sourceMappingURL=utils.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/web",
-  "version": "4.0.0-beta.7",
+  "version": "4.0.0-beta.9",
   "description": "Midway Web Framework for Egg.js",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -28,17 +28,17 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/logger": "^3.0.0",
-    "@midwayjs/mock": "^4.0.0-beta.7",
+    "@midwayjs/logger": "^4.0.0",
+    "@midwayjs/mock": "^4.0.0-beta.9",
     "@types/koa": "2.15.0",
-    "dayjs": "1.11.13",
+    "dayjs": "1.11.19",
     "egg-logger": "3.6.1",
     "egg-mock": "4.2.1",
     "egg-scripts": "3.1.0",
     "egg-socket.io": "4.1.6",
     "egg-view-nunjucks": "2.3.0",
     "fake-egg": "1.0.0",
-    "fs-extra": "11.3.0",
+    "fs-extra": "11.3.2",
     "is-type-of": "^2.1.0",
     "mm": "3.4.0",
     "mz-modules": "^2.1.0",
@@ -49,13 +49,13 @@
   },
   "dependencies": {
     "@eggjs/router": "^2.0.0",
-    "@midwayjs/core": "^4.0.0-beta.7",
+    "@midwayjs/core": "^4.0.0-beta.9",
     "egg": "^2.28.0",
     "egg-cluster": "^1.27.1",
     "egg-path-matching": "^2.1.0",
     "find-up": "5.0.0",
     "mkdirp": "1.0.4",
-    "qs": "6.14.0"
+    "qs": "6.14.1"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
   "repository": {
@@ -65,5 +65,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "6a221788112b4d998b3958e0a275579f42816c59"
+  "gitHead": "771e83974ef9f3d78c296e4ee0c8c68db44f6b31"
 }