upgrade dune version to get WASM build

cometkim · cometkim · commit 251dd7b8fa84 · 2025-03-25T05:01:11.000+09:00
diff --git a/analysis.opam b/analysis.opam
@@ -9,10 +9,11 @@ bug-reports: "https://github.com/rescript-lang/rescript-compiler/issues"
 depends: [
   "ocaml" {>= "4.14"}
   "cppo" {= "1.8.0"}
-  "dune"
+  "dune" {>= "3.17"}
+  "odoc" {with-doc}
 ]
 build: [
-  ["dune" "subst"] {pinned}
+  ["dune" "subst"] {dev}
   [
     "dune"
     "build"
diff --git a/compiler/jsoo/dune b/compiler/jsoo/dune
@@ -2,9 +2,10 @@
 
 (executables
  (names jsoo_playground_main)
- (modes js)
+ (modes js wasm)
  (enabled_if
   (= %{profile} browser))
  (flags
   (:standard -w +a-4-9-40-42-44-45))
- (libraries core syntax ml js_of_ocaml))
+ (libraries core syntax ml js_of_ocaml)
+ (preprocess (pps js_of_ocaml-ppx)))
diff --git a/compiler/jsoo/jsoo_playground_main.ml b/compiler/jsoo/jsoo_playground_main.ml
@@ -676,11 +676,9 @@ module Export = struct
 end
 
 let () =
-  export "rescript_compiler"
-    Js.Unsafe.(
-      obj
-        [|
-          ("api_version", inject @@ Js.string api_version);
-          ("version", inject @@ Js.string Bs_version.version);
-          ("make", inject @@ Export.make);
-        |])
+  Js.export "rescript_compiler"
+    (object%js
+       val api_version = api_version
+       val version = Bs_version.version
+       method make = Export.make ()
+    end)
diff --git a/dune-project b/dune-project
@@ -1,4 +1,4 @@
-(lang dune 2.3)
+(lang dune 3.17)
 
 (name rescript)
 
diff --git a/rescript.opam b/rescript.opam
@@ -14,10 +14,11 @@ depends: [
   "cppo" {= "1.8.0"}
   "js_of_ocaml" {= "6.0.1"}
   "ounit2" {= "2.2.7"}
-  "dune"
+  "dune" {>= "3.17"}
+  "odoc" {with-doc}
 ]
 build: [
-  ["dune" "subst"] {pinned}
+  ["dune" "subst"] {dev}
   [
     "dune"
     "build"
diff --git a/tools.opam b/tools.opam
@@ -10,10 +10,11 @@ depends: [
   "ocaml" {>= "4.14"}
   "cppo" {= "1.8.0"}
   "analysis"
-  "dune"
+  "dune" {>= "3.17"}
+  "odoc" {with-doc}
 ]
 build: [
-  ["dune" "subst"] {pinned}
+  ["dune" "subst"] {dev}
   [
     "dune"
     "build"

Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,11 @@ bug-reports: "https://github.com/rescript-lang/rescript-compiler/issues"`
`9`	`9`	`depends: [`
`10`	`10`	`"ocaml" {>= "4.14"}`
`11`	`11`	`"cppo" {= "1.8.0"}`
`12`		`- "dune"`
	`12`	`+ "dune" {>= "3.17"}`
	`13`	`+ "odoc" {with-doc}`
`13`	`14`	`]`
`14`	`15`	`build: [`
`15`		`- ["dune" "subst"] {pinned}`
	`16`	`+ ["dune" "subst"] {dev}`
`16`	`17`	`[`
`17`	`18`	`"dune"`
`18`	`19`	`"build"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-(lang dune 2.3)`
	`1`	`+(lang dune 3.17)`
`2`	`2`
`3`	`3`	`(name rescript)`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,11 @@ depends: [`
`14`	`14`	`"cppo" {= "1.8.0"}`
`15`	`15`	`"js_of_ocaml" {= "6.0.1"}`
`16`	`16`	`"ounit2" {= "2.2.7"}`
`17`		`- "dune"`
	`17`	`+ "dune" {>= "3.17"}`
	`18`	`+ "odoc" {with-doc}`
`18`	`19`	`]`
`19`	`20`	`build: [`
`20`		`- ["dune" "subst"] {pinned}`
	`21`	`+ ["dune" "subst"] {dev}`
`21`	`22`	`[`
`22`	`23`	`"dune"`
`23`	`24`	`"build"`
Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,11 @@ depends: [`
`10`	`10`	`"ocaml" {>= "4.14"}`
`11`	`11`	`"cppo" {= "1.8.0"}`
`12`	`12`	`"analysis"`
`13`		`- "dune"`
	`13`	`+ "dune" {>= "3.17"}`
	`14`	`+ "odoc" {with-doc}`
`14`	`15`	`]`
`15`	`16`	`build: [`
`16`		`- ["dune" "subst"] {pinned}`
	`17`	`+ ["dune" "subst"] {dev}`
`17`	`18`	`[`
`18`	`19`	`"dune"`
`19`	`20`	`"build"`