Merge branch 'main' into types/attachment-edit-data

discordjs · Oct 9, 2023 · 287d9ce · 287d9ce
2 parents 1a8b247 + ec47e72
commit 287d9ce
Show file tree

Hide file tree

Showing 12 changed files with 172 additions and 45 deletions.
diff --git a/.github/workflows/publish-dev.yml b/.github/workflows/publish-dev.yml
@@ -52,30 +52,31 @@ jobs:
           registry-url: https://registry.npmjs.org/
 
       - name: Check the current development version
-        id: pre-release
+        id: release-check
         run: |
           if [[ $(npm view ${{ matrix.package }}@dev version | grep -e "$(git rev-parse --short HEAD)") ]]; \
-          then echo '::set-output name=release::false'; \
-          else echo '::set-output name=release::true'; fi
+            then echo "RELEASE=0" >> "$GITHUB_OUTPUT"; \
+            else echo "RELEASE=1" >> "$GITHUB_OUTPUT"; \
+          fi
 
       - name: Install dependencies
-        if: steps.pre-release.outputs.release == 'true'
+        if: steps.release-check.outputs.release == '1'
         uses: ./packages/actions/src/pnpmCache
 
       - name: Build dependencies
-        if: steps.pre-release.outputs.release == 'true'
+        if: steps.release-check.outputs.release == '1'
         run: pnpm run build
 
       - name: Publish package
-        if: steps.pre-release.outputs.release == 'true'
+        if: steps.release-check.outputs.release == '1'
         run: |
           pnpm --filter=${{ matrix.package }} run release --preid "dev.$(date +%s)-$(git rev-parse --short HEAD)"
           pnpm --filter=${{ matrix.package }} publish --no-git-checks --tag dev || true
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
 
       - name: Deprecate prior development releases
-        if: steps.pre-release.outputs.release == 'true'
+        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 }}
diff --git a/packages/builders/package.json b/packages/builders/package.json
@@ -67,7 +67,7 @@
 		"@discordjs/formatters": "workspace:^",
 		"@discordjs/util": "workspace:^",
 		"@sapphire/shapeshift": "^3.9.2",
-		"discord-api-types": "0.37.59",
+		"discord-api-types": "0.37.60",
 		"fast-deep-equal": "^3.1.3",
 		"ts-mixer": "^6.0.3",
 		"tslib": "^2.6.2"

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -69,7 +69,7 @@
 		"@discordjs/ws": "workspace:^",
 		"@sapphire/snowflake": "^3.5.1",
 		"@vladfrangu/async_event_emitter": "^2.2.2",
-		"discord-api-types": "0.37.59"
+		"discord-api-types": "0.37.60"
 	},
 	"devDependencies": {
 		"@favware/cliff-jumper": "^2.2.0",

diff --git a/packages/create-discord-bot/template/TypeScript/tsconfig.json b/packages/create-discord-bot/template/TypeScript/tsconfig.json
@@ -4,7 +4,7 @@
 	"compilerOptions": {
 		"declaration": false,
 		"declarationMap": false,
-		"module": "ESNext",
+		"module": "NodeNext",
 		"moduleResolution": "NodeNext",
 		"target": "ESNext",
 		"outDir": "dist",

diff --git a/packages/discord.js/package.json b/packages/discord.js/package.json
@@ -59,7 +59,7 @@
     "@discordjs/ws": "workspace:^",
     "@sapphire/snowflake": "3.5.1",
     "@types/ws": "8.5.5",
-    "discord-api-types": "0.37.59",
+    "discord-api-types": "0.37.60",
     "fast-deep-equal": "3.1.3",
     "lodash.snakecase": "4.1.1",
     "tslib": "2.6.2",

diff --git a/packages/discord.js/src/structures/Role.js b/packages/discord.js/src/structures/Role.js
@@ -205,7 +205,7 @@ class Role extends Base {
       (acc, role) =>
         acc +
         (this.rawPosition === role.rawPosition
-          ? BigInt(this.id) > BigInt(role.id)
+          ? BigInt(this.id) < BigInt(role.id)
           : this.rawPosition > role.rawPosition),
       0,
     );

diff --git a/packages/formatters/package.json b/packages/formatters/package.json
@@ -54,7 +54,7 @@
 	},
 	"homepage": "https://discord.js.org",
 	"dependencies": {
-		"discord-api-types": "0.37.59"
+		"discord-api-types": "0.37.60"
 	},
 	"devDependencies": {
 		"@favware/cliff-jumper": "^2.2.0",

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -71,7 +71,7 @@
 		"@discordjs/rest": "workspace:^",
 		"@discordjs/util": "workspace:^",
 		"@discordjs/ws": "workspace:^",
-		"discord-api-types": "0.37.59"
+		"discord-api-types": "0.37.60"
 	},
 	"devDependencies": {
 		"@favware/cliff-jumper": "^2.2.0",

diff --git a/packages/rest/package.json b/packages/rest/package.json
@@ -87,7 +87,7 @@
 		"@sapphire/async-queue": "^1.5.0",
 		"@sapphire/snowflake": "^3.5.1",
 		"@vladfrangu/async_event_emitter": "^2.2.2",
-		"discord-api-types": "0.37.59",
+		"discord-api-types": "0.37.60",
 		"magic-bytes.js": "^1.0.15",
 		"tslib": "^2.6.2",
 		"undici": "5.23.0"

diff --git a/packages/voice/package.json b/packages/voice/package.json
@@ -63,7 +63,7 @@
 	"homepage": "https://discord.js.org",
 	"dependencies": {
 		"@types/ws": "^8.5.5",
-		"discord-api-types": "0.37.59",
+		"discord-api-types": "0.37.60",
 		"prism-media": "^1.3.5",
 		"tslib": "^2.6.2",
 		"ws": "^8.13.0"

diff --git a/packages/ws/package.json b/packages/ws/package.json
@@ -78,7 +78,7 @@
 		"@sapphire/async-queue": "^1.5.0",
 		"@types/ws": "^8.5.5",
 		"@vladfrangu/async_event_emitter": "^2.2.2",
-		"discord-api-types": "0.37.59",
+		"discord-api-types": "0.37.60",
 		"tslib": "^2.6.2",
 		"ws": "^8.13.0"
 	},