@midwayjs/web 3.13.3 → 3.13.4-beta.2

package/dist/config/config.default.js

@@ -5,6 +5,7 @@ const mkdirp = require("mkdirp");
 const os = require("os");
 const fs = require("fs");
 const loggerModule = require("@midwayjs/logger");
+const core_1 = require("@midwayjs/core");
 exports.default = appInfo => {
     const exports = {};
     exports.rundir = path.join(appInfo.appDir, 'run');
@@ -43,7 +44,7 @@ exports.default = appInfo => {
         };
     }
     // 修改默认的日志名
-    exports.midwayLogger = defaultLoggerConfig;
+    exports.midwayLogger = (0, core_1.extend)(true, {}, loggerModule.loggers.getDefaultMidwayLoggerConfig(appInfo)['midwayLogger'], defaultLoggerConfig);
     exports.egg = {
         dumpConfig: true,
         contextLoggerFormat: info => {

package/dist/logger.js

@@ -87,7 +87,7 @@ class MidwayLoggers extends Map {
         let loggerConfig = configService.getConfiguration('midwayLogger');
         // 这里属于 hack 了，cluster 模式下会先走这里，找不到默认值
         // 先合并一遍默认配置
-        configService.addObject(logger_1.loggers.getDefaultMidwayLoggerConfig(configService.getAppInfo()));
+        configService.addObject(logger_1.loggers.getDefaultMidwayLoggerConfig(configService.getAppInfo()), true);
         loggerConfig = configService.getConfiguration('midwayLogger');
         // 这里利用了 loggers 缓存的特性，提前初始化 logger
         if (loggerConfig) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/web",
-  "version": "3.13.3",
+  "version": "3.13.4-beta.2",
   "description": "Midway Web Framework for Egg.js",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -60,5 +60,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "a2647ad7e54f489562507798308b41f24333a3ea"
+  "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.