From 53029c10b9cb08339300a4dc7d912cd3619d0cf2 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 11 Sep 2018 12:09:19 -0400
Subject: [PATCH] Fix wonky default export in accounts-base/client_main.js.

Follow-up to 8d4f07a802d62abc8c3940022c5948f31c93f757.
---
 packages/accounts-base/client_main.js | 25 +++++++++++++------------
 packages/accounts-base/server_main.js |  2 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/packages/accounts-base/client_main.js b/packages/accounts-base/client_main.js
index 4fa98ef532..b3022e862a 100644
--- a/packages/accounts-base/client_main.js
+++ b/packages/accounts-base/client_main.js
@@ -1,4 +1,7 @@
-import { AccountsClient, AccountsTest } from "./accounts_client.js";
+import {
+  AccountsClient,
+  AccountsTest,
+} from "./accounts_client.js";
 
 /**
  * @namespace Accounts
@@ -14,14 +17,12 @@ Accounts = new AccountsClient();
  */
 Meteor.users = Accounts.users;
 
-const exp = { AccountsClient };
-
-if (Meteor.isPackageTest) {
-  // Since this file is the main module for the client version of the
-  // accounts-base package, properties of non-entry-point modules need to
-  // be re-exported in order to be accessible to modules that import the
-  // accounts-base package.
-  exp.AccountsTest = AccountsTest;
-}
-
-export default exp;
+export {
+  Accounts,
+  AccountsClient,
+  AccountsTest,
+  // For backwards compatibility. Note that exporting an object as the
+  // default export is *not* the same as exporting its properties as named
+  // exports, as was previously assumed.
+  exports as default,
+};
diff --git a/packages/accounts-base/server_main.js b/packages/accounts-base/server_main.js
index bfb12ef956..db5020fed5 100644
--- a/packages/accounts-base/server_main.js
+++ b/packages/accounts-base/server_main.js
@@ -1,4 +1,4 @@
-import {AccountsServer} from "./accounts_server.js";
+import { AccountsServer } from "./accounts_server.js";
 
 /**
  * @namespace Accounts