fix playground

Author: cometkim

jscomp/jsoo/jsoo_playground_main.ml

@@ -74,7 +74,7 @@ end
 
 module BundleConfig = struct
   type t = {
-    mutable module_system: Js_packages_info.module_system;
+    mutable module_system: Ext_module_system.t;
     mutable filename: string option;
     mutable warn_flags: string;
     mutable open_modules: string list;
@@ -86,7 +86,7 @@ module BundleConfig = struct
   }
 
   let make () = {
-    module_system=Js_packages_info.NodeJS;
+    module_system=Ext_module_system.Commonjs;
     filename=None;
     warn_flags=Bsc_warnings.defaults_w;
     open_modules=[];
@@ -97,8 +97,8 @@ module BundleConfig = struct
   let default_filename (lang: Lang.t) = "playground." ^ (Lang.toString lang)
 
   let string_of_module_system m = (match m with
-    | Js_packages_info.NodeJS -> "nodejs"
-    | Es6 -> "es6"
+    | Ext_module_system.Commonjs -> "nodejs"
+    | Esmodule -> "es6"
     | Es6_global -> "es6_global")
 end
 
@@ -608,10 +608,10 @@ module Export = struct
     let config = BundleConfig.make () in
     let set_module_system value =
       match value with
-      | "es6" ->
-        config.module_system <- Js_packages_info.Es6; true
-      | "nodejs" ->
-        config.module_system <- NodeJS; true
+      | "esmodule" | "es6" ->
+        config.module_system <- Ext_module_system.Esmodule; true
+      | "commonjs" | "nodejs" ->
+        config.module_system <- Commonjs; true
       | _ -> false in
     let set_filename value =
       config.filename <- Some value; true

packages/playground-bundling/bsconfig.json renamed to packages/playground-bundling/rescript.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "bs-dependencies": ["@rescript/react", "@rescript/core"],
   "package-specs": {
-    "module": "es6",
+    "module": "esmodule",
     "in-source": false
   },
   "sources": {

packages/playground-bundling/scripts/generate_cmijs.js

@@ -6,7 +6,7 @@
  * rescript version as the compiler bundle.
  *
  * This script extracts all cmi / cmj files of the rescript/lib/ocaml and all
- * dependencies listed in the project root's bsconfig.json, creates cmij.js
+ * dependencies listed in the project root's rescript.json, creates cmij.js
  * files for each library and puts them in the compiler playground directory.
  *
  * The cmij files are representing the marshaled dependencies that can be used with the ReScript
@@ -17,7 +17,7 @@ const child_process = require("child_process");
 const fs = require("fs");
 const path = require("path");
 
-const bsconfig = require("../bsconfig.json");
+const resConfig = require("../rescript.json");
 
 const RESCRIPT_COMPILER_ROOT_DIR = path.join(__dirname, "..", "..", "..");
 const PLAYGROUND_DIR = path.join(RESCRIPT_COMPILER_ROOT_DIR, "playground");
@@ -51,7 +51,7 @@ e(`npm link ${RESCRIPT_COMPILER_ROOT_DIR}`);
 e(`npx rescript clean`);
 e(`npx rescript`);
 
-const packages = bsconfig["bs-dependencies"];
+const packages = resConfig["bs-dependencies"];
 
 // We need to build the compiler's builtin modules as a separate cmij.
 // Otherwise we can't use them for compilation within the playground.