Skip to content

Commit f3664a4

Browse files
committed
Merge branch 'main' of github.com:ocsigen/ts2ocaml into main
2 parents 25be336 + 4e7f7d1 commit f3664a4

File tree

2 files changed

+32
-63
lines changed

2 files changed

+32
-63
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
"cassandra-driver": "^4.6.3",
4242
"monaco-editor": "0.31.1",
4343
"react-player": "2.9.0",
44-
"webpack": "5.65.0",
44+
"webpack": "5.66.0",
4545
"webpack-cli": "4.9.1",
46-
"webpack-dev-server": "4.7.2"
46+
"webpack-dev-server": "4.7.3"
4747
}
4848
}

yarn.lock

Lines changed: 30 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44

55
"@angular/common@^13.0.3":
6-
version "13.1.1"
7-
resolved "https://registry.yarnpkg.com/@angular/common/-/common-13.1.1.tgz#e8b659d6376d6764cd2516a4c6d604aafe24cb88"
8-
integrity sha512-FQwRZ1XgTH2PbPjBmq2jAZzETVNX9yWQt21MuNGtokC7V4eS0NYlFIDbhy3UPWCzRgd3+P7P4+HdX15VxCjf9g==
6+
version "13.1.2"
7+
resolved "https://registry.yarnpkg.com/@angular/common/-/common-13.1.2.tgz#6a4abe30b1cc42702452bfd2214e482675f5d889"
8+
integrity sha512-/8RWYQkZ1KPNvu2FANJM44wXlOMjMyxZVOEIn3llMRgxV2iiYtmluAOJNafTAbKedAuD6wiSpbi++QbioqCyyA==
99
dependencies:
1010
tslib "^2.3.0"
1111

@@ -747,18 +747,7 @@ browser-or-node@^2.0.0:
747747
resolved "https://registry.yarnpkg.com/browser-or-node/-/browser-or-node-2.0.0.tgz#808ea90282a670931cdc0ea98166538a50dd0d89"
748748
integrity sha512-3Lrks/Okgof+/cRguUNG+qRXSeq79SO3hY4QrXJayJofwJwHiGC0qi99uDjsfTwULUFSr1OGVsBkdIkygKjTUA==
749749

750-
browserslist@^4.14.5:
751-
version "4.17.0"
752-
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.0.tgz#1fcd81ec75b41d6d4994fb0831b92ac18c01649c"
753-
integrity sha512-g2BJ2a0nEYvEFQC208q8mVAhfNwpZ5Mu8BwgtCdZKO3qx98HChmeg448fPdUzld8aFmfLgVh7yymqV+q1lJZ5g==
754-
dependencies:
755-
caniuse-lite "^1.0.30001254"
756-
colorette "^1.3.0"
757-
electron-to-chromium "^1.3.830"
758-
escalade "^3.1.1"
759-
node-releases "^1.1.75"
760-
761-
browserslist@^4.17.5:
750+
browserslist@^4.14.5, browserslist@^4.17.5:
762751
version "4.18.1"
763752
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.18.1.tgz#60d3920f25b6860eb917c6c7b185576f4d8b017f"
764753
integrity sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==
@@ -797,11 +786,6 @@ call-bind@^1.0.2:
797786
function-bind "^1.1.1"
798787
get-intrinsic "^1.0.2"
799788

800-
caniuse-lite@^1.0.30001254:
801-
version "1.0.30001285"
802-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001285.tgz#fe1e52229187e11d6670590790d669b9e03315b7"
803-
integrity sha512-KAOkuUtcQ901MtmvxfKD+ODHH9YVDYnBt+TGYSz2KIfnq22CiArbUxXPN9067gNbgMlnNYRSwho8OPXZPALB9Q==
804-
805789
caniuse-lite@^1.0.30001280:
806790
version "1.0.30001283"
807791
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001283.tgz#8573685bdae4d733ef18f78d44ba0ca5fe9e896b"
@@ -893,11 +877,6 @@ color-name@~1.1.4:
893877
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
894878
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
895879

896-
colorette@^1.3.0:
897-
version "1.4.0"
898-
resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40"
899-
integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==
900-
901880
colorette@^2.0.10, colorette@^2.0.14:
902881
version "2.0.16"
903882
resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
@@ -1109,11 +1088,6 @@ [email protected]:
11091088
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
11101089
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
11111090

1112-
electron-to-chromium@^1.3.830:
1113-
version "1.4.11"
1114-
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.11.tgz#303c9deebbe90c68bf5c2c81a88a3bf4522c8810"
1115-
integrity sha512-2OhsaYgsWGhWjx2et8kaUcdktPbBGjKM2X0BReUCKcSCPttEY+hz2zie820JLbttU8jwL92+JJysWwkut3wZgA==
1116-
11171091
electron-to-chromium@^1.3.896:
11181092
version "1.4.8"
11191093
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.8.tgz#e1b7752ac1a75e39b5dd90cc7e29ea08b351c484"
@@ -1322,9 +1296,9 @@ find-up@^4.0.0:
13221296
path-exists "^4.0.0"
13231297

13241298
follow-redirects@^1.0.0:
1325-
version "1.14.5"
1326-
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.5.tgz#f09a5848981d3c772b5392309778523f8d85c381"
1327-
integrity sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==
1299+
version "1.14.7"
1300+
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
1301+
integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
13281302

13291303
13301304
version "0.2.0"
@@ -1421,10 +1395,10 @@ globby@^11.0.1:
14211395
merge2 "^1.3.0"
14221396
slash "^3.0.0"
14231397

1424-
graceful-fs@^4.1.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6:
1425-
version "4.2.8"
1426-
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
1427-
integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
1398+
graceful-fs@^4.1.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
1399+
version "4.2.9"
1400+
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
1401+
integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
14281402

14291403
handle-thing@^2.0.0:
14301404
version "2.0.1"
@@ -1937,15 +1911,10 @@ neo-async@^2.6.2:
19371911
resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
19381912
integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
19391913

1940-
node-forge@^0.10.0:
1941-
version "0.10.0"
1942-
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
1943-
integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
1944-
1945-
node-releases@^1.1.75:
1946-
version "1.1.77"
1947-
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.77.tgz#50b0cfede855dd374e7585bf228ff34e57c1c32e"
1948-
integrity sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ==
1914+
node-forge@^1.2.0:
1915+
version "1.2.1"
1916+
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.2.1.tgz#82794919071ef2eb5c509293325cec8afd0fd53c"
1917+
integrity sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==
19491918

19501919
node-releases@^2.0.1:
19511920
version "2.0.1"
@@ -2339,12 +2308,12 @@ select-hose@^2.0.0:
23392308
resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
23402309
integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
23412310

2342-
selfsigned@^1.10.11:
2343-
version "1.10.11"
2344-
resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz#24929cd906fe0f44b6d01fb23999a739537acbe9"
2345-
integrity sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==
2311+
selfsigned@^2.0.0:
2312+
version "2.0.0"
2313+
resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.0.tgz#e927cd5377cbb0a1075302cff8df1042cc2bce5b"
2314+
integrity sha512-cUdFiCbKoa1mZ6osuJs2uDHrs0k0oprsKveFiiaBKCNq3SYyb5gs2HxhQyDNLCmL51ZZThqi4YNDpCK6GOP1iQ==
23462315
dependencies:
2347-
node-forge "^0.10.0"
2316+
node-forge "^1.2.0"
23482317

23492318
semver@^6.3.0:
23502319
version "6.3.0"
@@ -2696,10 +2665,10 @@ webpack-dev-middleware@^5.3.0:
26962665
range-parser "^1.2.1"
26972666
schema-utils "^4.0.0"
26982667

2699-
2700-
version "4.7.2"
2701-
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.7.2.tgz#324b79046491f2cf0b9d9e275381198c8246b380"
2702-
integrity sha512-s6yEOSfPpB6g1T2+C5ZOUt5cQOMhjI98IVmmvMNb5cdiqHoxSUfACISHqU/wZy+q4ar/A9jW0pbNj7sa50XRVA==
2668+
2669+
version "4.7.3"
2670+
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.7.3.tgz#4e995b141ff51fa499906eebc7906f6925d0beaa"
2671+
integrity sha512-mlxq2AsIw2ag016nixkzUkdyOE8ST2GTy34uKSABp1c4nhjZvH90D5ZRR+UOLSsG4Z3TFahAi72a3ymRtfRm+Q==
27032672
dependencies:
27042673
"@types/bonjour" "^3.5.9"
27052674
"@types/connect-history-api-fallback" "^1.3.5"
@@ -2723,7 +2692,7 @@ [email protected]:
27232692
p-retry "^4.5.0"
27242693
portfinder "^1.0.28"
27252694
schema-utils "^4.0.0"
2726-
selfsigned "^1.10.11"
2695+
selfsigned "^2.0.0"
27272696
serve-index "^1.9.1"
27282697
sockjs "^0.3.21"
27292698
spdy "^4.0.2"
@@ -2744,10 +2713,10 @@ webpack-sources@^3.2.2:
27442713
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.2.tgz#d88e3741833efec57c4c789b6010db9977545260"
27452714
integrity sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw==
27462715

2747-
webpack@5.65.0:
2748-
version "5.65.0"
2749-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.65.0.tgz#ed2891d9145ba1f0d318e4ea4f89c3fa18e6f9be"
2750-
integrity sha512-Q5or2o6EKs7+oKmJo7LaqZaMOlDWQse9Tm5l1WAfU/ujLGN5Pb0SqGeVkN/4bpPmEqEP5RnVhiqsOtWtUVwGRw==
2716+
webpack@5.66.0:
2717+
version "5.66.0"
2718+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.66.0.tgz#789bf36287f407fc92b3e2d6f978ddff1bfc2dbb"
2719+
integrity sha512-NJNtGT7IKpGzdW7Iwpn/09OXz9inIkeIQ/ibY6B+MdV1x6+uReqz/5z1L89ezWnpPDWpXF0TY5PCYKQdWVn8Vg==
27512720
dependencies:
27522721
"@types/eslint-scope" "^3.7.0"
27532722
"@types/estree" "^0.0.50"
@@ -2763,7 +2732,7 @@ [email protected]:
27632732
eslint-scope "5.1.1"
27642733
events "^3.2.0"
27652734
glob-to-regexp "^0.4.1"
2766-
graceful-fs "^4.2.4"
2735+
graceful-fs "^4.2.9"
27672736
json-parse-better-errors "^1.0.2"
27682737
loader-runner "^4.2.0"
27692738
mime-types "^2.1.27"

0 commit comments

Comments
 (0)