From 359e722a4969fb618d1146b515f802002a6c8558 Mon Sep 17 00:00:00 2001 From: fp Date: Sun, 25 Jun 2017 22:16:45 +0200 Subject: [PATCH 1/2] added Oskars bs-moment work with a script to make it compile - bs-moment-hack.sh, PLEASE RUN BEFORE running npm start --- bs-moment-hack.sh | 17 ++++++++++++++++ bsconfig.json | 3 ++- package-lock.json | 51 +++++++++++++++++++++-------------------------- package.json | 1 + src/event.re | 6 ++++-- 5 files changed, 47 insertions(+), 31 deletions(-) create mode 100755 bs-moment-hack.sh diff --git a/bs-moment-hack.sh b/bs-moment-hack.sh new file mode 100755 index 0000000..dd7be3c --- /dev/null +++ b/bs-moment-hack.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +echo '{ + "name" : "bs-moment", + "sources" : [ + { + "dir": "src", + } + ], + "bs-dependencies": [ + ] +}' > node_modules/bs-moment/bsconfig.json + +cd node_modules/bs-moment +../bs-platform/bin/bsb -make-world +cd ../.. +./node_modules/bs-platform/bin/bsb -make-world \ No newline at end of file diff --git a/bsconfig.json b/bsconfig.json index 32f31d0..46d3896 100755 --- a/bsconfig.json +++ b/bsconfig.json @@ -9,7 +9,8 @@ "reason-react", "bs-director", "bs-fetch", - "bs-json" + "bs-json", + "bs-moment" ], "sources": [ { diff --git a/package-lock.json b/package-lock.json index 3c3a788..9fa7192 100644 --- a/package-lock.json +++ b/package-lock.json @@ -270,29 +270,13 @@ "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.24.1.tgz", "integrity": "sha1-fhDhOi9xBlvfrVoXh7pFvKbe118=", - "dev": true, - "dependencies": { - "core-js": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz", - "integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4=", - "dev": true - } - } + "dev": true }, "babel-runtime": { "version": "6.23.0", "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz", "integrity": "sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs=", - "dev": true, - "dependencies": { - "core-js": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz", - "integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4=", - "dev": true - } - } + "dev": true }, "babel-template": { "version": "6.25.0", @@ -458,6 +442,9 @@ "bs-json": { "version": "github:buckletypes/bs-json#46f588df94c25da7d38aaf1092472f2d40babed9" }, + "bs-moment": { + "version": "github:buckletypes/bs-moment#9045c7477600e455e0da50490feb49a389e94945" + }, "bs-platform": { "version": "1.7.5", "resolved": "https://registry.npmjs.org/bs-platform/-/bs-platform-1.7.5.tgz", @@ -699,9 +686,10 @@ "dev": true }, "core-js": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", - "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz", + "integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4=", + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -1197,7 +1185,14 @@ "fbjs": { "version": "0.8.12", "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.12.tgz", - "integrity": "sha1-ELXZL3bUVXX9Y6IX1OoCvqL47QQ=" + "integrity": "sha1-ELXZL3bUVXX9Y6IX1OoCvqL47QQ=", + "dependencies": { + "core-js": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", + "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" + } + } }, "filename-regex": { "version": "2.0.1", @@ -2390,9 +2385,9 @@ "dev": true }, "istanbul-api": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.1.9.tgz", - "integrity": "sha512-zV14oa+hjBNP3gJTM/BzNdJpInHKbZ9cLIEwVasuaTUA1ebF9TBOIfcC5SDAE3C11rXxOw3KSimKGMiFz6PpWQ==", + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.1.10.tgz", + "integrity": "sha1-8n5ecSXI3hP2qAZhr3j1EuVDmys=", "dev": true }, "istanbul-lib-coverage": { @@ -2408,9 +2403,9 @@ "dev": true }, "istanbul-lib-instrument": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.2.tgz", - "integrity": "sha512-lPgUY+Pa5dlq2/l0qs1PJZ54QPSfo+s4+UZdkb2d0hbOyrEIAbUJphBLFjEyXBdeCONgGRADFzs3ojfFtmuwFA==", + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.3.tgz", + "integrity": "sha1-klsjkWPqvdaMxASPUsL6T4mez6c=", "dev": true }, "istanbul-lib-report": { diff --git a/package.json b/package.json index d43a0df..7da9361 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "bs-director": "^0.0.1", "bs-fetch": "buckletypes/bs-fetch", "bs-json": "github:buckletypes/bs-json", + "bs-moment": "github:buckletypes/bs-moment", "moment": "^2.18.1", "react": "^15.4.2", "react-dom": "^15.4.2", diff --git a/src/event.re b/src/event.re index f0c86b3..81f768d 100644 --- a/src/event.re +++ b/src/event.re @@ -24,7 +24,7 @@ let make ::event _children => { { ...component, render: fun () _self => { - let meetupTime = event.time |> Js.Date.fromFloat |> Js.Date.toISOString; + let meetupTime = event.time |> Js.Date.fromFloat |> Js.Date.toISOString |> MomentRe.moment;

(ReactRe.stringToElement "When? ")

(ReactRe.stringToElement event.title)

From a35e90454e25e16e7e4300f7d3692828bcc6cbe0 Mon Sep 17 00:00:00 2001 From: fp Date: Mon, 26 Jun 2017 10:33:09 +0200 Subject: [PATCH 2/2] removed the hack script as it's no longer needed after bs-moment published new version --- bs-moment-hack.sh | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100755 bs-moment-hack.sh diff --git a/bs-moment-hack.sh b/bs-moment-hack.sh deleted file mode 100755 index dd7be3c..0000000 --- a/bs-moment-hack.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -echo '{ - "name" : "bs-moment", - "sources" : [ - { - "dir": "src", - } - ], - "bs-dependencies": [ - ] -}' > node_modules/bs-moment/bsconfig.json - -cd node_modules/bs-moment -../bs-platform/bin/bsb -make-world -cd ../.. -./node_modules/bs-platform/bin/bsb -make-world \ No newline at end of file