Bump jsoo

compiler/dune

@@ -1,9 +1,31 @@
 (alias
  (name native)
- (deps grainc/grainc.exe graindoc/graindoc.exe grainformat/grainformat.exe
-   grainlsp/grainlsp.exe test/test.exe))
+ (deps
+  grainc/grainc.exe
+  graindoc/graindoc.exe
+  grainformat/grainformat.exe
+  grainlsp/grainlsp.exe
+  test/test.exe))
 
 (alias
  (name js)
- (deps grainc/grainc.bc.js graindoc/graindoc.bc.js
-   grainformat/grainformat.bc.js grainlsp/grainlsp.bc.js test/test.bc.js))
+ (deps
+  grainc/grainc.bc.js
+  graindoc/graindoc.bc.js
+  grainformat/grainformat.bc.js
+  grainlsp/grainlsp.bc.js
+  test/test.bc.js))
+
+(env
+ (_
+  (js_of_ocaml
+   (flags (:standard) --quiet --no-extern-fs --disable use-js-string)
+   (link_flags (:standard) --quiet --disable use-js-string)
+   (build_runtime_flags
+    (:standard)
+    --quiet
+    --no-extern-fs
+    --disable
+    use-js-string))))
+
+(data_only_dirs node_modules)

compiler/dune-project

@@ -1,4 +1,4 @@
-(lang dune 2.3)
+(lang dune 3.0)
 (name grain)
 (version 0.6.6)
 (using menhir 2.0)

compiler/esy.json

@@ -22,8 +22,8 @@
     }
   },
   "scripts": {
-    "copy:exe": "cp #{$GRAINC_BIN_PATH} #{$GRAINDOC_BIN_PATH} #{$GRAINFORMAT_BIN_PATH} #{$GRAINLSP_BIN_PATH} #{$CLI_BIN_DIR}",
-    "copy:js": "cp #{$GRAINC_JS_PATH} #{$GRAINDOC_JS_PATH} #{$GRAINFORMAT_JS_PATH} #{$GRAINLSP_JS_PATH}  #{$CLI_BIN_DIR}",
+    "copy:exe": "cp -f #{$GRAINC_BIN_PATH} #{$GRAINDOC_BIN_PATH} #{$GRAINFORMAT_BIN_PATH} #{$GRAINLSP_BIN_PATH} #{$CLI_BIN_DIR}",
+    "copy:js": "cp -f #{$GRAINC_JS_PATH} #{$GRAINDOC_JS_PATH} #{$GRAINFORMAT_JS_PATH} #{$GRAINLSP_JS_PATH}  #{$CLI_BIN_DIR}",
     "clean": "rm -rf #{self.root}/_esy",
     "build:js": "esy b dune build @js --no-buffer #{os == 'windows' ? '-j 2' : ''}",
     "test": "#{$TEST_EXEC_PATH}",
@@ -54,7 +54,7 @@
     "ocaml": "4.14.1000"
   },
   "devDependencies": {
-    "@opam/js_of_ocaml-compiler": "5.0.1",
+    "@opam/js_of_ocaml-compiler": "6.0.1",
     "@opam/ocaml-lsp-server": "1.14.1",
     "@opam/rely": "^4.0.0"
   },

compiler/grainc/dune

@@ -7,6 +7,4 @@
  (flags
   (:standard
    (:include ./config/flags.sexp)))
- (libraries grain grain_diagnostics binaryen dune-build-info)
- (js_of_ocaml
-  (flags --no-sourcemap --no-extern-fs --quiet)))
+ (libraries grain grain_diagnostics binaryen dune-build-info))

compiler/graindoc/dune

@@ -13,9 +13,13 @@
  (flags
   (:standard
    (:include ./config/flags.sexp)))
- (libraries cmdliner grain grain_diagnostics grain_utils graindoc.docblock
-   binaryen dune-build-info)
+ (libraries
+  cmdliner
+  grain
+  grain_diagnostics
+  grain_utils
+  graindoc.docblock
+  binaryen
+  dune-build-info)
  (preprocess
-  (pps ppx_deriving_cmdliner))
- (js_of_ocaml
-  (flags --no-sourcemap --no-extern-fs --quiet)))
+  (pps ppx_deriving_cmdliner)))

compiler/grainformat/dune

@@ -7,9 +7,13 @@
  (flags
   (:standard
    (:include ./config/flags.sexp)))
- (libraries cmdliner grain grain_utils grain_parsing grain_formatting
-   binaryen dune-build-info)
+ (libraries
+  cmdliner
+  grain
+  grain_utils
+  grain_parsing
+  grain_formatting
+  binaryen
+  dune-build-info)
  (preprocess
-  (pps ppx_deriving_cmdliner))
- (js_of_ocaml
-  (flags --no-sourcemap --no-extern-fs --quiet)))
+  (pps ppx_deriving_cmdliner)))

compiler/grainlsp/dune

@@ -7,8 +7,9 @@
  (flags
   (:standard
    (:include ./config/flags.sexp)))
- (libraries cmdliner grain_utils grain_language_server grain_formatting
-   dune-build-info)
- (js_of_ocaml
-  (flags --no-sourcemap --no-extern-fs --quiet)
-  (javascript_files hacks.js)))
+ (libraries
+  cmdliner
+  grain_utils
+  grain_language_server
+  grain_formatting
+  dune-build-info))

compiler/package.json

@@ -9,7 +9,7 @@
     "node": ">=18.15"
   },
   "devDependencies": {
-    "esy": "0.6.12",
+    "esy": "0.8.0",
     "shx": "^0.3.4"
   },
   "scripts": {

compiler/src/codegen/dune

@@ -2,7 +2,14 @@
  (name grain_codegen)
  (public_name grain_codegen)
  (synopsis "Grain compiler code generation")
- (libraries compiler-libs.common grain_middle_end grain_parsing grain_typed
-   grain_utils ppx_sexp_conv.runtime-lib sexplib binaryen)
+ (libraries
+  compiler-libs.common
+  grain_middle_end
+  grain_parsing
+  grain_typed
+  grain_utils
+  ppx_sexp_conv.runtime-lib
+  sexplib
+  binaryen)
  (preprocess
   (pps ppx_sexp_conv)))

compiler/src/diagnostics/dune

@@ -6,14 +6,25 @@
  (action
   (with-stdout-to
    graindoc_parser_messages.ml
-   (run menhir %{dep:graindoc_parser.mly} --compile-errors
-     %{dep:graindoc_parser.messages} --unused-tokens))))
+   (run
+    menhir
+    %{dep:graindoc_parser.mly}
+    --compile-errors
+    %{dep:graindoc_parser.messages}
+    --unused-tokens))))
 
 (library
  (name grain_diagnostics)
  (public_name grain_diagnostics)
  (synopsis "Diagnostic modules for Grain compiler")
- (libraries compiler-libs.common grain_utils grain_typed str
-   ppx_deriving_yojson.runtime yojson menhirLib sexplib)
+ (libraries
+  compiler-libs.common
+  grain_utils
+  grain_typed
+  str
+  ppx_deriving_yojson.runtime
+  yojson
+  menhirLib
+  sexplib)
  (preprocess
   (pps ppx_deriving_yojson sedlex.ppx)))

compiler/src/dune

@@ -1,9 +1,17 @@
 (library
  (name grain)
  (public_name grain)
- (libraries cmdliner compiler-libs.common grain_codegen grain_middle_end
-   grain_parsing grain_typed grain_utils grain_diagnostics
-   ppx_sexp_conv.runtime-lib sexplib)
+ (libraries
+  cmdliner
+  compiler-libs.common
+  grain_codegen
+  grain_middle_end
+  grain_parsing
+  grain_typed
+  grain_utils
+  grain_diagnostics
+  ppx_sexp_conv.runtime-lib
+  sexplib)
  (preprocess
   (pps ppx_sexp_conv)))
 

compiler/src/language_server/dune

@@ -1,6 +1,13 @@
 (library
  (name grain_language_server)
- (libraries grain grain_diagnostics grain_parsing grain_utils uri
-   grain_formatting ppx_deriving_yojson.runtime yojson)
+ (libraries
+  grain
+  grain_diagnostics
+  grain_parsing
+  grain_utils
+  uri
+  grain_formatting
+  ppx_deriving_yojson.runtime
+  yojson)
  (preprocess
   (pps ppx_deriving.enum ppx_deriving_yojson)))

compiler/src/middle_end/dune

@@ -2,7 +2,12 @@
  (name grain_middle_end)
  (public_name grain_middle_end)
  (synopsis "Grain compiler middle end")
- (libraries compiler-libs.common grain_parsing grain_typed grain_utils
-   ppx_sexp_conv.runtime-lib sexplib)
+ (libraries
+  compiler-libs.common
+  grain_parsing
+  grain_typed
+  grain_utils
+  ppx_sexp_conv.runtime-lib
+  sexplib)
  (preprocess
   (pps ppx_sexp_conv)))

compiler/src/parsing/dune

@@ -19,23 +19,39 @@
 
 (menhir
  (modules unitActionsParser)
- (flags --table --external-tokens Parser --unused-tokens
-   --unused-precedence-levels))
+ (flags
+  --table
+  --external-tokens
+  Parser
+  --unused-tokens
+  --unused-precedence-levels))
 
 ;; This rule compiles the parser.messages file into OCaml code.
 
 (rule
  (action
   (with-stdout-to
    parser_messages.ml
-   (run menhir %{dep:parser.mly} --compile-errors %{dep:parser.messages}
-     --unused-tokens))))
+   (run
+    menhir
+    %{dep:parser.mly}
+    --compile-errors
+    %{dep:parser.messages}
+    --unused-tokens))))
 
 (library
  (name grain_parsing)
  (public_name grain_parsing)
  (synopsis "Frontend modules for Grain compiler")
- (libraries menhirLib compiler-libs.common grain_utils utf8.lib str
-   ppx_deriving_yojson.runtime ppx_sexp_conv.runtime-lib sexplib yojson)
+ (libraries
+  menhirLib
+  compiler-libs.common
+  grain_utils
+  utf8.lib
+  str
+  ppx_deriving_yojson.runtime
+  ppx_sexp_conv.runtime-lib
+  sexplib
+  yojson)
  (preprocess
   (pps ppx_sexp_conv ppx_deriving_yojson sedlex.ppx)))

compiler/src/typed/dune

@@ -2,8 +2,14 @@
  (name grain_typed)
  (public_name grain_typed)
  (synopsis "Grain compiler type utilities")
- (libraries compiler-libs.common grain_parsing grain_utils
-   ppx_deriving_yojson.runtime ppx_sexp_conv.runtime-lib sexplib yojson
-   ocamlgraph)
+ (libraries
+  compiler-libs.common
+  grain_parsing
+  grain_utils
+  ppx_deriving_yojson.runtime
+  ppx_sexp_conv.runtime-lib
+  sexplib
+  yojson
+  ocamlgraph)
  (preprocess
   (pps ppx_sexp_conv ppx_deriving_yojson)))

compiler/src/utils/dune

@@ -2,9 +2,14 @@
  (name grain_utils)
  (public_name grain_utils)
  (synopsis "Utilities for the Grain compiler")
- (libraries fp fs.lib cmdliner compiler-libs.common ppx_sexp_conv.runtime-lib
-   sexplib str dune-build-info)
+ (libraries
+  fp
+  fs.lib
+  cmdliner
+  compiler-libs.common
+  ppx_sexp_conv.runtime-lib
+  sexplib
+  str
+  dune-build-info)
  (preprocess
-  (pps ppx_sexp_conv sedlex.ppx))
- (js_of_ocaml
-  (javascript_files hacks.js)))
+  (pps ppx_sexp_conv sedlex.ppx)))

compiler/test/dune

@@ -4,8 +4,12 @@
  (name Grain_tests)
  (public_name grain-tests.framework)
  (libraries grain rely.lib)
- (modules TestFramework WarningExtensions BinaryFileExtensions test_utils
-   runner))
+ (modules
+  TestFramework
+  WarningExtensions
+  BinaryFileExtensions
+  test_utils
+  runner))
 
 (executable
  (name test)
@@ -20,6 +24,4 @@
    -40
    (:include ./config/flags.sexp)))
  (libraries grain grain-tests.framework grain-tests.suites grain-tests.utils)
- (modules test)
- (js_of_ocaml
-  (flags --no-sourcemap --quiet)))
+ (modules test))