fix: revert a few changes that broke building

bun.lock

@@ -29,9 +29,6 @@
     },
     "lib/modules": {
       "name": "@revenge-mod/modules",
-      "dependencies": {
-        "@revenge-mod/types": "workspace:*",
-      },
     },
     "lib/patcher": {
       "name": "@revenge-mod/patcher",

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 = {

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> = F extends Filter<infer R, boolean> ? R : never
 

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 = {
     /**

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

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'
 

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<Metro.ModuleID>()
 

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<ModuleInitializedCallback>()
 export const _specific = new Map<Metro.ModuleID, Set<ModuleInitializedCallback>>()

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

lib/modules/src/native.ts

@@ -1,4 +1,4 @@
-import type { DiscordNativeModules } from '#/discord.native'
+import type { DiscordNativeModules } from '../types/discord.native'
 
 /**
  * Naming conventions:

lib/modules/tsconfig.json

@@ -1,9 +0,0 @@
-{
-  "extends": "@revenge-mod/types/internal/tsconfig.json",
-  "compilerOptions": {
-    "paths": {
-      "~/*": ["./src/*"],
-      "#/*": ["./types/*"]
-    }
-  }
-}

lib/types/internal/tsconfig.json

@@ -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"]
-  }
-}

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"

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

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"]
 }

types.d.ts

@@ -6,3 +6,5 @@ declare global {
 
     const __BUILD_FLAG_INIT_DISABLE_PATCH_LOG_PROMISE_REJECTIONS__: boolean
 }
+
+export {}