diff --git a/lib/discord/src/actions.ts b/lib/discord/src/actions.ts index d95a389..147c0b7 100644 --- a/lib/discord/src/actions.ts +++ b/lib/discord/src/actions.ts @@ -10,7 +10,7 @@ import { lookupModules, } from '@revenge-mod/modules/finders/lookup' import { - ReactJsxRuntimeModuleId, + ReactJSXRuntimeModuleId, ReactModuleId, ReactNativeModuleId, } from '@revenge-mod/react' @@ -33,7 +33,7 @@ export let ActionSheetActionCreators: DiscordModules.Actions.ActionSheetActionCr byDependencies([ undefined, ReactModuleId, - ReactJsxRuntimeModuleId, + ReactJSXRuntimeModuleId, DispatcherModuleId, relative(1), relative(2), diff --git a/lib/discord/src/design.ts b/lib/discord/src/design.ts index 3ef7322..e076694 100644 --- a/lib/discord/src/design.ts +++ b/lib/discord/src/design.ts @@ -6,7 +6,7 @@ import { } from '@revenge-mod/modules/finders/filters' import { lookupModule } from '@revenge-mod/modules/finders/lookup' import { - ReactJsxRuntimeModuleId, + ReactJSXRuntimeModuleId, ReactModuleId, ReactNativeModuleId, } from '@revenge-mod/react' @@ -61,7 +61,7 @@ export let FormSwitch: DiscordModules.Components.FormSwitch = proxify(() => { [relative(1), relative(2), undefined, relative(3)], ReactModuleId, ReactNativeModuleId, - ReactJsxRuntimeModuleId, + ReactJSXRuntimeModuleId, undefined, undefined, undefined, diff --git a/lib/discord/src/modules/settings/renderer.ts b/lib/discord/src/modules/settings/renderer.ts index 4a2adff..26bbcb1 100644 --- a/lib/discord/src/modules/settings/renderer.ts +++ b/lib/discord/src/modules/settings/renderer.ts @@ -5,7 +5,7 @@ import { } from '@revenge-mod/modules/finders/filters' import { lookupModule } from '@revenge-mod/modules/finders/lookup' import { - ReactJsxRuntimeModuleId, + ReactJSXRuntimeModuleId, ReactModuleId, ReactNativeModuleId, } from '@revenge-mod/react' @@ -30,7 +30,7 @@ export let SettingListRenderer: SettingListRenderer = proxify( relative(1), relative(2), undefined, - ReactJsxRuntimeModuleId, + ReactJSXRuntimeModuleId, ]), ), ), diff --git a/lib/externals/src/react-navigation.ts b/lib/externals/src/react-navigation.ts index 1c8777a..d5c96db 100644 --- a/lib/externals/src/react-navigation.ts +++ b/lib/externals/src/react-navigation.ts @@ -5,7 +5,7 @@ import { preferExports, } from '@revenge-mod/modules/finders/filters' import { lookupModule } from '@revenge-mod/modules/finders/lookup' -import { ReactJsxRuntimeModuleId, ReactModuleId } from '@revenge-mod/react' +import { ReactJSXRuntimeModuleId, ReactModuleId } from '@revenge-mod/react' import { proxify } from '@revenge-mod/utils/proxy' const { loose, relative } = byDependencies @@ -52,7 +52,7 @@ export let ReactNavigationStack: typeof import('@react-navigation/stack') = loose([ [[]], ReactModuleId, - ReactJsxRuntimeModuleId, + ReactJSXRuntimeModuleId, ]), 1, ), diff --git a/lib/externals/src/shopify.ts b/lib/externals/src/shopify.ts index 5dd1de0..400d366 100644 --- a/lib/externals/src/shopify.ts +++ b/lib/externals/src/shopify.ts @@ -5,7 +5,7 @@ import { } from '@revenge-mod/modules/finders/filters' import { lookupModule } from '@revenge-mod/modules/finders/lookup' import { - ReactJsxRuntimeModuleId, + ReactJSXRuntimeModuleId, ReactModuleId, ReactNativeModuleId, } from '@revenge-mod/react' @@ -19,7 +19,7 @@ export let FlashList: typeof import('@shopify/flash-list') = proxify( byDependencies([ ReactModuleId, ReactNativeModuleId, - ReactJsxRuntimeModuleId, + ReactJSXRuntimeModuleId, undefined, undefined, undefined, diff --git a/lib/react/src/index.ts b/lib/react/src/index.ts index c3d96de..eddd84f 100644 --- a/lib/react/src/index.ts +++ b/lib/react/src/index.ts @@ -4,11 +4,11 @@ import type { Metro } from '@revenge-mod/modules/types' export let ReactModuleId: Metro.ModuleID export let ReactNativeModuleId: Metro.ModuleID -export let ReactJsxRuntimeModuleId: Metro.ModuleID +export let ReactJSXRuntimeModuleId: Metro.ModuleID export let React: typeof import('react') export let ReactNative: typeof import('react-native') -export let ReactJsxRuntime: typeof import('react/jsx-runtime') +export let ReactJSXRuntime: typeof import('react/jsx-runtime') let RtCount = 0 @@ -34,12 +34,12 @@ const unsubRN = waitForModules( let RJsxRCount = 0 -const unsubRJsxR = waitForModules( - byProps('jsxs'), +const unsubRJSXR = waitForModules( + byProps('jsxs'), (exports, id) => { - if (RJsxRCount++ === 2) return unsubRJsxR() + if (RJsxRCount++ === 2) return unsubRJSXR() - ReactJsxRuntimeModuleId = id - ReactJsxRuntime = exports + ReactJSXRuntimeModuleId = id + ReactJSXRuntime = exports }, ) diff --git a/lib/utils/src/discord.ts b/lib/utils/src/discord.ts index 18b8970..cba7c5c 100644 --- a/lib/utils/src/discord.ts +++ b/lib/utils/src/discord.ts @@ -3,7 +3,7 @@ import { TokensModuleId } from '@revenge-mod/discord/common' import { byDependencies, byProps } from '@revenge-mod/modules/finders/filters' import { lookupModule } from '@revenge-mod/modules/finders/lookup' import { - ReactJsxRuntimeModuleId, + ReactJSXRuntimeModuleId, ReactModuleId, ReactNativeModuleId, } from '@revenge-mod/react' @@ -13,7 +13,7 @@ import type { FC } from 'react' // Asset = relativeDep(1) const IconComponentFilter = [ ReactModuleId, - ReactJsxRuntimeModuleId, + ReactJSXRuntimeModuleId, TokensModuleId, undefined, undefined, @@ -26,7 +26,7 @@ const IconComponentFilter = [ const MultiIconComponentFilterBase = [ ReactModuleId, ReactNativeModuleId, - ReactJsxRuntimeModuleId, + ReactJSXRuntimeModuleId, TokensModuleId, undefined, ] diff --git a/shims/react~jsx-runtime.ts b/shims/react~jsx-runtime.ts index cc417f8..9385cae 100644 --- a/shims/react~jsx-runtime.ts +++ b/shims/react~jsx-runtime.ts @@ -1,8 +1,8 @@ -import { ReactJsxRuntime } from '@revenge-mod/react' +import { ReactJSXRuntime } from '@revenge-mod/react' import { isProxified, unproxify } from '@revenge-mod/utils/proxy' import type { ElementType } from 'react' -const { jsx: _jsx, jsxs: _jsxs, Fragment } = ReactJsxRuntime +const { jsx: _jsx, jsxs: _jsxs, Fragment } = ReactJSXRuntime const jsx = ((type, ...args) => _jsx(unproxy(type as object), ...args)) as typeof _jsx