From 135b71ee5773ec70479bdd1492a0475f0121961a Mon Sep 17 00:00:00 2001 From: dperolio Date: Wed, 20 Oct 2021 21:26:36 -0400 Subject: [PATCH] remove react-highlighter-ts package that was breaking Settings page --- package-lock.json | 17 -------- package.json | 1 - .../builtins/settings/components/Account.jsx | 11 +---- .../builtins/settings/components/Advanced.jsx | 17 +++----- .../settings/components/Appearance.jsx | 11 +---- .../builtins/settings/components/Commands.jsx | 21 +++------ .../settings/components/Developer.jsx | 37 ++++------------ .../builtins/settings/components/General.jsx | 43 ++++--------------- .../builtins/settings/components/Keybinds.jsx | 11 +---- .../settings/components/Notifications.jsx | 11 +---- 10 files changed, 36 insertions(+), 144 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1c916267..86ceb54e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1857,23 +1857,6 @@ "inherits": "~2.0.3" } }, - "react": { - "version": "17.0.2", - "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz", - "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==", - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1" - } - }, - "react-highlighter-ts": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/react-highlighter-ts/-/react-highlighter-ts-2.2.0.tgz", - "integrity": "sha512-wZgYrOq6bO1O1szjyduvqeiuV1DuZbKb22FvbclXEhyG5rw9vFaJhdO420RwBvDkD4DvFnDLX4hFuAOg0aQkXA==", - "requires": { - "react": "^17.0.1" - } - }, "react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", diff --git a/package.json b/package.json index 20e4e48a..a4bb4b3a 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,6 @@ "mime-types": "^2.1.31", "module-alias": "^2.2.2", "pluralize": "^8.0.0", - "react-highlighter-ts": "^2.2.0", "react-is": "^17.0.2", "react-markdown": "^6.0.2", "react-toastify": "^7.0.4", diff --git a/src/core/builtins/settings/components/Account.jsx b/src/core/builtins/settings/components/Account.jsx index 2f17391f..55dcb2af 100644 --- a/src/core/builtins/settings/components/Account.jsx +++ b/src/core/builtins/settings/components/Account.jsx @@ -1,5 +1,4 @@ import { SwitchItem } from '@vizality/components/settings'; -import { Highlight } from 'react-highlighter-ts/dist/lib'; import React, { memo, useEffect } from 'react'; import { useFilter } from '@vizality/hooks'; import { Messages } from '@vizality/i18n'; @@ -13,19 +12,13 @@ export default memo(({ builtin, search = '' }) => { ], render: query => - {Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_DESC} - - } + description={Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_DESC} value={true} onChange={() => void 0} info={Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_INFO.format()} requiresRestart > - - {Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW} - + {Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW} } ]; diff --git a/src/core/builtins/settings/components/Advanced.jsx b/src/core/builtins/settings/components/Advanced.jsx index 7347d45e..281020b0 100644 --- a/src/core/builtins/settings/components/Advanced.jsx +++ b/src/core/builtins/settings/components/Advanced.jsx @@ -1,5 +1,4 @@ import { SwitchItem } from '@vizality/components/settings'; -import { Highlight } from 'react-highlighter-ts/dist/lib'; import React, { memo, useEffect } from 'react'; import { useFilter } from '@vizality/hooks'; import { Messages } from '@vizality/i18n'; @@ -19,7 +18,7 @@ export default memo(({ builtin, search = '' }) => { ], render: query => {Messages.VIZALITY_SETTINGS_SMOOTH_SCROLLING_DESC}} + description={Messages.VIZALITY_SETTINGS_SMOOTH_SCROLLING_DESC} value={smoothScrolling} onChange={() => setSmoothScrolling(!smoothScrolling)} help={Messages.VIZALITY_SETTINGS_SMOOTH_SCROLLING_HELP} @@ -36,7 +35,7 @@ export default memo(({ builtin, search = '' }) => { ], render: query => {Messages.VIZALITY_SETTINGS_DEBUG_LOGS_DESC}} + description={Messages.VIZALITY_SETTINGS_DEBUG_LOGS_DESC} value={debugLogs} onChange={() => setDebugLogs(!debugLogs)} requiresRestart @@ -52,13 +51,11 @@ export default memo(({ builtin, search = '' }) => { ], render: query => {Messages.VIZALITY_SETTINGS_KEEP_TOKEN_DESC}} + description={Messages.VIZALITY_SETTINGS_KEEP_TOKEN_DESC} value={hideToken} onChange={() => setHideToken(!hideToken)} > - - {Messages.VIZALITY_SETTINGS_KEEP_TOKEN} - + {Messages.VIZALITY_SETTINGS_KEEP_TOKEN} }, { @@ -69,14 +66,12 @@ export default memo(({ builtin, search = '' }) => { ], render: query => {Messages.VIZALITY_SETTINGS_EXP_WEB_PLATFORM_DESC}} + description={Messages.VIZALITY_SETTINGS_EXP_WEB_PLATFORM_DESC} value={experimentalWebPlatform} onChange={() => setExperimentalWebPlatform(!experimentalWebPlatform)} requiresRestart > - - {Messages.VIZALITY_SETTINGS_EXP_WEB_PLATFORM} - + {Messages.VIZALITY_SETTINGS_EXP_WEB_PLATFORM} } ]; diff --git a/src/core/builtins/settings/components/Appearance.jsx b/src/core/builtins/settings/components/Appearance.jsx index 2f17391f..55dcb2af 100644 --- a/src/core/builtins/settings/components/Appearance.jsx +++ b/src/core/builtins/settings/components/Appearance.jsx @@ -1,5 +1,4 @@ import { SwitchItem } from '@vizality/components/settings'; -import { Highlight } from 'react-highlighter-ts/dist/lib'; import React, { memo, useEffect } from 'react'; import { useFilter } from '@vizality/hooks'; import { Messages } from '@vizality/i18n'; @@ -13,19 +12,13 @@ export default memo(({ builtin, search = '' }) => { ], render: query => - {Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_DESC} - - } + description={Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_DESC} value={true} onChange={() => void 0} info={Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_INFO.format()} requiresRestart > - - {Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW} - + {Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW} } ]; diff --git a/src/core/builtins/settings/components/Commands.jsx b/src/core/builtins/settings/components/Commands.jsx index 1d7ec186..f8d1d489 100644 --- a/src/core/builtins/settings/components/Commands.jsx +++ b/src/core/builtins/settings/components/Commands.jsx @@ -1,5 +1,4 @@ import { TextInput, SwitchItem } from '@vizality/components/settings'; -import { Highlight } from 'react-highlighter-ts/dist/lib'; import React, { memo, useEffect } from 'react'; import { useFilter } from '@vizality/hooks'; import { Messages } from '@vizality/i18n'; @@ -25,9 +24,7 @@ export default memo(({ builtin, search = '' }) => { onBlur={({ target }) => target.value = commandPrefix} error={commandPrefix === '/' ? 'Prefix should not be set to `/` as it is already in use by Discord and may disable Vizality autocompletions.' : ''} > - - {Messages.VIZALITY_COMMAND_PREFIX} - + {Messages.VIZALITY_COMMAND_PREFIX} }, { @@ -40,20 +37,14 @@ export default memo(({ builtin, search = '' }) => { ], render: query => - {Messages.VIZALITY_SETTINGS_NO_CLYDE_DESC.format({ - discordiaUrl: 'https://discordia.me/clyde', - apiUrl: `${window.location.origin}/vizality/docs` - })} - - } + description={Messages.VIZALITY_SETTINGS_NO_CLYDE_DESC.format({ + discordiaUrl: 'https://discordia.me/clyde', + apiUrl: `${window.location.origin}/vizality/docs` + })} value={replaceClyde} onChange={() => setReplaceClyde(!replaceClyde)} > - - {Messages.VIZALITY_SETTINGS_NO_CLYDE} - + {Messages.VIZALITY_SETTINGS_NO_CLYDE} } ]; diff --git a/src/core/builtins/settings/components/Developer.jsx b/src/core/builtins/settings/components/Developer.jsx index 839b6c5d..fadc9aaa 100644 --- a/src/core/builtins/settings/components/Developer.jsx +++ b/src/core/builtins/settings/components/Developer.jsx @@ -1,5 +1,4 @@ import { SwitchItem } from '@vizality/components/settings'; -import { Highlight } from 'react-highlighter-ts/dist/lib'; import React, { memo, useEffect } from 'react'; import { getModule } from '@vizality/webpack'; import { useFilter } from '@vizality/hooks'; @@ -19,15 +18,13 @@ export default memo(({ builtin, search = '' }) => { ], render: query => {Messages.VIZALITY_SETTINGS_REACT_DEVELOPER_TOOLS_DESC}} + description={Messages.VIZALITY_SETTINGS_REACT_DEVELOPER_TOOLS_DESC} value={reactDeveloperTools} onChange={() => setReactDeveloperTools(!reactDeveloperTools)} info={Messages.VIZALITY_SETTINGS_REACT_DEVELOPER_TOOLS_WARNING} requiresRestart > - - {Messages.VIZALITY_SETTINGS_REACT_DEVELOPER_TOOLS} - + {Messages.VIZALITY_SETTINGS_REACT_DEVELOPER_TOOLS} }, { @@ -37,20 +34,14 @@ export default memo(({ builtin, search = '' }) => { ], render: query => - {Messages.VIZALITY_SETTINGS_PLUGIN_HOT_RELOAD_DESC} - - } + description={Messages.VIZALITY_SETTINGS_PLUGIN_HOT_RELOAD_DESC} value={hotReload} onChange={async () => { setHotReload(!hotReload); await vizality.manager.plugins.remountAll(); }} > - - {Messages.VIZALITY_SETTINGS_PLUGIN_HOT_RELOAD} - + {Messages.VIZALITY_SETTINGS_PLUGIN_HOT_RELOAD} }, { @@ -60,17 +51,11 @@ export default memo(({ builtin, search = '' }) => { ], render: query => - {Messages.VIZALITY_SETTINGS_OVERLAY_DESC} - - } + description={Messages.VIZALITY_SETTINGS_OVERLAY_DESC} value={openOverlayDevTools} onChange={() => setOpenOverlayDevTools(!openOverlayDevTools)} > - - {Messages.VIZALITY_SETTINGS_OVERLAY} - + {Messages.VIZALITY_SETTINGS_OVERLAY} }, { @@ -80,11 +65,7 @@ export default memo(({ builtin, search = '' }) => { ], render: query => - {Messages.VIZALITY_SETTINGS_DISCORD_EXPERIMENTS_DESC.format()} - - } + description={Messages.VIZALITY_SETTINGS_DISCORD_EXPERIMENTS_DESC.format()} value={discordExperiments} onChange={() => { setDiscordExperiments(!discordExperiments); @@ -92,9 +73,7 @@ export default memo(({ builtin, search = '' }) => { experimentsModule._changeCallbacks.forEach(cb => cb()); }} > - - {Messages.VIZALITY_SETTINGS_DISCORD_EXPERIMENTS} - + {Messages.VIZALITY_SETTINGS_DISCORD_EXPERIMENTS} } ]; diff --git a/src/core/builtins/settings/components/General.jsx b/src/core/builtins/settings/components/General.jsx index b7e02d14..897adab8 100644 --- a/src/core/builtins/settings/components/General.jsx +++ b/src/core/builtins/settings/components/General.jsx @@ -5,7 +5,6 @@ import { removeDirRecursive } from '@vizality/util/file'; import React, { memo, useState, useEffect } from 'react'; import { Messages, chosenLocale } from '@vizality/i18n'; import { joinClassNames } from '@vizality/util/dom'; -import { Highlight } from 'react-highlighter-ts/dist/lib'; import { getModule } from '@vizality/webpack'; import { readdirSync, existsSync } from 'fs'; import { useFilter } from '@vizality/hooks'; @@ -199,19 +198,13 @@ export default memo(({ builtin, search = '' }) => { ], render: query => - {Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_DESC} - - } + description={Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_DESC} value={transparentWindow} onChange={() => setTransparentWindow(!transparentWindow)} info={Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_INFO.format()} requiresRestart > - - {Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW} - + {Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW} }, { @@ -222,18 +215,12 @@ export default memo(({ builtin, search = '' }) => { ], render: query => - {Messages.VIZALITY_SETTINGS_CACHE_VIZALITY_DESC} - - } + note={Messages.VIZALITY_SETTINGS_CACHE_VIZALITY_DESC} button={isVizalityCacheCleared ? Messages.VIZALITY_SETTINGS_CACHE_CLEARED : Messages.VIZALITY_SETTINGS_CACHE_VIZALITY} success={isVizalityCacheCleared} onClick={() => clearVizalityCache()} > - - {Messages.VIZALITY_SETTINGS_CACHE_VIZALITY} - + {Messages.VIZALITY_SETTINGS_CACHE_VIZALITY} }, { @@ -244,18 +231,12 @@ export default memo(({ builtin, search = '' }) => { ], render: query => - {Messages.VIZALITY_SETTINGS_CACHE_DISCORD_DESC} - - } + note={Messages.VIZALITY_SETTINGS_CACHE_DISCORD_DESC} button={isDiscordCacheCleared ? Messages.VIZALITY_SETTINGS_CACHE_CLEARED : Messages.VIZALITY_SETTINGS_CACHE_DISCORD} success={isDiscordCacheCleared} onClick={() => clearDiscordCache()} > - - {Messages.VIZALITY_SETTINGS_CACHE_DISCORD} - + {Messages.VIZALITY_SETTINGS_CACHE_DISCORD} }, { @@ -267,16 +248,8 @@ export default memo(({ builtin, search = '' }) => { render: query => - {Messages.VIZALITY_UPDATES_OPTS_DEBUG} - - } - description={ - - {Messages.VIZALITY_UPDATES_OPTS_DEBUG_DESC} - - } + title={Messages.VIZALITY_UPDATES_OPTS_DEBUG} + description={Messages.VIZALITY_UPDATES_OPTS_DEBUG_DESC} > {renderDebugInfo()} diff --git a/src/core/builtins/settings/components/Keybinds.jsx b/src/core/builtins/settings/components/Keybinds.jsx index 2f17391f..55dcb2af 100644 --- a/src/core/builtins/settings/components/Keybinds.jsx +++ b/src/core/builtins/settings/components/Keybinds.jsx @@ -1,5 +1,4 @@ import { SwitchItem } from '@vizality/components/settings'; -import { Highlight } from 'react-highlighter-ts/dist/lib'; import React, { memo, useEffect } from 'react'; import { useFilter } from '@vizality/hooks'; import { Messages } from '@vizality/i18n'; @@ -13,19 +12,13 @@ export default memo(({ builtin, search = '' }) => { ], render: query => - {Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_DESC} - - } + description={Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_DESC} value={true} onChange={() => void 0} info={Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_INFO.format()} requiresRestart > - - {Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW} - + {Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW} } ]; diff --git a/src/core/builtins/settings/components/Notifications.jsx b/src/core/builtins/settings/components/Notifications.jsx index 2f17391f..55dcb2af 100644 --- a/src/core/builtins/settings/components/Notifications.jsx +++ b/src/core/builtins/settings/components/Notifications.jsx @@ -1,5 +1,4 @@ import { SwitchItem } from '@vizality/components/settings'; -import { Highlight } from 'react-highlighter-ts/dist/lib'; import React, { memo, useEffect } from 'react'; import { useFilter } from '@vizality/hooks'; import { Messages } from '@vizality/i18n'; @@ -13,19 +12,13 @@ export default memo(({ builtin, search = '' }) => { ], render: query => - {Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_DESC} - - } + description={Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_DESC} value={true} onChange={() => void 0} info={Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_INFO.format()} requiresRestart > - - {Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW} - + {Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW} } ];