git.iko.soy/jsaddle
on master help sign in
Update for jsstring-based text implementation
commit0b8f956c3a5043b548cda3cd18415319c4eee3d0 authorRyan Trinkle <ryan.trinkle@gmail.com> dateWed 10 May 2017, 14:08 (9 years ago) parent4aa7ad6
2 files changed+4−1
compare with master
unifiedsplit
jsaddle/jsaddle.cabal+2−1 jsaddle/src/Language/Javascript/JSaddle/Value.hs+2
jsaddle/jsaddle.cabal+2−1
@@ -32,7 +32,8 @@ library
3232 if impl(ghcjs -any)
3333 build-depends:
3434 ghcjs-base -any,
35− ghcjs-prim -any
35+ ghcjs-prim -any,
36+ ghcjs-json -any
3637 else
3738 build-depends:
3839 attoparsec >=0.11 && <0.14,
jsaddle/src/Language/Javascript/JSaddle/Value.hs+2
@@ -110,6 +110,8 @@ import Language.Javascript.JSaddle.Marshal.String (ToJSString(..), FromJSString(
110110import Language.Javascript.JSaddle.String (strToText, textToStr)
111111import GHCJS.Foreign.Internal (jsTrue, jsFalse, jsNull, toJSBool, jsUndefined, isTruthy, isNull, isUndefined)
112112
113+import JavaScript.JSON.Types.ToJSVal ()
114+
113115-- $setup
114116-- >>> import Language.Javascript.JSaddle.Test (testJSaddle)
115117-- >>> import Language.Javascript.JSaddle.Monad (catch)