Merge pull request #277 from discordjs/main

GulajavaMinistudio · web-flow · commit cc651f6c55a5 · 2025-12-10T13:22:53.000+07:00
Create a new pull request by comparing changes across two branches.
diff --git a/apps/guide/package.json b/apps/guide/package.json
@@ -49,50 +49,33 @@
 	"funding": "https://github.com/discordjs/discord.js?sponsor",
 	"dependencies": {
 		"@opennextjs/cloudflare": "^1.14.4",
-		"@react-icons/all-files": "^4.1.0",
 		"@vercel/analytics": "^1.6.1",
-		"cmdk": "^1.1.1",
-		"cva": "1.0.0-beta.3",
 		"fumadocs-core": "^16.2.3",
 		"fumadocs-mdx": "^14.1.0",
 		"fumadocs-twoslash": "^3.1.10",
 		"fumadocs-ui": "^16.2.3",
 		"geist": "^1.5.1",
-		"immer": "^10.2.0",
-		"jotai": "^2.15.2",
-		"jotai-immer": "^0.4.1",
-		"lucide-react": "^0.548.0",
+		"lucide-react": "^0.556.0",
 		"mermaid": "^11.12.2",
-		"motion": "^12.23.25",
 		"next": "^16.0.7",
-		"next-mdx-remote-client": "^2.1.7",
 		"next-themes": "^0.4.6",
-		"nuqs": "^2.8.3",
 		"p-retry": "^7.1.0",
 		"react": "^19.2.1",
-		"react-aria": "^3.44.0",
-		"react-aria-components": "^1.13.0",
 		"react-dom": "^19.2.1",
-		"react-error-boundary": "^6.0.0",
-		"safe-mdx": "^1.3.9",
 		"sharp": "^0.34.5",
 		"tailwind-merge": "^3.4.0",
 		"tw-animate-css": "^1.4.0",
-		"twoslash": "^0.3.4",
-		"usehooks-ts": "^3.1.1"
+		"twoslash": "^0.3.4"
 	},
 	"devDependencies": {
-		"@next/env": "^16.0.7",
 		"@shikijs/rehype": "^3.19.0",
 		"@tailwindcss/postcss": "^4.1.17",
-		"@tailwindcss/typography": "^0.5.19",
-		"@tailwindcss/vite": "^4.1.17",
 		"@types/mdx": "^2.0.13",
 		"@types/node": "^24.10.1",
 		"@types/react": "^19.2.7",
 		"@types/react-dom": "^19.2.3",
 		"autoprefixer": "^10.4.22",
-		"babel-plugin-react-compiler": "19.1.0-rc.3",
+		"babel-plugin-react-compiler": "^1.0.0",
 		"cpy-cli": "^6.0.0",
 		"cross-env": "^10.1.0",
 		"eslint": "^9.39.1",
@@ -106,10 +89,9 @@
 		"remark-rehype": "^11.1.2",
 		"shiki": "^3.19.0",
 		"tailwindcss": "^4.1.17",
-		"tailwindcss-react-aria-components": "^2.0.1",
 		"turbo": "^2.6.3",
-		"typescript": "^5.9.3",
-		"vercel": "^48.12.1",
+		"typescript": "~5.9.3",
+		"vercel": "^49.1.2",
 		"wrangler": "^4.53.0"
 	},
 	"engines": {
diff --git a/apps/website/package.json b/apps/website/package.json
@@ -56,20 +56,15 @@
 		"@react-icons/all-files": "^4.1.0",
 		"@tanstack/react-query": "^5.90.12",
 		"@vercel/analytics": "^1.6.1",
-		"@vercel/edge-config": "^1.4.3",
 		"@vercel/postgres": "^0.10.0",
 		"cloudflare": "^5.2.0",
 		"cmdk": "^1.1.1",
 		"cva": "1.0.0-beta.3",
 		"geist": "^1.5.1",
-		"immer": "^10.2.0",
 		"jotai": "^2.15.2",
-		"jotai-immer": "^0.4.1",
-		"lucide-react": "^0.548.0",
-		"meilisearch": "^0.53.0",
-		"motion": "^12.23.25",
+		"lucide-react": "^0.556.0",
+		"meilisearch": "^0.54.0",
 		"next": "^16.0.7",
-		"next-mdx-remote-client": "^2.1.7",
 		"next-themes": "^0.4.6",
 		"nuqs": "^2.8.3",
 		"overlayscrollbars": "^2.13.0",
@@ -78,24 +73,21 @@
 		"react-aria": "^3.44.0",
 		"react-aria-components": "^1.13.0",
 		"react-dom": "^19.2.1",
-		"react-error-boundary": "^6.0.0",
 		"safe-mdx": "^1.3.9",
 		"sharp": "^0.34.5",
 		"tailwind-merge": "^3.4.0",
 		"tw-animate-css": "^1.4.0",
 		"usehooks-ts": "^3.1.1"
 	},
 	"devDependencies": {
-		"@next/env": "^16.0.7",
 		"@shikijs/rehype": "^3.19.0",
 		"@tailwindcss/postcss": "^4.1.17",
 		"@tailwindcss/typography": "^0.5.19",
-		"@tailwindcss/vite": "^4.1.17",
 		"@types/node": "^24.10.1",
 		"@types/react": "^19.2.7",
 		"@types/react-dom": "^19.2.3",
 		"autoprefixer": "^10.4.22",
-		"babel-plugin-react-compiler": "19.1.0-rc.3",
+		"babel-plugin-react-compiler": "^1.0.0",
 		"cpy-cli": "^6.0.0",
 		"cross-env": "^10.1.0",
 		"eslint": "^9.39.1",
@@ -111,8 +103,8 @@
 		"tailwindcss": "^4.1.17",
 		"tailwindcss-react-aria-components": "^2.0.1",
 		"turbo": "^2.6.3",
-		"typescript": "^5.9.3",
-		"vercel": "^48.12.1",
+		"typescript": "~5.9.3",
+		"vercel": "^49.1.2",
 		"wrangler": "^4.53.0"
 	},
 	"engines": {
diff --git a/package.json b/package.json
@@ -71,13 +71,13 @@
 		"tsup": "^8.5.1",
 		"turbo": "^2.6.3",
 		"typescript": "~5.9.3",
-		"typescript-eslint": "^8.48.1",
+		"typescript-eslint": "^8.49.0",
 		"unocss": "^66.5.10",
-		"vercel": "^48.12.1",
+		"vercel": "^49.1.2",
 		"vitest": "^4.0.15"
 	},
 	"engines": {
 		"node": ">=22.12.0"
 	},
-	"packageManager": "pnpm@10.24.0"
+	"packageManager": "pnpm@10.25.0"
 }
diff --git a/packages/actions/package.json b/packages/actions/package.json
@@ -48,16 +48,16 @@
 		"@discordjs/scripts": "workspace:^",
 		"cloudflare": "^5.2.0",
 		"commander": "^14.0.2",
-		"meilisearch": "^0.38.0",
+		"meilisearch": "^0.54.0",
 		"p-limit": "^7.2.0",
 		"p-queue": "^9.0.1",
 		"tslib": "^2.8.1",
 		"undici": "7.16.0"
 	},
 	"devDependencies": {
 		"@npm/types": "^2.1.0",
-		"@types/bun": "^1.3.3",
-		"@types/node": "^22.19.1",
+		"@types/bun": "^1.3.4",
+		"@types/node": "^24.10.1",
 		"@vitest/coverage-v8": "^4.0.15",
 		"cross-env": "^10.1.0",
 		"eslint": "^9.39.1",
diff --git a/packages/actions/src/uploadSearchIndices/index.ts b/packages/actions/src/uploadSearchIndices/index.ts
@@ -2,33 +2,35 @@ import process from 'node:process';
 import { setFailed } from '@actions/core';
 import { generateAllIndices } from '@discordjs/scripts';
 import Cloudflare from 'cloudflare';
-import { MeiliSearch } from 'meilisearch';
+import { type EnqueuedTask, MeiliSearch } from 'meilisearch';
 import pLimit from 'p-limit';
 import { fetch } from 'undici';
 
-if (!(process.env.CF_D1_DOCS_API_KEY && process.env.CF_D1_DOCS_ID && process.env.CF_ACCOUNT_ID)) {
+if (!process.env.CF_D1_DOCS_API_KEY || !process.env.CF_D1_DOCS_ID || !process.env.CF_ACCOUNT_ID) {
 	setFailed('Missing Cloudflare D1 environment variables.');
+	process.exit(1);
 }
 
 if (!process.env.SEARCH_API_URL) {
 	setFailed('SEARCH_API_URL is not set');
+	process.exit(1);
 }
 
 if (!process.env.SEARCH_API_KEY) {
 	setFailed('SEARCH_API_KEY is not set');
+	process.exit(1);
 }
 
 const cf = new Cloudflare({
-	apiToken: process.env.CF_D1_DOCS_API_KEY!,
+	apiToken: process.env.CF_D1_DOCS_API_KEY,
 });
 
 const client = new MeiliSearch({
-	host: process.env.SEARCH_API_URL!,
-	apiKey: process.env.SEARCH_API_KEY!,
+	host: process.env.SEARCH_API_URL,
+	apiKey: process.env.SEARCH_API_KEY,
 });
 
-const limit = pLimit(10);
-let promises: Promise<any>[] = [];
+const limit = pLimit(5);
 
 try {
 	console.log('Generating all indices...');
@@ -62,35 +64,31 @@ try {
 
 	console.log('Uploading indices...');
 
-	try {
-		promises = indices.map(async (index) =>
-			limit(async () => {
-				console.log(`Uploading ${index.index}...`);
-				let task;
-				try {
-					task = await client.createIndex(index.index);
-				} catch {}
+	const promises = indices.map(async (index) =>
+		limit(async () => {
+			console.log(`Uploading ${index.index}...`);
+			let task: EnqueuedTask | undefined;
+			try {
+				task = await client.createIndex(index.index);
+			} catch {}
 
-				if (task) {
-					await client.waitForTask(task.taskUid);
-				}
+			if (task) {
+				await client.tasks.waitForTask(task, { timeout: 10_000 });
+			}
 
-				const searchIndex = client.index(index.index);
-				await searchIndex.updateSettings({ sortableAttributes: ['type'] });
+			const searchIndex = client.index(index.index);
+			await searchIndex.updateSettings({ sortableAttributes: ['type'] });
 
-				await searchIndex.addDocuments(index.data);
-			}),
-		);
-	} catch {}
+			await searchIndex.addDocuments(index.data);
+		}),
+	);
+
+	await Promise.all(promises);
 
 	console.log('Uploaded all indices.');
 } catch (error) {
 	const err = error as Error;
+	console.error(err);
 	setFailed(err.message);
-}
-
-try {
-	await Promise.all(promises);
-} catch (error) {
-	console.log(error);
+	process.exit(1);
 }
diff --git a/packages/api-extractor-model/package.json b/packages/api-extractor-model/package.json
@@ -36,7 +36,7 @@
 		"@rushstack/node-core-library": "5.13.1"
 	},
 	"devDependencies": {
-		"@types/node": "^22.19.1",
+		"@types/node": "^24.10.1",
 		"cross-env": "^10.1.0",
 		"eslint": "^9.39.1",
 		"eslint-config-neon": "^0.2.9",
diff --git a/packages/api-extractor-utils/package.json b/packages/api-extractor-utils/package.json
@@ -50,7 +50,7 @@
 		"@microsoft/tsdoc": "~0.15.1"
 	},
 	"devDependencies": {
-		"@types/node": "^22.19.1",
+		"@types/node": "^24.10.1",
 		"cross-env": "^10.1.0",
 		"eslint": "^9.39.1",
 		"eslint-config-neon": "^0.2.9",
diff --git a/packages/api-extractor/package.json b/packages/api-extractor/package.json
@@ -64,7 +64,7 @@
 	},
 	"devDependencies": {
 		"@types/lodash": "^4.17.21",
-		"@types/node": "^22.19.1",
+		"@types/node": "^24.10.1",
 		"@types/resolve": "^1.20.6",
 		"@types/semver": "^7.7.1",
 		"cpy-cli": "^6.0.0",
diff --git a/packages/builders/__tests__/messages/embed.test.ts b/packages/builders/__tests__/messages/embed.test.ts
@@ -1,5 +1,6 @@
+import { embedLength } from '@discordjs/util';
 import { describe, test, expect } from 'vitest';
-import { EmbedBuilder, embedLength } from '../../src/index.js';
+import { EmbedBuilder } from '../../src/index.js';
 
 const alpha = 'abcdefghijklmnopqrstuvwxyz';
 
diff --git a/packages/builders/src/index.ts b/packages/builders/src/index.ts
@@ -89,7 +89,6 @@ export * from './messages/Attachment.js';
 export * from './messages/Message.js';
 export * from './messages/MessageReference.js';
 
-export * from './util/componentUtil.js';
 export * from './util/normalizeArray.js';
 export * from './util/resolveBuilder.js';
 export { disableValidators, enableValidators, isValidationEnabled } from './util/validation.js';
diff --git a/packages/builders/src/messages/embed/Assertions.ts b/packages/builders/src/messages/embed/Assertions.ts
@@ -1,5 +1,5 @@
+import { embedLength } from '@discordjs/util';
 import { z } from 'zod';
-import { embedLength } from '../../util/componentUtil.js';
 
 const namePredicate = z.string().max(256);
 
diff --git a/packages/collection/__tests__/collection.test.ts b/packages/collection/__tests__/collection.test.ts
@@ -207,6 +207,23 @@ describe('equals() tests', () => {
 		const coll3 = createCollectionFrom(['a', 2], ['b', 3], ['c', 3]);
 		expect(coll2.equals(coll3)).toBeFalsy();
 	});
+
+	test('collections with undefined values should be compared correctly', () => {
+		const collWithUndefined1 = new Collection<string, number | undefined>([
+			['a', 1],
+			['b', undefined],
+		]);
+		const collWithUndefined2 = new Collection<string, number | undefined>([
+			['a', 1],
+			['b', undefined],
+		]);
+		const collWithDifferentKeys = new Collection<string, number | undefined>([
+			['a', 1],
+			['c', undefined],
+		]);
+		expect(collWithUndefined1.equals(collWithUndefined2)).toBeTruthy();
+		expect(collWithUndefined1.equals(collWithDifferentKeys)).toBeFalsy();
+	});
 });
 
 describe('every() tests', () => {
diff --git a/packages/collection/src/collection.ts b/packages/collection/src/collection.ts
@@ -822,7 +822,11 @@ export class Collection<Key, Value> extends Map<Key, Value> {
 		if (this === collection) return true;
 		if (this.size !== collection.size) return false;
 		for (const [key, value] of this) {
-			if (!collection.has(key) || value !== collection.get(key)) {
+			const otherValue = collection.get(key);
+			// If values differ, collections aren't equal.
+			// For undefined values, we must also verify the key exists in the other collection,
+			// since get() returns undefined for both missing keys and keys with undefined values.
+			if (otherValue !== value || (otherValue === undefined && !collection.has(key))) {
 				return false;
 			}
 		}
diff --git a/packages/discord.js/package.json b/packages/discord.js/package.json
@@ -92,8 +92,6 @@
     "eslint-config-neon": "^0.2.9",
     "eslint-formatter-compact": "^9.0.1",
     "eslint-formatter-pretty": "^7.0.0",
-    "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-jsdoc": "^54.7.0",
     "prettier": "^3.7.4",
     "tsd": "^0.33.0",
     "turbo": "^2.6.3",
diff --git a/packages/discord.js/src/structures/Embed.js b/packages/discord.js/src/structures/Embed.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { embedLength } = require('@discordjs/builders');
+const { embedLength } = require('@discordjs/util');
 const isEqual = require('fast-deep-equal');
 
 /**
diff --git a/packages/docgen/package.json b/packages/docgen/package.json
@@ -67,7 +67,7 @@
 	},
 	"devDependencies": {
 		"@types/jsdoc-to-markdown": "^7.0.6",
-		"@types/node": "^22.19.1",
+		"@types/node": "^24.10.1",
 		"cross-env": "^10.1.0",
 		"eslint": "^9.39.1",
 		"eslint-config-neon": "^0.2.9",
diff --git a/packages/scripts/package.json b/packages/scripts/package.json
@@ -74,7 +74,7 @@
 	},
 	"devDependencies": {
 		"@turbo/gen": "^2.6.3",
-		"@types/node": "^22.19.1",
+		"@types/node": "^24.10.1",
 		"cross-env": "^10.1.0",
 		"eslint": "^9.39.1",
 		"eslint-config-neon": "^0.2.9",
diff --git a/packages/scripts/src/generateIndex.ts b/packages/scripts/src/generateIndex.ts
@@ -167,7 +167,10 @@ export async function generateAllIndices({
 	fetchPackageVersionDocs = fetchVersionDocs,
 	writeToFile = true,
 } = {}) {
-	const indices: Record<any, any>[] = [];
+	const indices: {
+		data: ReturnType<typeof visitNodes>;
+		index: string;
+	}[] = [];
 
 	for (const pkg of PACKAGES) {
 		const versions = await fetchPackageVersions(pkg);
diff --git a/packages/ui/package.json b/packages/ui/package.json
diff --git a/packages/util/__tests__/embedLength.test.ts b/packages/util/__tests__/embedLength.test.ts
diff --git a/packages/util/src/functions/embedLength.ts b/packages/util/src/functions/embedLength.ts
diff --git a/packages/util/src/functions/index.ts b/packages/util/src/functions/index.ts
diff --git a/packages/voice/README.md b/packages/voice/README.md
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
