diff --git a/packages/discord-types/.npmignore b/packages/discord-types/.npmignore new file mode 100644 index 000000000..3c3629e64 --- /dev/null +++ b/packages/discord-types/.npmignore @@ -0,0 +1 @@ +node_modules diff --git a/packages/discord-types/package.json b/packages/discord-types/package.json index 7b8726fd2..8c95d6749 100644 --- a/packages/discord-types/package.json +++ b/packages/discord-types/package.json @@ -1,6 +1,7 @@ { "name": "@vencord/discord-types", "author": "Vencord Contributors", + "private": false, "description": "Typescript definitions for the webpack modules of the Discord Web app", "version": "1.0.0", "license": "LGPL-3.0-or-later", @@ -12,8 +13,10 @@ "directory": "packages/discord-types" }, "dependencies": { - "@types/react": "^19.0.10", "moment": "^2.22.2", "type-fest": "^4.41.0" + }, + "peerDependencies": { + "@types/react": "^19.0.10" } } diff --git a/packages/vencord-types/package.json b/packages/vencord-types/package.json index 645869190..ae12354cd 100644 --- a/packages/vencord-types/package.json +++ b/packages/vencord-types/package.json @@ -1,7 +1,7 @@ { "name": "@vencord/types", "private": false, - "version": "1.11.5", + "version": "1.13.2", "description": "", "types": "index.d.ts", "scripts": { @@ -19,9 +19,14 @@ "dependencies": { "@types/lodash": "4.17.15", "@types/node": "^22.13.4", - "@types/react": "18.3.1", - "@types/react-dom": "18.3.1", - "standalone-electron-types": "^34.2.0", + "@vencord/discord-types": "^1.0.0", + "highlight.js": "11.11.1", + "moment": "^2.22.2", + "ts-pattern": "^5.6.0", "type-fest": "^4.35.0" + }, + "peerDependencies": { + "@types/react": "18.3.1", + "@types/react-dom": "18.3.1" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 59a443581..acf03949d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -197,9 +197,18 @@ importers: '@types/react-dom': specifier: 18.3.1 version: 18.3.1 - standalone-electron-types: - specifier: ^34.2.0 - version: 34.2.0 + '@vencord/discord-types': + specifier: ^1.0.0 + version: 1.0.0(@types/react@18.3.1) + highlight.js: + specifier: 11.11.1 + version: 11.11.1 + moment: + specifier: ^2.22.2 + version: 2.30.1 + ts-pattern: + specifier: ^5.6.0 + version: 5.6.2 type-fest: specifier: ^4.35.0 version: 4.38.0 @@ -598,8 +607,8 @@ packages: '@types/node@22.13.13': resolution: {integrity: sha512-ClsL5nMwKaBRwPcCvH8E7+nU4GxHVx1axNvMZTFHMEfNI7oahimt26P5zjVCRrjiIWj6YFXfE1v3dEp94wLcGQ==} - '@types/prop-types@15.7.14': - resolution: {integrity: sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==} + '@types/prop-types@15.7.15': + resolution: {integrity: sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==} '@types/react-dom@18.3.1': resolution: {integrity: sha512-qW1Mfv8taImTthu4KoXgDfLuk4bydU6Q/TkADnDWWHwi4NX4BR+LWfTp2sVmTqRrsHvyDDTelgelxJ+SsejKKQ==} @@ -717,6 +726,11 @@ packages: '@vap/shiki@0.10.5': resolution: {integrity: sha512-5BHVGvQT8qonbLSASon5aQFQ18OZU4FxSl9tLSj6oJ0sap3KdMbYcfGq25M9zFZR1g1dJN7fgjmZXBIS5omIdw==} + '@vencord/discord-types@1.0.0': + resolution: {integrity: sha512-idtijKdbjiqo8k+4mo5Aq9zrQYwr2u11VmiRasaf+8+cGC5bYsMTIZl7zKLF3VdYx2a0ICjxgZtcfa1U3mv1Yg==} + peerDependencies: + '@types/react': ^19.0.10 + acorn-jsx@5.3.2: resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} peerDependencies: @@ -2788,7 +2802,7 @@ snapshots: dependencies: undici-types: 6.20.0 - '@types/prop-types@15.7.14': {} + '@types/prop-types@15.7.15': {} '@types/react-dom@18.3.1': dependencies: @@ -2800,7 +2814,7 @@ snapshots: '@types/react@18.3.1': dependencies: - '@types/prop-types': 15.7.14 + '@types/prop-types': 15.7.15 csstype: 3.1.3 '@types/react@19.0.12': @@ -2961,6 +2975,12 @@ snapshots: vscode-oniguruma: 1.7.0 vscode-textmate: 5.2.0 + '@vencord/discord-types@1.0.0(@types/react@18.3.1)': + dependencies: + '@types/react': 18.3.1 + moment: 2.30.1 + type-fest: 4.41.0 + acorn-jsx@5.3.2(acorn@8.15.0): dependencies: acorn: 8.15.0 diff --git a/src/globals.d.ts b/src/globals.d.ts index cbbbdb0b4..b1e6e3314 100644 --- a/src/globals.d.ts +++ b/src/globals.d.ts @@ -16,8 +16,6 @@ * along with this program. If not, see . */ -import { LoDashStatic } from "lodash"; - declare global { /** * This exists only at build time, so references to it in patches should insert it @@ -68,9 +66,7 @@ declare global { export var Equibop: any; export var VesktopNative: any; - interface Window extends Record { - _: LoDashStatic; - } + interface Window extends Record { } } export { }; diff --git a/src/modules.d.ts b/src/modules.d.ts index ca7db7f62..3a9911a42 100644 --- a/src/modules.d.ts +++ b/src/modules.d.ts @@ -16,8 +16,6 @@ * along with this program. If not, see . */ -/// - declare module "~plugins" { const plugins: Record; export default plugins; @@ -28,11 +26,6 @@ declare module "~plugins" { export const ExcludedPlugins: Record; } -declare module "~pluginNatives" { - const pluginNatives: Record unknown>>; - export default pluginNatives; -} - declare module "~git-hash" { const hash: string; export default hash; diff --git a/src/nativeModules.d.ts b/src/nativeModules.d.ts new file mode 100644 index 000000000..40da784ed --- /dev/null +++ b/src/nativeModules.d.ts @@ -0,0 +1,12 @@ +/* + * Vencord, a Discord client mod + * Copyright (c) 2025 Vendicated and contributors + * SPDX-License-Identifier: GPL-3.0-or-later + */ + +/// + +declare module "~pluginNatives" { + const pluginNatives: Record unknown>>; + export default pluginNatives; +} diff --git a/src/plugins/webContextMenus.web/index.ts b/src/plugins/webContextMenus.web/index.ts index 89cb61418..6e65c2cd4 100644 --- a/src/plugins/webContextMenus.web/index.ts +++ b/src/plugins/webContextMenus.web/index.ts @@ -138,8 +138,8 @@ export default definePlugin({ replace: "false" }, { - match: /(canCopyImage\(.+?)\|\|"function"!=typeof \i\.clipboard\.copyImage/, - replace: "$1" + match: /(?<=canCopyImage\(.+?)typeof \i\.clipboard\.copyImage/, + replace: '"function"' } ] },