Fix getting changed packages (changesets#20)

Author: emmatown

get-changed-packages.ts

@@ -5,7 +5,8 @@ import fetch from "node-fetch";
 import { safeLoad } from "js-yaml";
 import { Packages, Tool } from "@manypkg/get-packages";
 import assembleReleasePlan from "@changesets/assemble-release-plan";
-import { PreState, Config, NewChangeset } from "@changesets/types";
+import { parse as parseConfig } from "@changesets/config";
+import { PreState, NewChangeset } from "@changesets/types";
 import parseChangeset from "@changesets/parse";
 
 type Sha = string & { ___sha: string };
@@ -16,7 +17,7 @@ export let getChangedPackages = async ({
   ref,
   changedFiles: changedFilesPromise,
   octokit,
-  installationToken
+  installationToken,
 }: {
   owner: string;
   repo: string;
@@ -35,16 +36,16 @@ export let getChangedPackages = async ({
       `https://raw.githubusercontent.com/${owner}/${repo}/${ref}/${path}`,
       {
         headers: {
-          Authorization: `Basic ${encodedCredentials}`
-        }
+          Authorization: `Basic ${encodedCredentials}`,
+        },
       }
     );
   }
 
   function fetchJsonFile(path: string) {
     return fetchFile(path)
-      .then(x => x.json())
-      .catch(err => {
+      .then((x) => x.json())
+      .catch((err) => {
         hasErrored = true;
         console.error(err);
         return {};
@@ -53,8 +54,8 @@ export let getChangedPackages = async ({
 
   function fetchTextFile(path: string) {
     return fetchFile(path)
-      .then(x => x.text())
-      .catch(err => {
+      .then((x) => x.text())
+      .catch((err) => {
         hasErrored = true;
         console.error(err);
         return "";
@@ -65,18 +66,18 @@ export let getChangedPackages = async ({
     let jsonContent = await fetchJsonFile(pkgPath + "/package.json");
     return {
       packageJson: jsonContent,
-      dir: pkgPath
+      dir: pkgPath,
     };
   }
 
   let rootPackageJsonContentsPromise = fetchJsonFile("package.json");
-  let configPromise: Promise<Config> = fetchJsonFile(".changeset/config.json");
+  let configPromise: Promise<any> = fetchJsonFile(".changeset/config.json");
 
   let tree = await octokit.git.getTree({
     owner,
     repo,
     recursive: "1",
-    tree_sha: ref
+    tree_sha: ref,
   });
 
   let preStatePromise: Promise<PreState> | undefined;
@@ -107,7 +108,7 @@ export let getChangedPackages = async ({
       }
       let id = res[1];
       changesetPromises.push(
-        fetchTextFile(item.path).then(text => {
+        fetchTextFile(item.path).then((text) => {
           return { ...parseChangeset(text), id };
         })
       );
@@ -123,7 +124,7 @@ export let getChangedPackages = async ({
   if (isPnpm) {
     tool = {
       tool: "pnpm",
-      globs: safeLoad(await fetchTextFile("pnpm-workspace.yaml")).packages
+      globs: safeLoad(await fetchTextFile("pnpm-workspace.yaml")).packages,
     };
   } else {
     let rootPackageJsonContent = await rootPackageJsonContentsPromise;
@@ -132,12 +133,12 @@ export let getChangedPackages = async ({
       if (!Array.isArray(rootPackageJsonContent.workspaces)) {
         tool = {
           tool: "yarn",
-          globs: rootPackageJsonContent.workspaces.packages
+          globs: rootPackageJsonContent.workspaces.packages,
         };
       } else {
         tool = {
           tool: "yarn",
-          globs: rootPackageJsonContent.workspaces
+          globs: rootPackageJsonContent.workspaces,
         };
       }
     } else if (
@@ -146,14 +147,17 @@ export let getChangedPackages = async ({
     ) {
       tool = {
         tool: "bolt",
-        globs: rootPackageJsonContent.bolt.workspaces
+        globs: rootPackageJsonContent.bolt.workspaces,
       };
     }
   }
 
   if (
     !tool ||
-    !(Array.isArray(tool.globs) && tool.globs.every(x => typeof x === "string"))
+    !(
+      Array.isArray(tool.globs) &&
+      tool.globs.every((x) => typeof x === "string")
+    )
   ) {
     throw new Error("globs are not valid");
   }
@@ -163,16 +167,18 @@ export let getChangedPackages = async ({
   let packages: Packages = {
     root: {
       dir: "/",
-      packageJson: rootPackageJsonContent
+      packageJson: rootPackageJsonContent,
     },
     tool: tool.tool,
-    packages: []
+    packages: [],
   };
 
   if (tool) {
     let matches = micromatch(potentialWorkspaceDirectories, tool.globs);
 
-    packages.packages = await Promise.all(matches.map(dir => getPackage(dir)));
+    packages.packages = await Promise.all(
+      matches.map((dir) => getPackage(dir))
+    );
   } else {
     packages.packages.push(packages.root);
   }
@@ -183,16 +189,16 @@ export let getChangedPackages = async ({
   const releasePlan = assembleReleasePlan(
     await Promise.all(changesetPromises),
     packages,
-    await configPromise,
+    await configPromise.then((rawConfig) => parseConfig(rawConfig, packages)),
     await preStatePromise
   );
 
   return {
     changedPackages: packages.packages
-      .filter(pkg =>
-        changedFiles.some(changedFile => changedFile.includes(pkg.dir))
+      .filter((pkg) =>
+        changedFiles.some((changedFile) => changedFile.includes(pkg.dir))
       )
-      .map(x => x.packageJson.name),
-    releasePlan
+      .map((x) => x.packageJson.name),
+    releasePlan,
   };
 };

package.json

@@ -6,10 +6,10 @@
   "repository": "https://github.com/changesets/bot",
   "homepage": "https://github.com/apps/changeset-bot",
   "dependencies": {
-    "@changesets/assemble-release-plan": "^3.0.0",
+    "@changesets/assemble-release-plan": "^4.0.0",
     "@changesets/config": "^1.3.0",
     "@changesets/parse": "^0.3.6",
-    "@changesets/types": "^3.1.0",
+    "@changesets/types": "^3.1.1",
     "@manypkg/get-packages": "^1.1.0",
     "@types/bunyan": "^1.8.6",
     "@types/express": "^4.17.2",

yarn.lock

@@ -97,12 +97,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/runtime@^7.4.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz#d79f5a2040f7caa24d53e563aad49cbc05581308"
-  integrity sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==
+"@babel/runtime@^7.10.4":
+  version "7.11.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
+  integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==
   dependencies:
-    regenerator-runtime "^0.13.2"
+    regenerator-runtime "^0.13.4"
 
 "@babel/runtime@^7.5.5":
   version "7.8.7"
@@ -144,12 +144,12 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@changesets/assemble-release-plan@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@changesets/assemble-release-plan/-/assemble-release-plan-3.0.0.tgz#23c280b0ea352003302b0c262b8dadb8bda517ed"
-  integrity sha512-TvcqUhNhKoqwE+L8dFtcwwAmos4+fqwmSkOWP3TSjw7K/inz2wjC46bA7IFtbx2hrwEq1iG0RCweQZTS2vrx1w==
+"@changesets/assemble-release-plan@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@changesets/assemble-release-plan/-/assemble-release-plan-4.0.0.tgz#60c2392c0e2c99f24778ab3a5c8e8c80ddaaaa59"
+  integrity sha512-3Kv21FNvysTQvZs3fHr6aZeDibhZHtgI1++fMZplzVtwNVmpjow3zv9lcZmJP26LthbpVH3I8+nqlU7M43lfWA==
   dependencies:
-    "@babel/runtime" "^7.4.4"
+    "@babel/runtime" "^7.10.4"
     "@changesets/errors" "^0.1.4"
     "@changesets/get-dependents-graph" "^1.1.3"
     "@changesets/types" "^3.1.0"
@@ -206,6 +206,11 @@
   resolved "https://registry.yarnpkg.com/@changesets/types/-/types-3.1.0.tgz#68957af45a0be29f0908e20a990ecf382282e1f1"
   integrity sha512-czOfaaxr5aGnNwVRgWr3n2CKoc3iRTfrHM4wUHQ+rBlLKKk9NzGwZ2EPsXkp4CUw4hWHGEOi8hdeIfDTWKrWgg==
 
+"@changesets/types@^3.1.1":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@changesets/types/-/types-3.1.1.tgz#447481380c42044a8788e46c0dbdf592b338b62f"
+  integrity sha512-XWGEGWXhM92zvBWiQt2sOwhjTt8eCQbrsRbqkv4WYwW3Zsl4qPpvhHsNt845S42dJXrxgjWvId+jxFQocCayNQ==
+
 "@cnakazawa/watch@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
@@ -4138,11 +4143,6 @@ redis-parser@^3.0.0:
   dependencies:
     redis-errors "^1.0.0"
 
-regenerator-runtime@^0.13.2:
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
-  integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==
-
 regenerator-runtime@^0.13.4:
   version "0.13.4"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz#e96bf612a3362d12bb69f7e8f74ffeab25c7ac91"