chore: deps update

This reverts commit 7b2a2e3a15.

.commitlintrc.json

@@ -1,11 +1,13 @@
 {
+	"$schema": "https://json.schemastore.org/commitlintrc.json",
 	"extends": ["@commitlint/config-angular"],
 	"rules": {
 		"type-enum": [
 			2,
 			"always",
-			["chore", "build", "ci", "docs", "feat", "fix", "perf", "refactor", "revert", "style", "test", "types", "typings"]
+			["chore", "build", "ci", "docs", "feat", "fix", "perf", "refactor", "revert", "style", "test", "types"]
 		],
-		"scope-case": [0]
+		"scope-case": [0],
+		"subject-exclamation-mark": [0]
 	}
 }

.dockerignore

@@ -1,31 +1,33 @@
 # Packages
-node_modules/
+**/node_modules
 
 # Log files
-logs/
-*.log
-npm-debug.log*
+**/logs
+**/*.log
+**/npm-debug.log*
 
 # Runtime data
-pids
-*.pid
-*.seed
+**/pids
+**/*.pid
+**/*.seed
 
 # Env
-.env
+**/.env
 
 # Dist
-dist/
+**/dist/
+**/dist-docs/
 
 # Miscellaneous
-.tmp/
-.vscode/*
-.idea/
-.DS_Store
-.turbo
-tsconfig.tsbuildinfo
-coverage/
-__tests__/
+**/.tmp
+**/.vscode
+**/.idea
+**/.DS_Store
+**/.turbo
+**/tsconfig.tsbuildinfo
+**/coverage
+**/__tests__
+**/out
 
 # yarn
 .pnp.*
@@ -37,20 +39,29 @@ __tests__/
 !.yarn/versions
 
 # Cache
-.prettiercache
-.eslintcache
+**/.prettiercache
+**/.eslintcache
+**/.vercel
 
 # Docker specific
-.cliff-jumperrc.json
-api-extractor.json
-.eslintrc.json
-.lintstagedrc.cjs
-.lintstagedrc.cjs
-.prettierignore
-.prettierrc.js
-.prettierrc.cjs
-cliff.toml
-CHANGELOG.md
-README.md
-tsconfig.eslint.json
-docs/
+**/.cliff-jumperrc.json
+**/api-extractor.json
+**/api-extractor-docs.json
+**/.eslintignore
+**/.eslintrc.json
+**/.lintstagedrc.js
+**/.lintstagedrc.cjs
+**/.lintstagedrc.json
+**/.prettierignore
+**/.prettierrc.js
+**/.prettierrc.cjs
+**/.prettierrc.json
+**/cliff.toml
+**/CHANGELOG.md
+**/README.md
+**/LICENSE
+**/tsconfig.eslint.json
+**/tsconfig.docs.json
+**/docs/
+**/vitest.config.ts
+

.eslintrc.json

@@ -1,11 +0,0 @@
-{
-	"root": true,
-	"extends": ["neon/common", "neon/node", "neon/typescript", "neon/prettier"],
-	"parserOptions": {
-		"project": "./tsconfig.eslint.json"
-	},
-	"rules": {
-		"@typescript-eslint/consistent-type-definitions": ["error", "interface"]
-	},
-	"ignorePatterns": ["**/dist/*"]
-}

.gitattributes

@@ -1 +1,2 @@
 * text=auto eol=lf
+pnpm-lock.yaml linguist-generated=true text=auto eol=lf

.github/.kodiak.toml

@@ -2,7 +2,7 @@ version = 1
 
 [merge]
 require_automerge_label = false
-blocking_labels = ['blocked']
+blocking_labels = ['blocked', 'in review']
 method = 'squash'
 
 [merge.message]

.github/CODEOWNERS

@@ -13,6 +13,7 @@
 /packages/builders/ @discordjs/builders
 /packages/collection/ @discordjs/collection
 /packages/core/ @discordjs/core
+/packages/create-discord-bot/ @discordjs/guide
 /packages/discord.js/ @discordjs/core
 /packages/docgen/ @iCrawl
 /packages/formatters/ @discordjs/formatters

.github/COMMIT_CONVENTION.md

@@ -7,7 +7,7 @@
 Messages must be matched by the following regex:
 
 ```js
-/^(revert: )?(feat|fix|docs|style|refactor|perf|test|workflow|build|ci|chore|types|wip)(\(.+\))?: .{1,72}/;
+/^(revert: )?(feat|fix|docs|style|refactor|perf|test|build|ci|chore|types)(\(.+\))?!?: .{1,72}/;
 ```
 
 #### Examples
@@ -55,6 +55,7 @@ A commit message consists of a **header**, **body** and **footer**. The header h
 ```
 
 The **header** is mandatory and the **scope** of the header is optional.
+If the commit contains **Breaking Changes**, a `!` can be added before the `:` as an indicator.
 
 ### Revert
 

.github/CONTRIBUTING.md

@@ -11,22 +11,20 @@ is a great boon to your development process.
 To get ready to work on the codebase, please do the following:
 
 1. Fork & clone the repository, and make sure you're on the **main** branch
-2. Run `yarn --immutable` ([install](https://yarnpkg.com/getting-started/install))
-3. Run `yarn build` to build local packages
+2. Run `pnpm install --frozen-lockfile` ([install](https://pnpm.io/installation))
+3. Run `pnpm run build` to build local packages
 4. Code your heart out!
-5. Run `yarn test` to run ESLint and ensure any JSDoc changes are valid
+5. Run `pnpm run test` to run ESLint and ensure any JSDoc changes are valid
 6. [Submit a pull request](https://github.com/discordjs/discord.js/compare) (Make sure you follow the [conventional commit format](https://github.com/discordjs/discord.js/blob/main/.github/COMMIT_CONVENTION.md))
 
 ## Testing changes locally
 
-If you want to test changes you've made locally, you can do so by using `yarn link`. This will create a symlink to your local copy of the discord.js libraries.
+If you want to test changes you've made locally, you can do so by using `pnpm link <package-you-want-to-link-to-your-current-package>`. This will create a symlink to your local copy of the discord.js libraries.
 
 1. Create a new directory `mkdir discordjs-test` and move into it `cd discordjs-test`
-2. Initialize a new yarn 3 project `yarn init -2`
-3. Disable pnp `yarn config set nodeLinker node-modules`
-4. Now link the local discord.js project you cloned earlier `yarn link -A {PATH_TO_DISCORDJS_REPO}`
-5. Install packages you'd like to test locally `yarn add discord.js@latest`, `yarn add @discordjs/rest@latest`, etc. **Note: Make sure you use `latest` tag or else yarn will try to install the remote package from npm**
-6. Import the package in your source code and test them out!
+2. Initialize a new pnpm project `pnpm init`
+3. Now link the discord.js package from the directory you cloned earlier `pnpm link {PATH_TO_DISCORDJS_REPO}/packages/<package>`. (e.g. `pnpm link ~/discord.js/packages/rest`)
+4. Import the package in your source code and test them out!
 
 ### Working with TypeScript packages
 
@@ -34,15 +32,18 @@ When testing local changes, you may notice you need to manually recompile TypeSc
 
 To avoid this you can use the `--watch` parameter in the package build script to automatically recompile the project when changes are detected.
 
-For example, to automatically recompile the `@discordjs/rest` project when changes are detected, run `yarn turbo run build --filter=@discordjs/rest -- --watch` in the root folder of where you cloned the discord.js repo.
+For example, to automatically recompile the `@discordjs/rest` project when changes are detected, run `pnpm turbo run build --filter='@discordjs/rest' -- --watch` in the root folder of where you cloned the discord.js repo.
 
 ## Adding new packages
 
 If you'd like to create another package under the `@discordjs` organization run the following command:
 
 ```sh
-yarn create-package <package-name> [package-description]
+pnpm run create-package <package-name> [package-description]
 ```
 
-This will create new package directory under `packages/` with the required configuration files. You can
-begin to make changes within the `src/` directory.
+This will create new package directory under `packages/` with the required configuration files. You may begin
+to make changes within the `src/` directory. You may also need to:
+
+- Update workflows that utilize packages
+- Update the CODEOWNERS file

.github/ISSUE_TEMPLATE/01-package_bug_report.yml

@@ -18,11 +18,14 @@ body:
         - builders
         - collection
         - core
+        - create-discord-bot
         - formatters
         - next
         - proxy
         - proxy-container
         - rest
+        - ui
+        - util
         - voice
         - ws
     validations:
@@ -58,9 +61,9 @@ body:
       label: Versions
       description: List necessary versions here. This includes your package version, runtime version, operating system etc.
       placeholder: |
-        - discord.js 14.9.0 (`npm ls discord.js` or another package)
-        - Node.js 16.9.0 (`node --version`)
-        - TypeScript 5.0.4 (`npm ls typescript` if you use it)
+        - discord.js 14.12.1 (`npm ls discord.js` or another package)
+        - Node.js 16.11.0 (`node --version`)
+        - TypeScript 5.1.6 (`npm ls typescript` if you use it)
         - macOS Ventura 13.3.1
     validations:
       required: true
@@ -120,6 +123,8 @@ body:
         - GuildScheduledEvents
         - AutoModerationConfiguration
         - AutoModerationExecution
+        - GuildMessagePolls
+        - DirectMessagePolls
       multiple: true
     validations:
       required: true

.github/ISSUE_TEMPLATE/03-feature_request.yml

@@ -20,11 +20,14 @@ body:
         - builders
         - collection
         - core
+        - create-discord-bot
         - formatters
         - next
         - proxy
         - proxy-container
         - rest
+        - ui
+        - util
         - voice
         - ws
     validations:

.github/issue-labeler.yml

@@ -16,6 +16,9 @@ packages:collection:
 packages:core:
   - "### Which (application|package|application or package) is this (bug
     report|feature request) for\\?\\n\\ncore\\n"
+packages:create-discord-bot:
+  - "### Which (application|package|application or package) is this (bug
+    report|feature request) for\\?\\n\\ncreate-discord-bot\\n"
 packages:discord.js:
   - "### Which (application|package|application or package) is this (bug
     report|feature request) for\\?\\n\\ndiscord.js\\n"
@@ -34,6 +37,12 @@ packages:proxy-container:
 packages:rest:
   - "### Which (application|package|application or package) is this (bug
     report|feature request) for\\?\\n\\nrest\\n"
+packages:ui:
+  - "### Which (application|package|application or package) is this (bug
+    report|feature request) for\\?\\n\\ui\\n"
+packages:util:
+  - "### Which (application|package|application or package) is this (bug
+    report|feature request) for\\?\\n\\util\\n"
 packages:voice:
   - "### Which (application|package|application or package) is this (bug
     report|feature request) for\\?\\n\\nvoice\\n"

.github/labeler.yml

@@ -1,51 +1,100 @@
 apps:guide:
-  - apps/guide/*
-  - apps/guide/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - apps/guide/*
+          - apps/guide/**/*
 apps:website:
-  - apps/website/*
-  - apps/website/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - apps/website/*
+          - apps/website/**/*
+packages:api-extractor:
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/api-extractor/*
+          - packages/api-extractor/**/*
+packages:api-extractor-model:
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/api-extractor-model/*
+          - packages/api-extractor-model/**/*
 packages:brokers:
-  - packages/brokers/*
-  - packages/brokers/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/brokers/*
+          - packages/brokers/**/*
 packages:builders:
-  - packages/builders/*
-  - packages/builders/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/builders/*
+          - packages/builders/**/*
 packages:collection:
-  - packages/collection/*
-  - packages/collection/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/collection/*
+          - packages/collection/**/*
 packages:core:
-  - packages/core/*
-  - packages/core/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/core/*
+          - packages/core/**/*
+packages:create-discord-bot:
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/create-discord-bot/*
+          - packages/create-discord-bot/**/*
 packages:discord.js:
-  - packages/discord.js/*
-  - packages/discord.js/**/*
-packages:next:
-  - packages/next/*
-  - packages/next/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/discord.js/*
+          - packages/discord.js/**/*
 packages:docgen:
-  - packages/docgen/*
-  - packages/docgen/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/docgen/*
+          - packages/docgen/**/*
 packages:formatters:
-  - packages/formatters/*
-  - packages/formatters/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/formatters/*
+          - packages/formatters/**/*
+packages:next:
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/next/*
+          - packages/next/**/*
 packages:proxy:
-  - packages/proxy/*
-  - packages/proxy/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/proxy/*
+          - packages/proxy/**/*
 packages:proxy-container:
-  - packages/proxy-container/*
-  - packages/proxy-container/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/proxy-container/*
+          - packages/proxy-container/**/*
 packages:rest:
-  - packages/rest/*
-  - packages/rest/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/rest/*
+          - packages/rest/**/*
 packages:ui:
-  - packages/ui/*
-  - packages/ui/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/ui/*
+          - packages/ui/**/*
 packages:util:
-  - packages/util/*
-  - packages/util/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/util/*
+          - packages/util/**/*
 packages:voice:
-  - packages/voice/*
-  - packages/voice/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/voice/*
+          - packages/voice/**/*
 packages:ws:
-  - packages/ws/*
-  - packages/ws/**/*
+  - changed-files:
+      - any-glob-to-any-file:
+          - packages/ws/*
+          - packages/ws/**/*

.github/labels.yml

@@ -52,6 +52,10 @@
   color: e4e669
 - name: need repro
   color: c66037
+- name: packages:api-extractor
+  color: fbca04
+- name: packages:api-extractor-model
+  color: fbca04
 - name: packages:brokers
   color: fbca04
 - name: packages:builders
@@ -60,14 +64,16 @@
   color: fbca04
 - name: packages:core
   color: fbca04
-- name: packages:discord.js
+- name: packages:create-discord-bot
   color: fbca04
-- name: packages:next
+- name: packages:discord.js
   color: fbca04
 - name: packages:docgen
   color: fbca04
 - name: packages:formatters
   color: fbca04
+- name: packages:next
+  color: fbca04
 - name: packages:proxy
   color: fbca04
 - name: packages:proxy-container

.github/workflows/cleanup-cache.yml

@@ -0,0 +1,35 @@
+# https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#force-deleting-cache-entries
+name: Cleanup caches
+on:
+  pull_request:
+    types:
+      - closed
+  workflow_dispatch:
+jobs:
+  cleanup:
+    name: Cleanup caches
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Cleanup caches
+        run: |
+          gh extension install actions/gh-actions-cache
+
+          REPO=${{ github.repository }}
+          BRANCH="refs/pull/${{ github.event.pull_request.number }}/merge"
+
+          echo "Fetching list of cache key"
+          cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH | cut -f 1 )
+
+          ## Setting this to not fail the workflow while deleting cache keys.
+          set +e
+          echo "Deleting caches..."
+          for cacheKey in $cacheKeysForPR
+          do
+              gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
+          done
+          echo "Done"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/deploy-website.yml

@@ -0,0 +1,34 @@
+name: Deploy website
+on:
+  workflow_dispatch:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+jobs:
+  deploy-website:
+    name: Deploy website
+    runs-on: ubuntu-latest
+    env:
+      VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
+      VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
+    if: github.repository_owner == 'discordjs'
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install Node.js v20
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Install dependencies
+        uses: ./packages/actions/src/pnpmCache
+
+      - name: Pull vercel production environment
+        run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}
+
+      - name: Build website artifacts
+        run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }}
+
+      - name: Deploy website artifacts to vercel
+        run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }}

.github/workflows/deprecate-version.yml

@@ -0,0 +1,50 @@
+name: Deprecate version
+on:
+  workflow_dispatch:
+    inputs:
+      package:
+        description: Package
+        required: true
+        type: choice
+        options:
+          - '@discordjs/brokers'
+          - '@discordjs/builders'
+          - '@discordjs/collection'
+          - '@discordjs/core'
+          - 'create-discord-bot'
+          - '@discordjs/formatters'
+          - 'discord.js'
+          - '@discordjs/next'
+          - '@discordjs/proxy'
+          - '@discordjs/rest'
+          - '@discordjs/util'
+          - '@discordjs/voice'
+          - '@discordjs/ws'
+      version:
+        description: Version(s)
+        required: true
+        type: string
+      message:
+        description: Deprecation message
+        required: false
+        type: string
+jobs:
+  deprecate:
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'discordjs'
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install Node.js v20
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Install dependencies
+        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 }}

.github/workflows/documentation.yml

@@ -5,6 +5,9 @@ on:
       - 'main'
     paths:
       - 'packages/*/src/**'
+      - '!packages/create-discord-bot/**'
+      - '!packages/proxy-container/**'
+      - '!packages/ui/**'
     tags:
       - '**'
   workflow_dispatch:
@@ -23,58 +26,119 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
   cancel-in-progress: true
 jobs:
-  build:
+  build-docs:
     name: Build & upload documentation
     runs-on: ubuntu-latest
     env:
       TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
       TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
+      REF_TYPE: ${{ inputs.ref_type || github.ref_type }}
     if: github.repository_owner == 'discordjs'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref || '' }}
 
-      - name: Install node.js v18
-        uses: actions/setup-node@v3
+      - name: Install Node.js v20
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Install dependencies
-        uses: ./packages/actions/src/yarnCache
+        uses: ./packages/actions/src/pnpmCache
 
       - name: Build dependencies
-        run: yarn build
+        run: pnpm run build
+
+      - name: Checkout main repository
+        if: ${{ inputs.ref && inputs.ref != 'main' }}
+        uses: actions/checkout@v4
+        with:
+          path: 'main'
+
+      - name: Build main
+        if: ${{ inputs.ref && inputs.ref != 'main' }}
+        shell: bash
+        run: |
+          cd main
+          pnpm install --frozen-lockfile --prefer-offline --loglevel error
+          pnpm run build
+          cd ..
+
+      - name: Extract package and semver from tag
+        if: ${{ env.REF_TYPE == 'tag' }}
+        id: extract-tag
+        uses: ./packages/actions/src/formatTag
+        with:
+          tag: ${{ inputs.ref || github.ref_name }}
+
+      - name: Apply tag to api-extractor config
+        if: ${{ env.REF_TYPE == 'tag' && !inputs.ref }}
+        run: sed -i 's!https://github.com/discordjs/discord.js/tree/main!https://github.com/discordjs/discord.js/tree/${{ github.ref_name }}!' "packages/${{ steps.extract-tag.outputs.package}}/api-extractor.json"
 
       - name: Build docs
-        run: yarn docs
+        run: pnpm run docs
+
+      - name: Build docs with main api-extractor
+        if: ${{ inputs.ref && inputs.ref != 'main' }}
+        run: |
+          declare -a PACKAGES=("brokers" "builders" "collection" "core" "discord.js" "formatters" "next" "proxy" "rest" "util" "voice" "ws")
+          for PACKAGE in "${PACKAGES[@]}"; do
+            cd "packages/${PACKAGE}"
+            sed -i 's!https://github.com/discordjs/discord.js/tree/main!https://github.com/discordjs/discord.js/tree/${{ inputs.ref }}!' api-extractor.json
+            ../../main/packages/api-extractor/bin/api-extractor run --local --minify
+            ../../main/packages/scripts/bin/generateSplitDocumentation.js
+            cd ../..
+          done
 
       - name: Checkout docs repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: 'discordjs/docs'
           token: ${{ secrets.DJS_DOCS }}
           path: 'out'
 
-      - name: Extract package and semver from tag
-        if: ${{ github.ref_type == 'tag' }}
-        id: extract-tag
-        uses: ./packages/actions/src/formatTag
-        with:
-          tag: ${{ github.ref_name }}
-
       - name: Upload documentation to database
-        if: ${{ github.ref_type == 'tag' }}
+        if: ${{ env.REF_TYPE == 'tag' && (!inputs.ref || inputs.ref == 'main') }}
         env:
           DATABASE_URL: ${{ secrets.DATABASE_URL }}
+          BLOB_READ_WRITE_TOKEN: ${{ secrets.BLOB_READ_WRITE_TOKEN }}
         uses: ./packages/actions/src/uploadDocumentation
         with:
           package: ${{ steps.extract-tag.outputs.package }}
           version: ${{ steps.extract-tag.outputs.semver }}
 
+      - name: Upload documentation to database
+        if: ${{ env.REF_TYPE == 'tag' && inputs.ref && inputs.ref != 'main' }}
+        env:
+          DATABASE_URL: ${{ secrets.DATABASE_URL }}
+          BLOB_READ_WRITE_TOKEN: ${{ secrets.BLOB_READ_WRITE_TOKEN }}
+        uses: ./main/packages/actions/src/uploadDocumentation
+        with:
+          package: ${{ steps.extract-tag.outputs.package }}
+          version: ${{ steps.extract-tag.outputs.semver }}
+
+      - name: Upload split documentation to blob storage
+        if: ${{ env.REF_TYPE == 'tag' && (!inputs.ref || inputs.ref == 'main') }}
+        env:
+          BLOB_READ_WRITE_TOKEN: ${{ secrets.BLOB_READ_WRITE_TOKEN }}
+        uses: ./packages/actions/src/uploadSplitDocumentation
+        with:
+          package: ${{ steps.extract-tag.outputs.package }}
+          version: ${{ steps.extract-tag.outputs.semver }}
+
+      - name: Upload split documentation to blob storage
+        if: ${{ env.REF_TYPE == 'tag' && inputs.ref && inputs.ref != 'main' }}
+        env:
+          BLOB_READ_WRITE_TOKEN: ${{ secrets.BLOB_READ_WRITE_TOKEN }}
+        uses: ./main/packages/actions/src/uploadSplitDocumentation
+        with:
+          package: ${{ steps.extract-tag.outputs.package }}
+          version: ${{ steps.extract-tag.outputs.semver }}
+
       - name: Move docs to correct directory
-        if: ${{ github.ref_type == 'tag' }}
+        if: ${{ env.REF_TYPE == 'tag' }}
         env:
           PACKAGE: ${{ steps.extract-tag.outputs.package }}
           SEMVER: ${{ steps.extract-tag.outputs.semver }}
@@ -82,24 +146,46 @@ jobs:
           mkdir -p "out/${PACKAGE}"
           if [[ "${PACKAGE}" == "discord.js" ]]; then
             mv "packages/${PACKAGE}/docs/docs.json" "out/${PACKAGE}/${SEMVER}.json"
+            mv "packages/${PACKAGE}/docs/docs.api.json" "out/${PACKAGE}/${SEMVER}.api.json"
           else
             mv "packages/${PACKAGE}/docs/docs.api.json" "out/${PACKAGE}/${SEMVER}.api.json"
           fi
 
       - name: Upload documentation to database
-        if: ${{ github.ref_type == 'branch' }}
+        if: ${{ env.REF_TYPE == 'branch' && (!inputs.ref || inputs.ref == 'main') }}
         env:
           DATABASE_URL: ${{ secrets.DATABASE_URL }}
+          BLOB_READ_WRITE_TOKEN: ${{ secrets.BLOB_READ_WRITE_TOKEN }}
         uses: ./packages/actions/src/uploadDocumentation
 
+      - name: Upload documentation to database
+        if: ${{ env.REF_TYPE == 'branch' && inputs.ref && inputs.ref != 'main' }}
+        env:
+          DATABASE_URL: ${{ secrets.DATABASE_URL }}
+          BLOB_READ_WRITE_TOKEN: ${{ secrets.BLOB_READ_WRITE_TOKEN }}
+        uses: ./main/packages/actions/src/uploadDocumentation
+
+      - name: Upload split documentation to blob storage
+        if: ${{ env.REF_TYPE == 'branch' && (!inputs.ref || inputs.ref == 'main') }}
+        env:
+          BLOB_READ_WRITE_TOKEN: ${{ secrets.BLOB_READ_WRITE_TOKEN }}
+        uses: ./packages/actions/src/uploadSplitDocumentation
+
+      - name: Upload split documentation to blob storage
+        if: ${{ env.REF_TYPE == 'branch' && inputs.ref && inputs.ref != 'main' }}
+        env:
+          BLOB_READ_WRITE_TOKEN: ${{ secrets.BLOB_READ_WRITE_TOKEN }}
+        uses: ./main/packages/actions/src/uploadSplitDocumentation
+
       - name: Move docs to correct directory
-        if: ${{ github.ref_type == 'branch' }}
+        if: ${{ env.REF_TYPE == 'branch' }}
         run: |
-          declare -a PACKAGES=("brokers" "builders" "collection" "core" "discord.js" "next" "formatters" "proxy" "rest" "util" "voice" "ws")
+          declare -a PACKAGES=("brokers" "builders" "collection" "core" "discord.js" "formatters" "next" "proxy" "rest" "util" "voice" "ws")
           for PACKAGE in "${PACKAGES[@]}"; do
             if [[ "${PACKAGE}" == "discord.js" ]]; then
               mkdir -p "out/${PACKAGE}"
               mv "packages/${PACKAGE}/docs/docs.json" "out/${PACKAGE}/${GITHUB_REF_NAME}.json"
+              mv "packages/${PACKAGE}/docs/docs.api.json" "out/${PACKAGE}/${GITHUB_REF_NAME}.api.json"
             else
               mkdir -p "out/${PACKAGE}"
               mv "packages/${PACKAGE}/docs/docs.api.json" "out/${PACKAGE}/${GITHUB_REF_NAME}.api.json"
@@ -114,3 +200,33 @@ jobs:
           git add .
           git commit -m "Docs build for ${GITHUB_REF_TYPE} ${GITHUB_REF_NAME}: ${GITHUB_SHA}" || true
           git push
+
+  build-indices:
+    needs: build-docs
+    name: Build & upload search indices
+    runs-on: ubuntu-latest
+    env:
+      TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+      TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
+    if: github.repository_owner == 'discordjs'
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install Node.js v20
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Install dependencies
+        uses: ./packages/actions/src/pnpmCache
+
+      - name: Build dependencies
+        run: pnpm run build
+
+      - name: Upload search indices to meilisearch
+        env:
+          DATABASE_URL: ${{ secrets.DATABASE_URL }}
+          SEARCH_API_URL: ${{ secrets.SEARCH_API_URL }}
+          SEARCH_API_KEY: ${{ secrets.SEARCH_API_KEY }}
+        uses: ./packages/actions/src/uploadSearchIndices

.github/workflows/issue-triage.yml

@@ -6,7 +6,7 @@ jobs:
   issue-triage:
     runs-on: ubuntu-latest
     steps:
-      - uses: github/issue-labeler@v3.1
+      - uses: github/issue-labeler@v3.4
         with:
           repo-token: '${{ secrets.GITHUB_TOKEN }}'
           configuration-path: .github/issue-labeler.yml

.github/workflows/label-sync.yml

@@ -15,9 +15,9 @@ jobs:
     if: github.repository_owner == 'discordjs'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Label sync
-        uses: crazy-max/ghaction-github-labeler@v4
+        uses: crazy-max/ghaction-github-labeler@v5
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lighthouse-main.yml

@@ -1,20 +0,0 @@
-name: 'Lighthouse Audit (main)'
-on:
-  workflow_dispatch:
-jobs:
-  lighthouse_audit_main:
-    name: 'Lighthouse Audit (main)'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Audit production URLs with Lighthouse
-        id: lighthouse_audit
-        uses: treosh/lighthouse-ci-action@v9
-        with:
-          urls: |
-            https://discordjs.dev
-            https://guide.discordjs.dev
-          uploadArtifacts: true
-          temporaryPublicStorage: true

.github/workflows/lighthouse.yml

@@ -1,88 +0,0 @@
-name: 'Lighthouse Audit'
-on:
-  issue_comment:
-    types: [created, edited]
-jobs:
-  lighthouse_audit:
-    name: 'Lighthouse Audit'
-    if: ${{ github.event.issue.pull_request }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get Vercel preview URL
-        id: get_preview_url
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const comment = context.payload.comment;
-            const regex = /https:\/\/[a-z0-9-]+\.vercel\.app/g;
-            const matches = comment.body.match(regex);
-            let previewUrl = "";
-            if (matches && matches.length) {
-              previewUrl = matches[0];
-              console.log('Preview url found:', previewUrl);
-            }
-            console.log("No preview url found.");
-            core.setOutput('vercel_preview_url', previewUrl);
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Add comment to PR
-        if: ${{ steps.get_preview_url.outputs.vercel_preview_url != '' }}
-        id: loading_comment_to_pr
-        uses: marocchino/sticky-pull-request-comment@v2
-        with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          number: ${{ github.event.issue.number }}
-          header: lighthouse
-          message: |
-            Running Lighthouse audit...
-
-      - name: Checkout repository
-        if: ${{ steps.get_preview_url.outputs.vercel_preview_url != '' }}
-        uses: actions/checkout@v3
-
-      - name: Audit preview URL with Lighthouse
-        if: ${{ steps.get_preview_url.outputs.vercel_preview_url != '' }}
-        id: lighthouse_audit
-        uses: treosh/lighthouse-ci-action@v9
-        with:
-          urls: |
-            ${{ steps.get_preview_url.outputs.vercel_preview_url }}
-          uploadArtifacts: true
-          temporaryPublicStorage: true
-
-      - name: Format lighthouse score
-        if: ${{ steps.get_preview_url.outputs.vercel_preview_url != '' }}
-        id: format_lighthouse_score
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const result = ${{ steps.lighthouse_audit.outputs.manifest }}[0].summary
-            const links = ${{ steps.lighthouse_audit.outputs.links }}
-            const formatResult = (res) => Math.round((res * 100))
-            Object.keys(result).forEach(key => result[key] = formatResult(result[key]))
-            const score = res => res >= 90 ? '🟢' : res >= 50 ? '🟠' : '🔴'
-            const comment = [
-                `⚡️ [Lighthouse report](${Object.values(links)[0]}) for the changes in this PR:`,
-                '| Category | Score |',
-                '| --- | --- |',
-                `| ${score(result.performance)} Performance | ${result.performance} |`,
-                `| ${score(result.accessibility)} Accessibility | ${result.accessibility} |`,
-                `| ${score(result['best-practices'])} Best practices | ${result['best-practices']} |`,
-                `| ${score(result.seo)} SEO | ${result.seo} |`,
-                `| ${score(result.pwa)} PWA | ${result.pwa} |`,
-                ' ',
-                `*Lighthouse ran on [${Object.keys(links)[0]}](${Object.keys(links)[0]})*`
-            ].join('\n')
-             core.setOutput("comment", comment);
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Add comment to PR
-        if: ${{ steps.get_preview_url.outputs.vercel_preview_url != '' }}
-        id: comment_to_pr
-        uses: marocchino/sticky-pull-request-comment@v2
-        with:
-          number: ${{ github.event.issue.number }}
-          header: lighthouse
-          message: |
-            ${{ steps.format_lighthouse_score.outputs.comment }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lock.yml

@@ -3,15 +3,15 @@ on:
   schedule:
     - cron: '0 16 * * *'
   workflow_dispatch:
-permissions:
-  issues: write
 concurrency:
   group: lock
 jobs:
   action:
     runs-on: ubuntu-latest
+    permissions:
+      issues: write
     steps:
-      - uses: dessant/lock-threads@v4
+      - uses: dessant/lock-threads@v5
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           issue-inactive-days: 365

.github/workflows/npm-auto-deprecate.yml

@@ -1,26 +0,0 @@
-name: npm auto deprecate
-on:
-  schedule:
-    - cron: '0 1 * * *'
-  workflow_dispatch:
-jobs:
-  npm-auto-deprecate:
-    name: npm auto deprecate
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'discordjs'
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Install node.js v18
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
-
-      - name: Install dependencies
-        uses: ./packages/actions/src/yarnCache
-
-      - name: Deprecate versions
-        run: 'yarn npm-deprecate --name "*dev*" --package @discordjs/brokers @discordjs/builders @discordjs/collection @discordjs/core @discordjs/formatters discord.js @discordjs/next @discordjs/proxy @discordjs/rest @discordjs/util @discordjs/voice @discordjs/ws'
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}

.github/workflows/pr-triage.yml

@@ -1,13 +1,35 @@
 name: 'PR Triage'
 on:
   pull_request_target:
+    types:
+      - opened
+      - edited
+      - reopened
+      - synchronize
 jobs:
-  pr-triage:
-    name: PR Triage
+  label:
+    name: Label
+    if: github.event.action != 'edited'
     runs-on: ubuntu-latest
     steps:
-      - name: Automatically label PR
-        uses: actions/labeler@v4
+      - name: Label pull request
+        uses: actions/labeler@v5
         with:
           repo-token: '${{ secrets.GITHUB_TOKEN }}'
           sync-labels: true
+  validate-title:
+    name: Validate title
+    if: github.event.action != 'synchronize'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Validate pull request title
+        env:
+          TITLE: ${{ github.event.pull_request.title }}
+        run: |
+          REGEX="^(revert: )?(feat|fix|docs|style|refactor|perf|test|build|ci|chore|types)(\\(.+\\))?!?: .{1,72}$"
+
+          echo "Title: \"$TITLE\""
+
+          if [[ ! "$TITLE" =~ $REGEX ]]; then
+            exit 1
+          fi

.github/workflows/publish-dev-docker.yml

@@ -10,27 +10,21 @@ jobs:
     if: github.repository_owner == 'discordjs'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Install node.js v18
-        uses: actions/setup-node@v3
+      - name: Install Node.js v20
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Install dependencies
-        uses: ./packages/actions/src/yarnCache
-
-      - name: Build dependencies
-        run: yarn build
+        uses: ./packages/actions/src/pnpmCache
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
         run: echo ${{ secrets.DOCKER_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
 
-      - name: Build the image
-        run: yarn docker build @discordjs/proxy-container -t discordjs/proxy:latest
-
-      - name: Push image to DockerHub
-        run: docker push discordjs/proxy:latest
+      - name: Build & push docker image
+        run: docker build -f packages/proxy-container/Dockerfile -t discordjs/proxy:latest --push .

.github/workflows/publish-dev.yml

@@ -35,29 +35,50 @@ jobs:
           - package: '@discordjs/ws'
             folder: 'ws'
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
     env:
       TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
       TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
     if: github.repository_owner == 'discordjs'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Install node.js v18
-        uses: actions/setup-node@v3
+        uses: actions/checkout@v4
         with:
-          node-version: 18
+          fetch-depth: 0
+
+      - name: Install Node.js v20
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
           registry-url: https://registry.npmjs.org/
 
+      - name: Check the current development version
+        id: release-check
+        run: |
+          if [[ $(npm view ${{ matrix.package }}@dev version | grep -e "$(git rev-parse --short HEAD)") ]]; \
+            then echo "RELEASE=0" >> "$GITHUB_OUTPUT"; \
+            else echo "RELEASE=1" >> "$GITHUB_OUTPUT"; \
+          fi
+
       - name: Install dependencies
-        uses: ./packages/actions/src/yarnCache
+        if: steps.release-check.outputs.release == '1'
+        uses: ./packages/actions/src/pnpmCache
 
       - name: Build dependencies
-        run: yarn build
+        if: steps.release-check.outputs.release == '1'
+        run: pnpm run build
 
       - name: Publish package
+        if: steps.release-check.outputs.release == '1'
         run: |
-          yarn workspace ${{ matrix.package }} release --preid "dev.$(date +%s)-$(git rev-parse --short HEAD)"
-          yarn workspace ${{ matrix.package }} npm publish --tag dev || true
+          pnpm --filter=${{ matrix.package }} run release --preid "dev.$(date +%s)-$(git rev-parse --short HEAD)" --skip-changelog
+          pnpm --filter=${{ matrix.package }} publish --provenance --no-git-checks --tag dev || true
         env:
-          YARN_NPM_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
+
+      - name: Deprecate prior development releases
+        if: steps.release-check.outputs.release == '1'
+        run: pnpm exec npm-deprecate --name "*dev*" --message "This version is deprecated. Please use a newer version." --package ${{ matrix.package }}
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}

.github/workflows/publish-docker.yml

@@ -7,30 +7,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Install node.js v18
-        uses: actions/setup-node@v3
+      - name: Install Node.js v20
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Install dependencies
-        uses: ./packages/actions/src/yarnCache
-
-      - name: Build dependencies
-        run: yarn build
+        uses: ./packages/actions/src/pnpmCache
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
         run: echo ${{ secrets.DOCKER_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
 
-      - name: Build docker image
-        run: yarn docker build @discordjs/proxy-container -t discordjs/proxy:latest
-
-      - name: Tag image with major
-        run: docker tag discordjs/proxy discordjs/proxy:$(cut -d '.' -f1 <<< $(jq --raw-output '.version' packages/proxy-container/package.json))
-
-      - name: Push image to DockerHub
-        run: docker push --all-tags discordjs/proxy
+      - name: Build & push docker image
+        run: docker build -f packages/proxy-container/Dockerfile -t discordjs/proxy:$(cut -d '.' -f1 <<< $(jq --raw-output '.version' packages/proxy-container/package.json)) --push .

.github/workflows/publish-release.yml

@@ -6,25 +6,27 @@ jobs:
   npm-publish:
     name: npm publish
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
     env:
       TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
       TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
     if: github.repository_owner == 'discordjs'
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Install node.js v18
-        uses: actions/setup-node@v3
+      - name: Install Node.js v20
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           registry-url: https://registry.npmjs.org/
 
       - name: Install dependencies
-        uses: ./packages/actions/src/yarnCache
+        uses: ./packages/actions/src/pnpmCache
 
       - name: Build dependencies
-        run: yarn build
+        run: pnpm run build
 
       - name: Extract package and semver from tag
         id: extract-tag
@@ -34,6 +36,6 @@ jobs:
 
       - name: Publish package
         run: |
-          yarn workspace ${{ steps.extract-tag.outputs.subpackage == 'true' && '@discordjs/' || '' }}${{ steps.extract-tag.outputs.package }} npm publish
+          pnpm --filter=${{ steps.extract-tag.outputs.subpackage == 'true' && '@discordjs/' || '' }}${{ steps.extract-tag.outputs.package }} publish --provenance --no-git-checks
         env:
-          YARN_NPM_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}

.github/workflows/tests.yml

@@ -15,50 +15,52 @@ jobs:
       TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Install node.js v18
-        uses: actions/setup-node@v3
+      - name: Install Node.js v20
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Install dependencies
-        uses: ./packages/actions/src/yarnCache
+        uses: ./packages/actions/src/pnpmCache
 
       - name: Build dependencies (PR)
         if: ${{ github.event_name != 'push' }}
-        run: yarn build --filter="...[origin/${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref || 'main' }}]"
+        run: pnpm exec turbo run build --filter="...[origin/${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref || 'main' }}]" --concurrency=4
 
       - name: Build dependencies (Push)
         if: ${{ github.event_name == 'push' }}
-        run: yarn build --filter="...[HEAD^1]"
-
-      - name: ESLint (PR)
-        if: ${{ github.event_name != 'push' }}
-        run: yarn lint --filter="...[origin/${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref || 'main' }}]" -- --format=compact
-
-      - name: ESLint (Push)
-        if: ${{ github.event_name == 'push' }}
-        run: yarn lint --filter="...[HEAD^1]" -- --format=compact
+        run: pnpm exec turbo run build --filter="...[HEAD^1]" --concurrency=4
 
       - name: Tests (PR)
         if: ${{ github.event_name != 'push' }}
-        run: yarn test --filter="...[origin/${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref || 'main' }}]"
+        run: pnpm exec turbo run test --filter="...[origin/${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref || 'main' }}]" --concurrency=4
 
       - name: Tests (Push)
         if: ${{ github.event_name == 'push' }}
-        run: yarn test --filter="...[HEAD^1]"
+        run: pnpm exec turbo run test --filter="...[HEAD^1]" --concurrency=4
+
+      - name: ESLint (PR)
+        if: ${{ github.event_name != 'push' }}
+        run: pnpm exec turbo run lint --filter="...[origin/${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref || 'main' }}]" --concurrency=4 -- --format=compact
+
+      - name: ESLint (Push)
+        if: ${{ github.event_name == 'push' }}
+        run: pnpm exec turbo run lint --filter="...[HEAD^1]" --concurrency=4 -- --format=compact
 
       - name: Docs (PR)
         if: ${{ github.event_name != 'push' }}
-        run: yarn docs --filter="...[origin/${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref || 'main' }}]"
+        run: pnpm exec turbo run docs --filter="...[origin/${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref || 'main' }}]" --concurrency=4
 
       - name: Docs (Push)
         if: ${{ github.event_name == 'push' }}
-        run: yarn docs --filter="...[HEAD^1]"
+        run: pnpm exec turbo run docs --filter="...[HEAD^1]" --concurrency=4
 
       - name: Upload Coverage
         if: github.repository_owner == 'discordjs'
         uses: ./packages/actions/src/uploadCoverage
+        with:
+          codecov_token: ${{ secrets.CODECOV_TOKEN }}

.gitignore

@@ -1,8 +1,8 @@
 # Packages
-node_modules/
+node_modules
 
 # Log files
-logs/
+logs
 *.log
 npm-debug.log*
 
@@ -15,20 +15,29 @@ pids
 .env
 
 # Dist
-dist/
-dist-docs/
+dist
+dist-docs
 
 # Miscellaneous
-.tmp/
+.tmp
 .vscode/*
 !.vscode/extensions.json
 !.vscode/settings.json
-.idea/
+.idea
 .DS_Store
 .turbo
 tsconfig.tsbuildinfo
-coverage/
-out/
+coverage
+out
+package.tgz
+tsup.config.bundled*
+vitest.config.ts.timestamp*
+
+# Deno
+deno.lock
+
+# Bun
+bun.lockb
 
 # yarn
 .pnp.*

.husky/commit-msg

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-yarn commitlint --edit $1
+pnpm exec commitlint --edit $1

.husky/pre-commit

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-yarn build:affected && yarn lint-staged
+pnpm run build:affected && pnpm exec lint-staged

.lintstagedrc.json

@@ -1,5 +1,6 @@
 {
+	"$schema": "https://json.schemastore.org/lintstagedrc.schema.json",
 	"*": "prettier --ignore-unknown --write",
-	"{src/**,__tests__/**}.{mjs,js,cjs,ts,tsx}": "eslint --ext .mjs,.js,.cjs,.ts,.tsx --fix",
+	"{src/**,__tests__/**}.{mjs,js,cjs,ts,tsx}": "eslint --fix",
 	"src/**.ts": "vitest related --run --config ../../vitest.config.ts"
 }

.npmrc

@@ -0,0 +1,6 @@
+auto-install-peers=false
+resolution-mode=highest
+public-hoist-pattern[]=*eslint*
+public-hoist-pattern[]=*prettier*
+public-hoist-pattern[]=*@rushstack/node-core-library*
+public-hoist-pattern[]=*jju*

.prettierignore

@@ -1 +1,5 @@
 CODEOWNERS
+CHANGELOG.md
+tsup.config.bundled*
+vitest.config.ts.timestamp*
+pnpm-lock.yaml

.prettierrc.json

@@ -1,4 +1,5 @@
 {
+	"$schema": "https://json.schemastore.org/prettierrc.json",
 	"printWidth": 120,
 	"useTabs": true,
 	"singleQuote": true,

.vscode/extensions.json

@@ -8,7 +8,6 @@
 		"eamodio.gitlens",
 		"christian-kohler.npm-intellisense",
 		"christian-kohler.path-intellisense",
-		"antfu.unocss",
 		"unifiedjs.vscode-mdx"
 	]
 }

.vscode/settings.json

@@ -1,18 +1,35 @@
 {
-	"eslint.workingDirectories": [{ "pattern": "./apps/*" }, { "pattern": "./packages/*" }],
 	"eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
+	"eslint.experimental.useFlatConfig": true,
+	"eslint.workingDirectories": [
+		{ "directory": "${workspaceFolder}" },
+		{ "pattern": "./apps/*/" },
+		{ "pattern": "./packages/*/" }
+	],
 	"editor.defaultFormatter": "esbenp.prettier-vscode",
 	"editor.formatOnSave": true,
 	"editor.codeActionsOnSave": {
-		"source.fixAll": true,
-		"source.organizeImports": false
+		"source.organizeImports": "never",
+		"source.fixAll.eslint": "explicit",
+		"source.fixAll": "explicit"
 	},
 	"editor.trimAutoWhitespace": false,
 	"files.associations": {
-		"*.mdx": "markdown"
+		"api-extractor.json": "jsonc",
+		"api-extractor-docs.json": "jsonc",
+		"tsconfig.json": "jsonc",
+		"tsconfig.eslint.json": "jsonc",
+		"tsconfig.docs.json": "jsonc"
 	},
 	"files.insertFinalNewline": true,
 	"files.eol": "\n",
-	"npm.packageManager": "yarn",
-	"typescript.tsdk": "node_modules/typescript/lib"
+	"npm.packageManager": "pnpm",
+	"typescript.tsdk": "node_modules/typescript/lib",
+	"typescript.enablePromptUseWorkspaceTsdk": true,
+	"unocss.disable": true,
+	"deno.enable": false,
+	"deno.enablePaths": ["./packages/create-discord-bot/template/Deno"],
+	"deno.lint": false,
+	"deno.unstable": false,
+	"deno.config": "./packages/create-discord-bot/template/Deno/deno.jsonc"
 }

.yarn/patches/yaml-npm-2.2.2-6e3cddb343.patch

@@ -1,18 +0,0 @@
-diff --git a/package.json b/package.json
-index fc35658a40f9ba3e3513c459ba9f4f6e1b3f59f5..bc35eda66f270c95ba52e721cb6976fd61622c58 100644
---- a/package.json
-+++ b/package.json
-@@ -26,11 +26,13 @@
-   },
-   "exports": {
-     ".": {
-+      "types": "./dist/index.d.ts",
-       "node": "./dist/index.js",
-       "default": "./browser/index.js"
-     },
-     "./package.json": "./package.json",
-     "./util": {
-+      "types": "./dist/util.d.ts",
-       "node": "./dist/util.js",
-       "default": "./browser/dist/util.js"
-     }

.yarn/plugins/@yarnpkg/plugin-docker-build.cjs

@@ -1,257 +0,0 @@
-/* eslint-disable */
-module.exports = {
-	name: '@yarnpkg/plugin-docker-build',
-	factory: function (require) {
-		var plugin;
-		(() => {
-			'use strict';
-			var t = {
-					d: (e, o) => {
-						for (var r in o) t.o(o, r) && !t.o(e, r) && Object.defineProperty(e, r, { enumerable: !0, get: o[r] });
-					},
-					o: (t, e) => Object.prototype.hasOwnProperty.call(t, e),
-					r: (t) => {
-						'undefined' != typeof Symbol &&
-							Symbol.toStringTag &&
-							Object.defineProperty(t, Symbol.toStringTag, { value: 'Module' }),
-							Object.defineProperty(t, '__esModule', { value: !0 });
-					},
-				},
-				e = {};
-			t.r(e), t.d(e, { default: () => u });
-			const o = require('@yarnpkg/cli'),
-				r = require('clipanion'),
-				i = require('@yarnpkg/core'),
-				a = require('@yarnpkg/plugin-patch'),
-				n = require('@yarnpkg/fslib');
-			const s = require('@yarnpkg/plugin-pack');
-			async function c({ workspace: t, destination: e, report: o }) {
-				await s.packUtils.prepareForPack(t, { report: o }, async () => {
-					const r = await s.packUtils.genPackList(t),
-						a = i.Report.progressViaCounter(r.length),
-						c = o.reportProgress(a);
-					try {
-						for (const i of r) {
-							const r = n.ppath.join(t.cwd, i),
-								s = n.ppath.join(e, t.relativeCwd, i);
-							o.reportInfo(null, i), await n.xfs.copyPromise(s, r, { overwrite: !0 }), a.tick();
-						}
-					} finally {
-						c.stop();
-					}
-				});
-			}
-			function p(t, e) {
-				const o = (0, n.toFilename)(e);
-				return n.ppath.isAbsolute(o) ? n.ppath.relative(t, o) : o;
-			}
-			const l = /^builtin<([^>]+)>$/;
-			var d = function (t, e, o, r) {
-				var i,
-					a = arguments.length,
-					n = a < 3 ? e : null === r ? (r = Object.getOwnPropertyDescriptor(e, o)) : r;
-				if ('object' == typeof Reflect && 'function' == typeof Reflect.decorate) n = Reflect.decorate(t, e, o, r);
-				else
-					for (var s = t.length - 1; s >= 0; s--)
-						(i = t[s]) && (n = (a < 3 ? i(n) : a > 3 ? i(e, o, n) : i(e, o)) || n);
-				return a > 3 && n && Object.defineProperty(e, o, n), n;
-			};
-			class f extends o.BaseCommand {
-				constructor() {
-					super(...arguments), (this.args = []);
-				}
-				async execute() {
-					const t = await i.Configuration.find(this.context.cwd, this.context.plugins),
-						{ project: e } = await i.Project.find(t, this.context.cwd),
-						o = e.getWorkspaceByIdent(i.structUtils.parseIdent(this.workspaceName)),
-						r = (function ({
-							project: t,
-							workspaces: e,
-							production: o = !1,
-							scopes: r = o ? ['dependencies'] : i.Manifest.hardDependencies,
-						}) {
-							const a = new Set([...e]);
-							for (const e of a)
-								for (const o of r) {
-									const r = e.manifest.getForScope(o).values();
-									for (const e of r) {
-										const o = t.tryWorkspaceByDescriptor(e);
-										o && a.add(o);
-									}
-								}
-							for (const e of t.workspaces)
-								a.has(e)
-									? o && e.manifest.devDependencies.clear()
-									: (e.manifest.dependencies.clear(),
-									  e.manifest.devDependencies.clear(),
-									  e.manifest.peerDependencies.clear());
-							return a;
-						})({ project: e, workspaces: [o], production: this.production }),
-						s = await (async function (t, e = 'Dockerfile') {
-							const o = (0, n.toFilename)(e);
-							if (n.ppath.isAbsolute(o)) return o;
-							const r = [n.ppath.join(t.cwd, o), n.ppath.join(t.project.cwd, o)];
-							for (const t of r) if (await n.xfs.existsPromise(t)) return t;
-							throw new Error('Dockerfile is required');
-						})(o, this.dockerFilePath),
-						d = await i.Cache.find(t);
-					return (
-						await i.StreamReport.start(
-							{ configuration: t, stdout: this.context.stdout, includeLogs: !this.context.quiet },
-							async (t) => {
-								await t.startTimerPromise('Resolution Step', async () => {
-									await e.resolveEverything({ report: t, cache: d });
-								}),
-									await t.startTimerPromise('Fetch Step', async () => {
-										await e.fetchEverything({ report: t, cache: d });
-									}),
-									await n.xfs.mktempPromise(async (o) => {
-										const f = n.ppath.join(o, (0, n.toFilename)('manifests')),
-											u = n.ppath.join(o, (0, n.toFilename)('packs'));
-										await t.startTimerPromise('Copy files', async () => {
-											await (async function ({ destination: t, project: e, report: o }) {
-												const r = e.configuration.get('rcFilename');
-												o.reportInfo(null, r),
-													await n.xfs.copyPromise(n.ppath.join(t, r), n.ppath.join(e.cwd, r), { overwrite: !0 });
-											})({ destination: f, project: e, report: t }),
-												await (async function ({ destination: t, project: e, report: o }) {
-													const r = n.ppath.join((0, n.toFilename)('.yarn'), (0, n.toFilename)('plugins'));
-													o.reportInfo(null, r),
-														await n.xfs.copyPromise(n.ppath.join(t, r), n.ppath.join(e.cwd, r), { overwrite: !0 });
-												})({ destination: f, project: e, report: t }),
-												await (async function ({ destination: t, project: e, report: o }) {
-													const r = e.configuration.get('yarnPath'),
-														i = n.ppath.relative(e.cwd, r),
-														a = n.ppath.join(t, i);
-													o.reportInfo(null, i), await n.xfs.copyPromise(a, r, { overwrite: !0 });
-												})({ destination: f, project: e, report: t }),
-												await (async function ({ destination: t, workspaces: e, report: o }) {
-													for (const r of e) {
-														const e = n.ppath.join(r.relativeCwd, i.Manifest.fileName),
-															a = n.ppath.join(t, e),
-															s = {};
-														r.manifest.exportTo(s),
-															o.reportInfo(null, e),
-															await n.xfs.mkdirpPromise(n.ppath.dirname(a)),
-															await n.xfs.writeJsonPromise(a, s);
-													}
-												})({ destination: f, workspaces: e.workspaces, report: t }),
-												await (async function ({ destination: t, report: e, project: o, parseDescriptor: r }) {
-													const a = new Set();
-													for (const s of o.storedDescriptors.values()) {
-														const c = r(
-															i.structUtils.isVirtualDescriptor(s) ? i.structUtils.devirtualizeDescriptor(s) : s,
-														);
-														if (!c) continue;
-														const { parentLocator: p, paths: d } = c;
-														for (const r of d) {
-															if (l.test(r)) continue;
-															if (n.ppath.isAbsolute(r)) continue;
-															const i = o.getWorkspaceByLocator(p),
-																s = n.ppath.join(i.relativeCwd, r);
-															if (a.has(s)) continue;
-															a.add(s);
-															const c = n.ppath.join(i.cwd, r),
-																d = n.ppath.join(t, s);
-															e.reportInfo(null, s),
-																await n.xfs.mkdirpPromise(n.ppath.dirname(d)),
-																await n.xfs.copyFilePromise(c, d);
-														}
-													}
-												})({
-													destination: f,
-													report: t,
-													project: e,
-													parseDescriptor: (t) => {
-														if (t.range.startsWith('exec:')) {
-															const e = (function (t) {
-																const { params: e, selector: o } = i.structUtils.parseRange(t),
-																	r = n.npath.toPortablePath(o);
-																return {
-																	parentLocator:
-																		e && 'string' == typeof e.locator ? i.structUtils.parseLocator(e.locator) : null,
-																	path: r,
-																};
-															})(t.range);
-															if (!e || !e.parentLocator) return;
-															return { parentLocator: e.parentLocator, paths: [e.path] };
-														}
-														if (t.range.startsWith('patch:')) {
-															const { parentLocator: e, patchPaths: o } = a.patchUtils.parseDescriptor(t);
-															if (!e) return;
-															return { parentLocator: e, paths: o };
-														}
-													},
-												}),
-												await (async function ({ destination: t, project: e, cache: o, report: r }) {
-													for (const i of o.markedFiles) {
-														const o = n.ppath.relative(e.cwd, i);
-														(await n.xfs.existsPromise(i)) &&
-															(r.reportInfo(null, o), await n.xfs.copyPromise(n.ppath.join(t, o), i));
-													}
-												})({ destination: f, project: e, cache: d, report: t }),
-												await (async function ({ destination: t, project: e, report: o }) {
-													const r = (0, n.toFilename)(e.configuration.get('lockfileFilename')),
-														i = n.ppath.join(t, r);
-													o.reportInfo(null, r),
-														await n.xfs.mkdirpPromise(n.ppath.dirname(i)),
-														await n.xfs.writeFilePromise(i, e.generateLockfile());
-												})({ destination: f, project: e, report: t }),
-												this.copyFiles &&
-													this.copyFiles.length &&
-													(await (async function ({ destination: t, files: e, dockerFilePath: o, report: r }) {
-														const i = n.ppath.dirname(o);
-														for (const o of e) {
-															const e = p(i, o),
-																a = n.ppath.join(i, e),
-																s = n.ppath.join(t, e);
-															r.reportInfo(null, e), await n.xfs.copyPromise(s, a);
-														}
-													})({ destination: f, files: this.copyFiles, dockerFilePath: s, report: t }));
-										});
-										for (const e of r) {
-											const o = e.manifest.name ? i.structUtils.stringifyIdent(e.manifest.name) : '';
-											await t.startTimerPromise('Pack workspace ' + o, async () => {
-												await c({ workspace: e, report: t, destination: u });
-											});
-										}
-										await i.execUtils.pipevp('docker', ['build', ...this.args, '-f', s, '.'], {
-											cwd: o,
-											strict: !0,
-											stdin: this.context.stdin,
-											stdout: this.context.stdout,
-											stderr: this.context.stderr,
-										});
-									});
-							},
-						)
-					).exitCode();
-				}
-			}
-			(f.usage = r.Command.Usage({
-				category: 'Docker-related commands',
-				description: 'Build a Docker image for a workspace',
-				details:
-					'\n      This command will build a efficient Docker image which only contains necessary dependencies for the specified workspace.\n\n      You have to create a Dockerfile in your workspace or your project. You can also specify the path to Dockerfile using the "-f, --file" option.\n\n      Additional arguments can be passed to "docker build" directly, please check the Docker docs for more info: https://docs.docker.com/engine/reference/commandline/build/\n\n      You can copy additional files or folders to a Docker image using the "--copy" option. This is useful for secret keys or configuration files. The files will be copied to "manifests" folder. The path can be either a path relative to the Dockerfile or an absolute path.\n    ',
-				examples: [
-					['Build a Docker image for a workspace', 'yarn docker build @foo/bar'],
-					['Pass additional arguments to docker build command', 'yarn docker build @foo/bar -t image-tag'],
-					[
-						'Copy additional files to a Docker image',
-						'yarn docker build --copy secret.key --copy config.json @foo/bar',
-					],
-					['Install production dependencies only', 'yarn docker build --production @foo/bar'],
-				],
-			})),
-				d([r.Command.String()], f.prototype, 'workspaceName', void 0),
-				d([r.Command.Proxy()], f.prototype, 'args', void 0),
-				d([r.Command.String('-f,--file')], f.prototype, 'dockerFilePath', void 0),
-				d([r.Command.Array('--copy')], f.prototype, 'copyFiles', void 0),
-				d([r.Command.Boolean('--production')], f.prototype, 'production', void 0),
-				d([r.Command.Path('docker', 'build')], f.prototype, 'execute', null);
-			const u = { commands: [f] };
-			plugin = e;
-		})();
-		return plugin;
-	},
-};

.yarnrc.yml

@@ -1,18 +0,0 @@
-nodeLinker: node-modules
-
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: '@yarnpkg/plugin-interactive-tools'
-  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-    spec: '@yarnpkg/plugin-workspace-tools'
-  - path: .yarn/plugins/@yarnpkg/plugin-version.cjs
-    spec: '@yarnpkg/plugin-version'
-  - path: .yarn/plugins/@yarnpkg/plugin-docker-build.cjs
-    spec: 'https://github.com/Dcard/yarn-plugins/releases/latest/download/plugin-docker-build.js'
-
-yarnPath: .yarn/releases/yarn-3.5.0.cjs
-
-packageExtensions:
-  '@storybook/core-common@*':
-    dependencies:
-      '@storybook/react-vite': '7.0.7'

README.md

@@ -13,6 +13,7 @@
 	</p>
 	<p>
 		<a href="https://vercel.com/?utm_source=discordjs&utm_campaign=oss"><img src="https://raw.githubusercontent.com/discordjs/discord.js/main/.github/powered-by-vercel.svg" alt="Vercel" /></a>
+		<a href="https://www.cloudflare.com"><img src="https://raw.githubusercontent.com/discordjs/discord.js/main/.github/powered-by-workers.png" alt="Cloudflare Workers" height="44" /></a>
 	</p>
 </div>
 

api-extractor.json

@@ -89,42 +89,50 @@
 		 * DEFAULT VALUE: no overrideTsconfig section
 		 */
 		"overrideTsconfig": {
-			// Type Checking
-			"allowUnreachableCode": false,
-			"allowUnusedLabels": false,
-			"exactOptionalPropertyTypes": true,
-			"noFallthroughCasesInSwitch": true,
-			"noImplicitOverride": true,
-			"noImplicitReturns": true,
-			"noUnusedLocals": true,
-			"noUnusedParameters": true,
-			"strict": true,
-			"useUnknownInCatchVariables": true,
-			"noUncheckedIndexedAccess": true,
+			"compilerOptions": {
+				// Type Checking
+				"allowUnreachableCode": false,
+				"allowUnusedLabels": false,
+				"exactOptionalPropertyTypes": true,
+				"noFallthroughCasesInSwitch": true,
+				"noImplicitOverride": true,
+				"noImplicitReturns": true,
+				"noPropertyAccessFromIndexSignature": false,
+				"noUncheckedIndexedAccess": true,
+				"noUnusedLocals": true,
+				"noUnusedParameters": true,
+				"strict": true,
 
-			// Modules
-			"module": "ESNext",
-			"moduleResolution": "node",
-			"resolveJsonModule": true,
+				// Modules
+				"allowArbitraryExtensions": false,
+				"allowImportingTsExtensions": false,
+				"module": "ESNext",
+				"moduleResolution": "nodenext",
+				"resolveJsonModule": true,
+				"resolvePackageJsonExports": false,
+				"resolvePackageJsonImports": false,
 
-			// Emit
-			"declaration": true,
-			"declarationMap": true,
-			"importHelpers": true,
-			"inlineSources": true,
-			"newLine": "lf",
-			"noEmitHelpers": true,
-			"outDir": "dist",
-			"removeComments": false,
-			"sourceMap": true,
-			"esModuleInterop": true,
-			"forceConsistentCasingInFileNames": true,
+				// Emit
+				"declaration": true,
+				"declarationMap": true,
+				"importHelpers": false,
+				"newLine": "lf",
+				"noEmitHelpers": true,
+				"outDir": "dist",
+				"removeComments": false,
+				"sourceMap": true,
 
-			// Language and Environment
-			"experimentalDecorators": true,
-			"lib": ["ESNext"],
-			"target": "ES2021",
-			"useDefineForClassFields": true
+				// Interop Constraints
+				"esModuleInterop": false,
+				"forceConsistentCasingInFileNames": true,
+				"isolatedModules": true,
+
+				// Language and Environment
+				"experimentalDecorators": true,
+				"lib": ["ESNext"],
+				"target": "ES2022",
+				"useDefineForClassFields": true
+			}
 		}
 		/**
 		 * This option causes the compiler to be invoked with the --skipLibCheck option. This option is not recommended
@@ -216,7 +224,7 @@
 		/**
 		 * (REQUIRED) Whether to generate the .d.ts rollup file.
 		 */
-		"enabled": true,
+		"enabled": false,
 
 		/**
 		 * Specifies the output path for a .d.ts rollup file to be generated without any trimming.

apps/guide/.env.development

@@ -0,0 +1 @@
+METADATA_BASE_URL=http://localhost:3000

apps/guide/.eslintrc.json

@@ -1,12 +0,0 @@
-{
-	"extends": ["../../.eslintrc.json", "neon/react", "neon/next", "neon/edge", "@unocss", "neon/prettier"],
-	"settings": {
-		"react": {
-			"version": "detect"
-		}
-	},
-	"rules": {
-		"react/react-in-jsx-scope": 0,
-		"react/jsx-filename-extension": [1, { "extensions": [".tsx"] }]
-	}
-}

apps/guide/.gitignore

@@ -1,8 +1,8 @@
 # Packages
-node_modules/
+node_modules
 
 # Log files
-logs/
+logs
 *.log
 npm-debug.log*
 
@@ -16,18 +16,13 @@ pids
 .env*.local
 
 # Dist
-dist/
-typings/
-.cache/
-build/
+.contentlayer
+.next
+public/searchIndex
 src/styles/unocss.css
-.next/
 
 # Miscellaneous
-.tmp/
-coverage/
-.vercel
-public/searchIndex
+.tmp
 .vscode
-lighthouse-results/
-.contentlayer
+lighthouse-results
+

apps/guide/.lintstagedrc.js

@@ -1 +1,2 @@
+/** @type {import('lint-staged').Config} */
 module.exports = require('../../.lintstagedrc.json');

apps/guide/.prettierignore

@@ -1,15 +1,7 @@
-# Autogenerated
-CHANGELOG.md
+.contentlayer
+.next
 .turbo
-dist/
-docs/**/*
-!docs/index.yml
-!docs/README.md
-coverage/
-.cache
-build/
+.vscode
+coverage
 src/styles/unocss.css
-api/
-.next/
-.vercel/
-.cache/
+next-env.d.ts

apps/guide/.prettierrc.js

@@ -1 +1,2 @@
+/** @type {import('prettier').Config} */
 module.exports = require('../../.prettierrc.json');

apps/guide/README.md

@@ -10,6 +10,7 @@
 	</p>
 	<p>
 		<a href="https://vercel.com/?utm_source=discordjs&utm_campaign=oss"><img src="https://raw.githubusercontent.com/discordjs/discord.js/main/.github/powered-by-vercel.svg" alt="Vercel" /></a>
+		<a href="https://www.cloudflare.com"><img src="https://raw.githubusercontent.com/discordjs/discord.js/main/.github/powered-by-workers.png" alt="Cloudflare Workers" height="44" /></a>
 	</p>
 </div>
 

apps/guide/next.config.js

@@ -1,24 +1,17 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 /* eslint-disable @typescript-eslint/no-require-imports */
-// import bundleAnalyzer from '@next/bundle-analyzer';
 // import { withContentlayer } from 'next-contentlayer';
-const bundleAnalyzer = require('@next/bundle-analyzer');
 const { withContentlayer } = require('next-contentlayer');
 
-const withBundleAnalyzer = bundleAnalyzer({
-	enabled: process.env.ANALYZE === 'true',
+module.exports = withContentlayer({
+	reactStrictMode: true,
+	experimental: {
+		typedRoutes: true,
+	},
+	images: {
+		dangerouslyAllowSVG: true,
+		contentDispositionType: 'attachment',
+		contentSecurityPolicy: "default-src 'self'; frame-src 'none'; sandbox;",
+	},
+	poweredByHeader: false,
 });
-
-module.exports = withBundleAnalyzer(
-	withContentlayer({
-		reactStrictMode: true,
-		experimental: {
-			appDir: true,
-		},
-		images: {
-			dangerouslyAllowSVG: true,
-			contentDispositionType: 'attachment',
-			contentSecurityPolicy: "default-src 'self'; frame-src 'none'; sandbox;",
-		},
-	}),
-);

apps/guide/package.json

@@ -1,27 +1,26 @@
 {
+	"$schema": "https://json.schemastore.org/package.json",
 	"name": "@discordjs/guide",
 	"version": "0.1.0",
 	"description": "Imagine a guide... that explores the many possibilities for your discord.js bot",
 	"private": true,
 	"scripts": {
 		"test": "vitest run",
-		"test:lighthouse": "lighthouse http://localhost:3000 --output-path=./lighthouse-results",
-		"build:local": "yarn build:prod",
-		"build:prod": "yarn workspaces foreach -ptR run build && yarn build:css && yarn build:next",
-		"build:next": "next build",
-		"build:css": "yarn generate:css",
-		"build:analyze": "cross-env-shell ANALYZE=true yarn build:prod",
+		"build:check": "tsc --noEmit",
+		"build:local": "pnpm run build:prod",
+		"build:prod": "next build",
+		"build:analyze": "cross-env ANALYZE=true pnpm run build:prod",
 		"preview": "next start",
-		"dev": "concurrently 'yarn dev:contentlayer' 'yarn dev:css' 'yarn dev:next'",
-		"dev:next": "next dev",
-		"dev:css": "yarn generate:css --watch",
-		"dev:contentlayer": "contentlayer dev",
-		"generate:css": "unocss 'src/**/*.tsx' 'contentlayer.config.ts' '../../packages/ui/src/lib/components/**/*.tsx' --out-file ./src/styles/unocss.css --config ../../unocss.config.ts",
-		"lint": "prettier --check . && cross-env TIMING=1 eslint src --ext .mjs,.js,.cjs,.ts,.tsx --format=pretty",
-		"format": "prettier --write . && cross-env TIMING=1 eslint src --ext .mjs,.js,.cjs,.ts,.tsx --fix --format=pretty",
-		"fmt": "yarn format"
+		"dev": "next dev",
+		"generate:contentlayer": "contentlayer build",
+		"lint": "pnpm run build:check && prettier --check . && cross-env TIMING=1 eslint --format=pretty src",
+		"format": "pnpm run build:check && prettier --write . && cross-env TIMING=1 eslint --fix --format=pretty src",
+		"fmt": "pnpm run format"
 	},
 	"type": "commonjs",
+	"directories": {
+		"lib": "src"
+	},
 	"contributors": [
 		"Crawl <icrawltogo@gmail.com>"
 	],
@@ -44,61 +43,57 @@
 		"url": "https://github.com/discordjs/discord.js/issues"
 	},
 	"homepage": "https://discord.js.org",
+	"funding": "https://github.com/discordjs/discord.js?sponsor",
 	"dependencies": {
-		"@code-hike/mdx": "^0.8.2",
+		"@code-hike/mdx": "^0.9.0",
 		"@discordjs/ui": "workspace:^",
 		"@react-icons/all-files": "^4.1.0",
-		"@vercel/analytics": "^1.0.0",
-		"@vercel/edge-config": "^0.1.8",
-		"@vercel/og": "^0.5.4",
-		"ariakit": "^2.0.0-next.44",
-		"cmdk": "^0.2.0",
-		"contentlayer": "^0.3.2",
-		"next": "^13.3.4",
-		"next-contentlayer": "^0.3.2",
-		"next-themes": "^0.2.1",
-		"react": "^18.2.0",
+		"@vercel/analytics": "^1.3.1",
+		"@vercel/edge-config": "^1.1.1",
+		"@vercel/og": "^0.6.2",
+		"ariakit": "2.0.0-next.44",
+		"cmdk": "^1.0.0",
+		"contentlayer": "^0.3.4",
+		"next": "^14.2.3",
+		"next-contentlayer": "^0.3.4",
+		"next-themes": "^0.3.0",
+		"react": "^18.3.1",
 		"react-custom-scrollbars-2": "^4.5.0",
-		"react-dom": "^18.2.0",
-		"react-use": "^17.4.0",
+		"react-dom": "^18.3.1",
 		"rehype-autolink-headings": "^6.1.1",
-		"rehype-ignore": "^1.0.5",
-		"rehype-raw": "^6.1.1",
 		"rehype-slug": "^5.1.0",
 		"remark-gfm": "^3.0.1",
-		"server-only": "^0.0.1",
-		"sharp": "^0.32.1"
+		"sharp": "^0.33.4"
 	},
 	"devDependencies": {
-		"@next/bundle-analyzer": "^13.3.4",
-		"@testing-library/react": "^14.0.0",
-		"@testing-library/user-event": "^14.4.3",
-		"@types/html-escaper": "^3.0.0",
-		"@types/node": "18.16.3",
-		"@types/react": "^18.2.0",
-		"@types/react-dom": "^18.2.1",
-		"@unocss/cli": "^0.51.8",
-		"@unocss/eslint-config": "^0.51.8",
-		"@unocss/reset": "^0.51.8",
-		"@vitejs/plugin-react": "^4.0.0",
-		"@vitest/coverage-c8": "^0.30.1",
-		"concurrently": "^8.0.1",
+		"@testing-library/react": "^15.0.7",
+		"@testing-library/user-event": "^14.5.2",
+		"@types/html-escaper": "^3.0.2",
+		"@types/node": "^18.19.45",
+		"@types/react": "^18.3.3",
+		"@types/react-dom": "^18.3.0",
+		"@unocss/eslint-plugin": "^0.60.4",
+		"@unocss/postcss": "^0.60.4",
+		"@unocss/reset": "^0.60.4",
+		"@vitejs/plugin-react": "^4.3.0",
+		"@vitest/coverage-v8": "^2.0.5",
 		"cross-env": "^7.0.3",
-		"eslint": "^8.39.0",
-		"eslint-config-neon": "^0.1.42",
-		"eslint-formatter-pretty": "^5.0.0",
-		"happy-dom": "^9.10.1",
+		"eslint": "^8.57.0",
+		"eslint-config-neon": "^0.1.62",
+		"eslint-formatter-pretty": "^6.0.1",
+		"happy-dom": "^14.12.0",
 		"hast-util-to-string": "^2.0.0",
-		"hastscript": "^7.2.0",
+		"hastscript": "^8.0.0",
 		"html-escaper": "^3.0.3",
-		"lighthouse": "^10.1.1",
-		"prettier": "^2.8.8",
-		"typescript": "^5.0.4",
-		"unocss": "^0.51.8",
-		"vercel": "^29.0.3",
-		"vitest": "^0.29.8"
+		"postcss": "^8.4.38",
+		"prettier": "^3.3.3",
+		"turbo": "^2.0.14",
+		"typescript": "~5.5.4",
+		"unocss": "^0.60.4",
+		"vercel": "^37.0.0",
+		"vitest": "^2.0.5"
 	},
 	"engines": {
-		"node": ">=18.13.0"
+		"node": ">=18"
 	}
 }

apps/guide/postcss.config.cjs

@@ -0,0 +1,5 @@
+module.exports = {
+	plugins: {
+		'@unocss/postcss': {},
+	},
+};

apps/guide/src/app/_global-error.tsx

@@ -1,9 +1,12 @@
 'use client';
 
-import { Providers } from './providers';
 import { inter } from '~/util/fonts';
+import { Providers } from './providers';
 
-export default function GlobalError({ error }: { error: Error }) {
+import '~/styles/cmdk.css';
+import '~/styles/main.css';
+
+export default function GlobalError({ error }: { readonly error: Error }) {
 	console.error(error);
 
 	return (

apps/guide/src/app/error.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-export default function Error({ error }: { error: Error }) {
+export default function Error({ error }: { readonly error: Error }) {
 	console.error(error);
 
 	return (

apps/guide/src/app/guide/[...slug]/page.tsx

@@ -1,12 +1,12 @@
-import { allContents } from 'contentlayer/generated';
 import { notFound } from 'next/navigation';
+import { allContents } from 'contentlayer/generated';
 import { Mdx } from '~/components/Mdx';
 
 export async function generateStaticParams() {
 	return allContents.map((content) => ({ slug: [content.slug] }));
 }
 
-export default function Page({ params }: { params: { slug: string[] } }) {
+export default function Page({ params }: { readonly params: { slug: string[] } }) {
 	const content = allContents.find((content) => content.slug === params.slug?.join('/'));
 
 	if (!content) {
@@ -14,7 +14,7 @@ export default function Page({ params }: { params: { slug: string[] } }) {
 	}
 
 	return (
-		<article className="max-w-none prose">
+		<article className="max-w-none px-5 prose">
 			<Mdx code={content?.body.code ?? ''} />
 		</article>
 	);

apps/guide/src/app/guide/layout.tsx

@@ -1,8 +1,8 @@
 import type { PropsWithChildren } from 'react';
-import { Providers } from './providers';
 import Footer from '~/components/Footer';
 import Header from '~/components/Header';
 import { Nav } from '~/components/Nav';
+import { Providers } from './providers';
 
 export default function Layout({ children }: PropsWithChildren) {
 	return (

apps/guide/src/app/layout.tsx

@@ -1,25 +1,29 @@
 import { Analytics } from '@vercel/analytics/react';
-import type { Metadata } from 'next';
+import type { Metadata, Viewport } from 'next';
 import type { PropsWithChildren } from 'react';
-import { Providers } from './providers';
 import { DESCRIPTION } from '~/util/constants';
 import { inter, jetBrainsMono } from '~/util/fonts';
+import { Providers } from './providers';
 
-import '@unocss/reset/tailwind-compat.css';
-import '~/styles/unocss.css';
 import '~/styles/cmdk.css';
 import '@code-hike/mdx/styles.css';
 import '~/styles/ch.css';
 import '~/styles/main.css';
 
+export const viewport: Viewport = {
+	themeColor: [
+		{ media: '(prefers-color-scheme: light)', color: '#f1f3f5' },
+		{ media: '(prefers-color-scheme: dark)', color: '#181818' },
+	],
+	colorScheme: 'light dark',
+};
+
 export const metadata: Metadata = {
+	metadataBase: new URL(
+		process.env.METADATA_BASE_URL ? process.env.METADATA_BASE_URL : `http://localhost:${process.env.PORT ?? 3_000}`,
+	),
 	title: 'discord.js',
 	description: DESCRIPTION,
-	viewport: {
-		minimumScale: 1,
-		initialScale: 1,
-		width: 'device-width',
-	},
 	icons: {
 		other: [
 			{
@@ -44,12 +48,6 @@ export const metadata: Metadata = {
 
 	manifest: '/site.webmanifest',
 
-	themeColor: [
-		{ media: '(prefers-color-scheme: light)', color: '#f1f3f5' },
-		{ media: '(prefers-color-scheme: dark)', color: '#181818' },
-	],
-	colorScheme: 'light dark',
-
 	appleWebApp: {
 		title: 'discord.js',
 	},

apps/guide/src/app/not-found.tsx

@@ -6,7 +6,7 @@ export default function NotFound() {
 			<h1 className="text-[9rem] font-black leading-none md:text-[12rem]">404</h1>
 			<h2 className="text-[2rem] md:text-[3rem]">Not found.</h2>
 			<Link
-				className="h-11 flex flex-row transform-gpu cursor-pointer select-none appearance-none place-items-center border-0 rounded bg-blurple px-6 text-base font-semibold leading-none text-white no-underline outline-none active:translate-y-px focus:ring focus:ring-width-2 focus:ring-white"
+				className="h-11 flex flex-row transform-gpu cursor-pointer select-none appearance-none place-items-center border-0 rounded bg-blurple px-6 text-base text-white font-semibold leading-none no-underline outline-none active:translate-y-px focus:ring focus:ring-width-2 focus:ring-white"
 				href="/guide"
 			>
 				Take me back

apps/guide/src/components/DiscordAPITypesLink.tsx

@@ -0,0 +1,91 @@
+import { FiExternalLink } from '@react-icons/all-files/fi/FiExternalLink';
+import type { PropsWithChildren } from 'react';
+import {
+	BASE_URL_DISCORD_API_TYPES,
+	DISCORD_API_TYPES_VERSION,
+	DISCORD_API_TYPES_VOICE_VERSION,
+} from '~/util/constants';
+
+interface DiscordAPITypesLinkOptions {
+	/**
+	 * The initial documentation enum, interface, function etc.
+	 *
+	 * @example `'RESTJSONErrorCodes'`
+	 */
+	readonly parent?: string;
+	/**
+	 * The scope of where this link lives.
+	 *
+	 * @remarks API does not have a scope.
+	 */
+	readonly scope?: 'gateway' | 'globals' | 'payloads' | 'rest' | 'rpc' | 'utils' | 'voice';
+	/**
+	 * The symbol belonging to the parent.
+	 *
+	 * @example '`MaximumNumberOfGuildsReached'`
+	 */
+	readonly symbol?: string;
+	/**
+	 * The type of the {@link DiscordAPITypesLinkOptions.parent}.
+	 *
+	 * @example `'enum'`
+	 * @example `'interface'`
+	 */
+	readonly type?: string;
+}
+
+export function DiscordAPITypesLink({
+	parent,
+	scope,
+	symbol,
+	type,
+	children,
+}: PropsWithChildren<DiscordAPITypesLinkOptions>) {
+	let url = BASE_URL_DISCORD_API_TYPES;
+	let text = 'discord-api-types';
+
+	if (type || parent) {
+		url += `/api/discord-api-types`;
+
+		switch (scope) {
+			case 'globals':
+				url += `-${scope}`;
+				break;
+			case 'gateway':
+			case 'payloads':
+			case 'rest':
+				url += `-${scope}/common`;
+				break;
+			case 'rpc':
+			case 'utils':
+				url += `-${scope}/${DISCORD_API_TYPES_VERSION}`;
+				break;
+			case 'voice':
+				url += `-${scope}/${DISCORD_API_TYPES_VOICE_VERSION}`;
+				break;
+			default:
+				url += `-${DISCORD_API_TYPES_VERSION}`;
+		}
+
+		if (type) {
+			url += `/${type}/${parent}`;
+			if (symbol) url += `#${symbol}`;
+		} else {
+			url += `#${parent}`;
+		}
+
+		text = `${parent}${symbol ? `#${symbol}` : ''}${type?.toUpperCase() === 'FUNCTION' ? '()' : ''}`;
+	}
+
+	return (
+		<a
+			className="inline-flex flex-row place-items-center gap-1"
+			href={url}
+			rel="external noopener noreferrer"
+			target="_blank"
+		>
+			{children ?? text}
+			<FiExternalLink size={18} />
+		</a>
+	);
+}

apps/guide/src/components/DocsLink.tsx

@@ -1,4 +1,5 @@
 import { FiExternalLink } from '@react-icons/all-files/fi/FiExternalLink';
+import type { PropsWithChildren } from 'react';
 import { BASE_URL, BASE_URL_LEGACY, PACKAGES, VERSION } from '~/util/constants';
 
 interface DocsLinkOptions {
@@ -7,19 +8,19 @@ interface DocsLinkOptions {
 	 *
 	 * @remarks Functions automatically infer this.
 	 */
-	brackets?: boolean;
+	readonly brackets?: boolean;
 	/**
 	 * The package.
 	 *
 	 * @defaultValue `'discord.js'`
 	 */
-	package?: (typeof PACKAGES)[number];
+	readonly package?: (typeof PACKAGES)[number];
 	/**
 	 * The initial documentation class, function, interface etc.
 	 *
 	 * @example `'Client'`
 	 */
-	parent: string;
+	readonly parent?: string;
 	/**
 	 * Whether to reference a static property.
 	 *
@@ -27,20 +28,20 @@ interface DocsLinkOptions {
 	 * This should only be used for the https://discord.js.org domain
 	 * as static properties are not identified in the URL.
 	 */
-	static?: boolean;
+	readonly static?: boolean;
 	/**
 	 * The symbol belonging to the parent.
 	 *
 	 * @example '`login'`
 	 */
-	symbol?: string;
+	readonly symbol?: string;
 	/**
 	 * The type of the {@link DocsLinkOptions.parent}.
 	 *
 	 * @example `'class'`
 	 * @example `'Function'`
 	 */
-	type: string;
+	readonly type?: string;
 }
 
 export function DocsLink({
@@ -50,29 +51,35 @@ export function DocsLink({
 	symbol,
 	brackets,
 	static: staticReference,
-}: DocsLinkOptions) {
-	const bracketText = brackets || type.toUpperCase() === 'FUNCTION' ? '()' : '';
-	const trimmedSymbol = symbol;
-	let url;
-	let text;
+	children,
+}: PropsWithChildren<DocsLinkOptions>) {
+	// In the case of no type and no parent, this will default to the entry point of the respective documentation.
+	let url = docs === PACKAGES[0] ? `${BASE_URL_LEGACY}/${VERSION}/general/welcome` : `${BASE_URL}/${docs}/stable`;
+	let text = `${docs === PACKAGES[0] ? '' : '@discordjs/'}${docs}`;
 
-	if (docs === PACKAGES[0]) {
-		url = `${BASE_URL_LEGACY}/${VERSION}/${type}/${parent}`;
-		if (trimmedSymbol) url += `?scrollTo=${trimmedSymbol}`;
+	// If there is a type and parent, we need to do some parsing.
+	if (type && parent) {
+		const bracketText = brackets || type?.toUpperCase() === 'FUNCTION' ? '()' : '';
 
-		text = `${parent}${trimmedSymbol ? (trimmedSymbol.startsWith('s-') ? '.' : '#') : ''}${
-			// eslint-disable-next-line prefer-named-capture-group
-			trimmedSymbol ? `${trimmedSymbol.replace(/(e|s)-/, '')}` : ''
-		}${bracketText}`;
-	} else {
-		url = `${BASE_URL}/${docs}/stable/${parent}:${type}`;
-		if (trimmedSymbol) url += `#${trimmedSymbol}`;
-		text = `${parent}${trimmedSymbol ? `${staticReference ? '.' : '#'}${trimmedSymbol}` : ''}${bracketText}`;
+		// Legacy discord.js documentation parsing.
+		if (docs === PACKAGES[0]) {
+			url = `${BASE_URL_LEGACY}/${VERSION}/${type}/${parent}`;
+			if (symbol) url += `?scrollTo=${symbol}`;
+
+			text = `${parent}${symbol ? (symbol.startsWith('s-') ? '.' : '#') : ''}${
+				// eslint-disable-next-line prefer-named-capture-group
+				symbol ? `${symbol.replace(/(e|s)-/, '')}` : ''
+			}${bracketText}`;
+		} else {
+			url += `/${parent}:${type}`;
+			if (symbol) url += `#${symbol}`;
+			text = `${parent}${symbol ? `${staticReference ? '.' : '#'}${symbol}` : ''}${bracketText}`;
+		}
 	}
 
 	return (
 		<a className="inline-flex flex-row place-items-center gap-1" href={url} rel="noopener noreferrer" target="_blank">
-			{text}
+			{children ?? text}
 			<FiExternalLink size={18} />
 		</a>
 	);

apps/guide/src/components/Footer.tsx

@@ -1,11 +1,12 @@
 import Image from 'next/image';
 import vercelLogo from '~/assets/powered-by-vercel.svg';
+import workersLogo from '~/assets/powered-by-workers.png';
 
 export default function Footer() {
 	return (
 		<footer className="md:pl-12 md:pr-12">
-			<div className="mx-auto max-w-6xl flex flex-col place-items-center gap-12 pt-12 lg:place-content-center">
-				<div className="w-full flex flex-col place-content-between place-items-center gap-12 md:flex-row md:gap-0">
+			<div className="flex flex-col flex-wrap place-content-center gap-6 pt-12 sm:flex-row md:gap-12">
+				<div className="flex flex-wrap place-content-center place-items-center gap-4">
 					<a
 						className="rounded outline-none focus:ring focus:ring-width-2 focus:ring-blurple"
 						href="https://vercel.com/?utm_source=discordjs&utm_campaign=oss"
@@ -22,56 +23,72 @@ export default function Footer() {
 							width={212}
 						/>
 					</a>
-					<div className="flex flex-row gap-6 md:gap-12">
-						<div className="flex flex-col gap-2">
-							<div className="text-lg font-semibold">Community</div>
-							<div className="flex flex-col gap-1">
-								<a
-									className="rounded outline-none focus:ring focus:ring-width-2 focus:ring-blurple"
-									href="https://discord.gg/djs"
-									rel="external noopener noreferrer"
-									target="_blank"
-								>
-									Discord
-								</a>
-								<a
-									className="rounded outline-none focus:ring focus:ring-width-2 focus:ring-blurple"
-									href="https://github.com/discordjs/discord.js/discussions"
-									rel="external noopener noreferrer"
-									target="_blank"
-								>
-									GitHub discussions
-								</a>
-							</div>
+					<a
+						className="rounded outline-none focus:ring focus:ring-width-2 focus:ring-blurple"
+						href="https://www.cloudflare.com"
+						rel="external noopener noreferrer"
+						target="_blank"
+						title="Cloudflare Workers"
+					>
+						<Image
+							alt="Cloudflare"
+							blurDataURL="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAABLCAQAAAA1k5H2AAAAi0lEQVR42u3SMQEAAAgDoC251a3gL2SgmfBYBRAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARAAARCAgwWEOSWBnYbKggAAAABJRU5ErkJggg=="
+							height={44}
+							placeholder="blur"
+							priority
+							src={workersLogo}
+						/>
+					</a>
+				</div>
+				<div className="flex flex-col place-self-center gap-6 sm:flex-row md:gap-12">
+					<div className="max-w-max flex flex-col gap-2">
+						<div className="text-lg font-semibold">Community</div>
+						<div className="flex flex-col gap-1">
+							<a
+								className="rounded outline-none focus:ring focus:ring-width-2 focus:ring-blurple"
+								href="https://discord.gg/djs"
+								rel="external noopener noreferrer"
+								target="_blank"
+							>
+								Discord
+							</a>
+							<a
+								className="rounded outline-none focus:ring focus:ring-width-2 focus:ring-blurple"
+								href="https://github.com/discordjs/discord.js/discussions"
+								rel="external noopener noreferrer"
+								target="_blank"
+							>
+								GitHub discussions
+							</a>
 						</div>
-						<div className="flex flex-col gap-2">
-							<div className="text-lg font-semibold">Project</div>
-							<div className="flex flex-col gap-1">
-								<a
-									className="rounded outline-none focus:ring focus:ring-width-2 focus:ring-blurple"
-									href="https://github.com/discordjs/discord.js"
-									rel="external noopener noreferrer"
-									target="_blank"
-								>
-									discord.js
-								</a>
-								<a
-									className="rounded outline-none focus:ring focus:ring-width-2 focus:ring-blurple"
-									href="https://discord.js.org/docs"
-									rel="noopener noreferrer"
-									target="_blank"
-								>
-									discord.js documentation
-								</a>
-								<a
-									className="rounded outline-none focus:ring focus:ring-width-2 focus:ring-blurple"
-									href="https://discord-api-types.dev"
-									rel="external noopener noreferrer"
-									target="_blank"
-								>
-									discord-api-types
-								</a>
-							</div>
+					</div>
+					<div className="max-w-max flex flex-col gap-2">
+						<div className="text-lg font-semibold">Project</div>
+						<div className="flex flex-col gap-1">
+							<a
+								className="rounded outline-none focus:ring focus:ring-width-2 focus:ring-blurple"
+								href="https://github.com/discordjs/discord.js"
+								rel="external noopener noreferrer"
+								target="_blank"
+							>
+								discord.js
+							</a>
+							<a
+								className="rounded outline-none focus:ring focus:ring-width-2 focus:ring-blurple"
+								href="https://discord.js.org/docs"
+								rel="noopener noreferrer"
+								target="_blank"
+							>
+								discord.js documentation
+							</a>
+							<a
+								className="rounded outline-none focus:ring focus:ring-width-2 focus:ring-blurple"
+								href="https://discord-api-types.dev"
+								rel="external noopener noreferrer"
+								target="_blank"
+							>
+								discord-api-types
+							</a>
 						</div>
 					</div>
 				</div>

apps/guide/src/components/Header.tsx

@@ -3,6 +3,7 @@
 import { VscGithubInverted } from '@react-icons/all-files/vsc/VscGithubInverted';
 import { VscMenu } from '@react-icons/all-files/vsc/VscMenu';
 import { Button } from 'ariakit/button';
+import type { Route } from 'next';
 import dynamic from 'next/dynamic';
 import Link from 'next/link';
 import { usePathname } from 'next/navigation';
@@ -23,7 +24,7 @@ export default function Header() {
 				.map((path, idx, original) => (
 					<Link
 						className="rounded outline-none hover:underline focus:ring focus:ring-width-2 focus:ring-blurple"
-						href={`/${original.slice(0, idx + 1).join('/')}`}
+						href={`/${original.slice(0, idx + 1).join('/')}` as Route}
 						key={`${path}-${idx}`}
 					>
 						{path}

apps/guide/src/components/Mdx.tsx

@@ -2,14 +2,15 @@
 
 import { Alert, Section, DiscordMessages, DiscordMessage, DiscordMessageEmbed } from '@discordjs/ui';
 import { useMDXComponent } from 'next-contentlayer/hooks';
+import { DocsLink } from '~/components/DocsLink';
+import { ResultingCode } from '~/components/ResultingCode';
+import { DiscordAPITypesLink } from './DiscordAPITypesLink';
 import { H1 } from './H1';
 import { H2 } from './H2';
 import { H3 } from './H3';
 import { H4 } from './H4';
-import { DocsLink } from '~/components/DocsLink';
-import { ResultingCode } from '~/components/ResultingCode';
 
-export function Mdx({ code }: { code: string }) {
+export function Mdx({ code }: { readonly code: string }) {
 	const Component = useMDXComponent(code);
 
 	return (
@@ -20,6 +21,7 @@ export function Mdx({ code }: { code: string }) {
 				DiscordMessages,
 				DiscordMessage,
 				DiscordMessageEmbed,
+				DiscordAPITypesLink,
 				DocsLink,
 				ResultingCode,
 				h1: H1,

apps/guide/src/components/Nav.tsx

@@ -1,8 +1,8 @@
 'use client';
 
 import { Scrollbars } from 'react-custom-scrollbars-2';
-import { Sidebar } from './Sidebar';
 import { useNav } from '~/contexts/nav';
+import { Sidebar } from './Sidebar';
 
 export function Nav() {
 	const { opened } = useNav();
@@ -23,7 +23,9 @@ export function Nav() {
 				)}
 				universal
 			>
-				<Sidebar />
+				<div className="flex flex-col gap-4 p-3">
+					<Sidebar />
+				</div>
 			</Scrollbars>
 		</nav>
 	);

apps/guide/src/components/Outline.tsx

@@ -5,7 +5,7 @@ const LINK_HEIGHT = 30;
 const INDICATOR_SIZE = 10;
 const INDICATOR_OFFSET = (LINK_HEIGHT - INDICATOR_SIZE) / 2;
 
-export function Outline({ headings }: { headings: any[] }) {
+export function Outline({ headings }: { readonly headings: any[] }) {
 	// eslint-disable-next-line react/hook-use-state
 	const [active /* setActive */] = useState(0);
 

apps/guide/src/components/PageButton.tsx

@@ -1,4 +1,12 @@
-export function PageButton({ url, title, direction }: { direction: 'next' | 'prev'; title: string; url: string }) {
+export function PageButton({
+	url,
+	title,
+	direction,
+}: {
+	readonly direction: 'next' | 'prev';
+	readonly title: string;
+	readonly url: string;
+}) {
 	return (
 		<a
 			className="flex flex-row flex-col transform-gpu cursor-pointer select-none appearance-none place-items-center gap-2 rounded bg-light-600 px-4 py-3 leading-none no-underline outline-none active:translate-y-px active:bg-light-800 dark:bg-dark-600 hover:bg-light-700 focus:ring focus:ring-width-2 focus:ring-blurple dark:active:bg-dark-400 dark:hover:bg-dark-500"

apps/guide/src/components/Sidebar.tsx

@@ -1,10 +1,11 @@
 'use client';
 
-import { allContents } from 'contentlayer/generated';
+import type { Route } from 'next';
 import Link from 'next/link';
 import { usePathname } from 'next/navigation';
-import { Section } from './Section';
+import { allContents } from 'contentlayer/generated';
 import { useNav } from '~/contexts/nav';
+import { Section } from './Section';
 
 const items = allContents.map((content) => ({
 	title: content.title,
@@ -31,21 +32,21 @@ export function Sidebar() {
 	const { setOpened } = useNav();
 
 	return (
-		<div className="flex flex-col gap-3 p-3">
+		<div className="flex flex-col gap-4">
 			{Object.keys(itemsByCategory).map((category, idx) => (
 				<Section
-					buttonClassName="bg-light-600 hover:bg-light-700 active:bg-light-800 dark:bg-dark-400 dark:hover:bg-dark-300 dark:active:bg-dark-400 focus:ring-width-2 focus:ring-blurple rounded p-3 outline-none focus:ring"
+					buttonClassName="bg-light-600 hover:bg-light-700 active:bg-light-800 dark:bg-dark-400 dark:hover:bg-dark-300 dark:active:bg-dark-400 focus:ring-width-2 focus:ring-blurple rounded p-3 outline-none focus:ring z-10"
 					key={`${category}-${idx}`}
 					title={category}
 				>
 					{itemsByCategory[category]?.map((member, index) => (
 						<Link
-							className={`dark:border-dark-100 border-light-800 focus:ring-width-2 focus:ring-blurple ml-5 flex flex-col border-l p-[5px] pl-6 outline-none focus:rounded focus:border-0 focus:ring ${
+							className={`dark:border-dark-100 border-light-800 focus:ring-width-2 focus:ring-blurple ml-5 flex flex-col border-l first:mt-1 p-[5px] pl-6 outline-none focus:rounded focus:border-0 focus:ring ${
 								decodeURIComponent(pathname ?? '') === member.href
 									? 'bg-blurple text-white'
 									: 'dark:hover:bg-dark-200 dark:active:bg-dark-100 hover:bg-light-700 active:bg-light-800'
 							}`}
-							href={member.href}
+							href={member.href as Route}
 							key={`${member.title}-${index}`}
 							onClick={() => setOpened(false)}
 							title={member.title}

apps/guide/src/content/01-home/01-introduction.mdx

@@ -8,15 +8,12 @@ category: Home
 If you're reading this, it probably means you want to learn how to make a bot with discord.js. Awesome! You've come to the right place.
 This guide will teach you things such as:
 
-- How to get a bot [up and running](/preparations/) from scratch;
-- How to properly [create](/creating-your-bot/), [organize](/creating-your-bot/command-handling.md), and expand on your commands;
-- In-depth explanations and examples regarding popular topics (e.g. [reactions](/popular-topics/reactions.md), [embeds](/popular-topics/embeds.md), [canvas](/popular-topics/canvas.md));
-- Working with databases (e.g. [sequelize](/sequelize/) and [keyv](/keyv/));
-- Getting started with [sharding](/sharding/);
+- How to get a bot [up and running](../getting-started/starting-out) from scratch;
+- In-depth explanations regarding features and concepts of the API (e.g. [intents](../topics/intents), [threads](../topics/threads), [webhooks](../topics/webhooks));
 - And much more.
 
 This guide will also cover subjects like common errors and how to solve them, keeping your code clean, setting up a proper development environment, etc.
-Sounds good? Great! Let's get started, then.
+Sounds good? Great! Let's get started.
 
 ## Before you begin...
 
@@ -25,11 +22,11 @@ While you _can_ make a bot with very little JavaScript and programming knowledge
 
 If you don't know JavaScript but would like to learn about it, here are a few links to help get you started:
 
-- [Eloquent JavaScript, a free online book](http://eloquentjavascript.net/)
-- [JavaScript.info, a modern javascript tutorial](https://javascript.info/)
-- [Codecademy's interactive JavaScript course](https://www.codecademy.com/learn/introduction-to-javascript)
-- [Nodeschool, for both JavaScript and Node.js lessons](https://nodeschool.io/)
-- [MDN's JavaScript guide and full documentation](https://developer.mozilla.org/en-US/docs/Web/JavaScript)
+- [Eloquent JavaScript, a free online book](http://eloquentjavascript.net)
+- [JavaScript.info, a modern javascript tutorial](https://javascript.info)
+- [Codecademy's interactive JavaScript course](https://codecademy.com/learn/introduction-to-javascript)
+- [Nodeschool, for both JavaScript and Node.js lessons](https://nodeschool.io)
+- [MDN's JavaScript guide and full documentation](https://developer.mozilla.org/docs/Web/JavaScript)
 - [Google, your best friend](https://google.com)
 
 Take your pick, learn some JavaScript, and once you feel like you're confident enough to make a bot, come back and get started!

apps/guide/src/content/01-home/02-whats-new.mdx

@@ -21,9 +21,7 @@ category: Home
 			time: 'Today at 21:00',
 		}}
 	>
-		discord.js v14 has released and the guide has been updated!
-		<br />
-		This includes additions and changes made in Discord, such as slash commands and message components.
+		This website is new! We will no longer be updating the old guide website.
 	</DiscordMessage>
 </DiscordMessages>
 
@@ -33,25 +31,9 @@ We have moved from VuePress to [Next.js](https://nextjs.org/)! The source can be
 
 ## Pages
 
-All content has been updated to use discord.js v14 syntax. The v13 version of the guide can be found at https://v13.discordjs.guide.
-
-### New
-
-- [Updating from v13 to v14](/additional-info/changes-in-v14.md): A list of the changes from discord.js v13 to v14
-- [Slash commands](/interactions/slash-commands.md): Registering, replying to slash commands and permissions
-- [Buttons](/interactions/buttons.md): Building, sending, and receiving buttons
-- [Select menus](/interactions/select-menus.md): Building, sending, and receiving select menus
-- [Threads](/popular-topics/threads.md): Creating and managing threads
-- [Builders](/popular-topics/builders.md): A collection of builders to use with your bot
-
-### Updated
-
-- Commando: Replaced with [Sapphire](https://sapphirejs.dev/docs/Guide/getting-started/getting-started-with-sapphire)
-- [Voice](/voice/): Rewritten to use the [_`@discordjs/voice`_](https://github.com/discordjs/discord.js/tree/main/packages/voice) package
-- [Command handling](/creating-your-bot/command-handling.md/): Updated to use slash commands
-  - Obsolete sections removed
-- _`client.on('message')`_ snippets updated to _`client.on(Events.InteractionCreate)`_
-  - [Message content became a privileged intent on August 31, 2022](https://support-dev.discord.com/hc/articles/4404772028055)
+- Pages have been revamped to account for our new [create-discord-bot](https://github.com/discordjs/discord.js/tree/main/packages/create-discord-bot) command-line interface.
+- Popular topic are now simply "topics" that detail usage of a particular concept of the API.
+- Focus is primarily on discord.js, so irrelevant topics have been removed. It may be better to visit the documentation of the package you are using to learn how to use them.
 
 <DiscordMessages rounded>
 	<DiscordMessage

apps/guide/src/content/01-home/03-how-to-contribute.mdx

@@ -7,16 +7,16 @@ category: Home
 
 Since this guide is made specifically for the discord.js community, we want to be sure to provide the most relevant and up-to-date content. We will, of course, make additions to the current pages and add new ones as we see fit, but fulfilling requests is how we know we're providing content you all want the most.
 
-Requests may be as simple as "add an example to the [frequently asked questions](/popular-topics/faq.html) page", or as elaborate as "add a page regarding [sharding](/sharding/)". We'll do our best to fulfill all requests, as long as they're reasonable.
+Requests may be as simple as "add an example to the [frequently asked questions](../topics/frequently-asked-questions) page", or as elaborate as "add a page regarding [sharding](../topics/sharding)". We'll do our best to fulfill all requests, as long as they're reasonable.
 
 To make a request, simply head over to [the repository's issue tracker](https://github.com/discordjs/discord.js/issues) and [create a new issue](https://github.com/discordjs/discord.js/issues/new)! Title it appropriately, and let us know exactly what you mean inside the issue description. Make sure that you've looked around the site before making a request; what you want to request might already exist!
 
-<Alert title="Tip" type="success">
+<Alert title="Tip" type="info">
 	Remember that you can always [fork the repository](https://github.com/discordjs/discord.js/fork) and [make a pull
 	request](https://github.com/discordjs/discord.js/pulls) if you want to add anything to the guide yourself!
 </Alert>
 
-We'll also get into some of the more advanced features this guide does below.
+We'll also get into some of the more advanced features this guide uses below. We recommended you have a look at the [source](https://github.com/discordjs/discord.js/blob/main/apps/guide/src/content/01-home/03-how-to-contribute.mdx) of this page to see exactly how they work.
 
 ## Components
 

apps/guide/src/content/02-getting-started/01-starting-out.mdx

@@ -0,0 +1,64 @@
+---
+title: Starting out
+category: Getting started
+---
+
+# Starting out
+
+Our [create-discord-bot](https://github.com/discordjs/discord.js/tree/main/packages/create-discord-bot) command-line interface sets up a basic Discord bot to help you get started on your journey.
+
+## Creating your bot
+
+To use discord.js, you'll need to install [Node.js](https://nodejs.org), [Deno](https://deno.com), or [Bun](https://bun.sh). discord.js v14 requires Node.js v16.11.0 or higher, but the long-term support (LTS) version is always recommended. For the purposes of this guide, we will be using Node.js.
+
+<Alert title="Tip" type="info">
+	To check if you already have Node.js installed, run _`node --version`_ in your terminal. If it outputs _`v16.11.0`_ or
+	higher, then you're good to go!
+</Alert>
+
+### Windows
+
+- Download from the [Node.js website](https://nodejs.org).
+- Use [fnm](https://github.com/Schniz/fnm).
+- Use [Volta](https://volta.sh).
+
+### macOS
+
+- Download from the [Node.js website](https://nodejs.org/).
+- Use [fnm](https://github.com/Schniz/fnm).
+- Use [Homebrew](https://formulae.brew.sh/formula/node).
+- Use [nvm](https://github.com/nvm-sh/nvm?tab=readme-ov-file#installing-and-updating).
+- Use [Volta](https://volta.sh).
+
+### Linux
+
+- Visit [this page](https://nodejs.org/en/download/package-manager) to determine how you should install Node.js.
+- Use [fnm](https://github.com/Schniz/fnm).
+- Use [nvm](https://github.com/nvm-sh/nvm).
+- Use [Volta](https://volta.sh).
+
+After installing Node.js, you'll be able to create a new application from your desired package manager. If you're starting out fresh, installing Node.js will also install npm, a package manager for Node.js.
+
+<CH.Code lineNumbers={false} showCopyButton={true}>
+
+```sh npm
+npm create discord-bot
+```
+
+```sh yarn
+yarn create discord-bot
+```
+
+```sh pnpm
+pnpm create discord-bot
+```
+
+```sh bun
+bun create discord-bot
+```
+
+</CH.Code>
+
+You'll be asked the directory to create the application in, as well as whether TypeScript should be used. Dependencies will automatically be installed for you. After this, you've just got your startup Discord bot template _nearly_ ready!
+
+In the next section, we will explain how to create an application to interact with Discord's API.

apps/guide/src/content/02-getting-started/02-setting-up-an-application.mdx

@@ -1,25 +1,28 @@
 ---
-title: Setting up a bot application
-category: Installations and preparations
+title: Setting up an application
+category: Getting started
 ---
 
-# Setting up a bot application
+# Setting up an application
 
-## Creating your bot
+You'll need to create an application on Discord's developer portal so your bot has a token to interact with Discord's API.
 
-Now that you've installed Node, discord.js, and hopefully a linter, you're almost ready to start coding! The next step you need to take is setting up an actual Discord bot application via Discord's website.
+## Creating the application
 
-It's effortless to create one. The steps you need to take are as follows:
+Follow these steps:
 
-1. Open the [Discord developer portal](https://discord.com/developers/applications) and log into your account.
+1. Open the [Discord developer portal](https://discord.com/developers/applications). You'll need to be logged in.
 2. Click on the "New Application" button.
 3. Enter a name and confirm the pop-up window by clicking the "Create" button.
+   - You'll need to agree to the [Developer Terms of Service](https://discord.com/developers/docs/policies-and-agreements/terms-of-service) and [Developer Policy](https://discord.com/developers/docs/policies-and-agreements/developer-policy).
 
 You should see a page like this:
 
 ![Successfully created application](/assets/create-app.png)
 
-You can edit your application's name, description, and avatar here. Once you've saved your changes, move on by selecting the "Bot" tab in the left pane.
+You can edit your application's name, description, and avatar here. Copy the application id and paste it in the .env file after _`APPLICATION_ID=`_.
+
+Once you've saved your changes, move on by selecting the "Bot" tab in the left pane.
 
 ## Your bot's token
 
@@ -32,9 +35,11 @@ On the bot tab, you'll see a section like this:
 
 ![Bot application](/assets/bot-user.png)
 
-In this panel, you can give your bot a snazzy avatar, set its username, and make it public or private. Your bot's token will be revealed when you press the "Reset Token" button and confirm. When we ask you to paste your bot's token somewhere, this is the value that you need to put in. If you happen to lose your bot's token at some point, you need to come back to this page and reset your bot's token again which will reveal the new token, invalidating all old ones.
+In this panel, you can give your bot a snazzy avatar, set its username, and make it public or private. Your bot's token will be revealed when you press the "Reset Token" button and confirm. Once you've done this, copy it and paste it in the .env file after _`DISCORD_TOKEN=`_.
 
-### What is a token, anyway?
+If you happen to lose this token at some point, you will need to come back to this page and reset it, which will reveal the new token, invalidating all old ones.
+
+### Bot token explanation
 
 A token is essentially your bot's password; it's what your bot uses to login to Discord. With that said, **it is vital that you do not ever share this token with anybody, purposely or accidentally**. If someone does manage to get a hold of your bot's token, they can use your bot as if it were theirs—this means they can perform malicious acts with it.
 
@@ -52,8 +57,6 @@ Let's imagine that you have a bot on over 1,000 servers, and it took you many, m
 
 All that and much, much more. Sounds pretty terrible, right? So make sure to keep your bot's token as safe as possible!
 
-In the [configuration files](../creating-your-bot/configuration-files) page of the guide, we cover how to safely store your bot's token in a configuration file.
-
 <Alert title="Compromised tokens" type="danger">
 	If your bot token has been compromised by committing it to a public repository, posting it in discord.js support etc.
 	or otherwise see your bot's token in danger, return to this page and press "Reset Token". This will invalidate all old

apps/guide/src/content/02-getting-started/03-adding-your-bot-to-a-server.mdx

@@ -0,0 +1,48 @@
+---
+title: Adding your bot to a server
+category: Getting started
+---
+
+# Adding your bot to a server
+
+After you [set up an application](./setting-up-an-application), you'll notice it's not in any servers yet. So, how does that work?
+
+Before you're able to see your bot in a server, you will need to add it by using an invite link.
+
+## Bot invite links
+
+The basic version of one such link looks like this:
+
+<CH.Code lineNumbers={false}>
+
+```
+https://discord.com/api/oauth2/authorize?client_id=123456789012345678&permissions=0&scope=bot
+```
+
+</CH.Code>
+
+The structure of the URL is quite simple:
+
+- _`https://discord.com/api/oauth2/authorize`_ is Discord's standard structure for authorizing an OAuth2 application (such as your bot application) for entry to a Discord server.
+- _`client_id=...`_ is to specify _which_ application you want to authorize. You'll need to replace this part with your client's id to create a valid invite link.
+- _`permissions=...`_ describes the permissions that your bot will request to be granted by default upon joining the server you are adding it to.
+- _`scope=bot`_ specifies that you want to add this application as a Discord bot with the ability to create slash commands.
+
+<Alert title="Warning" type="warning">
+	If you get an error message saying "Bot requires a code grant", head over to your application's settings and disable
+	the "Requires OAuth2 Code Grant" option. You shouldn't enable this option unless you know why you need to.
+</Alert>
+
+## Creating and using your invite link
+
+To create an invite link, head back to the [developer portal](https://discord.com/developers/applications), click on your bot application, and open the OAuth2 page.
+
+In the sidebar, you'll find the URL generator. Select the _`bot`_ option. Once you select the _`bot`_ option, a list of permissions will appear, allowing you to configure the permissions your bot needs.
+
+Grab the link via the "Copy" button and send it in a channel in Discord. Click on the link you just sent which should reveal this:
+
+![Bot Authorization page](/assets/bot-auth-page.png)
+
+Choose the server you want to add the bot to and click "Authorize". Congratulations! You've successfully added your bot to your Discord server.
+
+At this point, you should have a Discord bot you created with [create-discord-bot](https://github.com/discordjs/discord.js/tree/main/packages/create-discord-bot) with your .env file populated and your Discord bot in a server. You are now ready to do what you like.

apps/guide/src/content/02-installations-and-preparations/01-installing-node-discordjs.mdx

@@ -1,102 +0,0 @@
----
-title: Installing Node.js and discord.js
-category: Installations and preparations
----
-
-# Installing Node.js and discord.js
-
-## Installing Node.js
-
-To use discord.js, you'll need to install [Node.js](https://nodejs.org/). discord.js v14 requires Node v16.9.0 or higher.
-
-<Alert title="Tip" type="success">
-	To check if you already have Node installed on your machine \(e.g., if you're using a VPS\), run _`node -v`_ in your
-	terminal. If it outputs _`v16.9.0`_ or higher, then you're good to go! Otherwise, continue reading.
-</Alert>
-
-On Windows, it's as simple as installing any other program. Download the latest version from [the Node.js website](https://nodejs.org/), open the downloaded file, and follow the steps from the installer.
-
-On macOS, either:
-
-- Download the latest version from [the Node.js website](https://nodejs.org/), open the package installer, and follow the instructions
-- Use a package manager like [Homebrew](https://brew.sh/) with the command _`brew install node`_
-
-On Linux, you can consult [this page](https://nodejs.org/en/download/package-manager/) to determine how you should install Node. Native package managers often default to outdated versions of Node, so make sure you follow the recommended approach for your chosen Linux distribution carefully.
-
-## Preparing the essentials
-
-To use discord.js, you'll need to install it via npm \(Node's package manager\). npm comes with every Node installation, so you don't have to worry about installing that. However, before you install anything, you should set up a new project folder.
-
-Navigate to a suitable place on your machine and create a new folder named _`discord-bot`_ (or whatever you want). Next you'll need to open your terminal.
-
-### Opening the terminal
-
-<Alert title="Tip" type="success">
-	If you use [Visual Studio Code](https://code.visualstudio.com/), you can press <kbd>Ctrl + `</kbd> (backtick) to open
-	its integrated terminal.
-</Alert>
-
-On Windows, either:
-
-- <kbd>Shift + Right-click</kbd> inside your project directory and choose the "Open command window here" option
-- Press <kbd>Win + R</kbd> and run _`cmd.exe`_, and then _`cd`_ into your project directory
-
-On macOS, either:
-
-- Open Launchpad or Spotlight and search for "Terminal"
-- In your "Applications" folder, under "Utilities", open the Terminal app
-
-On Linux, you can quickly open the terminal with <kbd>Ctrl + Alt + T</kbd>.
-
-With the terminal open, run the _`node -v`_ command to make sure you've successfully installed Node.js. If it outputs _`v16.9.0`_ or higher, great!
-
-### Initiating a project folder
-
-<CH.Code lineNumbers={false}>
-
-```sh npm
-npm init; npm pkg set type="module"
-```
-
-```sh yarn
-yarn init
-# You must go into your package.json file and add "type": "module"
-```
-
-```sh pnpm
-pnpm init; pnpm pkg set type="module"
-```
-
-</CH.Code>
-
-This is the next command you'll be running. This command creates a _`package.json`_ file for you, which will keep track of the dependencies your project uses, as well as other info.
-
-This command will ask you a sequence of questions–you should fill them out as you see fit. If you're not sure of something or want to skip it as a whole, leave it blank and press enter. Setting the package type as _`module`_ tells Node that you'll be writing this project using ESM \(ECMAScript modules\), supporting the latest JavaScript syntax and features.
-
-Once you're done with that, you're ready to install discord.js!
-
-## Installing discord.js
-
-Now that you've installed Node.js and know how to open your console and run commands, you can finally install discord.js! Run the following command in your terminal:
-
-<CH.Code lineNumbers={false}>
-
-```sh npm
-npm install discord.js
-```
-
-```sh yarn
-yarn add discord.js
-```
-
-```sh pnpm
-pnpm add discord.js
-```
-
-</CH.Code>
-
-And that's it! With all the necessities installed, you're almost ready to start coding your bot.
-
-## Installing a linter
-
-While you are coding, it's possible to run into numerous syntax errors or code in an inconsistent style. You should [install a linter](./setting-up-a-linter) to ease these troubles. While code editors generally can point out syntax errors, linters coerce your code into a specific style as defined by the configuration. While this is not required, it is advised.

apps/guide/src/content/02-installations-and-preparations/02-setting-up-a-linter.mdx

@@ -1,6 +0,0 @@
----
-title: Setting up a linter
-category: Installations and preparations
----
-
-TODO: Rewrite. Placeholder page for ordering.

apps/guide/src/content/02-installations-and-preparations/04-adding-your-bot-to-servers.mdx

@@ -1,52 +0,0 @@
----
-title: Adding your bot to servers
-category: Installations and preparations
----
-
-# Adding your bot to servers
-
-After you [set up a bot application](./setting-up-a-bot-application), you'll notice that it's not in any servers yet. So how does that work?
-
-Before you're able to see your bot in your own (or other) servers, you'll need to add it by creating and using a unique invite link using your bot application's client id.
-
-## Bot invite links
-
-The basic version of one such link looks like this:
-
-<CH.Code lineNumbers={false}>
-
-```
-https://discord.com/api/oauth2/authorize?client_id=123456789012345678&permissions=0&scope=bot%20applications.commands
-```
-
-</CH.Code>
-
-The structure of the URL is quite simple:
-
-- _`https://discord.com/api/oauth2/authorize`_ is Discord's standard structure for authorizing an OAuth2 application (such as your bot application) for entry to a Discord server.
-- _`client_id=...`_ is to specify _which_ application you want to authorize. You'll need to replace this part with your client's id to create a valid invite link.
-- _`permissions=...`_ describes the permissions that your bot will request to be granted by default upon joining the server you are adding it to.
-- _`scope=bot%20applications.commands`_ specifies that you want to add this application as a Discord bot, with the ability to create slash commands.
-
-<Alert title="Warning" type="warning">
-	If you get an error message saying "Bot requires a code grant", head over to your application's settings and disable
-	the "Require OAuth2 Code Grant" option. You shouldn't enable this option unless you know why you need to.
-</Alert>
-
-## Creating and using your invite link
-
-To create an invite link, head back to the [My Apps](https://discord.com/developers/applications/me) page under the "Applications" section, click on your bot application, and open the OAuth2 page.
-
-In the sidebar, you'll find the OAuth2 URL generator. Select the _`bot`_ and _`applications.commands`_ options. Once you select the _`bot`_ option, a list of permissions will appear, allowing you to configure the permissions your bot needs.
-
-Grab the link via the "Copy" button and enter it in your browser. You should see something like this (with your bot's username and avatar):
-
-![Bot Authorization page](/assets/bot-auth-page.png)
-
-Choose the server you want to add it to and click "Authorize". Do note that you'll need the "Manage Server" permission on a server to add your bot there. This should then present you a nice confirmation message:
-
-![Bot authorized](/assets/bot-authorized.png)
-
-Congratulations! You've successfully added your bot to your Discord server. It should show up in your server's member list somewhat like this:
-
-![Bot in server's member list](/assets/bot-in-memberlist.png)

apps/guide/src/content/03-creating-your-bot/01-configuration-files.mdx

@@ -1,132 +0,0 @@
----
-title: Configuration files
-category: Creating your bot
----
-
-# Configuration files
-
-Once you [add your bot to a server](../installations-and-preparations/adding-your-bot-to-servers), the next step is to start coding and get it online! Let's start by creating a config file to prepare the necessary values your client will need.
-
-As explained in the ["What is a token, anyway?"](../installations-and-preparations/setting-up-a-bot-application.md#what-is-a-token-anyway) section, your token is essentially your bot's password, and you should protect it as best as possible. This can be done through a _`config.json`_ file or by using environment variables.
-
-Open your application in the [Discord Developer Portal](https://discord.com/developers/applications) and go to the "Bot" page to copy your token.
-
-## Using config.json
-
-Storing data in a _`config.json`_ file is a common way of keeping your sensitive values safe. Create a _`config.json`_ file in your project directory and paste in your token. You can access your token inside other files by importing this file.
-
-<CH.Code lineNumbers={false}>
-
-```json config.json
-{
-	"token": "your-token-goes-here"
-}
-```
-
-```js index.js
-import config from './config.json' assert { type: 'json' };
-
-console.log(config.token);
-```
-
-</CH.Code>
-
-<Alert title="Danger" type="danger">
-	If you're using Git, you should not commit this file and should [ignore it via `.gitignore`](#git-and-gitignore).
-</Alert>
-
-## Using environment variables
-
-Environment variables are special values for your environment (e.g., terminal session, Docker container, or environment variable file). You can pass these values into your code's scope so that you can use them.
-
-One way to pass in environment variables is via the command line interface. When starting your app, instead of _`node index.js`_, use _`TOKEN=your-token-goes-here node index.js`_. You can repeat this pattern to expose other values as well.
-
-You can access the set values in your code via the _`process.env`_ global variable, accessible in any file. Note that values passed this way will always be strings and that you might need to parse them to a number, if using them to do calculations.
-
-<CH.Code lineNumbers={false} rows={3}>
-
-```sh Shell
-A=123 B=456 DISCORD_TOKEN=your-token-goes-here node index.js
-```
-
-```js index.js
-console.log(process.env.A);
-console.log(process.env.B);
-console.log(process.env.DISCORD_TOKEN);
-```
-
-</CH.Code>
-
-### Using dotenv
-
-Another common approach is storing these values in a _`.env`_ file. This spares you from always copying your token into the command line. Each line in a _`.env`_ file should hold a _`KEY=value`_ pair.
-
-You can use the [`dotenv` package](https://www.npmjs.com/package/dotenv) for this. Once installed, require and use the package to load your _`.env`_ file and attach the variables to _`process.env`_:
-
-<CH.Code lineNumbers={false}>
-
-```sh npm
-npm install dotenv
-```
-
-```sh yarn
-yarn add dotenv
-```
-
-```sh pnpm
-pnpm add dotenv
-```
-
-</CH.Code>
-
-<CH.Code lineNumbers={false} rows={7}>
-
-```sh .env
-A=123
-B=456
-DISCORD_TOKEN=your-token-goes-here
-```
-
-```js index.js
-import { config } from 'dotenv';
-
-config();
-
-console.log(process.env.A);
-console.log(process.env.B);
-console.log(process.env.DISCORD_TOKEN);
-```
-
-</CH.Code>
-
-<Alert title="Danger" type="danger">
-	If you're using Git, you should not commit this file and should [ignore it via `.gitignore`](#git-and-gitignore).
-</Alert>
-
-<Alert title="Online editors (Glitch, Heroku, Replit, etc.)" type="info">
-While we generally do not recommend using online editors as hosting solutions, but rather invest in a proper virtual private server, these services do offer ways to keep your credentials safe as well! Please see the respective service's documentation and help articles for more information on how to keep sensitive values safe:
-
-- Glitch: [Storing secrets in .env](https://glitch.happyfox.com/kb/article/18)
-- Heroku: [Configuration variables](https://devcenter.heroku.com/articles/config-vars)
-- Replit: [Secrets and environment variables](https://docs.replit.com/repls/secrets-environment-variables)
-
-</Alert>
-
-## Git and .gitignore
-
-Git is a fantastic tool to keep track of your code changes and allows you to upload progress to services like [GitHub](https://github.com/), [GitLab](https://about.gitlab.com/), or [Bitbucket](https://bitbucket.org/product). While this is super useful to share code with other developers, it also bears the risk of uploading your configuration files with sensitive values!
-
-You can specify files that Git should ignore in its versioning systems with a*`.gitignore`* file. Create a _`.gitignore`_ file in your project directory and add the names of the files and folders you want to ignore:
-
-```
-node_modules
-.env
-config.json
-```
-
-<Alert title="Tip" type="success">
-	Aside from keeping credentials safe, _`node_modules`_ should be included here. Since this directory can be restored based on the entries in your _`package.json`_ and _`package-lock.json`_ files by running _`npm install`_, it does not need to be included in Git.
-
-    You can specify quite intricate patterns in _`.gitignore`_ files, check out the [Git documentation on `.gitignore`](https://git-scm.com/docs/gitignore) for more information!
-
-</Alert>

apps/guide/src/content/03-creating-your-bot/02-creating-the-main-file.mdx

@@ -1,60 +0,0 @@
----
-title: Creating the main file
-category: Creating your bot
----
-
-# Creating the main file
-
-<Alert title="Tip" type="success">
-	This page assumes you've already prepared the [configuration files](./configuration-files) from the previous page.
-	We're using the _`config.json`_ approach, however feel free to substitute your own!
-</Alert>
-
-Open your code editor and create a new file. We suggest that you save the file as _`index.js`_, but you may name it whatever you wish.
-
-Here's the base code to get you started:
-
-<CH.Code>
-
-```js
-// Require the necessary discord.js classes
-import { Client, Events, GatewayIntentBits } from 'discord.js';
-import config from './config.json' assert { type: 'json' };
-
-// Create a new client instance
-const client = new Client({ intents: [GatewayIntentBits.Guilds] });
-
-// When the client is ready, run this code (only once)
-// We use 'c' for the event parameter to keep it separate from the already defined 'client'
-client.once(Events.ClientReady, (c) => {
-	console.log(`Ready! Logged in as ${c.user.tag}`);
-});
-
-// Log in to Discord with your client's token
-client.login(config.token);
-```
-
-</CH.Code>
-
-This is how you create a client instance for your Discord bot and log in to Discord. The _`GatewayIntentBits.Guilds`_ intents option is necessary for the discord.js client to work as you expect it to, as it ensures that the caches for guilds, channels, and roles are populated and available for internal use.
-
-<Alert title="Tip" type="success">
-	The term "guild" is used by the Discord API and in discord.js to refer to a Discord server.
-</Alert>
-
-Intents also define which events Discord should send to your bot, and you may wish to enable more than just the minimum. You can read more about the other intents on the [Intents topic](../popular-topics/intents).
-
-## Running your application
-
-Open your terminal and run _`node index.js`_ to start the process. If you see "Ready!" after a few seconds, you're good to go! The next step is to start adding [slash commands](./adding-commands) to develop your bot's functionality.
-
-<Alert title="Tip" type="success">
-You can open your _`package.json`_ file and edit the _`"main": "index.js"`_ field to point to your main file. You can then run _`node .`_ in your terminal to start the process!
-
-After closing the process with _`Ctrl + C`_, you can press the up arrow on your keyboard to bring up the latest commands you've run. Pressing up and then enter after closing the process is a quick way to start it up again.
-
-</Alert>
-
-#### Resulting code
-
-<ResultingCode path="creating-your-bot/initial-files" />

apps/guide/src/content/03-creating-your-bot/03-adding-commands.mdx

@@ -1,147 +0,0 @@
----
-title: Adding commands
-category: Creating your bot
----
-
-# Creating slash commands
-
-Discord allows developers to register [slash commands](https://discord.com/developers/docs/interactions/application-commands), which provide users a first-class way of interacting directly with your application.
-
-Slash commands provide a huge number of benefits over manual message parsing, including:
-
-- Integration with the Discord client interface.
-- Automatic command detection and parsing of the associated options/arguments.
-- Typed argument inputs for command options, e.g. "String", "User", or "Role".
-- Validated or dynamic choices for command options.
-- In-channel private responses (ephemeral messages).
-- Pop-up form-style inputs for capturing additional information.
-
-...and many more!
-
-<Alert title="Read first!" type="info">
-	For fully functional slash commands, there are three important pieces of code that need to be written. They are:
-
-    1. The individual command files, containing their definitions and functionality.
-    2. The [command handler](command-handling.html), which dynamically reads the files and executes the commands.
-    3. The [command deployment script](command-deployment.html), to register your slash commands with Discord so they appear in the interface.
-
-    These steps can be done in any order, but **all are required** before the commands are fully functional.
-
-    On this page, you'll complete Step 1. Make sure to also complete the other pages linked above!
-
-</Alert>
-
-## Before you continue
-
-Assuming you've followed the guide so far, your project directory should look something like this:
-
-```:no-line-numbers
-discord-bot/
-├── node_modules
-├── config.json
-├── index.js
-├── package-lock.json
-└── package.json
-```
-
-## Individual command files
-
-Create a new folder named _`commands`_, which is where you'll store all of your command files.
-
-At a minimum, the definition of a slash command must have a name and a description. Slash command names must be between 1-32 characters and contain no capital letters, spaces, or symbols other than _`-`_ and _`_`_. Using the builder, a simple _`ping`\_ command definition would look like this:
-
-<CH.Code>
-
-```js
-export const data = {
-	name: 'ping',
-	description: 'Replies with Pong!',
-};
-```
-
-</CH.Code>
-
-A slash command also requires a function to run when the command is used, to respond to the interaction. Using an interaction response method confirms to Discord that your bot successfully received the interaction, and has responded to the user. Discord enforces this to ensure that all slash commands provide a good user experience (UX). Failing to respond will cause Discord to show that the command failed, even if your bot is performing other actions as a result.
-
-The simplest way to acknowledge and respond to an interaction is the _`interaction.reply()`_ method. Other methods of replying are covered on the [Response methods](../slash-commands/response-methods) page later in this section.
-
-<CH.Code>
-
-```js
-export async function execute(interaction) {
-	await interaction.reply('Pong!');
-}
-```
-
-</CH.Code>
-
-Put these two together by creating a `commands/ping.js` file for your first command. Inside this file, you're going to define and export two items.
-
-- The `data` property, which will provide the command definition shown above for registering to Discord.
-- The `execute` method, which will contain the functionality to run from our event handler when the command is used.
-
-The _`export`_ keyword ensures these values can be imported and read by other files; namely the command loader and command deployment scripts mentioned earlier.
-
-<CH.Code>
-
-```js commands/ping.js
-export const data = {
-	name: 'ping',
-	description: 'Replies with Pong!',
-};
-
-export async function execute(interaction) {
-	await interaction.reply('Pong!');
-}
-```
-
-</CH.Code>
-
-<Alert title="Tip" type="success">
-	[`module.exports`](https://nodejs.org/api/modules.html#modules_module_exports) is how you export data in Node.js so that you can [`require()`](https://nodejs.org/api/modules.html#modules_require_id) it in other files.
-
-    If you need to access your client instance from inside a command file, you can access it via `interaction.client`. If you need to access external files, packages, etc., you should `require()` them at the top of the file.
-
-</Alert>
-
-That's it for your basic ping command. Below are examples of two more commands we're going to build upon throughout the guide, so create two more files for these before you continue reading.
-
-<CH.Code>
-
-```js commands/user.js
-export const data = {
-	name: 'user',
-	description: 'Provides information about the user.',
-};
-
-export async function execute(interaction) {
-	// interaction.user is the object representing the User who ran the command
-	// interaction.member is the GuildMember object, which represents the user in the specific guild
-	await interaction.reply(
-		`This command was run by ${interaction.user.username}, who joined on ${interaction.member.joinedAt}.`,
-	);
-}
-```
-
-```js commands/server.js
-export const data = {
-	name: 'server',
-	description: 'Provides information about the server.',
-};
-
-export async function execute(interaction) {
-	// interaction.guild is the object representing the Guild in which the command was run
-	await interaction.reply(`This server is ${interaction.guild.name} and has 
-		${interaction.guild.memberCount} members.`);
-}
-```
-
-</CH.Code>
-
-#### Next steps
-
-You can implement additional commands by creating additional files in the _`commands`_ folder, but these three are the ones we're going to use for the examples as we go on. For now let's move on to the code you'll need for command handling, to load the files and respond to incoming interactions.
-
-#### Resulting code
-
-<ResultingCode />

apps/guide/src/content/03-creating-your-bot/04-handling-command-interactions.mdx

@@ -1,297 +0,0 @@
----
-title: Handling command interactions
-category: Creating your bot
----
-
-# Command handling
-
-Unless your bot project is small, it's not a very good idea to have a single file with a giant _`if`_/_`else if`_ chain for commands. If you want to implement features into your bot and make your development process a lot less painful, you'll want to implement a command handler. Let's get started on that!
-
-<Alert title="Read first!" type="info">
-	For fully functional slash commands, there are three important pieces of code that need to be written. They are:
-
-    1. The [individual command files](slash-commands), containing their definitions and functionality.
-    2. The command handler, which dynamically reads the files and executes the commands.
-    3. The [command deployment script](command-deployment), to register your slash commands with Discord so they appear in the interface.
-
-    These steps can be done in any order, but **all are required** before the commands are fully functional.
-
-    This page details how to complete **Step 2**. Make sure to also complete the other pages linked above!
-
-</Alert>
-
-## Loading command files
-
-Now that your command files have been created, your bot needs to load these files on startup.
-
-In your _`index.js`_ file, make these additions to the base template:
-
-<CH.Code>
-
-```js JavaScript mark=1:4,9
-import { readdir } from 'node:fs/promises';
-import { join } from 'node:path';
-import { fileURLToPath } from 'node:url';
-import { Client, Collection, Events, GatewayIntentBits } from 'discord.js';
-import config from './config.json' assert { type: 'json' };
-
-const client = new Client({ intents: [GatewayIntentBits.Guilds] });
-
-const commands = new Collection();
-
-client.once(Events.ClientReady, () => {
-	console.log('Ready!');
-});
-```
-
-```ts TypeScript mark=1:11,16:21
-import { readdir } from 'node:fs/promises';
-import { join } from 'node:path';
-import { fileURLToPath } from 'node:url';
-import {
-	Client,
-	Collection,
-	Events,
-	GatewayIntentBits,
-	type RESTPostAPIChatInputApplicationCommandsJSONBody,
-	type ChatInputCommandInteraction,
-} from 'discord.js';
-import config from './config.json';
-
-const client = new Client({ intents: [GatewayIntentBits.Guilds] });
-
-interface CommandModule {
-	data: RESTPostAPIChatInputApplicationCommandsJSONBody;
-	execute(interaction: ChatInputCommandInteraction): Promise<void>;
-}
-
-const commands = new Collection<string, CommandModule>();
-
-client.once(Events.ClientReady, () => {
-	console.log('Ready!');
-});
-```
-
-</CH.Code>
-
-<Alert title="Tip" type="info">
-	- The [`fs`](https://nodejs.org/api/fs.html) module is Node's native file system module. _`readdir`_ is used to read
-	the _`commands`_ directory and identify our command files. - The [`path`](https://nodejs.org/api/path.html) module is
-	Node's native path utility module. _`join`_ helps construct paths to access files and directories. One of the
-	advantages of _`path.join`_ is that it automatically detects the operating system and uses the appropriate joiners. -
-	The [`url`](https://nodejs.org/api/url.html) module provides utilities for URL resolution and parsing.
-	_`fileURLToPath`_ ensuring a cross-platform valid absolute path string.
-	- The{' '}
-	<DocsLink type="class" parent="Collection" /> class extends JavaScript's native
-	[_`Map`_](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map) class, and includes
-	more extensive, useful functionality. _`Collection`_ is used to store and efficiently retrieve commands for execution.
-
-</Alert>
-
-Next, using the modules imported above, dynamically retrieve your command files with a few more additions to the _`index.js`_ file:
-
-<CH.Code>
-
-```js JavaScript focus=3:15
-const commands = new Collection();
-
-const commandsPath = fileURLToPath(new URL('commands', import.meta.url));
-const commandFiles = await readdir(commandsPath).then((files) => files.filter((file) => file.endsWith('.js')));
-
-for (const file of commandFiles) {
-	const filePath = join(commandsPath, file);
-	const command = await import(filePath);
-	// Set a new item in the Collection with the key as the command name and the value as the exported module
-	if ('data' in command && 'execute' in command) {
-		commands.set(command.data.name, command);
-	} else {
-		console.log(`[WARNING] The command at ${filePath} is missing a required "data" or "execute" property.`);
-	}
-}
-```
-
-```ts TypeScript focus=3:15
-const commands = new Collection<string, CommandModule>();
-
-const commandsPath = fileURLToPath(new URL('commands', import.meta.url));
-const commandFiles = await readdir(commandsPath).then((files) => files.filter((file) => file.endsWith('.js')));
-
-for (const file of commandFiles) {
-	const filePath = join(commandsPath, file);
-	const command = await import(filePath);
-	// Set a new item in the Collection with the key as the command name and the value as the exported module
-	if ('data' in command && 'execute' in command) {
-		commands.set(command.data.name, command);
-	} else {
-		console.log(`[WARNING] The command at ${filePath} is missing a required "data" or "execute" property.`);
-	}
-}
-```
-
-</CH.Code>
-
-First, [url.fileURLToPath()](https://nodejs.org/api/url.html) helps to construct a path to the _`commands`_ directory. The [fs.readdir()](https://nodejs.org/api/fs.html#fspromisesreaddirpath-options) method then reads the path to the directory and returns a Promise which resolves to an array of all the file names it contains, currently _`['ping.js', 'server.js', 'user.js']`_. To ensure only command files get processed, _`Array.filter()`_ removes any non-JavaScript files from the array.
-
-With the correct files identified, the last step is to loop over the array and dynamically set each command into the _`commands`_ Collection. For each file being loaded, check that it has at least the _`data`_ and _`execute`_ properties. This helps to prevent errors resulting from loading empty, unfinished or otherwise incorrect command files while you're still developing.
-
-## Receiving command interactions
-
-Every slash command is an _`interaction`_, so to respond to a command, you need to create a listener for the <DocsLink type="class" parent="Client" symbol="e-interactionCreate" /> event that will execute code when your application receives an interaction. Place the code below in the _`index.js`_ file you created earlier.
-
-<CH.Code>
-
-```js
-client.on(Events.InteractionCreate, (interaction) => {
-	console.log(interaction);
-});
-```
-
-</CH.Code>
-
-Not every interaction is a slash command (e.g. _`MessageComponent`_ interactions). Make sure to only handle slash commands in this function by making use of the <DocsLink type="class" parent="BaseInteraction" symbol="isChatInputCommand" brackets /> method to exit the handler if another type is encountered. This method also provides type guarding for TypeScript users, narrowing the type from _`BaseInteraction`_ to <DocsLink type="class" parent="ChatInputCommandInteraction" />.
-
-<CH.Code>
-
-```js focus=2
-client.on(Events.InteractionCreate, (interaction) => {
-	if (!interaction.isChatInputCommand()) return;
-	console.log(interaction);
-});
-```
-
-</CH.Code>
-
-## Executing commands
-
-When your bot receives a <DocsLink type="class" parent="Client" symbol="e-interactionCreate" /> event, the interaction object contains all the information you need to dynamically retrieve and execute your commands!
-
-Let's take a look at the _`ping`_ command again. Note the _`execute()`_ function that will reply to the interaction with "Pong!".
-
-<CH.Code>
-
-```js
-export const data = {
-	name: 'ping',
-	description: 'Replies with Pong!',
-};
-
-export async function execute(interaction) {
-	await interaction.reply('Pong!');
-}
-```
-
-</CH.Code>
-
-First, you need to get the matching command from the _`commands`_ Collection based on the _`interaction.commandName`_. If no matching command is found, log an error to the console and ignore the event.
-
-With the right command identified, all that's left to do is call the command's _`.execute()`_ method and pass in the _`interaction`_ variable as its argument. Note that the event listener has been made _`async`_, allowing Promises to be awaited. In case something goes wrong and the Promise rejects, catch and log any error to the console.
-
-<CH.Code>
-
-```js focus=4:20
-// focus[37:42]
-client.on(Events.InteractionCreate, async (interaction) => {
-	if (!interaction.isChatInputCommand()) return;
-
-	const command = commands.get(interaction.commandName);
-
-	if (!command) {
-		console.error(`No command matching ${interaction.commandName} was found.`);
-		return;
-	}
-
-	try {
-		await command.execute(interaction);
-	} catch (error) {
-		console.error(error);
-		if (interaction.replied || interaction.deferred) {
-			await interaction.followUp({ content: 'There was an error while executing this command!', ephemeral: true });
-		} else {
-			await interaction.reply({ content: 'There was an error while executing this command!', ephemeral: true });
-		}
-	}
-});
-```
-
-</CH.Code>
-
-## Command categories
-
-So far, all of your command files are in a single _`commands`_ folder. This is fine at first, but as your project grows, the number of files in the _`commands`_ folder will too. Keeping track of that many files can be a little tough. To make this a little easier, you can categorize your commands and put them in subfolders inside the _`commands`_ folder. You will have to make a few changes to your existing code in _`index.js`_ for this to work out.
-
-If you've been following along, your project structure should look something like this:
-
-![Project structure before sorting](/assets/before-sorting.png)
-
-After moving your commands into subfolders, it will look something like this:
-
-![Project structure after sorting](/assets/after-sorting.png)
-
-<Alert title="Warning" type="warning">
-	Make sure you put every command file you have inside one of the new subfolders. Leaving a command file directly under
-	the _`commands`_ folder will create problems.
-</Alert>
-
-It is not necessary to name your subfolders exactly like we have named them here. You can create any number of subfolders and name them whatever you want. Although, it is a good practice to name them according to the type of commands stored inside them.
-
-Back in your _`index.js`_ file, where the code to [dynamically read command files](#loading-command-files) is, use the same pattern to read the subfolder directories, and then require each command inside them.
-
-<CH.Code>
-
-```js JavaScript focus=3:7,19
-const commands = new Collection();
-
-const foldersPath = fileURLToPath(new URL('commands', import.meta.url));
-const commandFolders = await readdir(foldersPath);
-
-for (const folder of commandFolders) {
-	const commandsPath = join(foldersPath, folder);
-	const commandFiles = await readdir(commandsPath).then((files) => files.filter((file) => file.endsWith('.js')));
-	for (const file of commandFiles) {
-		const filePath = join(commandsPath, file);
-		const command = await import(filePath);
-		// Set a new item in the Collection with the key as the command name and the value as the exported module
-		if ('data' in command && 'execute' in command) {
-			commands.set(command.data.name, command);
-		} else {
-			console.log(`[WARNING] The command at ${filePath} is missing a required "data" or "execute" property.`);
-		}
-	}
-}
-```
-
-```ts Typescript mark=3:7,19
-const commands = new Collection<string, CommandModule>();
-
-const foldersPath = fileURLToPath(new URL('commands', import.meta.url));
-const commandFolders = await readdir(foldersPath);
-
-for (const folder of commandFolders) {
-	const commandsPath = join(foldersPath, folder);
-	const commandFiles = await readdir(commandsPath).then((files) => files.filter((file) => file.endsWith('.js')));
-	for (const file of commandFiles) {
-		const filePath = join(commandsPath, file);
-		const command = await import(filePath);
-		// Set a new item in the Collection with the key as the command name and the value as the exported module
-		if ('data' in command && 'execute' in command) {
-			commands.set(command.data.name, command);
-		} else {
-			console.log(`[WARNING] The command at ${filePath} is missing a required "data" or "execute" property.`);
-		}
-	}
-}
-```
-
-</CH.Code>
-
-That's it! When creating new files for commands, make sure you create them inside one of the subfolders (or a new one) in the _`commands`_ folder.
-
-#### Next steps
-
-Your command files are now loaded into your bot, and the event listener is prepared and ready to respond. In the next section, we cover the final step - a command deployment script you'll need to register your commands so they appear in the Discord client.
-
-#### Resulting code
-
-<ResultingCode />
-
-It also includes some bonus commands!

apps/guide/src/content/03-creating-your-bot/05-registering-slash-commands.mdx

@@ -1,155 +0,0 @@
----
-title: Registering slash commands
-category: Creating your bot
----
-
-# Registering slash commands
-
-<Alert title="Read first!" type="info">
-	For fully functional slash commands, you need three important pieces of code:
-
-    1. The [individual command files](slash-commands), containing their definitions and functionality.
-    2. The [command handler](command-handling), which dynamically reads the files and executes the commands.
-    3. The command deployment script, to register your slash commands with Discord so they appear in the interface.
-
-    These steps can be done in any order, but **all are required** before the commands are fully functional.
-
-    This page details how to complete **Step 3**. Make sure to also complete the other pages linked above!
-
-</Alert>
-
-## Command registration
-
-Slash commands can be registered in two ways; in one specific guild, or for every guild the bot is in. We're going to look at single-guild registration first, as this is a good way to develop and test your commands before a global deployment.
-
-Your application will need the _`applications.commands`_ scope authorized in a guild for any of its slash commands to appear, and to be able to register them in a specific guild without error.
-
-Slash commands only need to be registered once, and updated when the definition (description, options etc) is changed. As there is a daily limit on command creations, it's not necessary nor desirable to connect a whole client to the gateway or do this on every _`ClientReady`_ event. As such, a standalone script using the lighter REST manager is preferred.
-
-This script is intended to be run separately, only when you need to make changes to your slash command **definitions** - you're free to modify parts such as the execute function as much as you like without redeployment.
-
-### Guild commands
-
-Create a _`deploy-commands.js`_ file in your project directory. This file will be used to register and update the slash commands for your bot application.
-
-Add two more properties to your _`config.json`_ file, which we'll need in the deployment script:
-
-- _`clientId`_: Your application's client id ([Discord Developer Portal](https://discord.com/developers/applications) > "General Information" > application id)
-- _`guildId`_: Your development server's id ([Enable developer mode](https://support.discord.com/hc/en-us/articles/206346498) > Right-click the server title > "Copy Server ID")
-
-<CH.Code lineNumbers={false}>
-
-```json
-{
-	"token": "your-token-goes-here",
-	"clientId": "your-application-id-goes-here",
-	"guildId": "your-server-id-goes-here"
-}
-```
-
-</CH.Code>
-
-With these defined, you can use the deployment script below:
-
-<CH.Code>
-
-```js deploy-commands.js
-import { REST, Routes } from 'discord.js';
-import { readdir } from 'node:fs/promises';
-import { join } from 'node:path';
-import { fileURLToPath } from 'node:url';
-import config from './config.json' assert { type: 'json' };
-
-const { clientId, guildId, token } = config;
-
-const commands = [];
-
-// Grab all the command files from the commands directory you created earlier
-const foldersPath = fileURLToPath(new URL('commands', import.meta.url));
-const commandFolders = await readdir(foldersPath);
-
-for (const folder of commandFolders) {
-	// Grab all the command files from the commands directory you created earlier
-	const commandsPath = join(foldersPath, folder);
-	const commandFiles = await readdir(commandsPath).then((files) => files.filter((file) => file.endsWith('.js')));
-	// Grab the SlashCommandBuilder#toJSON() output of each command's data for deployment
-	for (const file of commandFiles) {
-		const filePath = join(commandsPath, file);
-		const command = await import(filePath);
-		if ('data' in command && 'execute' in command) {
-			commands.push(command.data.toJSON());
-		} else {
-			console.log(`[WARNING] The command at ${filePath} is missing a required "data" or "execute" property.`);
-		}
-	}
-}
-
-// Construct and prepare an instance of the REST module
-const rest = new REST().setToken(token);
-
-try {
-	console.log(`Started refreshing ${commands.length} application (/) commands.`);
-
-	// The put method is used to fully refresh all commands in the guild with the current set
-	const data = await rest.put(Routes.applicationGuildCommands(clientId, guildId), { body: commands });
-
-	console.log(`Successfully reloaded ${data.length} application (/) commands.`);
-} catch (error) {
-	// And of course, make sure you catch and log any errors!
-	console.error(error);
-}
-```
-
-</CH.Code>
-
-Once you fill in these values, run _`node deploy-commands.js`_ in your project directory to register your commands to the guild specified. If you see the success message, check for the commands in the server by typing _`/`_! If all goes well, you should be able to run them and see your bot's response in Discord!
-
-### Global commands
-
-Global application commands will be available in all the guilds your application has the _`applications.commands`_ scope authorized in, and in direct messages by default.
-
-To deploy global commands, you can use the same script from the [guild commands](#guild-commands) section and simply adjust the route in the script to _`.applicationCommands(clientId)`_
-
-Test
-
-<CH.Code rows="focus">
-
-```js focus=5
-try {
-	console.log(`Started refreshing ${commands.length} application (/) commands.`);
-
-	// The put method is used to fully refresh all commands in the guild with the current set
-	const data = await rest.put(Routes.applicationCommands(clientId), { body: commands });
-
-	console.log(`Successfully reloaded ${data.length} application (/) commands.`);
-} catch (error) {
-	// And of course, make sure you catch and log any errors!
-	console.error(error);
-}
-```
-
-</CH.Code>
-
-### Where to deploy
-
-<Alert title="Tip" type="success">
-	Guild-based deployment of commands is best suited for development and testing in your own personal server. Once you're satisfied that it's ready, deploy the command globally to publish it to all guilds that your bot is in.
-
-    You may wish to have a separate application and token in the Discord Dev Portal for your dev application, to avoid duplication between your guild-based commands and the global deployment.
-
-</Alert>
-
-#### Further reading
-
-You've successfully sent a response to a slash command! However, this is only the most basic of command event and response functionality. Much more is available to enhance the user experience including:
-
-- applying this same dynamic, modular handling approach to events with an [Event handler](./event-handling).
-- utilising the different [Response methods](../slash-commands/response-methods) that can be used for slash commands.
-- expanding on these examples with additional validated option types in [Advanced command creation](../slash-commands/advanced-creation).
-- adding formatted [Embeds](../popular-topics/embeds) to your responses.
-- enhancing the command functionality with [Buttons](../interactions/buttons) and [Select Menus](../interactions/select-menus).
-- prompting the user for more information with [Modals](../interactions/modals).
-
-#### Resulting code
-
-<ResultingCode path="creating-your-bot/command-deployment" />

apps/guide/src/content/03-creating-your-bot/06-event-handling.mdx

@@ -1,219 +0,0 @@
----
-title: Event handling
-category: Creating your bot
----
-
-# Event handling
-
-Node.js uses an event-driven architecture, making it possible to execute code when a specific event occurs. The discord.js library takes full advantage of this. You can visit the <DocsLink type="class" parent="Client" /> documentation to see the full list of events.
-
-<Alert title="Tip" type="success">
-	This page assumes you've followed the guide up to this point, and created your _`index.js`_ and individual slash
-	commands according to those pages.
-</Alert>
-
-At this point, your `index.js` file has code for loading commands, and listeners for two events: `ClientReady` and `InteractionCreate`.
-
-<CH.Code>
-
-```js Commands
-const commands = new Collection();
-
-const foldersPath = fileURLToPath(new URL('commands', import.meta.url));
-const commandFolders = await readdir(foldersPath);
-
-for (const folder of commandFolders) {
-	const commandsPath = join(foldersPath, folder);
-	const commandFiles = await readdir(commandsPath).then((files) => files.filter((file) => file.endsWith('.js')));
-	for (const file of commandFiles) {
-		const filePath = join(commandsPath, file);
-		const command = await import(filePath);
-		// Set a new item in the Collection with the key as the command name and the value as the exported module
-		if ('data' in command && 'execute' in command) {
-			commands.set(command.data.name, command);
-		} else {
-			console.log(`[WARNING] The command at ${filePath} is missing a required "data" or "execute" property.`);
-		}
-	}
-}
-```
-
-```js ClientReady
-client.once(Events.ClientReady, (c) => {
-	console.log(`Ready! Logged in as ${c.user.tag}`);
-});
-```
-
-```js InteractionCreate
-client.on(Events.InteractionCreate, async (interaction) => {
-	if (!interaction.isChatInputCommand()) return;
-
-	const command = commands.get(interaction.commandName);
-
-	if (!command) {
-		console.error(`No command matching ${interaction.commandName} was found.`);
-		return;
-	}
-
-	try {
-		await command.execute(interaction);
-	} catch (error) {
-		console.error(`Error executing ${interaction.commandName}`);
-		console.error(error);
-	}
-});
-```
-
-</CH.Code>
-
-Currently, all of this code is in the _`index.js`_ file. <DocsLink type="class" parent="Client" symbol="e-ready" /> emits once when the _`Client`_ becomes ready for use, and <DocsLink type="class" parent="Client" symbol="e-interactionCreate" /> emits whenever an interaction is received.
-Moving the event listener code into individual files is simple, and we'll be taking a similar approach to the [command handler](./handling-command-interactions).
-
-## Individual event files
-
-Your project directory should look something like this:
-
-```
-discord-bot/
-├── commands/
-├── node_modules/
-├── config.json
-├── deploy-commands.js
-├── index.js
-├── package-lock.json
-└── package.json
-```
-
-Create an _`events`_ folder in the same directory. You can then move the code from your event listeners in _`index.js`_ to separate files: _`events/ready.js`_ and _`events/interactionCreate.js`_. The _`InteractionCreate`_ event is responsible for command handling, so the command loading code will move here too.
-
-<CH.Code>
-
-```js events/interactionCreate.js
-import { readdir } from 'node:fs/promises';
-import { join } from 'node:path';
-import { fileURLToPath } from 'node:url';
-import { Collection, Events } from 'discord.js';
-
-const commands = new Collection();
-
-const foldersPath = fileURLToPath(new URL('commands', import.meta.url));
-const commandFolders = await readdir(foldersPath);
-
-for (const folder of commandFolders) {
-	const commandsPath = join(foldersPath, folder);
-	const commandFiles = await readdir(commandsPath).then((files) => files.filter((file) => file.endsWith('.js')));
-	for (const file of commandFiles) {
-		const filePath = join(commandsPath, file);
-		const command = await import(filePath);
-		// Set a new item in the Collection with the key as the command name and the value as the exported module
-		if ('data' in command && 'execute' in command) {
-			commands.set(command.data.name, command);
-		} else {
-			console.log(`[WARNING] The command at ${filePath} is missing a required "data" or "execute" property.`);
-		}
-	}
-}
-
-export const data = {
-	name: Events.InteractionCreate,
-};
-
-export async function execute(interaction) {
-	if (!interaction.isChatInputCommand()) return;
-
-	const command = commands.get(interaction.commandName);
-
-	if (!command) {
-		console.error(`No command matching ${interaction.commandName} was found.`);
-		return;
-	}
-
-	try {
-		await command.execute(interaction);
-	} catch (error) {
-		console.error(`Error executing ${interaction.commandName}`);
-		console.error(error);
-	}
-}
-```
-
-```js events/ready.js
-import { Events } from 'discord.js';
-
-export const data = {
-	name: Events.ClientReady,
-	once = true,
-};
-export async function execute(client) {
-	console.log(`Ready! Logged in as ${client.user.tag}`);
-}
-```
-
-```js index.js
-import { readdir } from 'node:fs/promises';
-import { join } from 'node:path';
-import { fileURLToPath } from 'node:url';
-import { Client, GatewayIntentBits } from 'discord.js';
-import config from './config.json' assert { type: 'json' };
-
-const client = new Client({ intents: [GatewayIntentBits.Guilds] });
-
-client.login(config.token);
-```
-
-</CH.Code>
-
-The _`name`_ property states which event this file is for, and the _`once`_ property holds a boolean value that specifies if the event should run only once. You don't need to specify this in _`interactionCreate.js`_ as the default behavior will be to run on every event instance. The _`execute`_ function holds your event logic, which will be called by the event handler whenever the event emits.
-
-## Reading event files
-
-Next, let's write the code for dynamically retrieving all the event files in the _`events`_ folder. We'll be taking a similar approach to our [command handler](./handling-command-interactions). Place the new code highlighted below in your _`index.js`_.
-
-_`fs.readdir()`_ combined with _`array.filter()`_ returns an array of all the file names in the given directory and filters for only _`.js`_ files, i.e. _`['ready.js', 'interactionCreate.js']`_.
-
-<CH.Code>
-
-```js focus=9:20
-import { readdir } from 'node:fs/promises';
-import { join } from 'node:path';
-import { fileURLToPath } from 'node:url';
-import { Client, GatewayIntentBits } from 'discord.js';
-import config from './config.json' assert { type: 'json' };
-
-const client = new Client({ intents: [GatewayIntentBits.Guilds] });
-
-const eventsPath = fileURLToPath(new URL('events', import.meta.url));
-const eventFiles = await readdir(eventsPath).then((files) => files.filter((file) => file.endsWith('.js')));
-
-for (const file of eventFiles) {
-	const filePath = join(eventsPath, file);
-	const event = await import(filePath);
-	if (event.data.once) {
-		client.once(event.data.name, (...args) => event.execute(...args));
-	} else {
-		client.on(event.data.name, (...args) => event.execute(...args));
-	}
-}
-
-client.login(config.token);
-```
-
-</CH.Code>
-
-You'll notice the code looks very similar to the command loading above it - read the files in the events folder and load each one individually.
-
-The <DocsLink type="class" parent="Client" /> class in discord.js extends the [`EventEmitter`](https://nodejs.org/api/events.html#events_class_eventemitter) class. Therefore, the _`client`_ object exposes the [`.on()`](https://nodejs.org/api/events.html#events_emitter_on_eventname_listener) and [`.once()`](https://nodejs.org/api/events.html#events_emitter_once_eventname_listener) methods that you can use to register event listeners. These methods take two arguments: the event name and a callback function. These are defined in your separate event files as _`name`_ and _`execute`_.
-
-The callback function passed takes argument(s) returned by its respective event, collects them in an _`args`_ array using the _`...`_ [rest parameter syntax](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/rest_parameters), then calls _`event.execute()`_ while passing in the _`args`_ array using the _`...`_ [spread syntax](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Spread_syntax). They are used here because different events in discord.js have different numbers of arguments. The rest parameter collects these variable number of arguments into a single array, and the spread syntax then takes these elements and passes them to the _`execute`_ function.
-
-After this, listening for other events is as easy as creating a new file in the _`events`_ folder. The event handler will automatically retrieve and register it whenever you restart your bot.
-
-<Alert title="Tip" type="success">
-	In most cases, you can access your _`client`_ instance in other files by obtaining it from one of the other discord.js
-	structures, e.g. _`interaction.client`_ in the _`InteractionCreate`_ event. You do not need to manually pass it to
-	your events.
-</Alert>
-
-## Resulting code
-
-<ResultingCode />

apps/guide/src/content/03-topics/01-frequently-asked-questions.mdx

@@ -1,6 +1,6 @@
 ---
 title: Frequently asked questions
-category: Popular topics
+category: Topics
 ---
 
 # Frequently asked questions

apps/guide/src/content/03-topics/02-audit-logs.mdx

@@ -1,6 +1,6 @@
 ---
 title: Audit logs
-category: Popular topics
+category: Topics
 ---
 
 # Audit logs
@@ -162,4 +162,4 @@ client.on(Events.GuildAuditLogEntryCreate, async (auditLog) => {
 
 </CH.Code>
 
-If you want to check who banned a user, it's the same example as above except the _`action`_ should be _`AuditLogEvent.MemberBanAdd`_. You can check the rest of the types over at the [discord-api-types documentation](https://discord-api-types.dev/api/discord-api-types-v10/enum/AuditLogEvent).
+If you want to check who banned a user, it's the same example as above except the _`action`_ should be <DiscordAPITypesLink type="enum" parent="AuditLogEvent" symbol="MemberBanAdd" />. You can check the rest of the possible actions on this page.

apps/guide/src/content/03-topics/03-collectors.mdx

@@ -0,0 +1,223 @@
+---
+title: Collectors
+category: Topics
+---
+
+# Collectors
+
+## Message collectors
+
+{/* prettier-ignore */}
+<DocsLink type="class" parent="Collector">Collectors</DocsLink> are useful to enable your bot to obtain _additional_ input after the first command was sent. An example would be initiating a quiz, where the bot will "await" a correct response from somebody.
+
+### Basic message collector
+
+Let's take a look at a basic message collector:
+
+<CH.Code>
+
+```js
+const collectorFilter = (message) => message.content.includes('discord');
+const collector = interaction.channel.createMessageCollector({ filter: collectorFilter, time: 15_000 });
+
+collector.on('collect', (message) => {
+	console.log(`Collected ${message.content}`);
+});
+
+collector.on('end', (collected) => {
+	console.log(`Collected ${collected.size} messages`);
+});
+```
+
+</CH.Code>
+
+You can provide a _`filter`_ key to the object parameter of <DocsLink type="class" parent="TextChannel" symbol="createMessageCollector" brackets />. The value to this key should be a function that returns a boolean value to indicate if this message should be collected or not. To check for multiple conditions in your filter you can connect them using [logical operators](https://developer.mozilla.org/docs/Web/JavaScript/Guide/Expressions_and_Operators#logical_operators). If you don't provide a filter all messages in the channel the collector was started on will be collected.
+
+Note that the above example uses [implicit return](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Functions/Arrow_functions#function_body) for the filter function and passes it to the options object using the [object property shorthand](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Operators/Object_initializer#property_definitions) notation.
+
+If a message passes through the filter, it will trigger the <DocsLink type="class" parent="Collector" symbol="e-collect" /> event for the _`collector`_ you've created. This message is then passed into the event listener as _`collected`_ and the provided function is executed. In the above example, you simply log the message. Once the collector finishes collecting based on the provided end conditions the <DocsLink type="class" parent="Collector" symbol="e-end" /> event emits.
+
+You can control when a collector ends by supplying additional option keys when creating a collector:
+
+- _`time`_: Amount of time in milliseconds the collector should run for
+- _`max`_: Number of messages to successfully pass the filter
+- _`maxProcessed`_: Number of messages encountered (no matter the filter result)
+
+The benefit of using an event-based collector over _`awaitMessages()`_ (its promise-based counterpart) is that you can do something directly after each message is collected, rather than just after the collector ended. You can also stop the collector manually by calling <DocsLink type="class" parent="Collector" symbol="stop" brackets />.
+
+### Await messages
+
+Using <DocsLink type="class" parent="TextChannel" symbol="awaitMessages" brackets /> can be easier if you understand [Promises](../additional-info/understanding-async-await), and it allows you to have cleaner code overall. It is essentially identical to <DocsLink type="class" parent="TextChannel" symbol="createMessageCollector" brackets />, except promisified. However, the drawback of using this method is that you cannot do things before the Promise is resolved or rejected, either by an error or completion. However, it should do for most purposes, such as awaiting the correct response in a quiz. Instead of taking their example, let's set up a basic quiz command using the _`.awaitMessages()`_ feature.
+
+First, you'll need some questions and answers to choose from, so here's a basic set:
+
+<CH.Code>
+
+```json
+[
+	{
+		"question": "What color is the sky?",
+		"answers": ["blue"]
+	},
+	{
+		"question": "How many letters are there in the alphabet?",
+		"answers": ["26", "twenty-six", "twenty six", "twentysix"]
+	}
+]
+```
+
+</CH.Code>
+
+The provided set allows for responder error with an array of answers permitted. Ideally, it would be best to place this in a JSON file, which you can call _`quiz.json`_ for simplicity.
+
+<CH.Code>
+
+```js
+import quiz from './quiz.json' assert { type: 'json' };
+
+// ...
+
+const item = quiz[Math.floor(Math.random() * quiz.length)];
+
+const collectorFilter = (response) => {
+	return item.answers.some((answer) => answer.toLowerCase() === response.content.toLowerCase());
+};
+
+await interaction.reply({ content: item.question });
+
+try {
+	const collected = await interaction.channel.awaitMessages({
+		filter: collectorFilter,
+		max: 1,
+		time: 30_000,
+		errors: ['time'],
+	});
+
+	await interaction.followUp(`${collected.first().author} got the correct answer!`);
+} catch {
+	await interaction.followUp('Looks like nobody got the answer this time.');
+}
+```
+
+</CH.Code>
+
+<Alert title="Tip" type="info">
+	If you don't understand how _`.some()`_ works, you can read about it in more detail
+	[here](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array/some).
+</Alert>
+
+In this filter, you iterate through the answers to find what you want. You would like to ignore the case because simple typos can happen, so you convert each answer to its lowercase form and check if it's equal to the response in lowercase form as well. In the options section, you only want to allow one answer to pass through, hence the _`max: 1`_ setting.
+
+The filter looks for messages that match one of the answers in the array of possible answers to pass through the collector. The _`max`_ option (the second parameter) specifies that only a maximum of one message can go through the filter successfully before the Promise successfully resolves. The _`errors`_ section specifies that time will cause it to error out, which will cause the Promise to reject if one correct answer is not received within the time limit of one minute. As you can see, there is no _`collect`_ event, so you are limited in that regard.
+
+## Reaction collectors
+
+### Basic reaction collector
+
+These work quite similarly to message collectors, except that you apply them on a message rather than a channel. This example uses the <DocsLink type="class" parent="Message" symbol="createReactionCollector" brackets /> method. The filter will check for the 👍 emoji–in the default skin tone specifically, so be wary of that. It will also check that the person who reacted shares the same id as the author of the original message that the collector was assigned to.
+
+```js
+const collectorFilter = (reaction, user) => {
+	return reaction.emoji.name === '👍' && user.id === message.author.id;
+};
+
+const collector = message.createReactionCollector({ filter: collectorFilter, time: 15_000 });
+
+collector.on('collect', (reaction, user) => {
+	console.log(`Collected ${reaction.emoji.name} from ${user.tag}`);
+});
+
+collector.on('end', (collected) => {
+	console.log(`Collected ${collected.size} items`);
+});
+```
+
+### Await reactions
+
+<DocsLink type="class" parent="Message" symbol="awaitReactions" brackets /> works almost the same as a reaction
+collector, except it is Promise-based. The same differences apply as with channel collectors.
+
+```js
+const collectorFilter = (reaction, user) => {
+	return reaction.emoji.name === '👍' && user.id === message.author.id;
+};
+
+try {
+	const collected = await message.awaitReactions({ filter: collectorFilter, max: 1, time: 60_000, errors: ['time'] });
+	console.log(collected.size);
+} catch (collected) {
+	console.log(`After a minute, the user did not react.`);
+}
+```
+
+## Interaction collectors
+
+The third type of collector allows you to collect interactions; such as when users activate a slash command or click on a button in a message.
+
+### Basic message component collector
+
+Collecting interactions from message components works similarly to reaction collectors. In the following example, you will check that the interaction came from a button, and that the user clicking the button is the same user that initiated the command.
+
+One important difference to note with interaction collectors is that Discord expects a response to _all_ interactions within 3 seconds - even ones that you don't want to collect. For this reason, you may wish to _`.deferUpdate()`_ all interactions in your filter, or not use a filter at all and handle this behavior in the _`collect`_ event.
+
+```js
+import { ComponentType } from 'discord.js';
+
+const collector = message.createMessageComponentCollector({ componentType: ComponentType.Button, time: 15_000 });
+
+collector.on('collect', (i) => {
+	if (i.user.id === interaction.user.id) {
+		await i.reply(`${i.user.id} clicked on the ${i.customId} button.`);
+	} else {
+		await i.reply({ content: `These buttons aren't for you!`, ephemeral: true });
+	}
+});
+
+collector.on('end', (collected) => {
+	console.log(`Collected ${collected.size} interactions.`);
+});
+```
+
+### Await message component
+
+As before, this works similarly to the message component collector, except it is Promise-based.
+
+Unlike other Promise-based collectors, this method will only ever collect one interaction that passes the filter. If no interactions are collected before the time runs out, the Promise will reject. This behavior aligns with Discord's requirement that actions should immediately receive a response. In this example, you will use _`.deferUpdate()`_ on all interactions in the filter.
+
+```js
+import { ComponentType } from 'discord.js';
+
+const collectorFilter = (i) => {
+	i.deferUpdate();
+	return i.user.id === interaction.user.id;
+};
+
+try {
+	const interaction = await message.awaitMessageComponent({
+		filter: collectorFilter,
+		componentType: ComponentType.StringSelect,
+		time: 60_000,
+	});
+
+	await interaction.editReply(`You selected ${interaction.values.join(', ')}!`);
+} catch (error) {
+	console.log('No interactions were collected.');
+}
+```
+
+### Await modal submit
+
+If you want to wait for the submission of a modal within the context of another command or button execution, you may find the promisified collector <DocsLink type="class" parent="CommandInteraction" symbol="awaitModalSubmit" brackets /> useful.
+
+As Discord does not inform you if the user dismisses the modal, supplying a maximum _`time`_ to wait for is crucial:
+
+```js
+try {
+	const interaction = await initialInteraction.awaitModalSubmit({ time: 60_000, filter });
+	await interaction.editReply('Thank you for your submission!');
+} catch (error) {
+	console.log('No modal submit interaction was collected');
+}
+```
+
+For more information on working with modals, see the [modals section of this guide](../interactions/modals).