the merlin path is fixed regardless of which runtime we choose

- disable the  checking between the compiler and stdlib versions,
it is a bit complicated when we can change the runtime, settle later

Author: bobzhang

jscomp/bsb/bsb_config_parse.ml

@@ -90,48 +90,26 @@ let extract_package_name_and_namespace
     - the running bsb and vendoring bsb is the same
     - the running bsb need delete stale build artifacts
       (kinda check npm upgrade)
-*)
-let check_version_exit (map : json_map) stdlib_path =   
-  match Map_string.find_exn map Bsb_build_schemas.version with 
-  | Str {str } -> 
-    if str <> Bs_version.version then 
-      begin
-        Format.fprintf Format.err_formatter
-          "@{<error>bs-platform version mismatch@} Running bsb @{<info>%s@} (%s) vs vendored @{<info>%s@} (%s)@."
-          Bs_version.version
-          (Filename.dirname (Filename.dirname Sys.executable_name))
-          str
-          stdlib_path 
-        ;
-        exit 2
-      end
-  | _ -> assert false
-
-let check_stdlib (map : json_map) cwd (*built_in_package*) =  
+
+      Note if the setup is correct: 
+      the running compiler and node_modules/bs-platform
+      should be the same version, 
+      The exact check is that the running compiler should have a 
+      compatible runtime version installed, the location of the
+      compiler is actually not relevant.
+      We disable the check temporarily
+      e.g,
+      ```
+      bsc -runtime runtime_dir@version
+      ```
+*)  
+let check_stdlib (map : json_map) (*built_in_package*) : bool =  
   match map.?( Bsb_build_schemas.use_stdlib) with      
-  | Some (False _) -> None    
+  | Some (False _) -> false
   | None 
-  | Some _ ->
-    begin
-      let current_package : Bsb_pkg_types.t = Global !Bs_version.package_name in  
-      if Sys.getenv_opt "RES_SKIP_STDLIB_CHECK" = None then begin 
-        let stdlib_path = 
-          Bsb_pkg.resolve_bs_package ~cwd current_package in 
-        let json_spec = 
-          Ext_json_parse.parse_json_from_file
-            (* No exn raised: stdlib  has package.json *)
-            (Filename.concat stdlib_path Literals.package_json) in 
-        match json_spec with 
-        | Obj {map}  -> 
-          check_version_exit map stdlib_path;
-
-        | _ -> assert false
-      end;
-      Some {
-        Bsb_config_types.package_name = current_package;
-        package_install_path = Filename.dirname Bsb_global_paths.bsc_dir // Bsb_config.lib_ocaml;
-      }
-    end
+  | Some _ ->    
+    true
+
 
 
 
@@ -355,7 +333,7 @@ let interpret_json
          array from the bsconfig and set the backend_ref to the first entry, if any. *)
 
     (* The default situation is empty *)
-    let built_in_package = check_stdlib map per_proj_dir in
+    let built_in_package : bool = check_stdlib map  in
 
     let pp_flags : string option = 
       extract_string map Bsb_build_schemas.pp_flags (fun p -> 

jscomp/bsb/bsb_config_types.ml

@@ -61,7 +61,7 @@ type t =
     bs_dependencies : dependencies;
     bs_dev_dependencies : dependencies;
     pinned_dependencies : Set_string.t;
-    built_in_dependency : dependency option; 
+    built_in_dependency : bool; 
     warning : Bsb_warning.t;
     (*TODO: maybe we should always resolve bs-platform 
       so that we can calculate correct relative path in 

jscomp/bsb/bsb_merlin_gen.ml

@@ -165,11 +165,13 @@ let merlin_file_gen ~per_proj_dir:(per_proj_dir:string)
         Buffer.add_string buffer merlin_b;
         Buffer.add_string buffer path ;
       );      
-    Ext_option.iter built_in_dependency (fun package -> 
-        let path = package.package_install_path in 
-        Buffer.add_string buffer (merlin_s ^ path );
-        Buffer.add_string buffer (merlin_b ^ path)                      
-      );
+    if built_in_dependency then (
+      let path = 
+        (Filename.dirname Bsb_global_paths.bsc_dir) 
+        // "lib" //"ocaml" in 
+      Buffer.add_string buffer (merlin_s ^ path );
+      Buffer.add_string buffer (merlin_b ^ path)                      
+    );
     let bsc_string_flag = bsc_flg_to_merlin_ocamlc_flg bsc_flags in 
     Buffer.add_string buffer bsc_string_flag ;
     Buffer.add_string buffer (warning_to_merlin_flg  warning); 

jscomp/bsb/bsb_ninja_gen.ml

@@ -237,7 +237,7 @@ let output_ninja_and_namespace_map
       ~gentype_config
       ~has_postbuild:js_post_build_cmd 
       ~pp_file
-      ~has_builtin:(built_in_dependency <> None)
+      ~has_builtin:built_in_dependency 
       ~reason_react_jsx
       ~package_specs
       ~namespace

jscomp/core/js_name_of_module_id.ml

@@ -81,7 +81,7 @@ let get_runtime_module_path
             calculate relative js path
           *)
           ((Filename.dirname (Filename.dirname Sys.executable_name)) // dep_path // js_file)  
-
+          (*FIXME: the runtime path needs changed when customize runtime*)
 
 
 (* [output_dir] is decided by the command line argument *)