diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a41f779..714c4911 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/LOCAL_DEVELOPMENT.md b/LOCAL_DEVELOPMENT.md index 19548061..cfd810de 100644 --- a/LOCAL_DEVELOPMENT.md +++ b/LOCAL_DEVELOPMENT.md @@ -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 diff --git a/build-ci.sh b/build-ci.sh index e617a05b..d2310d37 100755 --- a/build-ci.sh +++ b/build-ci.sh @@ -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/; diff --git a/packages/rescript-relay/package.json b/packages/rescript-relay/package.json index ec49bf5d..278c1929 100644 --- a/packages/rescript-relay/package.json +++ b/packages/rescript-relay/package.json @@ -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", diff --git a/packages/rescript-relay/bsconfig.json b/packages/rescript-relay/rescript.json similarity index 100% rename from packages/rescript-relay/bsconfig.json rename to packages/rescript-relay/rescript.json diff --git a/packages/rescript-relay/bsconfig.release.json b/packages/rescript-relay/rescript.release.json similarity index 100% rename from packages/rescript-relay/bsconfig.release.json rename to packages/rescript-relay/rescript.release.json