Merge branch 'main' into feat/more-structures

Author: Qjuh

.github/workflows/deprecate-tag.yml

@@ -48,6 +48,9 @@ jobs:
         uses: ./packages/actions/src/pnpmCache
 
       - name: Deprecate
-        run: pnpm exec npm-deprecate --name "${{inputs.version}}" --message "${{inputs.message || 'This version is deprecated. Please use a newer version.'}}" --package ${{inputs.package}}
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
+        uses: ./packages/actions/src/deprecateVersion
+        with:
+          package: ${{ inputs.package }}
+          version: ${{ inputs.version }}
+          message: ${{ inputs.message }}
+          node-auth-token: ${{ secrets.NPM_PUBLISH_TOKEN }}

.github/workflows/deprecate-version.yml

@@ -0,0 +1,60 @@
+name: Remove tag
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: The tag to remove
+        required: true
+        type: string
+      message:
+        description: Deprecation message
+        required: false
+        type: string
+jobs:
+  removal:
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'discordjs'
+    strategy:
+      matrix:
+        package:
+          - '@discordjs/brokers'
+          - '@discordjs/builders'
+          - '@discordjs/collection'
+          - '@discordjs/core'
+          - 'create-discord-app'
+          - 'create-discord-bot'
+          - '@discordjs/formatters'
+          - 'discord.js'
+          - '@discordjs/next'
+          - '@discordjs/proxy'
+          - '@discordjs/rest'
+          - '@discordjs/structures'
+          - '@discordjs/util'
+          - '@discordjs/voice'
+          - '@discordjs/ws'
+      fail-fast: false
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+
+      - name: Install Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: 24
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Install dependencies
+        uses: ./packages/actions/src/pnpmCache
+
+      - name: Remove tag
+        run: pnpm dist-tag rm "${{ matrix.package }}" "${{ inputs.tag }}"
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
+
+      - name: Deprecate version
+        uses: ./packages/actions/src/deprecateVersion
+        with:
+          package: ${{ matrix.package }}
+          version: '*-${{ inputs.tag }}.*'
+          message: ${{ inputs.message }}
+          node-auth-token: ${{ secrets.NPM_PUBLISH_TOKEN }}

.github/workflows/remove-tag.yml

@@ -2,7 +2,7 @@
 	"pages": [
 		"[MessageCircleQuestion][FAQ](/legacy/popular-topics/faq)",
 		"[ArrowDownToLine][Updating to v14](/legacy/additional-info/changes-in-v14)",
-		"[LibraryBig][Documentation](https://discord.js.org/docs)",
+		"external:[LibraryBig][Documentation](https://discord.js.org/docs)",
 		"[Info][Introduction](/legacy)",
 		"---Setup---",
 		"preparations",

apps/guide/content/docs/legacy/meta.json

@@ -20,7 +20,7 @@ To use the display components, you need to pass the `IsComponentsV2` message fla
 
 ## The component `id`
 
-All components can be passed an optional, unique, `id` field holding a 32-bit integer identifier to later identify them in interaction responses. Do not confuse this with the `custom_id` field for interactive components! You can find more information about this [in the discord api documentation](https://discord.com/developers/docs/components/reference#anatomy-of-a-component). Discord will automatically populate the `id` of components that don't have the `id` specified in the payload sequentially starting from `1`. The `id` value `0` is treated as empty. The order components are automatically filled in is an implementation detail and not officially document. If you want to work with the `id` (for example to find and replace the content of a specific component lateron), you should explicitly specify it.
+All components can be passed an optional, unique, `id` field holding a 32-bit integer identifier to later identify them in interaction responses. Do not confuse this with the `custom_id` field for interactive components! You can find more information about this [in the discord api documentation](https://discord.com/developers/docs/components/reference#anatomy-of-a-component). Discord will automatically populate the `id` of components that don't have the `id` specified in the payload sequentially starting from `1`. The `id` value `0` is treated as empty. The order components are automatically filled in is an implementation detail and not officially document. If you want to work with the `id` (for example to find and replace the content of a specific component later on), you should explicitly specify it.
 
 In the following sections, we will explain all available display component types in detail and show you some examples on how you can use them.
 

apps/guide/content/docs/legacy/popular-topics/display-components.mdx

@@ -93,7 +93,7 @@ const thread = await channel.threads.create({
 console.log(`Created thread: ${thread.name}`);
 ```
 
-They can also be created from an existing message with the `Message#startThread` method, but will be "orphaned" if that message is deleted. The thread is not deleted along with the message and will still be available through the hcannels thread list!
+They can also be created from an existing message with the `Message#startThread` method, but will be "orphaned" if that message is deleted. The thread is not deleted along with the message and will still be available through the channels thread list!
 
 ```js
 // [!code word:startThread]

apps/guide/content/docs/legacy/popular-topics/threads.mdx

@@ -81,7 +81,7 @@ const resource = createAudioResource('/home/user/voice/music.mp3', {
 	},
 });
 
-// Not recommended - listen to errors from the audio player instead for most usecases!
+// Not recommended - listen to errors from the audio player instead for most use cases!
 resource.playStream.on('error', (error) => {
 	console.error('Error:', error.message, 'with track', resource.metadata.title);
 });

apps/guide/content/docs/voice/audio-resources.mdx

@@ -2,7 +2,7 @@
 	"title": "Voice",
 	"description": "Working with the voice library",
 	"pages": [
-		"[LibraryBig][Documentation](https://discord.js.org/docs/packages/voice/main)",
+		"external:[LibraryBig][Documentation](https://discord.js.org/docs/packages/voice/main)",
 		"---Working with Voice---",
 		"index",
 		"life-cycles",

apps/guide/content/docs/voice/meta.json

@@ -3,13 +3,14 @@
 import { Loader2Icon } from 'lucide-react';
 import { useParams, useRouter } from 'next/navigation';
 import { Select, SelectList, SelectOption, SelectTrigger } from '@/components/ui/Select';
+import type { EntryPoint } from '@/util/fetchEntryPoints';
 import { parseDocsPathParams } from '@/util/parseDocsPathParams';
 
 export function EntryPointSelect({
 	entryPoints,
 	isLoading,
 }: {
-	readonly entryPoints: { readonly entryPoint: string }[];
+	readonly entryPoints: EntryPoint[];
 	readonly isLoading: boolean;
 }) {
 	const router = useRouter();

apps/website/src/components/EntrypointSelect.tsx

@@ -12,6 +12,7 @@ import { VersionSelect } from '@/components/VersionSelect';
 import { SidebarHeader as BasSidebarHeader } from '@/components/ui/Sidebar';
 import { buttonStyles } from '@/styles/ui/button';
 import { PACKAGES_WITH_ENTRY_POINTS } from '@/util/constants';
+import type { EntryPoint } from '@/util/fetchEntryPoints';
 
 export function SidebarHeader() {
 	const params = useParams<{
@@ -21,7 +22,7 @@ export function SidebarHeader() {
 
 	const hasEntryPoints = PACKAGES_WITH_ENTRY_POINTS.includes(params.packageName);
 
-	const { data: entryPoints, isLoading: isLoadingEntryPoints } = useQuery({
+	const { data: entryPoints, isLoading: isLoadingEntryPoints } = useQuery<EntryPoint[]>({
 		queryKey: ['entryPoints', params.packageName, params.version],
 		queryFn: async () => {
 			const response = await fetch(`/api/docs/entrypoints?packageName=${params.packageName}&version=${params.version}`);
@@ -43,7 +44,10 @@ export function SidebarHeader() {
 		<BasSidebarHeader className="bg-[#f3f3f4] p-4 dark:bg-[#121214]">
 			<div className="flex flex-col gap-2">
 				<div className="flex place-content-between place-items-center p-1">
-					<Link className="text-xl font-bold" href={`/docs/packages/${params.packageName}/${params.version}`}>
+					<Link
+						className="text-xl font-bold"
+						href={`/docs/packages/${params.packageName}/${params.version}${hasEntryPoints ? `/${entryPoints?.[0]?.entryPoint ?? ''}` : ''}`}
+					>
 						{params.packageName}
 					</Link>
 					<div className="flex place-items-center gap-2">