refactoring

Author: bobzhang

jscomp/core/lam_compile_main.ml

@@ -254,20 +254,17 @@ let compile
   |> Js_shake.shake_program
   |> _j "shake"
   |> ( fun (program:  J.program) -> 
-      let external_module_ids = 
-        Lam_compile_env.get_required_modules  
-          may_required_modules  
-          (Js_fold_basic.calculate_hard_dependencies program.block)
-        |>
-        (fun x ->
-           if !Js_config.sort_imports then
-             Ext_list.sort_via_array x
-               (fun id1 id2 ->
-                  Ext_string.compare (Lam_module_ident.name id1) (Lam_module_ident.name id2)
-               ) 
-           else
-             x
-        )
+      let external_module_ids : Lam_module_ident.t list = 
+        let x = Lam_compile_env.get_required_modules  
+            may_required_modules  
+            (Js_fold_basic.calculate_hard_dependencies program.block) in 
+        if !Js_config.sort_imports then
+          Ext_list.sort_via_array x
+            (fun id1 id2 ->
+               Ext_string.compare (Lam_module_ident.name id1) (Lam_module_ident.name id2)
+            ) 
+        else
+          x
       in
       Warnings.check_fatal ();  
       let effect = 

jscomp/core/lam_convert.ml

@@ -161,7 +161,10 @@ let prim = Lam.prim
 type required_modules = Lam_module_ident.Hash_set.t
 
 
-(** drop Lseq (List! ) etc *)
+(** drop Lseq (List! ) etc 
+  see #3852, we drop all these required global modules
+  but added it back based on our own module analysis
+*)
 let rec drop_global_marker (lam : Lam.t) =
   match lam with
   | Lsequence (Lglobal_module id, rest) ->