@khanacademy/wonder-blocks-testing 6.0.0 → 7.0.1

package/dist/index.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 31);
+/******/ 	return __webpack_require__(__webpack_require__.s = 23);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -148,7 +148,7 @@ module.exports = require("react-router-dom");
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return makeTestHarness; });
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _render_adapters_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30);
+/* harmony import */ var _render_adapters_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(22);
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 
@@ -202,40 +202,10 @@ const makeTestHarness = (adapters, defaultConfigs) => {
 /* 4 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return setup; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return getConfiguration; });
-let _configuration = null;
-/**
- * Setup the fixture framework.
- */
-
-const setup = configuration => {
-  _configuration = configuration;
-};
-/**
- * Get the framework configuration.
- *
- * @returns {Configuration} The configuration as provided via setup().
- * @throws {Error} If the configuration has not been set.
- */
-
-const getConfiguration = () => {
-  if (_configuration == null) {
-    throw new Error("Not configured");
-  }
-
-  return _configuration;
-};
-
-/***/ }),
-/* 5 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return RespondWith; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return makeMockResponse; });
-/* harmony import */ var _response_impl_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(27);
+/* harmony import */ var _response_impl_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(19);
 
 
 /**
@@ -349,7 +319,7 @@ const makeMockResponse = response => {
 };
 
 /***/ }),
-/* 6 */
+/* 5 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -392,12 +362,12 @@ const makeHookHarness = (adapters, defaultConfigs) => {
 };
 
 /***/ }),
-/* 7 */
+/* 6 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return mockRequester; });
-/* harmony import */ var _make_mock_response_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(5);
+/* harmony import */ var _make_mock_response_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4);
 
 
 /**
@@ -449,6 +419,12 @@ const mockRequester = (operationMatcher, operationToString) => {
   return mockFn;
 };
 
+/***/ }),
+/* 7 */
+/***/ (function(module, exports) {
+
+module.exports = require("@storybook/addon-actions");
+
 /***/ }),
 /* 8 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
@@ -522,7 +498,7 @@ const adapter = (children, config) => {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return adapter; });
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _khanacademy_wonder_blocks_data__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
+/* harmony import */ var _khanacademy_wonder_blocks_data__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(21);
 /* harmony import */ var _khanacademy_wonder_blocks_data__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_khanacademy_wonder_blocks_data__WEBPACK_IMPORTED_MODULE_1__);
 
 
@@ -707,211 +683,81 @@ const adapter = (children, config) => {
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _storybook_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "storybook", function() { return _storybook_js__WEBPACK_IMPORTED_MODULE_0__["a"]; });
-
-
-
-/***/ }),
-/* 13 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return getAdapter; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return fixtures; });
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _storybook_addon_actions__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(20);
+/* harmony import */ var _storybook_addon_actions__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(7);
 /* harmony import */ var _storybook_addon_actions__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_storybook_addon_actions__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _adapter_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(21);
-
 
 
 
 /**
- * Get a fixture framework adapter for Storybook support.
+ * Describe a group of fixtures for a given component.
+ *
+ * Only one `fixtures` call should be used per fixture file as it returns
+ * the exports for that file.
+ *
+ * @param {component: React.ComponentType<any>} options Options describing the
+ * fixture group.
+ * @param {FixtureFn<TProps> => void} fn A function that provides a `fixture`
+ * function for defining fixtures.
+ * @returns {(
+ *    description: string,
+ *    props: FixtureProps<TProps>,
+ *    wrapper?: React.ComponentType<TProps>,
+ * ) => mixed} A function to create a CSF compatible story.
  */
-const getAdapter = (MountingComponent = null) => new _adapter_js__WEBPACK_IMPORTED_MODULE_2__[/* Adapter */ "a"]("storybook", ({
-  title,
-  description: groupDescription,
-  // We don't use the default title in Storybook as storybook
-  // will generate titles for us if we pass a nullish title.
-  getDefaultTitle: _
-}, adapterOptions, declaredFixtures) => {
-  const templateMap = new WeakMap();
-
-  const log = (message, ...args) => Object(_storybook_addon_actions__WEBPACK_IMPORTED_MODULE_1__["action"])(message).apply(void 0, args);
-
-  const exports = declaredFixtures.reduce((acc, {
-    description,
-    getProps,
-    component: Component
-  }, i) => {
-    const storyName = `${i + 1} ${description}`;
-    const exportName = storyName // Make word boundaries start with an upper case letter.
-    .replace(/\b\w/g, c => c.toUpperCase()) // Remove all non-alphanumeric characters.
-    .replace(/[^\w]+/g, "") // Remove all underscores.
-    .replace(/[_]+/g, ""); // We create a “template” of how args map to rendering
+const fixtures = Component => {
+  const templateMap = new WeakMap(); // We use this to make sure each story gets a unique name.
+
+  let storyNumber = 1;
+  const getPropsOptions = {
+    log: (message, ...args) => Object(_storybook_addon_actions__WEBPACK_IMPORTED_MODULE_1__["action"])(message).apply(void 0, args),
+    logHandler: _storybook_addon_actions__WEBPACK_IMPORTED_MODULE_1__["action"]
+  };
+
+  const makeStory = (description, props, wrapper = null) => {
+    const storyName = `${storyNumber++} ${description}`;
+
+    const getProps = options => typeof props === "function" ? props(options) : props; // We create a “template” of how args map to rendering
     // for each type of component as the component here could
     // be the component under test, or wrapped in a wrapper
     // component. We don't use decorators for the wrapper
     // because we may not be in a storybook context and it
     // keeps the framework API simpler this way.
 
+
     let Template = templateMap.get(Component);
 
     if (Template == null) {
-      // The MountingComponent is a bit different than just a
-      // Storybook decorator. It's a React component that
-      // takes over rendering the component in the fixture
-      // with the given args, allowing for greater
-      // customization in a platform-agnostic manner (i.e.
-      // not just story format).
-      Template = MountingComponent ? args => /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__["createElement"](MountingComponent, {
-        component: Component,
-        props: args,
-        log: log
-      }) : args => /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__["createElement"](Component, args);
+      Template = args => /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__["createElement"](Component, args);
+
       templateMap.set(Component, Template);
     } // Each story that shares that component then reuses that
     // template.
 
 
-    acc[exportName] = Template.bind({});
-    acc[exportName].args = getProps({
-      log
-    }); // Adding a story name here means that we don't have to
+    const story = Template.bind({});
+    story.args = getProps(getPropsOptions); // Adding a story name here means that we don't have to
     // care about naming the exports correctly, if we don't
     // want (useful if we need to autogenerate or manually
     // expose ESM exports).
 
-    acc[exportName].storyName = storyName;
-    return acc;
-  }, {
-    default: {
-      title,
-      // TODO(somewhatabstract): Use groupDescription
-      // Possibly via a decorator?
-      ...adapterOptions
-    }
-  });
-  return Object.freeze(exports);
-});
-
-/***/ }),
-/* 14 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return fixtures; });
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _setup_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4);
-/* harmony import */ var _combine_options_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(23);
-
-
-
-
-const normalizeOptions = componentOrOptions => {
-  // To differentiate between a React component and a FixturesOptions object,
-  // we have to do some type checking.
-  //
-  // Alternatives I considered were:
-  // - Use an additional parameter for the options and then do an arg number
-  //   check, but that always makes typing a function harder and often breaks
-  //   types. I didn't want that battle today.
-  // - Use a tuple when providing component and options with the first element
-  //   being the component and the second being the options. However that
-  //   feels like an obscure API even though it's really easy to do the
-  //   typing.
-  if ( // Most React components, whether functional or class-based, are
-  // inherently functions in JavaScript, so a check for functions is
-  // usually sufficient.
-  typeof componentOrOptions === "function" || // However, the return of React.forwardRef is not a function,
-  // so we also have to cope with that.
-  // A forwardRef has $$typeof = Symbol(react.forward_ref) and a
-  // render function.
-  // $FlowIgnore[prop-missing]
-  typeof componentOrOptions.render === "function") {
-    return {
-      // $FlowIgnore[incompatible-return]
-      component: componentOrOptions
-    };
-  } // We can't test for React.ComponentType at runtime.
-  // Let's assume our simple heuristic above is sufficient.
-  // $FlowIgnore[incompatible-return]
-
-
-  return componentOrOptions;
-};
-/**
- * Describe a group of fixtures for a given component.
- *
- * Only one `fixtures` call should be used per fixture file as it returns
- * the exports for that file.
- *
- * @param {FixtureOptions<TProps>} options Options describing the
- * fixture group.
- * @param {FixtureFn<TProps> => void} fn A function that provides a `fixture`
- * function for defining fixtures.
- * @returns {Exports} The object to be exported as `module.exports`.
- *
- * TODO(somewhatabstract): Determine a way around this requirement so we
- * can support named exports and default exports via the adapters in a
- * deterministic way. Currently this is imposed on us because of how
- * storybook, the popular framework, uses both default and named exports for
- * its interface.
- */
-
-
-const fixtures = (componentOrOptions, fn) => {
-  var _additionalAdapterOpt;
-
-  const {
-    adapter,
-    defaultAdapterOptions
-  } = Object(_setup_js__WEBPACK_IMPORTED_MODULE_1__[/* getConfiguration */ "a"])();
-  const {
-    title,
-    component,
-    description: groupDescription,
-    defaultWrapper,
-    additionalAdapterOptions
-  } = normalizeOptions(componentOrOptions); // 1. Create a new adapter group.
-
-  const group = adapter.declareGroup({
-    title,
-    description: groupDescription,
-    getDefaultTitle: () => component.displayName || component.name || "Component"
-  }); // 2. Invoke fn with a function that can add a new fixture.
-
-  const addFixture = (description, props, wrapper = null) => {
-    var _ref;
-
-    group.declareFixture({
-      description,
-      getProps: options => typeof props === "function" ? props(options) : props,
-      component: (_ref = wrapper != null ? wrapper : defaultWrapper) != null ? _ref : component
-    });
+    story.storyName = storyName;
+    return story;
   };
 
-  fn(addFixture); // 3. Combine the adapter options from the fixture group with the
-  //    defaults from our setup.
-
-  const groupAdapterOverrides = (_additionalAdapterOpt = additionalAdapterOptions == null ? void 0 : additionalAdapterOptions[adapter.name]) != null ? _additionalAdapterOpt : {};
-  const combinedAdapterOptions = Object(_combine_options_js__WEBPACK_IMPORTED_MODULE_2__[/* combineOptions */ "a"])(defaultAdapterOptions, groupAdapterOverrides); // 4. Call close on the group and return the result.
-
-  return group.closeGroup(combinedAdapterOptions);
+  return makeStory;
 };
 
 /***/ }),
-/* 15 */
+/* 13 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return mockFetch; });
-/* harmony import */ var _fetch_request_matches_mock_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(26);
-/* harmony import */ var _mock_requester_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(7);
+/* harmony import */ var _fetch_request_matches_mock_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(18);
+/* harmony import */ var _mock_requester_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(6);
 
 
 
@@ -922,13 +768,13 @@ const mockFetch = () => Object(_mock_requester_js__WEBPACK_IMPORTED_MODULE_1__[/
     Options: ${init == null ? "None" : JSON.stringify(init, null, 2)}`);
 
 /***/ }),
-/* 16 */
+/* 14 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return mockGqlFetch; });
-/* harmony import */ var _gql_request_matches_mock_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(28);
-/* harmony import */ var _mock_requester_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(7);
+/* harmony import */ var _gql_request_matches_mock_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(20);
+/* harmony import */ var _mock_requester_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(6);
 
 
 
@@ -940,7 +786,7 @@ const mockGqlFetch = () => Object(_mock_requester_js__WEBPACK_IMPORTED_MODULE_1_
     Context: ${JSON.stringify(context, null, 2)}`);
 
 /***/ }),
-/* 17 */
+/* 15 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -952,14 +798,14 @@ const mockGqlFetch = () => Object(_mock_requester_js__WEBPACK_IMPORTED_MODULE_1_
  */
 
 /***/ }),
-/* 18 */
+/* 16 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return hookHarness; });
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _make_hook_harness_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(6);
+/* harmony import */ var _make_hook_harness_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5);
 /* harmony import */ var _adapters_adapters_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(1);
 
 
@@ -977,7 +823,7 @@ const mockGqlFetch = () => Object(_mock_requester_js__WEBPACK_IMPORTED_MODULE_1_
 const hookHarness = Object(_make_hook_harness_js__WEBPACK_IMPORTED_MODULE_1__[/* makeHookHarness */ "a"])(_adapters_adapters_js__WEBPACK_IMPORTED_MODULE_2__["DefaultAdapters"], _adapters_adapters_js__WEBPACK_IMPORTED_MODULE_2__["DefaultConfigs"]);
 
 /***/ }),
-/* 19 */
+/* 17 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -1002,220 +848,7 @@ const hookHarness = Object(_make_hook_harness_js__WEBPACK_IMPORTED_MODULE_1__[/*
 const testHarness = Object(_make_test_harness_js__WEBPACK_IMPORTED_MODULE_1__[/* makeTestHarness */ "a"])(_adapters_adapters_js__WEBPACK_IMPORTED_MODULE_2__["DefaultAdapters"], _adapters_adapters_js__WEBPACK_IMPORTED_MODULE_2__["DefaultConfigs"]);
 
 /***/ }),
-/* 20 */
-/***/ (function(module, exports) {
-
-module.exports = require("@storybook/addon-actions");
-
-/***/ }),
-/* 21 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Adapter; });
-/* harmony import */ var _adapter_group_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(22);
-
-
-/**
- * Class for implementing a custom adapter.
- */
-class Adapter {
-  /**
-   * @param {string} name The name of the adapter.
-   * @param {CloseGroupFn<any, Options, Exports>} closeGroupFn The function
-   * an adapter group should call when the group is closed. This is invoked
-   * by an adapter group when it is closed. This function is where an
-   * adapter implements the logic to generate the actual fixtures for the
-   * adapter's target framework.
-   */
-  constructor(name, closeGroupFn) {
-    if (typeof name !== "string") {
-      throw new TypeError("name must be a string");
-    }
-
-    if (name.trim() === "") {
-      throw new Error("name must be a non-empty string");
-    }
-
-    if (typeof closeGroupFn !== "function") {
-      throw new TypeError("closeGroupFn must be a function");
-    }
-
-    this._name = name;
-    this._closeGroupFn = closeGroupFn;
-  }
-  /**
-   * The name of the adapter.
-   */
-
-
-  get name() {
-    return this._name;
-  }
-  /**
-   * Declare a new fixture group.
-   *
-   * @param {FixturesAdapterGroupOptions} options The options describing the fixture
-   * group.
-   * @returns {FixturesAdapterGroup} The new fixture group.
-   */
-
-
-  declareGroup(options) {
-    return new _adapter_group_js__WEBPACK_IMPORTED_MODULE_0__[/* AdapterGroup */ "a"](this._closeGroupFn, options);
-  }
-
-}
-
-/***/ }),
-/* 22 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AdapterGroup; });
-/**
- * Simple adapter group implementation.
- */
-class AdapterGroup {
-  /**
-   * Create an adapter group.
-   *
-   * @param {CloseGroupFn<TProps, Options, Exports>} closeGroupFn A function
-   * to invoke when the group is closed.
-   * @param {AdapterGroupOptions} options The options for the group.
-   */
-  constructor(closeGroupFn, _options) {
-    this.closeGroup = (adapterOptions = null) => {
-      if (this._closeGroupFn == null) {
-        throw new Error("Group already closed");
-      }
-
-      try {
-        return this._closeGroupFn(this._options, adapterOptions, this._fixtures);
-      } finally {
-        this._closeGroupFn = null;
-      }
-    };
-
-    this.declareFixture = options => {
-      if (typeof options !== "object" || options === null) {
-        throw new TypeError("options must be an object");
-      }
-
-      if (this._closeGroupFn == null) {
-        throw new Error("Cannot declare fixtures after closing the group");
-      }
-
-      this._fixtures.push(options);
-    };
-
-    if (typeof closeGroupFn !== "function") {
-      throw new TypeError("closeGroupFn must be a function");
-    }
-
-    if (typeof _options !== "object" || _options === null) {
-      throw new TypeError("options must be an object");
-    }
-
-    this._closeGroupFn = closeGroupFn;
-    this._options = _options;
-    this._fixtures = [];
-  }
-  /**
-   * Close the group.
-   *
-   * This declares that no more fixtures are to be added to the group,
-   * and will call the parent adapter with the declared fixtures so that they
-   * can be adapted for the target fixture framework, such as Storybook.
-   */
-
-
-}
-
-/***/ }),
-/* 23 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return combineOptions; });
-/* harmony import */ var _combine_top_level_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(24);
-
-/**
- * Combine one or more objects into a single object.
- *
- * Objects later in the argument list take precedence over those that are
- * earlier. Object and array values at the root level are merged.
- */
-
-const combineOptions = (...toBeCombined) => {
-  const combined = toBeCombined.filter(Boolean).reduce((acc, cur) => {
-    for (const key of Object.keys(cur)) {
-      // We always call combine, even if acc[key] is undefined
-      // because we need to make sure we clone values.
-      acc[key] = Object(_combine_top_level_js__WEBPACK_IMPORTED_MODULE_0__[/* combineTopLevel */ "a"])(acc[key], cur[key]);
-    }
-
-    return acc;
-  }, {}); // We know that we are creating a compatible return type.
-  // $FlowIgnore[incompatible-return]
-
-  return combined;
-};
-
-/***/ }),
-/* 24 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return combineTopLevel; });
-/* harmony import */ var _khanacademy_wonder_stuff_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(25);
-/* harmony import */ var _khanacademy_wonder_stuff_core__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_khanacademy_wonder_stuff_core__WEBPACK_IMPORTED_MODULE_0__);
-
-/**
- * Combine two values.
- *
- * This method clones val2 before using any of its properties to try to ensure
- * the combined object is not linked back to the original.
- *
- * If the values are objects, it will merge them at the top level. Properties
- * themselves are not merged; val2 properties will overwrite val1 where there
- * are conflicts
- *
- * If the values are arrays, it will concatenate and dedupe them.
- * NOTE: duplicates in either val1 or val2 will also be deduped.
- *
- * If the values are any other type, or val2 has a different type to val1, val2
- * will be returned.
- */
-
-const combineTopLevel = (val1, val2) => {
-  const obj2Clone = Object(_khanacademy_wonder_stuff_core__WEBPACK_IMPORTED_MODULE_0__["clone"])(val2); // Only merge if they're both arrays or both objects.
-  // If not, we will just return val2.
-
-  if (val1 !== null && val2 !== null && typeof val1 === "object" && typeof val2 === "object") {
-    const val1IsArray = Array.isArray(val1);
-    const val2IsArray = Array.isArray(val2);
-
-    if (val1IsArray && val2IsArray) {
-      return Array.from(new Set([].concat(val1, obj2Clone)));
-    } else if (!val1IsArray && !val2IsArray) {
-      return { ...val1,
-        ...obj2Clone
-      };
-    }
-  }
-
-  return obj2Clone;
-};
-
-/***/ }),
-/* 25 */
-/***/ (function(module, exports) {
-
-module.exports = require("@khanacademy/wonder-stuff-core");
-
-/***/ }),
-/* 26 */
+/* 18 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -1258,7 +891,7 @@ const fetchRequestMatchesMock = (mock, input, init) => {
 };
 
 /***/ }),
-/* 27 */
+/* 19 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -1268,10 +901,10 @@ const fetchRequestMatchesMock = (mock, input, init) => {
 // --experimental-fetch flag), then we're good, but otherwise we need an
 // implementation, so this uses node-fetch as a peer dependency and uses that
 // to provide the implementation if we don't already have one.
-const ResponseImpl = typeof Response === "undefined" ? __webpack_require__(32).Response : Response;
+const ResponseImpl = typeof Response === "undefined" ? __webpack_require__(24).Response : Response;
 
 /***/ }),
-/* 28 */
+/* 20 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -1346,13 +979,13 @@ const gqlRequestMatchesMock = (mock, operation, variables, context) => {
 };
 
 /***/ }),
-/* 29 */
+/* 21 */
 /***/ (function(module, exports) {
 
 module.exports = require("@khanacademy/wonder-blocks-data");
 
 /***/ }),
-/* 30 */
+/* 22 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -1384,48 +1017,40 @@ const renderAdapters = (adapters, configs, children) => {
 };
 
 /***/ }),
-/* 31 */
+/* 23 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _fixtures_adapters_adapters_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
-/* harmony reexport (module object) */ __webpack_require__.d(__webpack_exports__, "fixtureAdapters", function() { return _fixtures_adapters_adapters_js__WEBPACK_IMPORTED_MODULE_0__; });
-/* harmony import */ var _fixtures_fixtures_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(14);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "fixtures", function() { return _fixtures_fixtures_js__WEBPACK_IMPORTED_MODULE_1__["a"]; });
-
-/* harmony import */ var _fixtures_setup_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "setupFixtures", function() { return _fixtures_setup_js__WEBPACK_IMPORTED_MODULE_2__["b"]; });
+/* harmony import */ var _fixtures_fixtures_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "fixtures", function() { return _fixtures_fixtures_js__WEBPACK_IMPORTED_MODULE_0__["a"]; });
 
-/* harmony import */ var _fetch_mock_fetch_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(15);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mockFetch", function() { return _fetch_mock_fetch_js__WEBPACK_IMPORTED_MODULE_3__["a"]; });
+/* harmony import */ var _fetch_mock_fetch_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(13);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mockFetch", function() { return _fetch_mock_fetch_js__WEBPACK_IMPORTED_MODULE_1__["a"]; });
 
-/* harmony import */ var _gql_mock_gql_fetch_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(16);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mockGqlFetch", function() { return _gql_mock_gql_fetch_js__WEBPACK_IMPORTED_MODULE_4__["a"]; });
+/* harmony import */ var _gql_mock_gql_fetch_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(14);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mockGqlFetch", function() { return _gql_mock_gql_fetch_js__WEBPACK_IMPORTED_MODULE_2__["a"]; });
 
-/* harmony import */ var _make_mock_response_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(5);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "RespondWith", function() { return _make_mock_response_js__WEBPACK_IMPORTED_MODULE_5__["a"]; });
+/* harmony import */ var _make_mock_response_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(4);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "RespondWith", function() { return _make_mock_response_js__WEBPACK_IMPORTED_MODULE_3__["a"]; });
 
-/* harmony import */ var _harness_types_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(17);
-/* harmony import */ var _harness_adapters_adapters_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(1);
-/* harmony reexport (module object) */ __webpack_require__.d(__webpack_exports__, "harnessAdapters", function() { return _harness_adapters_adapters_js__WEBPACK_IMPORTED_MODULE_7__; });
-/* harmony import */ var _harness_make_hook_harness_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(6);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "makeHookHarness", function() { return _harness_make_hook_harness_js__WEBPACK_IMPORTED_MODULE_8__["a"]; });
+/* harmony import */ var _harness_types_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(15);
+/* harmony import */ var _harness_adapters_adapters_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(1);
+/* harmony reexport (module object) */ __webpack_require__.d(__webpack_exports__, "harnessAdapters", function() { return _harness_adapters_adapters_js__WEBPACK_IMPORTED_MODULE_5__; });
+/* harmony import */ var _harness_make_hook_harness_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(5);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "makeHookHarness", function() { return _harness_make_hook_harness_js__WEBPACK_IMPORTED_MODULE_6__["a"]; });
 
-/* harmony import */ var _harness_make_test_harness_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(3);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "makeTestHarness", function() { return _harness_make_test_harness_js__WEBPACK_IMPORTED_MODULE_9__["a"]; });
+/* harmony import */ var _harness_make_test_harness_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(3);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "makeTestHarness", function() { return _harness_make_test_harness_js__WEBPACK_IMPORTED_MODULE_7__["a"]; });
 
-/* harmony import */ var _harness_hook_harness_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(18);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "hookHarness", function() { return _harness_hook_harness_js__WEBPACK_IMPORTED_MODULE_10__["a"]; });
+/* harmony import */ var _harness_hook_harness_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(16);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "hookHarness", function() { return _harness_hook_harness_js__WEBPACK_IMPORTED_MODULE_8__["a"]; });
 
-/* harmony import */ var _harness_test_harness_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(19);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "testHarness", function() { return _harness_test_harness_js__WEBPACK_IMPORTED_MODULE_11__["a"]; });
+/* harmony import */ var _harness_test_harness_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(17);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "testHarness", function() { return _harness_test_harness_js__WEBPACK_IMPORTED_MODULE_9__["a"]; });
 
 // Fixtures framework
 
-
-
-
 // Fetch mocking framework
 
 
@@ -1440,7 +1065,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 /***/ }),
-/* 32 */
+/* 24 */
 /***/ (function(module, exports) {
 
 module.exports = require("node-fetch");