diff --git a/devtools/client/shared/async-store-helper.js b/devtools/client/shared/async-store-helper.js index 96678a3df8c6..0919a07b986e 100644 --- a/devtools/client/shared/async-store-helper.js +++ b/devtools/client/shared/async-store-helper.js @@ -4,7 +4,7 @@ "use strict"; -const asyncStorage = require("devtools/shared/async-storage"); +const asyncStorage = require("resource://devtools/shared/async-storage.js"); /* * asyncStoreHelper wraps asyncStorage so that it is easy to define project diff --git a/devtools/client/shared/autocomplete-popup.js b/devtools/client/shared/autocomplete-popup.js index 08ba64479a69..12f4044f8e0f 100644 --- a/devtools/client/shared/autocomplete-popup.js +++ b/devtools/client/shared/autocomplete-popup.js @@ -4,7 +4,7 @@ "use strict"; -const EventEmitter = require("devtools/shared/event-emitter"); +const EventEmitter = require("resource://devtools/shared/event-emitter.js"); loader.lazyRequireGetter( this, diff --git a/devtools/client/shared/components/Accordion.js b/devtools/client/shared/components/Accordion.js index 0c6ea0b64e78..c3f1afa4180f 100644 --- a/devtools/client/shared/components/Accordion.js +++ b/devtools/client/shared/components/Accordion.js @@ -7,15 +7,15 @@ const { Component, createElement, -} = require("devtools/client/shared/vendor/react"); -const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); +} = require("resource://devtools/client/shared/vendor/react.js"); +const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-types.js"); const { ul, li, h2, div, span, -} = require("devtools/client/shared/vendor/react-dom-factories"); +} = require("resource://devtools/client/shared/vendor/react-dom-factories.js"); class Accordion extends Component { static get propTypes() { diff --git a/devtools/client/shared/components/AppErrorBoundary.js b/devtools/client/shared/components/AppErrorBoundary.js index 1fe8908ffea7..bbbe6a036013 100644 --- a/devtools/client/shared/components/AppErrorBoundary.js +++ b/devtools/client/shared/components/AppErrorBoundary.js @@ -5,14 +5,16 @@ "use strict"; // React deps -const { Component } = require("devtools/client/shared/vendor/react"); -const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); -const dom = require("devtools/client/shared/vendor/react-dom-factories"); +const { + Component, +} = require("resource://devtools/client/shared/vendor/react.js"); +const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-types.js"); +const dom = require("resource://devtools/client/shared/vendor/react-dom-factories.js"); const { div, h1, h2, h3, p, a } = dom; // Localized strings for (devtools/client/locales/en-US/components.properties) loader.lazyGetter(this, "L10N", function() { - const { LocalizationHelper } = require("devtools/shared/l10n"); + const { LocalizationHelper } = require("resource://devtools/shared/l10n.js"); return new LocalizationHelper( "devtools/client/locales/components.properties" ); diff --git a/devtools/client/shared/components/Frame.js b/devtools/client/shared/components/Frame.js index 1adeba31d8c9..cb9706113daf 100644 --- a/devtools/client/shared/components/Frame.js +++ b/devtools/client/shared/components/Frame.js @@ -4,21 +4,25 @@ "use strict"; -const { Component } = require("devtools/client/shared/vendor/react"); -const dom = require("devtools/client/shared/vendor/react-dom-factories"); -const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); +const { + Component, +} = require("resource://devtools/client/shared/vendor/react.js"); +const dom = require("resource://devtools/client/shared/vendor/react-dom-factories.js"); +const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-types.js"); const { getUnicodeUrl, getUnicodeUrlPath, getUnicodeHostname, -} = require("devtools/client/shared/unicode-url"); +} = require("resource://devtools/client/shared/unicode-url.js"); const { getSourceNames, parseURL, getSourceMappedFile, -} = require("devtools/client/shared/source-utils"); -const { LocalizationHelper } = require("devtools/shared/l10n"); -const { MESSAGE_SOURCE } = require("devtools/client/webconsole/constants"); +} = require("resource://devtools/client/shared/source-utils.js"); +const { LocalizationHelper } = require("resource://devtools/shared/l10n.js"); +const { + MESSAGE_SOURCE, +} = require("resource://devtools/client/webconsole/constants.js"); const l10n = new LocalizationHelper( "devtools/client/locales/components.properties" diff --git a/devtools/client/shared/components/HSplitBox.js b/devtools/client/shared/components/HSplitBox.js index bd1f169a3819..65dfc0aaf642 100644 --- a/devtools/client/shared/components/HSplitBox.js +++ b/devtools/client/shared/components/HSplitBox.js @@ -23,10 +23,12 @@ // | | | // +-----------------------+---------------------+ -const { Component } = require("devtools/client/shared/vendor/react"); -const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); -const dom = require("devtools/client/shared/vendor/react-dom-factories"); -const { assert } = require("devtools/shared/DevToolsUtils"); +const { + Component, +} = require("resource://devtools/client/shared/vendor/react.js"); +const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-types.js"); +const dom = require("resource://devtools/client/shared/vendor/react-dom-factories.js"); +const { assert } = require("resource://devtools/shared/DevToolsUtils.js"); class HSplitBox extends Component { static get propTypes() { diff --git a/devtools/client/shared/components/List.js b/devtools/client/shared/components/List.js index 7da388e4cac1..8110aa471db8 100644 --- a/devtools/client/shared/components/List.js +++ b/devtools/client/shared/components/List.js @@ -9,18 +9,20 @@ const { createRef, Component, cloneElement, -} = require("devtools/client/shared/vendor/react"); -const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); +} = require("resource://devtools/client/shared/vendor/react.js"); +const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-types.js"); const { ul, li, div, -} = require("devtools/client/shared/vendor/react-dom-factories"); +} = require("resource://devtools/client/shared/vendor/react-dom-factories.js"); -const { scrollIntoView } = require("devtools/client/shared/scroll"); +const { + scrollIntoView, +} = require("resource://devtools/client/shared/scroll.js"); const { preventDefaultAndStopPropagation, -} = require("devtools/client/shared/events"); +} = require("resource://devtools/client/shared/events.js"); loader.lazyRequireGetter( this, diff --git a/devtools/client/shared/components/MdnLink.js b/devtools/client/shared/components/MdnLink.js index 4a858a76f345..c31f77369e2c 100644 --- a/devtools/client/shared/components/MdnLink.js +++ b/devtools/client/shared/components/MdnLink.js @@ -4,8 +4,8 @@ "use strict"; -const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); -const dom = require("devtools/client/shared/vendor/react-dom-factories"); +const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-types.js"); +const dom = require("resource://devtools/client/shared/vendor/react-dom-factories.js"); const { a } = dom; loader.lazyRequireGetter( diff --git a/devtools/client/shared/components/NotificationBox.js b/devtools/client/shared/components/NotificationBox.js index d61fe0d3c71c..f1a8a5e87771 100644 --- a/devtools/client/shared/components/NotificationBox.js +++ b/devtools/client/shared/components/NotificationBox.js @@ -7,17 +7,19 @@ const { Component, createFactory, -} = require("devtools/client/shared/vendor/react"); -const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); -const dom = require("devtools/client/shared/vendor/react-dom-factories"); -const { LocalizationHelper } = require("devtools/shared/l10n"); +} = require("resource://devtools/client/shared/vendor/react.js"); +const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-types.js"); +const dom = require("resource://devtools/client/shared/vendor/react-dom-factories.js"); +const { LocalizationHelper } = require("resource://devtools/shared/l10n.js"); const l10n = new LocalizationHelper( "devtools/client/locales/components.properties" ); const { div, span, button } = dom; loader.lazyGetter(this, "MDNLink", function() { - return createFactory(require("devtools/client/shared/components/MdnLink")); + return createFactory( + require("resource://devtools/client/shared/components/MdnLink.js") + ); }); // Priority Levels diff --git a/devtools/client/shared/components/SearchBox.js b/devtools/client/shared/components/SearchBox.js index 1f63c272f94c..5e5ab132ce02 100644 --- a/devtools/client/shared/components/SearchBox.js +++ b/devtools/client/shared/components/SearchBox.js @@ -10,17 +10,19 @@ const { createFactory, createRef, PureComponent, -} = require("devtools/client/shared/vendor/react"); -const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); -const dom = require("devtools/client/shared/vendor/react-dom-factories"); +} = require("resource://devtools/client/shared/vendor/react.js"); +const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-types.js"); +const dom = require("resource://devtools/client/shared/vendor/react-dom-factories.js"); loader.lazyGetter(this, "SearchBoxAutocompletePopup", function() { return createFactory( - require("devtools/client/shared/components/SearchBoxAutocompletePopup") + require("resource://devtools/client/shared/components/SearchBoxAutocompletePopup.js") ); }); loader.lazyGetter(this, "MDNLink", function() { - return createFactory(require("devtools/client/shared/components/MdnLink")); + return createFactory( + require("resource://devtools/client/shared/components/MdnLink.js") + ); }); loader.lazyRequireGetter( diff --git a/devtools/client/shared/components/SearchBoxAutocompletePopup.js b/devtools/client/shared/components/SearchBoxAutocompletePopup.js index f1053f2f5fc1..08aad18872fe 100644 --- a/devtools/client/shared/components/SearchBoxAutocompletePopup.js +++ b/devtools/client/shared/components/SearchBoxAutocompletePopup.js @@ -4,9 +4,11 @@ "use strict"; -const { Component } = require("devtools/client/shared/vendor/react"); -const dom = require("devtools/client/shared/vendor/react-dom-factories"); -const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); +const { + Component, +} = require("resource://devtools/client/shared/vendor/react.js"); +const dom = require("resource://devtools/client/shared/vendor/react-dom-factories.js"); +const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-types.js"); class SearchBoxAutocompletePopup extends Component { static get propTypes() { diff --git a/devtools/client/shared/components/Sidebar.js b/devtools/client/shared/components/Sidebar.js index d020e48dda37..bf9ef9938d09 100644 --- a/devtools/client/shared/components/Sidebar.js +++ b/devtools/client/shared/components/Sidebar.js @@ -7,14 +7,14 @@ const { createFactory, PureComponent, -} = require("devtools/client/shared/vendor/react"); -const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); +} = require("resource://devtools/client/shared/vendor/react.js"); +const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-types.js"); const SidebarToggle = createFactory( - require("devtools/client/shared/components/SidebarToggle") + require("resource://devtools/client/shared/components/SidebarToggle.js") ); const Tabs = createFactory( - require("devtools/client/shared/components/tabs/Tabs").Tabs + require("resource://devtools/client/shared/components/tabs/Tabs.js").Tabs ); class Sidebar extends PureComponent { diff --git a/devtools/client/shared/components/SidebarToggle.js b/devtools/client/shared/components/SidebarToggle.js index f514f5ff4615..3cb2a2843821 100644 --- a/devtools/client/shared/components/SidebarToggle.js +++ b/devtools/client/shared/components/SidebarToggle.js @@ -4,9 +4,11 @@ "use strict"; -const { Component } = require("devtools/client/shared/vendor/react"); -const dom = require("devtools/client/shared/vendor/react-dom-factories"); -const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); +const { + Component, +} = require("resource://devtools/client/shared/vendor/react.js"); +const dom = require("resource://devtools/client/shared/vendor/react-dom-factories.js"); +const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-types.js"); // Shortcuts const { button } = dom; diff --git a/devtools/client/shared/components/SmartTrace.js b/devtools/client/shared/components/SmartTrace.js index b153261089be..02205ef5c569 100644 --- a/devtools/client/shared/components/SmartTrace.js +++ b/devtools/client/shared/components/SmartTrace.js @@ -7,9 +7,9 @@ const { Component, createFactory, -} = require("devtools/client/shared/vendor/react"); -const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); -const { LocalizationHelper } = require("devtools/shared/l10n"); +} = require("resource://devtools/client/shared/vendor/react.js"); +const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-types.js"); +const { LocalizationHelper } = require("resource://devtools/shared/l10n.js"); const l10n = new LocalizationHelper( "devtools/client/locales/components.properties" @@ -18,15 +18,15 @@ const dbgL10n = new LocalizationHelper( "devtools/client/locales/debugger.properties" ); const Frames = createFactory( - require("devtools/client/debugger/src/components/SecondaryPanes/Frames/index") + require("resource://devtools/client/debugger/src/components/SecondaryPanes/Frames/index.js") .Frames ); const { annotateFrames, -} = require("devtools/client/debugger/src/utils/pause/frames/annotateFrames"); +} = require("resource://devtools/client/debugger/src/utils/pause/frames/annotateFrames.js"); const { getDisplayURL, -} = require("devtools/client/debugger/src/utils/sources-tree/getURL"); +} = require("resource://devtools/client/debugger/src/utils/sources-tree/getURL.js"); class SmartTrace extends Component { static get propTypes() { diff --git a/devtools/client/shared/components/StackTrace.js b/devtools/client/shared/components/StackTrace.js index 1a1d1037044c..0c0f4cc16b0d 100644 --- a/devtools/client/shared/components/StackTrace.js +++ b/devtools/client/shared/components/StackTrace.js @@ -7,11 +7,13 @@ const { Component, createFactory, -} = require("devtools/client/shared/vendor/react"); -const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); -const dom = require("devtools/client/shared/vendor/react-dom-factories"); -const { LocalizationHelper } = require("devtools/shared/l10n"); -const Frame = createFactory(require("devtools/client/shared/components/Frame")); +} = require("resource://devtools/client/shared/vendor/react.js"); +const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-types.js"); +const dom = require("resource://devtools/client/shared/vendor/react-dom-factories.js"); +const { LocalizationHelper } = require("resource://devtools/shared/l10n.js"); +const Frame = createFactory( + require("resource://devtools/client/shared/components/Frame.js") +); const l10n = new LocalizationHelper( "devtools/client/locales/webconsole.properties" diff --git a/devtools/client/shared/components/Tree.js b/devtools/client/shared/components/Tree.js index 17da07e138ae..a05d98a31460 100644 --- a/devtools/client/shared/components/Tree.js +++ b/devtools/client/shared/components/Tree.js @@ -4,10 +4,10 @@ "use strict"; -const React = require("devtools/client/shared/vendor/react"); +const React = require("resource://devtools/client/shared/vendor/react.js"); const { Component, createFactory } = React; -const dom = require("devtools/client/shared/vendor/react-dom-factories"); -const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); +const dom = require("resource://devtools/client/shared/vendor/react-dom-factories.js"); +const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-types.js"); // depth const AUTO_EXPAND_DEPTH = 0; diff --git a/devtools/client/shared/components/VirtualizedTree.js b/devtools/client/shared/components/VirtualizedTree.js index 7a2ce3fb0a56..ab1e214c9224 100644 --- a/devtools/client/shared/components/VirtualizedTree.js +++ b/devtools/client/shared/components/VirtualizedTree.js @@ -7,13 +7,15 @@ const { Component, createFactory, -} = require("devtools/client/shared/vendor/react"); -const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); -const dom = require("devtools/client/shared/vendor/react-dom-factories"); -const { scrollIntoView } = require("devtools/client/shared/scroll"); +} = require("resource://devtools/client/shared/vendor/react.js"); +const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-types.js"); +const dom = require("resource://devtools/client/shared/vendor/react-dom-factories.js"); +const { + scrollIntoView, +} = require("resource://devtools/client/shared/scroll.js"); const { preventDefaultAndStopPropagation, -} = require("devtools/client/shared/events"); +} = require("resource://devtools/client/shared/events.js"); loader.lazyRequireGetter( this, diff --git a/devtools/client/shared/components/VisibilityHandler.js b/devtools/client/shared/components/VisibilityHandler.js index 3eaea8246428..be1f3c5f932f 100644 --- a/devtools/client/shared/components/VisibilityHandler.js +++ b/devtools/client/shared/components/VisibilityHandler.js @@ -13,8 +13,10 @@ * See devtools/client/framework/toolbox.js:setIframeVisible(). */ -const { Component } = require("devtools/client/shared/vendor/react"); -const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); +const { + Component, +} = require("resource://devtools/client/shared/vendor/react.js"); +const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-types.js"); class VisibilityHandler extends Component { static get propTypes() { diff --git a/devtools/client/shared/components/menu/MenuButton.js b/devtools/client/shared/components/menu/MenuButton.js index 82f23ac04fc2..7b33d9d0178d 100644 --- a/devtools/client/shared/components/menu/MenuButton.js +++ b/devtools/client/shared/components/menu/MenuButton.js @@ -7,13 +7,13 @@ // A button that toggles a doorhanger menu. -const flags = require("devtools/shared/flags"); +const flags = require("resource://devtools/shared/flags.js"); const { createRef, PureComponent, -} = require("devtools/client/shared/vendor/react"); -const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); -const dom = require("devtools/client/shared/vendor/react-dom-factories"); +} = require("resource://devtools/client/shared/vendor/react.js"); +const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-types.js"); +const dom = require("resource://devtools/client/shared/vendor/react-dom-factories.js"); const { button } = dom; const isMacOS = Services.appinfo.OS === "Darwin"; diff --git a/devtools/client/shared/components/menu/MenuItem.js b/devtools/client/shared/components/menu/MenuItem.js index 26e48acf34e4..c3efa6db6ca9 100644 --- a/devtools/client/shared/components/menu/MenuItem.js +++ b/devtools/client/shared/components/menu/MenuItem.js @@ -11,12 +11,15 @@ const { createFactory, createRef, PureComponent, -} = require("devtools/client/shared/vendor/react"); -const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); -const dom = require("devtools/client/shared/vendor/react-dom-factories"); +} = require("resource://devtools/client/shared/vendor/react.js"); +const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-types.js"); +const dom = require("resource://devtools/client/shared/vendor/react-dom-factories.js"); const { button, li, span } = dom; loader.lazyGetter(this, "Localized", () => - createFactory(require("devtools/client/shared/vendor/fluent-react").Localized) + createFactory( + require("resource://devtools/client/shared/vendor/fluent-react.js") + .Localized + ) ); class MenuItem extends PureComponent { diff --git a/devtools/client/shared/components/menu/MenuList.js b/devtools/client/shared/components/menu/MenuList.js index 5218c5cfbec5..c66e06ab54fe 100644 --- a/devtools/client/shared/components/menu/MenuList.js +++ b/devtools/client/shared/components/menu/MenuList.js @@ -13,11 +13,13 @@ const { Children, PureComponent, -} = require("devtools/client/shared/vendor/react"); -const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); -const dom = require("devtools/client/shared/vendor/react-dom-factories"); +} = require("resource://devtools/client/shared/vendor/react.js"); +const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-types.js"); +const dom = require("resource://devtools/client/shared/vendor/react-dom-factories.js"); const { div } = dom; -const { focusableSelector } = require("devtools/client/shared/focus"); +const { + focusableSelector, +} = require("resource://devtools/client/shared/focus.js"); class MenuList extends PureComponent { static get propTypes() { diff --git a/devtools/client/shared/components/menu/utils.js b/devtools/client/shared/components/menu/utils.js index f0bc7cb8e139..e6fca9682208 100644 --- a/devtools/client/shared/components/menu/utils.js +++ b/devtools/client/shared/components/menu/utils.js @@ -4,8 +4,8 @@ "use strict"; -const Menu = require("devtools/client/framework/menu"); -const MenuItem = require("devtools/client/framework/menu-item"); +const Menu = require("resource://devtools/client/framework/menu.js"); +const MenuItem = require("resource://devtools/client/framework/menu-item.js"); /** * Helper function for opening context menu. diff --git a/devtools/client/shared/components/object-inspector/actions.js b/devtools/client/shared/components/object-inspector/actions.js index 7866f0996aed..c4473485f3ff 100644 --- a/devtools/client/shared/components/object-inspector/actions.js +++ b/devtools/client/shared/components/object-inspector/actions.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at . */ -const { loadItemProperties } = require("devtools/client/shared/components/object-inspector/utils/load-properties"); +const { loadItemProperties } = require("resource://devtools/client/shared/components/object-inspector/utils/load-properties.js"); const { getPathExpression, getParentFront, @@ -10,8 +10,8 @@ const { getValue, nodeIsBucket, getFront, -} = require("devtools/client/shared/components/object-inspector/utils/node"); -const { getLoadedProperties, getWatchpoints } = require("devtools/client/shared/components/object-inspector/reducer"); +} = require("resource://devtools/client/shared/components/object-inspector/utils/node.js"); +const { getLoadedProperties, getWatchpoints } = require("resource://devtools/client/shared/components/object-inspector/reducer.js"); /** * This action is responsible for expanding a given node, which also means that diff --git a/devtools/client/shared/components/object-inspector/components/ObjectInspector.js b/devtools/client/shared/components/object-inspector/components/ObjectInspector.js index c8fc82411165..5cf09a5e9fdf 100644 --- a/devtools/client/shared/components/object-inspector/components/ObjectInspector.js +++ b/devtools/client/shared/components/object-inspector/components/ObjectInspector.js @@ -8,32 +8,32 @@ const { Component, createFactory, createElement, -} = require("devtools/client/shared/vendor/react"); +} = require("resource://devtools/client/shared/vendor/react.js"); const { connect, Provider, -} = require("devtools/client/shared/vendor/react-redux"); +} = require("resource://devtools/client/shared/vendor/react-redux.js"); loader.lazyRequireGetter( this, "createStore", "devtools/client/shared/redux/create-store" ); -const actions = require("devtools/client/shared/components/object-inspector/actions"); +const actions = require("resource://devtools/client/shared/components/object-inspector/actions.js"); const { getExpandedPaths, getLoadedProperties, getEvaluations, default: reducer, -} = require("devtools/client/shared/components/object-inspector/reducer"); +} = require("resource://devtools/client/shared/components/object-inspector/reducer.js"); -const Tree = createFactory(require("devtools/client/shared/components/Tree")); +const Tree = createFactory(require("resource://devtools/client/shared/components/Tree.js")); const ObjectInspectorItem = createFactory( - require("devtools/client/shared/components/object-inspector/components/ObjectInspectorItem") + require("resource://devtools/client/shared/components/object-inspector/components/ObjectInspectorItem.js") ); -const Utils = require("devtools/client/shared/components/object-inspector/utils/index"); +const Utils = require("resource://devtools/client/shared/components/object-inspector/utils/index.js"); const { renderRep, shouldRenderRootsInReps } = Utils; const { getChildrenWithEvaluations, diff --git a/devtools/client/shared/components/object-inspector/components/ObjectInspectorItem.js b/devtools/client/shared/components/object-inspector/components/ObjectInspectorItem.js index 2a8a0d5423d8..534ac0e13b66 100644 --- a/devtools/client/shared/components/object-inspector/components/ObjectInspectorItem.js +++ b/devtools/client/shared/components/object-inspector/components/ObjectInspectorItem.js @@ -2,16 +2,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at . */ -const { Component } = require("devtools/client/shared/vendor/react"); -const dom = require("devtools/client/shared/vendor/react-dom-factories"); +const { Component } = require("resource://devtools/client/shared/vendor/react.js"); +const dom = require("resource://devtools/client/shared/vendor/react-dom-factories.js"); const isMacOS = Services.appinfo.OS === "Darwin"; const { MODE, -} = require("devtools/client/shared/components/reps/reps/constants"); +} = require("resource://devtools/client/shared/components/reps/reps/constants.js"); -const Utils = require("devtools/client/shared/components/object-inspector/utils/index"); +const Utils = require("resource://devtools/client/shared/components/object-inspector/utils/index.js"); const { getValue, diff --git a/devtools/client/shared/components/object-inspector/index.js b/devtools/client/shared/components/object-inspector/index.js index de0ffc383251..34e4d30086b7 100644 --- a/devtools/client/shared/components/object-inspector/index.js +++ b/devtools/client/shared/components/object-inspector/index.js @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at . */ -const ObjectInspector = require("devtools/client/shared/components/object-inspector/components/ObjectInspector"); -const utils = require("devtools/client/shared/components/object-inspector/utils/index"); -const reducer = require("devtools/client/shared/components/object-inspector/reducer"); -const actions = require("devtools/client/shared/components/object-inspector/actions"); +const ObjectInspector = require("resource://devtools/client/shared/components/object-inspector/components/ObjectInspector.js"); +const utils = require("resource://devtools/client/shared/components/object-inspector/utils/index.js"); +const reducer = require("resource://devtools/client/shared/components/object-inspector/reducer.js"); +const actions = require("resource://devtools/client/shared/components/object-inspector/actions.js"); module.exports = { ObjectInspector, utils, actions, reducer }; diff --git a/devtools/client/shared/components/object-inspector/utils/client.js b/devtools/client/shared/components/object-inspector/utils/client.js index ae59ed923fb2..85fd1b7cd0bb 100644 --- a/devtools/client/shared/components/object-inspector/utils/client.js +++ b/devtools/client/shared/components/object-inspector/utils/client.js @@ -5,7 +5,7 @@ const { getValue, nodeHasFullText, -} = require("devtools/client/shared/components/object-inspector/utils/node"); +} = require("resource://devtools/client/shared/components/object-inspector/utils/node.js"); async function enumIndexedProperties(objectFront, start, end) { try { diff --git a/devtools/client/shared/components/object-inspector/utils/index.js b/devtools/client/shared/components/object-inspector/utils/index.js index a18ea724d7e2..082515cafa5c 100644 --- a/devtools/client/shared/components/object-inspector/utils/index.js +++ b/devtools/client/shared/components/object-inspector/utils/index.js @@ -2,18 +2,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at . */ -const client = require("devtools/client/shared/components/object-inspector/utils/client"); -const loadProperties = require("devtools/client/shared/components/object-inspector/utils/load-properties"); -const node = require("devtools/client/shared/components/object-inspector/utils/node"); +const client = require("resource://devtools/client/shared/components/object-inspector/utils/client.js"); +const loadProperties = require("resource://devtools/client/shared/components/object-inspector/utils/load-properties.js"); +const node = require("resource://devtools/client/shared/components/object-inspector/utils/node.js"); const { nodeIsError, nodeIsPrimitive, nodeHasCustomFormatter, nodeHasCustomFormattedBody } = node; -const selection = require("devtools/client/shared/components/object-inspector/utils/selection"); +const selection = require("resource://devtools/client/shared/components/object-inspector/utils/selection.js"); const { MODE, -} = require("devtools/client/shared/components/reps/reps/constants"); +} = require("resource://devtools/client/shared/components/reps/reps/constants.js"); const { REPS: { Rep, Grip }, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); function shouldRenderRootsInReps(roots, props = {}) { if (roots.length !== 1) { diff --git a/devtools/client/shared/components/object-inspector/utils/load-properties.js b/devtools/client/shared/components/object-inspector/utils/load-properties.js index 16133741b14c..f62f7da1d7c0 100644 --- a/devtools/client/shared/components/object-inspector/utils/load-properties.js +++ b/devtools/client/shared/components/object-inspector/utils/load-properties.js @@ -13,7 +13,7 @@ const { getPromiseState, getProxySlots, getCustomFormatterBody, -} = require("devtools/client/shared/components/object-inspector/utils/client"); +} = require("resource://devtools/client/shared/components/object-inspector/utils/client.js"); const { getClosestGripNode, @@ -33,7 +33,7 @@ const { nodeIsProxy, nodeNeedsNumericalBuckets, nodeIsLongString, -} = require("devtools/client/shared/components/object-inspector/utils/node"); +} = require("resource://devtools/client/shared/components/object-inspector/utils/node.js"); function loadItemProperties(item, client, loadedProperties, threadActorID) { const gripItem = getClosestGripNode(item); diff --git a/devtools/client/shared/components/object-inspector/utils/node.js b/devtools/client/shared/components/object-inspector/utils/node.js index c085b4f5db17..edbdc6e327e0 100644 --- a/devtools/client/shared/components/object-inspector/utils/node.js +++ b/devtools/client/shared/components/object-inspector/utils/node.js @@ -4,16 +4,16 @@ const { maybeEscapePropertyName, -} = require("devtools/client/shared/components/reps/reps/rep-utils"); -const ArrayRep = require("devtools/client/shared/components/reps/reps/array"); -const GripArrayRep = require("devtools/client/shared/components/reps/reps/grip-array"); -const GripMap = require("devtools/client/shared/components/reps/reps/grip-map"); -const GripEntryRep = require("devtools/client/shared/components/reps/reps/grip-entry"); -const ErrorRep = require("devtools/client/shared/components/reps/reps/error"); -const BigIntRep = require("devtools/client/shared/components/reps/reps/big-int"); +} = require("resource://devtools/client/shared/components/reps/reps/rep-utils.js"); +const ArrayRep = require("resource://devtools/client/shared/components/reps/reps/array.js"); +const GripArrayRep = require("resource://devtools/client/shared/components/reps/reps/grip-array.js"); +const GripMap = require("resource://devtools/client/shared/components/reps/reps/grip-map.js"); +const GripEntryRep = require("resource://devtools/client/shared/components/reps/reps/grip-entry.js"); +const ErrorRep = require("resource://devtools/client/shared/components/reps/reps/error.js"); +const BigIntRep = require("resource://devtools/client/shared/components/reps/reps/big-int.js"); const { isLongString, -} = require("devtools/client/shared/components/reps/reps/string"); +} = require("resource://devtools/client/shared/components/reps/reps/string.js"); const MAX_NUMERICAL_PROPERTIES = 100; diff --git a/devtools/client/shared/components/splitter/Draggable.js b/devtools/client/shared/components/splitter/Draggable.js index 619f406649e5..3d18e49c34ed 100644 --- a/devtools/client/shared/components/splitter/Draggable.js +++ b/devtools/client/shared/components/splitter/Draggable.js @@ -4,9 +4,12 @@ "use strict"; -const { createRef, Component } = require("devtools/client/shared/vendor/react"); -const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); -const dom = require("devtools/client/shared/vendor/react-dom-factories"); +const { + createRef, + Component, +} = require("resource://devtools/client/shared/vendor/react.js"); +const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-types.js"); +const dom = require("resource://devtools/client/shared/vendor/react-dom-factories.js"); class Draggable extends Component { static get propTypes() { diff --git a/devtools/client/shared/components/splitter/GridElementWidthResizer.js b/devtools/client/shared/components/splitter/GridElementWidthResizer.js index 437afd8865c6..c6ab6f3e14dc 100644 --- a/devtools/client/shared/components/splitter/GridElementWidthResizer.js +++ b/devtools/client/shared/components/splitter/GridElementWidthResizer.js @@ -7,10 +7,10 @@ const { Component, createFactory, -} = require("devtools/client/shared/vendor/react"); -const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); +} = require("resource://devtools/client/shared/vendor/react.js"); +const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-types.js"); const Draggable = createFactory( - require("devtools/client/shared/components/splitter/Draggable") + require("resource://devtools/client/shared/components/splitter/Draggable.js") ); class GridElementWidthResizer extends Component { diff --git a/devtools/client/shared/components/splitter/SplitBox.js b/devtools/client/shared/components/splitter/SplitBox.js index d047b8539497..2bf0fdb74da1 100644 --- a/devtools/client/shared/components/splitter/SplitBox.js +++ b/devtools/client/shared/components/splitter/SplitBox.js @@ -7,12 +7,12 @@ const { Component, createFactory, -} = require("devtools/client/shared/vendor/react"); -const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); -const dom = require("devtools/client/shared/vendor/react-dom-factories"); +} = require("resource://devtools/client/shared/vendor/react.js"); +const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-types.js"); +const dom = require("resource://devtools/client/shared/vendor/react-dom-factories.js"); const Draggable = createFactory( - require("devtools/client/shared/components/splitter/Draggable") + require("resource://devtools/client/shared/components/splitter/Draggable.js") ); /** diff --git a/devtools/client/shared/components/tabs/TabBar.js b/devtools/client/shared/components/tabs/TabBar.js index bcb66d260046..bb9c5cc7340f 100644 --- a/devtools/client/shared/components/tabs/TabBar.js +++ b/devtools/client/shared/components/tabs/TabBar.js @@ -9,12 +9,12 @@ const { Component, createFactory, -} = require("devtools/client/shared/vendor/react"); -const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); -const dom = require("devtools/client/shared/vendor/react-dom-factories"); +} = require("resource://devtools/client/shared/vendor/react.js"); +const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-types.js"); +const dom = require("resource://devtools/client/shared/vendor/react-dom-factories.js"); const Sidebar = createFactory( - require("devtools/client/shared/components/Sidebar") + require("resource://devtools/client/shared/components/Sidebar.js") ); loader.lazyRequireGetter(this, "Menu", "devtools/client/framework/menu"); diff --git a/devtools/client/shared/components/test/chrome/head.js b/devtools/client/shared/components/test/chrome/head.js index 260da8b10f0a..af89a5ec62a9 100644 --- a/devtools/client/shared/components/test/chrome/head.js +++ b/devtools/client/shared/components/test/chrome/head.js @@ -11,14 +11,18 @@ var { require } = ChromeUtils.import( "resource://devtools/shared/loader/Loader.jsm" ); var { Assert } = ChromeUtils.import("resource://testing-common/Assert.jsm"); -var { gDevTools } = require("devtools/client/framework/devtools"); +var { gDevTools } = require("resource://devtools/client/framework/devtools.js"); var { BrowserLoader } = ChromeUtils.import( "resource://devtools/shared/loader/browser-loader.js" ); -var { DevToolsServer } = require("devtools/server/devtools-server"); -var { DevToolsClient } = require("devtools/client/devtools-client"); -var DevToolsUtils = require("devtools/shared/DevToolsUtils"); -var { Toolbox } = require("devtools/client/framework/toolbox"); +var { + DevToolsServer, +} = require("resource://devtools/server/devtools-server.js"); +var { + DevToolsClient, +} = require("resource://devtools/client/devtools-client.js"); +var DevToolsUtils = require("resource://devtools/shared/DevToolsUtils.js"); +var { Toolbox } = require("resource://devtools/client/framework/toolbox.js"); var { require: browserRequire } = BrowserLoader({ baseURI: "resource://devtools/client/shared/", diff --git a/devtools/client/shared/components/test/node/components/object-inspector/component/classnames.test.js b/devtools/client/shared/components/test/node/components/object-inspector/component/classnames.test.js index 8a10cab1e149..9f93d8fb7039 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/component/classnames.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/component/classnames.test.js @@ -2,10 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at . */ -const ObjectFront = require("devtools/client/shared/components/test/node/__mocks__/object-front"); +const ObjectFront = require("resource://devtools/client/shared/components/test/node/__mocks__/object-front.js"); const { mountObjectInspector, -} = require("devtools/client/shared/components/test/node/components/object-inspector/test-utils"); +} = require("resource://devtools/client/shared/components/test/node/components/object-inspector/test-utils.js"); function generateDefaults(overrides) { return { diff --git a/devtools/client/shared/components/test/node/components/object-inspector/component/entries.test.js b/devtools/client/shared/components/test/node/components/object-inspector/component/entries.test.js index f7bc6f8925c7..0cb896d3ae2b 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/component/entries.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/component/entries.test.js @@ -6,19 +6,19 @@ const { mountObjectInspector, -} = require("devtools/client/shared/components/test/node/components/object-inspector/test-utils"); +} = require("resource://devtools/client/shared/components/test/node/components/object-inspector/test-utils.js"); const { MODE, -} = require("devtools/client/shared/components/reps/reps/constants"); +} = require("resource://devtools/client/shared/components/reps/reps/constants.js"); const { formatObjectInspector, waitForDispatch, waitForLoadedProperties, -} = require("devtools/client/shared/components/test/node/components/object-inspector/test-utils"); +} = require("resource://devtools/client/shared/components/test/node/components/object-inspector/test-utils.js"); -const gripMapRepStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-map"); -const mapStubs = require("devtools/client/shared/components/test/node/stubs/object-inspector/map"); -const ObjectFront = require("devtools/client/shared/components/test/node/__mocks__/object-front"); +const gripMapRepStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-map.js"); +const mapStubs = require("resource://devtools/client/shared/components/test/node/stubs/object-inspector/map.js"); +const ObjectFront = require("resource://devtools/client/shared/components/test/node/__mocks__/object-front.js"); function generateDefaults(overrides) { return { diff --git a/devtools/client/shared/components/test/node/components/object-inspector/component/events.test.js b/devtools/client/shared/components/test/node/components/object-inspector/component/events.test.js index 6029eb94fde0..e6483dbefb8b 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/component/events.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/component/events.test.js @@ -5,10 +5,10 @@ /* global jest */ const { mountObjectInspector, -} = require("devtools/client/shared/components/test/node/components/object-inspector/test-utils"); +} = require("resource://devtools/client/shared/components/test/node/components/object-inspector/test-utils.js"); -const gripRepStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip"); -const ObjectFront = require("devtools/client/shared/components/test/node/__mocks__/object-front"); +const gripRepStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip.js"); +const ObjectFront = require("resource://devtools/client/shared/components/test/node/__mocks__/object-front.js"); function generateDefaults(overrides) { return { diff --git a/devtools/client/shared/components/test/node/components/object-inspector/component/function.test.js b/devtools/client/shared/components/test/node/components/object-inspector/component/function.test.js index cb7b77000764..0e5bb9573ad2 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/component/function.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/component/function.test.js @@ -4,16 +4,16 @@ const { mountObjectInspector, -} = require("devtools/client/shared/components/test/node/components/object-inspector/test-utils"); +} = require("resource://devtools/client/shared/components/test/node/components/object-inspector/test-utils.js"); const { MODE, -} = require("devtools/client/shared/components/reps/reps/constants"); +} = require("resource://devtools/client/shared/components/reps/reps/constants.js"); const { createNode, -} = require("devtools/client/shared/components/object-inspector/utils/node"); +} = require("resource://devtools/client/shared/components/object-inspector/utils/node.js"); -const functionStubs = require("devtools/client/shared/components/test/node/stubs/reps/function"); -const ObjectFront = require("devtools/client/shared/components/test/node/__mocks__/object-front"); +const functionStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/function.js"); +const ObjectFront = require("resource://devtools/client/shared/components/test/node/__mocks__/object-front.js"); function generateDefaults(overrides) { return { diff --git a/devtools/client/shared/components/test/node/components/object-inspector/component/getter-setter.test.js b/devtools/client/shared/components/test/node/components/object-inspector/component/getter-setter.test.js index 0f07ebbc99d2..e5fbbff7de27 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/component/getter-setter.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/component/getter-setter.test.js @@ -4,18 +4,18 @@ const { MODE, -} = require("devtools/client/shared/components/reps/reps/constants"); +} = require("resource://devtools/client/shared/components/reps/reps/constants.js"); const { formatObjectInspector, waitForLoadedProperties, mountObjectInspector, -} = require("devtools/client/shared/components/test/node/components/object-inspector/test-utils"); +} = require("resource://devtools/client/shared/components/test/node/components/object-inspector/test-utils.js"); const { makeNodesForProperties, -} = require("devtools/client/shared/components/object-inspector/utils/node"); -const accessorStubs = require("devtools/client/shared/components/test/node/stubs/reps/accessor"); -const ObjectFront = require("devtools/client/shared/components/test/node/__mocks__/object-front"); +} = require("resource://devtools/client/shared/components/object-inspector/utils/node.js"); +const accessorStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/accessor.js"); +const ObjectFront = require("resource://devtools/client/shared/components/test/node/__mocks__/object-front.js"); function generateDefaults(overrides) { return { diff --git a/devtools/client/shared/components/test/node/components/object-inspector/component/properties.test.js b/devtools/client/shared/components/test/node/components/object-inspector/component/properties.test.js index f4231cd536c0..8773cfd49ff7 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/component/properties.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/component/properties.test.js @@ -6,13 +6,13 @@ const { mountObjectInspector, -} = require("devtools/client/shared/components/test/node/components/object-inspector/test-utils"); -const gripRepStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip"); -const ObjectFront = require("devtools/client/shared/components/test/node/__mocks__/object-front"); +} = require("resource://devtools/client/shared/components/test/node/components/object-inspector/test-utils.js"); +const gripRepStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip.js"); +const ObjectFront = require("resource://devtools/client/shared/components/test/node/__mocks__/object-front.js"); const { formatObjectInspector, -} = require("devtools/client/shared/components/test/node/components/object-inspector/test-utils"); +} = require("resource://devtools/client/shared/components/test/node/components/object-inspector/test-utils.js"); function generateDefaults(overrides) { return { diff --git a/devtools/client/shared/components/test/node/components/object-inspector/component/proxy.test.js b/devtools/client/shared/components/test/node/components/object-inspector/component/proxy.test.js index 1d9df63fb463..0bf716ccff83 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/component/proxy.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/component/proxy.test.js @@ -5,19 +5,19 @@ /* global jest */ const { mountObjectInspector, -} = require("devtools/client/shared/components/test/node/components/object-inspector/test-utils"); +} = require("resource://devtools/client/shared/components/test/node/components/object-inspector/test-utils.js"); const { MODE, -} = require("devtools/client/shared/components/reps/reps/constants"); -const gripStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip"); +} = require("resource://devtools/client/shared/components/reps/reps/constants.js"); +const gripStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip.js"); const stub = gripStubs.get("testProxy"); const proxySlots = gripStubs.get("testProxySlots"); const { formatObjectInspector, -} = require("devtools/client/shared/components/test/node/components/object-inspector/test-utils"); +} = require("resource://devtools/client/shared/components/test/node/components/object-inspector/test-utils.js"); -const ObjectFront = require("devtools/client/shared/components/test/node/__mocks__/object-front"); +const ObjectFront = require("resource://devtools/client/shared/components/test/node/__mocks__/object-front.js"); function generateDefaults(overrides) { return { roots: [ diff --git a/devtools/client/shared/components/test/node/components/object-inspector/component/window.test.js b/devtools/client/shared/components/test/node/components/object-inspector/component/window.test.js index ae752e583392..c0b103638530 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/component/window.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/component/window.test.js @@ -4,14 +4,14 @@ const { createNode, -} = require("devtools/client/shared/components/object-inspector/utils/node"); +} = require("resource://devtools/client/shared/components/object-inspector/utils/node.js"); const { waitForDispatch, mountObjectInspector, -} = require("devtools/client/shared/components/test/node/components/object-inspector/test-utils"); +} = require("resource://devtools/client/shared/components/test/node/components/object-inspector/test-utils.js"); -const gripWindowStubs = require("devtools/client/shared/components/test/node/stubs/reps/window"); -const ObjectFront = require("devtools/client/shared/components/test/node/__mocks__/object-front"); +const gripWindowStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/window.js"); +const ObjectFront = require("resource://devtools/client/shared/components/test/node/__mocks__/object-front.js"); const windowNode = createNode({ name: "window", contents: { value: gripWindowStubs.get("Window")._grip }, diff --git a/devtools/client/shared/components/test/node/components/object-inspector/test-utils.js b/devtools/client/shared/components/test/node/components/object-inspector/test-utils.js index cc891d0904de..79d3e4116175 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/test-utils.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/test-utils.js @@ -3,37 +3,37 @@ * file, You can obtain one at . */ const { mount } = require("enzyme"); -const { createFactory } = require("devtools/client/shared/vendor/react"); +const { createFactory } = require("resource://devtools/client/shared/vendor/react.js"); -const { Provider } = require("devtools/client/shared/vendor/react-redux"); +const { Provider } = require("resource://devtools/client/shared/vendor/react-redux.js"); const { combineReducers, createStore, applyMiddleware, -} = require("devtools/client/shared/vendor/redux"); +} = require("resource://devtools/client/shared/vendor/redux.js"); -const { thunk } = require("devtools/client/shared/redux/middleware/thunk"); +const { thunk } = require("resource://devtools/client/shared/redux/middleware/thunk.js"); const { waitUntilService, -} = require("devtools/client/shared/redux/middleware/wait-service"); +} = require("resource://devtools/client/shared/redux/middleware/wait-service.js"); /** * Redux store utils * @module utils/create-store */ -const objectInspector = require("devtools/client/shared/components/object-inspector/index"); +const objectInspector = require("resource://devtools/client/shared/components/object-inspector/index.js"); const { getLoadedProperties, getLoadedPropertyKeys, getExpandedPaths, getExpandedPathKeys, -} = require("devtools/client/shared/components/object-inspector/reducer"); +} = require("resource://devtools/client/shared/components/object-inspector/reducer.js"); const ObjectInspector = createFactory(objectInspector.ObjectInspector); const { NAME: WAIT_UNTIL_TYPE, -} = require("devtools/client/shared/redux/middleware/wait-service"); +} = require("resource://devtools/client/shared/redux/middleware/wait-service.js"); /* * Takes an Enzyme wrapper (obtained with mount/shallow/…) and diff --git a/devtools/client/shared/components/test/node/components/object-inspector/utils/create-node.test.js b/devtools/client/shared/components/test/node/components/object-inspector/utils/create-node.test.js index 7dba8a9a44a9..792ad2dfb064 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/utils/create-node.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/utils/create-node.test.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at . */ -const { createNode, NODE_TYPES } = require("devtools/client/shared/components/object-inspector/utils/node"); +const { createNode, NODE_TYPES } = require("resource://devtools/client/shared/components/object-inspector/utils/node.js"); describe("createNode", () => { it("returns null when contents is undefined", () => { diff --git a/devtools/client/shared/components/test/node/components/object-inspector/utils/get-children.test.js b/devtools/client/shared/components/test/node/components/object-inspector/utils/get-children.test.js index bdec87b84a78..f57f82073d66 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/utils/get-children.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/utils/get-children.test.js @@ -2,19 +2,19 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at . */ -const accessorStubs = require("devtools/client/shared/components/test/node/stubs/reps/accessor"); -const performanceStubs = require("devtools/client/shared/components/test/node/stubs/object-inspector/performance"); -const gripMapStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-map"); -const gripArrayStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-array"); -const gripEntryStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-entry"); -const gripStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip"); +const accessorStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/accessor.js"); +const performanceStubs = require("resource://devtools/client/shared/components/test/node/stubs/object-inspector/performance.js"); +const gripMapStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-map.js"); +const gripArrayStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-array.js"); +const gripEntryStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-entry.js"); +const gripStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip.js"); const { createNode, getChildren, getValue, makeNodesForProperties, -} = require("devtools/client/shared/components/object-inspector/utils/node"); +} = require("resource://devtools/client/shared/components/object-inspector/utils/node.js"); function createRootNodeWithAccessorProperty(accessorStub) { const node = { name: "root", path: "rootpath" }; diff --git a/devtools/client/shared/components/test/node/components/object-inspector/utils/get-value.test.js b/devtools/client/shared/components/test/node/components/object-inspector/utils/get-value.test.js index 771d6bc296e9..29f0c0ffce9d 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/utils/get-value.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/utils/get-value.test.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at . */ -const { getValue } = require("devtools/client/shared/components/object-inspector/utils/node"); +const { getValue } = require("resource://devtools/client/shared/components/object-inspector/utils/node.js"); describe("getValue", () => { it("get the value from contents.value", () => { diff --git a/devtools/client/shared/components/test/node/components/object-inspector/utils/make-node-for-properties.test.js b/devtools/client/shared/components/test/node/components/object-inspector/utils/make-node-for-properties.test.js index 3c5f06bc9065..da0a221531f8 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/utils/make-node-for-properties.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/utils/make-node-for-properties.test.js @@ -9,8 +9,8 @@ const { nodeIsEntries, nodeIsMapEntry, nodeIsPrototype, -} = require("devtools/client/shared/components/object-inspector/utils/node"); -const gripArrayStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-array"); +} = require("resource://devtools/client/shared/components/object-inspector/utils/node.js"); +const gripArrayStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-array.js"); const root = { path: "root", @@ -227,7 +227,7 @@ describe("makeNodesForProperties", () => { }); it("object with entries", () => { - const gripMapStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-map"); + const gripMapStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-map.js"); const mapNode = createNode({ name: "map", diff --git a/devtools/client/shared/components/test/node/components/object-inspector/utils/make-numerical-buckets.test.js b/devtools/client/shared/components/test/node/components/object-inspector/utils/make-numerical-buckets.test.js index 8bd5934b7330..02fb1a3bc5af 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/utils/make-numerical-buckets.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/utils/make-numerical-buckets.test.js @@ -5,8 +5,8 @@ const { createNode, makeNumericalBuckets, -} = require("devtools/client/shared/components/object-inspector/utils/node"); -const gripArrayStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-array"); +} = require("resource://devtools/client/shared/components/object-inspector/utils/node.js"); +const gripArrayStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-array.js"); describe("makeNumericalBuckets", () => { it("handles simple numerical buckets", () => { diff --git a/devtools/client/shared/components/test/node/components/object-inspector/utils/node-has-entries.test.js b/devtools/client/shared/components/test/node/components/object-inspector/utils/node-has-entries.test.js index 89b496bd2301..4a7aaa971d9a 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/utils/node-has-entries.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/utils/node-has-entries.test.js @@ -2,13 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at . */ -const gripArrayStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-array"); -const gripMapStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-map"); +const gripArrayStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-array.js"); +const gripMapStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-map.js"); const { createNode, nodeHasEntries, -} = require("devtools/client/shared/components/object-inspector/utils/node"); +} = require("resource://devtools/client/shared/components/object-inspector/utils/node.js"); const createRootNode = value => createNode({ name: "root", contents: { value } }); diff --git a/devtools/client/shared/components/test/node/components/object-inspector/utils/node-is-window.test.js b/devtools/client/shared/components/test/node/components/object-inspector/utils/node-is-window.test.js index d92d0e4d82a0..8fe920ed1733 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/utils/node-is-window.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/utils/node-is-window.test.js @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at . */ -const gripWindowStubs = require("devtools/client/shared/components/test/node/stubs/reps/window"); +const gripWindowStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/window.js"); const { createNode, nodeIsWindow, -} = require("devtools/client/shared/components/object-inspector/utils/node"); +} = require("resource://devtools/client/shared/components/object-inspector/utils/node.js"); const createRootNode = value => createNode({ name: "root", contents: { value } }); diff --git a/devtools/client/shared/components/test/node/components/object-inspector/utils/node-supports-numerical-bucketing.test.js b/devtools/client/shared/components/test/node/components/object-inspector/utils/node-supports-numerical-bucketing.test.js index 457eaf3ca0fd..51199146e0e7 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/utils/node-supports-numerical-bucketing.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/utils/node-supports-numerical-bucketing.test.js @@ -6,7 +6,7 @@ const { createNode, makeNodesForEntries, nodeSupportsNumericalBucketing, -} = require("devtools/client/shared/components/object-inspector/utils/node"); +} = require("resource://devtools/client/shared/components/object-inspector/utils/node.js"); const createRootNode = stub => createNode({ @@ -14,8 +14,8 @@ const createRootNode = stub => contents: { value: stub }, }); -const gripArrayStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-array"); -const gripMapStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-map"); +const gripArrayStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-array.js"); +const gripMapStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-map.js"); describe("nodeSupportsNumericalBucketing", () => { it("returns true for Arrays", () => { diff --git a/devtools/client/shared/components/test/node/components/object-inspector/utils/promises.test.js b/devtools/client/shared/components/test/node/components/object-inspector/utils/promises.test.js index 4085f34f8743..229f717b5610 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/utils/promises.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/utils/promises.test.js @@ -5,7 +5,7 @@ const { makeNodesForPromiseProperties, nodeIsPromise, -} = require("devtools/client/shared/components/object-inspector/utils/node"); +} = require("resource://devtools/client/shared/components/object-inspector/utils/node.js"); describe("promises utils function", () => { it("is promise", () => { diff --git a/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-entries.test.js b/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-entries.test.js index 4e3da86c6d35..e4672f2a92a7 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-entries.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-entries.test.js @@ -2,14 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at . */ -const Utils = require("devtools/client/shared/components/object-inspector/utils/index"); +const Utils = require("resource://devtools/client/shared/components/object-inspector/utils/index.js"); const { createNode, getChildren, makeNodesForEntries } = Utils.node; const { shouldLoadItemEntries } = Utils.loadProperties; -const gripMapStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-map"); -const gripArrayStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-array"); -const gripStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip"); +const gripMapStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-map.js"); +const gripArrayStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-array.js"); +const gripStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip.js"); describe("shouldLoadItemEntries", () => { it("returns true for an entries node", () => { diff --git a/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-full-text.test.js b/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-full-text.test.js index d322cc0cc5c4..9e696a028c7c 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-full-text.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-full-text.test.js @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at . */ -const Utils = require("devtools/client/shared/components/object-inspector/utils/index"); +const Utils = require("resource://devtools/client/shared/components/object-inspector/utils/index.js"); const { createNode } = Utils.node; const { shouldLoadItemFullText } = Utils.loadProperties; -const longStringStubs = require("devtools/client/shared/components/test/node/stubs/reps/long-string"); -const symbolStubs = require("devtools/client/shared/components/test/node/stubs/reps/symbol"); +const longStringStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/long-string.js"); +const symbolStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/symbol.js"); describe("shouldLoadItemFullText", () => { it("returns true for a longString node with unloaded full text", () => { diff --git a/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-indexed-properties.test.js b/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-indexed-properties.test.js index 0a0e7d069bcf..63e505b947ee 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-indexed-properties.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-indexed-properties.test.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at . */ -const Utils = require("devtools/client/shared/components/object-inspector/utils/index"); +const Utils = require("resource://devtools/client/shared/components/object-inspector/utils/index.js"); const { createNode, createGetterNode, @@ -16,12 +16,12 @@ const { shouldLoadItemIndexedProperties } = Utils.loadProperties; const { createGripMapEntry, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); -const accessorStubs = require("devtools/client/shared/components/test/node/stubs/reps/accessor"); -const gripMapStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-map"); -const gripArrayStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-array"); -const gripStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip"); -const windowStubs = require("devtools/client/shared/components/test/node/stubs/reps/window"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); +const accessorStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/accessor.js"); +const gripMapStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-map.js"); +const gripArrayStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-array.js"); +const gripStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip.js"); +const windowStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/window.js"); describe("shouldLoadItemIndexedProperties", () => { it("returns true for an array", () => { diff --git a/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-non-indexed-properties.test.js b/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-non-indexed-properties.test.js index 228c99f1633f..425540eee281 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-non-indexed-properties.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-non-indexed-properties.test.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at . */ -const Utils = require("devtools/client/shared/components/object-inspector/utils/index"); +const Utils = require("resource://devtools/client/shared/components/object-inspector/utils/index.js"); const { createNode, createGetterNode, @@ -16,12 +16,12 @@ const { shouldLoadItemNonIndexedProperties } = Utils.loadProperties; const { createGripMapEntry, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); -const accessorStubs = require("devtools/client/shared/components/test/node/stubs/reps/accessor"); -const gripMapStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-map"); -const gripArrayStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-array"); -const gripStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip"); -const windowStubs = require("devtools/client/shared/components/test/node/stubs/reps/window"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); +const accessorStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/accessor.js"); +const gripMapStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-map.js"); +const gripArrayStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-array.js"); +const gripStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip.js"); +const windowStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/window.js"); describe("shouldLoadItemNonIndexedProperties", () => { it("returns true for an array", () => { diff --git a/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-prototype.test.js b/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-prototype.test.js index 565d6cf62961..83d45df70c7c 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-prototype.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-prototype.test.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at . */ -const Utils = require("devtools/client/shared/components/object-inspector/utils/index"); +const Utils = require("resource://devtools/client/shared/components/object-inspector/utils/index.js"); const { createNode, createGetterNode, @@ -16,12 +16,12 @@ const { shouldLoadItemPrototype } = Utils.loadProperties; const { createGripMapEntry, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); -const accessorStubs = require("devtools/client/shared/components/test/node/stubs/reps/accessor"); -const gripMapStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-map"); -const gripArrayStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-array"); -const gripStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip"); -const windowStubs = require("devtools/client/shared/components/test/node/stubs/reps/window"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); +const accessorStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/accessor.js"); +const gripMapStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-map.js"); +const gripArrayStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-array.js"); +const gripStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip.js"); +const windowStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/window.js"); describe("shouldLoadItemPrototype", () => { it("returns true for an array", () => { diff --git a/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-symbols.test.js b/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-symbols.test.js index e7af56ad0dd5..a937b9fcabec 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-symbols.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/utils/should-load-item-symbols.test.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at . */ -const Utils = require("devtools/client/shared/components/object-inspector/utils/index"); +const Utils = require("resource://devtools/client/shared/components/object-inspector/utils/index.js"); const { createNode, createGetterNode, @@ -16,12 +16,12 @@ const { shouldLoadItemSymbols } = Utils.loadProperties; const { createGripMapEntry, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); -const accessorStubs = require("devtools/client/shared/components/test/node/stubs/reps/accessor"); -const gripMapStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-map"); -const gripArrayStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-array"); -const gripStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip"); -const windowStubs = require("devtools/client/shared/components/test/node/stubs/reps/window"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); +const accessorStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/accessor.js"); +const gripMapStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-map.js"); +const gripArrayStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-array.js"); +const gripStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip.js"); +const windowStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/window.js"); describe("shouldLoadItemSymbols", () => { it("returns true for an array", () => { diff --git a/devtools/client/shared/components/test/node/components/object-inspector/utils/should-render-roots-in-reps.test.js b/devtools/client/shared/components/test/node/components/object-inspector/utils/should-render-roots-in-reps.test.js index 4a286111b943..456326545a55 100644 --- a/devtools/client/shared/components/test/node/components/object-inspector/utils/should-render-roots-in-reps.test.js +++ b/devtools/client/shared/components/test/node/components/object-inspector/utils/should-render-roots-in-reps.test.js @@ -2,17 +2,17 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at . */ -const Utils = require("devtools/client/shared/components/object-inspector/utils/index"); +const Utils = require("resource://devtools/client/shared/components/object-inspector/utils/index.js"); const { shouldRenderRootsInReps } = Utils; -const nullStubs = require("devtools/client/shared/components/test/node/stubs/reps/null"); -const numberStubs = require("devtools/client/shared/components/test/node/stubs/reps/number"); -const undefinedStubs = require("devtools/client/shared/components/test/node/stubs/reps/undefined"); -const gripStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip"); -const gripArrayStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-array"); -const symbolStubs = require("devtools/client/shared/components/test/node/stubs/reps/symbol"); -const errorStubs = require("devtools/client/shared/components/test/node/stubs/reps/error"); -const bigIntStubs = require("devtools/client/shared/components/test/node/stubs/reps/big-int"); +const nullStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/null.js"); +const numberStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/number.js"); +const undefinedStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/undefined.js"); +const gripStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip.js"); +const gripArrayStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-array.js"); +const symbolStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/symbol.js"); +const errorStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/error.js"); +const bigIntStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/big-int.js"); describe("shouldRenderRootsInReps", () => { it("returns true for a string", () => { diff --git a/devtools/client/shared/components/test/node/components/reps/accessible.test.js b/devtools/client/shared/components/test/node/components/reps/accessible.test.js index c35991dff362..8df9650c3666 100644 --- a/devtools/client/shared/components/test/node/components/reps/accessible.test.js +++ b/devtools/client/shared/components/test/node/components/reps/accessible.test.js @@ -10,12 +10,12 @@ const { JSDOM } = require("jsdom"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { Accessible } = REPS; const { ELLIPSIS, -} = require("devtools/client/shared/components/reps/reps/rep-utils"); -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/accessible"); +} = require("resource://devtools/client/shared/components/reps/reps/rep-utils.js"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/accessible.js"); describe("Accessible - Document", () => { const stub = stubs.get("Document"); diff --git a/devtools/client/shared/components/test/node/components/reps/accessor.test.js b/devtools/client/shared/components/test/node/components/reps/accessor.test.js index 80a7128b2dfb..31499fea5287 100644 --- a/devtools/client/shared/components/test/node/components/reps/accessor.test.js +++ b/devtools/client/shared/components/test/node/components/reps/accessor.test.js @@ -9,11 +9,11 @@ const { shallow } = require("enzyme"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { Accessor, Rep } = REPS; -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/accessor"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/accessor.js"); describe("Accessor - getter", () => { const object = stubs.get("getter"); diff --git a/devtools/client/shared/components/test/node/components/reps/array.test.js b/devtools/client/shared/components/test/node/components/reps/array.test.js index 10c90b52d415..ee7842f72bfb 100644 --- a/devtools/client/shared/components/test/node/components/reps/array.test.js +++ b/devtools/client/shared/components/test/node/components/reps/array.test.js @@ -9,11 +9,11 @@ const { shallow } = require("enzyme"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { MODE, -} = require("devtools/client/shared/components/reps/reps/constants"); +} = require("resource://devtools/client/shared/components/reps/reps/constants.js"); const { ArrayRep, Rep } = REPS; const { maxLengthMap } = ArrayRep; diff --git a/devtools/client/shared/components/test/node/components/reps/attribute.test.js b/devtools/client/shared/components/test/node/components/reps/attribute.test.js index 5d76efc37061..c13ab5985797 100644 --- a/devtools/client/shared/components/test/node/components/reps/attribute.test.js +++ b/devtools/client/shared/components/test/node/components/reps/attribute.test.js @@ -9,15 +9,15 @@ const { shallow } = require("enzyme"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { expectActorAttribute, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); const { Attribute, Rep } = REPS; -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/attribute"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/attribute.js"); describe("Attribute", () => { const stub = stubs.get("Attribute")._grip; diff --git a/devtools/client/shared/components/test/node/components/reps/big-int.test.js b/devtools/client/shared/components/test/node/components/reps/big-int.test.js index 0fd3d82e3acc..1fa6cd0ee192 100644 --- a/devtools/client/shared/components/test/node/components/reps/big-int.test.js +++ b/devtools/client/shared/components/test/node/components/reps/big-int.test.js @@ -8,9 +8,9 @@ const { shallow } = require("enzyme"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { BigInt, Rep } = REPS; -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/big-int"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/big-int.js"); describe("BigInt", () => { describe("1n", () => { diff --git a/devtools/client/shared/components/test/node/components/reps/comment-node.test.js b/devtools/client/shared/components/test/node/components/reps/comment-node.test.js index 81c5c3ec8447..df420f8b1b68 100644 --- a/devtools/client/shared/components/test/node/components/reps/comment-node.test.js +++ b/devtools/client/shared/components/test/node/components/reps/comment-node.test.js @@ -9,17 +9,17 @@ const { shallow } = require("enzyme"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { expectActorAttribute, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); const { MODE, -} = require("devtools/client/shared/components/reps/reps/constants"); +} = require("resource://devtools/client/shared/components/reps/reps/constants.js"); const { Rep, CommentNode } = REPS; -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/comment-node"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/comment-node.js"); describe("CommentNode", () => { const stub = stubs.get("Comment")._grip; diff --git a/devtools/client/shared/components/test/node/components/reps/date-time.test.js b/devtools/client/shared/components/test/node/components/reps/date-time.test.js index 0d3304bcd4d4..62a8557c3aff 100644 --- a/devtools/client/shared/components/test/node/components/reps/date-time.test.js +++ b/devtools/client/shared/components/test/node/components/reps/date-time.test.js @@ -9,15 +9,15 @@ const { shallow } = require("enzyme"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { expectActorAttribute, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); const { DateTime, Rep } = REPS; -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/date-time"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/date-time.js"); describe("test DateTime", () => { const stub = stubs.get("DateTime")._grip; diff --git a/devtools/client/shared/components/test/node/components/reps/document-type.test.js b/devtools/client/shared/components/test/node/components/reps/document-type.test.js index e5314f840967..f4709c6d5d7c 100644 --- a/devtools/client/shared/components/test/node/components/reps/document-type.test.js +++ b/devtools/client/shared/components/test/node/components/reps/document-type.test.js @@ -8,14 +8,14 @@ const { shallow } = require("enzyme"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { expectActorAttribute, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); const { DocumentType } = REPS; -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/document-type"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/document-type.js"); describe("DocumentType", () => { const stub = stubs.get("html"); diff --git a/devtools/client/shared/components/test/node/components/reps/document.test.js b/devtools/client/shared/components/test/node/components/reps/document.test.js index d5cb307c3975..36d2eced1145 100644 --- a/devtools/client/shared/components/test/node/components/reps/document.test.js +++ b/devtools/client/shared/components/test/node/components/reps/document.test.js @@ -8,14 +8,14 @@ const { shallow } = require("enzyme"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { expectActorAttribute, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); const { Document } = REPS; -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/document"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/document.js"); describe("Document", () => { const stub = stubs.get("Document"); diff --git a/devtools/client/shared/components/test/node/components/reps/element-node.test.js b/devtools/client/shared/components/test/node/components/reps/element-node.test.js index 2ea4674efe62..cab084e352d4 100644 --- a/devtools/client/shared/components/test/node/components/reps/element-node.test.js +++ b/devtools/client/shared/components/test/node/components/reps/element-node.test.js @@ -10,22 +10,22 @@ const { JSDOM } = require("jsdom"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { MODE, -} = require("devtools/client/shared/components/reps/reps/constants"); +} = require("resource://devtools/client/shared/components/reps/reps/constants.js"); const { MAX_ATTRIBUTE_LENGTH, -} = require("devtools/client/shared/components/reps/reps/element-node"); +} = require("resource://devtools/client/shared/components/reps/reps/element-node.js"); const { ElementNode } = REPS; const { expectActorAttribute, getSelectableInInspectorGrips, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); const { ELLIPSIS, -} = require("devtools/client/shared/components/reps/reps/rep-utils"); -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/element-node"); +} = require("resource://devtools/client/shared/components/reps/reps/rep-utils.js"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/element-node.js"); describe("ElementNode - BodyNode", () => { const stub = stubs.get("BodyNode"); diff --git a/devtools/client/shared/components/test/node/components/reps/error.test.js b/devtools/client/shared/components/test/node/components/reps/error.test.js index 499f644043d2..a8ce28016aa9 100644 --- a/devtools/client/shared/components/test/node/components/reps/error.test.js +++ b/devtools/client/shared/components/test/node/components/reps/error.test.js @@ -9,18 +9,18 @@ const { shallow } = require("enzyme"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { expectActorAttribute, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); const { ErrorRep } = REPS; const { MODE, -} = require("devtools/client/shared/components/reps/reps/constants"); -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/error"); -const dom = require("devtools/client/shared/vendor/react-dom-factories"); +} = require("resource://devtools/client/shared/components/reps/reps/constants.js"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/error.js"); +const dom = require("resource://devtools/client/shared/vendor/react-dom-factories.js"); describe("Error - Simple error", () => { // Test object = `new Error("Error message")` diff --git a/devtools/client/shared/components/test/node/components/reps/event.test.js b/devtools/client/shared/components/test/node/components/reps/event.test.js index 53a21ab39ab9..fe0f6b56010a 100644 --- a/devtools/client/shared/components/test/node/components/reps/event.test.js +++ b/devtools/client/shared/components/test/node/components/reps/event.test.js @@ -9,17 +9,17 @@ const { shallow } = require("enzyme"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { Event } = REPS; const { expectActorAttribute, getSelectableInInspectorGrips, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); const { MODE, -} = require("devtools/client/shared/components/reps/reps/constants"); -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/event"); +} = require("resource://devtools/client/shared/components/reps/reps/constants.js"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/event.js"); describe("Event - beforeprint", () => { const object = stubs.get("testEvent"); diff --git a/devtools/client/shared/components/test/node/components/reps/failure.test.js b/devtools/client/shared/components/test/node/components/reps/failure.test.js index e42b0f636193..6f31ae5687f0 100644 --- a/devtools/client/shared/components/test/node/components/reps/failure.test.js +++ b/devtools/client/shared/components/test/node/components/reps/failure.test.js @@ -7,11 +7,13 @@ /* global beforeAll, afterAll */ const { shallow } = require("enzyme"); -const { REPS } = require("devtools/client/shared/components/reps/reps/rep"); +const { + REPS, +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { Rep } = REPS; -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/failure"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/failure.js"); let originalConsoleError; beforeAll(() => { diff --git a/devtools/client/shared/components/test/node/components/reps/function.test.js b/devtools/client/shared/components/test/node/components/reps/function.test.js index 220725197e7e..b9ad70dd2605 100644 --- a/devtools/client/shared/components/test/node/components/reps/function.test.js +++ b/devtools/client/shared/components/test/node/components/reps/function.test.js @@ -6,16 +6,18 @@ /* global jest */ const { shallow } = require("enzyme"); -const { REPS } = require("devtools/client/shared/components/reps/reps/rep"); +const { + REPS, +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { MODE, -} = require("devtools/client/shared/components/reps/reps/constants"); +} = require("resource://devtools/client/shared/components/reps/reps/constants.js"); const { Func } = REPS; const { getFunctionName } = Func; -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/function"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/function.js"); const { expectActorAttribute, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); const renderRep = (object, props) => { return shallow(Func.rep({ object, ...props })); }; diff --git a/devtools/client/shared/components/test/node/components/reps/grip-array.test.js b/devtools/client/shared/components/test/node/components/reps/grip-array.test.js index 6b9945a4a56a..013fbf51039d 100644 --- a/devtools/client/shared/components/test/node/components/reps/grip-array.test.js +++ b/devtools/client/shared/components/test/node/components/reps/grip-array.test.js @@ -6,17 +6,19 @@ /* global jest */ const { shallow } = require("enzyme"); -const { getRep } = require("devtools/client/shared/components/reps/reps/rep"); -const GripArray = require("devtools/client/shared/components/reps/reps/grip-array"); +const { + getRep, +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); +const GripArray = require("resource://devtools/client/shared/components/reps/reps/grip-array.js"); const { MODE, -} = require("devtools/client/shared/components/reps/reps/constants"); -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-array"); +} = require("resource://devtools/client/shared/components/reps/reps/constants.js"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-array.js"); const { expectActorAttribute, getSelectableInInspectorGrips, getGripLengthBubbleText, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); const { maxLengthMap } = GripArray; function shallowRenderRep(object, props = {}) { diff --git a/devtools/client/shared/components/test/node/components/reps/grip-entry.test.js b/devtools/client/shared/components/test/node/components/reps/grip-entry.test.js index 77faaf78f4ad..cdfcab755eb7 100644 --- a/devtools/client/shared/components/test/node/components/reps/grip-entry.test.js +++ b/devtools/client/shared/components/test/node/components/reps/grip-entry.test.js @@ -10,20 +10,20 @@ const { shallow } = require("enzyme"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { GripEntry } = REPS; const { MODE, -} = require("devtools/client/shared/components/reps/reps/constants"); +} = require("resource://devtools/client/shared/components/reps/reps/constants.js"); const { createGripMapEntry, getGripLengthBubbleText, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-entry"); -const nodeStubs = require("devtools/client/shared/components/test/node/stubs/reps/element-node"); -const gripArrayStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-array"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-entry.js"); +const nodeStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/element-node.js"); +const gripArrayStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-array.js"); const renderRep = (object, mode, props) => { return shallow( diff --git a/devtools/client/shared/components/test/node/components/reps/grip-map.test.js b/devtools/client/shared/components/test/node/components/reps/grip-map.test.js index 203219bd776a..5ef582d56f3d 100644 --- a/devtools/client/shared/components/test/node/components/reps/grip-map.test.js +++ b/devtools/client/shared/components/test/node/components/reps/grip-map.test.js @@ -7,17 +7,19 @@ /* global jest */ const { shallow } = require("enzyme"); -const { getRep } = require("devtools/client/shared/components/reps/reps/rep"); -const GripMap = require("devtools/client/shared/components/reps/reps/grip-map"); +const { + getRep, +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); +const GripMap = require("resource://devtools/client/shared/components/reps/reps/grip-map.js"); const { MODE, -} = require("devtools/client/shared/components/reps/reps/constants"); -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-map"); +} = require("resource://devtools/client/shared/components/reps/reps/constants.js"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-map.js"); const { expectActorAttribute, getSelectableInInspectorGrips, getMapLengthBubbleText, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); const { maxLengthMap, getLength } = GripMap; function shallowRenderRep(object, props = {}) { diff --git a/devtools/client/shared/components/test/node/components/reps/grip.test.js b/devtools/client/shared/components/test/node/components/reps/grip.test.js index 934a04fa0866..7debeead3b74 100644 --- a/devtools/client/shared/components/test/node/components/reps/grip.test.js +++ b/devtools/client/shared/components/test/node/components/reps/grip.test.js @@ -10,19 +10,19 @@ const { shallow } = require("enzyme"); const { getRep, Rep, -} = require("devtools/client/shared/components/reps/reps/rep"); -const Grip = require("devtools/client/shared/components/reps/reps/grip"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); +const Grip = require("resource://devtools/client/shared/components/reps/reps/grip.js"); const { MODE, -} = require("devtools/client/shared/components/reps/reps/constants"); -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/grip"); -const gripArrayStubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-array"); +} = require("resource://devtools/client/shared/components/reps/reps/constants.js"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip.js"); +const gripArrayStubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-array.js"); const { expectActorAttribute, getSelectableInInspectorGrips, getGripLengthBubbleText, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); const { maxLengthMap } = Grip; function shallowRenderRep(object, props = {}) { diff --git a/devtools/client/shared/components/test/node/components/reps/helper-tests.test.js b/devtools/client/shared/components/test/node/components/reps/helper-tests.test.js index 60da5b6fe009..6fc1be64a376 100644 --- a/devtools/client/shared/components/test/node/components/reps/helper-tests.test.js +++ b/devtools/client/shared/components/test/node/components/reps/helper-tests.test.js @@ -6,11 +6,11 @@ const { MODE, -} = require("devtools/client/shared/components/reps/reps/constants"); -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-array"); +} = require("resource://devtools/client/shared/components/reps/reps/constants.js"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-array.js"); const { getGripLengthBubbleText, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); describe("getGripLengthBubbleText - Zero length", () => { const object = stubs.get("testBasic"); diff --git a/devtools/client/shared/components/test/node/components/reps/infinity.test.js b/devtools/client/shared/components/test/node/components/reps/infinity.test.js index 4217a0b1cee9..93fd310917c8 100644 --- a/devtools/client/shared/components/test/node/components/reps/infinity.test.js +++ b/devtools/client/shared/components/test/node/components/reps/infinity.test.js @@ -9,11 +9,11 @@ const { shallow } = require("enzyme"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { InfinityRep, Rep } = REPS; -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/infinity"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/infinity.js"); describe("testInfinity", () => { const stub = stubs.get("Infinity"); diff --git a/devtools/client/shared/components/test/node/components/reps/long-string.test.js b/devtools/client/shared/components/test/node/components/reps/long-string.test.js index 00e75c736d3a..ea6bb43e9712 100644 --- a/devtools/client/shared/components/test/node/components/reps/long-string.test.js +++ b/devtools/client/shared/components/test/node/components/reps/long-string.test.js @@ -8,18 +8,18 @@ const { shallow } = require("enzyme"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { ELLIPSIS, -} = require("devtools/client/shared/components/reps/reps/rep-utils"); +} = require("resource://devtools/client/shared/components/reps/reps/rep-utils.js"); const { expectActorAttribute, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); const { StringRep } = REPS; -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/long-string"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/long-string.js"); function quoteNewlines(text) { return text.split("\n").join("\\n"); diff --git a/devtools/client/shared/components/test/node/components/reps/nan.test.js b/devtools/client/shared/components/test/node/components/reps/nan.test.js index 0bd9091e2ca8..429e70acabe4 100644 --- a/devtools/client/shared/components/test/node/components/reps/nan.test.js +++ b/devtools/client/shared/components/test/node/components/reps/nan.test.js @@ -9,11 +9,11 @@ const { shallow } = require("enzyme"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { NaNRep, Rep } = REPS; -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/nan"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/nan.js"); describe("NaN", () => { const stub = stubs.get("NaN"); diff --git a/devtools/client/shared/components/test/node/components/reps/null.test.js b/devtools/client/shared/components/test/node/components/reps/null.test.js index f13fb8d9dae3..af5f615cadce 100644 --- a/devtools/client/shared/components/test/node/components/reps/null.test.js +++ b/devtools/client/shared/components/test/node/components/reps/null.test.js @@ -9,11 +9,11 @@ const { shallow } = require("enzyme"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { Null, Rep } = REPS; -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/null"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/null.js"); describe("testNull", () => { const stub = stubs.get("Null"); diff --git a/devtools/client/shared/components/test/node/components/reps/number.test.js b/devtools/client/shared/components/test/node/components/reps/number.test.js index 1d87498f1512..c0bbab3b0adf 100644 --- a/devtools/client/shared/components/test/node/components/reps/number.test.js +++ b/devtools/client/shared/components/test/node/components/reps/number.test.js @@ -8,9 +8,9 @@ const { shallow } = require("enzyme"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { Number, Rep } = REPS; -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/number"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/number.js"); describe("Int", () => { const stub = stubs.get("Int"); diff --git a/devtools/client/shared/components/test/node/components/reps/object-with-text.test.js b/devtools/client/shared/components/test/node/components/reps/object-with-text.test.js index da0b44ee8eaa..164024f7e627 100644 --- a/devtools/client/shared/components/test/node/components/reps/object-with-text.test.js +++ b/devtools/client/shared/components/test/node/components/reps/object-with-text.test.js @@ -7,14 +7,14 @@ const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { shallow } = require("enzyme"); const { expectActorAttribute, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/object-with-text"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/object-with-text.js"); const { ObjectWithText, Rep } = REPS; describe("Object with text - CSSStyleRule", () => { diff --git a/devtools/client/shared/components/test/node/components/reps/object-with-url.test.js b/devtools/client/shared/components/test/node/components/reps/object-with-url.test.js index 761956fa425d..055afbfde4d7 100644 --- a/devtools/client/shared/components/test/node/components/reps/object-with-url.test.js +++ b/devtools/client/shared/components/test/node/components/reps/object-with-url.test.js @@ -8,12 +8,12 @@ const { shallow } = require("enzyme"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { ObjectWithURL } = REPS; -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/object-with-url"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/object-with-url.js"); const { expectActorAttribute, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); describe("ObjectWithURL", () => { const stub = stubs.get("ObjectWithUrl"); diff --git a/devtools/client/shared/components/test/node/components/reps/object.test.js b/devtools/client/shared/components/test/node/components/reps/object.test.js index 40f0763ee897..9b32e51d20e7 100644 --- a/devtools/client/shared/components/test/node/components/reps/object.test.js +++ b/devtools/client/shared/components/test/node/components/reps/object.test.js @@ -8,11 +8,11 @@ const { shallow } = require("enzyme"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { Obj } = REPS; const { MODE, -} = require("devtools/client/shared/components/reps/reps/constants"); +} = require("resource://devtools/client/shared/components/reps/reps/constants.js"); const renderComponent = (object, props) => { return shallow(Obj.rep({ object, ...props })); @@ -217,129 +217,129 @@ describe("Object - noGrip prop", () => { }); it("Attribute grip", () => { - const stubs = require("devtools/client/shared/components/test/node/stubs/reps/attribute"); + const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/attribute.js"); expect(getRep(stubs.get("Attribute"), undefined, true)).toBe(Obj.rep); }); it("CommentNode grip", () => { - const stubs = require("devtools/client/shared/components/test/node/stubs/reps/comment-node"); + const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/comment-node.js"); expect(getRep(stubs.get("Comment"), undefined, true)).toBe(Obj.rep); }); it("DateTime grip", () => { - const stubs = require("devtools/client/shared/components/test/node/stubs/reps/date-time"); + const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/date-time.js"); expect(getRep(stubs.get("DateTime"), undefined, true)).toBe(Obj.rep); }); it("Document grip", () => { - const stubs = require("devtools/client/shared/components/test/node/stubs/reps/document"); + const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/document.js"); expect(getRep(stubs.get("Document"), undefined, true)).toBe(Obj.rep); }); it("ElementNode grip", () => { - const stubs = require("devtools/client/shared/components/test/node/stubs/reps/element-node"); + const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/element-node.js"); expect(getRep(stubs.get("BodyNode"), undefined, true)).toBe(Obj.rep); }); it("Error grip", () => { - const stubs = require("devtools/client/shared/components/test/node/stubs/reps/error"); + const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/error.js"); expect(getRep(stubs.get("SimpleError"), undefined, true)).toBe(Obj.rep); }); it("Event grip", () => { - const stubs = require("devtools/client/shared/components/test/node/stubs/reps/event"); + const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/event.js"); expect(getRep(stubs.get("testEvent"), undefined, true)).toBe(Obj.rep); }); it("Function grip", () => { - const stubs = require("devtools/client/shared/components/test/node/stubs/reps/function"); + const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/function.js"); expect(getRep(stubs.get("Named"), undefined, true)).toBe(Obj.rep); }); it("Array grip", () => { - const stubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-array"); + const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-array.js"); expect(getRep(stubs.get("testMaxProps"), undefined, true)).toBe(Obj.rep); }); it("Map grip", () => { - const stubs = require("devtools/client/shared/components/test/node/stubs/reps/grip-map"); + const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-map.js"); expect(getRep(stubs.get("testSymbolKeyedMap"), undefined, true)).toBe( Obj.rep ); }); it("Object grip", () => { - const stubs = require("devtools/client/shared/components/test/node/stubs/reps/grip"); + const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip.js"); expect(getRep(stubs.get("testMaxProps"), undefined, true)).toBe(Obj.rep); }); it("Infinity grip", () => { - const stubs = require("devtools/client/shared/components/test/node/stubs/reps/infinity"); + const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/infinity.js"); expect(getRep(stubs.get("Infinity"), undefined, true)).toBe(Obj.rep); }); it("LongString grip", () => { - const stubs = require("devtools/client/shared/components/test/node/stubs/reps/long-string"); + const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/long-string.js"); expect(getRep(stubs.get("testMultiline"), undefined, true)).toBe(Obj.rep); }); it("NaN grip", () => { - const stubs = require("devtools/client/shared/components/test/node/stubs/reps/nan"); + const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/nan.js"); expect(getRep(stubs.get("NaN"), undefined, true)).toBe(Obj.rep); }); it("Null grip", () => { - const stubs = require("devtools/client/shared/components/test/node/stubs/reps/null"); + const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/null.js"); expect(getRep(stubs.get("Null"), undefined, true)).toBe(Obj.rep); }); it("Number grip", () => { - const stubs = require("devtools/client/shared/components/test/node/stubs/reps/number"); + const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/number.js"); expect(getRep(stubs.get("NegZeroGrip"), undefined, true)).toBe(Obj.rep); }); it("ObjectWithText grip", () => { - const stubs = require("devtools/client/shared/components/test/node/stubs/reps/object-with-text"); + const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/object-with-text.js"); expect(getRep(stubs.get("ShadowRule"), undefined, true)).toBe(Obj.rep); }); it("ObjectWithURL grip", () => { - const stubs = require("devtools/client/shared/components/test/node/stubs/reps/object-with-url"); + const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/object-with-url.js"); expect(getRep(stubs.get("ObjectWithUrl"), undefined, true)).toBe(Obj.rep); }); it("Promise grip", () => { - const stubs = require("devtools/client/shared/components/test/node/stubs/reps/promise"); + const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/promise.js"); expect(getRep(stubs.get("Pending"), undefined, true)).toBe(Obj.rep); }); it("RegExp grip", () => { - const stubs = require("devtools/client/shared/components/test/node/stubs/reps/regexp"); + const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/regexp.js"); expect(getRep(stubs.get("RegExp"), undefined, true)).toBe(Obj.rep); }); it("Stylesheet grip", () => { - const stubs = require("devtools/client/shared/components/test/node/stubs/reps/stylesheet"); + const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/stylesheet.js"); expect(getRep(stubs.get("StyleSheet"), undefined, true)).toBe(Obj.rep); }); it("Symbol grip", () => { - const stubs = require("devtools/client/shared/components/test/node/stubs/reps/symbol"); + const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/symbol.js"); expect(getRep(stubs.get("Symbol"), undefined, true)).toBe(Obj.rep); }); it("TextNode grip", () => { - const stubs = require("devtools/client/shared/components/test/node/stubs/reps/text-node"); + const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/text-node.js"); expect(getRep(stubs.get("testRendering"), undefined, true)).toBe(Obj.rep); }); it("Undefined grip", () => { - const stubs = require("devtools/client/shared/components/test/node/stubs/reps/undefined"); + const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/undefined.js"); expect(getRep(stubs.get("Undefined"), undefined, true)).toBe(Obj.rep); }); it("Window grip", () => { - const stubs = require("devtools/client/shared/components/test/node/stubs/reps/window"); + const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/window.js"); expect(getRep(stubs.get("Window"), undefined, true)).toBe(Obj.rep); }); diff --git a/devtools/client/shared/components/test/node/components/reps/promise.test.js b/devtools/client/shared/components/test/node/components/reps/promise.test.js index a99d29b2815f..03862d19f608 100644 --- a/devtools/client/shared/components/test/node/components/reps/promise.test.js +++ b/devtools/client/shared/components/test/node/components/reps/promise.test.js @@ -9,17 +9,17 @@ const { shallow } = require("enzyme"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { PromiseRep } = REPS; const { MODE, -} = require("devtools/client/shared/components/reps/reps/constants"); -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/promise"); +} = require("resource://devtools/client/shared/components/reps/reps/constants.js"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/promise.js"); const { expectActorAttribute, getSelectableInInspectorGrips, getGripLengthBubbleText, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); const renderRep = (object, props) => { return shallow(PromiseRep.rep({ object, ...props })); diff --git a/devtools/client/shared/components/test/node/components/reps/regexp.test.js b/devtools/client/shared/components/test/node/components/reps/regexp.test.js index affeff591cc5..7e1ea841b8cd 100644 --- a/devtools/client/shared/components/test/node/components/reps/regexp.test.js +++ b/devtools/client/shared/components/test/node/components/reps/regexp.test.js @@ -8,15 +8,15 @@ const { shallow } = require("enzyme"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { Rep, RegExp } = REPS; const { ELLIPSIS, -} = require("devtools/client/shared/components/reps/reps/rep-utils"); -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/regexp"); +} = require("resource://devtools/client/shared/components/reps/reps/rep-utils.js"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/regexp.js"); const { expectActorAttribute, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); describe("test RegExp", () => { const stub = stubs.get("RegExp"); diff --git a/devtools/client/shared/components/test/node/components/reps/string-with-url.test.js b/devtools/client/shared/components/test/node/components/reps/string-with-url.test.js index fe167c3286cd..3325469f2683 100644 --- a/devtools/client/shared/components/test/node/components/reps/string-with-url.test.js +++ b/devtools/client/shared/components/test/node/components/reps/string-with-url.test.js @@ -6,11 +6,13 @@ /* global jest */ const { mount } = require("enzyme"); -const { REPS } = require("devtools/client/shared/components/reps/reps/rep"); +const { + REPS, +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { Rep } = REPS; const { getGripLengthBubbleText, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); const renderRep = (string, props) => mount( @@ -544,7 +546,7 @@ describe("test String with URL", () => { }); it("does render a link in a grip array", () => { - const object = require("devtools/client/shared/components/test/node/stubs/reps/grip-array").get( + const object = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip-array.js").get( '["http://example.com/abcdefghijabcdefghij some other text"]' ); const length = getGripLengthBubbleText(object); @@ -578,7 +580,7 @@ describe("test String with URL", () => { }); it("does render a link in a grip object", () => { - const object = require("devtools/client/shared/components/test/node/stubs/reps/grip").get( + const object = require("resource://devtools/client/shared/components/test/node/stubs/reps/grip.js").get( '{test: "http://example.com/ some other text"}' ); const openLink = jest.fn(); diff --git a/devtools/client/shared/components/test/node/components/reps/string.test.js b/devtools/client/shared/components/test/node/components/reps/string.test.js index c8e63fb5d01b..2d86ed5ea888 100644 --- a/devtools/client/shared/components/test/node/components/reps/string.test.js +++ b/devtools/client/shared/components/test/node/components/reps/string.test.js @@ -7,8 +7,10 @@ const { shallow, mount } = require("enzyme"); const { ELLIPSIS, -} = require("devtools/client/shared/components/reps/reps/rep-utils"); -const { REPS } = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep-utils.js"); +const { + REPS, +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { Rep } = REPS; const renderRep = (string, props) => diff --git a/devtools/client/shared/components/test/node/components/reps/stylesheet.test.js b/devtools/client/shared/components/test/node/components/reps/stylesheet.test.js index 20b22d86f088..31c40facfe22 100644 --- a/devtools/client/shared/components/test/node/components/reps/stylesheet.test.js +++ b/devtools/client/shared/components/test/node/components/reps/stylesheet.test.js @@ -8,12 +8,12 @@ const { shallow } = require("enzyme"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { StyleSheet, Rep } = REPS; -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/stylesheet"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/stylesheet.js"); const { expectActorAttribute, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); describe("Test StyleSheet", () => { const stub = stubs.get("StyleSheet")._grip; diff --git a/devtools/client/shared/components/test/node/components/reps/symbol.test.js b/devtools/client/shared/components/test/node/components/reps/symbol.test.js index 0da18211066c..4959e9a8131f 100644 --- a/devtools/client/shared/components/test/node/components/reps/symbol.test.js +++ b/devtools/client/shared/components/test/node/components/reps/symbol.test.js @@ -5,12 +5,14 @@ "use strict"; const { shallow } = require("enzyme"); -const { REPS } = require("devtools/client/shared/components/reps/reps/rep"); +const { + REPS, +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { Rep } = REPS; -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/symbol"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/symbol.js"); const { expectActorAttribute, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); describe("test Symbol", () => { const stub = stubs.get("Symbol"); diff --git a/devtools/client/shared/components/test/node/components/reps/test-helpers.js b/devtools/client/shared/components/test/node/components/reps/test-helpers.js index 3b1c6d1a4aea..d601f71e8830 100644 --- a/devtools/client/shared/components/test/node/components/reps/test-helpers.js +++ b/devtools/client/shared/components/test/node/components/reps/test-helpers.js @@ -8,19 +8,19 @@ const { shallow } = require("enzyme"); const { lengthBubble, -} = require("devtools/client/shared/components/reps/shared/grip-length-bubble"); +} = require("resource://devtools/client/shared/components/reps/shared/grip-length-bubble.js"); const { maxLengthMap: arrayLikeMaxLengthMap, getLength: getArrayLikeLength, -} = require("devtools/client/shared/components/reps/reps/grip-array"); +} = require("resource://devtools/client/shared/components/reps/reps/grip-array.js"); const { maxLengthMap: mapMaxLengths, getLength: getMapLength, -} = require("devtools/client/shared/components/reps/reps/grip-map"); +} = require("resource://devtools/client/shared/components/reps/reps/grip-map.js"); const { getGripPreviewItems, -} = require("devtools/client/shared/components/reps/reps/rep-utils"); -const nodeConstants = require("devtools/client/shared/components/reps/shared/dom-node-constants"); +} = require("resource://devtools/client/shared/components/reps/reps/rep-utils.js"); +const nodeConstants = require("resource://devtools/client/shared/components/reps/shared/dom-node-constants.js"); /** * Get an array of all the items from the grip in parameter (including the grip diff --git a/devtools/client/shared/components/test/node/components/reps/text-node.test.js b/devtools/client/shared/components/test/node/components/reps/text-node.test.js index 024f2e2467e2..5f39d724a63b 100644 --- a/devtools/client/shared/components/test/node/components/reps/text-node.test.js +++ b/devtools/client/shared/components/test/node/components/reps/text-node.test.js @@ -10,19 +10,19 @@ const { shallow } = require("enzyme"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { MODE, -} = require("devtools/client/shared/components/reps/reps/constants"); +} = require("resource://devtools/client/shared/components/reps/reps/constants.js"); const { TextNode } = REPS; -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/text-node"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/text-node.js"); const { expectActorAttribute, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); const { ELLIPSIS, -} = require("devtools/client/shared/components/reps/reps/rep-utils"); +} = require("resource://devtools/client/shared/components/reps/reps/rep-utils.js"); function quoteNewlines(text) { return text.split("\n").join("\\n"); diff --git a/devtools/client/shared/components/test/node/components/reps/undefined.test.js b/devtools/client/shared/components/test/node/components/reps/undefined.test.js index a86d2c7b1f95..56fa512f5588 100644 --- a/devtools/client/shared/components/test/node/components/reps/undefined.test.js +++ b/devtools/client/shared/components/test/node/components/reps/undefined.test.js @@ -9,11 +9,11 @@ const { shallow } = require("enzyme"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { Undefined, Rep } = REPS; -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/undefined"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/undefined.js"); // Test that correct rep is chosen describe("Test Undefined", () => { const stub = stubs.get("Undefined"); diff --git a/devtools/client/shared/components/test/node/components/reps/window.test.js b/devtools/client/shared/components/test/node/components/reps/window.test.js index fde09fe1d0ae..9645ca288c46 100644 --- a/devtools/client/shared/components/test/node/components/reps/window.test.js +++ b/devtools/client/shared/components/test/node/components/reps/window.test.js @@ -9,16 +9,16 @@ const { shallow } = require("enzyme"); const { REPS, getRep, -} = require("devtools/client/shared/components/reps/reps/rep"); +} = require("resource://devtools/client/shared/components/reps/reps/rep.js"); const { MODE, -} = require("devtools/client/shared/components/reps/reps/constants"); +} = require("resource://devtools/client/shared/components/reps/reps/constants.js"); const { Rep, Window } = REPS; -const stubs = require("devtools/client/shared/components/test/node/stubs/reps/window"); +const stubs = require("resource://devtools/client/shared/components/test/node/stubs/reps/window.js"); const { expectActorAttribute, -} = require("devtools/client/shared/components/test/node/components/reps/test-helpers"); +} = require("resource://devtools/client/shared/components/test/node/components/reps/test-helpers.js"); describe("test Window", () => { const stub = stubs.get("Window")._grip; diff --git a/devtools/client/shared/components/test/node/components/tree.test.js b/devtools/client/shared/components/test/node/components/tree.test.js index f92fe7b54918..9f2d1ae91639 100644 --- a/devtools/client/shared/components/test/node/components/tree.test.js +++ b/devtools/client/shared/components/test/node/components/tree.test.js @@ -11,7 +11,9 @@ const { mount } = require("enzyme"); const dom = require("react-dom-factories"); const { Component, createFactory } = React; -const Tree = createFactory(require("devtools/client/shared/components/Tree")); +const Tree = createFactory( + require("resource://devtools/client/shared/components/Tree.js") +); function mountTree(overrides = {}) { return mount( diff --git a/devtools/client/shared/components/test/node/setup.js b/devtools/client/shared/components/test/node/setup.js index eac87b2c7a05..570e4462ae81 100644 --- a/devtools/client/shared/components/test/node/setup.js +++ b/devtools/client/shared/components/test/node/setup.js @@ -11,5 +11,5 @@ Enzyme.configure({ adapter: new Adapter() }); const { setMocksInGlobal, -} = require("devtools/client/shared/test-helpers/shared-node-helpers"); +} = require("resource://devtools/client/shared/test-helpers/shared-node-helpers.js"); setMocksInGlobal(); diff --git a/devtools/client/shared/components/test/node/stubs/reps/grip-array.js b/devtools/client/shared/components/test/node/stubs/reps/grip-array.js index 412efcd7b868..93b07fa13632 100644 --- a/devtools/client/shared/components/test/node/stubs/reps/grip-array.js +++ b/devtools/client/shared/components/test/node/stubs/reps/grip-array.js @@ -6,10 +6,10 @@ const { MODE, -} = require("devtools/client/shared/components/reps/reps/constants"); +} = require("resource://devtools/client/shared/components/reps/reps/constants.js"); const { maxLengthMap, -} = require("devtools/client/shared/components/reps/reps/grip-array"); +} = require("resource://devtools/client/shared/components/reps/reps/grip-array.js"); const stubs = new Map(); stubs.set("testBasic", { diff --git a/devtools/client/shared/components/test/node/stubs/reps/grip-map.js b/devtools/client/shared/components/test/node/stubs/reps/grip-map.js index a123d573b838..8c2af0956f90 100644 --- a/devtools/client/shared/components/test/node/stubs/reps/grip-map.js +++ b/devtools/client/shared/components/test/node/stubs/reps/grip-map.js @@ -6,10 +6,10 @@ const { MODE, -} = require("devtools/client/shared/components/reps/reps/constants"); +} = require("resource://devtools/client/shared/components/reps/reps/constants.js"); const { maxLengthMap, -} = require("devtools/client/shared/components/reps/reps/grip-map"); +} = require("resource://devtools/client/shared/components/reps/reps/grip-map.js"); const stubs = new Map(); diff --git a/devtools/client/shared/components/test/node/stubs/reps/grip.js b/devtools/client/shared/components/test/node/stubs/reps/grip.js index ab9563cf6bc0..69a24013ef8d 100644 --- a/devtools/client/shared/components/test/node/stubs/reps/grip.js +++ b/devtools/client/shared/components/test/node/stubs/reps/grip.js @@ -6,10 +6,10 @@ const { MODE, -} = require("devtools/client/shared/components/reps/reps/constants"); +} = require("resource://devtools/client/shared/components/reps/reps/constants.js"); const { maxLengthMap, -} = require("devtools/client/shared/components/reps/reps/grip"); +} = require("resource://devtools/client/shared/components/reps/reps/grip.js"); const stubs = new Map(); diff --git a/devtools/client/shared/components/throttling/NetworkThrottlingMenu.js b/devtools/client/shared/components/throttling/NetworkThrottlingMenu.js index 008cd0ef412c..f57f76546716 100644 --- a/devtools/client/shared/components/throttling/NetworkThrottlingMenu.js +++ b/devtools/client/shared/components/throttling/NetworkThrottlingMenu.js @@ -4,15 +4,17 @@ "use strict"; -const { PureComponent } = require("devtools/client/shared/vendor/react"); -const dom = require("devtools/client/shared/vendor/react-dom-factories"); -const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); +const { + PureComponent, +} = require("resource://devtools/client/shared/vendor/react.js"); +const dom = require("resource://devtools/client/shared/vendor/react-dom-factories.js"); +const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-types.js"); -const throttlingProfiles = require("devtools/client/shared/components/throttling/profiles"); -const Types = require("devtools/client/shared/components/throttling/types"); +const throttlingProfiles = require("resource://devtools/client/shared/components/throttling/profiles.js"); +const Types = require("resource://devtools/client/shared/components/throttling/types.js"); // Localization -const { LocalizationHelper } = require("devtools/shared/l10n"); +const { LocalizationHelper } = require("resource://devtools/shared/l10n.js"); const L10N = new LocalizationHelper( "devtools/client/locales/network-throttling.properties" ); diff --git a/devtools/client/shared/components/throttling/profiles.js b/devtools/client/shared/components/throttling/profiles.js index d801a67b35fa..85dc3b115847 100644 --- a/devtools/client/shared/components/throttling/profiles.js +++ b/devtools/client/shared/components/throttling/profiles.js @@ -10,7 +10,7 @@ const Bps = 1 / 8; const KBps = K * Bps; const MBps = M * Bps; -const { LocalizationHelper } = require("devtools/shared/l10n"); +const { LocalizationHelper } = require("resource://devtools/shared/l10n.js"); const L10N = new LocalizationHelper( "devtools/client/locales/network-throttling.properties" ); diff --git a/devtools/client/shared/components/throttling/reducer.js b/devtools/client/shared/components/throttling/reducer.js index 7e5b1709d430..ea6408fe9f93 100644 --- a/devtools/client/shared/components/throttling/reducer.js +++ b/devtools/client/shared/components/throttling/reducer.js @@ -6,7 +6,7 @@ const { CHANGE_NETWORK_THROTTLING, -} = require("devtools/client/shared/components/throttling/actions"); +} = require("resource://devtools/client/shared/components/throttling/actions.js"); const INITIAL_STATE = { enabled: false, diff --git a/devtools/client/shared/components/throttling/types.js b/devtools/client/shared/components/throttling/types.js index 3ef7486f7ae2..a54797057dd8 100644 --- a/devtools/client/shared/components/throttling/types.js +++ b/devtools/client/shared/components/throttling/types.js @@ -4,7 +4,7 @@ "use strict"; -const PropTypes = require("devtools/client/shared/vendor/react-prop-types"); +const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-types.js"); /** * Network throttling state. diff --git a/devtools/client/shared/css-angle.js b/devtools/client/shared/css-angle.js index 383f1d36cae8..a039244c12ec 100644 --- a/devtools/client/shared/css-angle.js +++ b/devtools/client/shared/css-angle.js @@ -6,7 +6,7 @@ const SPECIALVALUES = new Set(["initial", "inherit", "unset"]); -const { getCSSLexer } = require("devtools/shared/css/lexer"); +const { getCSSLexer } = require("resource://devtools/shared/css/lexer.js"); loader.lazyRequireGetter( this, diff --git a/devtools/client/shared/devices.js b/devtools/client/shared/devices.js index f0ce19755fd4..7d32bbfcdb19 100644 --- a/devtools/client/shared/devices.js +++ b/devtools/client/shared/devices.js @@ -4,7 +4,7 @@ "use strict"; -const { LocalizationHelper } = require("devtools/shared/l10n"); +const { LocalizationHelper } = require("resource://devtools/shared/l10n.js"); const L10N = new LocalizationHelper( "devtools/client/locales/device.properties" ); diff --git a/devtools/client/shared/fluent-l10n/fluent-l10n.js b/devtools/client/shared/fluent-l10n/fluent-l10n.js index 12e6836da2d8..d3a5c33408d3 100644 --- a/devtools/client/shared/fluent-l10n/fluent-l10n.js +++ b/devtools/client/shared/fluent-l10n/fluent-l10n.js @@ -4,7 +4,7 @@ "use strict"; -const FluentReact = require("devtools/client/shared/vendor/fluent-react"); +const FluentReact = require("resource://devtools/client/shared/vendor/fluent-react.js"); /** * Wrapper over FluentReact. It encapsulates instantiation of the localization diff --git a/devtools/client/shared/inplace-editor.js b/devtools/client/shared/inplace-editor.js index 7192fcee47bd..372cf25c0414 100644 --- a/devtools/client/shared/inplace-editor.js +++ b/devtools/client/shared/inplace-editor.js @@ -22,11 +22,11 @@ "use strict"; const focusManager = Services.focus; -const { KeyCodes } = require("devtools/client/shared/keycodes"); -const EventEmitter = require("devtools/shared/event-emitter"); +const { KeyCodes } = require("resource://devtools/client/shared/keycodes.js"); +const EventEmitter = require("resource://devtools/shared/event-emitter.js"); const { findMostRelevantCssPropertyIndex, -} = require("devtools/client/shared/suggestion-picker"); +} = require("resource://devtools/client/shared/suggestion-picker.js"); const lazy = {}; ChromeUtils.defineModuleGetter( diff --git a/devtools/client/shared/key-shortcuts.js b/devtools/client/shared/key-shortcuts.js index e3f9d3f37bab..765c8e90cc06 100644 --- a/devtools/client/shared/key-shortcuts.js +++ b/devtools/client/shared/key-shortcuts.js @@ -4,9 +4,9 @@ "use strict"; -const EventEmitter = require("devtools/shared/event-emitter"); +const EventEmitter = require("resource://devtools/shared/event-emitter.js"); const isOSX = Services.appinfo.OS === "Darwin"; -const { KeyCodes } = require("devtools/client/shared/keycodes"); +const { KeyCodes } = require("resource://devtools/client/shared/keycodes.js"); // List of electron keys mapped to DOM API (DOM_VK_*) key code const ElectronKeysMapping = { diff --git a/devtools/client/shared/link.js b/devtools/client/shared/link.js index a7034e02611e..952f032d87ab 100644 --- a/devtools/client/shared/link.js +++ b/devtools/client/shared/link.js @@ -4,10 +4,12 @@ "use strict"; -const { gDevTools } = require("devtools/client/framework/devtools"); +const { + gDevTools, +} = require("resource://devtools/client/framework/devtools.js"); const { TabDescriptorFactory, -} = require("devtools/client/framework/tab-descriptor-factory"); +} = require("resource://devtools/client/framework/tab-descriptor-factory.js"); /** * Retrieve the most recent chrome window. diff --git a/devtools/client/shared/output-parser.js b/devtools/client/shared/output-parser.js index ddfcf5f0542c..97939d7a3739 100644 --- a/devtools/client/shared/output-parser.js +++ b/devtools/client/shared/output-parser.js @@ -4,15 +4,19 @@ "use strict"; -const { angleUtils } = require("devtools/client/shared/css-angle"); -const { colorUtils } = require("devtools/shared/css/color"); -const { getCSSLexer } = require("devtools/shared/css/lexer"); -const EventEmitter = require("devtools/shared/event-emitter"); -const { appendText } = require("devtools/client/inspector/shared/utils"); +const { + angleUtils, +} = require("resource://devtools/client/shared/css-angle.js"); +const { colorUtils } = require("resource://devtools/shared/css/color.js"); +const { getCSSLexer } = require("resource://devtools/shared/css/lexer.js"); +const EventEmitter = require("resource://devtools/shared/event-emitter.js"); +const { + appendText, +} = require("resource://devtools/client/inspector/shared/utils.js"); const STYLE_INSPECTOR_PROPERTIES = "devtools/shared/locales/styleinspector.properties"; -const { LocalizationHelper } = require("devtools/shared/l10n"); +const { LocalizationHelper } = require("resource://devtools/shared/l10n.js"); const STYLE_INSPECTOR_L10N = new LocalizationHelper(STYLE_INSPECTOR_PROPERTIES); // Functions that accept an angle argument. diff --git a/devtools/client/shared/prefs.js b/devtools/client/shared/prefs.js index 457326c26238..5bfe115c7ee2 100644 --- a/devtools/client/shared/prefs.js +++ b/devtools/client/shared/prefs.js @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ "use strict"; -const EventEmitter = require("devtools/shared/event-emitter"); +const EventEmitter = require("resource://devtools/shared/event-emitter.js"); /** * Shortcuts for lazily accessing and setting various preferences. diff --git a/devtools/client/shared/redux/create-store.js b/devtools/client/shared/redux/create-store.js index 6b9e35e5a570..ebe0920059bf 100644 --- a/devtools/client/shared/redux/create-store.js +++ b/devtools/client/shared/redux/create-store.js @@ -7,14 +7,20 @@ const { combineReducers, createStore, applyMiddleware, -} = require("devtools/client/shared/vendor/redux"); -const { thunk } = require("devtools/client/shared/redux/middleware/thunk"); +} = require("resource://devtools/client/shared/vendor/redux.js"); +const { + thunk, +} = require("resource://devtools/client/shared/redux/middleware/thunk.js"); const { waitUntilService, -} = require("devtools/client/shared/redux/middleware/wait-service"); -const { task } = require("devtools/client/shared/redux/middleware/task"); -const { promise } = require("devtools/client/shared/redux/middleware/promise"); -const flags = require("devtools/shared/flags"); +} = require("resource://devtools/client/shared/redux/middleware/wait-service.js"); +const { + task, +} = require("resource://devtools/client/shared/redux/middleware/task.js"); +const { + promise, +} = require("resource://devtools/client/shared/redux/middleware/promise.js"); +const flags = require("resource://devtools/shared/flags.js"); loader.lazyRequireGetter( this, diff --git a/devtools/client/shared/redux/middleware/xpcshell/test_middleware-task-01.js b/devtools/client/shared/redux/middleware/xpcshell/test_middleware-task-01.js index 86cb90723493..9edc781b1705 100644 --- a/devtools/client/shared/redux/middleware/xpcshell/test_middleware-task-01.js +++ b/devtools/client/shared/redux/middleware/xpcshell/test_middleware-task-01.js @@ -7,8 +7,10 @@ const { createStore, applyMiddleware, -} = require("devtools/client/shared/vendor/redux"); -const { task } = require("devtools/client/shared/redux/middleware/task"); +} = require("resource://devtools/client/shared/vendor/redux.js"); +const { + task, +} = require("resource://devtools/client/shared/redux/middleware/task.js"); /** * Tests that task middleware allows dispatching generators, promises and objects diff --git a/devtools/client/shared/redux/middleware/xpcshell/test_middleware-task-02.js b/devtools/client/shared/redux/middleware/xpcshell/test_middleware-task-02.js index 1f76e9871b07..ad9a3e0b6db4 100644 --- a/devtools/client/shared/redux/middleware/xpcshell/test_middleware-task-02.js +++ b/devtools/client/shared/redux/middleware/xpcshell/test_middleware-task-02.js @@ -12,8 +12,10 @@ const { createStore, applyMiddleware, -} = require("devtools/client/shared/vendor/redux"); -const { task } = require("devtools/client/shared/redux/middleware/task"); +} = require("resource://devtools/client/shared/vendor/redux.js"); +const { + task, +} = require("resource://devtools/client/shared/redux/middleware/task.js"); add_task(async function() { const store = applyMiddleware(task)(createStore)(reducer); diff --git a/devtools/client/shared/redux/middleware/xpcshell/test_middleware-task-03.js b/devtools/client/shared/redux/middleware/xpcshell/test_middleware-task-03.js index d0f006c3a590..916b7c623145 100644 --- a/devtools/client/shared/redux/middleware/xpcshell/test_middleware-task-03.js +++ b/devtools/client/shared/redux/middleware/xpcshell/test_middleware-task-03.js @@ -7,11 +7,11 @@ const { createStore, applyMiddleware, -} = require("devtools/client/shared/vendor/redux"); +} = require("resource://devtools/client/shared/vendor/redux.js"); const { task, ERROR_TYPE, -} = require("devtools/client/shared/redux/middleware/task"); +} = require("resource://devtools/client/shared/redux/middleware/task.js"); /** * Tests that the middleware handles errors thrown in tasks, and rejected promises. diff --git a/devtools/client/shared/redux/visibility-handler-connect.js b/devtools/client/shared/redux/visibility-handler-connect.js index 8e63c0ec2b3a..85835a1862f6 100644 --- a/devtools/client/shared/redux/visibility-handler-connect.js +++ b/devtools/client/shared/redux/visibility-handler-connect.js @@ -7,11 +7,13 @@ const { createFactory, createElement, -} = require("devtools/client/shared/vendor/react"); +} = require("resource://devtools/client/shared/vendor/react.js"); const VisibilityHandler = createFactory( - require("devtools/client/shared/components/VisibilityHandler") + require("resource://devtools/client/shared/components/VisibilityHandler.js") ); -const { connect } = require("devtools/client/shared/vendor/react-redux"); +const { + connect, +} = require("resource://devtools/client/shared/vendor/react-redux.js"); /** * This helper is wrapping Redux's connect() method and applying diff --git a/devtools/client/shared/remote-debugging/adb/adb-addon.js b/devtools/client/shared/remote-debugging/adb/adb-addon.js index 2c8be594227b..929c47aa620a 100644 --- a/devtools/client/shared/remote-debugging/adb/adb-addon.js +++ b/devtools/client/shared/remote-debugging/adb/adb-addon.js @@ -7,7 +7,7 @@ const { AddonManager } = ChromeUtils.import( "resource://gre/modules/AddonManager.jsm" ); -const EventEmitter = require("devtools/shared/event-emitter"); +const EventEmitter = require("resource://devtools/shared/event-emitter.js"); const PREF_ADB_EXTENSION_URL = "devtools.remote.adb.extensionURL"; const PREF_ADB_EXTENSION_ID = "devtools.remote.adb.extensionID"; diff --git a/devtools/client/shared/remote-debugging/adb/adb-binary.js b/devtools/client/shared/remote-debugging/adb/adb-binary.js index 7738056f6159..9bf6be94f45b 100644 --- a/devtools/client/shared/remote-debugging/adb/adb-binary.js +++ b/devtools/client/shared/remote-debugging/adb/adb-binary.js @@ -4,7 +4,7 @@ "use strict"; -const { dumpn } = require("devtools/shared/DevToolsUtils"); +const { dumpn } = require("resource://devtools/shared/DevToolsUtils.js"); const lazy = {}; diff --git a/devtools/client/shared/remote-debugging/adb/adb-client.js b/devtools/client/shared/remote-debugging/adb/adb-client.js index fbd42e63c115..ff238d6392e0 100644 --- a/devtools/client/shared/remote-debugging/adb/adb-client.js +++ b/devtools/client/shared/remote-debugging/adb/adb-client.js @@ -12,8 +12,8 @@ const { AdbSocket, -} = require("devtools/client/shared/remote-debugging/adb/adb-socket"); -const { dumpn } = require("devtools/shared/DevToolsUtils"); +} = require("resource://devtools/client/shared/remote-debugging/adb/adb-socket.js"); +const { dumpn } = require("resource://devtools/shared/DevToolsUtils.js"); const OKAY = 0x59414b4f; const FAIL = 0x4c494146; diff --git a/devtools/client/shared/remote-debugging/adb/adb-device.js b/devtools/client/shared/remote-debugging/adb/adb-device.js index 3f83572a923a..def22f27c3fd 100644 --- a/devtools/client/shared/remote-debugging/adb/adb-device.js +++ b/devtools/client/shared/remote-debugging/adb/adb-device.js @@ -6,7 +6,7 @@ const { shell, -} = require("devtools/client/shared/remote-debugging/adb/commands/index"); +} = require("resource://devtools/client/shared/remote-debugging/adb/commands/index.js"); /** * A Device instance is created and registered with the Devices module whenever diff --git a/devtools/client/shared/remote-debugging/adb/adb-process.js b/devtools/client/shared/remote-debugging/adb/adb-process.js index 3d0fabaeab15..a1142fb13c0d 100644 --- a/devtools/client/shared/remote-debugging/adb/adb-process.js +++ b/devtools/client/shared/remote-debugging/adb/adb-process.js @@ -4,11 +4,11 @@ "use strict"; -const { dumpn } = require("devtools/shared/DevToolsUtils"); -const EventEmitter = require("devtools/shared/event-emitter"); +const { dumpn } = require("resource://devtools/shared/DevToolsUtils.js"); +const EventEmitter = require("resource://devtools/shared/event-emitter.js"); const { getFileForBinary, -} = require("devtools/client/shared/remote-debugging/adb/adb-binary"); +} = require("resource://devtools/client/shared/remote-debugging/adb/adb-binary.js"); const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm"); loader.lazyRequireGetter( diff --git a/devtools/client/shared/remote-debugging/adb/adb-running-checker.js b/devtools/client/shared/remote-debugging/adb/adb-running-checker.js index bcce50d91c97..8d5617ae6bd8 100644 --- a/devtools/client/shared/remote-debugging/adb/adb-running-checker.js +++ b/devtools/client/shared/remote-debugging/adb/adb-running-checker.js @@ -10,8 +10,8 @@ "use strict"; -const client = require("devtools/client/shared/remote-debugging/adb/adb-client"); -const { dumpn } = require("devtools/shared/DevToolsUtils"); +const client = require("resource://devtools/client/shared/remote-debugging/adb/adb-client.js"); +const { dumpn } = require("resource://devtools/shared/DevToolsUtils.js"); exports.check = async function check() { let socket; diff --git a/devtools/client/shared/remote-debugging/adb/adb-runtime.js b/devtools/client/shared/remote-debugging/adb/adb-runtime.js index 72217a795709..77d39d643ef7 100644 --- a/devtools/client/shared/remote-debugging/adb/adb-runtime.js +++ b/devtools/client/shared/remote-debugging/adb/adb-runtime.js @@ -6,10 +6,10 @@ const { prepareTCPConnection, -} = require("devtools/client/shared/remote-debugging/adb/commands/index"); +} = require("resource://devtools/client/shared/remote-debugging/adb/commands/index.js"); const { shell, -} = require("devtools/client/shared/remote-debugging/adb/commands/index"); +} = require("resource://devtools/client/shared/remote-debugging/adb/commands/index.js"); class AdbRuntime { constructor(adbDevice, socketPath) { diff --git a/devtools/client/shared/remote-debugging/adb/adb-socket.js b/devtools/client/shared/remote-debugging/adb/adb-socket.js index 601a9c4a9ac1..46a9834b36f9 100644 --- a/devtools/client/shared/remote-debugging/adb/adb-socket.js +++ b/devtools/client/shared/remote-debugging/adb/adb-socket.js @@ -4,7 +4,7 @@ "use strict"; -const { dumpn } = require("devtools/shared/DevToolsUtils"); +const { dumpn } = require("resource://devtools/shared/DevToolsUtils.js"); function createTCPSocket(location, port, options) { const { TCPSocket } = Cu.getGlobalForObject( diff --git a/devtools/client/shared/remote-debugging/adb/adb.js b/devtools/client/shared/remote-debugging/adb/adb.js index 27d05571d057..4711a556c7a2 100644 --- a/devtools/client/shared/remote-debugging/adb/adb.js +++ b/devtools/client/shared/remote-debugging/adb/adb.js @@ -8,20 +8,20 @@ const { clearInterval, setInterval } = ChromeUtils.import( "resource://gre/modules/Timer.jsm" ); -const EventEmitter = require("devtools/shared/event-emitter"); +const EventEmitter = require("resource://devtools/shared/event-emitter.js"); const { adbProcess, -} = require("devtools/client/shared/remote-debugging/adb/adb-process"); +} = require("resource://devtools/client/shared/remote-debugging/adb/adb-process.js"); const { adbAddon, -} = require("devtools/client/shared/remote-debugging/adb/adb-addon"); -const AdbDevice = require("devtools/client/shared/remote-debugging/adb/adb-device"); +} = require("resource://devtools/client/shared/remote-debugging/adb/adb-addon.js"); +const AdbDevice = require("resource://devtools/client/shared/remote-debugging/adb/adb-device.js"); const { AdbRuntime, -} = require("devtools/client/shared/remote-debugging/adb/adb-runtime"); +} = require("resource://devtools/client/shared/remote-debugging/adb/adb-runtime.js"); const { TrackDevicesCommand, -} = require("devtools/client/shared/remote-debugging/adb/commands/track-devices"); +} = require("resource://devtools/client/shared/remote-debugging/adb/commands/track-devices.js"); loader.lazyRequireGetter( this, "check", diff --git a/devtools/client/shared/remote-debugging/adb/commands/index.js b/devtools/client/shared/remote-debugging/adb/commands/index.js index ee4e15f9b272..1032f1a4b891 100644 --- a/devtools/client/shared/remote-debugging/adb/commands/index.js +++ b/devtools/client/shared/remote-debugging/adb/commands/index.js @@ -6,19 +6,19 @@ const { listDevices, -} = require("devtools/client/shared/remote-debugging/adb/commands/list-devices"); +} = require("resource://devtools/client/shared/remote-debugging/adb/commands/list-devices.js"); const { prepareTCPConnection, -} = require("devtools/client/shared/remote-debugging/adb/commands/prepare-tcp-connection"); +} = require("resource://devtools/client/shared/remote-debugging/adb/commands/prepare-tcp-connection.js"); const { runCommand, -} = require("devtools/client/shared/remote-debugging/adb/commands/run-command"); +} = require("resource://devtools/client/shared/remote-debugging/adb/commands/run-command.js"); const { shell, -} = require("devtools/client/shared/remote-debugging/adb/commands/shell"); +} = require("resource://devtools/client/shared/remote-debugging/adb/commands/shell.js"); const { TrackDevicesCommand, -} = require("devtools/client/shared/remote-debugging/adb/commands/track-devices"); +} = require("resource://devtools/client/shared/remote-debugging/adb/commands/track-devices.js"); module.exports = { listDevices, diff --git a/devtools/client/shared/remote-debugging/adb/commands/list-devices.js b/devtools/client/shared/remote-debugging/adb/commands/list-devices.js index 32a0f864e81a..727b7b7c2fa2 100644 --- a/devtools/client/shared/remote-debugging/adb/commands/list-devices.js +++ b/devtools/client/shared/remote-debugging/adb/commands/list-devices.js @@ -4,7 +4,7 @@ "use strict"; -const { dumpn } = require("devtools/shared/DevToolsUtils"); +const { dumpn } = require("resource://devtools/shared/DevToolsUtils.js"); /** * The listDevices command is currently unused in DevTools. We are keeping it while * working on RemoteDebugging NG, in case it becomes needed later. We will remove it from diff --git a/devtools/client/shared/remote-debugging/adb/commands/prepare-tcp-connection.js b/devtools/client/shared/remote-debugging/adb/commands/prepare-tcp-connection.js index c371ff5d8363..aaf402e0a7e9 100644 --- a/devtools/client/shared/remote-debugging/adb/commands/prepare-tcp-connection.js +++ b/devtools/client/shared/remote-debugging/adb/commands/prepare-tcp-connection.js @@ -4,10 +4,10 @@ "use strict"; -const { dumpn } = require("devtools/shared/DevToolsUtils"); +const { dumpn } = require("resource://devtools/shared/DevToolsUtils.js"); const { runCommand, -} = require("devtools/client/shared/remote-debugging/adb/commands/run-command"); +} = require("resource://devtools/client/shared/remote-debugging/adb/commands/run-command.js"); // sends adb forward deviceId, localPort and devicePort const forwardPort = function(deviceId, localPort, devicePort) { diff --git a/devtools/client/shared/remote-debugging/adb/commands/run-command.js b/devtools/client/shared/remote-debugging/adb/commands/run-command.js index ce828ff987a3..287386d2b7ba 100644 --- a/devtools/client/shared/remote-debugging/adb/commands/run-command.js +++ b/devtools/client/shared/remote-debugging/adb/commands/run-command.js @@ -6,12 +6,12 @@ "use strict"; -const { dumpn } = require("devtools/shared/DevToolsUtils"); +const { dumpn } = require("resource://devtools/shared/DevToolsUtils.js"); const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm"); const { adbProcess, -} = require("devtools/client/shared/remote-debugging/adb/adb-process"); -const client = require("devtools/client/shared/remote-debugging/adb/adb-client"); +} = require("resource://devtools/client/shared/remote-debugging/adb/adb-process.js"); +const client = require("resource://devtools/client/shared/remote-debugging/adb/adb-client.js"); const OKAY = 0x59414b4f; diff --git a/devtools/client/shared/remote-debugging/adb/commands/shell.js b/devtools/client/shared/remote-debugging/adb/commands/shell.js index dbe1beffe8e6..fb190fbd9b5a 100644 --- a/devtools/client/shared/remote-debugging/adb/commands/shell.js +++ b/devtools/client/shared/remote-debugging/adb/commands/shell.js @@ -6,8 +6,8 @@ "use strict"; -const { dumpn } = require("devtools/shared/DevToolsUtils"); -const client = require("devtools/client/shared/remote-debugging/adb/adb-client"); +const { dumpn } = require("resource://devtools/shared/DevToolsUtils.js"); +const client = require("resource://devtools/client/shared/remote-debugging/adb/adb-client.js"); const OKAY = 0x59414b4f; diff --git a/devtools/client/shared/remote-debugging/adb/commands/track-devices.js b/devtools/client/shared/remote-debugging/adb/commands/track-devices.js index e183c50edbe4..b95519f1487e 100644 --- a/devtools/client/shared/remote-debugging/adb/commands/track-devices.js +++ b/devtools/client/shared/remote-debugging/adb/commands/track-devices.js @@ -6,14 +6,14 @@ "use strict"; -const EventEmitter = require("devtools/shared/event-emitter"); -const { dumpn } = require("devtools/shared/DevToolsUtils"); +const EventEmitter = require("resource://devtools/shared/event-emitter.js"); +const { dumpn } = require("resource://devtools/shared/DevToolsUtils.js"); const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm"); const { adbProcess, -} = require("devtools/client/shared/remote-debugging/adb/adb-process"); -const client = require("devtools/client/shared/remote-debugging/adb/adb-client"); +} = require("resource://devtools/client/shared/remote-debugging/adb/adb-process.js"); +const client = require("resource://devtools/client/shared/remote-debugging/adb/adb-client.js"); const ADB_STATUS_OFFLINE = "offline"; const OKAY = 0x59414b4f; diff --git a/devtools/client/shared/remote-debugging/adb/xpcshell/test_adb.js b/devtools/client/shared/remote-debugging/adb/xpcshell/test_adb.js index b0c1fbb8e70a..8ac5f6c5d7fb 100644 --- a/devtools/client/shared/remote-debugging/adb/xpcshell/test_adb.js +++ b/devtools/client/shared/remote-debugging/adb/xpcshell/test_adb.js @@ -9,16 +9,16 @@ const { ExtensionTestUtils } = ChromeUtils.import( const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const { getFileForBinary, -} = require("devtools/client/shared/remote-debugging/adb/adb-binary"); +} = require("resource://devtools/client/shared/remote-debugging/adb/adb-binary.js"); const { check, -} = require("devtools/client/shared/remote-debugging/adb/adb-running-checker"); +} = require("resource://devtools/client/shared/remote-debugging/adb/adb-running-checker.js"); const { adbProcess, -} = require("devtools/client/shared/remote-debugging/adb/adb-process"); +} = require("resource://devtools/client/shared/remote-debugging/adb/adb-process.js"); const { TrackDevicesCommand, -} = require("devtools/client/shared/remote-debugging/adb/commands/index"); +} = require("resource://devtools/client/shared/remote-debugging/adb/commands/index.js"); const ADB_JSON = { Linux: { diff --git a/devtools/client/shared/remote-debugging/remote-client-manager.js b/devtools/client/shared/remote-debugging/remote-client-manager.js index db5ae34d0706..45e7a1be4a04 100644 --- a/devtools/client/shared/remote-debugging/remote-client-manager.js +++ b/devtools/client/shared/remote-debugging/remote-client-manager.js @@ -6,7 +6,7 @@ const { CONNECTION_TYPES, -} = require("devtools/client/shared/remote-debugging/constants"); +} = require("resource://devtools/client/shared/remote-debugging/constants.js"); /** * This class is designed to be a singleton shared by all DevTools to get access to diff --git a/devtools/client/shared/remote-debugging/test/xpcshell/test_remote_client_manager.js b/devtools/client/shared/remote-debugging/test/xpcshell/test_remote_client_manager.js index 62ea7e8c8d33..62f6fc8ab21e 100644 --- a/devtools/client/shared/remote-debugging/test/xpcshell/test_remote_client_manager.js +++ b/devtools/client/shared/remote-debugging/test/xpcshell/test_remote_client_manager.js @@ -5,10 +5,10 @@ const { remoteClientManager, -} = require("devtools/client/shared/remote-debugging/remote-client-manager"); +} = require("resource://devtools/client/shared/remote-debugging/remote-client-manager.js"); const { CONNECTION_TYPES, -} = require("devtools/client/shared/remote-debugging/constants"); +} = require("resource://devtools/client/shared/remote-debugging/constants.js"); add_task(async function testRemoteClientManager() { for (const type of Object.values(CONNECTION_TYPES)) { @@ -147,7 +147,7 @@ add_task(async function testRemoteClientManagerWithUnknownType() { }); function createFakeClient() { - const EventEmitter = require("devtools/shared/event-emitter"); + const EventEmitter = require("resource://devtools/shared/event-emitter.js"); const client = {}; EventEmitter.decorate(client); diff --git a/devtools/client/shared/remote-debugging/test/xpcshell/test_version_checker.js b/devtools/client/shared/remote-debugging/test/xpcshell/test_version_checker.js index cec6a212c7d5..92f7d54a1e8f 100644 --- a/devtools/client/shared/remote-debugging/test/xpcshell/test_version_checker.js +++ b/devtools/client/shared/remote-debugging/test/xpcshell/test_version_checker.js @@ -6,7 +6,7 @@ const { _compareVersionCompatibility, checkVersionCompatibility, COMPATIBILITY_STATUS, -} = require("devtools/client/shared/remote-debugging/version-checker"); +} = require("resource://devtools/client/shared/remote-debugging/version-checker.js"); const TEST_DATA = [ { diff --git a/devtools/client/shared/screenshot.js b/devtools/client/shared/screenshot.js index 151160a990e9..49b4a718d7fb 100644 --- a/devtools/client/shared/screenshot.js +++ b/devtools/client/shared/screenshot.js @@ -4,7 +4,7 @@ "use strict"; -const { LocalizationHelper } = require("devtools/shared/l10n"); +const { LocalizationHelper } = require("resource://devtools/shared/l10n.js"); const lazy = {}; diff --git a/devtools/client/shared/source-utils.js b/devtools/client/shared/source-utils.js index c060f7880f5f..605c8b1fe0e3 100644 --- a/devtools/client/shared/source-utils.js +++ b/devtools/client/shared/source-utils.js @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ "use strict"; -const { LocalizationHelper } = require("devtools/shared/l10n"); +const { LocalizationHelper } = require("resource://devtools/shared/l10n.js"); const l10n = new LocalizationHelper( "devtools/client/locales/components.properties" diff --git a/devtools/client/shared/sourceeditor/autocomplete.js b/devtools/client/shared/sourceeditor/autocomplete.js index b1f1664f9808..f56acf8fd67b 100644 --- a/devtools/client/shared/sourceeditor/autocomplete.js +++ b/devtools/client/shared/sourceeditor/autocomplete.js @@ -4,7 +4,7 @@ "use strict"; -const AutocompletePopup = require("devtools/client/shared/autocomplete-popup"); +const AutocompletePopup = require("resource://devtools/client/shared/autocomplete-popup.js"); loader.lazyRequireGetter( this, diff --git a/devtools/client/shared/sourceeditor/codemirror/addon/accessibleTextarea.js b/devtools/client/shared/sourceeditor/codemirror/addon/accessibleTextarea.js index 2ab63977f8db..6119ca081882 100644 --- a/devtools/client/shared/sourceeditor/codemirror/addon/accessibleTextarea.js +++ b/devtools/client/shared/sourceeditor/codemirror/addon/accessibleTextarea.js @@ -28,7 +28,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ (function(mod) { - mod(require("devtools/client/shared/sourceeditor/codemirror/lib/codemirror")); + mod(require("resource://devtools/client/shared/sourceeditor/codemirror/lib/codemirror.js")); })(function(CodeMirror) { // CodeMirror uses an offscreen