Skip to content

Commit

Permalink
feat: Added Node JS v16.9.1 (FiveM) compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
Tynopia committed Aug 7, 2023
1 parent 7295a3a commit ed1def9
Show file tree
Hide file tree
Showing 322 changed files with 3,175 additions and 3,165 deletions.
42 changes: 21 additions & 21 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@

* @iCrawl

/apps/guide/ @discordjs/website @discordjs/guide
/apps/guide/src/content/ @discordjs/guide
/apps/website/ @discordjs/website
/apps/guide/ @cyberpurge-net/website @cyberpurge-net/guide
/apps/guide/src/content/ @cyberpurge-net/guide
/apps/website/ @cyberpurge-net/website

/packages/actions/ @discordjs/actions
/packages/api-extractor-utils/ @discordjs/api-extractor-utils
/packages/brokers/ @discordjs/brokers
/packages/builders/ @discordjs/builders
/packages/collection/ @discordjs/collection
/packages/core/ @discordjs/core
/packages/create-discord-bot/ @discordjs/guide
/packages/discord.js/ @discordjs/core
/packages/actions/ @cyberpurge-net/actions
/packages/api-extractor-utils/ @cyberpurge-net/api-extractor-utils
/packages/brokers/ @cyberpurge-net/brokers
/packages/builders/ @cyberpurge-net/builders
/packages/collection/ @cyberpurge-net/collection
/packages/core/ @cyberpurge-net/core
/packages/create-discord-bot/ @cyberpurge-net/guide
/packages/discord.js/ @cyberpurge-net/core
/packages/docgen/ @iCrawl
/packages/formatters/ @discordjs/formatters
/packages/next/ @discordjs/core
/packages/proxy/ @discordjs/proxy
/packages/proxy-container/ @discordjs/proxy
/packages/rest/ @discordjs/rest
/packages/scripts/ @discordjs/scripts
/packages/ui/ @discordjs/ui
/packages/util/ @discordjs/util
/packages/voice/ @discordjs/core
/packages/ws/ @discordjs/ws
/packages/formatters/ @cyberpurge-net/formatters
/packages/next/ @cyberpurge-net/core
/packages/proxy/ @cyberpurge-net/proxy
/packages/proxy-container/ @cyberpurge-net/proxy
/packages/rest/ @cyberpurge-net/rest
/packages/scripts/ @cyberpurge-net/scripts
/packages/ui/ @cyberpurge-net/ui
/packages/util/ @cyberpurge-net/util
/packages/voice/ @cyberpurge-net/core
/packages/ws/ @cyberpurge-net/ws
10 changes: 5 additions & 5 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ To get ready to work on the codebase, please do the following:
3. Run `yarn build` to build local packages
4. Code your heart out!
5. Run `yarn 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))
6. [Submit a pull request](https://github.com/cyberpurge-net/discord.js/compare) (Make sure you follow the [conventional commit format](https://github.com/cyberpurge-net/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.

1. Create a new directory `mkdir discordjs-test` and move into it `cd discordjs-test`
1. Create a new directory `mkdir cyberpurge-net-test` and move into it `cd cyberpurge-net-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**
5. Install packages you'd like to test locally `yarn add discord.js@latest`, `yarn add @cyberpurge-net/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!

### Working with TypeScript packages
Expand All @@ -34,11 +34,11 @@ 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 `@cyberpurge-net/rest` project when changes are detected, run `yarn turbo run build --filter=@cyberpurge-net/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:
If you'd like to create another package under the `@cyberpurge-net` organization run the following command:

```sh
yarn create-package <package-name> [package-description]
Expand Down
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github: [iCrawl, amishshah, vladfrangu, kyranet]
open_collective: discordjs
open_collective: cyberpurge-net
4 changes: 2 additions & 2 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
env:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
if: github.repository_owner == 'discordjs'
if: github.repository_owner == 'cyberpurge-net'
steps:
- name: Checkout repository
uses: actions/checkout@v3
Expand All @@ -53,7 +53,7 @@ jobs:
- name: Checkout docs repository
uses: actions/checkout@v3
with:
repository: 'discordjs/docs'
repository: 'cyberpurge-net/docs'
token: ${{ secrets.DJS_DOCS }}
path: 'out'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/label-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
label-sync:
name: Label sync
runs-on: ubuntu-latest
if: github.repository_owner == 'discordjs'
if: github.repository_owner == 'cyberpurge-net'
steps:
- name: Checkout repository
uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lighthouse-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
uses: treosh/lighthouse-ci-action@v9
with:
urls: |
https://discordjs.dev
https://guide.discordjs.dev
https://cyberpurge-net.dev
https://guide.cyberpurge-net.dev
uploadArtifacts: true
temporaryPublicStorage: true
4 changes: 2 additions & 2 deletions .github/workflows/npm-auto-deprecate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
npm-auto-deprecate:
name: npm auto deprecate
runs-on: ubuntu-latest
if: github.repository_owner == 'discordjs'
if: github.repository_owner == 'cyberpurge-net'
steps:
- name: Checkout repository
uses: actions/checkout@v3
Expand All @@ -21,6 +21,6 @@ jobs:
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'
run: 'yarn npm-deprecate --name "*dev*" --package @cyberpurge-net/brokers @cyberpurge-net/builders @cyberpurge-net/collection @cyberpurge-net/core @cyberpurge-net/formatters discord.js @cyberpurge-net/next @cyberpurge-net/proxy @cyberpurge-net/rest @cyberpurge-net/util @cyberpurge-net/voice @cyberpurge-net/ws'
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/publish-dev-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
docker-publish:
name: Docker publish
runs-on: ubuntu-latest
if: github.repository_owner == 'discordjs'
if: github.repository_owner == 'cyberpurge-net'
steps:
- name: Checkout repository
uses: actions/checkout@v3
Expand All @@ -30,4 +30,4 @@ jobs:
run: echo ${{ secrets.DOCKER_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin

- name: Build & push docker image
run: yarn docker build --buildkit @discordjs/proxy-container -t discordjs/proxy:latest --push
run: yarn docker build --buildkit @cyberpurge-net/proxy-container -t cyberpurge-net/proxy:latest --push
24 changes: 12 additions & 12 deletions .github/workflows/publish-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,35 +10,35 @@ jobs:
fail-fast: false
matrix:
include:
- package: '@discordjs/brokers'
- package: '@cyberpurge-net/brokers'
folder: 'brokers'
- package: '@discordjs/builders'
- package: '@cyberpurge-net/builders'
folder: 'builders'
- package: '@discordjs/collection'
- package: '@cyberpurge-net/collection'
folder: 'collection'
- package: '@discordjs/core'
- package: '@cyberpurge-net/core'
folder: 'core'
- package: '@discordjs/formatters'
- package: '@cyberpurge-net/formatters'
folder: 'formatters'
- package: 'discord.js'
folder: 'discord.js'
- package: '@discordjs/next'
- package: '@cyberpurge-net/next'
folder: 'next'
- package: '@discordjs/proxy'
- package: '@cyberpurge-net/proxy'
folder: 'proxy'
- package: '@discordjs/rest'
- package: '@cyberpurge-net/rest'
folder: 'rest'
- package: '@discordjs/util'
- package: '@cyberpurge-net/util'
folder: 'util'
- package: '@discordjs/voice'
- package: '@cyberpurge-net/voice'
folder: 'voice'
- package: '@discordjs/ws'
- package: '@cyberpurge-net/ws'
folder: 'ws'
runs-on: ubuntu-latest
env:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
if: github.repository_owner == 'discordjs'
if: github.repository_owner == 'cyberpurge-net'
steps:
- name: Checkout repository
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ jobs:
run: echo ${{ secrets.DOCKER_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin

- name: Build & push docker image
run: yarn docker build --buildkit @discordjs/proxy-container -t discordjs/proxy:$(cut -d '.' -f1 <<< $(jq --raw-output '.version' packages/proxy-container/package.json)) --push
run: yarn docker build --buildkit @cyberpurge-net/proxy-container -t cyberpurge-net/proxy:$(cut -d '.' -f1 <<< $(jq --raw-output '.version' packages/proxy-container/package.json)) --push
4 changes: 2 additions & 2 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
env:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
if: github.repository_owner == 'discordjs'
if: github.repository_owner == 'cyberpurge-net'
steps:
- name: Checkout repository
uses: actions/checkout@v3
Expand All @@ -34,6 +34,6 @@ jobs:

- name: Publish package
run: |
yarn workspace ${{ steps.extract-tag.outputs.subpackage == 'true' && '@discordjs/' || '' }}${{ steps.extract-tag.outputs.package }} npm publish
yarn workspace ${{ steps.extract-tag.outputs.subpackage == 'true' && '@cyberpurge-net/' || '' }}${{ steps.extract-tag.outputs.package }} npm publish
env:
YARN_NPM_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,5 @@ jobs:
run: yarn docs --filter="...[HEAD^1]"

- name: Upload Coverage
if: github.repository_owner == 'discordjs'
if: github.repository_owner == 'cyberpurge-net'
uses: ./packages/actions/src/uploadCoverage
2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ plugins:
spec: 'https://github.com/Dcard/yarn-plugins/releases/latest/download/plugin-docker-build.js'

yarnPath: .yarn/releases/yarn-3.5.1.cjs
npmRegistryServer: "https://npm.pkg.github.com/cyberpurge-net/"
npmAuthToken: ${GITHUB_TOKEN}
66 changes: 33 additions & 33 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
<a href="https://discord.gg/djs"><img src="https://img.shields.io/discord/222078108977594368?color=5865F2&logo=discord&logoColor=white" alt="Discord server" /></a>
<a href="https://www.npmjs.com/package/discord.js"><img src="https://img.shields.io/npm/v/discord.js.svg?maxAge=3600" alt="npm version" /></a>
<a href="https://www.npmjs.com/package/discord.js"><img src="https://img.shields.io/npm/dt/discord.js.svg?maxAge=3600" alt="npm downloads" /></a>
<a href="https://github.com/discordjs/discord.js/actions"><img src="https://github.com/discordjs/discord.js/actions/workflows/test.yml/badge.svg" alt="Tests status" /></a>
<a href="https://codecov.io/gh/discordjs/discord.js" ><img src="https://codecov.io/gh/discordjs/discord.js/branch/main/graph/badge.svg?precision=2" alt="Code coverage" /></a>
<a href="https://github.com/cyberpurge-net/discord.js/actions"><img src="https://github.com/cyberpurge-net/discord.js/actions/workflows/test.yml/badge.svg" alt="Tests status" /></a>
<a href="https://codecov.io/gh/cyberpurge-net/discord.js" ><img src="https://codecov.io/gh/cyberpurge-net/discord.js/branch/main/graph/badge.svg?precision=2" alt="Code coverage" /></a>
</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>
<a href="https://vercel.com/?utm_source=cyberpurge-net&utm_campaign=oss"><img src="https://raw.githubusercontent.com/cyberpurge-net/discord.js/main/.github/powered-by-vercel.svg" alt="Vercel" /></a>
<a href="https://www.cloudflare.com"><img src="https://raw.githubusercontent.com/cyberpurge-net/discord.js/main/.github/powered-by-workers.png" alt="Cloudflare Workers" height="44" /></a>
</p>
</div>

Expand All @@ -24,16 +24,16 @@ This repository contains multiple packages with separate [releases][github-relea
## Packages

- `discord.js` ([source][source]) - A powerful Node.js module for interacting with the Discord API
- `@discordjs/brokers` ([source][brokers-source]) - A collection of brokers for use with discord.js
- `@discordjs/builders` ([source][builders-source]) - A utility package for easily building Discord API payloads
- `@discordjs/collection` ([source][collection-source]) - A powerful utility data structure
- `@discordjs/core` ([source][core-source]) - A thinly abstracted wrapper around the core components of the Discord API
- `@discordjs/formatters` ([source][formatters-source]) - A collection of functions for formatting strings
- `@discordjs/proxy` ([source][proxy-source]) - A wrapper around `@discordjs/rest` for running an HTTP proxy
- `@discordjs/rest` ([source][rest-source]) - A module for interacting with the Discord REST API
- `@discordjs/voice` ([source][voice-source]) - A module for interacting with the Discord Voice API
- `@discordjs/util` ([source][util-source]) - A collection of utility functions
- `@discordjs/ws` ([source][ws-source]) - A wrapper around Discord's gateway
- `@cyberpurge-net/brokers` ([source][brokers-source]) - A collection of brokers for use with discord.js
- `@cyberpurge-net/builders` ([source][builders-source]) - A utility package for easily building Discord API payloads
- `@cyberpurge-net/collection` ([source][collection-source]) - A powerful utility data structure
- `@cyberpurge-net/core` ([source][core-source]) - A thinly abstracted wrapper around the core components of the Discord API
- `@cyberpurge-net/formatters` ([source][formatters-source]) - A collection of functions for formatting strings
- `@cyberpurge-net/proxy` ([source][proxy-source]) - A wrapper around `@cyberpurge-net/rest` for running an HTTP proxy
- `@cyberpurge-net/rest` ([source][rest-source]) - A module for interacting with the Discord REST API
- `@cyberpurge-net/voice` ([source][voice-source]) - A module for interacting with the Discord Voice API
- `@cyberpurge-net/util` ([source][util-source]) - A collection of utility functions
- `@cyberpurge-net/ws` ([source][ws-source]) - A wrapper around Discord's gateway

## Links

Expand All @@ -60,28 +60,28 @@ Please read through our [contribution guidelines][contributing] before starting
If you don't understand something in the documentation, you are experiencing problems, or you just need a gentle nudge in the right direction, please join our [Discord server][discord].

[website]: https://discord.js.org
[website-source]: https://github.com/discordjs/discord.js/tree/main/apps/website
[website-source]: https://github.com/cyberpurge-net/discord.js/tree/main/apps/website
[documentation]: https://discord.js.org/docs
[guide]: https://discordjs.guide/
[guide-source]: https://github.com/discordjs/guide
[guide-update]: https://discordjs.guide/additional-info/changes-in-v14.html
[guide]: https://cyberpurge-net.guide/
[guide-source]: https://github.com/cyberpurge-net/guide
[guide-update]: https://cyberpurge-net.guide/additional-info/changes-in-v14.html
[discord]: https://discord.gg/djs
[discord-api]: https://discord.gg/discord-api
[source]: https://github.com/discordjs/discord.js/tree/main/packages/discord.js
[source]: https://github.com/cyberpurge-net/discord.js/tree/main/packages/discord.js
[npm]: https://www.npmjs.com/package/discord.js
[related-libs]: https://discord.com/developers/docs/topics/community-resources#libraries
[rpc]: https://www.npmjs.com/package/discord-rpc
[rpc-source]: https://github.com/discordjs/RPC
[contributing]: https://github.com/discordjs/discord.js/blob/main/.github/CONTRIBUTING.md
[github-releases]: https://github.com/discordjs/discord.js/releases
[brokers-source]: https://github.com/discordjs/discord.js/tree/main/packages/brokers
[builders-source]: https://github.com/discordjs/discord.js/tree/main/packages/builders
[collection-source]: https://github.com/discordjs/discord.js/tree/main/packages/collection
[core-source]: https://github.com/discordjs/discord.js/tree/main/packages/core
[formatters-source]: https://github.com/discordjs/discord.js/tree/main/packages/formatters
[proxy-source]: https://github.com/discordjs/discord.js/tree/main/packages/proxy
[rest-source]: https://github.com/discordjs/discord.js/tree/main/packages/rest
[voice-source]: https://github.com/discordjs/discord.js/tree/main/packages/voice
[util-source]: https://github.com/discordjs/discord.js/tree/main/packages/util
[ws-source]: https://github.com/discordjs/discord.js/tree/main/packages/ws
[good-first-issue]: https://github.com/discordjs/discord.js/contribute
[rpc-source]: https://github.com/cyberpurge-net/RPC
[contributing]: https://github.com/cyberpurge-net/discord.js/blob/main/.github/CONTRIBUTING.md
[github-releases]: https://github.com/cyberpurge-net/discord.js/releases
[brokers-source]: https://github.com/cyberpurge-net/discord.js/tree/main/packages/brokers
[builders-source]: https://github.com/cyberpurge-net/discord.js/tree/main/packages/builders
[collection-source]: https://github.com/cyberpurge-net/discord.js/tree/main/packages/collection
[core-source]: https://github.com/cyberpurge-net/discord.js/tree/main/packages/core
[formatters-source]: https://github.com/cyberpurge-net/discord.js/tree/main/packages/formatters
[proxy-source]: https://github.com/cyberpurge-net/discord.js/tree/main/packages/proxy
[rest-source]: https://github.com/cyberpurge-net/discord.js/tree/main/packages/rest
[voice-source]: https://github.com/cyberpurge-net/discord.js/tree/main/packages/voice
[util-source]: https://github.com/cyberpurge-net/discord.js/tree/main/packages/util
[ws-source]: https://github.com/cyberpurge-net/discord.js/tree/main/packages/ws
[good-first-issue]: https://github.com/cyberpurge-net/discord.js/contribute
Loading

0 comments on commit ed1def9

Please sign in to comment.