fix(lib/discord)!: move ui/settings to settings

lib/discord/package.json

@@ -21,17 +21,17 @@
     "./preinit": {
       "default": "./src/preinit.ts"
     },
-    "./ui": {
-      "default": "./src/ui/index.ts"
-    },
-    "./ui/settings": {
-      "default": "./src/ui/settings/index.ts"
+    "./settings": {
+      "default": "./src/settings/index.ts"
     },
     "./types": {
       "types": "./types/index.ts"
     },
-    "./_/ui/settings": {
-      "default": "./src/ui/settings/_internal.ts"
+    "./ui": {
+      "default": "./src/ui/index.ts"
+    },
+    "./_/settings": {
+      "default": "./src/settings/_internal.ts"
     }
   }
 }

lib/discord/src/index.ts

@@ -7,6 +7,7 @@ export * from './preinit'
 
 export * as flux from './flux'
 export * as native from './native'
+export * as settings from './settings'
 export * as ui from './ui'
 
 // ../discord_common/js/shared/Logger.tsx

lib/discord/src/settings/api.ts

@@ -1,7 +1,7 @@
 import { _data, _subs } from './_internal'
 
 import type { ComponentType, ReactNode } from 'react'
-import type { DiscordModules } from '../../../types'
+import type { DiscordModules } from '../../types'
 
 export type SettingsModulesLoadedSubscription = () => void
 

lib/discord/src/ui/index.ts

@@ -1,2 +1 @@
 export * from './common'
-export * as settings from './settings'

src/plugins/developer-settings/definitions/EvaluateJavaScriptSetting.tsx

@@ -10,7 +10,7 @@ import AssetIcon from '~/components/AssetIcon'
 
 import { pluginApi } from '..'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const ALERT_KEY = 'evaluate-javascript'
 

src/plugins/developer-settings/definitions/ReactDevToolsConnectSetting.tsx

@@ -5,7 +5,7 @@ import AssetIcon from '~/components/AssetIcon'
 import { MobileSetting } from '../constants'
 import { DevToolsContext, connectToDevTools, useIsDevToolsOpen } from '../devtools'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const ReactDevToolsConnectSetting: SettingsItem = {
     parent: MobileSetting.REVENGE_DEVELOPER,

src/plugins/developer-settings/definitions/ReactDevToolsDisconnectSetting.tsx

@@ -5,7 +5,7 @@ import AssetIcon from '~/components/AssetIcon'
 import { MobileSetting } from '../constants'
 import { disconnectFromDevTools, useIsDevToolsOpen } from '../devtools'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const ReactDevToolsDisconnectSetting: SettingsItem = {
     parent: MobileSetting.REVENGE_DEVELOPER,

src/plugins/developer-settings/definitions/ReactDevToolsVersionSetting.tsx

@@ -5,7 +5,7 @@ import AssetIcon from '~/components/AssetIcon'
 import { MobileSetting } from '../constants'
 import { DevToolsContext } from '../devtools'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const ReactDevToolsVersionSetting: SettingsItem = {
     parent: MobileSetting.REVENGE_DEVELOPER,

src/plugins/developer-settings/definitions/RevengeDeveloperSetting.tsx

@@ -2,7 +2,7 @@ import AssetIcon from '~/components/AssetIcon'
 
 import { MobileSetting, UserSettingsSections } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const RevengeDeveloperSetting: SettingsItem = {
     parent: null,

src/plugins/developer-settings/index.ts

@@ -1,8 +1,8 @@
 import { type PluginApi, PluginFlags } from '@revenge-mod/plugins'
 import { InternalPluginFlags, registerPlugin } from '@revenge-mod/plugins/_'
 
-import { _data } from '@revenge-mod/discord/_/ui/settings'
-import { onceSettingsModulesLoaded } from '@revenge-mod/discord/ui/settings'
+import { _data } from '@revenge-mod/discord/_/settings'
+import { onceSettingsModulesLoaded } from '@revenge-mod/discord/settings'
 
 registerPlugin(
     {

src/plugins/developer-settings/register.ts

@@ -1,4 +1,4 @@
-import { addSettingsItemToSection, registerSettingsItems } from '@revenge-mod/discord/ui/settings'
+import { addSettingsItemToSection, registerSettingsItems } from '@revenge-mod/discord/settings'
 
 import { MobileSetting } from './constants'
 

src/plugins/developer-settings/screens/RevengeDeveloperSettingScreen.tsx

@@ -1,5 +1,5 @@
+import { SettingListRenderer } from '@revenge-mod/discord/settings'
 import { Components } from '@revenge-mod/discord/ui'
-import { SettingListRenderer } from '@revenge-mod/discord/ui/settings'
 import { React, ReactNative } from '@revenge-mod/react'
 
 import { MobileSetting } from '../constants'

src/plugins/settings/definitions/HermesVersionSetting.tsx

@@ -4,7 +4,7 @@ import AssetIcon from '~/components/AssetIcon'
 
 import { MobileSetting } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 // @ts-expect-error
 const props = HermesInternal.getRuntimeProperties()

src/plugins/settings/definitions/ReactNativeVersionSetting.tsx

@@ -4,7 +4,7 @@ import AssetIcon from '~/components/AssetIcon'
 
 import { MobileSetting } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const { major, minor, patch, prerelease } = ReactNative.Platform.constants.reactNativeVersion
 const version = `${major}.${minor}.${patch}${prerelease ? `-${prerelease}` : ''}`

src/plugins/settings/definitions/ReactVersionSetting.tsx

@@ -4,7 +4,7 @@ import { MobileSetting } from '../constants'
 
 import AssetIcon from '~/components/AssetIcon'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const ReactVersionSetting: SettingsItem = {
     parent: MobileSetting.REVENGE,

src/plugins/settings/definitions/ReloadAppSetting.tsx

@@ -5,7 +5,7 @@ import AssetIcon from '~/components/AssetIcon'
 
 import { MobileSetting } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const ReloadAppSetting: SettingsItem = {
     parent: MobileSetting.REVENGE,

src/plugins/settings/definitions/RevengeDiscordServerSetting.tsx

@@ -1,11 +1,11 @@
 import { React, ReactNative } from '@revenge-mod/react'
 
-import { DiscordServerURL } from '~/constants'
 import AssetIcon from '~/components/AssetIcon'
+import { DiscordServerURL } from '~/constants'
 
 import { MobileSetting } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const RevengeDiscordServerSetting: SettingsItem = {
     parent: MobileSetting.REVENGE,

src/plugins/settings/definitions/RevengeFontsSetting.tsx

@@ -2,7 +2,7 @@ import AssetIcon from '~/components/AssetIcon'
 
 import { MobileSetting, UserSettingsSections } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const RevengeFontsSetting: SettingsItem = {
     parent: null,

src/plugins/settings/definitions/RevengeGitHubOrganizationSetting.tsx

@@ -1,11 +1,11 @@
 import { React, ReactNative } from '@revenge-mod/react'
 
-import { GitHubOrganizationURL } from '~/constants'
 import AssetIcon from '~/components/AssetIcon'
+import { GitHubOrganizationURL } from '~/constants'
 
 import { MobileSetting } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const RevengeGitHubOrganizationSetting: SettingsItem = {
     parent: MobileSetting.REVENGE,

src/plugins/settings/definitions/RevengeNotImplementedSetting.tsx

@@ -2,7 +2,7 @@ import { React } from '@revenge-mod/react'
 
 import AssetIcon from '~/components/AssetIcon'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const RevengeNotImplementedSetting: SettingsItem = {
     parent: null,

src/plugins/settings/definitions/RevengePluginsSetting.tsx

@@ -4,7 +4,7 @@ import AssetIcon from '~/components/AssetIcon'
 
 import { MobileSetting, UserSettingsSections } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const RevengePluginsSetting: SettingsItem = {
     parent: null,

src/plugins/settings/definitions/RevengeSetting.tsx

@@ -3,7 +3,7 @@ import RevengeIcon from '~assets/RevengeIcon'
 
 import { MobileSetting, UserSettingsSections } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const RevengeSetting: SettingsItem = {
     parent: null,

src/plugins/settings/definitions/RevengeThemesSetting.tsx

@@ -2,7 +2,7 @@ import AssetIcon from '~/components/AssetIcon'
 
 import { MobileSetting, UserSettingsSections } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const RevengeThemesSetting: SettingsItem = {
     parent: null,

src/plugins/settings/definitions/RevengeVersionSetting.tsx

@@ -3,7 +3,7 @@ import RevengeIcon from '~assets/RevengeIcon'
 
 import { MobileSetting } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/ui/settings'
+import type { SettingsItem } from '@revenge-mod/discord/settings'
 
 const RevengeVersionSetting: SettingsItem = {
     parent: MobileSetting.REVENGE,

src/plugins/settings/index.ts

@@ -4,11 +4,11 @@ import { InternalPluginFlags, registerPlugin } from '@revenge-mod/plugins/_'
 import { waitForModules } from '@revenge-mod/modules/finders'
 import { byName, byProps } from '@revenge-mod/modules/finders/filters'
 
-import { _data, _subs } from '@revenge-mod/discord/_/ui/settings'
+import { _data, _subs } from '@revenge-mod/discord/_/settings'
+import { type SettingsItem, onceSettingsModulesLoaded } from '@revenge-mod/discord/settings'
 
 import { after } from '@revenge-mod/patcher'
 
-import { type SettingsItem, onceSettingsModulesLoaded } from '@revenge-mod/discord/ui/settings'
 import type { FC } from 'react'
 
 registerPlugin(

src/plugins/settings/register.ts

@@ -1,4 +1,4 @@
-import { registerSettingsItems, registerSettingsSection } from '@revenge-mod/discord/ui/settings'
+import { registerSettingsItems, registerSettingsSection } from '@revenge-mod/discord/settings'
 
 import { MobileSetting } from './constants'
 

src/plugins/settings/screens/RevengeFontsSettingScreen.tsx

@@ -1,4 +1,4 @@
-import { SettingListRenderer } from '@revenge-mod/discord/ui/settings'
+import { SettingListRenderer } from '@revenge-mod/discord/settings'
 
 import { MobileSetting } from '../constants'
 

src/plugins/settings/screens/RevengePluginsSettingScreen.tsx

@@ -1,4 +1,4 @@
-import { SettingListRenderer } from '@revenge-mod/discord/ui/settings'
+import { SettingListRenderer } from '@revenge-mod/discord/settings'
 
 import { MobileSetting } from '../constants'
 

src/plugins/settings/screens/RevengeSettingScreen.tsx

@@ -1,4 +1,4 @@
-import { SettingListRenderer } from '@revenge-mod/discord/ui/settings'
+import { SettingListRenderer } from '@revenge-mod/discord/settings'
 import { Components } from '../../../../lib/discord/src/ui/common'
 import { MobileSetting } from '../constants'
 

src/plugins/settings/screens/RevengeThemesSettingScreen.tsx

@@ -1,4 +1,4 @@
-import { SettingListRenderer } from '@revenge-mod/discord/ui/settings'
+import { SettingListRenderer } from '@revenge-mod/discord/settings'
 
 import { MobileSetting } from '../constants'