Skip to content

Commit cbe8118

Browse files
authored
Merge branch 'main' into api-docs
2 parents 8cf8288 + e5386f8 commit cbe8118

File tree

134 files changed

+283
-268
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+283
-268
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,13 @@ jobs:
3030
- name: Install dependencies
3131
run: npm ci
3232

33+
# There is a bug in the ReScript compiler where it tries to compile the test files before finishing the source files
3334
- name: Build ReScript code
3435
run: npm run build
36+
continue-on-error: true
37+
38+
- name: Rebuild ReScript code
39+
run: npm run build
3540

3641
- name: Run tests
3742
run: npm test

docs/content/docs/contributing/getting-started.mdx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,13 @@ This will update your fork with the latest from `rescript-lang/experimental-resc
5353

5454
## Initial build
5555

56-
Install the dependencies and compile the bindings using [Rewatch](https://github.com/rescript-lang/rewatch):
56+
Install the dependencies and compile the bindings using `ReScript`:
5757

5858
```shell
5959
npm install && npm run build
6060
```
61+
62+
<Aside type="caution">
63+
Usage of **[rewatch](https://github.com/rescript-lang/rewatch)** is currently not advised.
64+
See [rewatch#144](https://github.com/rescript-lang/rewatch/issues/144) and [rewatch#124](https://github.com/rescript-lang/rewatch/issues/124#issuecomment-2488194551)
65+
</Aside>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"type": "module",
2929
"scripts": {
3030
"test": "node tests/index.js",
31-
"build": "rewatch",
31+
"build": "rescript",
3232
"format": "rescript format -all && prettier --write ./tests/index.js ./package.json ./docs/pages",
3333
"docs": "astro dev",
3434
"build:docs": "astro build"

src/CSSFontLoadingAPI/FontFaceSet.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/CanvasAPI/OffscreenCanvas.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ChannelMessagingAPI/MessagePort.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ClipboardAPI/Clipboard.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/DOMAPI/Animation.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/DOMAPI/CharacterData.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/DOMAPI/Comment.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)