From ff2cb897ecc056b2ccbf5e387dccb80873986cce Mon Sep 17 00:00:00 2001 From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com> Date: Mon, 3 Mar 2025 12:53:40 -0800 Subject: [PATCH] Move react-dev-tools-core to dev dependencies (#9902) --- ACKNOWLEDGMENTS.md | 4 ---- package.json | 2 +- pnpm-lock.yaml | 6 +++--- ts/windows/main/phase0-devtools.ts | 6 +++++- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ACKNOWLEDGMENTS.md b/ACKNOWLEDGMENTS.md index f66aa623b5..05844639d0 100644 --- a/ACKNOWLEDGMENTS.md +++ b/ACKNOWLEDGMENTS.md @@ -2790,10 +2790,6 @@ Signal Desktop makes use of the following open source projects. OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -## react-devtools-core - - License: MIT - ## react-dom MIT License diff --git a/package.json b/package.json index 7cda9b6c0b..7212d87abd 100644 --- a/package.json +++ b/package.json @@ -179,7 +179,6 @@ "react-aria-components": "1.4.1", "react-blurhash": "0.3.0", "react-contextmenu": "2.14.0", - "react-devtools-core": "6.0.1", "react-dom": "17.0.2", "react-hot-loader": "4.13.1", "react-intl": "6.8.7", @@ -324,6 +323,7 @@ "prettier": "3.3.3", "protobufjs-cli": "1.1.1", "react-devtools": "6.0.1", + "react-devtools-core": "6.0.1", "resedit": "2.0.2", "resolve-url-loader": "5.0.0", "sass": "1.80.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 26c1fac3e4..474efc856e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -307,9 +307,6 @@ importers: react-contextmenu: specifier: 2.14.0 version: 2.14.0(patch_hash=5ec508240616a7d029c1f80185121cada9d4587b179f7c7a7ffa02b6bf02e043)(prop-types@15.8.1)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) - react-devtools-core: - specifier: 6.0.1 - version: 6.0.1(bufferutil@4.0.9)(utf-8-validate@5.0.10) react-dom: specifier: 17.0.2 version: 17.0.2(react@17.0.2) @@ -737,6 +734,9 @@ importers: react-devtools: specifier: 6.0.1 version: 6.0.1(bufferutil@4.0.9)(utf-8-validate@5.0.10) + react-devtools-core: + specifier: 6.0.1 + version: 6.0.1(bufferutil@4.0.9)(utf-8-validate@5.0.10) resedit: specifier: 2.0.2 version: 2.0.2 diff --git a/ts/windows/main/phase0-devtools.ts b/ts/windows/main/phase0-devtools.ts index db082377b9..62d3861c80 100644 --- a/ts/windows/main/phase0-devtools.ts +++ b/ts/windows/main/phase0-devtools.ts @@ -2,13 +2,17 @@ // SPDX-License-Identifier: AGPL-3.0-only import '../context'; -import { initialize, connectToDevTools } from 'react-devtools-core'; import { Environment, getEnvironment } from '../../environment'; if ( getEnvironment() === Environment.Development && Boolean(process.env.REACT_DEVTOOLS) ) { + // Not bundled in the production app + // eslint-disable-next-line max-len + // eslint-disable-next-line global-require, import/no-extraneous-dependencies, @typescript-eslint/no-var-requires + const { initialize, connectToDevTools } = require('react-devtools-core'); + initialize(); connectToDevTools(); }