Skip to content

Commit 3bab36c

Browse files
committed
Switch from .bs.js to .js build artifacts
We don't want to differentiate between plain JS files and ReScript generated JS files. Also adapts all imports that target ReScript JS files accordingly
1 parent 4563e86 commit 3bab36c

16 files changed

+20
-19
lines changed

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ out
44
*.swp
55
*.swo
66

7-
*.bs.js
8-
97
# Generated via update-index script
108
public/blog/feed.xml
119

@@ -24,3 +22,6 @@ lib/
2422
.vscode/
2523

2624
.vercel
25+
26+
# for IDE tooling tests
27+
bin.exe

_blogposts/2020-08-28-new-rescript-logo.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ description: |
88
Today, our resident designer Bettina is unveiling to us the fresh new ReScript branding we've been long waiting for. We hope you're as excited about the result as us!
99
---
1010

11-
import Image from "components/Image.bs";
11+
import Image from "components/Image";
1212

1313
## Why the Rebranding?
1414

_blogposts/archive/state-of-reasonml-org-2020-q2-pt1.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ description: |
1010
to expect in the future. The first part is an introduction to our project.
1111
---
1212

13-
import Image from "components/Image.bs";
13+
import Image from "components/Image";
1414

1515
## Hello World!
1616

_blogposts/archive/state-of-reasonml-org-2020-q2-pt3.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ description: |
99
talk about upcoming tools and features.
1010
---
1111

12-
import Image from "components/Image.bs";
12+
import Image from "components/Image";
1313

1414
## Future Tools for the Community
1515

_blogposts/archive/state-of-reasonml-org-2020-q2-pt4.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ description: |
1010
This is the final part of the series about our vision of a more accessible Reason platform.
1111
---
1212

13-
import Image from "components/Image.bs";
13+
import Image from "components/Image";
1414

1515
## It's all Opinions
1616

bsconfig.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
},
3131
{
3232
"dir": "scripts",
33-
"subdirs": true
33+
"subdirs": true,
34+
"type": "dev"
3435
},
3536
{
3637
"dir": "components",
@@ -45,7 +46,7 @@
4546
"warnings": {
4647
"error": "+8"
4748
},
48-
"suffix": ".bs.js",
49+
"suffix": ".js",
4950
"bsc-flags": [
5051
"-bs-no-version-header",
5152
"-bs-super-errors",

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,10 @@
4242
"test": "node scripts/test-examples.js && node scripts/test-hrefs.js",
4343
"check-dead-code": "reanalyze -dce",
4444
"check-for-exceptions": "reanalyze -exception",
45-
"update-index": "node scripts/extract-indices.js && node scripts/extract-tocs.js && node -r esm scripts/generate_feed.bs.js > public/blog/feed.xml",
45+
"update-index": "node scripts/extract-indices.js && node scripts/extract-tocs.js && node -r esm scripts/generate_feed.js > public/blog/feed.xml",
4646
"now-build": "yarn run build",
4747
"export": "next export",
4848
"start": "next start -p $PORT",
49-
"introspection": "./scripts/introspection.js",
5049
"bs:build": "bsb -make-world",
5150
"bs:clean": "bsb -clean-world",
5251
"bs:start": "bsb -make-world -w"

pages/_app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
//return <Component {...pageProps} />
77
//}
88

9-
import make from "../common/App.bs";
9+
import make from "common/App.js";
1010

1111
export default make;

pages/blog/[slug].js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ export {
22
default,
33
getStaticPaths,
44
getStaticProps
5-
} from "../../re_pages/Blog_Article.bs";
5+
} from "re_pages/Blog_Article.js";

pages/docs/latest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
import make from "re_pages/DocsOverview.bs";
1+
import make from "re_pages/DocsOverview.js";
22

33
export default make;

0 commit comments

Comments
 (0)