tweak

Author: bobzhang

jscomp/core/js_name_of_module_id.ml

@@ -25,8 +25,6 @@
 let (=)  (x : int) (y:float) = assert false 
 *)
 
-let runtime_package_name = "bs-platform"
-
 (* "xx/lib/ocaml/js.cmj" 
    Enhancement: This can be delegated to build system
 *)
@@ -79,7 +77,8 @@ let string_of_module_id
       in 
       begin match current_pkg_info with        
         | Package_not_found -> assert false
-        | Package_script -> runtime_package_name // dep_path // js_file
+        | Package_script -> 
+          Js_packages_info.runtime_package_path module_system js_file          
         | Package_found(cur_package_name, cur_path) -> 
           if  Js_packages_info.is_runtime_package cur_package_name then 
             Ext_path.node_rebase_file
@@ -92,7 +91,7 @@ let string_of_module_id
           else  
             match module_system with 
             | NodeJS | Es6 -> 
-              runtime_package_name // dep_path // js_file
+              Js_packages_info.runtime_package_path module_system js_file              
             (** Note we did a post-processing when working on Windows *)
             | Es6_global 
               -> 

jscomp/core/js_packages_info.ml

@@ -55,14 +55,16 @@ let is_runtime_package (x : string) =
     x = runtime_package_name
 
 let (//) = Filename.concat    
-let runtime_package_path (module_system : module_system) =    
+let runtime_package_path 
+  (module_system : module_system) 
+  js_file =      
   match module_system with 
   | NodeJS ->
-    runtime_package_name // "lib" // "js"
+    runtime_package_name // "lib" // "js" // js_file
   | Es6 
   | Es6_global ->
-    runtime_package_name // "lib" // "es6" 
-    
+    runtime_package_name // "lib" // "es6" // js_file
+
 type t =
   { 
     name : package_name ;

jscomp/core/js_packages_info.mli

@@ -42,6 +42,7 @@ val same_package :
 
 val runtime_package_path:  
   module_system ->
+  string ->
   string
 
 type package_info 

lib/whole_compiler.ml

@@ -60399,6 +60399,7 @@ val same_package :
 
 val runtime_package_path:  
   module_system ->
+  string ->
   string
 
 type package_info 
@@ -60511,14 +60512,16 @@ let is_runtime_package (x : string) =
     x = runtime_package_name
 
 let (//) = Filename.concat    
-let runtime_package_path (module_system : module_system) =    
+let runtime_package_path 
+  (module_system : module_system) 
+  js_file =      
   match module_system with 
   | NodeJS ->
-    runtime_package_name // "lib" // "js"
+    runtime_package_name // "lib" // "js" // js_file
   | Es6 
   | Es6_global ->
-    runtime_package_name // "lib" // "es6" 
-    
+    runtime_package_name // "lib" // "es6" // js_file
+
 type t =
   { 
     name : package_name ;
@@ -86203,8 +86206,6 @@ end = struct
 let (=)  (x : int) (y:float) = assert false 
 *)
 
-let runtime_package_name = "bs-platform"
-
 (* "xx/lib/ocaml/js.cmj" 
    Enhancement: This can be delegated to build system
 *)
@@ -86257,7 +86258,8 @@ let string_of_module_id
       in 
       begin match current_pkg_info with        
         | Package_not_found -> assert false
-        | Package_script -> runtime_package_name // dep_path // js_file
+        | Package_script -> 
+          Js_packages_info.runtime_package_path module_system js_file          
         | Package_found(cur_package_name, cur_path) -> 
           if  Js_packages_info.is_runtime_package cur_package_name then 
             Ext_path.node_rebase_file
@@ -86270,7 +86272,7 @@ let string_of_module_id
           else  
             match module_system with 
             | NodeJS | Es6 -> 
-              runtime_package_name // dep_path // js_file
+              Js_packages_info.runtime_package_path module_system js_file              
             (** Note we did a post-processing when working on Windows *)
             | Es6_global 
               ->