Merge pull request #3832 from BuckleScript/fix_release_issues

update changes, fix release issues

Author: bobzhang

Changes.md

@@ -8,6 +8,7 @@ Features
 - #3799 Improve code gen, better code equality for block
 - #3778 #3770 Improve pattern match compilation against the outer-most staticfail
 - #3764 better code gen for lazy evaluation
+- #3822 allow `f##"Content-Type"` for uncommon property name
 
 Fixes
 - #3809 Escape question mark and ampersand to special chars
@@ -18,10 +19,17 @@ Fixes
 - #3781 #3783 quote package path properly
 - #3793 pass bs-version to genType
 - #3674 installation from master works out of box
+- #3823 fix reason language server 
 
 Docs 
 - #3795 Fix docs for stringifyAny
 - #3788 Rename getUnasfe to getUnsafe
+- #3830 fix isSortedExample
+- #3829 fix mapWithDefault example
+- #3828 fix getExn example
+- #3827 fix partition example
+- #3826 simplify truncateToLengthUnsafe example
+
 
 
 

lib/4.02.3/bsdep.ml

@@ -29743,7 +29743,7 @@ val jsx_version : int ref
 val refmt : string option ref
 val is_reason : bool ref 
 
-val no_js_stdout : bool ref 
+val js_stdout : bool ref 
 end = struct
 #1 "js_config.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -29857,7 +29857,7 @@ let refmt = ref None
 
 let is_reason = ref false
 
-let no_js_stdout = ref false
+let js_stdout = ref true
 end
 module Bs_warnings : sig 
 #1 "bs_warnings.mli"

lib/4.02.3/bsppx.ml

@@ -2648,7 +2648,7 @@ val jsx_version : int ref
 val refmt : string option ref
 val is_reason : bool ref 
 
-val no_js_stdout : bool ref 
+val js_stdout : bool ref 
 end = struct
 #1 "js_config.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -2762,7 +2762,7 @@ let refmt = ref None
 
 let is_reason = ref false
 
-let no_js_stdout = ref false
+let js_stdout = ref true
 end
 (** Interface as module  *)
 module Asttypes

lib/4.02.3/unstable/all_ounit_tests.ml

@@ -7395,7 +7395,7 @@ val jsx_version : int ref
 val refmt : string option ref
 val is_reason : bool ref 
 
-val no_js_stdout : bool ref 
+val js_stdout : bool ref 
 end = struct
 #1 "js_config.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -7509,7 +7509,7 @@ let refmt = ref None
 
 let is_reason = ref false
 
-let no_js_stdout = ref false
+let js_stdout = ref true
 end
 module Ml_binary : sig 
 #1 "ml_binary.mli"

lib/4.02.3/unstable/bspack.ml

@@ -8162,7 +8162,7 @@ val jsx_version : int ref
 val refmt : string option ref
 val is_reason : bool ref 
 
-val no_js_stdout : bool ref 
+val js_stdout : bool ref 
 end = struct
 #1 "js_config.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -8276,7 +8276,7 @@ let refmt = ref None
 
 let is_reason = ref false
 
-let no_js_stdout = ref false
+let js_stdout = ref true
 end
 module Ml_binary : sig 
 #1 "ml_binary.mli"

lib/4.02.3/unstable/js_compiler.ml

@@ -11693,7 +11693,7 @@ val jsx_version : int ref
 val refmt : string option ref
 val is_reason : bool ref 
 
-val no_js_stdout : bool ref 
+val js_stdout : bool ref 
 end = struct
 #1 "js_config.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -11807,7 +11807,7 @@ let refmt = ref None
 
 let is_reason = ref false
 
-let no_js_stdout = ref false
+let js_stdout = ref true
 end
 module Bs_warnings : sig 
 #1 "bs_warnings.mli"
@@ -116287,7 +116287,7 @@ let lambda_as_module
       (if !Js_config.bs_suffix then Literals.suffix_bs_js else Literals.suffix_js) 
   in
   let package_info = Js_packages_state.get_packages_info () in 
-  if Js_packages_info.is_empty package_info && not !Js_config.no_js_stdout then     
+  if Js_packages_info.is_empty package_info && !Js_config.js_stdout then     
     Js_dump_program.dump_deps_program ~output_prefix NodeJS lambda_output stdout      
   else
     Js_packages_info.iter package_info (fun {module_system; path = _path} -> 

lib/4.02.3/unstable/native_ppx.ml

@@ -11671,7 +11671,7 @@ val jsx_version : int ref
 val refmt : string option ref
 val is_reason : bool ref 
 
-val no_js_stdout : bool ref 
+val js_stdout : bool ref 
 end = struct
 #1 "js_config.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -11785,7 +11785,7 @@ let refmt = ref None
 
 let is_reason = ref false
 
-let no_js_stdout = ref false
+let js_stdout = ref true
 end
 module Bs_warnings : sig 
 #1 "bs_warnings.mli"

lib/4.02.3/whole_compiler.ml

@@ -4998,7 +4998,7 @@ val jsx_version : int ref
 val refmt : string option ref
 val is_reason : bool ref 
 
-val no_js_stdout : bool ref 
+val js_stdout : bool ref 
 end = struct
 #1 "js_config.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -5112,7 +5112,7 @@ let refmt = ref None
 
 let is_reason = ref false
 
-let no_js_stdout = ref false
+let js_stdout = ref true
 end
 module Ast_reason_pp : sig 
 #1 "ast_reason_pp.mli"
@@ -113982,7 +113982,7 @@ let lambda_as_module
       (if !Js_config.bs_suffix then Literals.suffix_bs_js else Literals.suffix_js) 
   in
   let package_info = Js_packages_state.get_packages_info () in 
-  if Js_packages_info.is_empty package_info && not !Js_config.no_js_stdout then     
+  if Js_packages_info.is_empty package_info && !Js_config.js_stdout then     
     Js_dump_program.dump_deps_program ~output_prefix NodeJS lambda_output stdout      
   else
     Js_packages_info.iter package_info (fun {module_system; path = _path} -> 
@@ -125927,7 +125927,6 @@ end = struct
 
 let process_interface_file ppf name =
   Js_implementation.interface ppf name (Compenv.output_prefix name)
-
 let process_implementation_file ppf name =
   Js_implementation.implementation ppf name (Compenv.output_prefix name)
 
@@ -126239,9 +126238,9 @@ let buckle_script_flags : (string * Arg.spec * string) list =
   )  
 
   :: Ocaml_options.mk_impl 
-    (fun file  ->  Js_config.no_js_stdout := true;  impl file )  
+    (fun file  ->  Js_config.js_stdout := false;  impl file )  
   :: Ocaml_options.mk_intf 
-    (fun file -> Js_config.no_js_stdout := true ; intf file)
+    (fun file -> Js_config.js_stdout := false ; intf file)
   :: Ocaml_options.mk__ anonymous
   :: Ocaml_options.ocaml_options
 

scripts/buildocaml.js

@@ -5,6 +5,24 @@ var path = require("path");
 var fs = require("fs");
 
 var ocamlSrcDir = path.join(__dirname, "..", "ocaml");
+var ocamlVersionFilePath = path.join(ocamlSrcDir, "VERSION");
+
+/**
+ * Ensures the ocaml folder exists at the root of the project, either from the submodule,
+ * or by extracting the vendor/ocaml.tar.gz there
+ */
+function ensureOCamlExistsSync() {
+  if (!fs.existsSync(ocamlSrcDir)) {
+    fs.mkdirSync(ocamlSrcDir);
+  }
+  if (!fs.existsSync(ocamlVersionFilePath)) {
+    cp.execSync(`tar xzvf ../vendor/ocaml.tar.gz`, {
+      cwd: ocamlSrcDir,
+      stdio: [0, 1, 2]
+    });
+  }
+}
+
 /**
  * @type {string}
  */
@@ -19,16 +37,10 @@ function getVersionPrefix() {
     return cached;
   }
 
-  var file = path.join(__dirname, "..", "ocaml", "VERSION");
-  if (!fs.existsSync(file)) {
-    cp.execSync(`tar xzvf ../vendor/ocaml.tar.gz`, {
-      cwd: ocamlSrcDir,
-      stdio: [0, 1, 2]
-    });
-  }
+  ensureOCamlExistsSync();
 
-  console.log(`${file} is used in version detection`);
-  var version = fs.readFileSync(file, "ascii");
+  console.log(`${ocamlVersionFilePath} is used in version detection`);
+  var version = fs.readFileSync(ocamlVersionFilePath, "ascii");
   cached = version.substr(0, version.indexOf("+"));
   return cached;
 }
@@ -39,15 +51,7 @@ exports.getVersionPrefix = getVersionPrefix;
  * @param {boolean} config
  */
 function build(config) {
-  if (!fs.existsSync(ocamlSrcDir)) {
-    fs.mkdirSync(ocamlSrcDir);
-  }
-  if (!fs.existsSync(path.join(ocamlSrcDir, "VERSION"))) {
-    cp.execSync(`tar xzvf ../vendor/ocaml.tar.gz`, {
-      cwd: ocamlSrcDir,
-      stdio: [0, 1, 2]
-    });
-  }
+  ensureOCamlExistsSync();
 
   var prefix = path.normalize(
     path.join(__dirname, "..", "native", getVersionPrefix())