Commit add2223c authored by Julian Descottes's avatar Julian Descottes
Browse files

Bug 1596686 - Use absolute paths for require calls r=gl 

# ignore-this-changeset

Differential Revision: https://phabricator.services.mozilla.com/D58243

--HG--
extra : moz-landing-system : lando
parent 7057d021

devtools/client/aboutdebugging/aboutdebugging.js

+11 −7
Original line number Diff line number Diff line
@@ -19,24 +19,26 @@ const Provider = createFactory( 
const FluentReact = require("devtools/client/shared/vendor/fluent-react");

const LocalizationProvider = createFactory(FluentReact.LocalizationProvider);



const actions = require("./src/actions/index");

const { configureStore } = require("./src/create-store");

const actions = require("devtools/client/aboutdebugging/src/actions/index");

const {

  configureStore,

} = require("devtools/client/aboutdebugging/src/create-store");

const {

  setDebugTargetCollapsibilities,

} = require("./src/modules/debug-target-collapsibilities");

} = require("devtools/client/aboutdebugging/src/modules/debug-target-collapsibilities");



const { l10n } = require("./src/modules/l10n");

const { l10n } = require("devtools/client/aboutdebugging/src/modules/l10n");



const {

  addNetworkLocationsObserver,

  getNetworkLocations,

  removeNetworkLocationsObserver,

} = require("./src/modules/network-locations");

} = require("devtools/client/aboutdebugging/src/modules/network-locations");

const {

  addUSBRuntimesObserver,

  getUSBRuntimes,

  removeUSBRuntimesObserver,

} = require("./src/modules/usb-runtimes");

} = require("devtools/client/aboutdebugging/src/modules/usb-runtimes");



loader.lazyRequireGetter(this, "adb", "devtools/shared/adb/adb", true);

loader.lazyRequireGetter(
@@ -55,7 +57,9 @@ loader.lazyRequireGetter( 
const Router = createFactory(

  require("devtools/client/shared/vendor/react-router-dom").HashRouter

);

const App = createFactory(require("./src/components/App"));

const App = createFactory(

  require("devtools/client/aboutdebugging/src/components/App")

);



const AboutDebugging = {

  async init() {

devtools/client/aboutdebugging/initializer.js

+1 −1
Original line number Diff line number Diff line
@@ -20,4 +20,4 @@ const { require } = BrowserLoader({ 
// script tags are using Promises bound to the lifecycle of the document, while modules

// loaded with a devtools loader use Promises that will still resolve if the document is

// destroyed. This is particularly useful to ensure asynchronous destroy() calls succeed.

require("./aboutdebugging");
 
require("devtools/client/aboutdebugging/aboutdebugging");

devtools/client/aboutdebugging/src/actions/debug-targets.js

+6 −6
Original line number Diff line number Diff line
@@ -10,21 +10,21 @@ const { 
} = require("devtools/client/shared/remote-debugging/remote-client-manager");

const Services = require("Services");



const { l10n } = require("../modules/l10n");

const { l10n } = require("devtools/client/aboutdebugging/src/modules/l10n");



const {

  isSupportedDebugTargetPane,

} = require("../modules/debug-target-support");

} = require("devtools/client/aboutdebugging/src/modules/debug-target-support");



const {

  openTemporaryExtension,

  uninstallAddon,

} = require("../modules/extensions-helper");

} = require("devtools/client/aboutdebugging/src/modules/extensions-helper");



const {

  getCurrentClient,

  getCurrentRuntime,

} = require("../modules/runtimes-state-helper");

} = require("devtools/client/aboutdebugging/src/modules/runtimes-state-helper");



const {

  DEBUG_TARGETS,
@@ -48,9 +48,9 @@ const { 
  TEMPORARY_EXTENSION_RELOAD_START,

  TEMPORARY_EXTENSION_RELOAD_SUCCESS,

  RUNTIMES,

} = require("../constants");

} = require("devtools/client/aboutdebugging/src/constants");



const Actions = require("./index");

const Actions = require("devtools/client/aboutdebugging/src/actions/index");



function isCachedActorNeeded(runtime, type, id) {

  // Unique ids for workers were introduced in Firefox 68 (Bug 1539328). When debugging

devtools/client/aboutdebugging/src/actions/index.js

+4 −4
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ 


"use strict";



const debugTargets = require("./debug-targets");

const runtimes = require("./runtimes");

const telemetry = require("./telemetry");

const ui = require("./ui");

const debugTargets = require("devtools/client/aboutdebugging/src/actions/debug-targets");

const runtimes = require("devtools/client/aboutdebugging/src/actions/runtimes");

const telemetry = require("devtools/client/aboutdebugging/src/actions/telemetry");

const ui = require("devtools/client/aboutdebugging/src/actions/ui");



Object.assign(exports, ui, runtimes, telemetry, debugTargets);

devtools/client/aboutdebugging/src/actions/runtimes.js

+8 −6
Original line number Diff line number Diff line
@@ -6,19 +6,21 @@ 


const Services = require("Services");



const Actions = require("./index");

const Actions = require("devtools/client/aboutdebugging/src/actions/index");



const {

  getAllRuntimes,

  getCurrentRuntime,

  findRuntimeById,

} = require("../modules/runtimes-state-helper");

} = require("devtools/client/aboutdebugging/src/modules/runtimes-state-helper");



const { l10n } = require("../modules/l10n");

const { createClientForRuntime } = require("../modules/runtime-client-factory");

const { l10n } = require("devtools/client/aboutdebugging/src/modules/l10n");

const {

  createClientForRuntime,

} = require("devtools/client/aboutdebugging/src/modules/runtime-client-factory");

const {

  isSupportedDebugTargetPane,

} = require("../modules/debug-target-support");

} = require("devtools/client/aboutdebugging/src/modules/debug-target-support");



const {

  remoteClientManager,
@@ -51,7 +53,7 @@ const { 
  WATCH_RUNTIME_FAILURE,

  WATCH_RUNTIME_START,

  WATCH_RUNTIME_SUCCESS,

} = require("../constants");

} = require("devtools/client/aboutdebugging/src/constants");



const CONNECTION_TIMING_OUT_DELAY = 3000;

const CONNECTION_CANCEL_DELAY = 13000;