Skip to content

Commit 1992635

Browse files
authored
Merge pull request #757 from reasonml/Improve-readme
2 parents 133315d + dee28dd commit 1992635

File tree

3 files changed

+12803
-7206
lines changed

3 files changed

+12803
-7206
lines changed

README.md

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Reason Website
22

3-
This code is used to generate https://reasonml.github.io. It pulls in files from `docs/` and `website/` to generate html files served on the site.
3+
This code is used to generate https://reasonml.github.io. It pulls in files from `docs/` and `website/` to generate HTML files served on the site.
44

5-
`website/` contains the JS, CSS, images and other files (and blog, which contains some markdown files too, these are separated from `docs/`, not too important).
5+
`website/` contains the JS, CSS, images and other files (and some markdown files in `blog` which are separated from `docs/`; it's not too important).
66

7-
`cd website && yarn && yarn start` to start the development server & watcher.
7+
`cd website && npm install && npm run start` to start the development server & watcher.
88

9-
Don't use `yarn build`. It's mostly for debugging.
9+
Don't use `npm run build`. It's mostly for debugging.
1010

11-
In the end, we spit out normal HTML, with all the JS dependencies (barring a few critical ones) removed, including ReactJS itself. It's a full, static website, super lightweight, portable, unfancy but good looking. Works with JS turned off too.
11+
In the end, we spit out normal HTML with all but a few critical JS dependencies removed, including ReactJS itself. It's a full static website: super lightweight, portable, unfancy, but good looking. And it works with JS turned off!
1212

1313
Two special files:
1414

@@ -19,23 +19,23 @@ During your development, most changes will be picked up at each browser refresh.
1919

2020
## Translations
2121

22-
The entire site can be translated via the [Crowdin project](https://crowdin.com/project/reason). This repo only has the canonical english documentation. Don't manually edit things in `i18n/`.
22+
The entire site can be translated via the [Crowdin project](https://crowdin.com/project/reason). This repo only has the canonical English documentation. Don't manually edit things in `i18n/`.
2323

2424
## Debugging
2525

2626
`console.log`s appear in your terminal! Since the site itself is React-free.
2727

2828
## Building and Deploying
2929

30-
Changes from `source` branch are automatically picked into `master` branch by CI, then published.
30+
Changes from the `source` branch are automatically picked into `master` branch by CI and then published.
3131

32-
# Build the Playground
32+
# Building the Playground
3333

3434
```
35-
cd website && yarn
35+
cd website && npm install
3636
```
3737

38-
For modifying the actual try playground source code, run `yarn bundle-try-playground:dev` to start a watcher. Once you're done, run `yarn bundle-try-playground:prod` once.
38+
For modifying the actual try playground source code, run `npm run bundle-try-playground:dev` to start a watcher. Once you're done, run `npm run bundle-try-playground:prod` once.
3939

4040
## Building with custom BuckleScript/etc
4141

@@ -45,13 +45,14 @@ You'll need to have this repository and the [BuckleScript](https://github.com/Bu
4545

4646
1. Inside the BuckleScript repository, follow the [Setup](https://github.com/BuckleScript/bucklescript/blob/master/CONTRIBUTING.md#setup) guide.
4747

48-
2. Follow the [BS Playground instructions](https://github.com/BuckleScript/bucklescript/tree/master/playground), with these caveats:
49-
- Make sure the `reason-react` version in BuckleScript `playground` folder is the same as the one in this project
50-
- When calling `cmij.exe`, just pass the path to `reason-react`, e.g. `../jscomp/bin/cmij.exe -playground node_modules/reason-react/lib/ocaml`
51-
- Run `BS_PLAYGROUND=../../reasonml.github.io/website/playground/bs node scripts/repl.js`
48+
2. Follow the [Contributing to the BS Playground Bundle](https://github.com/BuckleScript/bucklescript/blob/7.0.1/CONTRIBUTING.md#contributing-to-the-bs-playground-bundle) guide.
5249

53-
3. Inside the `reasonml.github.io` repository, run `cd website && yarn`
50+
3. Run `BS_PLAYGROUND=../../reasonml.github.io/website/playground/bs node scripts/repl.js`
5451

55-
4. Finally, run `node setupSomeArtifacts.js`
52+
4. Inside the `reasonml.github.io` repository, run `cd website && yarn`
53+
54+
5. Then run, `yarn prepare` in the same place.
55+
56+
6. Finally, run `node setupSomeArtifacts.js`
5657

5758
If this command fails, ping @chenglou in Discord.

0 commit comments

Comments
 (0)