Skip to content

Commit a8e9a6c

Browse files
fhammerschmidtfhammerschmidt
committed
Merge remote-tracking branch 'rescript/master' into v12-migration-guide
2 parents 30a90ce + 3a050b2 commit a8e9a6c

File tree

1,139 files changed

+22994
-200462
lines changed

Some content is hidden

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

1,139 files changed

+22994
-200462
lines changed

‎.env‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
VERSION_LATEST="v11.0.0"
2-
VERSION_NEXT="v12.0.0"
1+
VITE_VERSION_LATEST="v11.0.0"
2+
VITE_VERSION_NEXT="v12.0.0"

‎.github/workflows/pull-request.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ jobs:
1010
node-version-file: ".node-version"
1111
cache: npm
1212
- run: npm ci
13-
- run: npx rescript
13+
- run: npm run res:build
1414
- run: npm test
1515
- run: npm run ci:format

‎.gitignore‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@ index_data/*.json
1414
_tempFile.cmi
1515
_tempFile.cmj
1616
_tempFile.cmt
17-
18-
# these docs are checked in, but we consider them frozen.
19-
# pages/docs/manual/v8.0.0/
20-
# pages/docs/manual/v9.0.0/
17+
_tempFile.res
18+
temp
2119

2220
.bsb.lock
2321
.merlin
@@ -35,4 +33,13 @@ public/llms/react/**/llm*.txt
3533
pages/docs/**/**/llms.mdx
3634

3735
public/playground-bundles/
38-
public/_redirects
36+
!public/_redirects
37+
38+
39+
dist
40+
build
41+
.react-router
42+
mdx-manifest.json
43+
44+
app/**/*.mjs
45+
!_shims.mjs

‎.node-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.11.0
1+
22.16.0

‎.prettierignore‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,45 @@
1+
!_shims.mjs
2+
!public/_redirects
3+
.DS_Store
4+
.next/
5+
.react-router
6+
*.swo
7+
*.swp
8+
app/**/*.mjs
9+
build
110
data/api/**/*.json
11+
dist
12+
index_data/*.json
13+
node_modules/
14+
out/
15+
public/playground-bundles/
16+
17+
# Generated via update-index script
18+
public/blog/feed.xml
19+
20+
21+
# Generated via test examples script
22+
_tempFile.cmi
23+
_tempFile.cmj
24+
_tempFile.cmt
25+
_tempFile.res
26+
temp
27+
28+
29+
.bsb.lock
30+
.merlin
31+
lib/
32+
33+
.vercel
34+
35+
src/**/*.mjs
36+
scripts/gendocs.mjs
37+
scripts/generate_*.mjs
38+
39+
# Generated via generate-llms script
40+
public/llms/manual/**/llm*.txt
41+
public/llms/react/**/llm*.txt
42+
pages/docs/**/**/llms.mdx
43+
44+
# prettier refuses to not mess up the installation table
45+
markdown-pages/docs/manual/installation.mdx

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ In case you are a blog author, please refer to our [guide on writing blog posts]
153153
In case your company is a user of ReScript and wants to be displayed on our front page ("Trusted by our users" section), do the following:
154154

155155
- Get your logo as a black / white `.svg` version and use `#979AAD` as a fill color (check out the existing logos on our front page).
156-
- Put your logo into the [`public/static/lp`](./public/static/lp) folder; the file should be named after your company.
156+
- Put your logo into the [`app/public/lp`](./app/public/lp) folder; the file should be named after your company.
157157
- Open [src/common/OurUsers.res](./src/common/OurUsers.res) and add your info
158158
- Commit, push, and open a PR.
159159

‎app/root.res‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
@module("../styles/main.css?url")
2+
external mainCss: string = "default"
3+
4+
@module("../styles/_hljs.css?url")
5+
external hljsCss: string = "default"
6+
7+
@module("../styles/utils.css?url")
8+
external utilsCss: string = "default"
9+
10+
%%raw(`
11+
import hljs from 'highlight.js/lib/core';
12+
import bash from 'highlight.js/lib/languages/bash';
13+
import css from 'highlight.js/lib/languages/css';
14+
import diff from 'highlight.js/lib/languages/diff';
15+
import javascript from 'highlight.js/lib/languages/javascript';
16+
import typescript from 'highlight.js/lib/languages/typescript';
17+
import json from 'highlight.js/lib/languages/json';
18+
import text from 'highlight.js/lib/languages/plaintext';
19+
import html from 'highlight.js/lib/languages/xml';
20+
import toml from 'highlight.js/lib/languages/ini';
21+
import rescript from 'highlightjs-rescript';
22+
23+
hljs.registerLanguage('rescript', rescript)
24+
hljs.registerLanguage('javascript', javascript)
25+
hljs.registerLanguage('css', css)
26+
hljs.registerLanguage('ts', typescript)
27+
hljs.registerLanguage('sh', bash)
28+
hljs.registerLanguage('bash', bash)
29+
hljs.registerLanguage('toml', toml)
30+
hljs.registerLanguage('json', json)
31+
hljs.registerLanguage('text', text)
32+
hljs.registerLanguage('html', html)
33+
hljs.registerLanguage('diff', diff)
34+
hljs.registerLanguage('typescript', typescript)
35+
`)
36+
37+
open ReactRouter
38+
39+
@react.component
40+
let default = () => {
41+
let {pathname} = ReactRouter.useLocation()
42+
let (isOverlayOpen, setOverlayOpen) = React.useState(_ => false)
43+
let (isScrollLockEnabled, setIsScrollLockEnabled) = React.useState(_ => false)
44+
45+
React.useEffect(() => {
46+
// When the path changes close the sidebar and disable scroll lock
47+
setOverlayOpen(_ => false)
48+
setIsScrollLockEnabled(_ => false)
49+
None
50+
}, [pathname])
51+
52+
<html>
53+
<head>
54+
<style> {React.string("html {opacity:0;}")} </style>
55+
<link rel="preload" href={mainCss} as_="style" />
56+
<link rel="stylesheet" href={mainCss} />
57+
<link rel="stylesheet" href={hljsCss} />
58+
<link rel="stylesheet" href={utilsCss} />
59+
<link rel="icon" href="/favicon.ico" />
60+
<Links />
61+
<Meta />
62+
<meta
63+
name="viewport"
64+
content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, minimal-ui"
65+
/>
66+
<meta charSet="UTF-8" />
67+
</head>
68+
<body className={isScrollLockEnabled ? "overflow-hidden" : ""}>
69+
<ScrollLockContext.Provider lockState=(isScrollLockEnabled, setIsScrollLockEnabled)>
70+
<EnableCollapsibleNavbar isEnabled={!isOverlayOpen}>
71+
<Navigation isOverlayOpen setOverlayOpen />
72+
<Outlet />
73+
<ScrollRestoration />
74+
<Scripts />
75+
</EnableCollapsibleNavbar>
76+
</ScrollLockContext.Provider>
77+
</body>
78+
</html>
79+
}

‎app/root.resi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@react.component
2+
let default: unit => Jsx.element

‎app/routes.res‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
open ReactRouter.Routes
2+
3+
let stdlibPaths = {
4+
let rawFile = await Node.Fs.readFile("./markdown-pages/docs/api/stdlib.json", "utf-8")
5+
let json = JSON.parseOrThrow(rawFile)
6+
switch json {
7+
| Object(json) => Dict.keysToArray(json)
8+
| _ => []
9+
}
10+
->Array.map(key => "docs/manual/api/" ++ key)
11+
->Array.filter(path => path !== "docs/manual/api/stdlib")
12+
}
13+
14+
let beltPaths = {
15+
let rawFile = await Node.Fs.readFile("./markdown-pages/docs/api/belt.json", "utf-8")
16+
let json = JSON.parseOrThrow(rawFile)
17+
switch json {
18+
| Object(json) => Dict.keysToArray(json)
19+
| _ => []
20+
}
21+
->Array.map(key => "docs/manual/api/" ++ key)
22+
->Array.filter(path => path !== "docs/manual/api/belt")
23+
}
24+
25+
let stdlibRoutes =
26+
stdlibPaths->Array.map(path => route(path, "./routes/ApiRoute.mjs", ~options={id: path}))
27+
28+
let beltRoutes =
29+
beltPaths->Array.map(path => route(path, "./routes/ApiRoute.mjs", ~options={id: path}))
30+
31+
let default = [
32+
index("./routes/LandingPageRoute.mjs"),
33+
route("packages", "./routes/PackagesRoute.mjs"),
34+
route("try", "./routes/TryRoute.mjs"),
35+
route("syntax-lookup", "./routes/SyntaxLookupRoute.mjs", ~options={id: "syntax-lookup"}),
36+
route("blog", "./routes/BlogRoute.mjs", ~options={id: "blog-index"}),
37+
route("blog/archived", "./routes/BlogRoute.mjs", ~options={id: "blog-archived"}),
38+
route("docs", "./routes/DocsOverview.mjs", ~options={id: "docs-overview"}),
39+
route("docs/manual/api/stdlib", "./routes/ApiRoute.mjs", ~options={id: "api-stdlib"}),
40+
route("docs/manual/api/introduction", "./routes/ApiRoute.mjs", ~options={id: "api-intro"}),
41+
route("docs/manual/api/belt", "./routes/ApiRoute.mjs", ~options={id: "api-belt"}),
42+
route("docs/manual/api/dom", "./routes/ApiRoute.mjs", ~options={id: "api-dom"}),
43+
...stdlibRoutes,
44+
...beltRoutes,
45+
...mdxRoutes("./routes/MdxRoute.mjs"),
46+
route("*", "./routes/NotFoundRoute.mjs"),
47+
]

‎app/routes.resi‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
let stdlibPaths: array<string>
2+
let beltPaths: array<string>
3+
let stdlibRoutes: array<ReactRouter.Routes.t>
4+
let beltRoutes: array<ReactRouter.Routes.t>
5+
let default: Belt.Array.t<ReactRouter.Routes.t>

0 commit comments

Comments
 (0)