Merge pull request #4902 from rescript-lang/mjs_for_runtime_stdlib

.mjs for runtime stdlib files, allows node to use directly

Author: bobzhang

jscomp/core/js_name_of_module_id.ml

@@ -43,7 +43,7 @@ let get_runtime_module_path
       module_system  in
   let js_file =  
     Ext_namespace.js_name_of_modulename dep_module_id.id.name 
-      Little Js in (* Js may be subject to the module system *)
+      Little (match module_system with NodeJS -> Js | Es6 | Es6_global -> Mjs) in 
   match current_info_query with        
   | Package_not_found -> assert false
   | Package_script -> 

jscomp/core/js_packages_info.ml

@@ -82,7 +82,7 @@ type t =
 let runtime_package_specs : t = {
   name = Pkg_runtime;
   module_systems =[
-    {module_system = Es6; path = "lib/es6"; suffix = Js};
+    {module_system = Es6; path = "lib/es6"; suffix = Mjs};
     {module_system = NodeJS; path = "lib/js"; suffix = Js};
   ]
 }   

jscomp/main/cmij_main.ml

@@ -67,7 +67,11 @@ let from_cmj ~mode (files : string list) (output_file : string) : unit =
               when package_spec = Js_packages_info.runtime_package_specs
               -> ()
               (*TODO: assert its suffixes*)
-            | _ -> assert false   
+            | _ -> 
+              Format.fprintf Format.err_formatter
+                 "@[%s: @[%a@]@]@." file
+              Js_packages_info.dump_packages_info  content.package_spec;              
+              assert false   
           end
         | Playground _ -> ()
         in

jscomp/others/release.ninja

@@ -1,5 +1,5 @@
 
-bsc_flags = -no-keep-locs -no-alias-deps -bs-no-version-header -bs-no-check-div-by-zero -nostdlib  -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js  -bs-package-output es6:lib/es6   -nopervasives  -unsafe  -w +50 -warn-error A  -open Bs_stdlib_mini -I ./runtime
+bsc_flags = -no-keep-locs -no-alias-deps -bs-no-version-header -bs-no-check-div-by-zero -nostdlib  -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js  -bs-package-output es6:lib/es6:.mjs   -nopervasives  -unsafe  -w +50 -warn-error A  -open Bs_stdlib_mini -I ./runtime
 
 rule cc
     command = $bsc -bs-cmi -bs-cmj $bsc_flags   -I others  $in

jscomp/runtime/release.ninja

@@ -1,5 +1,5 @@
 
-bsc_no_open_flags =  -no-keep-locs -no-alias-deps -bs-no-version-header -bs-no-check-div-by-zero -nostdlib  -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js  -bs-package-output es6:lib/es6  -nopervasives  -unsafe -w +50 -warn-error A
+bsc_no_open_flags =  -no-keep-locs -no-alias-deps -bs-no-version-header -bs-no-check-div-by-zero -nostdlib  -bs-cross-module-opt -bs-package-name bs-platform -bs-package-output commonjs:lib/js  -bs-package-output es6:lib/es6:.mjs  -nopervasives  -unsafe -w +50 -warn-error A
 bsc_flags = $bsc_no_open_flags -open Bs_stdlib_mini
 
 rule cc