new file mode 100644
--- /dev/null
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/DebuggerClient.js
@@ -0,0 +1,88 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+// Objects and functions were cherry-picked from devtools/shared/client/main.js, in
+// order to make the console launchpad Worker.
+
+// mock, we only need DebuggerClient.requester
+const DebuggerClient = function (transport) {};
+
+/**
+ * A declarative helper for defining methods that send requests to the server.
+ *
+ * @param packetSkeleton
+ *        The form of the packet to send. Can specify fields to be filled from
+ *        the parameters by using the |arg| function.
+ * @param before
+ *        The function to call before sending the packet. Is passed the packet,
+ *        and the return value is used as the new packet. The |this| context is
+ *        the instance of the client object we are defining a method for.
+ * @param after
+ *        The function to call after the response is received. It is passed the
+ *        response, and the return value is considered the new response that
+ *        will be passed to the callback. The |this| context is the instance of
+ *        the client object we are defining a method for.
+ * @return Request
+ *         The `Request` object that is a Promise object and resolves once
+ *         we receive the response. (See request method for more details)
+ */
+DebuggerClient.requester = function (packetSkeleton, config = {}) {
+  let { before, after } = config;
+  return function (...args) {
+    let outgoingPacket = {
+      to: packetSkeleton.to || this.actor
+    };
+
+    let maxPosition = -1;
+    for (let k of Object.keys(packetSkeleton)) {
+      if (packetSkeleton[k] instanceof DebuggerClient.Argument) {
+        let { position } = packetSkeleton[k];
+        outgoingPacket[k] = packetSkeleton[k].getArgument(args);
+        maxPosition = Math.max(position, maxPosition);
+      } else {
+        outgoingPacket[k] = packetSkeleton[k];
+      }
+    }
+
+    if (before) {
+      outgoingPacket = before.call(this, outgoingPacket);
+    }
+
+    return this.request(outgoingPacket, (response) => {
+      if (after) {
+        let { from } = response;
+        response = after.call(this, response);
+        if (!response.from) {
+          response.from = from;
+        }
+      }
+
+      // The callback is always the last parameter.
+      let thisCallback = args[maxPosition + 1];
+      if (thisCallback) {
+        thisCallback(response);
+      }
+      return response;
+    }, "DebuggerClient.requester request callback");
+  };
+};
+
+function arg(pos) {
+  return new DebuggerClient.Argument(pos);
+}
+
+DebuggerClient.Argument = function (position) {
+  this.position = position;
+};
+
+DebuggerClient.Argument.prototype.getArgument = function (params) {
+  if (!(this.position in params)) {
+    throw new Error("Bad index into params: " + this.position);
+  }
+  return params[this.position];
+};
+
+module.exports = { arg, DebuggerClient };

deleted file mode 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/ObjectClient.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-class ObjectClient {
-  constructor(client, grip) {
-    this._grip = grip;
-    this._client = client;
-    this.request = this._client.request;
-  }
-
-  getPrototypeAndProperties() {
-    return this._client.request({
-      to: this._grip.actor,
-      type: "prototypeAndProperties"
-    });
-  }
-}
-
-module.exports = { ObjectClient };

--- a/devtools/client/webconsole/webpack.config.js
+++ b/devtools/client/webconsole/webpack.config.js
@@ -21,27 +21,33 @@ let webpackConfig = {
 
   module: {
     rules: [
       {
         test: /\.(png|svg)$/,
         loader: "file-loader?name=[path][name].[ext]",
       },
       {
-        /*
-         * The version of webpack used in the launchpad seems to have trouble
-         * with the require("raw!${file}") that we use for the properties
-         * file in l10.js.
-         * This loader goes through the whole code and remove the "raw!" prefix
-         * so the raw-loader declared in devtools-launchpad config can load
-         * those files.
-         */
-        test: /\.js/,
-        loader: "rewrite-raw",
-      },
+        test: /\.js$/,
+        loaders: [
+          /*
+          * The version of webpack used in the launchpad seems to have trouble
+          * with the require("raw!${file}") that we use for the properties
+          * file in l10.js.
+          * This loader goes through the whole code and remove the "raw!" prefix
+          * so the raw-loader declared in devtools-launchpad config can load
+          * those files.
+          */
+          "rewrite-raw",
+          // Replace all references to this.browserRequire() by require()
+          "rewrite-browser-require",
+          // Replace all references to loader.lazyRequire() by require()
+          "rewrite-lazy-require",
+        ],
+      }
     ]
   },
 
   resolveLoader: {
     modules: [
       path.resolve("./node_modules"),
       path.resolve("../shared/webpack"),
     ]
@@ -84,17 +90,17 @@ webpackConfig.resolve = {
     "devtools/client/framework/devtools": path.join(__dirname, "../../client/shared/webpack/shims/framework-devtools-shim"),
     "devtools/client/framework/menu": "devtools-modules/src/menu",
     "devtools/client/sourceeditor/editor": "devtools-source-editor/src/source-editor",
 
     "devtools/client/shared/zoom-keys": "devtools-modules/src/zoom-keys",
 
     "devtools/shared/fronts/timeline": path.join(__dirname, "../../client/shared/webpack/shims/fronts-timeline-shim"),
     "devtools/shared/old-event-emitter": "devtools-modules/src/utils/event-emitter",
-    "devtools/shared/client/object-client": path.join(__dirname, "new-console-output/test/fixtures/ObjectClient"),
+    "devtools/shared/client/debugger-client": path.join(__dirname, "new-console-output/test/fixtures/DebuggerClient"),
     "devtools/shared/platform/clipboard": path.join(__dirname, "../../client/shared/webpack/shims/platform-clipboard-stub"),
     "devtools/shared/platform/stack": path.join(__dirname, "../../client/shared/webpack/shims/platform-stack-stub"),
 
     // Locales need to be explicitly mapped to the en-US subfolder
     "toolkit/locales": path.join(__dirname, "../../../toolkit/locales/en-US"),
     "devtools/client/locales": path.join(__dirname, "../../client/locales/en-US"),
     "devtools/shared/locales": path.join(__dirname, "../../shared/locales/en-US"),
     "devtools/shim/locales": path.join(__dirname, "../../shared/locales/en-US"),