Skip to content

Commit

Permalink
bsconfig.json -> rescript.json
Browse files Browse the repository at this point in the history
  • Loading branch information
zth committed Feb 26, 2024
1 parent 14d7a69 commit b59e0dc
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- Clean up connection handler generators now that v3 let us use a better representation.
- Fix issue with default args in connection id makers. https://github.com/zth/rescript-relay/pull/488
- Fix issue with PPX not actually converting all functions to uncurried.
- Rename `bsconfig.json` -> `rescript.json`.

# 3.0.0-rc.4

Expand Down
2 changes: 1 addition & 1 deletion LOCAL_DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Any feature added or fix done should consider whether that case is covered in th

`/packages/rescript-relay/src` contains all the _ReScript_ code shipped in the package. You build it by running `yarn build` in `/packages/rescript-relay`.

`bsconfig.json` is only used for development, the actual `bsconfig.json` that'll be copied to the published package is located in `bsconfig.release.json`. This setup isn't great and it's likely that we'll move to using the same `bsconfig.json` for dev and release, with a script stripping unwanted things from the config before copying it to the release bundle.
`rescript.json` is only used for development, the actual `rescript.json` that'll be copied to the published package is located in `rescript.release.json`. This setup isn't great and it's likely that we'll move to using the same `rescript.json` for dev and release, with a script stripping unwanted things from the config before copying it to the release bundle.

## The PPX

Expand Down
2 changes: 1 addition & 1 deletion build-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ sed -i 's/module\.exports \= /export /g' ../../_release/src/utils.mjs;

# copy config files
echo "Copying config files..."
cp bsconfig.release.json ../../_release/bsconfig.json;
cp rescript.release.json ../../_release/rescript.json;
./copyPackageJson.js ../../_release $INPUT_TAG_NAME
cp yarn.lock ../../_release/;
cp compiler.js ../../_release/;
Expand Down
2 changes: 1 addition & 1 deletion packages/rescript-relay/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"rescript-relay-cli": "cli/cli.js"
},
"scripts": {
"build": "rescript build -with-deps",
"build": "rescript",
"build:test": "./build-compiler-dev.sh && ./rescript-relay-compiler",
"postinstall": "node postinstall.js",
"test": "jest",
Expand Down
File renamed without changes.

0 comments on commit b59e0dc

Please sign in to comment.