Skip to content

Commit 35c9334

Browse files
AVVSAVVS
authoredNov 13, 2019
fix: improved logging experience (#359)
NOTE: additional tests to cover error serialization
·
microfleet@v24.0.0@microfleet/core@15.4.1
1 parent fb076f1 commit 35c9334

File tree

10 files changed

+205
-163
lines changed

10 files changed

+205
-163
lines changed
 

‎packages/core/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,13 @@
8080
"@hapi/boom": "^8.0.1",
8181
"@hapi/hapi": "^18.4.0",
8282
"@hapi/vision": "^5.5.4",
83-
"@microfleet/transport-amqp": "^15.0.0",
83+
"@microfleet/transport-amqp": "^15.1.2",
8484
"@microfleet/validation": "^8.1.2",
8585
"@sentry/node": "^5.8.0",
8686
"@types/bluebird": "^3.5.29",
8787
"@types/bluebird-retry": "^0.11.4",
8888
"@types/callsite": "^1.0.30",
89-
"@types/chai": "^4.2.4",
89+
"@types/chai": "^4.2.5",
9090
"@types/common-errors": "^1.0.0",
9191
"@types/consul": "^0.23.34",
9292
"@types/debug": "^4.1.5",
@@ -97,7 +97,7 @@
9797
"@types/hapi__hapi": "^18.2.6",
9898
"@types/ioredis": "^4.0.19",
9999
"@types/is": "^0.0.21",
100-
"@types/jest": "^24.0.22",
100+
"@types/jest": "^24.0.23",
101101
"@types/lodash.intersection": "^4.4.4",
102102
"@types/lodash.partial": "^4.2.4",
103103
"@types/node": "^12.12.7",

‎packages/core/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -396,13 +396,13 @@ export class Microfleet extends EventEmitter {
396396
for (const handler of connectors) {
397397
const pluginName = this.connectorToPlugin.get(handler)
398398
if (this.log) {
399-
this.log.info({ pluginName, connectorType }, event)
399+
this.log.info({ pluginName, connectorType, event }, 'started')
400400
}
401401

402402
responses.push(await handler.call(this))
403403

404404
if (this.log) {
405-
this.log.info({ pluginName, connectorType }, event)
405+
this.log.info({ pluginName, connectorType, event }, 'completed')
406406
}
407407
}
408408
}

‎packages/core/test/router/helpers/actions/throws.js

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
const { HttpStatusError } = require('common-errors');
2+
const { ActionTransport } = require('../../../..');
3+
4+
module.exports = function handler() {
5+
throw new HttpStatusError(202, 'ok');
6+
};
7+
8+
module.exports.transports = [ActionTransport.amqp];

‎packages/core/test/router/helpers/schemas/throws.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"$id": "action.throws"
3+
}

‎packages/core/test/suites/amqp.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ const Promise = require('bluebird');
22
const assert = require('assert');
33
const sinon = require('sinon');
44
const AMQPTransport = require('@microfleet/transport-amqp');
5-
const { inspectPromise } = require('@makeomatic/deploy');
65
const { findHealthCheck } = require('../utils');
76

87
describe('AMQP suite', function testSuite() {
@@ -46,10 +45,7 @@ describe('AMQP suite', function testSuite() {
4645
await service.amqp.close();
4746

4847
// wait a while and ask again, should throw an error
49-
await Promise.delay(5000)
50-
.then(handler)
51-
.reflect()
52-
.then(inspectPromise(false));
48+
await assert.rejects(Promise.delay(5000).then(handler));
5349

5450
// restore connection for further tests
5551
await service.amqp.connect();

‎packages/core/test/suites/router.js

+97-85
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ describe('Router suite', function testSuite() {
2727
assert(!service.router);
2828
});
2929

30-
it('should return response', function test() {
30+
it('should return response', async function test() {
3131
const service = new Microfleet({
3232
name: 'tester',
3333
amqp: {
@@ -72,6 +72,7 @@ describe('Router suite', function testSuite() {
7272
enabled: {
7373
simple: 'simple',
7474
retry: 'retry',
75+
throws: 'throws',
7576
},
7677
prefix: 'action',
7778
transports: [
@@ -101,98 +102,109 @@ describe('Router suite', function testSuite() {
101102
validator: { schemas: ['../router/helpers/schemas'] },
102103
});
103104

104-
return service
105-
.connect()
106-
.then(() => {
107-
const AMQPRequest = getAMQPRequest(service.amqp);
108-
const HTTPRequest = getHTTPRequest({ url: 'http://0.0.0.0:3000' });
109-
const socketIOClient = SocketIOClient('http://0.0.0.0:3000');
110-
const socketIORequest = getSocketIORequest(socketIOClient);
105+
await service.connect();
111106

112-
const routeNotFound = {
113-
expect: 'error',
114-
verify: (error) => {
115-
expect(error.name).to.be.equals('NotFoundError');
116-
expect(error.message).to.be.equals('Not Found: "route "not.exists" not found"');
117-
},
118-
};
107+
const AMQPRequest = getAMQPRequest(service.amqp);
108+
const HTTPRequest = getHTTPRequest({ url: 'http://0.0.0.0:3000' });
109+
const socketIOClient = SocketIOClient('http://0.0.0.0:3000');
110+
const socketIORequest = getSocketIORequest(socketIOClient);
119111

120-
const authFailed = {
121-
expect: 'error',
122-
verify: (error) => {
123-
try {
124-
expect(error.name).to.be.equals('AuthenticationRequiredError');
125-
expect(error.message).to.be.equals('An attempt was made to perform an operation without authentication: Invalid token');
126-
} catch (e) {
127-
throw error;
128-
}
129-
},
130-
};
112+
const routeNotFound = {
113+
expect: 'error',
114+
verify: (error) => {
115+
expect(error.name).to.be.equals('NotFoundError');
116+
expect(error.message).to.be.equals('Not Found: "route "not.exists" not found"');
117+
},
118+
};
131119

132-
const validationFailed = {
133-
expect: 'error',
134-
verify: (error) => {
135-
expect(error.name).to.be.equals('HttpStatusError');
136-
expect(error.message).to.be.equals('action.simple validation failed: data.isAdmin should be boolean');
137-
},
138-
};
120+
const authFailed = {
121+
expect: 'error',
122+
verify: (error) => {
123+
try {
124+
expect(error.name).to.be.equals('AuthenticationRequiredError');
125+
expect(error.message).to.be.equals('An attempt was made to perform an operation without authentication: Invalid token');
126+
} catch (e) {
127+
throw error;
128+
}
129+
},
130+
};
139131

140-
const accessDenied = {
141-
expect: 'error',
142-
verify: (error) => {
143-
expect(error.name).to.be.equals('NotPermittedError');
144-
expect(error.message).to.be.equals('An attempt was made to perform an operation that is not permitted: You are not admin');
145-
},
146-
};
132+
const validationFailed = {
133+
expect: 'error',
134+
verify: (error) => {
135+
expect(error.name).to.be.equals('HttpStatusError');
136+
expect(error.message).to.be.equals('action.simple validation failed: data.isAdmin should be boolean');
137+
},
138+
};
147139

148-
const returnsResult = {
149-
expect: 'success',
150-
verify: (result) => {
151-
expect(result.user).to.be.equals('User');
152-
expect(result.token).to.be.equals(true);
153-
expect(result.response).to.be.equals('success');
154-
},
155-
};
140+
const accessDenied = {
141+
expect: 'error',
142+
verify: (error) => {
143+
expect(error.name).to.be.equals('NotPermittedError');
144+
expect(error.message).to.be.equals('An attempt was made to perform an operation that is not permitted: You are not admin');
145+
},
146+
};
156147

157-
const retryFail = {
158-
expect: 'error',
159-
verify: (error) => {
160-
expect(error.retryAttempt).to.be.equal(5);
161-
},
162-
};
148+
const returnsResult = {
149+
expect: 'success',
150+
verify: (result) => {
151+
expect(result.user).to.be.equals('User');
152+
expect(result.token).to.be.equals(true);
153+
expect(result.response).to.be.equals('success');
154+
},
155+
};
163156

164-
const retrySuccess = {
165-
expect: 'success',
166-
verify: (result) => {
167-
expect(result).to.be.equal(3);
168-
},
169-
};
157+
const retryFail = {
158+
expect: 'error',
159+
verify: (error) => {
160+
expect(error.retryAttempt).to.be.equal(5);
161+
},
162+
};
170163

171-
return Promise
172-
.all([
173-
socketIORequest('not.exists', {}).reflect().then(verify(routeNotFound)),
174-
socketIORequest('action.simple', {}).reflect().then(verify(authFailed)),
175-
socketIORequest('action.simple', { token: true, isAdmin: 42 }).reflect().then(verify(validationFailed)),
176-
socketIORequest('action.simple', { token: true }).reflect().then(verify(accessDenied)),
177-
socketIORequest('action.simple', { token: true, isAdmin: true }).reflect().then(verify(returnsResult)),
178-
HTTPRequest('/not/exists', {}).reflect().then(verify(routeNotFound)),
179-
HTTPRequest('/action/simple', {}).reflect().then(verify(authFailed)),
180-
HTTPRequest('/action/simple', { token: true, isAdmin: 42 }).reflect().then(verify(validationFailed)),
181-
HTTPRequest('/action/simple', { token: true }).reflect().then(verify(accessDenied)),
182-
HTTPRequest('/action/simple', { token: true, isAdmin: true }).reflect().then(verify(returnsResult)),
183-
// non-existent action will be not processed by ms-amqp-transport
184-
AMQPRequest('action.simple', {}).reflect().then(verify(authFailed)),
185-
AMQPRequest('action.simple', { token: true, isAdmin: 42 }).reflect().then(verify(validationFailed)),
186-
AMQPRequest('action.simple', { token: true }).reflect().then(verify(accessDenied)),
187-
AMQPRequest('action.simple', { token: true, isAdmin: true }).reflect().then(verify(returnsResult)),
188-
AMQPRequest('action.retry', 10).reflect().then(verify(retryFail)),
189-
AMQPRequest('action.retry', 3).reflect().then(verify(retrySuccess)),
190-
])
191-
.finally(() => Promise.all([
192-
service.close(),
193-
socketIOClient.close(),
194-
]));
195-
});
164+
const retrySuccess = {
165+
expect: 'success',
166+
verify: (result) => {
167+
expect(result).to.be.equal(3);
168+
},
169+
};
170+
171+
const throwsFail = {
172+
expect: 'error',
173+
verify(error) {
174+
expect(error.name).to.be.equal('HttpStatusError');
175+
expect(error.statusCode).to.be.equal(202);
176+
},
177+
};
178+
179+
try {
180+
await Promise.all([
181+
socketIORequest('not.exists', {}).reflect().then(verify(routeNotFound)),
182+
socketIORequest('action.simple', {}).reflect().then(verify(authFailed)),
183+
socketIORequest('action.simple', { token: true, isAdmin: 42 }).reflect().then(verify(validationFailed)),
184+
socketIORequest('action.simple', { token: true }).reflect().then(verify(accessDenied)),
185+
socketIORequest('action.simple', { token: true, isAdmin: true }).reflect().then(verify(returnsResult)),
186+
187+
HTTPRequest('/not/exists', {}).reflect().then(verify(routeNotFound)),
188+
HTTPRequest('/action/simple', {}).reflect().then(verify(authFailed)),
189+
HTTPRequest('/action/simple', { token: true, isAdmin: 42 }).reflect().then(verify(validationFailed)),
190+
HTTPRequest('/action/simple', { token: true }).reflect().then(verify(accessDenied)),
191+
HTTPRequest('/action/simple', { token: true, isAdmin: true }).reflect().then(verify(returnsResult)),
192+
193+
// non-existent action will be not processed by ms-amqp-transport
194+
AMQPRequest('action.simple', {}).reflect().then(verify(authFailed)),
195+
AMQPRequest('action.simple', { token: true, isAdmin: 42 }).reflect().then(verify(validationFailed)),
196+
AMQPRequest('action.simple', { token: true }).reflect().then(verify(accessDenied)),
197+
AMQPRequest('action.simple', { token: true, isAdmin: true }).reflect().then(verify(returnsResult)),
198+
AMQPRequest('action.retry', 10).reflect().then(verify(retryFail)),
199+
AMQPRequest('action.retry', 3).reflect().then(verify(retrySuccess)),
200+
AMQPRequest('action.throws', {}).reflect().then(verify(throwsFail)),
201+
]);
202+
} finally {
203+
await Promise.all([
204+
service.close(),
205+
socketIOClient.close(),
206+
]);
207+
}
196208
});
197209

198210
it('should be able to parse query string when present & perform validation', async function test() {

‎packages/plugin-consul/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"devDependencies": {
3535
"@microfleet/core": "^15.4.0",
3636
"@types/consul": "^0.23.34",
37-
"@types/jest": "^24.0.22",
37+
"@types/jest": "^24.0.23",
3838
"jest": "^24.9.0",
3939
"rimraf": "^3.0.0",
4040
"ts-essentials": "^3.0.4",

‎packages/plugin-couchdb/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"devDependencies": {
4040
"@makeomatic/deploy": "^9.4.1",
4141
"@microfleet/core": "^15.4.0",
42-
"@types/jest": "^24.0.22",
42+
"@types/jest": "^24.0.23",
4343
"jest": "^24.9.0",
4444
"rimraf": "^3.0.0",
4545
"ts-jest": "^24.1.0"

‎packages/plugin-knex/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
},
3939
"devDependencies": {
4040
"@microfleet/core": "^15.4.0",
41-
"@types/jest": "^24.0.22",
41+
"@types/jest": "^24.0.23",
4242
"jest": "^24.9.0",
4343
"rimraf": "^3.0.0",
4444
"ts-jest": "^24.1.0"

‎yarn.lock

+88-65
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@
521521
"@hapi/cryptiles" "4.x.x"
522522
"@hapi/hoek" "8.x.x"
523523

524-
"@hapi/joi@15.x.x", "@hapi/joi@^15.1.1":
524+
"@hapi/joi@15.x.x":
525525
version "15.1.1"
526526
resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-15.1.1.tgz#c675b8a71296f02833f8d6d243b34c57b8ce19d7"
527527
integrity sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==
@@ -531,7 +531,7 @@
531531
"@hapi/hoek" "8.x.x"
532532
"@hapi/topo" "3.x.x"
533533

534-
"@hapi/joi@16.x.x":
534+
"@hapi/joi@16.x.x", "@hapi/joi@^16.1.7":
535535
version "16.1.7"
536536
resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-16.1.7.tgz#360857223a87bb1f5f67691537964c1b4908ed93"
537537
integrity sha512-anaIgnZhNooG3LJLrTFzgGALTiO97zRA1UkvQHm9KxxoSiIzCozB3RCNCpDnfhTJD72QlrHA8nwGmNgpFFCIeg==
@@ -1531,14 +1531,14 @@
15311531
debug "^3.1.0"
15321532
lodash "^4.17.10"
15331533

1534-
"@microfleet/transport-amqp@^15.0.0":
1535-
version "15.0.0"
1536-
resolved "https://registry.yarnpkg.com/@microfleet/transport-amqp/-/transport-amqp-15.0.0.tgz#440b7e7f6cf786ddbdc79b168101a14ee0a51b9b"
1537-
integrity sha512-CXU3/3LzwTKVnpF/C0mclQyXNDuzhld3BNK12xdXrXV9VDLwHEp8jZB7S6w7mziGTAD04DtCYQWsms1lDGeD2Q==
1534+
"@microfleet/transport-amqp@^15.1.2":
1535+
version "15.1.2"
1536+
resolved "https://registry.yarnpkg.com/@microfleet/transport-amqp/-/transport-amqp-15.1.2.tgz#886105e4754e4f6d5448d23581b8241aed4b02a7"
1537+
integrity sha512-LnwVbSBMghiKOoAzhLCNiAwNY07Ifvao7zPH+e/w5TM+k7U30w4+BLOFD919YXSAhYcxXgUuekLSVI9uz8JxlA==
15381538
dependencies:
1539-
"@hapi/joi" "^15.1.1"
1539+
"@hapi/joi" "^16.1.7"
15401540
"@microfleet/amqp-coffee" "^1.3.1"
1541-
bluebird "^3.5.5"
1541+
bluebird "^3.7.1"
15421542
common-errors "^1.0.5"
15431543
debug "^4.1.1"
15441544
eventemitter3 "^4.0.0"
@@ -1547,9 +1547,9 @@
15471547
is "^3.3.0"
15481548
json-stringify-safe "^5.0.1"
15491549
lodash "^4.17.15"
1550-
object-hash "^1.3.1"
1550+
object-hash "^2.0.0"
15511551
opentracing "^0.14.4"
1552-
pino "^5.13.2"
1552+
pino "^5.13.6"
15531553
uuid "^3.3.3"
15541554

15551555
"@microfleet/validation@^8.1.2":
@@ -1859,12 +1859,7 @@
18591859
dependencies:
18601860
"@types/bluebird" "*"
18611861

1862-
"@types/bluebird@*":
1863-
version "3.5.28"
1864-
resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.28.tgz#04c1a520ff076649236bc8ca21198542ce2bdb09"
1865-
integrity sha512-0Vk/kqkukxPKSzP9c8WJgisgGDx5oZDbsLLWIP5t70yThO/YleE+GEm2S1GlRALTaack3O7U5OS5qEm7q2kciA==
1866-
1867-
"@types/bluebird@^3.5.29":
1862+
"@types/bluebird@*", "@types/bluebird@^3.5.29":
18681863
version "3.5.29"
18691864
resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.29.tgz#7cd933c902c4fc83046517a1bef973886d00bdb6"
18701865
integrity sha512-kmVtnxTuUuhCET669irqQmPAez4KFnFVKvpleVRyfC3g+SHD1hIkFZcWLim9BVcwUBLO59o8VZE4yGCmTif8Yw==
@@ -1887,10 +1882,15 @@
18871882
resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.2.tgz#f65d3d6389e01eeb458bd54dc8f52b95a9463bc8"
18881883
integrity sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==
18891884

1890-
"@types/chai@^4.2.4":
1891-
version "4.2.4"
1892-
resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.4.tgz#8936cffad3c96ec470a2dc26a38c3ba8b9b6f619"
1893-
integrity sha512-7qvf9F9tMTzo0akeswHPGqgUx/gIaJqrOEET/FCD8CFRkSUHlygQiM5yB6OvjrtdxBVLSyw7COJubsFYs0683g==
1885+
"@types/chai@^4.2.5":
1886+
version "4.2.5"
1887+
resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.5.tgz#f8da153ebbe30babb0adc9a528b9ad32be3175a2"
1888+
integrity sha512-YvbLiIc0DbbhiANrfVObdkLEHJksQZVq0Uvfg550SRAKVYaEJy+V70j65BVe2WNp6E3HtKsUczeijHFCjba3og==
1889+
1890+
"@types/color-name@^1.1.1":
1891+
version "1.1.1"
1892+
resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
1893+
integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
18941894

18951895
"@types/common-errors@^1.0.0":
18961896
version "1.0.1"
@@ -2053,17 +2053,12 @@
20532053
"@types/istanbul-lib-coverage" "*"
20542054
"@types/istanbul-lib-report" "*"
20552055

2056-
"@types/jest-diff@*":
2057-
version "20.0.1"
2058-
resolved "https://registry.yarnpkg.com/@types/jest-diff/-/jest-diff-20.0.1.tgz#35cc15b9c4f30a18ef21852e255fdb02f6d59b89"
2059-
integrity sha512-yALhelO3i0hqZwhjtcr6dYyaLoCHbAMshwtj6cGxTvHZAKXHsYGdff6E8EPw3xLKY0ELUTQ69Q1rQiJENnccMA==
2060-
2061-
"@types/jest@^24.0.22":
2062-
version "24.0.22"
2063-
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.22.tgz#08a50be08e78aba850a1185626e71d31e2336145"
2064-
integrity sha512-t2OvhNZnrNjlzi2i0/cxbLVM59WN15I2r1Qtb7wDv28PnV9IzrPtagFRey/S9ezdLD0zyh1XGMQIEQND2YEfrw==
2056+
"@types/jest@^24.0.23":
2057+
version "24.0.23"
2058+
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.23.tgz#046f8e2ade026fe831623e361a36b6fb9a4463e4"
2059+
integrity sha512-L7MBvwfNpe7yVPTXLn32df/EK+AMBFAFvZrRuArGs7npEWnlziUXK+5GMIUTI4NIuwok3XibsjXCs5HxviYXjg==
20652060
dependencies:
2066-
"@types/jest-diff" "*"
2061+
jest-diff "^24.3.0"
20672062

20682063
"@types/lodash.intersection@^4.4.4":
20692064
version "4.4.6"
@@ -2232,9 +2227,9 @@ JSONStream@^1.0.4, JSONStream@^1.3.1, JSONStream@^1.3.4, JSONStream@^1.3.5:
22322227
through ">=2.2.7 <3"
22332228

22342229
abab@^2.0.0:
2235-
version "2.0.2"
2236-
resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.2.tgz#a2fba1b122c69a85caa02d10f9270c7219709a9d"
2237-
integrity sha512-2scffjvioEmNz0OyDSLGWDfKCVwaKc6l9Pm9kOIREU13ClXZvHpg/nRL5xyjSSSLhOnXqft2HpsAzNEEA8cFFg==
2230+
version "2.0.3"
2231+
resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
2232+
integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
22382233

22392234
abbrev@1, abbrev@~1.1.1:
22402235
version "1.1.1"
@@ -2394,10 +2389,11 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
23942389
color-convert "^1.9.0"
23952390

23962391
ansi-styles@^4.1.0:
2397-
version "4.1.0"
2398-
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.1.0.tgz#d3ba8047b818293eaaa7978321dd61bff9842cfc"
2399-
integrity sha512-Qts4KCLKG+waHc9C4m07weIY8qyeixoS0h6RnbsNVD6Fw+pEZGW3vTyObL3WXpE09Mq4Oi7/lBEyLmOiLtlYWQ==
2392+
version "4.2.0"
2393+
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.0.tgz#5681f0dcf7ae5880a7841d8831c4724ed9cc0172"
2394+
integrity sha512-7kFQgnEaMdRtwf6uSfUnVr9gSGC7faurn+J/Mv90/W+iTtN0405/nLdopfMWwchyxhbGYl6TC4Sccn9TUkGAgg==
24002395
dependencies:
2396+
"@types/color-name" "^1.1.1"
24012397
color-convert "^2.0.1"
24022398

24032399
ansicolors@~0.3.2:
@@ -3952,7 +3948,7 @@ debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
39523948
dependencies:
39533949
ms "2.0.0"
39543950

3955-
debuglog@^1.0.1:
3951+
debuglog@*, debuglog@^1.0.1:
39563952
version "1.0.1"
39573953
resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
39583954
integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
@@ -4719,9 +4715,9 @@ execa@^1.0.0:
47194715
strip-eof "^1.0.0"
47204716

47214717
execa@^3.2.0:
4722-
version "3.2.0"
4723-
resolved "https://registry.yarnpkg.com/execa/-/execa-3.2.0.tgz#18326b79c7ab7fbd6610fd900c1b9e95fa48f90a"
4724-
integrity sha512-kJJfVbI/lZE1PZYDI5VPxp8zXPO9rtxOkhpZ0jMKha56AI9y2gGVC6bkukStQf0ka5Rh15BA5m7cCCH4jmHqkw==
4718+
version "3.3.0"
4719+
resolved "https://registry.yarnpkg.com/execa/-/execa-3.3.0.tgz#7e348eef129a1937f21ecbbd53390942653522c1"
4720+
integrity sha512-j5Vit5WZR/cbHlqU97+qcnw9WHRCIL4V1SVe75VcHcD1JRBdt8fv0zw89b7CQHQdUHTt2VjuhcF5ibAgVOxqpg==
47254721
dependencies:
47264722
cross-spawn "^7.0.0"
47274723
get-stream "^5.0.0"
@@ -5879,7 +5875,7 @@ import-modules@^2.0.0:
58795875
resolved "https://registry.yarnpkg.com/import-modules/-/import-modules-2.0.0.tgz#9c1e13b4e7a15682f70a6e3fa29534e4540cfc5d"
58805876
integrity sha512-iczM/v9drffdNnABOKwj0f9G3cFDon99VcG1mxeBsdqnbd+vnQ5c2uAiCHNQITqFTOPaEvwg3VjoWCur0uHLEw==
58815877

5882-
imurmurhash@^0.1.4:
5878+
imurmurhash@*, imurmurhash@^0.1.4:
58835879
version "0.1.4"
58845880
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
58855881
integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
@@ -6507,7 +6503,7 @@ jest-config@^24.9.0:
65076503
pretty-format "^24.9.0"
65086504
realpath-native "^1.1.0"
65096505

6510-
jest-diff@^24.9.0:
6506+
jest-diff@^24.3.0, jest-diff@^24.9.0:
65116507
version "24.9.0"
65126508
resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da"
65136509
integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==
@@ -7304,6 +7300,11 @@ lockfile@^1.0.4:
73047300
dependencies:
73057301
signal-exit "^3.0.2"
73067302

7303+
lodash._baseindexof@*:
7304+
version "3.1.0"
7305+
resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
7306+
integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw=
7307+
73077308
lodash._baseuniq@~4.6.0:
73087309
version "4.6.0"
73097310
resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
@@ -7312,11 +7313,33 @@ lodash._baseuniq@~4.6.0:
73127313
lodash._createset "~4.0.0"
73137314
lodash._root "~3.0.0"
73147315

7316+
lodash._bindcallback@*:
7317+
version "3.0.1"
7318+
resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
7319+
integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=
7320+
7321+
lodash._cacheindexof@*:
7322+
version "3.0.2"
7323+
resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
7324+
integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI=
7325+
7326+
lodash._createcache@*:
7327+
version "3.1.2"
7328+
resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
7329+
integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM=
7330+
dependencies:
7331+
lodash._getnative "^3.0.0"
7332+
73157333
lodash._createset@~4.0.0:
73167334
version "4.0.3"
73177335
resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
73187336
integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY=
73197337

7338+
lodash._getnative@*, lodash._getnative@^3.0.0:
7339+
version "3.9.1"
7340+
resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
7341+
integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
7342+
73207343
lodash._reinterpolate@^3.0.0:
73217344
version "3.0.0"
73227345
resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
@@ -7422,6 +7445,11 @@ lodash.reduce@^4.6.0:
74227445
resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b"
74237446
integrity sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=
74247447

7448+
lodash.restparam@*:
7449+
version "3.6.1"
7450+
resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
7451+
integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
7452+
74257453
lodash.set@^4.3.2:
74267454
version "4.3.2"
74277455
resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23"
@@ -7775,22 +7803,17 @@ micromatch@^4.0.2:
77757803
braces "^3.0.1"
77767804
picomatch "^2.0.5"
77777805

7778-
mime-db@1.40.0:
7779-
version "1.40.0"
7780-
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
7781-
integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
7782-
7783-
mime-db@1.x.x:
7806+
mime-db@1.42.0, mime-db@1.x.x:
77847807
version "1.42.0"
77857808
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz#3e252907b4c7adb906597b4b65636272cf9e7bac"
77867809
integrity sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==
77877810

77887811
mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24:
7789-
version "2.1.24"
7790-
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
7791-
integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
7812+
version "2.1.25"
7813+
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.25.tgz#39772d46621f93e2a80a856c53b86a62156a6437"
7814+
integrity sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==
77927815
dependencies:
7793-
mime-db "1.40.0"
7816+
mime-db "1.42.0"
77947817

77957818
mime@^2.4.3:
77967819
version "2.4.4"
@@ -7985,9 +8008,9 @@ ms@^2.0.0, ms@^2.1.1:
79858008
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
79868009

79878010
multimap@^1.0.2:
7988-
version "1.0.2"
7989-
resolved "https://registry.yarnpkg.com/multimap/-/multimap-1.0.2.tgz#6aa76fc3233905ba948bbe4c74dc2c3a0356eb36"
7990-
integrity sha1-aqdvwyM5BbqUi75MdNwsOgNW6zY=
8011+
version "1.1.0"
8012+
resolved "https://registry.yarnpkg.com/multimap/-/multimap-1.1.0.tgz#5263febc085a1791c33b59bb3afc6a76a2a10ca8"
8013+
integrity sha512-0ZIR9PasPxGXmRsEF8jsDzndzHDj7tIav+JUmvIFB/WHswliFnquxECT/De7GR4yg99ky/NlRKJT82G1y271bw==
79918014

79928015
multimatch@^3.0.0:
79938016
version "3.0.0"
@@ -8562,10 +8585,10 @@ object-hash@1.1.4:
85628585
resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.1.4.tgz#136f07f1a48af5f6b906812451ae4e43978c94aa"
85638586
integrity sha1-E28H8aSK9fa5BoEkUa5OQ5eMlKo=
85648587

8565-
object-hash@^1.3.1:
8566-
version "1.3.1"
8567-
resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df"
8568-
integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==
8588+
object-hash@^2.0.0:
8589+
version "2.0.0"
8590+
resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.0.0.tgz#7c4cc341eb8b53367312a7c546142f00c9e0ea20"
8591+
integrity sha512-I7zGBH0rDKwVGeGZpZoFaDhIwvJa3l1CZE+8VchylXbInNiCj7sxxea9P5dTM4ftKR5//nrqxrdeGSTWL2VpBA==
85698592

85708593
object-inspect@^1.6.0:
85718594
version "1.7.0"
@@ -9548,9 +9571,9 @@ qs@~6.5.2:
95489571
integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
95499572

95509573
query-string@^6.8.2:
9551-
version "6.8.3"
9552-
resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.8.3.tgz#fd9fb7ffb068b79062b43383685611ee47777d4b"
9553-
integrity sha512-llcxWccnyaWlODe7A9hRjkvdCKamEKTh+wH8ITdTc3OhchaqUZteiSCX/2ablWHVrkVIe04dntnaZJ7BdyW0lQ==
9574+
version "6.9.0"
9575+
resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.9.0.tgz#1c3b727c370cf00f177c99f328fda2108f8fa3dd"
9576+
integrity sha512-KG4bhCFYapExLsUHrFt+kQVEegF2agm4cpF/VNc6pZVthIfCc/GK8t8VyNIE3nyXG9DK3Tf2EGkxjR6/uRdYsA==
95549577
dependencies:
95559578
decode-uri-component "^0.2.0"
95569579
split-on-first "^1.0.0"
@@ -11384,9 +11407,9 @@ typescript@^3.7.2:
1138411407
integrity sha512-ml7V7JfiN2Xwvcer+XAf2csGO1bPBdRbFCkYBczNZggrBZ9c7G3riSUeJmqEU5uOtXNPMhE3n+R4FA/3YOAWOQ==
1138511408

1138611409
uglify-js@^3.1.4:
11387-
version "3.6.8"
11388-
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.8.tgz#5edcbcf9d49cbb0403dc49f856fe81530d65145e"
11389-
integrity sha512-XhHJ3S3ZyMwP8kY1Gkugqx3CJh2C3O0y8NPiSxtm1tyD/pktLAkFZsFGpuNfTZddKDQ/bbDBLAd2YyA1pbi8HQ==
11410+
version "3.6.9"
11411+
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.9.tgz#85d353edb6ddfb62a9d798f36e91792249320611"
11412+
integrity sha512-pcnnhaoG6RtrvHJ1dFncAe8Od6Nuy30oaJ82ts6//sGSXOP5UjBMEthiProjXmMNHOfd93sqlkztifFMcb+4yw==
1139011413
dependencies:
1139111414
commander "~2.20.3"
1139211415
source-map "~0.6.1"

0 commit comments

Comments
 (0)
Please sign in to comment.