Guard open modules with api version >= 4

rescript-lang · Nov 1, 2023 · 931b9f5 · 931b9f5
1 parent b268ff4
commit 931b9f5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/Playground.res b/src/Playground.res
@@ -903,10 +903,13 @@ module Settings = {
     let onResetClick = evt => {
       ReactEvent.Mouse.preventDefault(evt)
 
-      let open_modules =
+      let open_modules = switch readyState.selected.apiVersion {
+      | V1 | V2 | V3 | UnknownVersion(_) => None
+      | V4 =>
         readyState.selected.libraries->Belt.Array.some(el => el === "@rescript/core")
           ? Some(["RescriptCore"])
           : None
+      }
 
       let defaultConfig = {
         Api.Config.module_system: "nodejs",

diff --git a/src/common/CompilerManagerHook.res b/src/common/CompilerManagerHook.res
@@ -145,6 +145,12 @@ let getLibrariesForVersion = (~version: Semver.t): array<string> => {
   libraries
 }
 
+let getOpenModules = (~apiVersion: Version.t, ~libraries: array<string>): option<array<string>> =>
+  switch apiVersion {
+  | V1 | V2 | V3 | UnknownVersion(_) => None
+  | V4 => libraries->Belt.Array.some(el => el === "@rescript/core") ? Some(["RescriptCore"]) : None
+  }
+
 /*
     This function loads the compiler, plus a defined set of libraries that are available
     on our bs-platform-js-releases channel.
@@ -396,6 +402,7 @@ let useCompilerManager = (
             | Ok() =>
               let instance = Compiler.make()
               let apiVersion = apiVersion->Version.fromString
+              let open_modules = getOpenModules(~apiVersion, ~libraries)
 
               // Note: The compiler bundle currently defaults to
               // commonjs when initiating the compiler, but our playground
@@ -405,6 +412,7 @@ let useCompilerManager = (
               let config = {
                 ...instance->Compiler.getConfig,
                 module_system: "es6",
+                ?open_modules,
               }
               instance->Compiler.setConfig(config)
 
@@ -453,11 +461,7 @@ let useCompilerManager = (
 
           let instance = Compiler.make()
           let apiVersion = apiVersion->Version.fromString
-
-          let open_modules =
-            libraries->Belt.Array.some(el => el === "@rescript/core")
-              ? Some(["RescriptCore"])
-              : None
+          let open_modules = getOpenModules(~apiVersion, ~libraries)
 
           let config = {...instance->Compiler.getConfig, ?open_modules}
           instance->Compiler.setConfig(config)