Skip to content

Commit 171a9ef

Browse files
committed
fix playground
1 parent e93eb8c commit 171a9ef

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

jscomp/jsoo/jsoo_playground_main.ml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ end
7474

7575
module BundleConfig = struct
7676
type t = {
77-
mutable module_system: Js_packages_info.module_system;
77+
mutable module_system: Ext_module_system.t;
7878
mutable filename: string option;
7979
mutable warn_flags: string;
8080
mutable open_modules: string list;
@@ -86,7 +86,7 @@ module BundleConfig = struct
8686
}
8787

8888
let make () = {
89-
module_system=Js_packages_info.NodeJS;
89+
module_system=Ext_module_system.Commonjs;
9090
filename=None;
9191
warn_flags=Bsc_warnings.defaults_w;
9292
open_modules=[];
@@ -97,8 +97,8 @@ module BundleConfig = struct
9797
let default_filename (lang: Lang.t) = "playground." ^ (Lang.toString lang)
9898

9999
let string_of_module_system m = (match m with
100-
| Js_packages_info.NodeJS -> "nodejs"
101-
| Es6 -> "es6"
100+
| Ext_module_system.Commonjs -> "nodejs"
101+
| Esmodule -> "es6"
102102
| Es6_global -> "es6_global")
103103
end
104104

@@ -608,10 +608,10 @@ module Export = struct
608608
let config = BundleConfig.make () in
609609
let set_module_system value =
610610
match value with
611-
| "es6" ->
612-
config.module_system <- Js_packages_info.Es6; true
613-
| "nodejs" ->
614-
config.module_system <- NodeJS; true
611+
| "esmodule" | "es6" ->
612+
config.module_system <- Ext_module_system.Esmodule; true
613+
| "commonjs" | "nodejs" ->
614+
config.module_system <- Commonjs; true
615615
| _ -> false in
616616
let set_filename value =
617617
config.filename <- Some value; true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.1.0",
44
"bs-dependencies": ["@rescript/react", "@rescript/core"],
55
"package-specs": {
6-
"module": "es6",
6+
"module": "esmodule",
77
"in-source": false
88
},
99
"sources": {

0 commit comments

Comments
 (0)