Skip to content

Commit 131a474

Browse files
committed
resolve package by the build system instead
1 parent 5eb318e commit 131a474

File tree

13 files changed

+990
-1520
lines changed

13 files changed

+990
-1520
lines changed

docs/Manual.html

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ <h1><a href="https://github.com/bloomberg/bucklescript">BuckleScript</a> User Ma
518518
<li><a href="#_an_example_with_multiple_modules">An example with multiple modules</a></li>
519519
</ul>
520520
</li>
521-
<li><a href="#_built_in_npm_support">Built in npm support</a>
521+
<li><a href="#_built_in_npm_support">Built in NPM support</a>
522522
<ul class="sectlevel2">
523523
<li><a href="#_build_ocaml_library_as_a_npm_package">Build OCaml library as a npm package</a></li>
524524
<li><a href="#_to_use_ocaml_library_as_a_npm_package">To use OCaml library as a npm package</a></li>
@@ -1216,16 +1216,35 @@ <h3 id="_an_example_with_multiple_modules"><a class="anchor" href="#_an_example_
12161216
</div>
12171217
</div>
12181218
<div class="sect1">
1219-
<h2 id="_built_in_npm_support"><a class="anchor" href="#_built_in_npm_support"></a>Built in npm support</h2>
1219+
<h2 id="_built_in_npm_support"><a class="anchor" href="#_built_in_npm_support"></a>Built in NPM support</h2>
12201220
<div class="sectionbody">
12211221
<div class="sect2">
12221222
<h3 id="_build_ocaml_library_as_a_npm_package"><a class="anchor" href="#_build_ocaml_library_as_a_npm_package"></a>Build OCaml library as a npm package</h3>
12231223
<div class="paragraph">
1224+
<p>BuckleScript build system has built in support for NPM packages,
1225+
please checkout the section about the bsb for NPM support.</p>
1226+
</div>
1227+
<div class="admonitionblock note">
1228+
<table>
1229+
<tr>
1230+
<td class="icon">
1231+
<div class="title">Note</div>
1232+
</td>
1233+
<td class="content">
1234+
<div class="paragraph">
1235+
<p>This section covers some basics of how NPM is supported internally, normal users
1236+
are safe to skip this section.</p>
1237+
</div>
1238+
</td>
1239+
</tr>
1240+
</table>
1241+
</div>
1242+
<div class="paragraph">
12241243
<p>BuckleScript extends the OCaml compiler options with several flags to
12251244
provide better experience for NPM users.</p>
12261245
</div>
12271246
<div class="paragraph">
1228-
<p>In general, you are expected to deploy two kinds of artifacts, the
1247+
<p>In general, you are expected to see two kinds of build artifacts, the
12291248
generated JS files and meta data which your OCaml dependencies rely
12301249
on.</p>
12311250
</div>
@@ -1261,7 +1280,7 @@ <h3 id="_to_use_ocaml_library_as_a_npm_package"><a class="anchor" href="#_to_use
12611280
</div>
12621281
<div class="listingblock">
12631282
<div class="content">
1264-
<pre class="pygments highlight"><code data-lang="sh">bsc.exe -bs-package-include ocaml-package-name -c a.ml</code></pre>
1283+
<pre class="pygments highlight"><code data-lang="sh">bsc.exe -I path/to/ocaml/package/installed -c a.ml</code></pre>
12651284
</div>
12661285
</div>
12671286
</div>
@@ -1272,7 +1291,7 @@ <h3 id="_together"><a class="anchor" href="#_together"></a>Together</h3>
12721291
</div>
12731292
<div class="listingblock">
12741293
<div class="content">
1275-
<pre class="pygments highlight"><code data-lang="sh">bsc.exe -bs-package-include ocaml-package1 -bs-package-include ocaml-package2 -bs-package-name <span class="tok-nv">$npm_package_name</span> -bs-package-output commonjs:path/to/lib/js/ -c a.ml</code></pre>
1294+
<pre class="pygments highlight"><code data-lang="sh">bsc.exe -I path/to/ocaml/package1/installed -I path/to/ocaml/package2/installed -bs-package-name <span class="tok-nv">$npm_package_name</span> -bs-package-output commonjs:path/to/lib/js/ -c a.ml</code></pre>
12761295
</div>
12771296
</div>
12781297
</div>

jscomp/all.depend

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -571,9 +571,8 @@ core/bspp_main.cmx : core/bspp_main.cmi
571571
core/js_cmi_datasets.cmx : ext/string_map.cmx core/js_cmi_datasets.cmi
572572
core/js_main.cmx : core/ocaml_parse.cmx core/ocaml_options.cmx \
573573
core/ocaml_batch_compile.cmx core/js_implementation.cmx \
574-
common/js_config.cmx ext/ext_string.cmx ext/ext_filename.cmx \
575-
common/bs_pkg.cmx depends/bs_exception.cmx \
576-
core/bs_conditional_initial.cmx core/js_main.cmi
574+
common/js_config.cmx ext/ext_string.cmx core/bs_conditional_initial.cmx \
575+
core/js_main.cmi
577576
ounit/oUnit.cmi :
578577
ounit/oUnitDiff.cmi :
579578
ounit/oUnit.cmx : ounit/oUnitUtils.cmx ounit/oUnitTypes.cmx \
@@ -653,9 +652,8 @@ bsb/bsb_build_util.cmx : ext/literals.cmx ext/ext_sys.cmx ext/ext_string.cmx \
653652
ext/ext_list.cmx ext/ext_json.cmx ext/ext_filename.cmx ext/ext_array.cmx \
654653
bsb/bsb_config.cmx bsb/bsb_build_schemas.cmx common/bs_pkg.cmx \
655654
bsb/bsb_build_util.cmi
656-
bsb/bsb_config.cmx : ext/string_set.cmx ext/literals.cmx \
657-
common/js_config.cmx ext/ext_string.cmx ext/ext_filename.cmx \
658-
bsb/bsb_config.cmi
655+
bsb/bsb_config.cmx : ext/string_set.cmx ext/literals.cmx ext/ext_string.cmx \
656+
ext/ext_filename.cmx bsb/bsb_config.cmi
659657
bsb/bsb_config_parse.cmx : ext/string_hash_set.cmx ext/literals.cmx \
660658
ext/ext_string.cmx ext/ext_json.cmx ext/ext_filename.cmx \
661659
ext/ext_file_pp.cmx bsb/bsb_default.cmx bsb/bsb_config_types.cmx \

jscomp/bin/bsb.d

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ bin/bsb.ml : ext/ext_string.ml
1111
bin/bsb.ml : ext/ext_string.mli
1212
bin/bsb.ml : ext/ext_filename.ml
1313
bin/bsb.ml : ext/ext_filename.mli
14-
bin/bsb.ml : common/js_config.ml
15-
bin/bsb.ml : common/js_config.mli
1614
bin/bsb.ml : ext/set_gen.ml
1715
bin/bsb.ml : ext/string_set.ml
1816
bin/bsb.ml : ext/string_set.mli

0 commit comments

Comments
 (0)