Merge 062e4da into a3c8482

rescript-lang · Dec 1, 2016 · ce183d7 · ce183d7
2 parents a3c8482 + 062e4da
commit ce183d7
Show file tree

Hide file tree

Showing 23 changed files with 316 additions and 116 deletions.
diff --git a/bsconfig.json b/bsconfig.json
@@ -3,6 +3,10 @@
     "version": "1.2.2",
     "ocaml-config" : 
     {
+        "package-specs": [
+            "commonjs"
+            // ,"amdjs"
+        ],
         "bs-external-includes" : [
             "jscomp/runtime", 
             "jscomp/stdlib", 

diff --git a/docs/docson/build-schema.json b/docs/docson/build-schema.json
@@ -8,24 +8,12 @@
                 "goog"
             ]
         },
-        "module-output": {
-            "type": "array",
-            "items": [
-                {
-                    "$ref": "#/definitions/module-format"
-                },
-                {
-                    "type": "string",
-                    "description": "output path, if not set, it will be `lib/js/commonjs`, `lib/js/amdjs` or `lib/js/goog` "
-                }
-            ]
-        },
-        "package-spec": {
+        "package-specs": {
             "oneOf": [
                 {
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/module-output"
+                        "$ref": "#/definitions/module-format"
                     },
                     "description": "package output"
                 },
@@ -196,8 +184,8 @@
                     "$ref": "#/definitions/stringArray",
                     "description": "A list of flags for bsc.exe"
                 },
-                "package-spec": {
-                    "$ref": "#/definitions/package-spec",
+                "package-specs": {
+                    "$ref": "#/definitions/package-specs",
                     "description": "TODO: currently only support commonjs"
                 },
                 "ocamllex": {

diff --git a/jscomp/all.depend b/jscomp/all.depend
@@ -509,8 +509,9 @@ bsb/bsb_build_util.cmx : ext/ext_list.cmx ext/ext_filename.cmx \
     bsb/bsb_build_util.cmi
 bsb/bsb_config.cmx : common/js_config.cmx ext/ext_filename.cmx \
     bsb/bsb_config.cmi
-bsb/bsb_default.cmx : ext/ext_filename.cmx bsb/bsb_build_util.cmx \
-    common/bs_pkg.cmx bsb/bsb_default.cmi
+bsb/bsb_default.cmx : ext/string_set.cmx ext/literals.cmx \
+    ext/ext_filename.cmx bsb/bsb_build_util.cmx common/bs_pkg.cmx \
+    bsb/bsb_default.cmi
 bsb/bsb_dep_infos.cmx : bsb/bsb_dep_infos.cmi
 bsb/bsb_dir.cmx : bsb/bsb_dir.cmi
 bsb/bsb_gen.cmx : ext/string_map.cmx ext/literals.cmx ext/ext_filename.cmx \
@@ -533,14 +534,14 @@ bsb/bsb_build_ui.cmi : ext/string_set.cmi ext/ext_file_pp.cmi \
     bsb/bsb_json.cmi common/binary_cache.cmi
 bsb/bsb_build_util.cmi : bsb/bsb_json.cmi
 bsb/bsb_config.cmi :
-bsb/bsb_default.cmi : bsb/bsb_json.cmi
+bsb/bsb_default.cmi : ext/string_set.cmi bsb/bsb_json.cmi
 bsb/bsb_dep_infos.cmi :
 bsb/bsb_dir.cmi :
-bsb/bsb_gen.cmi : bsb/bsb_build_ui.cmi
+bsb/bsb_gen.cmi : bsb/bsb_default.cmi bsb/bsb_build_ui.cmi
 bsb/bsb_helper_main.cmi :
 bsb/bsb_json.cmi : ext/string_map.cmi
 bsb/bsb_main.cmi :
-bsb/bsb_ninja.cmi : bsb/bsb_build_ui.cmi
+bsb/bsb_ninja.cmi : bsb/bsb_default.cmi bsb/bsb_build_ui.cmi
 bsb/sexp_lexer.cmi :
 ounit/oUnit.cmi :
 ounit/oUnitDiff.cmi :

diff --git a/jscomp/bin/all_ounit_tests.ml b/jscomp/bin/all_ounit_tests.ml
@@ -5984,7 +5984,9 @@ val suffix_mliastd : string
 val suffix_js : string
 
 
-
+val commonjs : string 
+val amdjs : string 
+val goog : string 
 end = struct
 #1 "literals.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -6077,6 +6079,9 @@ let suffix_mlastd = ".mlast.d"
 let suffix_mliastd = ".mliast.d"
 let suffix_js = ".js"
 
+let commonjs = "commonjs" 
+let amdjs = "amdjs"
+let goog = "goog"
 end
 module Ext_filename : sig 
 #1 "ext_filename.mli"