From ad4b5dfb37c732069918dfae4f9be6fb254681ac Mon Sep 17 00:00:00 2001 From: Julian Descottes Date: Fri, 20 Mar 2020 12:57:58 +0000 Subject: [PATCH] Bug 1604539 - Rename shared/fronts to client/fronts in the devtools codebase r=nchevobbe Depends on D67603 This patch is an automated string replace of shared/fronts/ to client/fronts/ in devtools. Differential Revision: https://phabricator.services.mozilla.com/D67604 --HG-- extra : moz-landing-system : lando --- .../configs/mozilla-central-mappings.js | 4 +- devtools/client/framework/toolbox.js | 2 +- .../addon/webextension-inspected-window.js | 2 +- devtools/client/fronts/descriptors/frame.js | 2 +- devtools/client/fronts/descriptors/process.js | 4 +- devtools/client/fronts/descriptors/tab.js | 4 +- .../client/fronts/descriptors/webextension.js | 2 +- devtools/client/fronts/node.js | 2 +- devtools/client/fronts/object.js | 2 +- devtools/client/fronts/performance.js | 2 +- devtools/client/fronts/property-iterator.js | 2 +- devtools/client/fronts/root.js | 6 +- devtools/client/fronts/source.js | 2 +- devtools/client/fronts/styles.js | 2 +- devtools/client/fronts/symbol-iterator.js | 2 +- .../client/fronts/targets/browsing-context.js | 2 +- .../client/fronts/targets/content-process.js | 2 +- devtools/client/fronts/targets/local-tab.js | 2 +- .../client/fronts/targets/target-mixin.js | 2 +- devtools/client/fronts/targets/worker.js | 2 +- devtools/client/fronts/thread.js | 6 +- devtools/client/fronts/webconsole.js | 4 +- .../components/ExpressionResultView.js | 4 +- devtools/client/inspector/inspector.js | 2 +- .../inspector/rules/models/element-style.js | 2 +- .../browser_styleinspector_output-parser.js | 2 +- devtools/client/memory/models.js | 2 +- .../client/shared/build/build-debugger.js | 2 +- .../shared/sourceeditor/css-autocompleter.js | 2 +- devtools/client/shared/sourceeditor/editor.js | 2 +- .../client/shared/sourceeditor/test/head.js | 2 +- .../shared/test/browser_outputparser.js | 2 +- .../test/xpcshell/test_rewriteDeclarations.js | 2 +- devtools/client/styleeditor/panel.js | 2 +- .../test/browser_styleeditor_autocomplete.js | 2 +- .../test/browser/stub-generator-helpers.js | 2 +- .../webconsole/utils/object-inspector.js | 4 +- devtools/client/webconsole/webconsole-ui.js | 2 +- devtools/client/webconsole/webconsole.js | 2 +- devtools/docs/backend/protocol.js.md | 4 +- .../tests/chrome/test_css-properties.html | 2 +- devtools/server/tests/xpcshell/head_dbg.js | 4 +- devtools/server/tests/xpcshell/test_attach.js | 4 +- .../tests/xpcshell/test_framebindings-07.js | 2 +- devtools/shared/client/devtools-client.js | 2 +- .../xpcshell/test_protocol_longstring.js | 2 +- devtools/shared/specs/index.js | 92 +++++++++---------- .../shared/webconsole/test/chrome/common.js | 2 +- 48 files changed, 106 insertions(+), 106 deletions(-) diff --git a/devtools/client/debugger/configs/mozilla-central-mappings.js b/devtools/client/debugger/configs/mozilla-central-mappings.js index 098896f32186..524677bdc5ea 100644 --- a/devtools/client/debugger/configs/mozilla-central-mappings.js +++ b/devtools/client/debugger/configs/mozilla-central-mappings.js @@ -12,7 +12,7 @@ const EXCLUDED_FILES = { }; const whatwgUrl = ` -(() => { +(() => { importScripts("resource://devtools/client/shared/vendor/whatwg-url.js"); return { URL } })() @@ -23,7 +23,7 @@ module.exports = Object.assign( "./source-editor": "devtools/client/sourceeditor/editor", "../editor/source-editor": "devtools/client/sourceeditor/editor", "./test-flag": "devtools/shared/flags", - "./fronts-device": "devtools/shared/fronts/device", + "./fronts-device": "devtools/client/fronts/device", immutable: "devtools/client/shared/vendor/immutable", lodash: "devtools/client/shared/vendor/lodash", react: "devtools/client/shared/vendor/react", diff --git a/devtools/client/framework/toolbox.js b/devtools/client/framework/toolbox.js index 4d7a92b2a07a..5794e5fc6c66 100644 --- a/devtools/client/framework/toolbox.js +++ b/devtools/client/framework/toolbox.js @@ -193,7 +193,7 @@ loader.lazyRequireGetter( loader.lazyRequireGetter( this, "NodeFront", - "devtools/shared/fronts/node", + "devtools/client/fronts/node", true ); diff --git a/devtools/client/fronts/addon/webextension-inspected-window.js b/devtools/client/fronts/addon/webextension-inspected-window.js index 963b6ca4cea5..e8064d369156 100644 --- a/devtools/client/fronts/addon/webextension-inspected-window.js +++ b/devtools/client/fronts/addon/webextension-inspected-window.js @@ -15,7 +15,7 @@ const { const { getAdHocFrontOrPrimitiveGrip, -} = require("devtools/shared/fronts/object"); +} = require("devtools/client/fronts/object"); /** * The corresponding Front object for the WebExtensionInspectedWindowActor. diff --git a/devtools/client/fronts/descriptors/frame.js b/devtools/client/fronts/descriptors/frame.js index 5d2455f8cfca..bde01a9668bb 100644 --- a/devtools/client/fronts/descriptors/frame.js +++ b/devtools/client/fronts/descriptors/frame.js @@ -10,7 +10,7 @@ const { loader.lazyRequireGetter( this, "BrowsingContextTargetFront", - "devtools/shared/fronts/targets/browsing-context", + "devtools/client/fronts/targets/browsing-context", true ); diff --git a/devtools/client/fronts/descriptors/process.js b/devtools/client/fronts/descriptors/process.js index 41a74936bda9..19f888dd468f 100644 --- a/devtools/client/fronts/descriptors/process.js +++ b/devtools/client/fronts/descriptors/process.js @@ -8,10 +8,10 @@ const { } = require("devtools/shared/specs/descriptors/process"); const { BrowsingContextTargetFront, -} = require("devtools/shared/fronts/targets/browsing-context"); +} = require("devtools/client/fronts/targets/browsing-context"); const { ContentProcessTargetFront, -} = require("devtools/shared/fronts/targets/content-process"); +} = require("devtools/client/fronts/targets/content-process"); const { FrontClassWithSpec, registerFront, diff --git a/devtools/client/fronts/descriptors/tab.js b/devtools/client/fronts/descriptors/tab.js index 7bdbb286b034..3a793219f98c 100644 --- a/devtools/client/fronts/descriptors/tab.js +++ b/devtools/client/fronts/descriptors/tab.js @@ -8,13 +8,13 @@ const { tabDescriptorSpec } = require("devtools/shared/specs/descriptors/tab"); loader.lazyRequireGetter( this, "BrowsingContextTargetFront", - "devtools/shared/fronts/targets/browsing-context", + "devtools/client/fronts/targets/browsing-context", true ); loader.lazyRequireGetter( this, "LocalTabTargetFront", - "devtools/shared/fronts/targets/local-tab", + "devtools/client/fronts/targets/local-tab", true ); const { diff --git a/devtools/client/fronts/descriptors/webextension.js b/devtools/client/fronts/descriptors/webextension.js index 7b25e88809ac..5a42fe933db7 100644 --- a/devtools/client/fronts/descriptors/webextension.js +++ b/devtools/client/fronts/descriptors/webextension.js @@ -13,7 +13,7 @@ const { loader.lazyRequireGetter( this, "BrowsingContextTargetFront", - "devtools/shared/fronts/targets/browsing-context", + "devtools/client/fronts/targets/browsing-context", true ); diff --git a/devtools/client/fronts/node.js b/devtools/client/fronts/node.js index 5745a5ff92a7..2f2f7a68eef0 100644 --- a/devtools/client/fronts/node.js +++ b/devtools/client/fronts/node.js @@ -11,7 +11,7 @@ const { registerFront, } = require("devtools/shared/protocol.js"); const { nodeSpec, nodeListSpec } = require("devtools/shared/specs/node"); -const { SimpleStringFront } = require("devtools/shared/fronts/string"); +const { SimpleStringFront } = require("devtools/client/fronts/string"); const Services = require("Services"); loader.lazyRequireGetter( diff --git a/devtools/client/fronts/object.js b/devtools/client/fronts/object.js index 3bac4f6e9f99..b88b886cc67e 100644 --- a/devtools/client/fronts/object.js +++ b/devtools/client/fronts/object.js @@ -9,7 +9,7 @@ const { FrontClassWithSpec, registerFront, } = require("devtools/shared/protocol"); -const { LongStringFront } = require("devtools/shared/fronts/string"); +const { LongStringFront } = require("devtools/client/fronts/string"); /** * A ObjectFront is used as a front end for the ObjectActor that is diff --git a/devtools/client/fronts/performance.js b/devtools/client/fronts/performance.js index 04ceb8f6ee6d..4233efa52e29 100644 --- a/devtools/client/fronts/performance.js +++ b/devtools/client/fronts/performance.js @@ -11,7 +11,7 @@ const { } = require("devtools/shared/protocol"); const { PerformanceRecordingFront, -} = require("devtools/shared/fronts/performance-recording"); +} = require("devtools/client/fronts/performance-recording"); const { performanceSpec } = require("devtools/shared/specs/performance"); loader.lazyRequireGetter( diff --git a/devtools/client/fronts/property-iterator.js b/devtools/client/fronts/property-iterator.js index adcadc2d81a6..dcbdf3e22e07 100644 --- a/devtools/client/fronts/property-iterator.js +++ b/devtools/client/fronts/property-iterator.js @@ -13,7 +13,7 @@ const { } = require("devtools/shared/specs/property-iterator"); const { getAdHocFrontOrPrimitiveGrip, -} = require("devtools/shared/fronts/object"); +} = require("devtools/client/fronts/object"); /** * A PropertyIteratorFront provides a way to access to property names and diff --git a/devtools/client/fronts/root.js b/devtools/client/fronts/root.js index ff6222f635e0..1d39d00d2454 100644 --- a/devtools/client/fronts/root.js +++ b/devtools/client/fronts/root.js @@ -14,19 +14,19 @@ loader.lazyRequireGetter(this, "getFront", "devtools/shared/protocol", true); loader.lazyRequireGetter( this, "TabDescriptorFront", - "devtools/shared/fronts/descriptors/tab", + "devtools/client/fronts/descriptors/tab", true ); loader.lazyRequireGetter( this, "BrowsingContextTargetFront", - "devtools/shared/fronts/targets/browsing-context", + "devtools/client/fronts/targets/browsing-context", true ); loader.lazyRequireGetter( this, "LocalTabTargetFront", - "devtools/shared/fronts/targets/local-tab", + "devtools/client/fronts/targets/local-tab", true ); diff --git a/devtools/client/fronts/source.js b/devtools/client/fronts/source.js index 61ff9b401037..c433f95f9771 100644 --- a/devtools/client/fronts/source.js +++ b/devtools/client/fronts/source.js @@ -9,7 +9,7 @@ const { FrontClassWithSpec, registerFront, } = require("devtools/shared/protocol"); -const { ArrayBufferFront } = require("devtools/shared/fronts/array-buffer"); +const { ArrayBufferFront } = require("devtools/client/fronts/array-buffer"); /** * A SourceFront provides a way to access the source text of a script. diff --git a/devtools/client/fronts/styles.js b/devtools/client/fronts/styles.js index 05208b2e3927..2eb1a756f8f9 100644 --- a/devtools/client/fronts/styles.js +++ b/devtools/client/fronts/styles.js @@ -17,7 +17,7 @@ const promise = require("promise"); loader.lazyRequireGetter( this, "RuleRewriter", - "devtools/shared/fronts/inspector/rule-rewriter" + "devtools/client/fronts/inspector/rule-rewriter" ); /** diff --git a/devtools/client/fronts/symbol-iterator.js b/devtools/client/fronts/symbol-iterator.js index 2ffa10feede0..749deca7d52a 100644 --- a/devtools/client/fronts/symbol-iterator.js +++ b/devtools/client/fronts/symbol-iterator.js @@ -11,7 +11,7 @@ const { const { symbolIteratorSpec } = require("devtools/shared/specs/symbol-iterator"); const { getAdHocFrontOrPrimitiveGrip, -} = require("devtools/shared/fronts/object"); +} = require("devtools/client/fronts/object"); /** * A SymbolIteratorFront is used as a front end for the SymbolIterator that is diff --git a/devtools/client/fronts/targets/browsing-context.js b/devtools/client/fronts/targets/browsing-context.js index 757d3fd56c55..0249b680b43b 100644 --- a/devtools/client/fronts/targets/browsing-context.js +++ b/devtools/client/fronts/targets/browsing-context.js @@ -10,7 +10,7 @@ const { FrontClassWithSpec, registerFront, } = require("devtools/shared/protocol"); -const { TargetMixin } = require("devtools/shared/fronts/targets/target-mixin"); +const { TargetMixin } = require("devtools/client/fronts/targets/target-mixin"); class BrowsingContextTargetFront extends TargetMixin( FrontClassWithSpec(browsingContextTargetSpec) diff --git a/devtools/client/fronts/targets/content-process.js b/devtools/client/fronts/targets/content-process.js index bd4144b6133a..cacd1af552cd 100644 --- a/devtools/client/fronts/targets/content-process.js +++ b/devtools/client/fronts/targets/content-process.js @@ -10,7 +10,7 @@ const { FrontClassWithSpec, registerFront, } = require("devtools/shared/protocol"); -const { TargetMixin } = require("devtools/shared/fronts/targets/target-mixin"); +const { TargetMixin } = require("devtools/client/fronts/targets/target-mixin"); class ContentProcessTargetFront extends TargetMixin( FrontClassWithSpec(contentProcessTargetSpec) diff --git a/devtools/client/fronts/targets/local-tab.js b/devtools/client/fronts/targets/local-tab.js index 18fc9e260857..8f392a6a0da0 100644 --- a/devtools/client/fronts/targets/local-tab.js +++ b/devtools/client/fronts/targets/local-tab.js @@ -19,7 +19,7 @@ loader.lazyRequireGetter( loader.lazyRequireGetter( this, "BrowsingContextTargetFront", - "devtools/shared/fronts/targets/browsing-context", + "devtools/client/fronts/targets/browsing-context", true ); diff --git a/devtools/client/fronts/targets/target-mixin.js b/devtools/client/fronts/targets/target-mixin.js index f132510e654a..6236db6d8e76 100644 --- a/devtools/client/fronts/targets/target-mixin.js +++ b/devtools/client/fronts/targets/target-mixin.js @@ -165,7 +165,7 @@ function TargetMixin(parentClass) { /** * The following getters: isLocalTab, localTab, ... will be overriden for - * local tabs by some code in devtools/shared/fronts/targets/local-tab.js. + * local tabs by some code in devtools/client/fronts/targets/local-tab.js. * They are all specific to local tabs, i.e. when you are debugging a tab of * the current Firefox instance. */ diff --git a/devtools/client/fronts/targets/worker.js b/devtools/client/fronts/targets/worker.js index ff0dfc3002c3..f462e3872f12 100644 --- a/devtools/client/fronts/targets/worker.js +++ b/devtools/client/fronts/targets/worker.js @@ -9,7 +9,7 @@ const { FrontClassWithSpec, registerFront, } = require("devtools/shared/protocol"); -const { TargetMixin } = require("devtools/shared/fronts/targets/target-mixin"); +const { TargetMixin } = require("devtools/client/fronts/targets/target-mixin"); class WorkerTargetFront extends TargetMixin( FrontClassWithSpec(workerTargetSpec) diff --git a/devtools/client/fronts/thread.js b/devtools/client/fronts/thread.js index a2b84240e052..e4bf0abe96ff 100644 --- a/devtools/client/fronts/thread.js +++ b/devtools/client/fronts/thread.js @@ -15,14 +15,14 @@ const { threadSpec } = require("devtools/shared/specs/thread"); loader.lazyRequireGetter( this, "ObjectFront", - "devtools/shared/fronts/object", + "devtools/client/fronts/object", true ); -loader.lazyRequireGetter(this, "FrameFront", "devtools/shared/fronts/frame"); +loader.lazyRequireGetter(this, "FrameFront", "devtools/client/fronts/frame"); loader.lazyRequireGetter( this, "SourceFront", - "devtools/shared/fronts/source", + "devtools/client/fronts/source", true ); diff --git a/devtools/client/fronts/webconsole.js b/devtools/client/fronts/webconsole.js index ceb5c7bb2ca0..07335d275841 100644 --- a/devtools/client/fronts/webconsole.js +++ b/devtools/client/fronts/webconsole.js @@ -5,7 +5,7 @@ "use strict"; const DevToolsUtils = require("devtools/shared/DevToolsUtils"); -const { LongStringFront } = require("devtools/shared/fronts/string"); +const { LongStringFront } = require("devtools/client/fronts/string"); const { FrontClassWithSpec, registerFront, @@ -13,7 +13,7 @@ const { const { webconsoleSpec } = require("devtools/shared/specs/webconsole"); const { getAdHocFrontOrPrimitiveGrip, -} = require("devtools/shared/fronts/object"); +} = require("devtools/client/fronts/object"); /** * A WebConsoleFront is used as a front end for the WebConsoleActor that is diff --git a/devtools/client/inspector/extensions/components/ExpressionResultView.js b/devtools/client/inspector/extensions/components/ExpressionResultView.js index aef08380f208..a98a7040cae4 100644 --- a/devtools/client/inspector/extensions/components/ExpressionResultView.js +++ b/devtools/client/inspector/extensions/components/ExpressionResultView.js @@ -25,14 +25,14 @@ const { loader.lazyRequireGetter( this, "LongStringFront", - "devtools/shared/fronts/string", + "devtools/client/fronts/string", true ); loader.lazyRequireGetter( this, "ObjectFront", - "devtools/shared/fronts/object", + "devtools/client/fronts/object", true ); diff --git a/devtools/client/inspector/inspector.js b/devtools/client/inspector/inspector.js index 988a26a13400..54c628eb13bc 100644 --- a/devtools/client/inspector/inspector.js +++ b/devtools/client/inspector/inspector.js @@ -19,7 +19,7 @@ const Promise = require("Promise"); loader.lazyRequireGetter( this, "initCssProperties", - "devtools/shared/fronts/css-properties", + "devtools/client/fronts/css-properties", true ); loader.lazyRequireGetter( diff --git a/devtools/client/inspector/rules/models/element-style.js b/devtools/client/inspector/rules/models/element-style.js index d94689119b50..dd52cfd83690 100644 --- a/devtools/client/inspector/rules/models/element-style.js +++ b/devtools/client/inspector/rules/models/element-style.js @@ -37,7 +37,7 @@ loader.lazyRequireGetter( loader.lazyRequireGetter( this, "isCssVariable", - "devtools/shared/fronts/css-properties", + "devtools/client/fronts/css-properties", true ); diff --git a/devtools/client/inspector/shared/test/browser_styleinspector_output-parser.js b/devtools/client/inspector/shared/test/browser_styleinspector_output-parser.js index cd2d3a4ec81d..227ab2848cec 100644 --- a/devtools/client/inspector/shared/test/browser_styleinspector_output-parser.js +++ b/devtools/client/inspector/shared/test/browser_styleinspector_output-parser.js @@ -13,7 +13,7 @@ const { CSS_PROPERTIES_DB } = require("devtools/shared/css/properties-db"); const { initCssProperties, getCssProperties, -} = require("devtools/shared/fronts/css-properties"); +} = require("devtools/client/fronts/css-properties"); const COLOR_CLASS = "color-class"; const URL_CLASS = "url-class"; diff --git a/devtools/client/memory/models.js b/devtools/client/memory/models.js index af1a25cd4260..ab358519ac2d 100644 --- a/devtools/client/memory/models.js +++ b/devtools/client/memory/models.js @@ -8,7 +8,7 @@ "use strict"; const { assert } = require("devtools/shared/DevToolsUtils"); -const { MemoryFront } = require("devtools/shared/fronts/memory"); +const { MemoryFront } = require("devtools/client/fronts/memory"); const HeapAnalysesClient = require("devtools/shared/heapsnapshot/HeapAnalysesClient"); const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); const { diff --git a/devtools/client/shared/build/build-debugger.js b/devtools/client/shared/build/build-debugger.js index 7402ad731f63..05cf3b98dc41 100644 --- a/devtools/client/shared/build/build-debugger.js +++ b/devtools/client/shared/build/build-debugger.js @@ -19,7 +19,7 @@ const mappings = { "./source-editor": "devtools/client/shared/sourceeditor/editor", "../editor/source-editor": "devtools/client/shared/sourceeditor/editor", "./test-flag": "devtools/shared/flags", - "./fronts-device": "devtools/shared/fronts/device", + "./fronts-device": "devtools/client/fronts/device", immutable: "devtools/client/shared/vendor/immutable", lodash: "devtools/client/shared/vendor/lodash", react: "devtools/client/shared/vendor/react", diff --git a/devtools/client/shared/sourceeditor/css-autocompleter.js b/devtools/client/shared/sourceeditor/css-autocompleter.js index 165a5b399634..655b710f2d08 100644 --- a/devtools/client/shared/sourceeditor/css-autocompleter.js +++ b/devtools/client/shared/sourceeditor/css-autocompleter.js @@ -10,7 +10,7 @@ const { } = require("devtools/shared/css/parsing-utils"); const { getClientCssProperties, -} = require("devtools/shared/fronts/css-properties"); +} = require("devtools/client/fronts/css-properties"); /** * Here is what this file (+ css-parsing-utils.js) do. diff --git a/devtools/client/shared/sourceeditor/editor.js b/devtools/client/shared/sourceeditor/editor.js index f10bd12569f9..addb88aca654 100644 --- a/devtools/client/shared/sourceeditor/editor.js +++ b/devtools/client/shared/sourceeditor/editor.js @@ -150,7 +150,7 @@ function Editor(config) { themeSwitching: true, autocomplete: false, autocompleteOpts: {}, - // Expect a CssProperties object (see devtools/shared/fronts/css-properties.js) + // Expect a CssProperties object (see devtools/client/fronts/css-properties.js) cssProperties: null, // Set to true to prevent the search addon to be activated. disableSearchAddon: false, diff --git a/devtools/client/shared/sourceeditor/test/head.js b/devtools/client/shared/sourceeditor/test/head.js index 0df0d31488c1..ac258d660ca5 100644 --- a/devtools/client/shared/sourceeditor/test/head.js +++ b/devtools/client/shared/sourceeditor/test/head.js @@ -15,7 +15,7 @@ Services.scriptloader.loadSubScript( const Editor = require("devtools/client/shared/sourceeditor/editor"); const { getClientCssProperties, -} = require("devtools/shared/fronts/css-properties"); +} = require("devtools/client/fronts/css-properties"); function promiseWaitForFocus(el) { return new Promise(resolve => waitForFocus(resolve, el)); diff --git a/devtools/client/shared/test/browser_outputparser.js b/devtools/client/shared/test/browser_outputparser.js index 28a5fa898498..1d0f3d0b4ff0 100644 --- a/devtools/client/shared/test/browser_outputparser.js +++ b/devtools/client/shared/test/browser_outputparser.js @@ -6,7 +6,7 @@ const { initCssProperties, getCssProperties, -} = require("devtools/shared/fronts/css-properties"); +} = require("devtools/client/fronts/css-properties"); const { CSS_PROPERTIES_DB } = require("devtools/shared/css/properties-db"); add_task(async function() { diff --git a/devtools/client/shared/test/xpcshell/test_rewriteDeclarations.js b/devtools/client/shared/test/xpcshell/test_rewriteDeclarations.js index e98efb4da076..49861a9c517d 100644 --- a/devtools/client/shared/test/xpcshell/test_rewriteDeclarations.js +++ b/devtools/client/shared/test/xpcshell/test_rewriteDeclarations.js @@ -4,7 +4,7 @@ "use strict"; const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm"); -const RuleRewriter = require("devtools/shared/fronts/inspector/rule-rewriter"); +const RuleRewriter = require("devtools/client/fronts/inspector/rule-rewriter"); const { isCssPropertyKnown } = require("devtools/server/actors/css-properties"); const TEST_DATA = [ diff --git a/devtools/client/styleeditor/panel.js b/devtools/client/styleeditor/panel.js index ac5ef0c06380..b594527b5c49 100644 --- a/devtools/client/styleeditor/panel.js +++ b/devtools/client/styleeditor/panel.js @@ -14,7 +14,7 @@ var { var { getString, } = require("resource://devtools/client/styleeditor/StyleEditorUtil.jsm"); -var { initCssProperties } = require("devtools/shared/fronts/css-properties"); +var { initCssProperties } = require("devtools/client/fronts/css-properties"); var StyleEditorPanel = function StyleEditorPanel(panelWin, toolbox) { EventEmitter.decorate(this); diff --git a/devtools/client/styleeditor/test/browser_styleeditor_autocomplete.js b/devtools/client/styleeditor/test/browser_styleeditor_autocomplete.js index 6651b2394bd9..b463cf613d4b 100644 --- a/devtools/client/styleeditor/test/browser_styleeditor_autocomplete.js +++ b/devtools/client/styleeditor/test/browser_styleeditor_autocomplete.js @@ -7,7 +7,7 @@ const TESTCASE_URI = TEST_BASE_HTTP + "autocomplete.html"; const MAX_SUGGESTIONS = 15; -const { initCssProperties } = require("devtools/shared/fronts/css-properties"); +const { initCssProperties } = require("devtools/client/fronts/css-properties"); // Test cases to test that autocompletion works correctly when enabled. // Format: diff --git a/devtools/client/webconsole/test/browser/stub-generator-helpers.js b/devtools/client/webconsole/test/browser/stub-generator-helpers.js index 23e47b591ca5..e14d12aece2f 100644 --- a/devtools/client/webconsole/test/browser/stub-generator-helpers.js +++ b/devtools/client/webconsole/test/browser/stub-generator-helpers.js @@ -8,7 +8,7 @@ const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); const { getAdHocFrontOrPrimitiveGrip, -} = require("devtools/shared/fronts/object"); +} = require("devtools/client/fronts/object"); const CHROME_PREFIX = "chrome://mochitests/content/browser/"; const STUBS_FOLDER = "devtools/client/webconsole/test/node/fixtures/stubs/"; diff --git a/devtools/client/webconsole/utils/object-inspector.js b/devtools/client/webconsole/utils/object-inspector.js index ef20b4ba45a8..74db03ac7829 100644 --- a/devtools/client/webconsole/utils/object-inspector.js +++ b/devtools/client/webconsole/utils/object-inspector.js @@ -29,14 +29,14 @@ loader.lazyRequireGetter( loader.lazyRequireGetter( this, "LongStringFront", - "devtools/shared/fronts/string", + "devtools/client/fronts/string", true ); loader.lazyRequireGetter( this, "ObjectFront", - "devtools/shared/fronts/object", + "devtools/client/fronts/object", true ); diff --git a/devtools/client/webconsole/webconsole-ui.js b/devtools/client/webconsole/webconsole-ui.js index 489274c07bda..134542015062 100644 --- a/devtools/client/webconsole/webconsole-ui.js +++ b/devtools/client/webconsole/webconsole-ui.js @@ -18,7 +18,7 @@ const { BrowserLoader } = ChromeUtils.import( ); const { getAdHocFrontOrPrimitiveGrip, -} = require("devtools/shared/fronts/object"); +} = require("devtools/client/fronts/object"); loader.lazyRequireGetter( this, diff --git a/devtools/client/webconsole/webconsole.js b/devtools/client/webconsole/webconsole.js index 6d6951a5bd51..e802904be3ef 100644 --- a/devtools/client/webconsole/webconsole.js +++ b/devtools/client/webconsole/webconsole.js @@ -467,7 +467,7 @@ class WebConsole { * * @param {String} string: The code you want to evaluate. * @param {Object} options: Options for evaluation. See evaluateJSAsync method on - * devtools/shared/fronts/webconsole.js + * devtools/client/fronts/webconsole.js */ evaluateJSAsync(expression, options = {}) { return this.ui._commands.evaluateJSAsync(expression, options); diff --git a/devtools/docs/backend/protocol.js.md b/devtools/docs/backend/protocol.js.md index 0784f49c1228..66f11cef0620 100644 --- a/devtools/docs/backend/protocol.js.md +++ b/devtools/docs/backend/protocol.js.md @@ -67,7 +67,7 @@ A request/reply will look like this: <- { from: , greeting: "hello" } Now we can create a client side object. We call these *front* objects and -they typically go in `devtools/shared/fronts/`. +they typically go in `devtools/client/fronts/`. Here's the front for the HelloActor: @@ -479,7 +479,7 @@ Now you can listen to events on a front: If you want to modify the argument that will be passed to event listeners callbacks, you can use `before(eventName, fn)` in the front definition. This can only be used once for a given `eventName`. The `fn` function will be called before emitting the event via -the EventEmitter API on the Front, and its return value will be passed to the event +the EventEmitter API on the Front, and its return value will be passed to the event listener callbacks. If `fn` is async, the event will only be emitted after `fn` call resolves. // In front file, most probably in the constructor: diff --git a/devtools/server/tests/chrome/test_css-properties.html b/devtools/server/tests/chrome/test_css-properties.html index fb0d3c8adb56..ccbc7ea89474 100644 --- a/devtools/server/tests/chrome/test_css-properties.html +++ b/devtools/server/tests/chrome/test_css-properties.html @@ -14,7 +14,7 @@ Bug 1265798 - Replace inIDOMUtils.cssPropertyIsShorthand window.onload = function() { const { initCssProperties, getCssProperties } = - require("devtools/shared/fronts/css-properties"); + require("devtools/client/fronts/css-properties"); function toSortedString(array) { return JSON.stringify(array.sort()); diff --git a/devtools/server/tests/xpcshell/head_dbg.js b/devtools/server/tests/xpcshell/head_dbg.js index 45c2886d3c6c..cc192e248707 100644 --- a/devtools/server/tests/xpcshell/head_dbg.js +++ b/devtools/server/tests/xpcshell/head_dbg.js @@ -43,8 +43,8 @@ const { DevToolsServer: WorkerDevToolsServer } = worker.require( "devtools/server/devtools-server" ); const { DevToolsClient } = require("devtools/shared/client/devtools-client"); -const { ObjectFront } = require("devtools/shared/fronts/object"); -const { LongStringFront } = require("devtools/shared/fronts/string"); +const { ObjectFront } = require("devtools/client/fronts/object"); +const { LongStringFront } = require("devtools/client/fronts/string"); const { TargetFactory } = require("devtools/client/framework/target"); const { addDebuggerToGlobal } = ChromeUtils.import( diff --git a/devtools/server/tests/xpcshell/test_attach.js b/devtools/server/tests/xpcshell/test_attach.js index 4363841339d2..f8b14588b5c6 100644 --- a/devtools/server/tests/xpcshell/test_attach.js +++ b/devtools/server/tests/xpcshell/test_attach.js @@ -3,10 +3,10 @@ "use strict"; -const { ThreadFront } = require("devtools/shared/fronts/thread"); +const { ThreadFront } = require("devtools/client/fronts/thread"); const { BrowsingContextTargetFront, -} = require("devtools/shared/fronts/targets/browsing-context"); +} = require("devtools/client/fronts/targets/browsing-context"); /** * Very naive test that checks threadClearTest helper. diff --git a/devtools/server/tests/xpcshell/test_framebindings-07.js b/devtools/server/tests/xpcshell/test_framebindings-07.js index ecf9addca969..fc46ab581adc 100644 --- a/devtools/server/tests/xpcshell/test_framebindings-07.js +++ b/devtools/server/tests/xpcshell/test_framebindings-07.js @@ -4,7 +4,7 @@ "use strict"; -const { EnvironmentFront } = require("devtools/shared/fronts/environment"); +const { EnvironmentFront } = require("devtools/client/fronts/environment"); add_task( threadFrontTest(async ({ threadFront, debuggee, client }) => { diff --git a/devtools/shared/client/devtools-client.js b/devtools/shared/client/devtools-client.js index a4153998ea0e..d537e8392086 100644 --- a/devtools/shared/client/devtools-client.js +++ b/devtools/shared/client/devtools-client.js @@ -37,7 +37,7 @@ loader.lazyRequireGetter( loader.lazyRequireGetter( this, "ObjectFront", - "devtools/shared/fronts/object", + "devtools/client/fronts/object", true ); loader.lazyRequireGetter(this, "Front", "devtools/shared/protocol", true); diff --git a/devtools/shared/protocol/tests/xpcshell/test_protocol_longstring.js b/devtools/shared/protocol/tests/xpcshell/test_protocol_longstring.js index 79320d123727..20b44b4b1352 100644 --- a/devtools/shared/protocol/tests/xpcshell/test_protocol_longstring.js +++ b/devtools/shared/protocol/tests/xpcshell/test_protocol_longstring.js @@ -13,7 +13,7 @@ var EventEmitter = require("devtools/shared/event-emitter"); var { LongStringActor } = require("devtools/server/actors/string"); // The test implicitly relies on this. -require("devtools/shared/fronts/string"); +require("devtools/client/fronts/string"); function simpleHello() { return { diff --git a/devtools/shared/specs/index.js b/devtools/shared/specs/index.js index aca81c538d2e..6068df370052 100644 --- a/devtools/shared/specs/index.js +++ b/devtools/shared/specs/index.js @@ -20,82 +20,82 @@ const Types = (exports.__TypesForTests = [ "parentaccessibility", ], spec: "devtools/shared/specs/accessibility", - front: "devtools/shared/fronts/accessibility", + front: "devtools/client/fronts/accessibility", }, { types: ["addons"], spec: "devtools/shared/specs/addon/addons", - front: "devtools/shared/fronts/addon/addons", + front: "devtools/client/fronts/addon/addons", }, { types: ["webExtensionInspectedWindow"], spec: "devtools/shared/specs/addon/webextension-inspected-window", - front: "devtools/shared/fronts/addon/webextension-inspected-window", + front: "devtools/client/fronts/addon/webextension-inspected-window", }, { types: ["animationplayer", "animations"], spec: "devtools/shared/specs/animation", - front: "devtools/shared/fronts/animation", + front: "devtools/client/fronts/animation", }, { types: ["arraybuffer"], spec: "devtools/shared/specs/array-buffer", - front: "devtools/shared/fronts/array-buffer", + front: "devtools/client/fronts/array-buffer", }, { types: ["changes"], spec: "devtools/shared/specs/changes", - front: "devtools/shared/fronts/changes", + front: "devtools/client/fronts/changes", }, { types: ["contentViewer"], spec: "devtools/shared/specs/content-viewer", - front: "devtools/shared/fronts/content-viewer", + front: "devtools/client/fronts/content-viewer", }, { types: ["cssProperties"], spec: "devtools/shared/specs/css-properties", - front: "devtools/shared/fronts/css-properties", + front: "devtools/client/fronts/css-properties", }, { types: ["frameDescriptor"], spec: "devtools/shared/specs/descriptors/frame", - front: "devtools/shared/fronts/descriptors/frame", + front: "devtools/client/fronts/descriptors/frame", }, { types: ["processDescriptor"], spec: "devtools/shared/specs/descriptors/process", - front: "devtools/shared/fronts/descriptors/process", + front: "devtools/client/fronts/descriptors/process", }, { types: ["tabDescriptor"], spec: "devtools/shared/specs/descriptors/tab", - front: "devtools/shared/fronts/descriptors/tab", + front: "devtools/client/fronts/descriptors/tab", }, { types: ["webExtensionDescriptor"], spec: "devtools/shared/specs/descriptors/webextension", - front: "devtools/shared/fronts/descriptors/webextension", + front: "devtools/client/fronts/descriptors/webextension", }, { types: ["device"], spec: "devtools/shared/specs/device", - front: "devtools/shared/fronts/device", + front: "devtools/client/fronts/device", }, { types: ["environment"], spec: "devtools/shared/specs/environment", - front: "devtools/shared/fronts/environment", + front: "devtools/client/fronts/environment", }, { types: ["frame"], spec: "devtools/shared/specs/frame", - front: "devtools/shared/fronts/frame", + front: "devtools/client/fronts/frame", }, { types: ["framerate"], spec: "devtools/shared/specs/framerate", - front: "devtools/shared/fronts/framerate", + front: "devtools/client/fronts/framerate", }, /* heap snapshot has old fashion client and no front */ { @@ -106,27 +106,27 @@ const Types = (exports.__TypesForTests = [ { types: ["highlighter", "customhighlighter"], spec: "devtools/shared/specs/highlighters", - front: "devtools/shared/fronts/highlighters", + front: "devtools/client/fronts/highlighters", }, { types: ["inspector"], spec: "devtools/shared/specs/inspector", - front: "devtools/shared/fronts/inspector", + front: "devtools/client/fronts/inspector", }, { types: ["flexbox", "grid", "layout"], spec: "devtools/shared/specs/layout", - front: "devtools/shared/fronts/layout", + front: "devtools/client/fronts/layout", }, { types: ["manifest"], spec: "devtools/shared/specs/manifest", - front: "devtools/shared/fronts/manifest", + front: "devtools/client/fronts/manifest", }, { types: ["memory"], spec: "devtools/shared/specs/memory", - front: "devtools/shared/fronts/memory", + front: "devtools/client/fronts/memory", }, { types: ["netEvent"], @@ -142,7 +142,7 @@ const Types = (exports.__TypesForTests = [ { types: ["domnode", "domnodelist"], spec: "devtools/shared/specs/node", - front: "devtools/shared/fronts/node", + front: "devtools/client/fronts/node", }, { types: ["obj", "object.descriptor"], @@ -152,52 +152,52 @@ const Types = (exports.__TypesForTests = [ { types: ["perf"], spec: "devtools/shared/specs/perf", - front: "devtools/shared/fronts/perf", + front: "devtools/client/fronts/perf", }, { types: ["performance"], spec: "devtools/shared/specs/performance", - front: "devtools/shared/fronts/performance", + front: "devtools/client/fronts/performance", }, { types: ["performance-recording"], spec: "devtools/shared/specs/performance-recording", - front: "devtools/shared/fronts/performance-recording", + front: "devtools/client/fronts/performance-recording", }, { types: ["preference"], spec: "devtools/shared/specs/preference", - front: "devtools/shared/fronts/preference", + front: "devtools/client/fronts/preference", }, { types: ["propertyIterator"], spec: "devtools/shared/specs/property-iterator", - front: "devtools/shared/fronts/property-iterator", + front: "devtools/client/fronts/property-iterator", }, { types: ["reflow"], spec: "devtools/shared/specs/reflow", - front: "devtools/shared/fronts/reflow", + front: "devtools/client/fronts/reflow", }, { types: ["responsive"], spec: "devtools/shared/specs/responsive", - front: "devtools/shared/fronts/responsive", + front: "devtools/client/fronts/responsive", }, { types: ["root"], spec: "devtools/shared/specs/root", - front: "devtools/shared/fronts/root", + front: "devtools/client/fronts/root", }, { types: ["screenshot"], spec: "devtools/shared/specs/screenshot", - front: "devtools/shared/fronts/screenshot", + front: "devtools/client/fronts/screenshot", }, { types: ["source"], spec: "devtools/shared/specs/source", - front: "devtools/shared/fronts/source", + front: "devtools/client/fronts/source", }, { types: [ @@ -209,7 +209,7 @@ const Types = (exports.__TypesForTests = [ "storage", ], spec: "devtools/shared/specs/storage", - front: "devtools/shared/fronts/storage", + front: "devtools/client/fronts/storage", }, /* longstring is special, it has a wrapper type. See its spec module */ { @@ -220,17 +220,17 @@ const Types = (exports.__TypesForTests = [ { types: ["longstractor"], spec: "devtools/shared/specs/string", - front: "devtools/shared/fronts/string", + front: "devtools/client/fronts/string", }, { types: ["pagestyle", "domstylerule"], spec: "devtools/shared/specs/styles", - front: "devtools/shared/fronts/styles", + front: "devtools/client/fronts/styles", }, { types: ["mediarule", "stylesheet", "stylesheets"], spec: "devtools/shared/specs/stylesheets", - front: "devtools/shared/fronts/stylesheets", + front: "devtools/client/fronts/stylesheets", }, { types: ["symbol"], @@ -240,12 +240,12 @@ const Types = (exports.__TypesForTests = [ { types: ["symbolIterator"], spec: "devtools/shared/specs/symbol-iterator", - front: "devtools/shared/fronts/symbol-iterator", + front: "devtools/client/fronts/symbol-iterator", }, { types: ["browsingContextTarget"], spec: "devtools/shared/specs/targets/browsing-context", - front: "devtools/shared/fronts/targets/browsing-context", + front: "devtools/client/fronts/targets/browsing-context", }, { types: ["chromeWindowTarget"], @@ -275,42 +275,42 @@ const Types = (exports.__TypesForTests = [ { types: ["workerTarget"], spec: "devtools/shared/specs/targets/worker", - front: "devtools/shared/fronts/targets/worker", + front: "devtools/client/fronts/targets/worker", }, { types: ["thread"], spec: "devtools/shared/specs/thread", - front: "devtools/shared/fronts/thread", + front: "devtools/client/fronts/thread", }, { types: ["domwalker"], spec: "devtools/shared/specs/walker", - front: "devtools/shared/fronts/walker", + front: "devtools/client/fronts/walker", }, { types: ["console"], spec: "devtools/shared/specs/webconsole", - front: "devtools/shared/fronts/webconsole", + front: "devtools/client/fronts/webconsole", }, { types: ["webSocket"], spec: "devtools/shared/specs/websocket", - front: "devtools/shared/fronts/websocket", + front: "devtools/client/fronts/websocket", }, { types: ["pushSubscription"], spec: "devtools/shared/specs/worker/push-subscription", - front: "devtools/shared/fronts/worker/push-subscription", + front: "devtools/client/fronts/worker/push-subscription", }, { types: ["serviceWorker"], spec: "devtools/shared/specs/worker/service-worker", - front: "devtools/shared/fronts/worker/service-worker", + front: "devtools/client/fronts/worker/service-worker", }, { types: ["serviceWorkerRegistration"], spec: "devtools/shared/specs/worker/service-worker-registration", - front: "devtools/shared/fronts/worker/service-worker-registration", + front: "devtools/client/fronts/worker/service-worker-registration", }, ]); diff --git a/devtools/shared/webconsole/test/chrome/common.js b/devtools/shared/webconsole/test/chrome/common.js index 582aa40e28b6..fc6c26c7da19 100644 --- a/devtools/shared/webconsole/test/chrome/common.js +++ b/devtools/shared/webconsole/test/chrome/common.js @@ -11,7 +11,7 @@ const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm"); const { DevToolsServer } = require("devtools/server/devtools-server"); const { DevToolsClient } = require("devtools/shared/client/devtools-client"); -const { ObjectFront } = require("devtools/shared/fronts/object"); +const { ObjectFront } = require("devtools/client/fronts/object"); const Services = require("Services"); function initCommon() {