Revert "Update deps and setup to log to Sentry on changed package fetching"

This reverts commit ec93428.

Author: emmatown

get-changed-packages.ts

@@ -1,6 +1,6 @@
 import nodePath from "path";
 import micromatch from "micromatch";
-import { ProbotOctokit } from "probot";
+import { Octokit } from "probot";
 import fetch from "node-fetch";
 import { safeLoad } from "js-yaml";
 import { Packages, Tool } from "@manypkg/get-packages";
@@ -23,7 +23,7 @@ export let getChangedPackages = async ({
   repo: string;
   ref: string;
   changedFiles: string[] | Promise<string[]>;
-  octokit: InstanceType<typeof ProbotOctokit>;
+  octokit: Octokit;
   installationToken: string;
 }) => {
   let hasErrored = false;
@@ -82,6 +82,7 @@ export let getChangedPackages = async ({
 
   let preStatePromise: Promise<PreState> | undefined;
   let changesetPromises: Promise<NewChangeset>[] = [];
+  let itemsByDirPath = new Map<string, { path: string; sha: Sha }>();
   let potentialWorkspaceDirectories: string[] = [];
   let isPnpm = false;
   let changedFiles = await changedFilesPromise;
@@ -90,6 +91,7 @@ export let getChangedPackages = async ({
     if (item.path.endsWith("/package.json")) {
       let dirPath = nodePath.dirname(item.path);
       potentialWorkspaceDirectories.push(dirPath);
+      itemsByDirPath.set(dirPath, item);
     } else if (item.path === "pnpm-workspace.yaml") {
       isPnpm = true;
     } else if (item.path === ".changeset/pre.json") {

index.ts

@@ -1,38 +1,28 @@
 // @ts-ignore
 import humanId from "human-id";
-import { Application, Context } from "probot";
+import { Application, Context, Octokit } from "probot";
 import Webhooks from "@octokit/webhooks";
 import { getChangedPackages } from "./get-changed-packages";
-import {
-  ReleasePlan,
-  ComprehensiveRelease,
-  VersionType,
-} from "@changesets/types";
+import { ReleasePlan, ComprehensiveRelease, VersionType } from "@changesets/types";
 import markdownTable from "markdown-table";
-import { captureException } from "@sentry/node";
 
 const getReleasePlanMessage = (releasePlan: ReleasePlan | null) => {
   if (!releasePlan) return "";
 
   let table = markdownTable([
     ["Name", "Type"],
     ...releasePlan.releases
-      .filter(
-        (
-          x
-        ): x is ComprehensiveRelease & { type: Exclude<VersionType, "none"> } =>
-          x.type !== "none"
-      )
-      .map((x) => {
+      .filter((x): x is ComprehensiveRelease & { type: Exclude<VersionType, 'none'>} => x.type !== 'none')
+      .map(x => {
         return [
           x.name,
           {
             major: "Major",
             minor: "Minor",
-            patch: "Patch",
-          }[x.type],
+            patch: "Patch"
+          }[x.type]
         ];
-      }),
+      })
   ]);
 
   return `<details><summary>This PR includes ${
@@ -92,36 +82,37 @@ Not sure what this means? [Click here  to learn what changesets are](https://git
 
 const getNewChangesetTemplate = (changedPackages: string[], title: string) =>
   encodeURIComponent(`---
-${changedPackages.map((x) => `"${x}": patch`).join("\n")}
+${changedPackages.map(x => `"${x}": patch`).join("\n")}
 ---
 
 ${title}
 `);
 
-type PRContext = Context<Webhooks.EventPayloads.WebhookPayloadPullRequest>;
+type PRContext = Context<Webhooks.WebhookPayloadPullRequest>;
 
 const getCommentId = (
   context: PRContext,
   params: { repo: string; owner: string; issue_number: number }
 ) =>
-  context.github.issues.listComments(params).then((comments) => {
+  context.github.issues.listComments(params).then(comments => {
     const changesetBotComment = comments.data.find(
       // TODO: find what the current user is in some way or something
-      (comment) =>
+      comment =>
         comment.user.login === "changeset-bot[bot]" ||
         comment.user.login === "changesets-test-bot[bot]"
     );
     return changesetBotComment ? changesetBotComment.id : null;
   });
 
 const getChangesetId = (
-  changedFilesPromise: ReturnType<PRContext["github"]["pulls"]["listFiles"]>,
+  changedFilesPromise: Promise<
+    Octokit.Response<Octokit.PullsListFilesResponse>
+  >,
   params: { repo: string; owner: string; pull_number: number }
 ) =>
-  changedFilesPromise.then((files) =>
+  changedFilesPromise.then(files =>
     files.data.some(
-      (file) =>
-        file.filename.startsWith(".changeset") && file.status === "added"
+      file => file.filename.startsWith(".changeset") && file.status === "added"
     )
   );
 
@@ -130,7 +121,7 @@ async function fetchJsonFile(context: PRContext, path: string) {
     owner: context.payload.pull_request.head.repo.owner.login,
     repo: context.payload.pull_request.head.repo.name,
     path,
-    ref: context.payload.pull_request.head.ref,
+    ref: context.payload.pull_request.head.ref
   });
   // @ts-ignore
   let buffer = Buffer.from(output.data.content, "base64");
@@ -157,21 +148,22 @@ export default (app: Application) => {
 
         let repo = {
           repo: context.payload.repository.name,
-          owner: context.payload.repository.owner.login,
+          owner: context.payload.repository.owner.login
         };
 
         const latestCommitSha = context.payload.pull_request.head.sha;
+
         let changedFilesPromise = context.github.pulls.listFiles({
           ...repo,
-          pull_number: number,
+          pull_number: number
         });
 
         console.log(context.payload);
 
         const [
           commentId,
           hasChangeset,
-          { changedPackages, releasePlan },
+          { changedPackages, releasePlan }
         ] = await Promise.all([
           // we know the comment won't exist on opened events
           // ok, well like technically that's wrong
@@ -185,23 +177,20 @@ export default (app: Application) => {
             repo: context.payload.pull_request.head.repo.name,
             owner: context.payload.pull_request.head.repo.owner.login,
             ref: context.payload.pull_request.head.ref,
-            changedFiles: changedFilesPromise.then((x) =>
-              x.data.map((x) => x.filename)
+            changedFiles: changedFilesPromise.then(x =>
+              x.data.map(x => x.filename)
             ),
             octokit: context.github,
-            installationToken: (
-              await (await app.auth()).apps.createInstallationAccessToken({
-                installation_id: context.payload.installation!.id,
-              })
-            ).data.token,
-          }).catch((err) => {
+            installationToken: await app.app.getInstallationAccessToken({
+              installationId: (context.payload as any).installation.id
+            })
+          }).catch(err => {
             console.error(err);
-            captureException(err);
             return {
               changedPackages: ["@fake-scope/fake-pkg"],
-              releasePlan: null,
+              releasePlan: null
             };
-          }),
+          })
         ] as const);
 
         let addChangesetUrl = `${
@@ -210,7 +199,7 @@ export default (app: Application) => {
           context.payload.pull_request.head.ref
         }?filename=.changeset/${humanId({
           separator: "-",
-          capitalize: false,
+          capitalize: false
         })}.md&value=${getNewChangesetTemplate(
           changedPackages,
           context.payload.pull_request.title
@@ -222,7 +211,7 @@ export default (app: Application) => {
           issue_number: number,
           body: hasChangeset
             ? getApproveMessage(latestCommitSha, addChangesetUrl, releasePlan)
-            : getAbsentMessage(latestCommitSha, addChangesetUrl, releasePlan),
+            : getAbsentMessage(latestCommitSha, addChangesetUrl, releasePlan)
         };
 
         if (prComment.comment_id != null) {

package.json

@@ -7,10 +7,10 @@
   "homepage": "https://github.com/apps/changeset-bot",
   "dependencies": {
     "@changesets/assemble-release-plan": "^4.0.0",
-    "@changesets/config": "^1.4.0",
-    "@changesets/parse": "^0.3.7",
-    "@changesets/types": "^3.2.0",
-    "@manypkg/get-packages": "^1.1.1",
+    "@changesets/config": "^1.3.0",
+    "@changesets/parse": "^0.3.6",
+    "@changesets/types": "^3.1.1",
+    "@manypkg/get-packages": "^1.1.0",
     "@types/bunyan": "^1.8.6",
     "@types/express": "^4.17.2",
     "@types/ioredis": "^4.14.8",
@@ -19,12 +19,12 @@
     "@types/micromatch": "^4.0.1",
     "@types/node-fetch": "^2.5.5",
     "human-id": "^1.0.2",
-    "js-yaml": "^3.14.0",
+    "js-yaml": "^3.13.1",
     "markdown-table": "^2.0.0",
     "node-fetch": "^2.6.0",
     "path": "^0.12.7",
-    "probot": "^10.9.3",
-    "typescript": "^4.0.3"
+    "probot": "^9.5.0",
+    "typescript": "^3.8.3"
   },
   "devDependencies": {
     "jest": "^24.1.0",