Skip to content

Commit 7cd20bb

Browse files
committed
Merge branch 'main' into mafredri/feat-add-template-push-message
2 parents 960e5d1 + a33a255 commit 7cd20bb

File tree

8 files changed

+619
-1254
lines changed

8 files changed

+619
-1254
lines changed

.github/actions/setup-node/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ runs:
66
steps:
77
- uses: buildjet/setup-node@v3
88
with:
9-
node-version: 16.16.0
9+
node-version: 16.20.1
1010
# See https://github.com/actions/setup-node#caching-global-packages-data
1111
cache: "yarn"
1212
cache-dependency-path: "site/yarn.lock"

.github/workflows/ci.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,7 @@ jobs:
192192
- name: Checkout
193193
uses: actions/checkout@v3
194194

195-
- uses: buildjet/setup-node@v3
196-
with:
197-
node-version: 16.16.0
195+
- uses: ./.github/actions/setup-node
198196

199197
- uses: buildjet/setup-go@v4
200198
with:

enterprise/audit/table.go

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ package audit
22

33
import (
44
"fmt"
5+
"os"
56
"reflect"
7+
"runtime"
68

79
"github.com/coder/coder/coderd/database"
810
"github.com/coder/coder/codersdk"
@@ -236,7 +238,9 @@ func entry(v any, f map[string]Action) (string, map[string]Action) {
236238
continue
237239
}
238240
if _, ok := fcpy[jsonTag]; !ok {
239-
panic(fmt.Sprintf("audit table entry missing action for field %q in type %q", d.FieldType.Name, name))
241+
_, _ = fmt.Fprintf(os.Stderr, "ERROR: Audit table entry missing action for field %q in type %q\nPlease update the auditable resource types in: %s\n", d.FieldType.Name, name, self())
242+
//nolint:revive
243+
os.Exit(1)
240244
}
241245
delete(fcpy, jsonTag)
242246
}
@@ -253,3 +257,9 @@ func entry(v any, f map[string]Action) (string, map[string]Action) {
253257
func (t Action) String() string {
254258
return string(t)
255259
}
260+
261+
func self() string {
262+
//nolint:dogsled
263+
_, file, _, _ := runtime.Caller(1)
264+
return file
265+
}

pty/ptytest/ptytest.go

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@ func (e *outExpecter) ExpectMatchContext(ctx context.Context, str string) string
158158
e.t.Helper()
159159

160160
var buffer bytes.Buffer
161-
err := e.doMatchWithDeadline(ctx, "ExpectMatchContext", func() error {
161+
err := e.doMatchWithDeadline(ctx, "ExpectMatchContext", func(rd *bufio.Reader) error {
162162
for {
163-
r, _, err := e.runeReader.ReadRune()
163+
r, _, err := rd.ReadRune()
164164
if err != nil {
165165
return err
166166
}
@@ -186,9 +186,9 @@ func (e *outExpecter) ExpectNoMatchBefore(ctx context.Context, match, before str
186186
e.t.Helper()
187187

188188
var buffer bytes.Buffer
189-
err := e.doMatchWithDeadline(ctx, "ExpectNoMatchBefore", func() error {
189+
err := e.doMatchWithDeadline(ctx, "ExpectNoMatchBefore", func(rd *bufio.Reader) error {
190190
for {
191-
r, _, err := e.runeReader.ReadRune()
191+
r, _, err := rd.ReadRune()
192192
if err != nil {
193193
return err
194194
}
@@ -218,9 +218,9 @@ func (e *outExpecter) Peek(ctx context.Context, n int) []byte {
218218
e.t.Helper()
219219

220220
var out []byte
221-
err := e.doMatchWithDeadline(ctx, "Peek", func() error {
221+
err := e.doMatchWithDeadline(ctx, "Peek", func(rd *bufio.Reader) error {
222222
var err error
223-
out, err = e.runeReader.Peek(n)
223+
out, err = rd.Peek(n)
224224
return err
225225
})
226226
if err != nil {
@@ -235,9 +235,9 @@ func (e *outExpecter) ReadRune(ctx context.Context) rune {
235235
e.t.Helper()
236236

237237
var r rune
238-
err := e.doMatchWithDeadline(ctx, "ReadRune", func() error {
238+
err := e.doMatchWithDeadline(ctx, "ReadRune", func(rd *bufio.Reader) error {
239239
var err error
240-
r, _, err = e.runeReader.ReadRune()
240+
r, _, err = rd.ReadRune()
241241
return err
242242
})
243243
if err != nil {
@@ -252,9 +252,9 @@ func (e *outExpecter) ReadLine(ctx context.Context) string {
252252
e.t.Helper()
253253

254254
var buffer bytes.Buffer
255-
err := e.doMatchWithDeadline(ctx, "ReadLine", func() error {
255+
err := e.doMatchWithDeadline(ctx, "ReadLine", func(rd *bufio.Reader) error {
256256
for {
257-
r, _, err := e.runeReader.ReadRune()
257+
r, _, err := rd.ReadRune()
258258
if err != nil {
259259
return err
260260
}
@@ -267,14 +267,14 @@ func (e *outExpecter) ReadLine(ctx context.Context) string {
267267

268268
// Unicode code points can be up to 4 bytes, but the
269269
// ones we're looking for are only 1 byte.
270-
b, _ := e.runeReader.Peek(1)
270+
b, _ := rd.Peek(1)
271271
if len(b) == 0 {
272272
return nil
273273
}
274274

275275
r, _ = utf8.DecodeRune(b)
276276
if r == '\n' {
277-
_, _, err = e.runeReader.ReadRune()
277+
_, _, err = rd.ReadRune()
278278
if err != nil {
279279
return err
280280
}
@@ -297,7 +297,7 @@ func (e *outExpecter) ReadLine(ctx context.Context) string {
297297
return buffer.String()
298298
}
299299

300-
func (e *outExpecter) doMatchWithDeadline(ctx context.Context, name string, fn func() error) error {
300+
func (e *outExpecter) doMatchWithDeadline(ctx context.Context, name string, fn func(*bufio.Reader) error) error {
301301
e.t.Helper()
302302

303303
// A timeout is mandatory, caller can decide by passing a context
@@ -314,14 +314,15 @@ func (e *outExpecter) doMatchWithDeadline(ctx context.Context, name string, fn f
314314
match := make(chan error, 1)
315315
go func() {
316316
defer close(match)
317-
match <- fn()
317+
match <- fn(e.runeReader)
318318
}()
319319
select {
320320
case err := <-match:
321321
return err
322322
case <-ctx.Done():
323-
// Ensure goroutine is cleaned up before test exit.
324-
_ = e.close("match deadline exceeded")
323+
// Ensure goroutine is cleaned up before test exit, do not call
324+
// (*outExpecter).close here to let the caller decide.
325+
_ = e.out.Close()
325326
<-match
326327

327328
return xerrors.Errorf("match deadline exceeded: %w", ctx.Err())

scripts/apidocgen/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
{
22
"dependencies": {
33
"widdershins": "^4.0.1"
4+
},
5+
"resolutions": {
6+
"semver": "7.5.3",
7+
"jsonpointer": "5.0.1"
48
}
59
}

scripts/apidocgen/yarn.lock

Lines changed: 65 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,42 @@
33

44

55
"@babel/code-frame@^7.0.0":
6-
version "7.18.6"
7-
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
8-
integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
6+
version "7.22.5"
7+
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658"
8+
integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==
99
dependencies:
10-
"@babel/highlight" "^7.18.6"
10+
"@babel/highlight" "^7.22.5"
1111

12-
"@babel/helper-validator-identifier@^7.18.6":
13-
version "7.19.1"
14-
resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
15-
integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
12+
"@babel/helper-validator-identifier@^7.22.5":
13+
version "7.22.5"
14+
resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193"
15+
integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
1616

17-
"@babel/highlight@^7.18.6":
18-
version "7.18.6"
19-
resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
20-
integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
17+
"@babel/highlight@^7.22.5":
18+
version "7.22.5"
19+
resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031"
20+
integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==
2121
dependencies:
22-
"@babel/helper-validator-identifier" "^7.18.6"
22+
"@babel/helper-validator-identifier" "^7.22.5"
2323
chalk "^2.0.0"
2424
js-tokens "^4.0.0"
2525

2626
"@babel/runtime@^7.0.0":
27-
version "7.20.7"
28-
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.7.tgz#fcb41a5a70550e04a7b708037c7c32f7f356d8fd"
29-
integrity sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==
27+
version "7.22.6"
28+
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.6.tgz#57d64b9ae3cff1d67eb067ae117dac087f5bd438"
29+
integrity sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==
3030
dependencies:
3131
regenerator-runtime "^0.13.11"
3232

3333
"@exodus/schemasafe@^1.0.0-rc.2":
34-
version "1.0.0-rc.9"
35-
resolved "https://registry.yarnpkg.com/@exodus/schemasafe/-/schemasafe-1.0.0-rc.9.tgz#56b9c6df627190f2dcda15f81f25d68826d9be4d"
36-
integrity sha512-dGGHpb61hLwifAu7sotuHFDBw6GTdpG8aKC0fsK17EuTzMRvUrH7lEAr6LTJ+sx3AZYed9yZ77rltVDHyg2hRg==
34+
version "1.0.1"
35+
resolved "https://registry.yarnpkg.com/@exodus/schemasafe/-/schemasafe-1.0.1.tgz#e4e2d86ae176b7c96fbff033f3b1a8b1cfd390fb"
36+
integrity sha512-PQdbF8dGd4LnbwBlcc4ML8RKYdplm+e9sUeWBTr4zgF13/Shiuov9XznvM4T8cb1CfyKK21yTUkuAIIh/DAH/g==
3737

3838
"@types/json-schema@^7.0.7":
39-
version "7.0.11"
40-
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
41-
integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
39+
version "7.0.12"
40+
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
41+
integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
4242

4343
ajv@^5.5.2:
4444
version "5.5.2"
@@ -228,9 +228,9 @@ commander@^2.9.0:
228228
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
229229

230230
core-js@^3.2.1:
231-
version "3.27.1"
232-
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.27.1.tgz#23cc909b315a6bb4e418bf40a52758af2103ba46"
233-
integrity sha512-GutwJLBChfGCpwwhbYoqfv03LAfmiz7e7D/BNxzeMxwQf10GRSzqiOjx7AmtEk+heiD/JWmBuyBPgFtx0Sg1ww==
231+
version "3.31.0"
232+
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.31.0.tgz#4471dd33e366c79d8c0977ed2d940821719db344"
233+
integrity sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ==
234234

235235
cross-spawn@^6.0.0:
236236
version "6.0.5"
@@ -420,9 +420,9 @@ get-stream@^4.0.0:
420420
pump "^3.0.0"
421421

422422
graceful-fs@^4.1.2:
423-
version "4.2.10"
424-
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
425-
integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
423+
version "4.2.11"
424+
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
425+
integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
426426

427427
grapheme-splitter@^1.0.4:
428428
version "1.0.4"
@@ -557,10 +557,10 @@ json-to-ast@^2.0.3:
557557
code-error-fragment "0.0.230"
558558
grapheme-splitter "^1.0.4"
559559

560-
jsonpointer@^4.0.1:
561-
version "4.1.0"
562-
resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.1.0.tgz#501fb89986a2389765ba09e6053299ceb4f2c2cc"
563-
integrity sha512-CXcRvMyTlnR53xMcKnuMzfCA5i/nfblTnnr74CZb6C4vG39eu6w51t7nKmU5MfLfbTgGItliNyjO/ciNPDqClg==
560+
jsonpointer@5.0.1, jsonpointer@^4.0.1:
561+
version "5.0.1"
562+
resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.1.tgz#2110e0af0900fd37467b5907ecd13a7884a1b559"
563+
integrity sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==
564564

565565
lcid@^2.0.0:
566566
version "2.0.0"
@@ -596,6 +596,13 @@ locate-path@^5.0.0:
596596
dependencies:
597597
p-locate "^4.1.0"
598598

599+
lru-cache@^6.0.0:
600+
version "6.0.0"
601+
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
602+
integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
603+
dependencies:
604+
yallist "^4.0.0"
605+
599606
map-age-cleaner@^0.1.1:
600607
version "0.1.3"
601608
resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
@@ -678,9 +685,9 @@ node-fetch-h2@^2.3.0:
678685
http2-client "^1.2.5"
679686

680687
node-fetch@^2.0.0:
681-
version "2.6.7"
682-
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
683-
integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
688+
version "2.6.12"
689+
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.12.tgz#02eb8e22074018e3d5a83016649d04df0e348fba"
690+
integrity sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==
684691
dependencies:
685692
whatwg-url "^5.0.0"
686693

@@ -759,9 +766,9 @@ once@^1.3.1, once@^1.4.0:
759766
wrappy "1"
760767

761768
openapi-sampler@^1.0.0-beta.15:
762-
version "1.3.0"
763-
resolved "https://registry.yarnpkg.com/openapi-sampler/-/openapi-sampler-1.3.0.tgz#5b99ceb4156b00d2aa3f860e52ccb768a5695793"
764-
integrity sha512-2QfjK1oM9Sv0q82Ae1RrUe3yfFmAyjF548+6eAeb+h/cL1Uj51TW4UezraBEvwEdzoBgfo4AaTLVFGTKj+yYDw==
769+
version "1.3.1"
770+
resolved "https://registry.yarnpkg.com/openapi-sampler/-/openapi-sampler-1.3.1.tgz#eebb2a1048f830cc277398bc8022b415f887e859"
771+
integrity sha512-Ert9mvc2tLPmmInwSyGZS+v4Ogu9/YoZuq9oP3EdUklg2cad6+IGndP9yqJJwbgdXwZibiq5fpv6vYujchdJFg==
765772
dependencies:
766773
"@types/json-schema" "^7.0.7"
767774
json-pointer "0.6.2"
@@ -871,9 +878,9 @@ pump@^3.0.0:
871878
once "^1.3.1"
872879

873880
punycode@^2.1.0:
874-
version "2.1.1"
875-
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
876-
integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
881+
version "2.3.0"
882+
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
883+
integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
877884

878885
reftools@^1.1.0, reftools@^1.1.5, reftools@^1.1.9:
879886
version "1.1.9"
@@ -900,10 +907,12 @@ require-main-filename@^2.0.0:
900907
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
901908
integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
902909

903-
semver@^5.5.0:
904-
version "5.7.1"
905-
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
906-
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
910+
semver@7.5.3, semver@^5.5.0:
911+
version "7.5.3"
912+
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e"
913+
integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==
914+
dependencies:
915+
lru-cache "^6.0.0"
907916

908917
set-blocking@^2.0.0:
909918
version "2.0.0"
@@ -1121,9 +1130,9 @@ whatwg-url@^5.0.0:
11211130
webidl-conversions "^3.0.0"
11221131

11231132
which-module@^2.0.0:
1124-
version "2.0.0"
1125-
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
1126-
integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==
1133+
version "2.0.1"
1134+
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409"
1135+
integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==
11271136

11281137
which@^1.2.9:
11291138
version "1.3.1"
@@ -1195,6 +1204,11 @@ y18n@^5.0.5:
11951204
resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
11961205
integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
11971206

1207+
yallist@^4.0.0:
1208+
version "4.0.0"
1209+
resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
1210+
integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
1211+
11981212
yaml@^1.10.0, yaml@^1.8.3:
11991213
version "1.10.2"
12001214
resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
@@ -1257,9 +1271,9 @@ yargs@^15.3.1:
12571271
yargs-parser "^18.1.2"
12581272

12591273
yargs@^17.0.1:
1260-
version "17.6.2"
1261-
resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz#2e23f2944e976339a1ee00f18c77fedee8332541"
1262-
integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==
1274+
version "17.7.2"
1275+
resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
1276+
integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
12631277
dependencies:
12641278
cliui "^8.0.1"
12651279
escalade "^3.1.1"

0 commit comments

Comments
 (0)