Merge pull request #3451 from BuckleScript/add_refmt

Add refmt
rescript-lang · Mar 27, 2019 · d07b76f · d07b76f
2 parents b8546ee + 250c05b
commit d07b76f
Show file tree

Hide file tree

Showing 8 changed files with 135,968 additions and 50 deletions.
diff --git a/jscomp/build_tests/priv2/input.js b/jscomp/build_tests/priv2/input.js
@@ -9,7 +9,8 @@ assert.throws(
             { cwd: __dirname, encoding: 'utf8' })
     },
         (err) => {
-        if (err.stdout.match(/Unbound value Liba.Priv.v/)){
+        if (err.stdout.match(/Unbound value Liba.Priv.v/) ||err.stdout.match(/Liba.Priv is an alias/)){
+            // error message changed for 4.06    
             return true
         }
         return false

diff --git a/jscomp/snapshot.ninja b/jscomp/snapshot.ninja
@@ -50,7 +50,7 @@ build $SNAP/unstable/bsb_native.ml: bspack | ./bin/bspack.exe
      main = Bsb_main 
 
 build $SNAP/unstable/native_ppx.ml: bspack | ./bin/bspack.exe     
-     flags =   -D BS_MIN_LEX_DEPS=true -D BS_NATIVE=true -bs-MD ${releaseMode} -I $OCAML_SRC_UTILS -I $OCAML_SRC_PARSING -I stubs -I common -I ext -I syntax -I depends -I bsb -I ext -I main 
+     flags =   -module-alias Config=Config_whole_compiler -D BS_MIN_LEX_DEPS=true -D BS_NATIVE=true -bs-MD ${releaseMode} -I $OCAML_SRC_UTILS -I $OCAML_SRC_PARSING -I stubs -I common -I ext -I syntax -I depends -I bsb -I ext -I core -I main 
      main = Native_ppx_main
 
 

diff --git a/lib/4.06.1/reactjs_jsx_ppx_v2.ml b/lib/4.06.1/reactjs_jsx_ppx_v2.ml
diff --git a/lib/4.06.1/reactjs_jsx_ppx_v2.mli b/lib/4.06.1/reactjs_jsx_ppx_v2.mli