From 201b002ad405b845ace5f708077c1f157bb4126d Mon Sep 17 00:00:00 2001 From: Almeida Date: Mon, 1 May 2023 23:25:51 +0100 Subject: [PATCH] fix: correct `isJSONEncodable()` import (#9495) Co-authored-by: Jiralite <33201955+Jiralite@users.noreply.github.com> --- packages/discord.js/src/managers/ApplicationCommandManager.js | 2 +- packages/discord.js/src/structures/ActionRow.js | 2 +- packages/discord.js/src/structures/ActionRowBuilder.js | 3 ++- packages/discord.js/src/structures/ButtonBuilder.js | 3 ++- packages/discord.js/src/structures/ChannelSelectMenuBuilder.js | 3 ++- packages/discord.js/src/structures/EmbedBuilder.js | 3 ++- .../discord.js/src/structures/MentionableSelectMenuBuilder.js | 3 ++- packages/discord.js/src/structures/MessagePayload.js | 3 +-- packages/discord.js/src/structures/ModalBuilder.js | 3 ++- packages/discord.js/src/structures/RoleSelectMenuBuilder.js | 3 ++- packages/discord.js/src/structures/StringSelectMenuBuilder.js | 3 ++- .../discord.js/src/structures/StringSelectMenuOptionBuilder.js | 3 ++- packages/discord.js/src/structures/TextInputBuilder.js | 3 ++- packages/discord.js/src/structures/UserSelectMenuBuilder.js | 3 ++- .../src/structures/interfaces/InteractionResponses.js | 2 +- 15 files changed, 26 insertions(+), 16 deletions(-) diff --git a/packages/discord.js/src/managers/ApplicationCommandManager.js b/packages/discord.js/src/managers/ApplicationCommandManager.js index 388b7b408fe3..417afc4d3381 100644 --- a/packages/discord.js/src/managers/ApplicationCommandManager.js +++ b/packages/discord.js/src/managers/ApplicationCommandManager.js @@ -1,8 +1,8 @@ 'use strict'; -const { isJSONEncodable } = require('@discordjs/builders'); const { Collection } = require('@discordjs/collection'); const { makeURLSearchParams } = require('@discordjs/rest'); +const { isJSONEncodable } = require('@discordjs/util'); const { Routes } = require('discord-api-types/v10'); const ApplicationCommandPermissionsManager = require('./ApplicationCommandPermissionsManager'); const CachedManager = require('./CachedManager'); diff --git a/packages/discord.js/src/structures/ActionRow.js b/packages/discord.js/src/structures/ActionRow.js index 3f858b7e3c0a..3f39691b1101 100644 --- a/packages/discord.js/src/structures/ActionRow.js +++ b/packages/discord.js/src/structures/ActionRow.js @@ -1,7 +1,7 @@ 'use strict'; const { deprecate } = require('node:util'); -const { isJSONEncodable } = require('@discordjs/builders'); +const { isJSONEncodable } = require('@discordjs/util'); const Component = require('./Component'); const { createComponent } = require('../util/Components'); diff --git a/packages/discord.js/src/structures/ActionRowBuilder.js b/packages/discord.js/src/structures/ActionRowBuilder.js index 1d1650a8e310..962a378c2a41 100644 --- a/packages/discord.js/src/structures/ActionRowBuilder.js +++ b/packages/discord.js/src/structures/ActionRowBuilder.js @@ -1,6 +1,7 @@ 'use strict'; -const { ActionRowBuilder: BuildersActionRow, isJSONEncodable } = require('@discordjs/builders'); +const { ActionRowBuilder: BuildersActionRow } = require('@discordjs/builders'); +const { isJSONEncodable } = require('@discordjs/util'); const { createComponentBuilder } = require('../util/Components'); const { toSnakeCase } = require('../util/Transformers'); diff --git a/packages/discord.js/src/structures/ButtonBuilder.js b/packages/discord.js/src/structures/ButtonBuilder.js index f841f3854238..ada4188a8e5c 100644 --- a/packages/discord.js/src/structures/ButtonBuilder.js +++ b/packages/discord.js/src/structures/ButtonBuilder.js @@ -1,6 +1,7 @@ 'use strict'; -const { ButtonBuilder: BuildersButton, isJSONEncodable } = require('@discordjs/builders'); +const { ButtonBuilder: BuildersButton } = require('@discordjs/builders'); +const { isJSONEncodable } = require('@discordjs/util'); const { toSnakeCase } = require('../util/Transformers'); const { resolvePartialEmoji } = require('../util/Util'); diff --git a/packages/discord.js/src/structures/ChannelSelectMenuBuilder.js b/packages/discord.js/src/structures/ChannelSelectMenuBuilder.js index 54cde0471b74..6d994740587b 100644 --- a/packages/discord.js/src/structures/ChannelSelectMenuBuilder.js +++ b/packages/discord.js/src/structures/ChannelSelectMenuBuilder.js @@ -1,6 +1,7 @@ 'use strict'; -const { ChannelSelectMenuBuilder: BuildersChannelSelectMenu, isJSONEncodable } = require('@discordjs/builders'); +const { ChannelSelectMenuBuilder: BuildersChannelSelectMenu } = require('@discordjs/builders'); +const { isJSONEncodable } = require('@discordjs/util'); const { toSnakeCase } = require('../util/Transformers'); /** diff --git a/packages/discord.js/src/structures/EmbedBuilder.js b/packages/discord.js/src/structures/EmbedBuilder.js index 825d056e1ce2..09fe5725a2b9 100644 --- a/packages/discord.js/src/structures/EmbedBuilder.js +++ b/packages/discord.js/src/structures/EmbedBuilder.js @@ -1,6 +1,7 @@ 'use strict'; -const { EmbedBuilder: BuildersEmbed, isJSONEncodable } = require('@discordjs/builders'); +const { EmbedBuilder: BuildersEmbed } = require('@discordjs/builders'); +const { isJSONEncodable } = require('@discordjs/util'); const { toSnakeCase } = require('../util/Transformers'); const { resolveColor } = require('../util/Util'); diff --git a/packages/discord.js/src/structures/MentionableSelectMenuBuilder.js b/packages/discord.js/src/structures/MentionableSelectMenuBuilder.js index f66616e8ab03..b22f600b90e3 100644 --- a/packages/discord.js/src/structures/MentionableSelectMenuBuilder.js +++ b/packages/discord.js/src/structures/MentionableSelectMenuBuilder.js @@ -1,6 +1,7 @@ 'use strict'; -const { MentionableSelectMenuBuilder: BuildersMentionableSelectMenu, isJSONEncodable } = require('@discordjs/builders'); +const { MentionableSelectMenuBuilder: BuildersMentionableSelectMenu } = require('@discordjs/builders'); +const { isJSONEncodable } = require('@discordjs/util'); const { toSnakeCase } = require('../util/Transformers'); /** diff --git a/packages/discord.js/src/structures/MessagePayload.js b/packages/discord.js/src/structures/MessagePayload.js index a2681afc8cfb..e23730906c8e 100644 --- a/packages/discord.js/src/structures/MessagePayload.js +++ b/packages/discord.js/src/structures/MessagePayload.js @@ -1,8 +1,7 @@ 'use strict'; const { Buffer } = require('node:buffer'); -const { isJSONEncodable } = require('@discordjs/builders'); -const { lazy } = require('@discordjs/util'); +const { lazy, isJSONEncodable } = require('@discordjs/util'); const { MessageFlags } = require('discord-api-types/v10'); const ActionRowBuilder = require('./ActionRowBuilder'); const { DiscordjsRangeError, ErrorCodes } = require('../errors'); diff --git a/packages/discord.js/src/structures/ModalBuilder.js b/packages/discord.js/src/structures/ModalBuilder.js index 40cf5d970c1e..535b4a52a51b 100644 --- a/packages/discord.js/src/structures/ModalBuilder.js +++ b/packages/discord.js/src/structures/ModalBuilder.js @@ -1,6 +1,7 @@ 'use strict'; -const { ModalBuilder: BuildersModal, ComponentBuilder, isJSONEncodable } = require('@discordjs/builders'); +const { ModalBuilder: BuildersModal, ComponentBuilder } = require('@discordjs/builders'); +const { isJSONEncodable } = require('@discordjs/util'); const { toSnakeCase } = require('../util/Transformers'); /** diff --git a/packages/discord.js/src/structures/RoleSelectMenuBuilder.js b/packages/discord.js/src/structures/RoleSelectMenuBuilder.js index c9d98c6f503e..0d80de5ba9b0 100644 --- a/packages/discord.js/src/structures/RoleSelectMenuBuilder.js +++ b/packages/discord.js/src/structures/RoleSelectMenuBuilder.js @@ -1,6 +1,7 @@ 'use strict'; -const { RoleSelectMenuBuilder: BuildersRoleSelectMenu, isJSONEncodable } = require('@discordjs/builders'); +const { RoleSelectMenuBuilder: BuildersRoleSelectMenu } = require('@discordjs/builders'); +const { isJSONEncodable } = require('@discordjs/util'); const { toSnakeCase } = require('../util/Transformers'); /** diff --git a/packages/discord.js/src/structures/StringSelectMenuBuilder.js b/packages/discord.js/src/structures/StringSelectMenuBuilder.js index f82dbbf9bb49..ac555e745401 100644 --- a/packages/discord.js/src/structures/StringSelectMenuBuilder.js +++ b/packages/discord.js/src/structures/StringSelectMenuBuilder.js @@ -1,6 +1,7 @@ 'use strict'; -const { SelectMenuBuilder: BuildersSelectMenu, isJSONEncodable, normalizeArray } = require('@discordjs/builders'); +const { SelectMenuBuilder: BuildersSelectMenu, normalizeArray } = require('@discordjs/builders'); +const { isJSONEncodable } = require('@discordjs/util'); const { toSnakeCase } = require('../util/Transformers'); const { resolvePartialEmoji } = require('../util/Util'); diff --git a/packages/discord.js/src/structures/StringSelectMenuOptionBuilder.js b/packages/discord.js/src/structures/StringSelectMenuOptionBuilder.js index 4b8ee5c8ee7f..d7056a586a83 100644 --- a/packages/discord.js/src/structures/StringSelectMenuOptionBuilder.js +++ b/packages/discord.js/src/structures/StringSelectMenuOptionBuilder.js @@ -1,6 +1,7 @@ 'use strict'; -const { SelectMenuOptionBuilder: BuildersSelectMenuOption, isJSONEncodable } = require('@discordjs/builders'); +const { SelectMenuOptionBuilder: BuildersSelectMenuOption } = require('@discordjs/builders'); +const { isJSONEncodable } = require('@discordjs/util'); const { toSnakeCase } = require('../util/Transformers'); const { resolvePartialEmoji } = require('../util/Util'); diff --git a/packages/discord.js/src/structures/TextInputBuilder.js b/packages/discord.js/src/structures/TextInputBuilder.js index 2109d9c0fcd4..938215495b63 100644 --- a/packages/discord.js/src/structures/TextInputBuilder.js +++ b/packages/discord.js/src/structures/TextInputBuilder.js @@ -1,6 +1,7 @@ 'use strict'; -const { TextInputBuilder: BuildersTextInput, isJSONEncodable } = require('@discordjs/builders'); +const { TextInputBuilder: BuildersTextInput } = require('@discordjs/builders'); +const { isJSONEncodable } = require('@discordjs/util'); const { toSnakeCase } = require('../util/Transformers'); /** diff --git a/packages/discord.js/src/structures/UserSelectMenuBuilder.js b/packages/discord.js/src/structures/UserSelectMenuBuilder.js index e0d6a543d94d..64ec1c6b9a0d 100644 --- a/packages/discord.js/src/structures/UserSelectMenuBuilder.js +++ b/packages/discord.js/src/structures/UserSelectMenuBuilder.js @@ -1,6 +1,7 @@ 'use strict'; -const { UserSelectMenuBuilder: BuildersUserSelectMenu, isJSONEncodable } = require('@discordjs/builders'); +const { UserSelectMenuBuilder: BuildersUserSelectMenu } = require('@discordjs/builders'); +const { isJSONEncodable } = require('@discordjs/util'); const { toSnakeCase } = require('../util/Transformers'); /** diff --git a/packages/discord.js/src/structures/interfaces/InteractionResponses.js b/packages/discord.js/src/structures/interfaces/InteractionResponses.js index d846ac7166bd..15256e3d6c03 100644 --- a/packages/discord.js/src/structures/interfaces/InteractionResponses.js +++ b/packages/discord.js/src/structures/interfaces/InteractionResponses.js @@ -1,6 +1,6 @@ 'use strict'; -const { isJSONEncodable } = require('@discordjs/builders'); +const { isJSONEncodable } = require('@discordjs/util'); const { InteractionResponseType, MessageFlags, Routes, InteractionType } = require('discord-api-types/v10'); const { DiscordjsError, ErrorCodes } = require('../../errors'); const InteractionCollector = require('../InteractionCollector');