From ee0f34b7046c50d77b1464be390eb2895ab367fe Mon Sep 17 00:00:00 2001 From: David Sancho Moreno Date: Tue, 23 Jul 2024 14:21:37 +0200 Subject: [PATCH] Update quickjs to 0.1.2 --- CHANGES.md | 3 +++ demo/server/dune | 2 ++ demo/server/server.re | 6 +++--- dune-project | 2 +- packages/melange.js/Js.ml | 12 ++++++++++-- server-reason-react.opam | 2 +- 6 files changed, 20 insertions(+), 7 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index ceb5ce440..c041d027b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,8 @@ # Changes +## 0.3.1 +* Update quickjs dependency to 0.1.2 by @davesnx + ## 0.3.0 * browser-ppx: process stritems by @jchavarri in https://github.com/ml-in-barcelona/server-reason-react/pull/127 diff --git a/demo/server/dune b/demo/server/dune index 83b386b13..3b0a40513 100644 --- a/demo/server/dune +++ b/demo/server/dune @@ -2,9 +2,11 @@ (name server) (enabled_if (= %{profile} "dev")) + (flags :standard -w -26-27) ; browser_only removes code form the server, making this warning necessary (libraries tiny_httpd tiny_httpd.core + tiny_httpd.unix shared_native react reactDOM diff --git a/demo/server/server.re b/demo/server/server.re index 6f0e763f8..06b108bdc 100644 --- a/demo/server/server.re +++ b/demo/server/server.re @@ -6,15 +6,15 @@ */ module Httpd = Tiny_httpd; -module Httpd_dir = Tiny_httpd_dir; +module Httpd_dir = Tiny_httpd.Dir; module Link = { [@react.component] let make = (~href, ~children) => { - let (useState, setState) = React.useState(() => false); + let (state, setState) = React.useState(() => false); React.useEffect0(() => { - setState(_prev => !useState); + setState(_prev => !state); None; }); diff --git a/dune-project b/dune-project index 4838d1aed..e9bb96399 100644 --- a/dune-project +++ b/dune-project @@ -31,7 +31,7 @@ ; Library dependencies (ppxlib (> 0.23.0)) - (quickjs (>= 0.1.1)) + (quickjs (>= 0.1.2)) (promise (>= 1.1.2)) (lwt (>= 5.6.0)) (lwt_ppx (>= 2.1.0)) diff --git a/packages/melange.js/Js.ml b/packages/melange.js/Js.ml index f1b7a439d..e897c2961 100644 --- a/packages/melange.js/Js.ml +++ b/packages/melange.js/Js.ml @@ -493,10 +493,18 @@ end = struct let index : result -> int = Quickjs.RegExp.index let input : result -> string = Quickjs.RegExp.input let source : t -> string = Quickjs.RegExp.source - let fromString : string -> t = fun str -> Quickjs.RegExp.compile str "" + + let fromString : string -> t = + fun str -> + match Quickjs.RegExp.compile str ~flags:"" with + | Ok regex -> regex + | Error (_, msg) -> raise (Invalid_argument msg) let fromStringWithFlags : string -> flags:string -> t = - fun str ~flags -> Quickjs.RegExp.compile str flags + fun str ~flags -> + match Quickjs.RegExp.compile str ~flags with + | Ok regex -> regex + | Error (_, msg) -> raise (Invalid_argument msg) let flags : t -> string = fun regexp -> Quickjs.RegExp.flags regexp let global : t -> bool = fun regexp -> Quickjs.RegExp.global regexp diff --git a/server-reason-react.opam b/server-reason-react.opam index 63ade7f86..b2706442d 100644 --- a/server-reason-react.opam +++ b/server-reason-react.opam @@ -12,7 +12,7 @@ depends: [ "reason" {>= "3.10.0"} "melange" {>= "3.0.0"} "ppxlib" {> "0.23.0"} - "quickjs" {>= "0.1.1"} + "quickjs" {>= "0.1.2"} "promise" {>= "1.1.2"} "lwt" {>= "5.6.0"} "lwt_ppx" {>= "2.1.0"}