Skip to content

Commit 8e2fe01

Browse files
authored
Merge branch 'main' into rescript-support
2 parents fb5eac3 + 93e5c53 commit 8e2fe01

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

docs/js_of_ocaml.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ Check the version of `ts2ocaml` with `ts2ocaml --version` and do the following:
4444
opam pin add ts2ocaml-jsoo-stdlib https://github.com/ocsigen/ts2ocaml.git#jsoo-stdlib-vX.Y.Z
4545
```
4646

47+
You can take a look at the contents of `ts2ocaml-jsoo-stdlib` on https://github.com/ocsigen/ts2ocaml/tree/jsoo-stdlib.
48+
4749
### Using [`--create-minimal-stdlib`](#--create-minimal-stdlib)
4850

4951
`ts2ocaml jsoo --create-minimal-stdlib` generates a minimal standard library for `ts2ocaml`.
@@ -1090,4 +1092,4 @@ end
10901092
> val meth: t -> T.t Foo.t -> unit
10911093
> end
10921094
> end
1093-
> ```
1095+
> ```

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"monaco-editor": "0.32.1",
4343
"react-player": "2.9.0",
4444
"rescript": "9.1.4",
45-
"webpack": "5.69.1",
45+
"webpack": "5.70.0",
4646
"webpack-cli": "4.9.2",
4747
"webpack-dev-server": "4.7.4"
4848
}

yarn.lock

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -409,9 +409,9 @@
409409
"@types/node" "*"
410410

411411
"@types/vscode@^1.63.1":
412-
version "1.64.0"
413-
resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.64.0.tgz#bfd82c8d92dc7824c1be084be1ab46ce20d7fb55"
414-
integrity sha512-bSlAWz5WtcSL3cO9tAT/KpEH9rv5OBnm93OIIFwdCshaAiqr2bp1AUyEwW9MWeCvZBHEXc3V0fTYVdVyzDNwHA==
412+
version "1.65.0"
413+
resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.65.0.tgz#042dd8d93c32ac62cb826cd0fa12376069d1f448"
414+
integrity sha512-wQhExnh2nEzpjDMSKhUvnNmz3ucpd3E+R7wJkOhBNK3No6fG3VUdmVmMOKD0A8NDZDDDiQcLNxe3oGmX5SjJ5w==
415415

416416
"@types/ws@^8.2.2":
417417
version "8.2.2"
@@ -1128,10 +1128,10 @@ encodeurl@~1.0.2:
11281128
resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
11291129
integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
11301130

1131-
enhanced-resolve@^5.8.3:
1132-
version "5.9.0"
1133-
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.0.tgz#49ac24953ac8452ed8fed2ef1340fc8e043667ee"
1134-
integrity sha512-weDYmzbBygL7HzGGS26M3hGQx68vehdEg6VUmqSOaFzXExFqlnKuSvsEJCVGQHScS8CQMbrAqftT+AzzHNt/YA==
1131+
enhanced-resolve@^5.9.2:
1132+
version "5.9.2"
1133+
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz#0224dcd6a43389ebfb2d55efee517e5466772dd9"
1134+
integrity sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==
11351135
dependencies:
11361136
graceful-fs "^4.2.4"
11371137
tapable "^2.2.0"
@@ -2744,10 +2744,10 @@ webpack-sources@^3.2.3:
27442744
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
27452745
integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
27462746

2747-
webpack@5.69.1:
2748-
version "5.69.1"
2749-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.69.1.tgz#8cfd92c192c6a52c99ab00529b5a0d33aa848dc5"
2750-
integrity sha512-+VyvOSJXZMT2V5vLzOnDuMz5GxEqLk7hKWQ56YxPW/PQRUuKimPqmEIJOx8jHYeyo65pKbapbW464mvsKbaj4A==
2747+
webpack@5.70.0:
2748+
version "5.70.0"
2749+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.70.0.tgz#3461e6287a72b5e6e2f4872700bc8de0d7500e6d"
2750+
integrity sha512-ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw==
27512751
dependencies:
27522752
"@types/eslint-scope" "^3.7.3"
27532753
"@types/estree" "^0.0.51"
@@ -2758,7 +2758,7 @@ [email protected]:
27582758
acorn-import-assertions "^1.7.6"
27592759
browserslist "^4.14.5"
27602760
chrome-trace-event "^1.0.2"
2761-
enhanced-resolve "^5.8.3"
2761+
enhanced-resolve "^5.9.2"
27622762
es-module-lexer "^0.9.0"
27632763
eslint-scope "5.1.1"
27642764
events "^3.2.0"

0 commit comments

Comments
 (0)