Skip to content

Commit baae0d6

Browse files
Fix merge conflict
1 parent 65f27fa commit baae0d6

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/common/CompilerManagerHook.res

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,11 @@ module Semver = {
108108
}
109109

110110
module CdnMeta = {
111-
let experimentalVersions = ["v11.0.0-rc.3", "v11.0.0-beta.4", "v11.0.0-beta.1", "v11.0.0-alpha.5"]
111+
let getCompilerUrl = (version): string =>
112+
`https://cdn.rescript-lang.org/${Semver.toString(version)}/compiler.js`
112113

113-
let getCompilerUrl = (version: string): string =>
114-
`https://cdn.rescript-lang.org/${version}/compiler.js`
115-
116-
let getLibraryCmijUrl = (version: string, libraryName: string): string =>
117-
`https://cdn.rescript-lang.org/${version}/${libraryName}/cmij.js`
114+
let getLibraryCmijUrl = (version, libraryName: string): string =>
115+
`https://cdn.rescript-lang.org/${Semver.toString(version)}/${libraryName}/cmij.js`
118116
}
119117

120118
module FinalResult = {

0 commit comments

Comments
 (0)