From b3331c0217fe84ce8f25650a1bd1fe3e01fc010e Mon Sep 17 00:00:00 2001
From: Logan Smyth <loganfsmyth@gmail.com>
Date: Thu, 5 Oct 2017 22:03:39 -0400
Subject: [PATCH] Ensure that the options object always exists.

---
 packages/babel-core/src/config/option-manager.js | 4 ++--
 packages/babel-core/src/config/plugin.js         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/babel-core/src/config/option-manager.js b/packages/babel-core/src/config/option-manager.js
index d2232ef98d..6b39bbd274 100644
--- a/packages/babel-core/src/config/option-manager.js
+++ b/packages/babel-core/src/config/option-manager.js
@@ -222,7 +222,7 @@ type BasicDescriptor = {
 
 type LoadedDescriptor = {
   value: {},
-  options: {} | void,
+  options: {},
   dirname: string,
   alias: string,
   loc: string,
@@ -292,7 +292,7 @@ const loadConfig = makeWeakCache((config): {
  */
 const loadDescriptor = makeWeakCache(
   (descriptor: BasicDescriptor, cache): LoadedDescriptor => {
-    const { value, options, dirname, alias, loc } = descriptor;
+    const { value, options = {}, dirname, alias, loc } = descriptor;
 
     let item = value;
     if (typeof value === "function") {
diff --git a/packages/babel-core/src/config/plugin.js b/packages/babel-core/src/config/plugin.js
index 324e482226..fec1ecdbe1 100644
--- a/packages/babel-core/src/config/plugin.js
+++ b/packages/babel-core/src/config/plugin.js
@@ -7,9 +7,9 @@ export default class Plugin {
   pre: ?Function;
   visitor: ?{};
 
-  options: {} | void;
+  options: {};
 
-  constructor(plugin: {}, options: {} | void, key?: string) {
+  constructor(plugin: {}, options: {}, key?: string) {
     if (plugin.name != null && typeof plugin.name !== "string") {
       throw new Error("Plugin .name must be a string, null, or undefined");
     }