From 2f4366187a43204f8ee862cbf2dd67e47a8a9fa0 Mon Sep 17 00:00:00 2001
From: Isaac Murchie <isaac@saucelabs.com>
Date: Wed, 3 Oct 2018 09:17:26 -0400
Subject: [PATCH] Fix exports for new Babel

---
 index.js                          | 37 +++++++++++++++++++++----------
 lib/basedriver/device-settings.js |  2 +-
 lib/basedriver/driver.js          |  1 +
 lib/jsonwp-proxy/proxy.js         |  1 +
 4 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/index.js b/index.js
index a4051bf57..5f2b94e1a 100644
--- a/index.js
+++ b/index.js
@@ -1,19 +1,26 @@
 // transpile:main
 
 // BaseDriver exports
-import BaseDriver from './lib/basedriver/driver';
-import { ImageElement } from './lib/basedriver/image-element';
-import DeviceSettings, { BASEDRIVER_HANDLED_SETTINGS } from './lib/basedriver/device-settings';
+import * as driver from './lib/basedriver/driver';
+import * as image from './lib/basedriver/image-element';
+import * as deviceSettings from './lib/basedriver/device-settings';
+
+const { BaseDriver } = driver;
+const { ImageElement } = image;
+const { DeviceSettings, BASEDRIVER_HANDLED_SETTINGS } = deviceSettings;
 
 export { BaseDriver, DeviceSettings, ImageElement, BASEDRIVER_HANDLED_SETTINGS };
 export default BaseDriver;
 
+
 // MJSONWP exports
-import {
+import * as protocol from './lib/protocol';
+
+const {
   Protocol, routeConfiguringFunction, errors, isErrorType,
   errorFromMJSONWPStatusCode, errorFromW3CJsonCode, ALL_COMMANDS, METHOD_MAP,
   routeToCommandName, NO_SESSION_ID_COMMANDS, isSessionCommand,
-} from './lib/protocol';
+} = protocol;
 
 export {
   Protocol, routeConfiguringFunction, errors, isErrorType,
@@ -22,24 +29,30 @@ export {
   routeToCommandName, NO_SESSION_ID_COMMANDS, isSessionCommand };
 
 // Express exports
-import { STATIC_DIR } from './lib/express/static';
+import * as staticIndex from './lib/express/static';
+const { STATIC_DIR } = staticIndex;
 export { STATIC_DIR };
-import { server } from './lib/express/server';
+
+import * as serverIndex from './lib/express/server';
+const { server } = serverIndex;
 export { server };
 
 // jsonwp-proxy exports
-import JWProxy from './lib/jsonwp-proxy/proxy';
+import * as proxyIndex from './lib/jsonwp-proxy/proxy';
+const { JWProxy } = proxyIndex;
 export { JWProxy };
 
 // jsonwp-status exports
-import { codes, getSummaryByCode } from './lib/jsonwp-status/status';
-const statusCodes = codes;
+import * as statusIndex from './lib/jsonwp-status/status';
+const { codes: statusCodes, getSummaryByCode } = statusIndex;
 export { statusCodes, getSummaryByCode };
 
 // W3C capabilities parser
-import { processCapabilities } from './lib/basedriver/capabilities';
+import * as caps from './lib/basedriver/capabilities';
+const { processCapabilities } = caps;
 export { processCapabilities };
 
 // Web socket helpers
-import { DEFAULT_WS_PATHNAME_PREFIX } from './lib/express/websocket';
+import * as ws from './lib/express/websocket';
+const { DEFAULT_WS_PATHNAME_PREFIX } = ws;
 export { DEFAULT_WS_PATHNAME_PREFIX };
diff --git a/lib/basedriver/device-settings.js b/lib/basedriver/device-settings.js
index 596ec5ed5..3522a5877 100644
--- a/lib/basedriver/device-settings.js
+++ b/lib/basedriver/device-settings.js
@@ -76,4 +76,4 @@ class DeviceSettings {
 }
 
 export default DeviceSettings;
-export { BASEDRIVER_HANDLED_SETTINGS };
+export { DeviceSettings, BASEDRIVER_HANDLED_SETTINGS };
diff --git a/lib/basedriver/driver.js b/lib/basedriver/driver.js
index a7efdd0b9..34c8febb8 100644
--- a/lib/basedriver/driver.js
+++ b/lib/basedriver/driver.js
@@ -470,4 +470,5 @@ for (let [cmd, fn] of _.toPairs(commands)) {
   BaseDriver.prototype[cmd] = fn;
 }
 
+export { BaseDriver };
 export default BaseDriver;
diff --git a/lib/jsonwp-proxy/proxy.js b/lib/jsonwp-proxy/proxy.js
index 6841736f6..976050076 100644
--- a/lib/jsonwp-proxy/proxy.js
+++ b/lib/jsonwp-proxy/proxy.js
@@ -294,4 +294,5 @@ class JWProxy {
   }
 }
 
+export { JWProxy };
 export default JWProxy;