Merge f8abc79 into 27da8bf

.npmignore

@@ -12,6 +12,9 @@ docs/*
 docs/docson/*
 !docs/docson/build-schema.json
 site/
+lib/amdjs
+lib/es6
+lib/js
 .vscode/
 .github/
 odoc_gen

belt-js/.gitignore

@@ -0,0 +1 @@
+lib/

belt-js/LICENSE

@@ -0,0 +1,23 @@
+Copyright (C) 2015-2016 Bloomberg Finance L.P.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+In addition to the permissions granted to you by the LGPL, you may combine
+or link a "work that uses the Library" with a publicly distributed version
+of this file to produce a combined library or application, then distribute
+that combined work under the terms of your choosing, with no requirement
+to comply with the obligations normally placed on you by section 4 of the
+LGPL version 3 (or the corresponding section of a later version of the LGPL
+should you choose to use a later version).
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

belt-js/package.json

@@ -0,0 +1,29 @@
+{
+  "name": "belt-js",
+  "version": "2.2.3",
+  "description": "BuckleScript compiled standard libraries",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/bucklescript/bucklescript.git"
+  },
+  "keywords": [
+    "ocaml",
+    "bucklescript",
+    "stdlib",
+    "functional programming"
+  ],
+  "author": {
+    "name": "Hongbo Zhang"
+  },
+  "maintainers": [
+    {
+      "name": "hongbo_zhang",
+      "email": "bobzhang1988@gmail.com"
+    }
+  ],
+  "license": "SEE LICENSE IN LICENSE",
+  "bugs": {
+    "url": "https://github.com/bucklescript/bucklescript/issues"
+  },
+  "homepage": "https://github.com/bucklescript/bucklescript#readme"
+}

jscomp/bsb/templates/basic-reason/package.json

@@ -11,6 +11,9 @@
   ],
   "author": "",
   "license": "MIT",
+  "dependencies": {
+    "belt-js": "${bsb:bs-version}"
+  },
   "devDependencies": {
     "bs-platform": "^${bsb:bs-version}"
   }

jscomp/bsb/templates/basic/package.json

@@ -11,6 +11,9 @@
   ],
   "author": "",
   "license": "MIT",
+  "dependencies": {
+    "belt-js": "${bsb:bs-version}"
+  },
   "devDependencies": {
     "bs-platform": "^${bsb:bs-version}"
   }

jscomp/bsb/templates/generator/package.json

@@ -11,6 +11,9 @@
   ],
   "author": "",
   "license": "MIT",
+  "dependencies": {
+    "belt-js": "${bsb:bs-version}"
+  },
   "devDependencies": {
     "bs-platform": "^${bsb:bs-version}"
   }

jscomp/bsb/templates/minimal/package.json

@@ -11,6 +11,9 @@
   ],
   "author": "",
   "license": "MIT",
+  "dependencies": {
+    "belt-js": "${bsb:bs-version}"
+  },
   "devDependencies": {
     "bs-platform": "^${bsb:bs-version}"
   }

jscomp/bsb/templates/node/package.json

@@ -11,6 +11,9 @@
   ],
   "author": "",
   "license": "MIT",
+  "dependencies": {
+    "belt-js": "${bsb:bs-version}"
+  },
   "devDependencies": {
     "bs-platform": "^${bsb:bs-version}"
   }

jscomp/bsb/templates/react/package.json

@@ -15,6 +15,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
+    "belt-js": "${bsb:bs-version}",
     "react": "^16.2.0",
     "react-dom": "^16.2.0",
     "reason-react": ">=0.3.4"

jscomp/core/js_packages_info.ml

@@ -238,7 +238,9 @@ let string_of_module_id
           else  
             begin match module_system with 
               | AmdJS | NodeJS | Es6 -> 
-                dep_package_name // dep_path // js_file
+                (* HACK - TODO Replace belt-js upstream and not here *)
+                let upd_dep_package_name = if dep_package_name = "bs-platform" then "belt-js" else dep_package_name in
+                upd_dep_package_name // dep_path // js_file
               (** Note we did a post-processing when working on Windows *)
               | Es6_global 
               | AmdJS_global -> 

package.json

@@ -29,7 +29,8 @@
     "cover": "istanbul cover --report html ./node_modules/.bin/_mocha --   ./jscomp/test/**/*test.js && open coverage/index.html",
     "coverage": "istanbul cover ./node_modules/.bin/_mocha --report lcovonly --  './jscomp/test/*test.js'",
     "coveralls": "npm run-script coverage && node ./node_modules/.bin/coveralls < coverage/lcov.info",
-    "postinstall": "node scripts/install.js"
+    "postinstall": "node scripts/install.js",
+    "prepublishOnly": "./scripts/prepublish.sh"
   },
   "name": "bs-platform",
   "version": "2.2.3",

scripts/prepublish.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+BELT_FOLDER_NAME="belt-js"
+MAIN_PACKAGE_VERSION=$(node -p -e "require('./package.json').version")
+BELT_PACKAGE_VERSION=$(node -p -e "require('./$BELT_FOLDER_NAME/package.json').version")
+
+echo "**Preparing and publishing belt-js...**\n"
+
+if [ $MAIN_PACKAGE_VERSION == $BELT_PACKAGE_VERSION ]; then
+  # make && make install && \
+  cd jscomp && cd ../belt-js && \
+  mkdir -p ./lib/js && cp ../lib/js/* ./lib/js && \
+  mkdir -p ./lib/amdjs && cp ../lib/amdjs/* ./lib/amdjs && \
+  mkdir -p ./lib/es6 && cp ../lib/es6/* ./lib/es6 && \
+  echo "Finished prepublishing $BELT_FOLDER_NAME, version $BELT_PACKAGE_VERSION"
+  # && npm publish
+else
+  echo "Error: bs-platform and belt-js don't have the same version.\nbs-platform is $MAIN_PACKAGE_VERSION and belt-js is $BELT_PACKAGE_VERSION"
+fi