sync js_of_ocaml dune and ocamlbuild flags

Summary: Changelog: [internal]

Reviewed By: SamChou19815

Differential Revision: D41389337

fbshipit-source-id: ece87977260434c1cc4dc816401a56b712ee0ea6

Author: mroch

Makefile

@@ -517,23 +517,13 @@ bin/flow.js: _build/scripts/ppx_gen_flowlibs.exe $(LIBFUZZY_PATH_DEP) $(BUILT_OB
 		$(INCLUDE_OPTS) $(JS_FINDLIB_OPTS) \
 		-lflags "$(BYTECODE_LINKER_FLAGS)" \
 		src/flow_dot_js.byte
-	# js_of_ocaml has no ability to upgrade warnings to errors, but we want to
-	# error if, for example, there are any unimplemented C primitives.
 	js_of_ocaml \
+			--Werror \
 			--opt 3 \
 			--disable genprim \
 			--extern-fs \
 			-o bin/flow.js \
-			$(JS_STUBS) _build/src/flow_dot_js.byte \
-			2>_build/js_of_ocaml.err; \
-	ret=$$?; \
-	if [ ! $$ret ]; then \
-		exit $$ret; \
-	elif [ -s _build/js_of_ocaml.err ]; then \
-		printf "js_of_ocaml produced output on stderr:\n" 1>&2; \
-		cat _build/js_of_ocaml.err 1>&2; \
-		exit 1; \
-	fi
+			$(JS_STUBS) _build/src/flow_dot_js.byte
 
 js: bin/flow.js
 

dune

@@ -1,4 +1,6 @@
 (env
  (_
   (flags
-   (:standard -w @a-4-29-35-41-42-44-45-48-50-58-70))))
+   (:standard -w @a-4-29-35-41-42-44-45-48-50-58-70))
+  (js_of_ocaml
+    (flags --disable genprim --Werror))))

dune-project

@@ -1,2 +1,2 @@
-(lang dune 2.8)
+(lang dune 3.0)
 (formatting (enabled_for dune))

src/dune

@@ -1,3 +1,9 @@
+(env
+ (opt
+  (js_of_ocaml
+    (compilation_mode whole_program)
+    (flags :standard --opt 3))))
+
 (executable
  (name flow)
  (modes native byte_complete)

src/parser/Makefile

@@ -82,8 +82,7 @@ js:
 	cd $(TOP); \
 	$(OCB) -no-links -pkgs js_of_ocaml $(REL_DIR)/flow_parser_dot_js.byte; \
 	[ -e "$(REL_DIR)/flow_parser.js" -a "$(REL_DIR)/flow_parser.js" -nt "_build/$(REL_DIR)/flow_parser_dot_js.byte" ] || \
-		js_of_ocaml --opt 3 \
-			--no-extern-fs \
+		js_of_ocaml --Werror --disable genprim --opt 3 --no-extern-fs \
 			-o $(REL_DIR)/flow_parser.js \
 			_build/$(REL_DIR)/flow_parser_dot_js.byte
 

src/parser/dune

@@ -11,6 +11,8 @@
  (name flow_parser_dot_js)
  (modes js)
  (modules flow_parser_js flow_parser_dot_js)
+ (js_of_ocaml
+  (flags :standard --no-extern-fs))
  (libraries flow_parser js_of_ocaml))
 
 (dirs