rescript-lang · cristianoc · Apr 18, 2023 · Apr 18, 2023 · Apr 18, 2023
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,7 @@
 - Fix issue with record type coercion and unboxed. https://github.com/rescript-lang/rescript-compiler/issues/6158
 - Fixed subtype checking for record types with "@as" attributes: The subtype relationship now takes into account the compatibility of "@as" attributes between corresponding fields, ensuring correctness in runtime representation.
  https://github.com/rescript-lang/rescript-compiler/issues/6158
+- Emit directive above header comment. https://github.com/rescript-lang/rescript-compiler/pull/6172
 
 #### :nail_care: Polish
 

diff --git a/jscomp/core/js_dump_program.ml b/jscomp/core/js_dump_program.ml
@@ -102,12 +102,13 @@ let es6_program ~output_dir fmt f (x : J.deps_program) =
 let pp_deps_program ~(output_prefix : string)
     (kind : Js_packages_info.module_system) (program : J.deps_program)
     (f : Ext_pp.t) =
-  if not !Js_config.no_version_header then (
-    P.string f Bs_version.header;
-    P.newline f);
+
   !Js_config.directives |> List.iter (fun prim ->
     P.string f prim;
     P.newline f);
+  if not !Js_config.no_version_header then (
+    P.string f Bs_version.header;
+    P.newline f);
 
   if deps_program_is_empty program then P.string f empty_explanation
     (* This is empty module, it won't be referred anywhere *)

diff --git a/jscomp/test/406_primitive_test.js b/jscomp/test/406_primitive_test.js
diff --git a/jscomp/test/DotDotDot.js b/jscomp/test/DotDotDot.js
diff --git a/jscomp/test/EmptyRecord.js b/jscomp/test/EmptyRecord.js
diff --git a/jscomp/test/RecordCoercion.js b/jscomp/test/RecordCoercion.js
diff --git a/jscomp/test/RecordOrObject.js b/jscomp/test/RecordOrObject.js
diff --git a/jscomp/test/SafePromises.js b/jscomp/test/SafePromises.js
diff --git a/jscomp/test/UncurriedAlways.js b/jscomp/test/UncurriedAlways.js
diff --git a/jscomp/test/UncurriedExternals.js b/jscomp/test/UncurriedExternals.js
diff --git a/jscomp/test/UncurriedPervasives.js b/jscomp/test/UncurriedPervasives.js
diff --git a/jscomp/test/UntaggedVariants.js b/jscomp/test/UntaggedVariants.js
diff --git a/jscomp/test/a.js b/jscomp/test/a.js
diff --git a/jscomp/test/a_filename_test.js b/jscomp/test/a_filename_test.js
diff --git a/jscomp/test/a_list_test.js b/jscomp/test/a_list_test.js
diff --git a/jscomp/test/a_recursive_type.js b/jscomp/test/a_recursive_type.js
diff --git a/jscomp/test/a_scope_bug.js b/jscomp/test/a_scope_bug.js
diff --git a/jscomp/test/a_string_test.js b/jscomp/test/a_string_test.js
diff --git a/jscomp/test/abstract_type.js b/jscomp/test/abstract_type.js
diff --git a/jscomp/test/adt_optimize_test.js b/jscomp/test/adt_optimize_test.js
diff --git a/jscomp/test/alias_default_value_test.js b/jscomp/test/alias_default_value_test.js
diff --git a/jscomp/test/alias_test.js b/jscomp/test/alias_test.js
diff --git a/jscomp/test/and_or_tailcall_test.js b/jscomp/test/and_or_tailcall_test.js
diff --git a/jscomp/test/app_root_finder.js b/jscomp/test/app_root_finder.js
diff --git a/jscomp/test/argv_test.js b/jscomp/test/argv_test.js
diff --git a/jscomp/test/ari_regress_test.js b/jscomp/test/ari_regress_test.js
diff --git a/jscomp/test/arith_lexer.js b/jscomp/test/arith_lexer.js
diff --git a/jscomp/test/arith_parser.js b/jscomp/test/arith_parser.js
diff --git a/jscomp/test/arith_syntax.js b/jscomp/test/arith_syntax.js
diff --git a/jscomp/test/arity.js b/jscomp/test/arity.js
diff --git a/jscomp/test/arity_deopt.js b/jscomp/test/arity_deopt.js
diff --git a/jscomp/test/arity_infer.js b/jscomp/test/arity_infer.js
diff --git a/jscomp/test/array_data_util.js b/jscomp/test/array_data_util.js
diff --git a/jscomp/test/array_safe_get.js b/jscomp/test/array_safe_get.js
diff --git a/jscomp/test/array_subtle_test.js b/jscomp/test/array_subtle_test.js
diff --git a/jscomp/test/array_test.js b/jscomp/test/array_test.js
diff --git a/jscomp/test/ast_abstract_test.js b/jscomp/test/ast_abstract_test.js
diff --git a/jscomp/test/ast_mapper_unused_warning_test.js b/jscomp/test/ast_mapper_unused_warning_test.js
diff --git a/jscomp/test/async_await.js b/jscomp/test/async_await.js
diff --git a/jscomp/test/async_ideas.js b/jscomp/test/async_ideas.js
diff --git a/jscomp/test/async_inline.js b/jscomp/test/async_inline.js
diff --git a/jscomp/test/attr_test.js b/jscomp/test/attr_test.js
diff --git a/jscomp/test/b.js b/jscomp/test/b.js
diff --git a/jscomp/test/bal_set_mini.js b/jscomp/test/bal_set_mini.js
diff --git a/jscomp/test/bang_primitive.js b/jscomp/test/bang_primitive.js
diff --git a/jscomp/test/basic_module_test.js b/jscomp/test/basic_module_test.js
diff --git a/jscomp/test/bb.js b/jscomp/test/bb.js
diff --git a/jscomp/test/bdd.js b/jscomp/test/bdd.js
diff --git a/jscomp/test/belt_internal_test.js b/jscomp/test/belt_internal_test.js
diff --git a/jscomp/test/belt_result_alias_test.js b/jscomp/test/belt_result_alias_test.js
diff --git a/jscomp/test/bench.js b/jscomp/test/bench.js
diff --git a/jscomp/test/big_enum.js b/jscomp/test/big_enum.js
diff --git a/jscomp/test/big_polyvar_test.js b/jscomp/test/big_polyvar_test.js
diff --git a/jscomp/test/block_alias_test.js b/jscomp/test/block_alias_test.js
diff --git a/jscomp/test/boolean_test.js b/jscomp/test/boolean_test.js
diff --git a/jscomp/test/bs_MapInt_test.js b/jscomp/test/bs_MapInt_test.js
diff --git a/jscomp/test/bs_abstract_test.js b/jscomp/test/bs_abstract_test.js
diff --git a/jscomp/test/bs_array_test.js b/jscomp/test/bs_array_test.js
diff --git a/jscomp/test/bs_auto_uncurry.js b/jscomp/test/bs_auto_uncurry.js
diff --git a/jscomp/test/bs_auto_uncurry_test.js b/jscomp/test/bs_auto_uncurry_test.js
diff --git a/jscomp/test/bs_float_test.js b/jscomp/test/bs_float_test.js
diff --git a/jscomp/test/bs_hashmap_test.js b/jscomp/test/bs_hashmap_test.js
diff --git a/jscomp/test/bs_hashset_int_test.js b/jscomp/test/bs_hashset_int_test.js
diff --git a/jscomp/test/bs_hashtbl_string_test.js b/jscomp/test/bs_hashtbl_string_test.js
diff --git a/jscomp/test/bs_ignore_effect.js b/jscomp/test/bs_ignore_effect.js
diff --git a/jscomp/test/bs_ignore_test.js b/jscomp/test/bs_ignore_test.js
diff --git a/jscomp/test/bs_int_test.js b/jscomp/test/bs_int_test.js
diff --git a/jscomp/test/bs_list_test.js b/jscomp/test/bs_list_test.js
diff --git a/jscomp/test/bs_map_set_dict_test.js b/jscomp/test/bs_map_set_dict_test.js
diff --git a/jscomp/test/bs_map_test.js b/jscomp/test/bs_map_test.js
diff --git a/jscomp/test/bs_min_max_test.js b/jscomp/test/bs_min_max_test.js
diff --git a/jscomp/test/bs_mutable_set_test.js b/jscomp/test/bs_mutable_set_test.js
diff --git a/jscomp/test/bs_node_string_buffer_test.js b/jscomp/test/bs_node_string_buffer_test.js
diff --git a/jscomp/test/bs_poly_map_test.js b/jscomp/test/bs_poly_map_test.js
diff --git a/jscomp/test/bs_poly_mutable_map_test.js b/jscomp/test/bs_poly_mutable_map_test.js
diff --git a/jscomp/test/bs_poly_mutable_set_test.js b/jscomp/test/bs_poly_mutable_set_test.js
diff --git a/jscomp/test/bs_poly_set_test.js b/jscomp/test/bs_poly_set_test.js
diff --git a/jscomp/test/bs_qualified.js b/jscomp/test/bs_qualified.js
diff --git a/jscomp/test/bs_queue_test.js b/jscomp/test/bs_queue_test.js