From ee318842469ec11c41de84c621f49c9d81610fd0 Mon Sep 17 00:00:00 2001 From: PalmDevs Date: Sat, 5 Apr 2025 23:35:01 +0700 Subject: [PATCH] fix: revert a few changes that broke building --- bun.lock | 3 --- lib/modules/src/finders/_internal.ts | 4 ++-- lib/modules/src/finders/filters.ts | 4 ++-- lib/modules/src/finders/find.ts | 4 ++-- lib/modules/src/finders/lookup.ts | 8 +++---- lib/modules/src/finders/wait.ts | 6 +++--- lib/modules/src/metro/_internal.ts | 2 +- .../src/metro/subscriptions/_internal.ts | 2 +- lib/modules/src/metro/subscriptions/index.ts | 2 +- lib/modules/src/native.ts | 2 +- lib/modules/tsconfig.json | 9 -------- lib/types/internal/tsconfig.json | 21 ------------------- lib/types/package.json | 5 +---- lib/types/types.d.ts | 2 +- tsconfig.json | 7 +++++-- lib/types/internal/types.d.ts => types.d.ts | 2 ++ 16 files changed, 26 insertions(+), 57 deletions(-) delete mode 100644 lib/modules/tsconfig.json delete mode 100644 lib/types/internal/tsconfig.json rename lib/types/internal/types.d.ts => types.d.ts (95%) diff --git a/bun.lock b/bun.lock index 5378d08..cfb880d 100644 --- a/bun.lock +++ b/bun.lock @@ -29,9 +29,6 @@ }, "lib/modules": { "name": "@revenge-mod/modules", - "dependencies": { - "@revenge-mod/types": "workspace:*", - }, }, "lib/patcher": { "name": "@revenge-mod/patcher", diff --git a/lib/modules/src/finders/_internal.ts b/lib/modules/src/finders/_internal.ts index eab9281..c74f67f 100644 --- a/lib/modules/src/finders/_internal.ts +++ b/lib/modules/src/finders/_internal.ts @@ -1,7 +1,7 @@ -import { _isExportBad } from '~/metro/_internal' +import { _isExportBad } from '../metro/_internal' import type { If } from '@revenge-mod/utils/types' -import type { Metro } from '#/metro' +import type { Metro } from '../../types/metro' import type { Filter } from './filters' export type RunFilterOptions = { diff --git a/lib/modules/src/finders/filters.ts b/lib/modules/src/finders/filters.ts index ca8c683..6cc9750 100644 --- a/lib/modules/src/finders/filters.ts +++ b/lib/modules/src/finders/filters.ts @@ -1,7 +1,7 @@ -import { _mMetadatas } from '~/metro/_internal' +import { _mMetadatas } from '../metro/_internal' import type { If, LogicalOr } from '@revenge-mod/utils/types' -import type { Metro } from '#/metro' +import type { Metro } from '../../types/metro' export type FilterResult = F extends Filter ? R : never diff --git a/lib/modules/src/finders/find.ts b/lib/modules/src/finders/find.ts index d7ec3c0..ae19d90 100644 --- a/lib/modules/src/finders/find.ts +++ b/lib/modules/src/finders/find.ts @@ -1,10 +1,10 @@ import { type LookupModulesOptions, lookupModuleByImportedPath, lookupModuleIds, lookupModules } from './lookup' import { type WaitForModulesOptions, waitForModuleByImportedPath, waitForModules } from './wait' +import { type ProxifyOptions, proxify } from '@revenge-mod/utils/proxy' import type { LookupModuleIdsOptions, MaybeDefaultExportMatched } from '.' -import type { Metro } from '#/metro' +import type { Metro } from '../../types/metro' import type { Filter, FilterResult } from './filters' -import { proxify, type ProxifyOptions } from '@revenge-mod/utils/proxy' export type BaseFindModuleOptions = { /** diff --git a/lib/modules/src/finders/lookup.ts b/lib/modules/src/finders/lookup.ts index 67771f6..025b060 100644 --- a/lib/modules/src/finders/lookup.ts +++ b/lib/modules/src/finders/lookup.ts @@ -1,13 +1,13 @@ -import { _mInited, _mMetadatas, _mPaths, _mUninited } from '~/metro/_internal' +import { _mInited, _mMetadatas, _mPaths, _mUninited } from '../metro/_internal' import { - runFilter, - runFilterReturnExports, type RunFilterOptions, type RunFilterReturnExportsOptions, + runFilter, + runFilterReturnExports, } from './_internal' import type { MaybeDefaultExportMatched } from '.' -import type { Metro } from '#/metro' +import type { Metro } from '../../types/metro' import type { Filter, FilterResult } from './filters' export type BaseLookupModulesOptions = RunFilterOptions diff --git a/lib/modules/src/finders/wait.ts b/lib/modules/src/finders/wait.ts index e6b43f3..9507191 100644 --- a/lib/modules/src/finders/wait.ts +++ b/lib/modules/src/finders/wait.ts @@ -1,9 +1,9 @@ -import { onAnyModuleInitialized, onModuleFinishedImporting } from '~/metro' -import { _bl, _mMetadatas } from '~/metro/_internal' +import { onAnyModuleInitialized, onModuleFinishedImporting } from '../metro' +import { _bl, _mMetadatas } from '../metro/_internal' import { runFilterReturnExports } from './_internal' import type { MaybeDefaultExportMatched } from '.' -import type { Metro } from '#/metro' +import type { Metro } from '../../types/metro' import type { Filter, FilterResult } from './filters' import type { LookupModulesOptions } from './lookup' diff --git a/lib/modules/src/metro/_internal.ts b/lib/modules/src/metro/_internal.ts index 4c3f54d..b4b1299 100644 --- a/lib/modules/src/metro/_internal.ts +++ b/lib/modules/src/metro/_internal.ts @@ -1,7 +1,7 @@ import { isProxy } from '@revenge-mod/utils/proxy' import { _executeSubscription } from './subscriptions/_internal' -import type { Metro } from '#/metro' +import type { Metro } from '../../types/metro' export const _bl = new Set() diff --git a/lib/modules/src/metro/subscriptions/_internal.ts b/lib/modules/src/metro/subscriptions/_internal.ts index f1ad4e9..724a59d 100644 --- a/lib/modules/src/metro/subscriptions/_internal.ts +++ b/lib/modules/src/metro/subscriptions/_internal.ts @@ -1,5 +1,5 @@ import type { ModuleInitializedCallback, ModuleWithImportedPathInitializedCallback } from '.' -import type { Metro } from '#/metro' +import type { Metro } from '../../../types/metro' export const _all = new Set() export const _specific = new Map>() diff --git a/lib/modules/src/metro/subscriptions/index.ts b/lib/modules/src/metro/subscriptions/index.ts index 5300180..52faf24 100644 --- a/lib/modules/src/metro/subscriptions/index.ts +++ b/lib/modules/src/metro/subscriptions/index.ts @@ -1,4 +1,4 @@ -import type { Metro } from '#/metro' +import type { Metro } from '../../../types/metro' import { _all, _importedPath, _specific } from './_internal' export type ModuleInitializedCallback = (id: Metro.ModuleID, exports: Metro.ModuleExports) => void diff --git a/lib/modules/src/native.ts b/lib/modules/src/native.ts index c53aadc..9292107 100644 --- a/lib/modules/src/native.ts +++ b/lib/modules/src/native.ts @@ -1,4 +1,4 @@ -import type { DiscordNativeModules } from '#/discord.native' +import type { DiscordNativeModules } from '../types/discord.native' /** * Naming conventions: diff --git a/lib/modules/tsconfig.json b/lib/modules/tsconfig.json deleted file mode 100644 index faa6bcb..0000000 --- a/lib/modules/tsconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "@revenge-mod/types/internal/tsconfig.json", - "compilerOptions": { - "paths": { - "~/*": ["./src/*"], - "#/*": ["./types/*"] - } - } -} diff --git a/lib/types/internal/tsconfig.json b/lib/types/internal/tsconfig.json deleted file mode 100644 index a0b50ab..0000000 --- a/lib/types/internal/tsconfig.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - // Features - "lib": ["ESNext"], - "module": "ESNext", - "target": "ES2015", - // Bundler - "moduleResolution": "bundler", - "verbatimModuleSyntax": true, - "noEmit": true, - // Type checking - "strict": true, - "skipLibCheck": true, - "noFallthroughCasesInSwitch": true, - "noUnusedLocals": true, - "noUnusedParameters": true, - "noPropertyAccessFromIndexSignature": false, - "types": ["@revenge-mod/types", "@revenge-mod/types/internal/types.d.ts"] - } -} diff --git a/lib/types/package.json b/lib/types/package.json index cf70e84..eb2846a 100644 --- a/lib/types/package.json +++ b/lib/types/package.json @@ -3,11 +3,8 @@ "private": true, "type": "module", "exports": { - "./*": { - "types": "./*" - }, ".": { - "types": "./types.d.ts" + "default": "./types.d.ts" }, "./tsconfig": { "default": "./tsconfig.json" diff --git a/lib/types/types.d.ts b/lib/types/types.d.ts index 08d3d8f..6987f12 100644 --- a/lib/types/types.d.ts +++ b/lib/types/types.d.ts @@ -1,7 +1,7 @@ // All of these typings are exported, be careful what you export here! -import type { Metro } from '@revenge-mod/modules' import type { Buffer as _Buffer } from 'buffer' +import type { Metro } from '@revenge-mod/modules' import type { ErrorUtils as RNErrorUtils } from 'react-native' /// HERMES diff --git a/tsconfig.json b/tsconfig.json index d1d1556..d10a074 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,4 +1,7 @@ { - "extends": "@revenge-mod/types/internal/tsconfig.json", - "exclude": ["scripts"] + "extends": "@revenge-mod/types/tsconfig", + "compilerOptions": { + "types": ["@revenge-mod/types", "./types"] + }, + "include": ["lib", "plugins", "src"] } diff --git a/lib/types/internal/types.d.ts b/types.d.ts similarity index 95% rename from lib/types/internal/types.d.ts rename to types.d.ts index 2b6c118..3da0466 100644 --- a/lib/types/internal/types.d.ts +++ b/types.d.ts @@ -6,3 +6,5 @@ declare global { const __BUILD_FLAG_INIT_DISABLE_PATCH_LOG_PROMISE_REJECTIONS__: boolean } + +export {}