Bug 1625495 - Remove devtools/shared/client folder r=daisuke,ochameau,nchevobbe

Depends on D68599 This changeset moves devtools-client.js and constants.js to devtools/client and removes devtools/shared/client Differential Revision: https://phabricator.services.mozilla.com/D68600 --HG-- rename : devtools/shared/client/constants.js => devtools/client/constants.js rename : devtools/shared/client/devtools-client.js => devtools/client/devtools-client.js extra : moz-landing-system : lando
2024-10-09 11:25:00 +00:00 · 2020-03-31 08:36:29 +00:00 · 2020-03-31 08:36:29 +00:00 · fdec3e7197
commit fdec3e7197
parent b243785ac5
50 changed files with 52 additions and 64 deletions
--- a/browser/components/extensions/test/browser/browser_ext_addon_debugging_netmonitor.js
+++ b/browser/components/extensions/test/browser/browser_ext_addon_debugging_netmonitor.js
@ -4,7 +4,7 @@

 const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");

-const { DevToolsClient } = require("devtools/shared/client/devtools-client");
+const { DevToolsClient } = require("devtools/client/devtools-client");
 const { DevToolsServer } = require("devtools/server/devtools-server");
 const { gDevTools } = require("devtools/client/framework/devtools");
 const { Toolbox } = require("devtools/client/framework/toolbox");
--- a/devtools/.eslintrc.js
+++ b/devtools/.eslintrc.js
@ -89,9 +89,6 @@ module.exports = {
      // For all server and shared files, prevent requiring devtools/client
      // modules.
      files: ["server/**", "shared/**"],
-      // devtools-client.js is effectively a client file, but it is still loaded
-      // by test suites in devtools/shared and devtools/server.
-      excludedFiles: ["shared/client/devtools-client.js"],
      rules: {
        "mozilla/reject-some-requires": [
          "error",
--- a/devtools/client/aboutdebugging/src/modules/runtime-client-factory.js
+++ b/devtools/client/aboutdebugging/src/modules/runtime-client-factory.js
@ -7,7 +7,7 @@
 const {
  prepareTCPConnection,
 } = require("devtools/client/shared/remote-debugging/adb/commands/index");
-const { DevToolsClient } = require("devtools/shared/client/devtools-client");
+const { DevToolsClient } = require("devtools/client/devtools-client");
 const { DevToolsServer } = require("devtools/server/devtools-server");
 const {
  ClientWrapper,
--- a/devtools/client/aboutdebugging/test/browser/helper-mocks.js
+++ b/devtools/client/aboutdebugging/test/browser/helper-mocks.js
@ -243,7 +243,7 @@ const silenceWorkerUpdates = function() {
 async function createLocalClientWrapper() {
  info("Create a local DevToolsClient");
  const { DevToolsServer } = require("devtools/server/devtools-server");
-  const { DevToolsClient } = require("devtools/shared/client/devtools-client");
+  const { DevToolsClient } = require("devtools/client/devtools-client");
  const {
    ClientWrapper,
  } = require("devtools/client/aboutdebugging/src/modules/client-wrapper");
--- a/devtools/shared/client/constants.js
+++ b/devtools/shared/client/constants.js
--- a/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/error.js
+++ b/devtools/client/debugger/packages/devtools-reps/src/reps/stubs/error.js
@ -200,7 +200,7 @@ stubs.set("base-loader Error", {
    name: "Error",
    message: "Error message",
    stack:
-      "onPacket@resource://devtools/shared/base-loader.js -> resource://devtools/shared/client/debugger-client.js:856:9\n" +
+      "onPacket@resource://devtools/shared/base-loader.js -> resource://devtools/client/debugger-client.js:856:9\n" +
      "send/<@resource://devtools/shared/base-loader.js -> resource://devtools/shared/transport/transport.js:569:13\n" +
      "exports.makeInfallible/<@resource://devtools/shared/base-loader.js -> resource://devtools/shared/ThreadSafeDevToolsUtils.js:109:14\n" +
      "exports.makeInfallible/<@resource://devtools/shared/base-loader.js -> resource://devtools/shared/ThreadSafeDevToolsUtils.js:109:14\n",
--- a/devtools/client/debugger/packages/devtools-reps/src/reps/tests/snapshots/error.js.snap
+++ b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/snapshots/error.js.snap
@ -476,7 +476,7 @@ exports[`Error - base-loader.js renders as expected without mode 1`] = `
      className="objectBox-stackTrace-location"
      key="location0"
    >
-      resource://devtools/shared/client/debugger-client.js:856:9
+      resource://devtools/client/debugger-client.js:856:9
    </span>
    

--- a/devtools/client/debugger/packages/devtools-reps/src/reps/tests/error.js
+++ b/devtools/client/debugger/packages/devtools-reps/src/reps/tests/error.js
@ -434,7 +434,7 @@ describe("Error - stacktrace location click", () => {

    expect(locations.first().prop("title")).toBe(
      "View source in debugger → " +
-        "resource://devtools/shared/client/debugger-client.js:856:9"
+        "resource://devtools/client/debugger-client.js:856:9"
    );
    locations.first().simulate("click", {
      type: "click",
@ -444,7 +444,7 @@ describe("Error - stacktrace location click", () => {
    expect(onViewSourceInDebugger.mock.calls).toHaveLength(1);
    let mockCall = onViewSourceInDebugger.mock.calls[0][0];
    expect(mockCall.url).toEqual(
-      "resource://devtools/shared/client/debugger-client.js"
+      "resource://devtools/client/debugger-client.js"
    );
    expect(mockCall.line).toEqual(856);
    expect(mockCall.column).toEqual(9);
--- a/devtools/client/debugger/src/client/README.md
+++ b/devtools/client/debugger/src/client/README.md
@ -39,7 +39,7 @@ should not notify the application that the thread has been paused or resumed.

 [protocol]: https://searchfox.org/mozilla-central/source/devtools/docs/backend/protocol.md
 [dt-connect]: https://github.com/firefox-devtools/devtools-core/tree/master/packages/devtools-connection
-[devtools-client.js]: https://searchfox.org/mozilla-central/source/devtools/shared/client/devtools-client.js
+[devtools-client.js]: https://searchfox.org/mozilla-central/source/devtools/client/devtools-client.js

 ## Chrome

--- a/devtools/client/debugger/test/mochitest/browser_dbg-chrome-debugging.js
+++ b/devtools/client/debugger/test/mochitest/browser_dbg-chrome-debugging.js
@ -13,7 +13,7 @@ var customLoader = new DevToolsLoader({
  invisibleToDebugger: true,
 });
 var { DevToolsServer } = customLoader.require("devtools/server/devtools-server");
-var { DevToolsClient } = require("devtools/shared/client/devtools-client");
+var { DevToolsClient } = require("devtools/client/devtools-client");

 function initDevToolsClient() {
  DevToolsServer.init();
--- a/devtools/shared/client/devtools-client.js
+++ b/devtools/shared/client/devtools-client.js
@ -10,9 +10,7 @@ const {
  callFunctionWithAsyncStack,
 } = require("devtools/shared/platform/stack");
 const EventEmitter = require("devtools/shared/event-emitter");
-const {
-  UnsolicitedNotifications,
-} = require("devtools/shared/client/constants");
+const { UnsolicitedNotifications } = require("devtools/client/constants");

 loader.lazyRequireGetter(
  this,
--- a/devtools/client/framework/browser-toolbox/test/helpers-browser-toolbox.js
+++ b/devtools/client/framework/browser-toolbox/test/helpers-browser-toolbox.js
@ -7,7 +7,7 @@
 const { BrowserToolboxLauncher } = ChromeUtils.import(
  "resource://devtools/client/framework/browser-toolbox/Launcher.jsm"
 );
-const { DevToolsClient } = require("devtools/shared/client/devtools-client");
+const { DevToolsClient } = require("devtools/client/devtools-client");

 /**
 * Open up a browser toolbox and return a ToolboxTask object for interacting
--- a/devtools/client/framework/browser-toolbox/window.js
+++ b/devtools/client/framework/browser-toolbox/window.js
@ -14,7 +14,7 @@ loader.require("devtools/client/framework/devtools-browser");
 var { gDevTools } = require("devtools/client/framework/devtools");
 var { Toolbox } = require("devtools/client/framework/toolbox");
 var Services = require("Services");
-var { DevToolsClient } = require("devtools/shared/client/devtools-client");
+var { DevToolsClient } = require("devtools/client/devtools-client");
 var { PrefsHelper } = require("devtools/client/shared/prefs");
 const KeyShortcuts = require("devtools/client/shared/key-shortcuts");
 const { LocalizationHelper } = require("devtools/shared/l10n");
--- a/devtools/client/framework/devtools-browser.js
+++ b/devtools/client/framework/devtools-browser.js
@ -38,7 +38,7 @@ loader.lazyRequireGetter(
 loader.lazyRequireGetter(
  this,
  "DevToolsClient",
-  "devtools/shared/client/devtools-client",
+  "devtools/client/devtools-client",
  true
 );
 loader.lazyRequireGetter(
--- a/devtools/client/framework/target-from-url.js
+++ b/devtools/client/framework/target-from-url.js
@ -5,7 +5,7 @@
 "use strict";

 const { DevToolsServer } = require("devtools/server/devtools-server");
-const { DevToolsClient } = require("devtools/shared/client/devtools-client");
+const { DevToolsClient } = require("devtools/client/devtools-client");
 const {
  remoteClientManager,
 } = require("devtools/client/shared/remote-debugging/remote-client-manager");
--- a/devtools/client/framework/target.js
+++ b/devtools/client/framework/target.js
@ -13,7 +13,7 @@ loader.lazyRequireGetter(
 loader.lazyRequireGetter(
  this,
  "DevToolsClient",
-  "devtools/shared/client/devtools-client",
+  "devtools/client/devtools-client",
  true
 );

--- a/devtools/client/framework/test/browser_about-devtools-toolbox_reload.js
+++ b/devtools/client/framework/test/browser_about-devtools-toolbox_reload.js
@ -55,7 +55,7 @@ add_task(async function() {
 });

 async function createLocalClient() {
-  const { DevToolsClient } = require("devtools/shared/client/devtools-client");
+  const { DevToolsClient } = require("devtools/client/devtools-client");
  const { DevToolsServer } = require("devtools/server/devtools-server");
  DevToolsServer.init();
  DevToolsServer.registerAllActors();
--- a/devtools/client/framework/test/browser_target_parents.js
+++ b/devtools/client/framework/test/browser_target_parents.js
@ -5,7 +5,7 @@

 // Test a given Target's parentFront attribute returns the correct parent front.

-const { DevToolsClient } = require("devtools/shared/client/devtools-client");
+const { DevToolsClient } = require("devtools/client/devtools-client");
 const { DevToolsServer } = require("devtools/server/devtools-server");

 const TEST_URL = `data:text/html;charset=utf-8,<div id="test"></div>`;
--- a/devtools/client/framework/test/browser_target_server_compartment.js
+++ b/devtools/client/framework/test/browser_target_server_compartment.js
@ -84,7 +84,7 @@ async function testMainProcess() {
  const { DevToolsServer } = customLoader.require(
    "devtools/server/devtools-server"
  );
-  const { DevToolsClient } = require("devtools/shared/client/devtools-client");
+  const { DevToolsClient } = require("devtools/client/devtools-client");

  DevToolsServer.init();
  DevToolsServer.registerAllActors();
--- a/devtools/client/framework/test/browser_two_tabs.js
+++ b/devtools/client/framework/test/browser_two_tabs.js
@ -6,7 +6,7 @@
 */

 var { DevToolsServer } = require("devtools/server/devtools-server");
-var { DevToolsClient } = require("devtools/shared/client/devtools-client");
+var { DevToolsClient } = require("devtools/client/devtools-client");

 const TAB_URL_1 = "data:text/html;charset=utf-8,foo";
 const TAB_URL_2 = "data:text/html;charset=utf-8,bar";
--- a/devtools/client/framework/test/head.js
+++ b/devtools/client/framework/test/head.js
@ -27,7 +27,7 @@ function toggleAllTools(state) {

 async function getParentProcessActors(callback) {
  const { DevToolsServer } = require("devtools/server/devtools-server");
-  const { DevToolsClient } = require("devtools/shared/client/devtools-client");
+  const { DevToolsClient } = require("devtools/client/devtools-client");

  DevToolsServer.init();
  DevToolsServer.registerAllActors();
--- a/devtools/client/framework/toolbox-init.js
+++ b/devtools/client/framework/toolbox-init.js
@ -87,7 +87,7 @@ async function initToolbox(url, host) {
  } = require("devtools/client/framework/target-from-url");
  const { Toolbox } = require("devtools/client/framework/toolbox");
  const { DevToolsServer } = require("devtools/server/devtools-server");
-  const { DevToolsClient } = require("devtools/shared/client/devtools-client");
+  const { DevToolsClient } = require("devtools/client/devtools-client");

  // Specify the default tool to open
  const tool = url.searchParams.get("tool");
--- a/devtools/client/fronts/thread.js
+++ b/devtools/client/fronts/thread.js
@ -4,7 +4,7 @@

 "use strict";

-const { ThreadStateTypes } = require("devtools/shared/client/constants");
+const { ThreadStateTypes } = require("devtools/client/constants");
 const {
  FrontClassWithSpec,
  registerFront,
--- a/devtools/client/moz.build
+++ b/devtools/client/moz.build
@ -34,7 +34,9 @@ DIRS += [
 JAR_MANIFESTS += ['jar.mn']

 DevToolsModules(
+    'constants.js',
    'definitions.js',
+    'devtools-client.js',
    'menus.js',
 )

--- a/devtools/client/responsive/ui.js
+++ b/devtools/client/responsive/ui.js
@ -16,7 +16,7 @@ const { TargetList } = require("devtools/shared/resources/target-list");
 loader.lazyRequireGetter(
  this,
  "DevToolsClient",
-  "devtools/shared/client/devtools-client",
+  "devtools/client/devtools-client",
  true
 );
 loader.lazyRequireGetter(
--- a/devtools/client/shared/components/test/chrome/head.js
+++ b/devtools/client/shared/components/test/chrome/head.js
@ -17,7 +17,7 @@ var promise = require("promise");
 var defer = require("devtools/shared/defer");
 var Services = require("Services");
 var { DevToolsServer } = require("devtools/server/devtools-server");
-var { DevToolsClient } = require("devtools/shared/client/devtools-client");
+var { DevToolsClient } = require("devtools/client/devtools-client");
 var DevToolsUtils = require("devtools/shared/DevToolsUtils");
 var { TargetFactory } = require("devtools/client/framework/target");
 var { Toolbox } = require("devtools/client/framework/toolbox");
--- a/devtools/client/shared/test/browser_dbg_globalactor.js
+++ b/devtools/client/shared/test/browser_dbg_globalactor.js
@ -9,7 +9,7 @@

 var { DevToolsServer } = require("devtools/server/devtools-server");
 var { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
-var { DevToolsClient } = require("devtools/shared/client/devtools-client");
+var { DevToolsClient } = require("devtools/client/devtools-client");

 const ACTORS_URL = EXAMPLE_URL + "testactors.js";

--- a/devtools/client/shared/test/browser_dbg_listaddons.js
+++ b/devtools/client/shared/test/browser_dbg_listaddons.js
@ -10,7 +10,7 @@ Services.scriptloader.loadSubScript(
 );

 var { DevToolsServer } = require("devtools/server/devtools-server");
-var { DevToolsClient } = require("devtools/shared/client/devtools-client");
+var { DevToolsClient } = require("devtools/client/devtools-client");

 /**
 * Make sure the listAddons request works as specified.
--- a/devtools/client/shared/test/browser_dbg_listtabs-01.js
+++ b/devtools/client/shared/test/browser_dbg_listtabs-01.js
@ -8,7 +8,7 @@
 */

 var { DevToolsServer } = require("devtools/server/devtools-server");
-var { DevToolsClient } = require("devtools/shared/client/devtools-client");
+var { DevToolsClient } = require("devtools/client/devtools-client");

 const TAB1_URL = EXAMPLE_URL + "doc_empty-tab-01.html";
 const TAB2_URL = EXAMPLE_URL + "doc_empty-tab-02.html";
--- a/devtools/client/shared/test/browser_dbg_listtabs-03.js
+++ b/devtools/client/shared/test/browser_dbg_listtabs-03.js
@ -8,7 +8,7 @@
 */

 var { DevToolsServer } = require("devtools/server/devtools-server");
-var { DevToolsClient } = require("devtools/shared/client/devtools-client");
+var { DevToolsClient } = require("devtools/client/devtools-client");

 const TAB1_URL = EXAMPLE_URL + "doc_empty-tab-01.html";

--- a/devtools/client/shared/test/browser_dbg_multiple-windows.js
+++ b/devtools/client/shared/test/browser_dbg_multiple-windows.js
@ -9,7 +9,7 @@
 */

 var { DevToolsServer } = require("devtools/server/devtools-server");
-var { DevToolsClient } = require("devtools/shared/client/devtools-client");
+var { DevToolsClient } = require("devtools/client/devtools-client");

 const TAB1_URL = "data:text/html;charset=utf-8,first-tab";
 const TAB2_URL = "data:text/html;charset=utf-8,second-tab";
--- a/devtools/client/shared/test/helper_workers.js
+++ b/devtools/client/shared/test/helper_workers.js
@ -12,7 +12,7 @@ Services.scriptloader.loadSubScript(
 );

 var { DevToolsServer } = require("devtools/server/devtools-server");
-var { DevToolsClient } = require("devtools/shared/client/devtools-client");
+var { DevToolsClient } = require("devtools/client/devtools-client");
 var { Toolbox } = require("devtools/client/framework/toolbox");
 loader.lazyRequireGetter(this, "defer", "devtools/shared/defer");

--- a/devtools/client/shared/test/shared-head.js
+++ b/devtools/client/shared/test/shared-head.js
@ -166,7 +166,7 @@ async function getTestActor(toolbox) {
 // create a front for the given `tab`
 async function getTestActorWithoutToolbox(tab) {
  const { DevToolsServer } = require("devtools/server/devtools-server");
-  const { DevToolsClient } = require("devtools/shared/client/devtools-client");
+  const { DevToolsClient } = require("devtools/client/devtools-client");

  // We need to spawn a client instance,
  // but for that we have to first ensure a server is running
--- a/devtools/client/storage/test/browser_storage_webext_storage_local.js
+++ b/devtools/client/storage/test/browser_storage_webext_storage_local.js
@ -15,7 +15,7 @@ loader.lazyRequireGetter(
 loader.lazyRequireGetter(
  this,
  "DevToolsClient",
-  "devtools/shared/client/devtools-client",
+  "devtools/client/devtools-client",
  true
 );

--- a/devtools/client/webconsole/browser-console-manager.js
+++ b/devtools/client/webconsole/browser-console-manager.js
@ -14,7 +14,7 @@ loader.lazyRequireGetter(this, "Tools", "devtools/client/definitions", true);
 loader.lazyRequireGetter(
  this,
  "DevToolsClient",
-  "devtools/shared/client/devtools-client",
+  "devtools/client/devtools-client",
  true
 );
 loader.lazyRequireGetter(this, "l10n", "devtools/client/webconsole/utils/l10n");
--- a/devtools/docs/backend/client-api.md
+++ b/devtools/docs/backend/client-api.md
@ -8,7 +8,7 @@ In order to communicate, a client and a server instance must be created and a pr

 ```javascript
 const { DevToolsServer } = require("devtools/server/devtools-server");
-const { DevToolsClient } = require("devtools/shared/client/devtools-client");
+const { DevToolsClient } = require("devtools/client/devtools-client");

 function start() {
  // Start the server.
@ -32,7 +32,7 @@ If a TCP socket is required, the function should be split in two parts, a server

 ```javascript
 const { DevToolsServer } = require("devtools/server/devtools-server");
-const { DevToolsClient } = require("devtools/shared/client/devtools-client");
+const { DevToolsClient } = require("devtools/client/devtools-client");

 function startServer() {
  // Start the server.
@ -139,7 +139,7 @@ Here is the source code for a complete debugger application:
 * Debugger API demo.
 */
 const { DevToolsServer } = require("devtools/server/devtools-server");
-const { DevToolsClient } = require("devtools/shared/client/devtools-client");
+const { DevToolsClient } = require("devtools/client/devtools-client");

 let client;
 let threadFront;
--- a/devtools/server/tests/browser/head.js
+++ b/devtools/server/tests/browser/head.js
@ -12,7 +12,7 @@ Services.scriptloader.loadSubScript(
  this
 );

-const { DevToolsClient } = require("devtools/shared/client/devtools-client");
+const { DevToolsClient } = require("devtools/client/devtools-client");
 const {
  ActorRegistry,
 } = require("devtools/server/actors/utils/actor-registry");
--- a/devtools/server/tests/chrome/test_device.html
+++ b/devtools/server/tests/chrome/test_device.html
@ -16,7 +16,7 @@ Bug 895360 - [app manager] Device meta data actor

 window.onload = function() {
  const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
-  const {DevToolsClient} = require("devtools/shared/client/devtools-client");
+  const {DevToolsClient} = require("devtools/client/devtools-client");
  const {DevToolsServer} = require("devtools/server/devtools-server");
  const Services = require("Services");

--- a/devtools/server/tests/chrome/test_preference.html
+++ b/devtools/server/tests/chrome/test_preference.html
@ -16,7 +16,7 @@ Bug 943251 - Test preferences actor

 function runTests() {
  const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
-  const {DevToolsClient} = require("devtools/shared/client/devtools-client");
+  const {DevToolsClient} = require("devtools/client/devtools-client");
  const {DevToolsServer} = require("devtools/server/devtools-server");
  const Services = require("Services");

--- a/devtools/server/tests/chrome/webextension-helpers.js
+++ b/devtools/server/tests/chrome/webextension-helpers.js
@ -8,7 +8,7 @@
 const { require, loader } = ChromeUtils.import(
  "resource://devtools/shared/Loader.jsm"
 );
-const { DevToolsClient } = require("devtools/shared/client/devtools-client");
+const { DevToolsClient } = require("devtools/client/devtools-client");
 const { DevToolsServer } = require("devtools/server/devtools-server");

 const {
--- a/devtools/server/tests/xpcshell/head_dbg.js
+++ b/devtools/server/tests/xpcshell/head_dbg.js
@ -42,7 +42,7 @@ const { DevToolsServer } = require("devtools/server/devtools-server");
 const { DevToolsServer: WorkerDevToolsServer } = worker.require(
  "devtools/server/devtools-server"
 );
-const { DevToolsClient } = require("devtools/shared/client/devtools-client");
+const { DevToolsClient } = require("devtools/client/devtools-client");
 const { ObjectFront } = require("devtools/client/fronts/object");
 const { LongStringFront } = require("devtools/client/fronts/string");
 const { TargetFactory } = require("devtools/client/framework/target");
--- a/devtools/shared/client/moz.build
+++ b/devtools/shared/client/moz.build
@ -1,10 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-DevToolsModules(
-    'constants.js',
-    'devtools-client.js',
-)
--- a/devtools/shared/moz.build
+++ b/devtools/shared/moz.build
@ -8,7 +8,6 @@ include('../templates.mozbuild')

 DIRS += [
    'acorn',
-    'client',
    'css',
    'discovery',
    'heapsnapshot',
--- a/devtools/shared/protocol/tests/xpcshell/head.js
+++ b/devtools/shared/protocol/tests/xpcshell/head.js
@ -6,7 +6,7 @@
 const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
 const Services = require("Services");
 const { DevToolsServer } = require("devtools/server/devtools-server");
-const { DevToolsClient } = require("devtools/shared/client/devtools-client");
+const { DevToolsClient } = require("devtools/client/devtools-client");

 const defer = require("devtools/shared/defer");

--- a/devtools/shared/resources/tests/head.js
+++ b/devtools/shared/resources/tests/head.js
@ -12,7 +12,7 @@ Services.scriptloader.loadSubScript(
  this
 );

-const { DevToolsClient } = require("devtools/shared/client/devtools-client");
+const { DevToolsClient } = require("devtools/client/devtools-client");
 const { DevToolsServer } = require("devtools/server/devtools-server");

 async function createLocalClient() {
--- a/devtools/shared/security/tests/chrome/test_websocket-transport.html
+++ b/devtools/shared/security/tests/chrome/test_websocket-transport.html
@ -13,7 +13,8 @@
 window.onload = function() {
  const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
  const Services = require("Services");
-  const {DevToolsClient} = require("devtools/shared/client/devtools-client");
+  // eslint-disable-next-line mozilla/reject-some-requires
+  const {DevToolsClient} = require("devtools/client/devtools-client");
  const {DevToolsServer} = require("devtools/server/devtools-server");
  const { SocketListener } = require("devtools/shared/security/socket");

--- a/devtools/shared/security/tests/xpcshell/head_dbg.js
+++ b/devtools/shared/security/tests/xpcshell/head_dbg.js
@ -12,7 +12,7 @@ const defer = require("devtools/shared/defer");
 const Services = require("Services");
 const xpcInspector = require("xpcInspector");
 const { DevToolsServer } = require("devtools/server/devtools-server");
-const { DevToolsClient } = require("devtools/shared/client/devtools-client");
+const { DevToolsClient } = require("devtools/client/devtools-client");
 // We need to require lazily since will be crashed if we load SocketListener too early
 // in xpc shell test due to SocketListener loads PSM module.
 loader.lazyRequireGetter(
--- a/devtools/shared/tests/xpcshell/test_debugger_client.js
+++ b/devtools/shared/tests/xpcshell/test_debugger_client.js
@ -6,7 +6,7 @@
 // DevToolsClient tests

 const { DevToolsServer } = require("devtools/server/devtools-server");
-const { DevToolsClient } = require("devtools/shared/client/devtools-client");
+const { DevToolsClient } = require("devtools/client/devtools-client");

 add_task(async function() {
  await testCloseLoops();
--- a/devtools/shared/transport/tests/xpcshell/head_dbg.js
+++ b/devtools/shared/transport/tests/xpcshell/head_dbg.js
@ -28,7 +28,7 @@ const {
  ActorRegistry,
 } = require("devtools/server/actors/utils/actor-registry");
 const { DevToolsServer } = require("devtools/server/devtools-server");
-const { DevToolsClient } = require("devtools/shared/client/devtools-client");
+const { DevToolsClient } = require("devtools/client/devtools-client");
 const { SocketListener } = require("devtools/shared/security/socket");

 // Convert an nsIScriptError 'logLevel' value into an appropriate string.
--- a/devtools/shared/webconsole/test/chrome/common.js
+++ b/devtools/shared/webconsole/test/chrome/common.js
@ -10,7 +10,8 @@

 const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
 const { DevToolsServer } = require("devtools/server/devtools-server");
-const { DevToolsClient } = require("devtools/shared/client/devtools-client");
+// eslint-disable-next-line mozilla/reject-some-requires
+const { DevToolsClient } = require("devtools/client/devtools-client");

 const Services = require("Services");