Mirrors
/
vizality
mirror of https://github.com/vizality/vizality
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove react-highlighter-ts package that was breaking Settings page

Browse Source
development
dperolio 3 years ago
parent 48076bb23d
commit 135b71ee57
10 changed files with 36 additions and 144 deletions
Show Stats Download Patch File Download Diff File

17
package-lock.json generated
Unescape View File

@ -1857,23 +1857,6 @@
"inherits": "~2.0.3" "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": { "react-is": {
"version": "17.0.2", "version": "17.0.2",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",

1
package.json
Unescape View File

@ -101,7 +101,6 @@
"mime-types": "^2.1.31", "mime-types": "^2.1.31",
"module-alias": "^2.2.2", "module-alias": "^2.2.2",
"pluralize": "^8.0.0", "pluralize": "^8.0.0",
"react-highlighter-ts": "^2.2.0",
"react-is": "^17.0.2", "react-is": "^17.0.2",
"react-markdown": "^6.0.2", "react-markdown": "^6.0.2",
"react-toastify": "^7.0.4", "react-toastify": "^7.0.4",

11
src/core/builtins/settings/components/Account.jsx
Unescape View File

@ -1,5 +1,4 @@
import { SwitchItem } from '@vizality/components/settings'; import { SwitchItem } from '@vizality/components/settings';
import { Highlight } from 'react-highlighter-ts/dist/lib';
import React, { memo, useEffect } from 'react'; import React, { memo, useEffect } from 'react';
import { useFilter } from '@vizality/hooks'; import { useFilter } from '@vizality/hooks';
import { Messages } from '@vizality/i18n'; import { Messages } from '@vizality/i18n';
@ -13,19 +12,13 @@ export default memo(({ builtin, search = '' }) => {
], ],
render: query => render: query =>
<SwitchItem <SwitchItem
description={ description={Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_DESC}
<Highlight search={query}>
{Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_DESC}
</Highlight>
}
value={true} value={true}
onChange={() => void 0} onChange={() => void 0}
info={Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_INFO.format()} info={Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_INFO.format()}
requiresRestart requiresRestart
> >
<Highlight search={query}> {Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW}
{Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW}
</Highlight>
</SwitchItem> </SwitchItem>
} }
]; ];

17
src/core/builtins/settings/components/Advanced.jsx
Unescape View File

@ -1,5 +1,4 @@
import { SwitchItem } from '@vizality/components/settings'; import { SwitchItem } from '@vizality/components/settings';
import { Highlight } from 'react-highlighter-ts/dist/lib';
import React, { memo, useEffect } from 'react'; import React, { memo, useEffect } from 'react';
import { useFilter } from '@vizality/hooks'; import { useFilter } from '@vizality/hooks';
import { Messages } from '@vizality/i18n'; import { Messages } from '@vizality/i18n';
@ -19,7 +18,7 @@ export default memo(({ builtin, search = '' }) => {
], ],
render: query => render: query =>
<SwitchItem <SwitchItem
description={<Highlight search={query}>{Messages.VIZALITY_SETTINGS_SMOOTH_SCROLLING_DESC}</Highlight>} description={Messages.VIZALITY_SETTINGS_SMOOTH_SCROLLING_DESC}
value={smoothScrolling} value={smoothScrolling}
onChange={() => setSmoothScrolling(!smoothScrolling)} onChange={() => setSmoothScrolling(!smoothScrolling)}
help={Messages.VIZALITY_SETTINGS_SMOOTH_SCROLLING_HELP} help={Messages.VIZALITY_SETTINGS_SMOOTH_SCROLLING_HELP}
@ -36,7 +35,7 @@ export default memo(({ builtin, search = '' }) => {
], ],
render: query => render: query =>
<SwitchItem <SwitchItem
description={<Highlight search={query}>{Messages.VIZALITY_SETTINGS_DEBUG_LOGS_DESC}</Highlight>} description={Messages.VIZALITY_SETTINGS_DEBUG_LOGS_DESC}
value={debugLogs} value={debugLogs}
onChange={() => setDebugLogs(!debugLogs)} onChange={() => setDebugLogs(!debugLogs)}
requiresRestart requiresRestart
@ -52,13 +51,11 @@ export default memo(({ builtin, search = '' }) => {
], ],
render: query => render: query =>
<SwitchItem <SwitchItem
description={<Highlight search={query}>{Messages.VIZALITY_SETTINGS_KEEP_TOKEN_DESC}</Highlight>} description={Messages.VIZALITY_SETTINGS_KEEP_TOKEN_DESC}
value={hideToken} value={hideToken}
onChange={() => setHideToken(!hideToken)} onChange={() => setHideToken(!hideToken)}
> >
<Highlight search={query}> {Messages.VIZALITY_SETTINGS_KEEP_TOKEN}
{Messages.VIZALITY_SETTINGS_KEEP_TOKEN}
</Highlight>
</SwitchItem> </SwitchItem>
}, },
{ {
@ -69,14 +66,12 @@ export default memo(({ builtin, search = '' }) => {
], ],
render: query => render: query =>
<SwitchItem <SwitchItem
description={<Highlight search={query}>{Messages.VIZALITY_SETTINGS_EXP_WEB_PLATFORM_DESC}</Highlight>} description={Messages.VIZALITY_SETTINGS_EXP_WEB_PLATFORM_DESC}
value={experimentalWebPlatform} value={experimentalWebPlatform}
onChange={() => setExperimentalWebPlatform(!experimentalWebPlatform)} onChange={() => setExperimentalWebPlatform(!experimentalWebPlatform)}
requiresRestart requiresRestart
> >
<Highlight search={query}> {Messages.VIZALITY_SETTINGS_EXP_WEB_PLATFORM}
{Messages.VIZALITY_SETTINGS_EXP_WEB_PLATFORM}
</Highlight>
</SwitchItem> </SwitchItem>
} }
]; ];

11
src/core/builtins/settings/components/Appearance.jsx
Unescape View File

@ -1,5 +1,4 @@
import { SwitchItem } from '@vizality/components/settings'; import { SwitchItem } from '@vizality/components/settings';
import { Highlight } from 'react-highlighter-ts/dist/lib';
import React, { memo, useEffect } from 'react'; import React, { memo, useEffect } from 'react';
import { useFilter } from '@vizality/hooks'; import { useFilter } from '@vizality/hooks';
import { Messages } from '@vizality/i18n'; import { Messages } from '@vizality/i18n';
@ -13,19 +12,13 @@ export default memo(({ builtin, search = '' }) => {
], ],
render: query => render: query =>
<SwitchItem <SwitchItem
description={ description={Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_DESC}
<Highlight search={query}>
{Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_DESC}
</Highlight>
}
value={true} value={true}
onChange={() => void 0} onChange={() => void 0}
info={Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_INFO.format()} info={Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_INFO.format()}
requiresRestart requiresRestart
> >
<Highlight search={query}> {Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW}
{Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW}
</Highlight>
</SwitchItem> </SwitchItem>
} }
]; ];

21
src/core/builtins/settings/components/Commands.jsx
Unescape View File

@ -1,5 +1,4 @@
import { TextInput, SwitchItem } from '@vizality/components/settings'; import { TextInput, SwitchItem } from '@vizality/components/settings';
import { Highlight } from 'react-highlighter-ts/dist/lib';
import React, { memo, useEffect } from 'react'; import React, { memo, useEffect } from 'react';
import { useFilter } from '@vizality/hooks'; import { useFilter } from '@vizality/hooks';
import { Messages } from '@vizality/i18n'; import { Messages } from '@vizality/i18n';
@ -25,9 +24,7 @@ export default memo(({ builtin, search = '' }) => {
onBlur={({ target }) => target.value = commandPrefix} 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.' : ''} error={commandPrefix === '/' ? 'Prefix should not be set to `/` as it is already in use by Discord and may disable Vizality autocompletions.' : ''}
> >
<Highlight search={query}> {Messages.VIZALITY_COMMAND_PREFIX}
{Messages.VIZALITY_COMMAND_PREFIX}
</Highlight>
</TextInput> </TextInput>
}, },
{ {
@ -40,20 +37,14 @@ export default memo(({ builtin, search = '' }) => {
], ],
render: query => render: query =>
<SwitchItem <SwitchItem
description={ description={Messages.VIZALITY_SETTINGS_NO_CLYDE_DESC.format({
<Highlight search={query}> discordiaUrl: 'https://discordia.me/clyde',
{Messages.VIZALITY_SETTINGS_NO_CLYDE_DESC.format({ apiUrl: `${window.location.origin}/vizality/docs`
discordiaUrl: 'https://discordia.me/clyde', })}
apiUrl: `${window.location.origin}/vizality/docs`
})}
</Highlight>
}
value={replaceClyde} value={replaceClyde}
onChange={() => setReplaceClyde(!replaceClyde)} onChange={() => setReplaceClyde(!replaceClyde)}
> >
<Highlight search={query}> {Messages.VIZALITY_SETTINGS_NO_CLYDE}
{Messages.VIZALITY_SETTINGS_NO_CLYDE}
</Highlight>
</SwitchItem> </SwitchItem>
} }
]; ];

37
src/core/builtins/settings/components/Developer.jsx
Unescape View File

@ -1,5 +1,4 @@
import { SwitchItem } from '@vizality/components/settings'; import { SwitchItem } from '@vizality/components/settings';
import { Highlight } from 'react-highlighter-ts/dist/lib';
import React, { memo, useEffect } from 'react'; import React, { memo, useEffect } from 'react';
import { getModule } from '@vizality/webpack'; import { getModule } from '@vizality/webpack';
import { useFilter } from '@vizality/hooks'; import { useFilter } from '@vizality/hooks';
@ -19,15 +18,13 @@ export default memo(({ builtin, search = '' }) => {
], ],
render: query => render: query =>
<SwitchItem <SwitchItem
description={<Highlight search={query}>{Messages.VIZALITY_SETTINGS_REACT_DEVELOPER_TOOLS_DESC}</Highlight>} description={Messages.VIZALITY_SETTINGS_REACT_DEVELOPER_TOOLS_DESC}
value={reactDeveloperTools} value={reactDeveloperTools}
onChange={() => setReactDeveloperTools(!reactDeveloperTools)} onChange={() => setReactDeveloperTools(!reactDeveloperTools)}
info={Messages.VIZALITY_SETTINGS_REACT_DEVELOPER_TOOLS_WARNING} info={Messages.VIZALITY_SETTINGS_REACT_DEVELOPER_TOOLS_WARNING}
requiresRestart requiresRestart
> >
<Highlight search={query}> {Messages.VIZALITY_SETTINGS_REACT_DEVELOPER_TOOLS}
{Messages.VIZALITY_SETTINGS_REACT_DEVELOPER_TOOLS}
</Highlight>
</SwitchItem> </SwitchItem>
}, },
{ {
@ -37,20 +34,14 @@ export default memo(({ builtin, search = '' }) => {
], ],
render: query => render: query =>
<SwitchItem <SwitchItem
description={ description={Messages.VIZALITY_SETTINGS_PLUGIN_HOT_RELOAD_DESC}
<Highlight search={query}>
{Messages.VIZALITY_SETTINGS_PLUGIN_HOT_RELOAD_DESC}
</Highlight>
}
value={hotReload} value={hotReload}
onChange={async () => { onChange={async () => {
setHotReload(!hotReload); setHotReload(!hotReload);
await vizality.manager.plugins.remountAll(); await vizality.manager.plugins.remountAll();
}} }}
> >
<Highlight search={query}> {Messages.VIZALITY_SETTINGS_PLUGIN_HOT_RELOAD}
{Messages.VIZALITY_SETTINGS_PLUGIN_HOT_RELOAD}
</Highlight>
</SwitchItem> </SwitchItem>
}, },
{ {
@ -60,17 +51,11 @@ export default memo(({ builtin, search = '' }) => {
], ],
render: query => render: query =>
<SwitchItem <SwitchItem
description={ description={Messages.VIZALITY_SETTINGS_OVERLAY_DESC}
<Highlight search={query}>
{Messages.VIZALITY_SETTINGS_OVERLAY_DESC}
</Highlight>
}
value={openOverlayDevTools} value={openOverlayDevTools}
onChange={() => setOpenOverlayDevTools(!openOverlayDevTools)} onChange={() => setOpenOverlayDevTools(!openOverlayDevTools)}
> >
<Highlight search={query}> {Messages.VIZALITY_SETTINGS_OVERLAY}
{Messages.VIZALITY_SETTINGS_OVERLAY}
</Highlight>
</SwitchItem> </SwitchItem>
}, },
{ {
@ -80,11 +65,7 @@ export default memo(({ builtin, search = '' }) => {
], ],
render: query => render: query =>
<SwitchItem <SwitchItem
description={ description={Messages.VIZALITY_SETTINGS_DISCORD_EXPERIMENTS_DESC.format()}
<Highlight search={query}>
{Messages.VIZALITY_SETTINGS_DISCORD_EXPERIMENTS_DESC.format()}
</Highlight>
}
value={discordExperiments} value={discordExperiments}
onChange={() => { onChange={() => {
setDiscordExperiments(!discordExperiments); setDiscordExperiments(!discordExperiments);
@ -92,9 +73,7 @@ export default memo(({ builtin, search = '' }) => {
experimentsModule._changeCallbacks.forEach(cb => cb()); experimentsModule._changeCallbacks.forEach(cb => cb());
}} }}
> >
<Highlight search={query}> {Messages.VIZALITY_SETTINGS_DISCORD_EXPERIMENTS}
{Messages.VIZALITY_SETTINGS_DISCORD_EXPERIMENTS}
</Highlight>
</SwitchItem> </SwitchItem>
} }
]; ];

43
src/core/builtins/settings/components/General.jsx
Unescape View File

@ -5,7 +5,6 @@ import { removeDirRecursive } from '@vizality/util/file';
import React, { memo, useState, useEffect } from 'react'; import React, { memo, useState, useEffect } from 'react';
import { Messages, chosenLocale } from '@vizality/i18n'; import { Messages, chosenLocale } from '@vizality/i18n';
import { joinClassNames } from '@vizality/util/dom'; import { joinClassNames } from '@vizality/util/dom';
import { Highlight } from 'react-highlighter-ts/dist/lib';
import { getModule } from '@vizality/webpack'; import { getModule } from '@vizality/webpack';
import { readdirSync, existsSync } from 'fs'; import { readdirSync, existsSync } from 'fs';
import { useFilter } from '@vizality/hooks'; import { useFilter } from '@vizality/hooks';
@ -199,19 +198,13 @@ export default memo(({ builtin, search = '' }) => {
], ],
render: query => render: query =>
<SwitchItem <SwitchItem
description={ description={Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_DESC}
<Highlight search={query}>
{Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_DESC}
</Highlight>
}
value={transparentWindow} value={transparentWindow}
onChange={() => setTransparentWindow(!transparentWindow)} onChange={() => setTransparentWindow(!transparentWindow)}
info={Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_INFO.format()} info={Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_INFO.format()}
requiresRestart requiresRestart
> >
<Highlight search={query}> {Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW}
{Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW}
</Highlight>
</SwitchItem> </SwitchItem>
}, },
{ {
@ -222,18 +215,12 @@ export default memo(({ builtin, search = '' }) => {
], ],
render: query => render: query =>
<ButtonItem <ButtonItem
note={ note={Messages.VIZALITY_SETTINGS_CACHE_VIZALITY_DESC}
<Highlight search={query}>
{Messages.VIZALITY_SETTINGS_CACHE_VIZALITY_DESC}
</Highlight>
}
button={isVizalityCacheCleared ? Messages.VIZALITY_SETTINGS_CACHE_CLEARED : Messages.VIZALITY_SETTINGS_CACHE_VIZALITY} button={isVizalityCacheCleared ? Messages.VIZALITY_SETTINGS_CACHE_CLEARED : Messages.VIZALITY_SETTINGS_CACHE_VIZALITY}
success={isVizalityCacheCleared} success={isVizalityCacheCleared}
onClick={() => clearVizalityCache()} onClick={() => clearVizalityCache()}
> >
<Highlight search={query}> {Messages.VIZALITY_SETTINGS_CACHE_VIZALITY}
{Messages.VIZALITY_SETTINGS_CACHE_VIZALITY}
</Highlight>
</ButtonItem> </ButtonItem>
}, },
{ {
@ -244,18 +231,12 @@ export default memo(({ builtin, search = '' }) => {
], ],
render: query => render: query =>
<ButtonItem <ButtonItem
note={ note={Messages.VIZALITY_SETTINGS_CACHE_DISCORD_DESC}
<Highlight search={query}>
{Messages.VIZALITY_SETTINGS_CACHE_DISCORD_DESC}
</Highlight>
}
button={isDiscordCacheCleared ? Messages.VIZALITY_SETTINGS_CACHE_CLEARED : Messages.VIZALITY_SETTINGS_CACHE_DISCORD} button={isDiscordCacheCleared ? Messages.VIZALITY_SETTINGS_CACHE_CLEARED : Messages.VIZALITY_SETTINGS_CACHE_DISCORD}
success={isDiscordCacheCleared} success={isDiscordCacheCleared}
onClick={() => clearDiscordCache()} onClick={() => clearDiscordCache()}
> >
<Highlight search={query}> {Messages.VIZALITY_SETTINGS_CACHE_DISCORD}
{Messages.VIZALITY_SETTINGS_CACHE_DISCORD}
</Highlight>
</ButtonItem> </ButtonItem>
}, },
{ {
@ -267,16 +248,8 @@ export default memo(({ builtin, search = '' }) => {
render: query => render: query =>
<Category <Category
icon='Bug' icon='Bug'
title={ title={Messages.VIZALITY_UPDATES_OPTS_DEBUG}
<Highlight search={query}> description={Messages.VIZALITY_UPDATES_OPTS_DEBUG_DESC}
{Messages.VIZALITY_UPDATES_OPTS_DEBUG}
</Highlight>
}
description={
<Highlight search={query}>
{Messages.VIZALITY_UPDATES_OPTS_DEBUG_DESC}
</Highlight>
}
> >
{renderDebugInfo()} {renderDebugInfo()}
</Category> </Category>

11
src/core/builtins/settings/components/Keybinds.jsx
Unescape View File

@ -1,5 +1,4 @@
import { SwitchItem } from '@vizality/components/settings'; import { SwitchItem } from '@vizality/components/settings';
import { Highlight } from 'react-highlighter-ts/dist/lib';
import React, { memo, useEffect } from 'react'; import React, { memo, useEffect } from 'react';
import { useFilter } from '@vizality/hooks'; import { useFilter } from '@vizality/hooks';
import { Messages } from '@vizality/i18n'; import { Messages } from '@vizality/i18n';
@ -13,19 +12,13 @@ export default memo(({ builtin, search = '' }) => {
], ],
render: query => render: query =>
<SwitchItem <SwitchItem
description={ description={Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_DESC}
<Highlight search={query}>
{Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_DESC}
</Highlight>
}
value={true} value={true}
onChange={() => void 0} onChange={() => void 0}
info={Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_INFO.format()} info={Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_INFO.format()}
requiresRestart requiresRestart
> >
<Highlight search={query}> {Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW}
{Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW}
</Highlight>
</SwitchItem> </SwitchItem>
} }
]; ];

11
src/core/builtins/settings/components/Notifications.jsx
Unescape View File

@ -1,5 +1,4 @@
import { SwitchItem } from '@vizality/components/settings'; import { SwitchItem } from '@vizality/components/settings';
import { Highlight } from 'react-highlighter-ts/dist/lib';
import React, { memo, useEffect } from 'react'; import React, { memo, useEffect } from 'react';
import { useFilter } from '@vizality/hooks'; import { useFilter } from '@vizality/hooks';
import { Messages } from '@vizality/i18n'; import { Messages } from '@vizality/i18n';
@ -13,19 +12,13 @@ export default memo(({ builtin, search = '' }) => {
], ],
render: query => render: query =>
<SwitchItem <SwitchItem
description={ description={Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_DESC}
<Highlight search={query}>
{Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_DESC}
</Highlight>
}
value={true} value={true}
onChange={() => void 0} onChange={() => void 0}
info={Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_INFO.format()} info={Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW_INFO.format()}
requiresRestart requiresRestart
> >
<Highlight search={query}> {Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW}
{Messages.VIZALITY_SETTINGS_TRANSPARENT_WINDOW}
</Highlight>
</SwitchItem> </SwitchItem>
} }
]; ];

Write Preview
Loading…
Cancel
Save