@midwayjs/web 3.13.4-beta.2 → 3.13.4-beta.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/config/config.default.js +3 -27
  2. package/dist/logger.js +12 -32
  3. package/package.json +2 -2
package/dist/config/config.default.js CHANGED
@@ -9,8 +9,8 @@ const core_1 = require("@midwayjs/core");
9
9
  exports.default = appInfo => {
10
10
  const exports = {};
11
11
  exports.rundir = path.join(appInfo.appDir, 'run');
12
- // v2 格式
13
- let defaultLoggerConfig = {
12
+ // 修改默认的日志名
13
+ exports.midwayLogger = (0, core_1.extend)(true, {}, loggerModule.loggers.getDefaultMidwayLoggerConfig(appInfo)['midwayLogger'], {
14
14
  clients: {
15
15
  appLogger: {
16
16
  fileLogName: 'midway-web.log',
@@ -20,31 +20,7 @@ exports.default = appInfo => {
20
20
  fileLogName: 'midway-agent.log',
21
21
  },
22
22
  },
23
- };
24
- // v3 格式
25
- if (loggerModule['formatLegacyLoggerOptions']) {
26
- defaultLoggerConfig = {
27
- clients: {
28
- appLogger: {
29
- transports: {
30
- file: {
31
- fileLogName: 'midway-web.log',
32
- },
33
- },
34
- aliasName: 'logger',
35
- },
36
- agentLogger: {
37
- transports: {
38
- file: {
39
- fileLogName: 'midway-agent.log',
40
- },
41
- },
42
- },
43
- },
44
- };
45
- }
46
- // 修改默认的日志名
47
- exports.midwayLogger = (0, core_1.extend)(true, {}, loggerModule.loggers.getDefaultMidwayLoggerConfig(appInfo)['midwayLogger'], defaultLoggerConfig);
23
+ });
48
24
  exports.egg = {
49
25
  dumpConfig: true,
50
26
  contextLoggerFormat: info => {
package/dist/logger.js CHANGED
@@ -158,7 +158,7 @@ class MidwayLoggers extends Map {
158
158
  }
159
159
  }
160
160
  transformEggLogger(eggCustomLogger, midwayLoggerConfig) {
161
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
161
+ var _a, _b, _c, _d;
162
162
  const transformLoggerConfig = {
163
163
  midwayLogger: {
164
164
  clients: {},
@@ -174,42 +174,22 @@ class MidwayLoggers extends Map {
174
174
  // 绝对路径，单独处理
175
175
  options.dir = (0, path_1.dirname)(file);
176
176
  options.fileLogName = (0, path_1.basename)(file);
177
- if (isV3Logger) {
178
- options.auditFileDir =
179
- ((_c = (_b = midwayLoggerConfig === null || midwayLoggerConfig === void 0 ? void 0 : midwayLoggerConfig.transports) === null || _b === void 0 ? void 0 : _b.file) === null || _c === void 0 ? void 0 : _c['auditFileDir']) === '.audit'
180
- ? (0, path_1.join)((_e = (_d = midwayLoggerConfig === null || midwayLoggerConfig === void 0 ? void 0 : midwayLoggerConfig.transports) === null || _d === void 0 ? void 0 : _d.file) === null || _e === void 0 ? void 0 : _e['dir'], '.audit')
181
- : (_g = (_f = midwayLoggerConfig === null || midwayLoggerConfig === void 0 ? void 0 : midwayLoggerConfig.transports) === null || _f === void 0 ? void 0 : _f.file) === null || _g === void 0 ? void 0 : _g['auditFileDir'];
182
- options.errorDir =
183
- (_k = (_j = (_h = midwayLoggerConfig === null || midwayLoggerConfig === void 0 ? void 0 : midwayLoggerConfig.transports) === null || _h === void 0 ? void 0 : _h.error) === null || _j === void 0 ? void 0 : _j['dir']) !== null && _k !== void 0 ? _k : (_m = (_l = midwayLoggerConfig === null || midwayLoggerConfig === void 0 ? void 0 : midwayLoggerConfig.transports) === null || _l === void 0 ? void 0 : _l.file) === null || _m === void 0 ? void 0 : _m['dir'];
184
- }
185
- else {
186
- options.auditFileDir =
187
- midwayLoggerConfig['auditFileDir'] === '.audit'
188
- ? (0, path_1.join)(midwayLoggerConfig['dir'], '.audit')
189
- : midwayLoggerConfig['auditFileDir'];
190
- options.errorDir =
191
- (_o = midwayLoggerConfig['errorDir']) !== null && _o !== void 0 ? _o : midwayLoggerConfig['dir'];
192
- }
177
+ options.auditFileDir =
178
+ midwayLoggerConfig['auditFileDir'] === '.audit'
179
+ ? (0, path_1.join)(midwayLoggerConfig['dir'], '.audit')
180
+ : midwayLoggerConfig['auditFileDir'];
181
+ options.errorDir =
182
+ (_b = midwayLoggerConfig['errorDir']) !== null && _b !== void 0 ? _b : midwayLoggerConfig['dir'];
193
183
  }
194
184
  else {
195
185
  // 相对路径，使用默认的 dir 即可
196
186
  options.fileLogName = file;
197
187
  }
198
- // v3 logger，格式化一下 options
199
- if (isV3Logger) {
200
- transformLoggerConfig.midwayLogger.clients[name] = loggerModule['formatLegacyLoggerOptions']({
201
- level: levelTransform((_p = eggCustomLogger[name]) === null || _p === void 0 ? void 0 : _p.level),
202
- consoleLevel: levelTransform((_q = eggCustomLogger[name]) === null || _q === void 0 ? void 0 : _q.consoleLevel),
203
- ...options,
204
- });
205
- }
206
- else {
207
- transformLoggerConfig.midwayLogger.clients[name] = {
208
- level: levelTransform((_r = eggCustomLogger[name]) === null || _r === void 0 ? void 0 : _r.level),
209
- consoleLevel: levelTransform((_s = eggCustomLogger[name]) === null || _s === void 0 ? void 0 : _s.consoleLevel),
210
- ...options,
211
- };
212
- }
188
+ transformLoggerConfig.midwayLogger.clients[name] = {
189
+ level: levelTransform((_c = eggCustomLogger[name]) === null || _c === void 0 ? void 0 : _c.level),
190
+ consoleLevel: levelTransform((_d = eggCustomLogger[name]) === null || _d === void 0 ? void 0 : _d.consoleLevel),
191
+ ...options,
192
+ };
213
193
  cleanUndefinedProperty(transformLoggerConfig.midwayLogger.clients[name]);
214
194
  }
215
195
  return transformLoggerConfig;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@midwayjs/web",
3
- "version": "3.13.4-beta.2",
3
+ "version": "3.13.4-beta.4",
4
4
  "description": "Midway Web Framework for Egg.js",
5
5
  "main": "dist/index.js",
6
6
  "typings": "index.d.ts",
@@ -37,7 +37,7 @@
37
37
  "egg-socket.io": "4.1.6",
38
38
  "egg-view-nunjucks": "2.3.0",
39
39
  "fake-egg": "1.0.0",
40
- "fs-extra": "11.1.1",
40
+ "fs-extra": "11.2.0",
41
41
  "mm": "3.3.0",
42
42
  "pedding": "1.1.0",
43
43
  "react": "17.0.2",