From ccad545aeb876837167a84864bab9ea6a3a7964a Mon Sep 17 00:00:00 2001 From: Nicolas Chevobbe Date: Tue, 16 Jan 2024 08:31:00 +0000 Subject: [PATCH] Bug 1874363 - [devtools] Remove build-debugger reselect mappings. r=devtools-reviewers,ochameau. Differential Revision: https://phabricator.services.mozilla.com/D198413 --- .../src/components/SecondaryPanes/Breakpoints/Breakpoint.js | 2 +- devtools/client/debugger/src/selectors/breakpointSources.js | 2 +- devtools/client/debugger/src/selectors/breakpoints.js | 2 +- devtools/client/debugger/src/selectors/exceptions.js | 2 +- devtools/client/debugger/src/selectors/expressions.js | 2 +- devtools/client/debugger/src/selectors/pause.js | 2 +- devtools/client/debugger/src/selectors/sources-tree.js | 2 +- devtools/client/debugger/src/selectors/sources.js | 2 +- devtools/client/debugger/src/selectors/tabs.js | 2 +- devtools/client/debugger/src/selectors/threads.js | 2 +- devtools/client/debugger/src/selectors/visibleBreakpoints.js | 2 +- .../client/debugger/src/selectors/visibleColumnBreakpoints.js | 2 +- devtools/client/shared/build/build-debugger.js | 1 - 13 files changed, 12 insertions(+), 13 deletions(-) diff --git a/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/Breakpoint.js b/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/Breakpoint.js index f4c8dce8c0d8..27f6722c96ef 100644 --- a/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/Breakpoint.js +++ b/devtools/client/debugger/src/components/SecondaryPanes/Breakpoints/Breakpoint.js @@ -6,7 +6,7 @@ import React, { PureComponent } from "react"; import { div, input, span } from "react-dom-factories"; import PropTypes from "prop-types"; import { connect } from "../../../utils/connect"; -import { createSelector } from "reselect"; +import { createSelector } from "devtools/client/shared/vendor/reselect"; import actions from "../../../actions"; import { CloseButton } from "../../shared/Button"; diff --git a/devtools/client/debugger/src/selectors/breakpointSources.js b/devtools/client/debugger/src/selectors/breakpointSources.js index 6de277252158..a0daedae21b4 100644 --- a/devtools/client/debugger/src/selectors/breakpointSources.js +++ b/devtools/client/debugger/src/selectors/breakpointSources.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 . */ -import { createSelector } from "reselect"; +import { createSelector } from "devtools/client/shared/vendor/reselect"; import { getSelectedSource } from "./sources"; import { getBreakpointsList } from "./breakpoints"; import { getFilename } from "../utils/source"; diff --git a/devtools/client/debugger/src/selectors/breakpoints.js b/devtools/client/debugger/src/selectors/breakpoints.js index 8eb763667bba..c29a251d83b6 100644 --- a/devtools/client/debugger/src/selectors/breakpoints.js +++ b/devtools/client/debugger/src/selectors/breakpoints.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 . */ -import { createSelector } from "reselect"; +import { createSelector } from "devtools/client/shared/vendor/reselect"; import { makeBreakpointId } from "../utils/breakpoint"; diff --git a/devtools/client/debugger/src/selectors/exceptions.js b/devtools/client/debugger/src/selectors/exceptions.js index 30230706cdde..e1abf9bab83a 100644 --- a/devtools/client/debugger/src/selectors/exceptions.js +++ b/devtools/client/debugger/src/selectors/exceptions.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 . */ -import { createSelector } from "reselect"; +import { createSelector } from "devtools/client/shared/vendor/reselect"; import { shallowEqual, arrayShallowEqual } from "../utils/shallow-equal"; import { getSelectedSource, getSourceActorsForSource } from "./"; diff --git a/devtools/client/debugger/src/selectors/expressions.js b/devtools/client/debugger/src/selectors/expressions.js index 6cbe829943c1..a37c67cc2c0e 100644 --- a/devtools/client/debugger/src/selectors/expressions.js +++ b/devtools/client/debugger/src/selectors/expressions.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 . */ -import { createSelector } from "reselect"; +import { createSelector } from "devtools/client/shared/vendor/reselect"; const getExpressionsWrapper = state => state.expressions; diff --git a/devtools/client/debugger/src/selectors/pause.js b/devtools/client/debugger/src/selectors/pause.js index abc35fcd5c56..a1bccda7c487 100644 --- a/devtools/client/debugger/src/selectors/pause.js +++ b/devtools/client/debugger/src/selectors/pause.js @@ -9,7 +9,7 @@ import { getBlackBoxRanges } from "./source-blackbox"; // eslint-disable-next-line import { getSelectedLocation as _getSelectedLocation } from "../utils/selected-location"; import { isFrameBlackBoxed } from "../utils/source"; -import { createSelector } from "reselect"; +import { createSelector } from "devtools/client/shared/vendor/reselect"; export const getSelectedFrame = createSelector( (state, thread) => state.pause.threads[thread], diff --git a/devtools/client/debugger/src/selectors/sources-tree.js b/devtools/client/debugger/src/selectors/sources-tree.js index 8ef67c93ba71..8fbf16139773 100644 --- a/devtools/client/debugger/src/selectors/sources-tree.js +++ b/devtools/client/debugger/src/selectors/sources-tree.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 . */ -import { createSelector } from "reselect"; +import { createSelector } from "devtools/client/shared/vendor/reselect"; /** * Main selector to build the SourceTree, diff --git a/devtools/client/debugger/src/selectors/sources.js b/devtools/client/debugger/src/selectors/sources.js index 4e8f3cfffc58..e398d3e719e5 100644 --- a/devtools/client/debugger/src/selectors/sources.js +++ b/devtools/client/debugger/src/selectors/sources.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 . */ -import { createSelector } from "reselect"; +import { createSelector } from "devtools/client/shared/vendor/reselect"; import { getPrettySourceURL, isPretty, isJavaScript } from "../utils/source"; diff --git a/devtools/client/debugger/src/selectors/tabs.js b/devtools/client/debugger/src/selectors/tabs.js index f810adfdeea2..822bb7f49ae0 100644 --- a/devtools/client/debugger/src/selectors/tabs.js +++ b/devtools/client/debugger/src/selectors/tabs.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 . */ -import { createSelector } from "reselect"; +import { createSelector } from "devtools/client/shared/vendor/reselect"; import { getPrettySourceURL } from "../utils/source"; import { getSpecificSourceByURL } from "./sources"; diff --git a/devtools/client/debugger/src/selectors/threads.js b/devtools/client/debugger/src/selectors/threads.js index 8e3054ce7a7f..931af555a3b4 100644 --- a/devtools/client/debugger/src/selectors/threads.js +++ b/devtools/client/debugger/src/selectors/threads.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 . */ -import { createSelector } from "reselect"; +import { createSelector } from "devtools/client/shared/vendor/reselect"; import { parse } from "../utils/url"; export const getThreads = createSelector( diff --git a/devtools/client/debugger/src/selectors/visibleBreakpoints.js b/devtools/client/debugger/src/selectors/visibleBreakpoints.js index 663cfab8c75d..5b07cb07a95a 100644 --- a/devtools/client/debugger/src/selectors/visibleBreakpoints.js +++ b/devtools/client/debugger/src/selectors/visibleBreakpoints.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 . */ -import { createSelector } from "reselect"; +import { createSelector } from "devtools/client/shared/vendor/reselect"; import { getBreakpointsList } from "./breakpoints"; import { getSelectedSource } from "./sources"; diff --git a/devtools/client/debugger/src/selectors/visibleColumnBreakpoints.js b/devtools/client/debugger/src/selectors/visibleColumnBreakpoints.js index 587dec1a06f1..ce463bea1481 100644 --- a/devtools/client/debugger/src/selectors/visibleColumnBreakpoints.js +++ b/devtools/client/debugger/src/selectors/visibleColumnBreakpoints.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 . */ -import { createSelector } from "reselect"; +import { createSelector } from "devtools/client/shared/vendor/reselect"; import { getViewport, diff --git a/devtools/client/shared/build/build-debugger.js b/devtools/client/shared/build/build-debugger.js index 5e627b5a9c81..f2a9e0460d3b 100644 --- a/devtools/client/shared/build/build-debugger.js +++ b/devtools/client/shared/build/build-debugger.js @@ -14,7 +14,6 @@ const mappings = { "react-dom-factories": "devtools/client/shared/vendor/react-dom-factories", "react-redux": "devtools/client/shared/vendor/react-redux", redux: "devtools/client/shared/vendor/redux", - reselect: "devtools/client/shared/vendor/reselect", "prop-types": "devtools/client/shared/vendor/react-prop-types", "wasmparser/dist/cjs/WasmParser": "devtools/client/shared/vendor/WasmParser", "wasmparser/dist/cjs/WasmDis": "devtools/client/shared/vendor/WasmDis",