Skip to content

Commit ac36283

Browse files
cometkimcometkim
authored
Ensure version bump using Yarn constraints (#7481)
* Ensure version bump using Yarn constraints * constraints for other meta * Update yarn.config.cjs
1 parent 1e69109 commit ac36283

File tree

16 files changed

+214
-143
lines changed

16 files changed

+214
-143
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ jobs:
338338
run: git diff --exit-code lib/js lib/es6
339339

340340
- name: Version Check
341-
run: ./scripts/prebuilt.js
341+
run: yarn constraints
342342

343343
- name: Run tests
344344
run: node scripts/test.js -all

‎CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,8 +388,8 @@ To build a new version and release it on NPM, follow these steps:
388388
- `npm dist-tag add @rescript/std@<version> <tag>`
389389
1. Create a release entry for the version tag on the [Github Releases page](https://github.com/rescript-lang/rescript-compiler/releases), copying the changes from `CHANGELOG.md`.
390390
1. Create a PR with the following changes to prepare for development of the next version:
391-
- Increment the version number in `package.json` for the next version.
392-
- Run `node scripts/setVersion.js` to take that version number over into other files.
391+
- Increment the `EXPECTED_VERSION` number in `yarn.config.cjs` for the next version.
392+
- Run `yarn constraints --fix` to take that version number over into other files.
393393
- Update `CHANGELOG.md` and add an entry for the next version, e.g., "10.0.0-beta.2 (Unreleased)"
394394
1. Coordinate any forum/blog posts with [@ryyppy](https://github.com/ryyppy).
395395

‎Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,9 @@ reanalyze:
5959

6060
lib-bsb:
6161
./scripts/buildRuntime.sh
62-
./scripts/prebuilt.js
6362

6463
lib:
6564
./scripts/buildRuntimeRewatch.sh
66-
./scripts/prebuilt.js
6765

6866
artifacts: lib
6967
./scripts/npmPack.js --updateArtifactList

‎package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"Language"
1212
],
1313
"license": "SEE LICENSE IN LICENSE",
14-
"homepage": "http://rescript-lang.org",
15-
"bugs": "https://github.com/rescript-lang/rescript-compiler/issues",
14+
"homepage": "https://rescript-lang.org",
15+
"bugs": "https://github.com/rescript-lang/rescript/issues",
1616
"repository": {
1717
"type": "git",
18-
"url": "git+https://github.com/rescript-lang/rescript-compiler.git"
18+
"url": "git+https://github.com/rescript-lang/rescript.git"
1919
},
2020
"author": {
2121
"name": "Hongbo Zhang",
@@ -84,10 +84,9 @@
8484
"devDependencies": {
8585
"@biomejs/biome": "1.9.4",
8686
"@types/node": "^20.14.9",
87-
"@types/semver": "^7.5.8",
87+
"@yarnpkg/types": "^4.0.1",
8888
"mocha": "10.8.2",
8989
"nyc": "15.0.0",
90-
"semver": "7.6.2",
9190
"typescript": "5.8.2"
9291
},
9392
"workspaces": [
@@ -98,5 +97,6 @@
9897
"tests/gentype_tests/**",
9998
"tests/tools_tests"
10099
],
101-
"packageManager": "[email protected]"
100+
"packageManager": "[email protected]",
101+
"preferUnplugged": true
102102
}

‎packages/@rescript/darwin-arm64/package.json

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,29 @@
33
"version": "12.0.0-alpha.13",
44
"description": "ReScript binaries for MacOS ARM64",
55
"type": "module",
6+
"homepage": "https://rescript-lang.org",
7+
"bugs": "https://github.com/rescript-lang/rescript/issues",
68
"repository": {
79
"type": "git",
8-
"url": "git+https://github.com/rescript-lang/rescript-compiler.git"
10+
"url": "git+https://github.com/rescript-lang/rescript.git"
911
},
12+
"author": {
13+
"name": "Hongbo Zhang",
14+
"email": "[email protected]"
15+
},
16+
"maintainers": [
17+
"Christoph Knittel (https://github.com/cknitt)",
18+
"Cristiano Calcagno (https://github.com/cristianoc)",
19+
"Dmitry Zakharov (https://github.com/DZakh)",
20+
"Florian Hammerschmidt (https://github.com/fhammerschmidt)",
21+
"Gabriel Nordeborn (https://github.com/zth)",
22+
"Hyeseong Kim (https://github.com/cometkim)",
23+
"Jaap Frolich (https://github.com/jfrolich)",
24+
"Matthias Le Brun (https://github.com/bloodyowl)",
25+
"Patrick Ecker (https://github.com/ryyppy)",
26+
"Paul Tsnobiladzé (https://github.com/tsnobip)",
27+
"Woonki Moon (https://github.com/mununki)"
28+
],
1029
"publishConfig": {
1130
"access": "public",
1231
"executableFiles": [

‎packages/@rescript/darwin-x64/package.json

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,29 @@
33
"version": "12.0.0-alpha.13",
44
"description": "ReScript binaries for MacOS x86_64",
55
"type": "module",
6+
"homepage": "https://rescript-lang.org",
7+
"bugs": "https://github.com/rescript-lang/rescript/issues",
68
"repository": {
79
"type": "git",
8-
"url": "git+https://github.com/rescript-lang/rescript-compiler.git"
10+
"url": "git+https://github.com/rescript-lang/rescript.git"
911
},
12+
"author": {
13+
"name": "Hongbo Zhang",
14+
"email": "[email protected]"
15+
},
16+
"maintainers": [
17+
"Christoph Knittel (https://github.com/cknitt)",
18+
"Cristiano Calcagno (https://github.com/cristianoc)",
19+
"Dmitry Zakharov (https://github.com/DZakh)",
20+
"Florian Hammerschmidt (https://github.com/fhammerschmidt)",
21+
"Gabriel Nordeborn (https://github.com/zth)",
22+
"Hyeseong Kim (https://github.com/cometkim)",
23+
"Jaap Frolich (https://github.com/jfrolich)",
24+
"Matthias Le Brun (https://github.com/bloodyowl)",
25+
"Patrick Ecker (https://github.com/ryyppy)",
26+
"Paul Tsnobiladzé (https://github.com/tsnobip)",
27+
"Woonki Moon (https://github.com/mununki)"
28+
],
1029
"publishConfig": {
1130
"access": "public",
1231
"executableFiles": [

‎packages/@rescript/linux-arm64/package.json

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,29 @@
33
"version": "12.0.0-alpha.13",
44
"description": "ReScript binaries for Linux ARM64",
55
"type": "module",
6+
"homepage": "https://rescript-lang.org",
7+
"bugs": "https://github.com/rescript-lang/rescript/issues",
68
"repository": {
79
"type": "git",
8-
"url": "git+https://github.com/rescript-lang/rescript-compiler.git"
10+
"url": "git+https://github.com/rescript-lang/rescript.git"
911
},
12+
"author": {
13+
"name": "Hongbo Zhang",
14+
"email": "[email protected]"
15+
},
16+
"maintainers": [
17+
"Christoph Knittel (https://github.com/cknitt)",
18+
"Cristiano Calcagno (https://github.com/cristianoc)",
19+
"Dmitry Zakharov (https://github.com/DZakh)",
20+
"Florian Hammerschmidt (https://github.com/fhammerschmidt)",
21+
"Gabriel Nordeborn (https://github.com/zth)",
22+
"Hyeseong Kim (https://github.com/cometkim)",
23+
"Jaap Frolich (https://github.com/jfrolich)",
24+
"Matthias Le Brun (https://github.com/bloodyowl)",
25+
"Patrick Ecker (https://github.com/ryyppy)",
26+
"Paul Tsnobiladzé (https://github.com/tsnobip)",
27+
"Woonki Moon (https://github.com/mununki)"
28+
],
1029
"publishConfig": {
1130
"access": "public",
1231
"executableFiles": [

‎packages/@rescript/linux-x64/package.json

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,29 @@
33
"version": "12.0.0-alpha.13",
44
"description": "ReScript binaries for Linux x86_64",
55
"type": "module",
6+
"homepage": "https://rescript-lang.org",
7+
"bugs": "https://github.com/rescript-lang/rescript/issues",
68
"repository": {
79
"type": "git",
8-
"url": "git+https://github.com/rescript-lang/rescript-compiler.git"
10+
"url": "git+https://github.com/rescript-lang/rescript.git"
911
},
12+
"author": {
13+
"name": "Hongbo Zhang",
14+
"email": "[email protected]"
15+
},
16+
"maintainers": [
17+
"Christoph Knittel (https://github.com/cknitt)",
18+
"Cristiano Calcagno (https://github.com/cristianoc)",
19+
"Dmitry Zakharov (https://github.com/DZakh)",
20+
"Florian Hammerschmidt (https://github.com/fhammerschmidt)",
21+
"Gabriel Nordeborn (https://github.com/zth)",
22+
"Hyeseong Kim (https://github.com/cometkim)",
23+
"Jaap Frolich (https://github.com/jfrolich)",
24+
"Matthias Le Brun (https://github.com/bloodyowl)",
25+
"Patrick Ecker (https://github.com/ryyppy)",
26+
"Paul Tsnobiladzé (https://github.com/tsnobip)",
27+
"Woonki Moon (https://github.com/mununki)"
28+
],
1029
"publishConfig": {
1130
"access": "public",
1231
"executableFiles": [

‎packages/@rescript/win32-x64/package.json

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,29 @@
33
"version": "12.0.0-alpha.13",
44
"description": "ReScript binaries for Windows x86_64",
55
"type": "module",
6+
"homepage": "https://rescript-lang.org",
7+
"bugs": "https://github.com/rescript-lang/rescript/issues",
68
"repository": {
79
"type": "git",
8-
"url": "git+https://github.com/rescript-lang/rescript-compiler.git"
10+
"url": "git+https://github.com/rescript-lang/rescript.git"
911
},
12+
"author": {
13+
"name": "Hongbo Zhang",
14+
"email": "[email protected]"
15+
},
16+
"maintainers": [
17+
"Christoph Knittel (https://github.com/cknitt)",
18+
"Cristiano Calcagno (https://github.com/cristianoc)",
19+
"Dmitry Zakharov (https://github.com/DZakh)",
20+
"Florian Hammerschmidt (https://github.com/fhammerschmidt)",
21+
"Gabriel Nordeborn (https://github.com/zth)",
22+
"Hyeseong Kim (https://github.com/cometkim)",
23+
"Jaap Frolich (https://github.com/jfrolich)",
24+
"Matthias Le Brun (https://github.com/bloodyowl)",
25+
"Patrick Ecker (https://github.com/ryyppy)",
26+
"Paul Tsnobiladzé (https://github.com/tsnobip)",
27+
"Woonki Moon (https://github.com/mununki)"
28+
],
1029
"publishConfig": {
1130
"access": "public",
1231
"executableFiles": [

‎packages/std/package.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@
77
"functional programming"
88
],
99
"license": "SEE LICENSE IN LICENSE",
10-
"homepage": "http://rescript-lang.org",
11-
"bugs": "https://github.com/rescript-compiler/issues",
10+
"homepage": "https://rescript-lang.org",
11+
"bugs": "https://github.com/rescript-lang/rescript/issues",
12+
"repository": {
13+
"type": "git",
14+
"url": "git+https://github.com/rescript-lang/rescript.git"
15+
},
1216
"author": {
1317
"name": "Hongbo Zhang",
1418
"email": "[email protected]"
@@ -28,5 +32,6 @@
2832
],
2933
"files": [
3034
"lib"
31-
]
35+
],
36+
"preferUnplugged": true
3237
}

‎scripts/prebuilt.js

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

‎scripts/setVersion.js

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

‎tests/dependencies/rescript-react/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"name": "@rescript/react",
2+
"name": "@tests/rescript-react",
33
"private": true
44
}

‎tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"packages/**",
2020
"tests/**/input.js",
2121
".github/workflows/*.js",
22+
"yarn.config.cjs",
2223
"package.json"
2324
],
2425
"exclude": ["*.res.js", "*.res.mjs"]

0 commit comments

Comments
 (0)