Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create a new pull request by comparing changes across two branches #253

Merged
merged 7 commits into from
Oct 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/labels.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- name: api changes
color: 5663e9
color: '5663e9'
- name: api support
color: 5663e9
color: '5663e9'
- name: apps:guide
color: fbca04
- name: apps:website
Expand All @@ -23,7 +23,7 @@
- name: dependencies
color: 276bd1
- name: discord
color: 5663e9
color: '5663e9'
- name: discussion
color: b6b1f9
- name: documentation
Expand All @@ -41,7 +41,7 @@
- name: has PR
color: 4b1f8e
- name: help wanted
color: 008672
color: '008672'
- name: in progress
color: ffccd7
- name: in review
Expand Down
30 changes: 15 additions & 15 deletions apps/guide/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@
"@code-hike/mdx": "^0.9.0",
"@discordjs/ui": "workspace:^",
"@react-icons/all-files": "^4.1.0",
"@vercel/analytics": "^1.0.2",
"@vercel/analytics": "^1.1.1",
"@vercel/edge-config": "^0.2.1",
"@vercel/og": "^0.5.11",
"@vercel/og": "^0.5.19",
"ariakit": "2.0.0-next.44",
"cmdk": "^0.2.0",
"contentlayer": "^0.3.4",
"next": "^13.4.19",
"next": "^13.5.5",
"next-contentlayer": "^0.3.4",
"next-themes": "^0.2.1",
"react": "^18.2.0",
Expand All @@ -67,36 +67,36 @@
"rehype-autolink-headings": "^6.1.1",
"rehype-slug": "^5.1.0",
"remark-gfm": "^3.0.1",
"sharp": "^0.32.5"
"sharp": "^0.32.6"
},
"devDependencies": {
"@next/bundle-analyzer": "^13.4.19",
"@next/bundle-analyzer": "^13.5.5",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.4.3",
"@testing-library/user-event": "^14.5.1",
"@types/html-escaper": "^3.0.0",
"@types/node": "18.17.9",
"@types/react": "^18.2.21",
"@types/react-dom": "^18.2.7",
"@types/react": "^18.2.28",
"@types/react-dom": "^18.2.13",
"@unocss/cli": "^0.55.3",
"@unocss/eslint-plugin": "^0.55.3",
"@unocss/reset": "^0.55.3",
"@vitejs/plugin-react": "^4.0.4",
"@vitejs/plugin-react": "^4.1.0",
"@vitest/coverage-v8": "^0.34.3",
"concurrently": "^8.2.1",
"cross-env": "^7.0.3",
"eslint": "^8.48.0",
"eslint": "^8.51.0",
"eslint-config-neon": "^0.1.57",
"eslint-formatter-pretty": "^5.0.0",
"happy-dom": "^10.11.0",
"happy-dom": "^10.11.2",
"hast-util-to-string": "^2.0.0",
"hastscript": "^8.0.0",
"html-escaper": "^3.0.3",
"lighthouse": "^11.0.0",
"prettier": "^3.0.2",
"turbo": "^1.10.13",
"lighthouse": "^11.2.0",
"prettier": "^3.0.3",
"turbo": "^1.10.15",
"typescript": "^5.2.2",
"unocss": "^0.55.3",
"vercel": "^32.0.2",
"vercel": "^32.4.1",
"vitest": "^0.34.3"
},
"engines": {
Expand Down
32 changes: 16 additions & 16 deletions apps/website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@
"@microsoft/tsdoc-config": "0.16.2",
"@planetscale/database": "^1.11.0",
"@react-icons/all-files": "^4.1.0",
"@vercel/analytics": "^1.0.2",
"@vercel/analytics": "^1.1.1",
"@vercel/edge-config": "^0.2.1",
"@vercel/og": "^0.5.11",
"@vercel/og": "^0.5.19",
"ariakit": "2.0.0-next.44",
"bright": "^0.8.4",
"class-variance-authority": "^0.7.0",
"cmdk": "^0.2.0",
"meilisearch": "^0.34.1",
"next": "^13.4.19",
"next": "^13.5.5",
"next-mdx-remote": "^4.4.1",
"next-themes": "^0.2.1",
"react": "^18.2.0",
Expand All @@ -75,33 +75,33 @@
"react-use": "^17.4.0",
"rehype-slug": "^5.1.0",
"remark-gfm": "^3.0.1",
"sharp": "^0.32.5",
"swr": "^2.2.1"
"sharp": "^0.32.6",
"swr": "^2.2.4"
},
"devDependencies": {
"@next/bundle-analyzer": "^13.4.19",
"@next/bundle-analyzer": "^13.5.5",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.4.3",
"@testing-library/user-event": "^14.5.1",
"@types/node": "18.17.9",
"@types/react": "^18.2.21",
"@types/react-dom": "^18.2.7",
"@types/react": "^18.2.28",
"@types/react-dom": "^18.2.13",
"@unocss/cli": "^0.55.3",
"@unocss/eslint-plugin": "^0.55.3",
"@unocss/reset": "^0.55.3",
"@vitejs/plugin-react": "^4.0.4",
"@vitejs/plugin-react": "^4.1.0",
"@vitest/coverage-v8": "^0.34.3",
"concurrently": "^8.2.1",
"cpy-cli": "^5.0.0",
"cross-env": "^7.0.3",
"eslint": "^8.48.0",
"eslint": "^8.51.0",
"eslint-config-neon": "^0.1.57",
"eslint-formatter-pretty": "^5.0.0",
"happy-dom": "^10.11.0",
"lighthouse": "^11.0.0",
"prettier": "^3.0.2",
"turbo": "^1.10.13",
"happy-dom": "^10.11.2",
"lighthouse": "^11.2.0",
"prettier": "^3.0.3",
"turbo": "^1.10.15",
"typescript": "^5.2.2",
"vercel": "^32.0.2",
"vercel": "^32.4.1",
"vitest": "^0.34.3"
},
"engines": {
Expand Down
15 changes: 9 additions & 6 deletions apps/website/src/components/ExcerptText.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,16 @@ export function ExcerptText({ model, excerpt }: ExcerptTextProps) {
{excerpt.spannedTokens.map((token, idx) => {
if (token.kind === ExcerptTokenKind.Reference) {
const source = token.canonicalReference?.source;
const symbol = token.canonicalReference?.symbol;
if (source && 'packageName' in source && source.packageName === 'discord-api-types' && symbol) {
const { meaning, componentPath: path } = symbol;
let href = DISCORD_API_TYPES_DOCS_URL;

if (source && 'packageName' in source && source.packageName === 'discord-api-types') {
const meaning = token.canonicalReference.symbol?.meaning;
const href =
meaning === 'type'
? `${DISCORD_API_TYPES_DOCS_URL}#${token.text}`
: `${DISCORD_API_TYPES_DOCS_URL}/${meaning}/${token.text}`;
// dapi-types doesn't have routes for class members
// so we can assume this member is for an enum
if (meaning === 'member' && path && 'parent' in path) href += `/enum/${path.parent}#${path.component}`;
else if (meaning === 'type') href += `#${token.text}`;
else href += `/${meaning}/${token.text}`;

return (
<a className="text-blurple" href={href} key={idx} rel="external noreferrer noopener" target="_blank">
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"prepare": "is-ci || husky install",
"update": "pnpm --recursive update --interactive",
"update:latest": "pnpm --recursive update --interactive --latest",
"create-package": "turbo gen create-package"
"create-package": "turbo gen create-package --args"
},
"type": "module",
"contributors": [
Expand All @@ -49,25 +49,25 @@
},
"homepage": "https://discord.js.org",
"devDependencies": {
"@commitlint/cli": "^17.7.1",
"@commitlint/config-angular": "^17.7.0",
"@commitlint/cli": "^17.8.0",
"@commitlint/config-angular": "^17.8.0",
"@favware/cliff-jumper": "^2.2.0",
"@favware/npm-deprecate": "^1.0.7",
"@types/lodash.merge": "^4.6.7",
"@unocss/eslint-plugin": "^0.55.3",
"@vitest/coverage-v8": "^0.34.3",
"conventional-changelog-cli": "^3.0.0",
"eslint": "^8.48.0",
"eslint": "^8.51.0",
"eslint-config-neon": "^0.1.57",
"husky": "^8.0.3",
"is-ci": "^3.0.1",
"lint-staged": "^14.0.1",
"lodash.merge": "^4.6.2",
"tsup": "^7.2.0",
"turbo": "^1.10.13",
"turbo": "^1.10.15",
"typescript": "^5.2.2",
"unocss": "^0.55.3",
"vercel": "^32.1.0",
"vercel": "^32.4.1",
"vitest": "^0.34.3"
},
"pnpm": {
Expand All @@ -81,7 +81,7 @@
},
"patchedDependencies": {
"@microsoft/[email protected]": "patches/@[email protected]",
"[email protected].0-2": "patches/[email protected].0-2.patch"
"[email protected].1": "patches/[email protected].1.patch"
}
},
"engines": {
Expand Down
10 changes: 5 additions & 5 deletions packages/actions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,22 +40,22 @@
},
"homepage": "https://discord.js.org",
"dependencies": {
"@actions/core": "^1.10.0",
"@actions/core": "^1.10.1",
"@actions/glob": "^0.4.0",
"@planetscale/database": "^1.11.0",
"tslib": "^2.6.2",
"undici": "5.23.0"
"undici": "5.26.3"
},
"devDependencies": {
"@types/node": "16.18.44",
"@vitest/coverage-v8": "^0.34.3",
"cross-env": "^7.0.3",
"eslint": "^8.48.0",
"eslint": "^8.51.0",
"eslint-config-neon": "^0.1.57",
"eslint-formatter-pretty": "^5.0.0",
"prettier": "^3.0.2",
"prettier": "^3.0.3",
"tsup": "^7.2.0",
"turbo": "^1.10.13",
"turbo": "^1.10.15",
"typescript": "^5.2.2",
"vitest": "^0.34.3"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/api-extractor-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@
"devDependencies": {
"@types/node": "16.18.44",
"cross-env": "^7.0.3",
"eslint": "^8.48.0",
"eslint": "^8.51.0",
"eslint-config-neon": "^0.1.57",
"eslint-formatter-pretty": "^5.0.0",
"prettier": "^3.0.2",
"prettier": "^3.0.3",
"tsup": "^7.2.0",
"turbo": "^1.10.13",
"turbo": "^1.10.15",
"typescript": "^5.2.2"
},
"engines": {
Expand Down
8 changes: 4 additions & 4 deletions packages/brokers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,16 @@
},
"devDependencies": {
"@favware/cliff-jumper": "^2.2.0",
"@microsoft/api-extractor": "^7.36.4",
"@microsoft/api-extractor": "^7.38.0",
"@types/node": "16.18.44",
"@vitest/coverage-v8": "^0.34.3",
"cross-env": "^7.0.3",
"eslint": "^8.48.0",
"eslint": "^8.51.0",
"eslint-config-neon": "^0.1.57",
"eslint-formatter-pretty": "^5.0.0",
"prettier": "^3.0.2",
"prettier": "^3.0.3",
"tsup": "^7.2.0",
"turbo": "^1.10.13",
"turbo": "^1.10.15",
"typescript": "^5.2.2",
"vitest": "^0.34.3"
},
Expand Down
12 changes: 6 additions & 6 deletions packages/builders/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,26 +66,26 @@
"dependencies": {
"@discordjs/formatters": "workspace:^",
"@discordjs/util": "workspace:^",
"@sapphire/shapeshift": "^3.9.2",
"@sapphire/shapeshift": "^3.9.3",
"discord-api-types": "0.37.60",
"fast-deep-equal": "^3.1.3",
"ts-mixer": "^6.0.3",
"tslib": "^2.6.2"
},
"devDependencies": {
"@favware/cliff-jumper": "^2.2.0",
"@microsoft/api-extractor": "^7.36.4",
"@microsoft/api-extractor": "^7.38.0",
"@types/node": "16.18.44",
"@vitest/coverage-v8": "^0.34.3",
"cross-env": "^7.0.3",
"downlevel-dts": "^0.11.0",
"esbuild-plugin-version-injector": "^1.2.0",
"eslint": "^8.48.0",
"esbuild-plugin-version-injector": "^1.2.1",
"eslint": "^8.51.0",
"eslint-config-neon": "^0.1.57",
"eslint-formatter-pretty": "^5.0.0",
"prettier": "^3.0.2",
"prettier": "^3.0.3",
"tsup": "^7.2.0",
"turbo": "^1.10.13",
"turbo": "^1.10.15",
"typescript": "^5.2.2",
"vitest": "^0.34.3"
},
Expand Down
10 changes: 5 additions & 5 deletions packages/collection/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,17 @@
"homepage": "https://discord.js.org",
"devDependencies": {
"@favware/cliff-jumper": "^2.2.0",
"@microsoft/api-extractor": "^7.36.4",
"@microsoft/api-extractor": "^7.38.0",
"@types/node": "16.18.44",
"@vitest/coverage-v8": "^0.34.3",
"cross-env": "^7.0.3",
"esbuild-plugin-version-injector": "^1.2.0",
"eslint": "^8.48.0",
"esbuild-plugin-version-injector": "^1.2.1",
"eslint": "^8.51.0",
"eslint-config-neon": "^0.1.57",
"eslint-formatter-pretty": "^5.0.0",
"prettier": "^3.0.2",
"prettier": "^3.0.3",
"tsup": "^7.2.0",
"turbo": "^1.10.13",
"turbo": "^1.10.15",
"typescript": "^5.2.2",
"vitest": "^0.34.3"
},
Expand Down
10 changes: 5 additions & 5 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,17 @@
},
"devDependencies": {
"@favware/cliff-jumper": "^2.2.0",
"@microsoft/api-extractor": "^7.36.4",
"@microsoft/api-extractor": "^7.38.0",
"@types/node": "18.17.9",
"@vitest/coverage-v8": "^0.34.3",
"cross-env": "^7.0.3",
"esbuild-plugin-version-injector": "^1.2.0",
"eslint": "^8.48.0",
"esbuild-plugin-version-injector": "^1.2.1",
"eslint": "^8.51.0",
"eslint-config-neon": "^0.1.57",
"eslint-formatter-pretty": "^5.0.0",
"prettier": "^3.0.2",
"prettier": "^3.0.3",
"tsup": "^7.2.0",
"turbo": "^1.10.13",
"turbo": "^1.10.15",
"typescript": "^5.2.2",
"vitest": "^0.34.3"
},
Expand Down
Loading