@eggjs/onerror 4.0.0-beta.19 → 4.0.0-beta.21
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.
- package/dist/agent.d.ts +5 -9
- package/dist/agent.js +13 -15
- package/dist/app.d.ts +10 -14
- package/dist/app.js +140 -110
- package/dist/config/config.default.d.ts +24 -27
- package/dist/config/config.default.js +9 -11
- package/dist/index.d.ts +1 -1
- package/dist/index.js +2 -1
- package/dist/lib/error_view.d.ts +149 -153
- package/dist/lib/error_view.js +239 -222
- package/dist/lib/utils.d.ts +6 -10
- package/dist/lib/utils.js +25 -17
- package/dist/types.d.ts +5 -7
- package/dist/types.js +2 -1
- package/package.json +4 -4
package/dist/lib/error_view.js
CHANGED
|
@@ -1,224 +1,241 @@
|
|
|
1
|
+
// modify from https://github.com/poppinss/youch/blob/develop/src/Youch/index.js
|
|
2
|
+
import fs from 'node:fs';
|
|
3
|
+
import path from 'node:path';
|
|
4
|
+
import util from 'node:util';
|
|
5
|
+
import { parse } from 'cookie';
|
|
6
|
+
import Mustache from 'mustache';
|
|
7
|
+
import stackTrace, {} from 'stack-trace';
|
|
1
8
|
import { detectErrorMessage } from "./utils.js";
|
|
2
|
-
import fs from "node:fs";
|
|
3
|
-
import path from "node:path";
|
|
4
|
-
import util from "node:util";
|
|
5
|
-
import { parse } from "cookie";
|
|
6
|
-
import Mustache from "mustache";
|
|
7
|
-
import stackTrace from "stack-trace";
|
|
8
|
-
|
|
9
|
-
//#region src/lib/error_view.ts
|
|
10
9
|
const startingSlashRegex = /\\|\//;
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
10
|
+
export class ErrorView {
|
|
11
|
+
ctx;
|
|
12
|
+
error;
|
|
13
|
+
request;
|
|
14
|
+
app;
|
|
15
|
+
assets;
|
|
16
|
+
viewTemplate;
|
|
17
|
+
codeContext = 5;
|
|
18
|
+
_filterHeaders = ['cookie', 'connection'];
|
|
19
|
+
constructor(ctx, error, template) {
|
|
20
|
+
this.ctx = ctx;
|
|
21
|
+
this.error = error;
|
|
22
|
+
this.request = ctx.request;
|
|
23
|
+
this.app = ctx.app;
|
|
24
|
+
this.assets = new Map();
|
|
25
|
+
this.viewTemplate = template;
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* get html error page
|
|
29
|
+
*
|
|
30
|
+
* @return {String} html page
|
|
31
|
+
*/
|
|
32
|
+
toHTML() {
|
|
33
|
+
const stack = this.parseError();
|
|
34
|
+
const data = this.serializeData(stack, (frame, index) => {
|
|
35
|
+
const serializedFrame = this.serializeFrame(frame);
|
|
36
|
+
serializedFrame.classes = this.getFrameClasses(frame, index);
|
|
37
|
+
return serializedFrame;
|
|
38
|
+
});
|
|
39
|
+
return this.compileView(this.viewTemplate, {
|
|
40
|
+
...data,
|
|
41
|
+
appInfo: this.serializeAppInfo(),
|
|
42
|
+
request: this.serializeRequest(),
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
/**
|
|
46
|
+
* compile view
|
|
47
|
+
*
|
|
48
|
+
* @param {String} tpl - template
|
|
49
|
+
* @param {Object} locals - data used by template
|
|
50
|
+
*/
|
|
51
|
+
compileView(tpl, locals) {
|
|
52
|
+
return Mustache.render(tpl, locals);
|
|
53
|
+
}
|
|
54
|
+
/**
|
|
55
|
+
* check if the frame is node native file.
|
|
56
|
+
*
|
|
57
|
+
* @param {Frame} frame - current frame
|
|
58
|
+
*/
|
|
59
|
+
isNode(frame) {
|
|
60
|
+
if (frame.isNative()) {
|
|
61
|
+
return true;
|
|
62
|
+
}
|
|
63
|
+
const filename = frame.getFileName() || '';
|
|
64
|
+
return !path.isAbsolute(filename) && filename[0] !== '.';
|
|
65
|
+
}
|
|
66
|
+
/**
|
|
67
|
+
* check if the frame is app modules.
|
|
68
|
+
*
|
|
69
|
+
* @param {Object} frame - current frame
|
|
70
|
+
*/
|
|
71
|
+
isApp(frame) {
|
|
72
|
+
if (this.isNode(frame)) {
|
|
73
|
+
return false;
|
|
74
|
+
}
|
|
75
|
+
const filename = frame.getFileName() || '';
|
|
76
|
+
return !filename.includes('node_modules' + path.sep);
|
|
77
|
+
}
|
|
78
|
+
/**
|
|
79
|
+
* cache file asserts
|
|
80
|
+
*
|
|
81
|
+
* @param {String} key - assert key
|
|
82
|
+
* @param {String} value - assert content
|
|
83
|
+
*/
|
|
84
|
+
setAssets(key, value) {
|
|
85
|
+
this.assets.set(key, value);
|
|
86
|
+
}
|
|
87
|
+
/**
|
|
88
|
+
* get cache file asserts
|
|
89
|
+
*
|
|
90
|
+
* @param {String} key - assert key
|
|
91
|
+
*/
|
|
92
|
+
getAssets(key) {
|
|
93
|
+
return this.assets.get(key);
|
|
94
|
+
}
|
|
95
|
+
/**
|
|
96
|
+
* get frame source
|
|
97
|
+
*
|
|
98
|
+
* @param {Object} frame - current frame
|
|
99
|
+
*/
|
|
100
|
+
getFrameSource(frame) {
|
|
101
|
+
const filename = frame.getFileName();
|
|
102
|
+
const lineNumber = frame.getLineNumber();
|
|
103
|
+
let contents = this.getAssets(filename);
|
|
104
|
+
if (!contents) {
|
|
105
|
+
contents = fs.existsSync(filename) ? fs.readFileSync(filename, 'utf8') : '';
|
|
106
|
+
this.setAssets(filename, contents);
|
|
107
|
+
}
|
|
108
|
+
const lines = contents.split(/\r?\n/);
|
|
109
|
+
return {
|
|
110
|
+
pre: lines.slice(Math.max(0, lineNumber - (this.codeContext + 1)), lineNumber - 1),
|
|
111
|
+
line: lines[lineNumber - 1],
|
|
112
|
+
post: lines.slice(lineNumber, lineNumber + this.codeContext),
|
|
113
|
+
};
|
|
114
|
+
}
|
|
115
|
+
/**
|
|
116
|
+
* parse error and return frame stack
|
|
117
|
+
*/
|
|
118
|
+
parseError() {
|
|
119
|
+
const stack = stackTrace.parse(this.error);
|
|
120
|
+
return stack.map((frame) => {
|
|
121
|
+
if (!this.isNode(frame)) {
|
|
122
|
+
frame.context = this.getFrameSource(frame);
|
|
123
|
+
}
|
|
124
|
+
return frame;
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
/**
|
|
128
|
+
* get stack context
|
|
129
|
+
*
|
|
130
|
+
* @param {Object} frame - current frame
|
|
131
|
+
*/
|
|
132
|
+
getContext(frame) {
|
|
133
|
+
if (!frame.context) {
|
|
134
|
+
return {};
|
|
135
|
+
}
|
|
136
|
+
return {
|
|
137
|
+
start: frame.getLineNumber() - (frame.context.pre || []).length,
|
|
138
|
+
pre: frame.context.pre.join('\n'),
|
|
139
|
+
line: frame.context.line,
|
|
140
|
+
post: frame.context.post.join('\n'),
|
|
141
|
+
};
|
|
142
|
+
}
|
|
143
|
+
/**
|
|
144
|
+
* get frame classes, let view identify the frame
|
|
145
|
+
*
|
|
146
|
+
* @param {any} frame - current frame
|
|
147
|
+
* @param {any} index - current index
|
|
148
|
+
*/
|
|
149
|
+
getFrameClasses(frame, index) {
|
|
150
|
+
const classes = [];
|
|
151
|
+
if (index === 0) {
|
|
152
|
+
classes.push('active');
|
|
153
|
+
}
|
|
154
|
+
if (!this.isApp(frame)) {
|
|
155
|
+
classes.push('native-frame');
|
|
156
|
+
}
|
|
157
|
+
return classes.join(' ');
|
|
158
|
+
}
|
|
159
|
+
/**
|
|
160
|
+
* serialize frame and return meaningful data
|
|
161
|
+
*
|
|
162
|
+
* @param {Object} frame - current frame
|
|
163
|
+
*/
|
|
164
|
+
serializeFrame(frame) {
|
|
165
|
+
const filename = frame.getFileName();
|
|
166
|
+
const relativeFileName = filename.includes(process.cwd())
|
|
167
|
+
? filename.replace(process.cwd(), '').replace(startingSlashRegex, '')
|
|
168
|
+
: filename;
|
|
169
|
+
const extname = path.extname(filename).replace('.', '');
|
|
170
|
+
return {
|
|
171
|
+
extname,
|
|
172
|
+
file: relativeFileName,
|
|
173
|
+
method: frame.getFunctionName(),
|
|
174
|
+
line: frame.getLineNumber(),
|
|
175
|
+
column: frame.getColumnNumber(),
|
|
176
|
+
context: this.getContext(frame),
|
|
177
|
+
classes: '',
|
|
178
|
+
};
|
|
179
|
+
}
|
|
180
|
+
/**
|
|
181
|
+
* serialize base data
|
|
182
|
+
*
|
|
183
|
+
* @param {Object} stack - frame stack
|
|
184
|
+
* @param {Function} frameFormatter - frame formatter function
|
|
185
|
+
*/
|
|
186
|
+
serializeData(stack, frameFormatter) {
|
|
187
|
+
const code = Reflect.get(this.error, 'code') ?? Reflect.get(this.error, 'type');
|
|
188
|
+
let message = detectErrorMessage(this.ctx, this.error);
|
|
189
|
+
if (code) {
|
|
190
|
+
message = `${message} (code: ${code})`;
|
|
191
|
+
}
|
|
192
|
+
return {
|
|
193
|
+
code,
|
|
194
|
+
message,
|
|
195
|
+
name: this.error.name,
|
|
196
|
+
status: this.error.status,
|
|
197
|
+
frames: stack instanceof Array ? stack.filter(frame => frame.getFileName()).map(frameFormatter) : [],
|
|
198
|
+
};
|
|
199
|
+
}
|
|
200
|
+
/**
|
|
201
|
+
* serialize request object
|
|
202
|
+
*/
|
|
203
|
+
serializeRequest() {
|
|
204
|
+
const headers = [];
|
|
205
|
+
Object.keys(this.request.headers).forEach(key => {
|
|
206
|
+
if (this._filterHeaders.includes(key)) {
|
|
207
|
+
return;
|
|
208
|
+
}
|
|
209
|
+
headers.push({
|
|
210
|
+
key,
|
|
211
|
+
value: this.request.headers[key],
|
|
212
|
+
});
|
|
213
|
+
});
|
|
214
|
+
const parsedCookies = parse(this.request.headers.cookie || '');
|
|
215
|
+
const cookies = Object.keys(parsedCookies).map(key => {
|
|
216
|
+
return { key, value: parsedCookies[key] };
|
|
217
|
+
});
|
|
218
|
+
return {
|
|
219
|
+
url: this.request.url,
|
|
220
|
+
httpVersion: this.request.req.httpVersion,
|
|
221
|
+
method: this.request.method,
|
|
222
|
+
connection: this.request.headers.connection,
|
|
223
|
+
headers,
|
|
224
|
+
cookies,
|
|
225
|
+
};
|
|
226
|
+
}
|
|
227
|
+
/**
|
|
228
|
+
* serialize app info object
|
|
229
|
+
*/
|
|
230
|
+
serializeAppInfo() {
|
|
231
|
+
let config = this.app.config;
|
|
232
|
+
if ('dumpConfigToObject' in this.app && typeof this.app.dumpConfigToObject === 'function') {
|
|
233
|
+
config = this.app.dumpConfigToObject().config.config;
|
|
234
|
+
}
|
|
235
|
+
return {
|
|
236
|
+
baseDir: this.app.config.baseDir,
|
|
237
|
+
config: util.inspect(config),
|
|
238
|
+
};
|
|
239
|
+
}
|
|
240
|
+
}
|
|
241
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"error_view.js","sourceRoot":"","sources":["../../src/lib/error_view.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/utils.d.ts
CHANGED
|
@@ -1,10 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
declare function
|
|
6
|
-
declare function
|
|
7
|
-
declare function accepts(ctx: Context): "json" | "js" | "html";
|
|
8
|
-
declare function isProd(app: Application): boolean;
|
|
9
|
-
//#endregion
|
|
10
|
-
export { accepts, detectErrorMessage, detectStatus, isProd };
|
|
1
|
+
import type { Context, Application } from 'egg';
|
|
2
|
+
import type { OnerrorError } from 'koa-onerror';
|
|
3
|
+
export declare function detectErrorMessage(ctx: Context, err: OnerrorError): string;
|
|
4
|
+
export declare function detectStatus(err: OnerrorError): number;
|
|
5
|
+
export declare function accepts(ctx: Context): "html" | "json" | "js";
|
|
6
|
+
export declare function isProd(app: Application): boolean;
|
package/dist/lib/utils.js
CHANGED
|
@@ -1,21 +1,29 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
export function detectErrorMessage(ctx, err) {
|
|
2
|
+
// detect json parse error
|
|
3
|
+
if (err.status === 400 &&
|
|
4
|
+
err.name === 'SyntaxError' &&
|
|
5
|
+
ctx.request.is('application/json', 'application/vnd.api+json', 'application/csp-report')) {
|
|
6
|
+
return 'Problems parsing JSON';
|
|
7
|
+
}
|
|
8
|
+
return err.message;
|
|
5
9
|
}
|
|
6
|
-
function detectStatus(err) {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
+
export function detectStatus(err) {
|
|
11
|
+
// detect status
|
|
12
|
+
let status = err.status || 500;
|
|
13
|
+
if (status < 200) {
|
|
14
|
+
// invalid status consider as 500, like urllib will return -1 status
|
|
15
|
+
status = 500;
|
|
16
|
+
}
|
|
17
|
+
return status;
|
|
10
18
|
}
|
|
11
|
-
function accepts(ctx) {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
19
|
+
export function accepts(ctx) {
|
|
20
|
+
if (ctx.acceptJSON)
|
|
21
|
+
return 'json';
|
|
22
|
+
if (ctx.acceptJSONP)
|
|
23
|
+
return 'js';
|
|
24
|
+
return 'html';
|
|
15
25
|
}
|
|
16
|
-
function isProd(app) {
|
|
17
|
-
|
|
26
|
+
export function isProd(app) {
|
|
27
|
+
return app.config.env !== 'local' && app.config.env !== 'unittest';
|
|
18
28
|
}
|
|
19
|
-
|
|
20
|
-
//#endregion
|
|
21
|
-
export { accepts, detectErrorMessage, detectStatus, isProd };
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE1BQU0sVUFBVSxrQkFBa0IsQ0FBQyxHQUFZLEVBQUUsR0FBaUI7SUFDaEUsMEJBQTBCO0lBQzFCLElBQ0UsR0FBRyxDQUFDLE1BQU0sS0FBSyxHQUFHO1FBQ2xCLEdBQUcsQ0FBQyxJQUFJLEtBQUssYUFBYTtRQUMxQixHQUFHLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxrQkFBa0IsRUFBRSwwQkFBMEIsRUFBRSx3QkFBd0IsQ0FBQyxFQUN4RixDQUFDO1FBQ0QsT0FBTyx1QkFBdUIsQ0FBQztJQUNqQyxDQUFDO0lBQ0QsT0FBTyxHQUFHLENBQUMsT0FBTyxDQUFDO0FBQ3JCLENBQUM7QUFFRCxNQUFNLFVBQVUsWUFBWSxDQUFDLEdBQWlCO0lBQzVDLGdCQUFnQjtJQUNoQixJQUFJLE1BQU0sR0FBRyxHQUFHLENBQUMsTUFBTSxJQUFJLEdBQUcsQ0FBQztJQUMvQixJQUFJLE1BQU0sR0FBRyxHQUFHLEVBQUUsQ0FBQztRQUNqQixvRUFBb0U7UUFDcEUsTUFBTSxHQUFHLEdBQUcsQ0FBQztJQUNmLENBQUM7SUFDRCxPQUFPLE1BQU0sQ0FBQztBQUNoQixDQUFDO0FBRUQsTUFBTSxVQUFVLE9BQU8sQ0FBQyxHQUFZO0lBQ2xDLElBQUksR0FBRyxDQUFDLFVBQVU7UUFBRSxPQUFPLE1BQU0sQ0FBQztJQUNsQyxJQUFJLEdBQUcsQ0FBQyxXQUFXO1FBQUUsT0FBTyxJQUFJLENBQUM7SUFDakMsT0FBTyxNQUFNLENBQUM7QUFDaEIsQ0FBQztBQUVELE1BQU0sVUFBVSxNQUFNLENBQUMsR0FBZ0I7SUFDckMsT0FBTyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsS0FBSyxPQUFPLElBQUksR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLEtBQUssVUFBVSxDQUFDO0FBQ3JFLENBQUMifQ==
|
package/dist/types.d.ts
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
import { OnerrorConfig } from
|
|
2
|
-
|
|
3
|
-
//#region src/types.d.ts
|
|
1
|
+
import type { OnerrorConfig } from './config/config.default.ts';
|
|
4
2
|
declare module 'egg' {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
}
|
|
3
|
+
interface EggAppConfig {
|
|
4
|
+
onerror: OnerrorConfig;
|
|
5
|
+
}
|
|
6
|
+
}
|
package/dist/types.js
CHANGED
|
@@ -1 +1,2 @@
|
|
|
1
|
-
export {
|
|
1
|
+
export {};
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eggjs/onerror",
|
|
3
|
-
"version": "4.0.0-beta.
|
|
3
|
+
"version": "4.0.0-beta.21",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"stack-trace": "^0.0.10"
|
|
34
34
|
},
|
|
35
35
|
"peerDependencies": {
|
|
36
|
-
"egg": "4.1.0-beta.
|
|
36
|
+
"egg": "4.1.0-beta.21"
|
|
37
37
|
},
|
|
38
38
|
"devDependencies": {
|
|
39
39
|
"@types/mustache": "^4.2.5",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"tsdown": "^0.15.4",
|
|
42
42
|
"typescript": "^5.9.3",
|
|
43
43
|
"vitest": "4.0.0-beta.16",
|
|
44
|
-
"@eggjs/mock": "7.0.0-beta.
|
|
44
|
+
"@eggjs/mock": "7.0.0-beta.21"
|
|
45
45
|
},
|
|
46
46
|
"type": "module",
|
|
47
47
|
"exports": {
|
|
@@ -64,6 +64,6 @@
|
|
|
64
64
|
"lint": "oxlint --type-aware",
|
|
65
65
|
"typecheck": "tsc --noEmit",
|
|
66
66
|
"test": "vitest run",
|
|
67
|
-
"build": "tsdown"
|
|
67
|
+
"build": "tsdown && rimraf dist && tsc -b --clean && tsc && cp src/lib/onerror_page.mustache.html dist/lib/onerror_page.mustache.html"
|
|
68
68
|
}
|
|
69
69
|
}
|