From 11438c230b785d9bd919503e80498d17ee2cd4bd Mon Sep 17 00:00:00 2001 From: Jiralite <33201955+Jiralite@users.noreply.github.com> Date: Mon, 13 Jan 2025 04:48:30 +0000 Subject: [PATCH] refactor!: Unpin @discordjs/collection (#10665) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BREAKING CHANGE: discord.js now uses @discordjs/collection v3—a major version increase. --- packages/discord.js/package.json | 2 +- packages/discord.js/src/util/Util.js | 2 +- pnpm-lock.yaml | 10 ++-------- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/packages/discord.js/package.json b/packages/discord.js/package.json index 471617e6a..3e378d4f6 100644 --- a/packages/discord.js/package.json +++ b/packages/discord.js/package.json @@ -66,7 +66,7 @@ "funding": "https://github.com/discordjs/discord.js?sponsor", "dependencies": { "@discordjs/builders": "^1.9.0", - "@discordjs/collection": "1.5.3", + "@discordjs/collection": "workspace:^", "@discordjs/formatters": "workspace:^", "@discordjs/rest": "workspace:^", "@discordjs/util": "workspace:^", diff --git a/packages/discord.js/src/util/Util.js b/packages/discord.js/src/util/Util.js index 1214ad71f..275d63f54 100644 --- a/packages/discord.js/src/util/Util.js +++ b/packages/discord.js/src/util/Util.js @@ -309,7 +309,7 @@ function resolveColor(color) { */ function discordSort(collection) { const isGuildChannel = collection.first() instanceof GuildChannel; - return collection.sorted( + return collection.toSorted( isGuildChannel ? (a, b) => a.rawPosition - b.rawPosition || Number(BigInt(a.id) - BigInt(b.id)) : (a, b) => a.rawPosition - b.rawPosition || Number(BigInt(b.id) - BigInt(a.id)), diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9e4767b27..e3e164166 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -923,8 +923,8 @@ importers: specifier: ^1.9.0 version: 1.9.0 '@discordjs/collection': - specifier: 1.5.3 - version: 1.5.3 + specifier: workspace:^ + version: link:../collection '@discordjs/formatters': specifier: workspace:^ version: link:../formatters @@ -2194,10 +2194,6 @@ packages: resolution: {integrity: sha512-0zx8DePNVvQibh5ly5kCEei5wtPBIUbSoE9n+91Rlladz4tgtFbJ36PZMxxZrTEOQ7AHMZ/b0crT/0fCy6FTKg==} engines: {node: '>=18'} - '@discordjs/collection@1.5.3': - resolution: {integrity: sha512-SVb428OMd3WO1paV3rm6tSjM4wC+Kecaa1EUGX7vc6/fddvw/6lg90z4QtCqm21zvVe92vMMDt9+DkIvjXImQQ==} - engines: {node: '>=16.11.0'} - '@discordjs/formatters@0.5.0': resolution: {integrity: sha512-98b3i+Y19RFq1Xke4NkVY46x8KjJQjldHUuEbCqMvp1F5Iq9HgnGpu91jOi/Ufazhty32eRsKnnzS8n4c+L93g==} engines: {node: '>=18'} @@ -13921,8 +13917,6 @@ snapshots: ts-mixer: 6.0.4 tslib: 2.8.1 - '@discordjs/collection@1.5.3': {} - '@discordjs/formatters@0.5.0': dependencies: discord-api-types: 0.37.97