@ffflorian/auto-merge 1.4.4 → 1.4.6

package/dist/AutoMerge.js

@@ -3,8 +3,7 @@ import path from 'node:path';
 import logdown from 'logdown';
 const __dirname = import.meta.dirname;
 const packageJsonPath = path.join(__dirname, '../package.json');
-const { bin, version: toolVersion } = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
-const toolName = Object.keys(bin)[0];
+const { name: toolName, version: toolVersion } = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
 export class AutoMerge {
     constructor(config) {
         this.config = config;
@@ -16,8 +15,9 @@ export class AutoMerge {
         this.baseURL = 'https://api.github.com';
         this.baseHeaders = {
             Accept: 'application/vnd.github+json',
-            Authorization: `token ${this.config.authToken}`,
+            Authorization: `Bearer ${this.config.authToken}`,
             'User-Agent': `${toolName} v${toolVersion}`,
+            'X-GitHub-Api-Version': '2022-11-28',
         };
         this.checkConfig(this.config);
     }
@@ -69,7 +69,8 @@ export class AutoMerge {
         if (!response.ok) {
             throw new Error(`Error while checking merge request: ${response.statusText}`);
         }
-        return (await response.json()).mergeable_state === 'clean';
+        const pullRequestData = await response.json();
+        return pullRequestData.mergeable_state === 'clean';
     }
     async mergeByMatch(regex, repositories) {
         const allRepositories = repositories || (await this.getRepositoriesWithOpenPullRequests());
@@ -78,7 +79,7 @@ export class AutoMerge {
         for (const { pullRequests, repositorySlug } of matchingRepositories) {
             const actionResults = [];
             for (const pullRequest of pullRequests) {
-                const isMergeable = this.isPullRequestMergeable(repositorySlug, pullRequest.number);
+                const isMergeable = await this.isPullRequestMergeable(repositorySlug, pullRequest.number);
                 if (!isMergeable) {
                     this.logger.warn(`Pull request #${pullRequest.number} in "${repositorySlug}" is not mergeable. Skipping.`);
                     continue;
@@ -105,15 +106,18 @@ export class AutoMerge {
     }
     async mergePullRequest(repositorySlug, pullNumber, squash = false) {
         const actionResult = { pullNumber, status: 'good' };
-        try {
-            if (!this.config.dryRun) {
-                await this.putMerge(repositorySlug, pullNumber, squash);
+        if (!this.config.dryRun) {
+            try {
+                const isMerged = await this.putMerge(repositorySlug, pullNumber, squash);
+                if (!isMerged) {
+                    actionResult.status = 'bad';
+                }
+            }
+            catch (error) {
+                this.logger.error(`Could not merge pull request #${pullNumber} in "${repositorySlug}": ${error.message}`);
+                actionResult.status = 'bad';
+                actionResult.error = error.toString();
             }
-        }
-        catch (error) {
-            this.logger.error(`Could not merge pull request #${pullNumber} in "${repositorySlug}": ${error.message}`);
-            actionResult.status = 'bad';
-            actionResult.error = error.toString();
         }
         return actionResult;
     }
@@ -138,8 +142,8 @@ export class AutoMerge {
     /** @see https://docs.github.com/en/rest/reference/pulls#create-a-review-for-a-pull-request */
     async postReview(repositorySlug, pullNumber) {
         const resourceUrl = new URL(`/repos/${repositorySlug}/pulls/${pullNumber}/reviews`, this.baseURL);
-        resourceUrl.search = new URLSearchParams({ event: 'APPROVE' }).toString();
-        const response = await fetch(resourceUrl, { headers: this.baseHeaders, method: 'POST' });
+        const body = JSON.stringify({ event: 'APPROVE' });
+        const response = await fetch(resourceUrl, { body, headers: this.baseHeaders, method: 'POST' });
         if (!response.ok) {
             throw new Error(`Error while approving pull request: ${response.statusText}`);
         }
@@ -147,13 +151,17 @@ export class AutoMerge {
     /** @see https://docs.github.com/en/rest/reference/issues#create-an-issue-comment */
     async putMerge(repositorySlug, pullNumber, squash) {
         const resourceUrl = new URL(`/repos/${repositorySlug}/pulls/${pullNumber}/merge`, this.baseURL);
+        const config = { headers: this.baseHeaders, method: 'PUT' };
         if (squash) {
-            resourceUrl.search = new URLSearchParams({ merge_method: 'squash' }).toString();
+            const mergeMethod = { merge_method: 'squash' };
+            config.body = JSON.stringify(mergeMethod);
         }
-        const response = await fetch(resourceUrl, { headers: this.baseHeaders, method: 'PUT' });
+        const response = await fetch(resourceUrl, config);
         if (!response.ok) {
             throw new Error(`Error while merging pull request: ${response.statusText}`);
         }
+        const { merged } = await response.json();
+        return merged;
     }
     async getPullRequestsBySlug(repositorySlug) {
         const resourceUrl = new URL(`/repos/${repositorySlug}/pulls`, this.baseURL);

package/package.json

@@ -10,10 +10,10 @@
   "devDependencies": {
     "http-status-codes": "2.3.0",
     "nock": "14.0.10",
-    "rimraf": "6.1.0",
-    "tsx": "4.20.6",
+    "rimraf": "6.1.2",
+    "tsx": "4.21.0",
     "typescript": "5.9.3",
-    "vitest": "4.0.6"
+    "vitest": "4.0.15"
   },
   "engines": {
     "node": ">= 18.0"
@@ -38,6 +38,6 @@
     "test": "vitest run"
   },
   "type": "module",
-  "version": "1.4.4",
-  "gitHead": "25ab72d31b8b8d6f518e0791d723e41a5bdf2502"
+  "version": "1.4.6",
+  "gitHead": "a6dc75c712d4c99a7eedffb1b0f1516d5da42535"
 }