diff --git a/packages/discord.js/package.json b/packages/discord.js/package.json index aec4d44c3d78..47ce416be3cf 100644 --- a/packages/discord.js/package.json +++ b/packages/discord.js/package.json @@ -66,14 +66,14 @@ "homepage": "https://discord.js.org", "funding": "https://github.com/discordjs/discord.js?sponsor", "dependencies": { - "@discordjs/builders": "^1.11.2", + "@discordjs/builders": "^1.12.0", "@discordjs/collection": "1.5.3", "@discordjs/formatters": "^0.6.1", "@discordjs/rest": "workspace:^", "@discordjs/util": "workspace:^", "@discordjs/ws": "^1.2.3", "@sapphire/snowflake": "3.5.3", - "discord-api-types": "^0.38.24", + "discord-api-types": "^0.38.29", "fast-deep-equal": "3.1.3", "lodash.snakecase": "4.1.1", "magic-bytes.js": "^1.10.0", diff --git a/packages/discord.js/src/structures/LabelComponent.js b/packages/discord.js/src/structures/LabelComponent.js index f191e72e80c5..2e8cb25feeaf 100644 --- a/packages/discord.js/src/structures/LabelComponent.js +++ b/packages/discord.js/src/structures/LabelComponent.js @@ -1,7 +1,7 @@ 'use strict'; -const { Component } = require('./Component.js'); -const { createComponent } = require('../util/Components.js'); +const Component = require('./Component'); +const { createComponent } = require('../util/Components'); /** * Represents a label component diff --git a/packages/discord.js/src/util/InviteFlagsBitField.js b/packages/discord.js/src/util/InviteFlagsBitField.js index 87f4e7e74f05..6ff3e28aa3ce 100644 --- a/packages/discord.js/src/util/InviteFlagsBitField.js +++ b/packages/discord.js/src/util/InviteFlagsBitField.js @@ -1,7 +1,7 @@ 'use strict'; const { InviteFlags } = require('discord-api-types/v10'); -const { BitField } = require('./BitField.js'); +const BitField = require('./BitField'); /** * Data structure that makes it easy to interact with a {@link GuildInvite#flags} bit field. diff --git a/packages/discord.js/typings/index.d.ts b/packages/discord.js/typings/index.d.ts index 23fa5f2c3c5e..deb0bdf2ca6b 100644 --- a/packages/discord.js/typings/index.d.ts +++ b/packages/discord.js/typings/index.d.ts @@ -37,7 +37,15 @@ import { } from '@discordjs/formatters'; import { Awaitable, JSONEncodable } from '@discordjs/util'; import { Collection, ReadonlyCollection } from '@discordjs/collection'; -import { BaseImageURLOptions, EmojiURLOptions, ImageURLOptions, RawFile, REST, RESTOptions } from '@discordjs/rest'; +import { + BaseImageURLOptions, + EmojiURLOptions, + ImageURLOptions, + RawFile, + REST, + RESTOptions, + ImageSize, +} from '@discordjs/rest'; import { WebSocketManager as WSWebSocketManager, IShardingStrategy, @@ -361,7 +369,8 @@ export type ComponentInLabelData = | RoleSelectMenuComponentData | MentionableSelectMenuComponentData; -export interface LabelData extends BaseComponentData { +export interface LabelComponentData extends BaseComponentData { + type: ComponentType.Label; component: ComponentInLabelData; description?: string; label: string; @@ -2780,7 +2789,7 @@ export interface ModalComponentData { components: readonly ( | JSONEncodable | APILabelComponent> | ActionRowData - | LabelData + | LabelComponentData | TextDisplayComponentData )[]; } @@ -4143,7 +4152,7 @@ export class Formatters extends null { export type ComponentData = | MessageActionRowComponentData | ModalActionRowComponentData - | LabelData + | LabelComponentData | ComponentInLabelData | ComponentInContainerData | ContainerComponentData @@ -8003,3 +8012,6 @@ export * from '@discordjs/formatters'; export * from '@discordjs/rest'; export * from '@discordjs/util'; export * from '@discordjs/ws'; + +// Solve TS compile error +export type { ImageSize }; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2c4c2a82573e..a10f0d5b6c25 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -932,8 +932,8 @@ importers: packages/discord.js: dependencies: '@discordjs/builders': - specifier: ^1.11.2 - version: 1.11.2 + specifier: ^1.12.0 + version: 1.12.0 '@discordjs/collection': specifier: 1.5.3 version: 1.5.3 @@ -953,8 +953,8 @@ importers: specifier: 3.5.3 version: 3.5.3 discord-api-types: - specifier: ^0.38.24 - version: 0.38.24 + specifier: ^0.38.29 + version: 0.38.29 fast-deep-equal: specifier: 3.1.3 version: 3.1.3 @@ -2789,8 +2789,8 @@ packages: resolution: {integrity: sha512-4JINx4Rttha29f50PBsJo48xZXx/He5yaIWJRwVarhYAN947+S84YciHl+AIhQNRPAFkg8+5qFngEGtKxQDWXA==} engines: {node: '>=18.18.0'} - '@discordjs/builders@1.11.2': - resolution: {integrity: sha512-F1WTABdd8/R9D1icJzajC4IuLyyS8f3rTOz66JsSI3pKvpCAtsMBweu8cyNYsIyvcrKAVn9EPK+Psoymq+XC0A==} + '@discordjs/builders@1.12.0': + resolution: {integrity: sha512-jQ0m/fVOg6j3w2Rrzrg5VfqPpkslYNnpdTAyQzQXQ7S/5y0iScBnMlVZfu/AFLP9C34shQ4I+EpTGZV1VlN7RQ==} engines: {node: '>=16.11.0'} '@discordjs/collection@1.5.3': @@ -8360,6 +8360,9 @@ packages: discord-api-types@0.38.24: resolution: {integrity: sha512-P7/DkcFIiIoaBogStnhhcGRX7KR+gIFp0SpmwsZUIM0bgDkYMEUx+8l+t3quYc/KSgg92wvE9w/4mabO57EMug==} + discord-api-types@0.38.29: + resolution: {integrity: sha512-+5BfrjLJN1hrrcK0MxDQli6NSv5lQH7Y3/qaOfk9+k7itex8RkA/UcevVMMLe8B4IKIawr4ITBTb2fBB2vDORg==} + dlv@1.1.3: resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==} @@ -16318,12 +16321,12 @@ snapshots: tar-stream: 3.1.7 which: 4.0.0 - '@discordjs/builders@1.11.2': + '@discordjs/builders@1.12.0': dependencies: '@discordjs/formatters': 0.6.1 '@discordjs/util': 1.1.1 '@sapphire/shapeshift': 4.0.0 - discord-api-types: 0.38.24 + discord-api-types: 0.38.29 fast-deep-equal: 3.1.3 ts-mixer: 6.0.4 tslib: 2.8.1 @@ -16334,7 +16337,7 @@ snapshots: '@discordjs/formatters@0.6.1': dependencies: - discord-api-types: 0.38.24 + discord-api-types: 0.38.29 '@discordjs/rest@2.5.1': dependencies: @@ -16343,7 +16346,7 @@ snapshots: '@sapphire/async-queue': 1.5.3 '@sapphire/snowflake': 3.5.3 '@vladfrangu/async_event_emitter': 2.4.6 - discord-api-types: 0.38.24 + discord-api-types: 0.38.29 magic-bytes.js: 1.10.0 tslib: 2.8.1 undici: 6.21.3 @@ -16358,7 +16361,7 @@ snapshots: '@sapphire/async-queue': 1.5.3 '@types/ws': 8.5.12 '@vladfrangu/async_event_emitter': 2.4.6 - discord-api-types: 0.38.24 + discord-api-types: 0.38.29 tslib: 2.8.1 ws: 8.18.0(bufferutil@4.0.8)(utf-8-validate@6.0.4) transitivePeerDependencies: @@ -23713,6 +23716,8 @@ snapshots: discord-api-types@0.38.24: {} + discord-api-types@0.38.29: {} + dlv@1.1.3: {} dmd@6.2.3: