Skip to content

Commit 6dd7f87

Browse files
committed
Update more links and names
1 parent 4ab1e56 commit 6dd7f87

File tree

5 files changed

+24
-106
lines changed

5 files changed

+24
-106
lines changed

.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[submodule "ocaml"]
22
path = ocaml
3-
url = https://github.com/BuckleScript/ocaml
3+
url = https://github.com/rescript-lang/ocaml
44
[submodule "syntax"]
55
path = syntax
6-
url = https://github.com/BuckleScript/syntax
6+
url = https://github.com/rescript-lang/syntax
77
branch = master

CONTRIBUTING.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Contributing
22

3-
Thanks for your help! Due to BuckleScript's nature, the contribution setup isn't all straightforward. If something isn't working, please file an issue!
3+
Thanks for your help! Due to ReScript's nature, the contribution setup isn't all straightforward. If something isn't working, please file an issue!
44

55
## Prerequisites
66

77
- [NodeJS](https://nodejs.org/)
88
- C compiler toolchain (you probably already have it installed)
9-
- OS: Mac/Linux (BuckleScript works on Windows, but developing the repo using Windows isn't tested. Contribution welcome!)
9+
- OS: Mac/Linux (ReScript works on Windows, but developing the repo using Windows isn't tested. Contribution welcome!)
1010

1111
## Build
1212

@@ -42,7 +42,7 @@ In the rare case there you're making changes to the vendored OCaml fork, rebuild
4242
4343
### Integration Test
4444

45-
If you'd like to use your modified BuckleScript like an end-user, try:
45+
If you'd like to use your modified ReScript like an end-user, try:
4646

4747
```sh
4848
BS_TRAVIS_CI=1 npm install -g .
@@ -67,7 +67,7 @@ See https://github.com/reason-association/reasonml.org/
6767

6868
## Contribute to the API Reference
6969

70-
The API reference is generated from doc comments in the source code. [Here](https://github.com/bucklescript/bucklescript/blob/99650/jscomp/others/js_re.mli#L146-L161)'s a good example.
70+
The API reference is generated from doc comments in the source code. [Here](https://github.com/rescript-lang/rescript-compiler/blob/99650/jscomp/others/js_re.mli#L146-L161)'s a good example.
7171

7272
Some tips:
7373

@@ -94,7 +94,7 @@ To generate the html:
9494

9595
## Contributing to the Runtime
9696

97-
BuckleScript runtime implementation is written in pure OCaml with some raw JS code embedded (`jscomp/runtime` directory).
97+
Our runtime implementation is written in pure OCaml with some raw JS code embedded (`jscomp/runtime` directory).
9898

9999
The goal is to implement the runtime **purely in OCaml**. This includes removing all existing occurrences of embedded raw JS code as well, and you can help!
100100

@@ -138,11 +138,11 @@ This is usually the file you want to create to test certain compile behavior wit
138138

139139
## Contribute to the BS Playground Bundle
140140

141-
> Note: These instructions are designed for building the 4.06 based version of BuckleScript (BS v6).
141+
> Note: These instructions are designed for building the 4.06 based version of ReScript (ReScript v6).
142142
143-
The "BuckleScript Playground bundle" is the BS compiler compiled to JavaScript, including all necessary dependency files (stdlib / belt etc). It is useful for building tools where you want to compile and execute arbitrary Reason / OCaml in the browser.
143+
The "Playground bundle" is the BS compiler compiled to JavaScript, including all necessary dependency files (stdlib / belt etc). It is useful for building tools where you want to compile and execute arbitrary Reason / OCaml in the browser.
144144

145-
The BuckleScript source code is compiled with a tool called [JSOO (js_of_ocaml)](https://ocsigen.org/js_of_ocaml/3.5.1/manual/overview), which uses OCaml bytecode to compile to JavaScript and is part of the bigger OCaml ecosystem. Before we can compile anything, we need to install the required tools (requires [`opam`](https://opam.ocaml.org/doc/Install.html) to be installed):
145+
The ReScript source code is compiled with a tool called [JSOO (js_of_ocaml)](https://ocsigen.org/js_of_ocaml/3.5.1/manual/overview), which uses OCaml bytecode to compile to JavaScript and is part of the bigger OCaml ecosystem. Before we can compile anything, we need to install the required tools (requires [`opam`](https://opam.ocaml.org/doc/Install.html) to be installed):
146146

147147
```sh
148148
# Create the right switch, if not created yet (first install)
@@ -163,7 +163,7 @@ The entry point of the JSOO bundle is located in `jscomp/main/jsoo_main.ml` and
163163
# We create a target directory for storing the bundle / stdlib files
164164
mkdir playground && mkdir playground/stdlib
165165
166-
# We build the BuckleScript source code and also the bytecode for jsoo_main.ml
166+
# We build the ReScript source code and also the bytecode for jsoo_main.ml
167167
node scripts/ninja.js config && node scripts/ninja.js build
168168
169169
# Now we run the repl.js script pointing to our playground directory (note how it needs to be relative to the repl.js file)
@@ -174,8 +174,8 @@ _Troubleshooting: if ninja build step failed with `Error: cannot find file '+run
174174

175175
**You should now find following files:**
176176

177-
- `playground/exports.js` -> This is the BuckleScript compiler, which binds the BuckleScript API to the `window` object.
178-
- `playground/stdlib/*.js` -> All the BuckleScript runtime files.
177+
- `playground/exports.js` -> This is the ReScript compiler, which binds the ReScript API to the `window` object.
178+
- `playground/stdlib/*.js` -> All the ReScript runtime files.
179179

180180
You can now use the `exports.js` file either directly by using a `<script src="/path/to/exports.js"/>` inside a html file, use a browser bundler infrastructure to optimize it, or you can even use it with `nodejs`:
181181

@@ -206,7 +206,7 @@ For each compile every successful operation will return `{js_code: string}`. On
206206

207207
### Working on the Playground JS API
208208

209-
Whenever you are modifying any files in the BuckleScript compiler, or in the `jsoo_main.ml` file, you'll need to rebuild the source and recreate the JS bundle.
209+
Whenever you are modifying any files in the ReScript compiler, or in the `jsoo_main.ml` file, you'll need to rebuild the source and recreate the JS bundle.
210210

211211
```sh
212212
node scripts/ninja.js config && node scripts/ninja.js build
@@ -215,15 +215,15 @@ BS_PLAYGROUND=../playground node scripts/repl.js
215215

216216
**.cmj files in the Web**
217217

218-
A `.cmj` file contains compile information and JS package information of BuckleScript build artifacts (your `.re / .ml` modules) and are generated on build (`scripts/ninja.js build`).
218+
A `.cmj` file contains compile information and JS package information of ReScript build artifacts (your `.re / .ml` modules) and are generated on build (`scripts/ninja.js build`).
219219

220220
A `.cmi` file is an [OCaml originated file extension](https://waleedkhan.name/blog/ocaml-file-extensions/) and contains all interface information of a certain module without any implementation.
221221

222222
In this repo, these files usually sit right next to each compiled `.ml` / `.re` file. The structure of a `.cmj` file is defined in [js_cmj_format.ml](jscomp/core/js_cmj_format.ml). You can run a tool called `./jscomp/bin/cmjdump.exe [some-file.cmj]` to inspect the contents of given `.cmj` file.
223223

224-
`.cmj` files are required for making BuckleScript compile modules (this includes modules like ReasonReact). BuckleScript includes a subset of modules by default, which can be found in `jscomp/stdlib-406` and `jscomp/others`. You can also find those modules listed in the `jsoo` call in `scripts/repl.js`. As you probably noticed, the generated `playground` files are all plain `.js`, so how are the `cmj` / `cmi` files embedded?
224+
`.cmj` files are required for making ReScript compile modules (this includes modules like ReasonReact). ReScript includes a subset of modules by default, which can be found in `jscomp/stdlib-406` and `jscomp/others`. You can also find those modules listed in the `jsoo` call in `scripts/repl.js`. As you probably noticed, the generated `playground` files are all plain `.js`, so how are the `cmj` / `cmi` files embedded?
225225

226-
`repl.js` calls an executable called `cmjbrowser.exe` on every build, which is a compile artifact from `jscomp/main/jscmj_main.ml`. It is used to serialize `cmj` / `cmi` artifacts into two files called `jscomp/core/js_cmj_datasets.ml`. These files are only linked for the browser target, where BuckleScript doesn't have access to the filesystem. When working on BS, you'll see diffs on those files whenever there are changes on core modules, e.g. stdlib modules or when the ocaml version was changed. We usually check in these files to keep it in sync with the most recent compiler implementation. JSOO will pick up those files to encode them into the `exports.js` bundle.
226+
`repl.js` calls an executable called `cmjbrowser.exe` on every build, which is a compile artifact from `jscomp/main/jscmj_main.ml`. It is used to serialize `cmj` / `cmi` artifacts into two files called `jscomp/core/js_cmj_datasets.ml`. These files are only linked for the browser target, where ReScript doesn't have access to the filesystem. When working on BS, you'll see diffs on those files whenever there are changes on core modules, e.g. stdlib modules or when the ocaml version was changed. We usually check in these files to keep it in sync with the most recent compiler implementation. JSOO will pick up those files to encode them into the `exports.js` bundle.
227227

228228
For any other dependency needed in the playground, such as `ReasonReact`, you will be required to serialize your `.cmi` / `.cmt` files accordingly from binary to hex encoded strings so that BS Playground's `ocaml.load` function can load the data. Right now we don't provide any instructions inside here yet, but [here's how the official ReasonML playground did it](https://github.com/reasonml/reasonml.github.io/blob/source/website/setupSomeArtifacts.js#L65).
229229

@@ -259,7 +259,7 @@ Note that there is one design goal to keep in mind, never introduce any meaningl
259259

260260
## Contribution Licensing
261261

262-
Since BuckleScript is distributed under the terms of the [LGPL Version 3](LICENSE), contributions that you make are licensed under the same terms. In order for us to be able to accept your contributions, we will need explicit confirmation from you that you are able and willing to provide them under these terms, and the mechanism we use to do this is called a Developer's Certificate of Origin [DCO](DCO.md). This is very similar to the process used by the Linux(R) kernel, Samba, and many other major open source projects.
262+
Since ReScript is distributed under the terms of the [LGPL Version 3](LICENSE), contributions that you make are licensed under the same terms. In order for us to be able to accept your contributions, we will need explicit confirmation from you that you are able and willing to provide them under these terms, and the mechanism we use to do this is called a Developer's Certificate of Origin [DCO](DCO.md). This is very similar to the process used by the Linux(R) kernel, Samba, and many other major open source projects.
263263

264264
To participate under these terms, all that you must do is include a line like the following as the last line of the commit message for each commit in your contribution:
265265

CONTRIBUTING_EXTRA.md

Lines changed: 0 additions & 82 deletions
This file was deleted.

Changes.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,9 @@
232232
- #4114 fix SPA mode watcher path in react-hooks template
233233
234234
- #4199 Change ReactJS PPX to avoid modifying locations of existing code (better integration with editors)
235-
- #4122 toplevel [@@@warning "+101"] works for bucklescript warnings
235+
- #4122 toplevel [@@@warning "+101"] works for our own warnings (apart from OCaml ones)
236236
237-
`bsc -warn-help` listed several warnings for BuckleScript
237+
`bsc -warn-help` listed several of our own warnings
238238
```
239239
101 BuckleScript warning: Unused bs attributes
240240
102 BuckleScript warning: polymorphic comparison introduced (maybe unsafe)
@@ -267,7 +267,7 @@
267267
- #4005 fix windows installing issues
268268
269269
# 7.0.0
270-
- #4003 not doing ast invariant checking, leave it for bucklescript (faster compilation)
270+
- #4003 not doing ast invariant checking, leave it to us (faster compilation)
271271
- #4002 upgrade ocamldoc in 4.06, fix document build
272272
- #4001 tweak error message
273273
- #3999 #3987 fix ppx reactjs regression keep attributes on object fields
@@ -278,13 +278,13 @@
278278
- #3985 more precise runtime information passed down from upstream, fix a corner case of compiling ocaml class
279279
- #3986 more precise runtime information passed down from upstream, add module alias comments in generated code
280280
- #3991 #3980 fix a corner case when printing js object in statement position
281-
- #3977 #3978 not relying on ref internal for bucklescript runtime
281+
- #3977 #3978 not relying on ref internal for the runtime
282282
- #3976 add bs js playground reason support
283283
- #3974 bsb tweak react hooks template README
284284
- #3971 docs about format of lib/bs/.bsbuild
285285
- #3967 #3973 fix recursive value initialization
286286
- #3972 upgrade repl.js to 4.06.1
287-
- #3890 Fix typo in bucklescript readme
287+
- #3890 Fix typo in readme
288288
- #3898 #3900 #3911 #3913 #3915 #3925 #3928 #3929 #3932 #3936 #3934 OCaml record as Js object
289289
- #3945 sync refmt 3.5.3
290290
- #3916 add large ocaml object test

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
},
2020
"name": "bs-platform",
2121
"version": "8.2.0",
22-
"description": "bucklescript compiler, ocaml standard libary by bucklescript and its required runtime support",
22+
"description": "ReScript compiler, OCAml standard libary by ReScript and its required runtime support",
2323
"repository": {
2424
"type": "git",
2525
"url": "git+https://github.com/bucklescript/bucklescript.git"

0 commit comments

Comments
 (0)