Skip to content

Commit ec19b64

Browse files
committed
Do not allow selection of v12 beta/rc versions now that final is out
1 parent ba436c6 commit ec19b64

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/RescriptVersions.res

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module P = ClackPrompts
22

3-
let rescript12VersionRange = ">=12.0.0-beta.1"
4-
let rescriptVersionRange = `11.x.x || ${rescript12VersionRange}`
3+
let rescriptVersionRange = `11.x.x || 12.x.x`
54
let rescriptCoreVersionRange = ">=1.0.0"
6-
let rescriptRewatchVersionRange = ">=12.0.0-alpha.15"
5+
let includesRewatchVersionRange = ">=12.0.0-alpha.15"
6+
let includesStdlibVersionRange = ">=12.0.0-beta.1"
77

88
type versions = {rescriptVersion: string, rescriptCoreVersion: option<string>}
99

@@ -39,7 +39,7 @@ let promptVersions = async () => {
3939
let options = rescriptVersions->Array.map(v => {P.value: v})
4040

4141
let initialValue =
42-
options->Array.find(o => o.value->String.startsWith("11."))->Option.map(o => o.value)
42+
options->Array.find(o => o.value->String.startsWith("12."))->Option.map(o => o.value)
4343

4444
let selectOptions = {ClackPrompts.message: "ReScript version?", options, ?initialValue}
4545

@@ -57,10 +57,10 @@ let promptVersions = async () => {
5757
~rescriptCoreVersions,
5858
)
5959

60-
let isRescript12 = CompareVersions.satisfies(rescriptVersion, rescript12VersionRange)
60+
let includesStdlib = CompareVersions.satisfies(rescriptVersion, includesStdlibVersionRange)
6161

6262
let rescriptCoreVersion = switch rescriptCoreVersions {
63-
| _ if isRescript12 => None
63+
| _ if includesStdlib => None
6464
| [version] => Some(version)
6565
| _ =>
6666
let version = await P.select({
@@ -98,4 +98,4 @@ let esmModuleSystemName = ({rescriptVersion}) =>
9898
CompareVersions.compareVersions(rescriptVersion, "11.1.0-rc.8") > 0. ? "esmodule" : "es6"
9999

100100
let usesRewatch = ({rescriptVersion}) =>
101-
CompareVersions.satisfies(rescriptVersion, rescriptRewatchVersionRange)
101+
CompareVersions.satisfies(rescriptVersion, includesRewatchVersionRange)

0 commit comments

Comments
 (0)