Skip to content

Commit 3ff6006

Browse files
Merge remote-tracking branch 'rescript/master' into v12-post
2 parents 5bc85d5 + 3a050b2 commit 3ff6006

File tree

1,142 files changed

+22994
-200676
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,142 files changed

+22994
-200676
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

_blogposts/2025-11-17-announcing-rescript-12.mdx

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

0 commit comments

Comments
 (0)