diff --git a/lib/plugins/package.json b/lib/plugins/package.json index 071d918..7cf4000 100644 --- a/lib/plugins/package.json +++ b/lib/plugins/package.json @@ -3,8 +3,8 @@ "private": true, "type": "module", "exports": { - ".": { - "default": "./src/index.ts" + "./constants": { + "default": "./src/constants.ts" }, "./init": { "default": "./src/init.ts" diff --git a/lib/plugins/src/apis/discord.ts b/lib/plugins/src/apis/discord.ts index c3e336c..0decf12 100644 --- a/lib/plugins/src/apis/discord.ts +++ b/lib/plugins/src/apis/discord.ts @@ -27,21 +27,15 @@ export const discord: PluginApiDiscord = { get design() { return (this.design = require('@revenge-mod/discord/design')) }, - get native() { - return (this.native = require('@revenge-mod/discord/native')) - }, - get modules() { - const api: PluginApiDiscordModules = { - get settings() { - const api = { - ...require('@revenge-mod/discord/modules/settings'), - renderer: require('@revenge-mod/discord/modules/settings/renderer'), - } + native: require('@revenge-mod/discord/native'), + modules: { + get settings() { + const api = { + ...require('@revenge-mod/discord/modules/settings'), + renderer: require('@revenge-mod/discord/modules/settings/renderer'), + } - return (this.settings = api) - }, - } - - return (this.modules = api) + return (this.settings = api) + }, }, } diff --git a/lib/plugins/src/apis/index.ts b/lib/plugins/src/apis/index.ts index b01fc9d..268f407 100644 --- a/lib/plugins/src/apis/index.ts +++ b/lib/plugins/src/apis/index.ts @@ -1,21 +1,11 @@ import * as PatcherLibrary from '@revenge-mod/patcher' -import * as PluginsLibrary from '@revenge-mod/plugins' - import type { UnscopedInitPluginApi, UnscopedPluginApi } from '../types' export const _uapi: UnscopedInitPluginApi | UnscopedPluginApi = { - get discord() { - return (this.discord = require('./discord').discord) - }, - get externals() { - return (this.externals = require('./externals').externals) - }, - get modules() { - return (this.modules = require('./modules').modules) - }, + discord: require('./discord').discord, + externals: require('./externals').externals, + modules: require('./modules').modules, + plugins: require('./plugins').plugins, patcher: PatcherLibrary, - plugins: PluginsLibrary, - get react() { - return (this.react = require('./react').react) - }, + react: require('./react').react, } diff --git a/lib/plugins/src/apis/modules.ts b/lib/plugins/src/apis/modules.ts index 2b574c7..90aa15b 100644 --- a/lib/plugins/src/apis/modules.ts +++ b/lib/plugins/src/apis/modules.ts @@ -20,25 +20,15 @@ export type PluginApiModulesFinders = } export const modules: PluginApiModules = { - get finders() { - const api = { - ...require('@revenge-mod/modules/finders/lookup'), - ...require('@revenge-mod/modules/finders/wait'), - ...require('@revenge-mod/modules/finders/find'), - filters: require('@revenge-mod/modules/finders/filters'), - } - - return (this.finders = api) + finders: { + ...require('@revenge-mod/modules/finders/lookup'), + ...require('@revenge-mod/modules/finders/wait'), + ...require('@revenge-mod/modules/finders/find'), + filters: require('@revenge-mod/modules/finders/filters'), }, - get metro() { - const api: PluginApiModulesMetro = { - ...require('@revenge-mod/modules/metro/utils'), - ...require('@revenge-mod/modules/metro/subscriptions'), - } - - return (this.metro = api) - }, - get native() { - return (this.native = require('@revenge-mod/modules/native')) + metro: { + ...require('@revenge-mod/modules/metro/utils'), + ...require('@revenge-mod/modules/metro/subscriptions'), }, + native: require('@revenge-mod/modules/native'), } diff --git a/lib/plugins/src/apis/plugins.ts b/lib/plugins/src/apis/plugins.ts new file mode 100644 index 0000000..58e7a48 --- /dev/null +++ b/lib/plugins/src/apis/plugins.ts @@ -0,0 +1,7 @@ +export interface PluginApiPlugins { + constants: typeof import('@revenge-mod/plugins/constants') +} + +export const plugins: PluginApiPlugins = { + constants: require('@revenge-mod/plugins/constants'), +} diff --git a/lib/plugins/src/index.ts b/lib/plugins/src/index.ts deleted file mode 100644 index f87cf01..0000000 --- a/lib/plugins/src/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './constants' diff --git a/lib/plugins/src/types.ts b/lib/plugins/src/types.ts index a072c6e..fa58e54 100644 --- a/lib/plugins/src/types.ts +++ b/lib/plugins/src/types.ts @@ -6,6 +6,7 @@ import type { PluginApiDiscord } from './apis/discord' import type { PluginApiExternals } from './apis/externals' import type { PluginApiModules } from './apis/modules' import type { PluginApiReact } from './apis/react' +import type { PluginApiPlugins } from './apis/plugins' export type PluginFlags = (typeof PF)[keyof typeof PF] export type PluginStatus = (typeof PS)[keyof typeof PS] @@ -19,7 +20,7 @@ export interface UnscopedInitPluginApi { externals: PluginApiExternals modules: PluginApiModules patcher: typeof import('@revenge-mod/patcher') - plugins: typeof import('@revenge-mod/plugins') + plugins: PluginApiPlugins react: PluginApiReact // utils: PluginApiUtils } diff --git a/src/plugins/developer-settings/index.ts b/src/plugins/developer-settings/index.ts index 7ff1e66..07626b6 100644 --- a/src/plugins/developer-settings/index.ts +++ b/src/plugins/developer-settings/index.ts @@ -1,4 +1,4 @@ -import { PluginFlags } from '@revenge-mod/plugins' +import { PluginFlags } from '@revenge-mod/plugins/constants' import { InternalPluginFlags, registerPlugin } from '@revenge-mod/plugins/_' import { _data } from '@revenge-mod/discord/_/modules/settings' diff --git a/src/plugins/logging/index.ts b/src/plugins/logging/index.ts index 8eff416..7e98bd9 100644 --- a/src/plugins/logging/index.ts +++ b/src/plugins/logging/index.ts @@ -1,6 +1,6 @@ import { AppStartPerformance } from '@revenge-mod/discord/common' -import { PluginFlags } from '@revenge-mod/plugins' +import { PluginFlags } from '@revenge-mod/plugins/constants' import { InternalPluginFlags, registerPlugin } from '@revenge-mod/plugins/_' AppStartPerformance.mark('👊', 'Plugins register') diff --git a/src/plugins/settings/index.ts b/src/plugins/settings/index.ts index 1b5b0be..b287f34 100644 --- a/src/plugins/settings/index.ts +++ b/src/plugins/settings/index.ts @@ -1,4 +1,4 @@ -import { PluginFlags } from '@revenge-mod/plugins' +import { PluginFlags } from '@revenge-mod/plugins/constants' import { InternalPluginFlags, registerPlugin } from '@revenge-mod/plugins/_' import { byName, byProps } from '@revenge-mod/modules/finders/filters' diff --git a/src/plugins/staff-settings/index.ts b/src/plugins/staff-settings/index.ts index e599a87..960965d 100644 --- a/src/plugins/staff-settings/index.ts +++ b/src/plugins/staff-settings/index.ts @@ -3,7 +3,7 @@ import { waitForModules } from '@revenge-mod/modules/finders/wait' import { after } from '@revenge-mod/patcher' -import { PluginFlags } from '@revenge-mod/plugins' +import { PluginFlags } from '@revenge-mod/plugins/constants' import { InternalPluginFlags, registerPlugin } from '@revenge-mod/plugins/_' registerPlugin(