Skip to content

Commit a395018

Browse files
authored
Merge pull request #1 from BuckleScript/master
merge upstream changes
2 parents 2b81913 + 0a6375f commit a395018

File tree

587 files changed

+140650
-56833
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

587 files changed

+140650
-56833
lines changed

.github/CHECK_LIST.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Before a bug report, please confirm if it is reproducible in master, we fix bugs quickly, so it may already be fixed in master.
2+
3+
## Checklist
4+
5+
* [x] Does your title concisely summarize the problem?
6+
* [x] Did you include a minimal, reproducable example? Is it an [SSCCE][sscce]?
7+
* [x] What OS and browser are you using? What versions?
8+
* [x] What version of OCaml are you using?
9+
10+
[sscce]: http://sscce.org
11+
12+
Just modify your initial comment if you forgot anything! Not new comments.
13+
14+
15+
## Guidelines
16+
17+
- **Keep it concise.** Longer issues are harder to understand.
18+
- **Keep it focused.** Solving three vague problems is harder than solving one specific problem.
19+
- **Be friendly!** Everyone is working hard and trying to be effective.

.github/ISSUE_TEMPLATE.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Issues are for bugs. If you have questions, ask them on a [community forum][comm]. Folks are friendly and happy to help!
2+
3+
[comm]: discord.gg/reasonml
4+
5+
Please have a look at checklist before submitting issues:
6+
7+
https://github.com/BuckleScript/bucklescript/blob/master/.github/CHECK_LIST.md

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ odoc_gen/*.cmxs
6666
!bin/bsppx
6767
!bin/bspack
6868
!/bin/bsb
69+
!/bin/bsc
70+
!bin/refmt
6971
!ocaml.tar.gz
7072

7173
#ninja

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "ocaml"]
22
path = ocaml
3-
url = https://github.com/bloomberg/ocaml
3+
url = https://github.com/bucklescript/ocaml

.vscode/c_cpp_properties.json

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,43 @@
22
"configurations": [
33
{
44
"name": "Mac",
5-
"includePath": ["/usr/include", "/Users/hzhang295/.opam/4.02.3+local-git-master/lib/ocaml/caml"],
6-
"browse" : {
7-
"limitSymbolsToIncludedHeaders" : true,
8-
"databaseFilename" : ""
5+
"includePath": [
6+
"/usr/include"
7+
8+
],
9+
"browse": {
10+
"limitSymbolsToIncludedHeaders": true,
11+
"databaseFilename": "",
12+
"path": [
13+
"/usr/include"
14+
]
915
}
1016
},
1117
{
1218
"name": "Linux",
13-
"includePath": ["/usr/include"],
14-
"browse" : {
15-
"limitSymbolsToIncludedHeaders" : true,
16-
"databaseFilename" : ""
19+
"includePath": [
20+
"/usr/include"
21+
],
22+
"browse": {
23+
"limitSymbolsToIncludedHeaders": true,
24+
"databaseFilename": "",
25+
"path": [
26+
"/usr/include"
27+
]
1728
}
1829
},
1930
{
2031
"name": "Win32",
21-
"includePath": ["c:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include"],
22-
"browse" : {
23-
"limitSymbolsToIncludedHeaders" : true,
24-
"databaseFilename" : ""
32+
"includePath": [
33+
"c:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include"
34+
],
35+
"browse": {
36+
"limitSymbolsToIncludedHeaders": true,
37+
"databaseFilename": "",
38+
"path": [
39+
"c:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include"
40+
]
2541
}
2642
}
2743
]
28-
}
44+
}

.vscode/settings.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
// Place your settings in this file to overwrite default and user settings.
22
{
3-
"debug.inlineValues": true
3+
"debug.inlineValues": true,
4+
"ocaml.lintOnSave": false,
5+
"ocaml.lintOnChange": false
46
}

.vscode/tasks.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"fileLocation": "absolute",
1414
"owner": "ocaml",
1515
"watching": {
16-
"activeOnStart": true,
16+
"activeOnStart": false,
1717
"beginsPattern": ">>>> Start compiling",
1818
"endsPattern": ">>>> Finish compiling"
1919
},

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ If you'd like to help us improve and extend BuckleScript, then we welcome your
44
contributions!
55

66
Below you will find some basic steps required to be able to contribute to the project. If
7-
you have any questions about this process or any other aspect of contributing to a Bloomberg open
8-
source project, feel free to send an email to [email protected] and we'll get your questions
7+
you have any questions about this process or any other aspect of contributing to a bucklescript open
8+
source project, feel free to send an email to [email protected] and we'll get your questions
99
answered as quickly as we can.
1010

1111

Changes

Lines changed: 0 additions & 38 deletions
This file was deleted.

Changes.md

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
2+
# Next
3+
Fixes:
4+
5+
- #1573, don't include `-bs` flags in `.merlin`
6+
- #1716, fix wrong optimization of recursive values
7+
- #1728, bad inlining
8+
- #1409, make sure when optional is None, bs.obj will not introduce such label
9+
- #1737, same as #1409
10+
- #1746, a corner case when mixing recursive value and functions, should make markup.ml work
11+
- #1749, fix nested if, code block discarded issue
12+
13+
# 1.7.5
14+
15+
Fixes:
16+
- #1676, `bsb -w` will always build regardless of filetype when fs.watch doesn't send a filename
17+
- #1655, fix #1653 Js.Promise.all[n] interfaces
18+
- #1658, fix typeof = "null" issue
19+
- #1656, bs.get/set/get_index/set_index respects bs.ignore
20+
- #1654, `bsb -init` fails if package or current dir has space (parent dir can have spaces)
21+
- #1678, bs.get{null;undefined} in object type
22+
- #1692, fix invalid js syntax output
23+
- #1701, fix tailcall handling interaction with exception handler
24+
- #1666, fix misue of GADT api
25+
26+
Features:
27+
- #1648, exposed `bsc` in the npm environment
28+
- #1647, special handling `bsb -init .` to reuse current directory
29+
- #1667, fix an optimization bug
30+
- #1698, fix exit code incorrectly aggregated issue
31+
- #1666, add Js.Json.classify and Js.Types.classify
32+
- #1705, add dom storage api
33+
- #1672, sync up with new reason
34+
- #1696, provide reason-react template
35+
36+
# 1.7.4(May 24, 2017):
37+
38+
39+
40+
internal tools:
41+
42+
- #1583, add -U -D support for bspack
43+
44+
Features:
45+
46+
- #1630, add modules Option, Result, List, and Vector into Js namesapace, update docs
47+
48+
- #1613, allow bs.scope with bs.send/bs.send.pipe/bs.set/bs.get/bs.set_index/bs.get_index
49+
- #1604, add the functions `entries`, `values`, `fromList`, `fromArray` and `map` to `Js.Dict`
50+
51+
- #1632, bsb themes support
52+
53+
Bug fixes :
54+
55+
- #1581, more error checking
56+
- #1633, fix missing installations
57+
- #1581, more error checking %identity
58+
59+
# 1.7.3:
60+
61+
Bug fixes:
62+
63+
- #1556, fix duplicated requires of runtime (report by Chenglou)
64+
65+
- #1568, internal compiler error
66+
67+
Features:
68+
69+
- #1564: scoped values in FF, see `bs.scope` in the Manual
70+
71+
72+

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
[BuckleScript](http://bloomberg.github.io/bucklescript/): A JavaScript backend for [OCaml](https://ocaml.org/) focused on smooth integration and clean generated code.
1+
[BuckleScript](http://bucklescript.github.io/bucklescript/): A JavaScript backend for [OCaml](https://ocaml.org/) focused on smooth integration and clean generated code.
22

33
[![NPM](https://nodei.co/npm/bs-platform.png?compact=true)](https://nodei.co/npm/bs-platform/)
44

5-
[![Build Status](https://travis-ci.org/bloomberg/bucklescript.svg?branch=master)](https://travis-ci.org/bloomberg/bucklescript)
6-
[![Coverage Status](https://coveralls.io/repos/github/bloomberg/bucklescript/badge.svg?branch=master)](https://coveralls.io/github/bloomberg/bucklescript?branch=master)
7-
[![Try Online](https://img.shields.io/badge/try_it-online!-yellow.svg?style=flat-square)](https://bloomberg.github.io/bucklescript/js-demo)
5+
[![Build Status](https://travis-ci.org/BuckleScript/bucklescript.svg?branch=master)](https://travis-ci.org/bucklescript/bucklescript)
6+
[![Try Online](https://img.shields.io/badge/try_it-online!-yellow.svg?style=flat-square)](https://bucklescript.github.io/bucklescript/js-demo)
87

98
## Try BuckleScript
109

11-
You can try BuckleScript directly [in your browser](http://bloomberg.github.io/bucklescript/js-demo/). Write OCaml in the left panel and
10+
You can try BuckleScript directly [in your browser](http://bucklescript.github.io/bucklescript/js-demo/). Write OCaml in the left panel and
1211
watch as it instantly compiles to JavaScript shown in the right panel.
1312

1413

@@ -30,11 +29,11 @@ from the git repository places them in `./bin`.
3029

3130
## Documentation
3231

33-
See http://bloomberg.github.io/bucklescript/Manual.html for detailed documentation on BuckleScript. If you'd
34-
like to contribute content [see here](https://github.com/bloomberg/bucklescript/blob/master/site/docsource)
32+
See http://bucklescript.github.io/bucklescript/Manual.html for detailed documentation on BuckleScript. If you'd
33+
like to contribute content [see here](https://github.com/bucklescript/bucklescript/blob/master/site/docsource)
3534
for the documentation source.
3635

37-
See http://bloomberg.github.io/bucklescript/api/ for Libraries shipped with BuckleScript.
36+
See http://bucklescript.github.io/bucklescript/api/ for Libraries shipped with BuckleScript.
3837

3938
## How BuckleScript Works
4039

@@ -54,7 +53,7 @@ alongside the rich cross-platform JavaScript ecosystem.
5453
## BuckleScript Examples
5554

5655
Basic examples of using BuckleScript are provided below. More extensive examples are available at
57-
https://github.com/bloomberg/bucklescript-addons.
56+
https://github.com/bucklescript/bucklescript-addons.
5857

5958
#### An HTTP Server
6059

@@ -175,12 +174,13 @@ test();
175174
## Getting Help and Providing Feedback
176175

177176
If you need help or have a question, comment, or suggestion, please feel free to [open an
178-
issue](https://github.com/bloomberg/bucklescript/issues).
177+
issue](https://github.com/bucklescript/bucklescript/issues).
179178

180-
## Credits
179+
## Acknowledgements
181180

182181
* Thanks to the [OCaml](https://ocaml.org) team, obviously, without such a beautiful yet practical language, this backend would not exist
183182
* Thanks to [ninja-build](https://ninja-build.org), BuckleScript also comes with a blazing fast build tool on top of it, `ninja` is a truly [well engineered](http://aosabook.org/en/posa/ninja.html) scalable build tool
183+
* Thanks to [Bloomberg](https://techatbloomberg.com)! This project began at Bloomberg and was published in 2016; without the support of Bloomberg, it would not have happened. Now that the project has grown and developed its own community, it has moved to its own GitHub organization.
184184

185185
## Licensing
186186

bin/bsc

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/usr/bin/env node
2+
"use strict";
3+
4+
var child_process = require('child_process')
5+
6+
var exe = __filename + ".exe"
7+
var delegate_args = process.argv.slice(2)
8+
9+
try {
10+
child_process.execFileSync(exe, delegate_args, { stdio: 'inherit' })
11+
} catch (e) {
12+
console.error('Error happened when running command', exe, 'with args', delegate_args)
13+
process.exit(2)
14+
}

bin/refmt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/usr/bin/env node
2+
"use strict";
3+
4+
var child_process = require('child_process')
5+
6+
var exe = __filename + ".exe"
7+
var delegate_args = process.argv.slice(2)
8+
9+
try {
10+
child_process.execFileSync(exe, delegate_args, { stdio: 'inherit' })
11+
} catch (e) {
12+
console.error('Error happened when running command', exe, 'with args', delegate_args)
13+
process.exit(2)
14+
}

0 commit comments

Comments
 (0)