Merge pull request #2171 from intuit/update-octokit

Update octokit

package.json

@@ -54,7 +54,7 @@
     "change-case": "^4.0.0",
     "command-line-docs": "^0.0.6",
     "copy-template-dir": "^1.4.0",
-    "endent": "^2.0.1",
+    "endent": "^2.1.0",
     "eslint": "^7.6.0",
     "eslint-config-prettier": "^8.0.0",
     "eslint-config-xo": "^0.33.1",

packages/cli/package.json

@@ -55,7 +55,7 @@
     "await-to-js": "^3.0.0",
     "chalk": "^4.0.0",
     "command-line-application": "^0.10.1",
-    "endent": "^2.0.1",
+    "endent": "^2.1.0",
     "module-alias": "^2.2.2",
     "signale": "^1.4.0",
     "terminal-link": "^2.1.1",

packages/core/package.json

@@ -40,15 +40,15 @@
     "@auto-it/bot-list": "link:../../packages/bot-list",
     "@endemolshinegroup/cosmiconfig-typescript-loader": "^3.0.2",
     "@octokit/plugin-enterprise-compatibility": "1.3.0",
-    "@octokit/plugin-retry": "^3.0.1",
-    "@octokit/plugin-throttling": "^3.2.0",
-    "@octokit/rest": "^18.0.0",
+    "@octokit/plugin-retry": "^3.0.9",
+    "@octokit/plugin-throttling": "^3.6.2",
+    "@octokit/rest": "^18.12.0",
     "await-to-js": "^3.0.0",
     "chalk": "^4.0.0",
     "cosmiconfig": "7.0.0",
     "deepmerge": "^4.0.0",
     "dotenv": "^8.0.0",
-    "endent": "^2.0.1",
+    "endent": "^2.1.0",
     "enquirer": "^2.3.4",
     "env-ci": "^5.0.1",
     "fast-glob": "^3.1.1",

packages/core/src/__tests__/git.test.ts

@@ -631,6 +631,7 @@ describe("github", () => {
 
       getByUsername.mockReturnValueOnce({
         data: { name: "Andrew Lisowski" },
+        status: 200,
       });
 
       expect(await gh.getUserByUsername("andrew")).toStrictEqual({
@@ -792,8 +793,8 @@ describe("github", () => {
         message: "The request has failed",
         status: 404,
         response: {
-          headers
-        }
+          headers,
+        },
       });
 
       // eslint-disable-next-line no-new

packages/core/src/git.ts

@@ -166,7 +166,8 @@ export default class Git {
     this.github.hook.error("request", (error) => {
       if (error) {
         // narrow down the type
-        if ("headers" in error && error.headers.authorization) {
+        if ("headers" in error && error.request.headers.authorization) {
+          delete error.request.headers.authorization;
           delete error.headers.authorization;
         }
       }
@@ -480,6 +481,10 @@ export default class Git {
         username,
       });
 
+      if (user.status !== 200) {
+        return;
+      }
+
       return user.data;
     } catch (error) {
       this.logger.verbose.warn(`Could not find user by username: ${username}`);
@@ -851,7 +856,7 @@ export default class Git {
     releaseNotes: string,
     tag: string,
     prerelease = false,
-    fallbackCommit?: string,
+    fallbackCommit?: string
   ) {
     this.logger.verbose.info("Creating release on GitHub for tag:", tag);
 

plugins/all-contributors/package.json

@@ -39,11 +39,11 @@
   "dependencies": {
     "@auto-it/bot-list": "link:../../packages/bot-list",
     "@auto-it/core": "link:../../packages/core",
-    "@octokit/rest": "^18.0.0",
+    "@octokit/rest": "^18.12.0",
     "all-contributors-cli": "6.19.0",
     "anymatch": "^3.1.1",
     "await-to-js": "^3.0.0",
-    "endent": "^2.0.1",
+    "endent": "^2.1.0",
     "env-ci": "^5.0.1",
     "fp-ts": "^2.5.3",
     "fromentries": "^1.2.0",

plugins/all-contributors/src/index.ts

@@ -6,7 +6,6 @@ import {
   inFolder,
   validatePluginConfiguration,
 } from "@auto-it/core";
-import { RestEndpointMethodTypes } from "@octokit/rest";
 import envCi from "env-ci";
 import endent from "endent";
 import botList from "@auto-it/bot-list";
@@ -381,12 +380,7 @@ export default class AllContributorsPlugin implements IPlugin {
               auto.git?.getUserByUsername(contributor)
             )
           )
-        ).filter(
-          (
-            c
-          ): c is RestEndpointMethodTypes["users"]["getByUsername"]["response"]["data"] =>
-            Boolean(c)
-        );
+        ).filter((c): c is NonNullable<typeof c> => Boolean(c));
 
         return {
           ...commit,

plugins/cocoapods/src/index.ts

@@ -262,7 +262,8 @@ export default class CocoapodsPlugin implements IPlugin {
         }
 
         const remoteRepo = pr
-          ? await (await auto.git.getPullRequest(pr)).data.head.repo.clone_url
+          ? (await auto.git.getPullRequest(pr)).data.head.repo?.clone_url ||
+            auto.remote
           : auto.remote;
 
         const lastRelease = await auto.git.getLatestRelease();
@@ -295,11 +296,12 @@ export default class CocoapodsPlugin implements IPlugin {
 
         // Reset changes to podspec file since it doesn't need to be committed
         await this.paths.reduce(
-          (promise, path) => promise.then(async () => {
-            await execPromise("git", ["checkout", path])
-          }),
+          (promise, path) =>
+            promise.then(async () => {
+              await execPromise("git", ["checkout", path]);
+            }),
           Promise.resolve()
-        )
+        );
 
         return canaryVersion;
       }

plugins/conventional-commits/package.json

@@ -42,7 +42,7 @@
     "conventional-changelog-core": "^4.2.0",
     "conventional-changelog-preset-loader": "^2.3.4",
     "conventional-commits-parser": "^3.1.0",
-    "endent": "^2.0.1",
+    "endent": "^2.1.0",
     "fp-ts": "^2.5.3",
     "io-ts": "^2.1.2",
     "tslib": "2.1.0"

plugins/exec/package.json

@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@auto-it/core": "link:../../packages/core",
-    "endent": "^2.0.1",
+    "endent": "^2.1.0",
     "fp-ts": "^2.5.3",
     "fromentries": "^1.2.0",
     "io-ts": "^2.1.2",

plugins/first-time-contributor/package.json

@@ -39,12 +39,12 @@
     "@auto-it/bot-list": "link:../../packages/bot-list",
     "@auto-it/core": "link:../../packages/core",
     "array.prototype.flatmap": "^1.2.2",
-    "endent": "^2.0.1",
+    "endent": "^2.1.0",
     "tslib": "2.1.0",
     "url-join": "^4.0.0"
   },
   "devDependencies": {
-    "@octokit/rest": "^18.0.0",
+    "@octokit/rest": "^18.12.0",
     "@types/array.prototype.flatmap": "^1.2.0"
   }
 }

plugins/gem/package.json

@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@auto-it/core": "link:../../packages/core",
-    "endent": "^2.0.1",
+    "endent": "^2.1.0",
     "env-ci": "^5.0.1",
     "fast-glob": "^3.1.1",
     "fp-ts": "^2.5.3",

plugins/gh-pages/package.json

@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@auto-it/core": "link:../../packages/core",
-    "endent": "^2.0.1",
+    "endent": "^2.1.0",
     "fp-ts": "^2.5.3",
     "io-ts": "^2.1.2",
     "push-dir": "^0.4.1",

plugins/npm/package.json

@@ -41,7 +41,7 @@
     "@auto-it/core": "link:../../packages/core",
     "@auto-it/package-json-utils": "link:../../packages/package-json-utils",
     "await-to-js": "^3.0.0",
-    "endent": "^2.0.1",
+    "endent": "^2.1.0",
     "env-ci": "^5.0.1",
     "fp-ts": "^2.5.3",
     "get-monorepo-packages": "^1.1.0",
@@ -54,7 +54,7 @@
     "user-home": "^2.0.0"
   },
   "devDependencies": {
-    "@octokit/rest": "^18.0.0",
+    "@octokit/rest": "^18.12.0",
     "@types/env-ci": "^3.1.0",
     "@types/semver": "^7.1.0",
     "@types/url-join": "^4.0.0",

plugins/released/package.json

@@ -46,6 +46,6 @@
     "tslib": "2.1.0"
   },
   "devDependencies": {
-    "@octokit/rest": "^18.0.0"
+    "@octokit/rest": "^18.12.0"
   }
 }

plugins/slack/package.json

@@ -39,7 +39,7 @@
   "dependencies": {
     "@atomist/slack-messages": "^1.2.2",
     "@auto-it/core": "link:../../packages/core",
-    "@octokit/rest": "^18.0.0",
+    "@octokit/rest": "^18.12.0",
     "fp-ts": "^2.5.3",
     "https-proxy-agent": "^5.0.0",
     "io-ts": "^2.1.2",

plugins/twitter/package.json

@@ -40,7 +40,7 @@
   "dependencies": {
     "@auto-it/core": "link:../../packages/core",
     "@types/twitter-text": "^3.1.0",
-    "endent": "^2.0.1",
+    "endent": "^2.1.0",
     "fp-ts": "^2.5.3",
     "io-ts": "^2.1.2",
     "semver": "^7.0.0",

plugins/upload-assets/package.json

@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@auto-it/core": "link:../../packages/core",
-    "endent": "^2.0.1",
+    "endent": "^2.1.0",
     "fast-glob": "^3.1.1",
     "file-type": "^16.0.0",
     "fp-ts": "^2.5.3",
@@ -48,6 +48,6 @@
     "tslib": "2.1.0"
   },
   "devDependencies": {
-    "@octokit/rest": "^18.0.0"
+    "@octokit/rest": "^18.12.0"
   }
 }