Skip to content

Commit 40d51cb

Browse files
committed
Merge branch 'master' into new-react-docs-only
2 parents d4c8c95 + c8b7c57 commit 40d51cb

21 files changed

+131
-149
lines changed

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ This is the official documentation platform for the [ReScript](https://rescript-
1313
## Setup
1414

1515
```sh
16-
# For first time clone / build
16+
# For first time clone / build (install dependencies)
1717
yarn
18-
yarn run update-index
1918

2019
# Initial build
2120
yarn bs:build
2221

22+
# Build the index data
23+
yarn run update-index
24+
2325
# In a new tab
2426
yarn dev
2527

common/Mdx.res

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,15 @@ module MdxChildren: {
4848
} = {
4949
type unknown
5050

51-
@unboxed
52-
type rec t = Any('a): t
51+
type t
5352

5453
type case =
5554
| String(string)
5655
| Element(mdxComponent)
5756
| Array(array<mdxComponent>)
5857
| Unknown(unknown)
5958

60-
let classify = (Any(v): t): case =>
59+
let classify = (v: t): case =>
6160
if %raw(`function (a) { return a instanceof Array}`)(v) {
6261
Array((Obj.magic(v): array<mdxComponent>))
6362
} else if Js.typeof(v) == "string" {

common/MetaFrontmatter.js

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

common/MetaFrontmatter.res

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

compilers/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# compilers
2+
3+
This folder is needed to install additional rescript compiler versions for testing our documented source code on multiple compiler versions.
4+
5+
Our `scripts/test-examples.js` script will automatically install all package.json dependencies if it cannot find any compiler versions.

compilers/package-lock.json

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

compilers/package.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"name": "compilers",
3+
"private": true,
4+
"version": "1.0.0",
5+
"main": "index.js",
6+
"license": "MIT",
7+
"dependencies": {
8+
"rescript-820": "npm:bs-platform@8.2.0"
9+
}
10+
}

components/ApiMarkdown.res

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
// This file was automatically converted to ReScript from 'ApiMarkdown.re'
2-
// Check the output and make sure to delete the original file
3-
open Util.ReactStuff
4-
51
/*
62
This module is intended for the ODOC like documentation layout.
73
It hides the h2 tags and does

components/Button.res

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
open Util.ReactStuff
2-
31
@react.component
42
let make = (~children) =>
53
<button

components/CodeMirror.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)