From a5ea102ab38cccae0b1b52035a579653ced8a854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Se=CC=81rgio=20Ramos?= <mail@sergioramos.me>
Date: Thu, 15 Feb 2018 20:05:29 +0000
Subject: [PATCH] chore(ui-toolkit): update react-bundle

---
 bundle/index.js                  | 39 ++++++++++++++++++++------------
 bundle/package.json              |  9 ++++----
 packages/ui-toolkit/package.json |  2 +-
 yarn.lock                        | 22 +++++++++---------
 4 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/bundle/index.js b/bundle/index.js
index 54125d07..98fc99b7 100644
--- a/bundle/index.js
+++ b/bundle/index.js
@@ -1,12 +1,15 @@
-
+'use strict';
 
 const Brule = require('brule');
 const Hapi = require('hapi');
-const Inert = require('inert');
-const Main = require('apr-main');
 const Rollover = require('rollover');
+const { homedir } = require('os');
+const { join } = require('path');
 
-const Sso = require('minio-proto-auth');
+process.env.SDC_KEY_PATH =
+  process.env.SDC_KEY_PATH || join(homedir(), '.ssh/id_rsa');
+
+const Sso = require('hapi-triton-auth');
 const Ui = require('my-joy-beta');
 const Nav = require('joyent-navigation');
 const Api = require('cloudapi-gql');
@@ -29,17 +32,17 @@ const server = Hapi.server({
   host: '127.0.0.1'
 });
 
-Main(async () => {
+async function main () {
   await server.register([
-    // {
-    //   plugin: Rollover,
-    //   options: {
-    //     rollbar: {
-    //       accessToken: ROLLBAR_SERVER_TOKEN,
-    //       reportLevel: 'error'
-    //     }
-    //   }
-    // },
+    {
+      plugin: Rollover,
+      options: {
+        rollbar: {
+          accessToken: ROLLBAR_SERVER_TOKEN,
+          reportLevel: 'error'
+        }
+      }
+    },
     {
       plugin: Brule,
       options: {
@@ -80,6 +83,12 @@ Main(async () => {
 
   server.auth.default('sso');
 
+  process.on('unhandledRejection', (err) => {
+    server.log(['error'], err);
+  });
+
   await server.start();
   console.log(`server started at http://localhost:${server.info.port}`);
-});
+}
+
+main();
diff --git a/bundle/package.json b/bundle/package.json
index f9a41c4a..382bfd25 100644
--- a/bundle/package.json
+++ b/bundle/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "license": "MPL-2.0",
   "scripts": {
-    "start": "NODE_ENV=development PORT=3069 REACT_APP_GQL_PORT=3069 REACT_APP_GQL_PROTOCOL=http node -r ./_env.js index.js",
+    "start": "NODE_ENV=development PORT=3069 REACT_APP_GQL_PORT=3069 REACT_APP_GQL_PROTOCOL=http node index.js",
     "lint-ci": "echo 0",
     "lint": "echo 0",
     "test-ci": "echo 0",
@@ -12,14 +12,13 @@
     "prepublish": "echo 0"
   },
   "dependencies": {
-    "apr-main": "^4.0.3",
     "brule": "^3.1.0",
     "cloudapi-gql": "^4.6.0",
     "hapi": "^17.2.0",
+    "hapi-triton-auth": "^1.0.0",
     "inert": "^5.1.0",
-    "joyent-navigation": "^1.0.0",
-    "minio-proto-auth": "^1.1.0",
-    "my-joy-beta": "^1.0.0",
+    "joyent-navigation": "*",
+    "my-joy-beta": "*",
     "rollover": "^1.0.0"
   }
 }
diff --git a/packages/ui-toolkit/package.json b/packages/ui-toolkit/package.json
index 53ef5224..e53b7079 100644
--- a/packages/ui-toolkit/package.json
+++ b/packages/ui-toolkit/package.json
@@ -34,7 +34,7 @@
     "outy": "^0.1.2",
     "pascal-case": "^2.0.1",
     "prop-types": "^15.6.0",
-    "react-bundle": "^1.0.4",
+    "react-bundle": "^1.1.0",
     "react-popper": "^0.7.5",
     "react-responsive": "^4.0.3",
     "remcalc": "^1.0.10",
diff --git a/yarn.lock b/yarn.lock
index aaac3a69..6b104aac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5035,6 +5035,16 @@ handlebars@^4.0.2, handlebars@^4.0.3:
   optionalDependencies:
     uglify-js "^2.6"
 
+hapi-triton-auth@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/hapi-triton-auth/-/hapi-triton-auth-1.0.0.tgz#b9fcf8808edae5dd1951683821eec4356d7b253e"
+  dependencies:
+    boom "7.1.x"
+    bounce "1.2.x"
+    cryptiles "4.1.x"
+    hoek "5.0.x"
+    wreck "14.0.x"
+
 hapi@^17.2.0:
   version "17.2.0"
   resolved "https://registry.yarnpkg.com/hapi/-/hapi-17.2.0.tgz#e5d74b65235b443225e05d7b7510cdb80d4887e7"
@@ -7241,16 +7251,6 @@ minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
 
-minio-proto-auth@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/minio-proto-auth/-/minio-proto-auth-1.1.0.tgz#6eb0487d9366ed07d42374107a6ba80795eec7e3"
-  dependencies:
-    boom "7.1.x"
-    bounce "1.2.x"
-    cryptiles "4.1.x"
-    hoek "5.0.x"
-    wreck "14.0.x"
-
 mississippi@^1.3.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-1.3.1.tgz#2a8bb465e86550ac8b36a7b6f45599171d78671e"
@@ -8722,7 +8722,7 @@ react-apollo@^2.0.4:
     lodash.pick "^4.4.0"
     prop-types "^15.5.8"
 
-react-bundle@^1.0.4:
+react-bundle@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/react-bundle/-/react-bundle-1.1.0.tgz#d243de62ecb28639440dfb35d25bc5721d93a9b1"
   dependencies: