v1.4.4

CHANGELOG.md

@@ -1,11 +1,5 @@
 # @changesets/action
 
-## 1.4.5
-
-### Patch Changes
-
-- [#282](https://github.com/changesets/action/pull/282) [`eb19e25`](https://github.com/changesets/action/commit/eb19e25e7797cf33dc2de4caa071e85a8057a0f0) Thanks [@mark-omarov](https://github.com/mark-omarov)! - Updated a few dependencies to patch the security vulnerabilities that were reported for their older versions.
-
 ## 1.4.4
 
 ### Patch Changes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@changesets/action",
-  "version": "1.4.5",
+  "version": "1.4.4",
   "main": "dist/index.js",
   "license": "MIT",
   "devDependencies": {
@@ -10,17 +10,7 @@
     "@vercel/ncc": "^0.36.1",
     "fixturez": "^1.1.0",
     "prettier": "^2.0.5",
-    "typescript": "^5.0.4",
+    "typescript": "^5.0.4"
-    "@babel/core": "^7.13.10",
-    "@babel/preset-env": "^7.13.10",
-    "@babel/preset-typescript": "^7.13.0",
-    "@types/fs-extra": "^8.0.0",
-    "@types/jest": "^29.5.1",
-    "@types/node": "^12.7.1",
-    "@types/semver": "^6.0.2",
-    "babel-jest": "^29.5.0",
-    "husky": "^3.0.3",
-    "jest": "^29.5.0"
   },
   "scripts": {
     "build": "ncc build src/index.ts -o dist --transpile-only --minify",
@@ -37,11 +27,21 @@
     "@actions/core": "^1.10.0",
     "@actions/exec": "^1.1.1",
     "@actions/github": "^5.1.1",
+    "@babel/core": "^7.13.10",
+    "@babel/preset-env": "^7.13.10",
+    "@babel/preset-typescript": "^7.13.0",
     "@changesets/pre": "^1.0.9",
     "@changesets/read": "^0.5.3",
     "@manypkg/get-packages": "^1.1.3",
-    "@octokit/plugin-throttling": "^5.2.1",
+    "@octokit/plugin-throttling": "5.1.1",
+    "@types/fs-extra": "^8.0.0",
+    "@types/jest": "^29.5.1",
+    "@types/node": "^12.7.1",
+    "@types/semver": "^6.0.2",
+    "babel-jest": "^29.5.0",
     "fs-extra": "^8.1.0",
+    "husky": "^3.0.3",
+    "jest": "^29.5.0",
     "mdast-util-to-string": "^1.0.6",
     "remark-parse": "^7.0.1",
     "remark-stringify": "^7.0.3",
@@ -54,8 +54,6 @@
   },
   "prettier": {},
   "resolutions": {
-    "**/@octokit/core": "4.2.0",
+    "**/@octokit/core": "4.2.0"
-    "trim": "^0.0.3",
-    "y18n": "^4.0.1"
   }
 }

src/readChangesetState.ts

@@ -11,19 +11,17 @@ export default async function readChangesetState(
   cwd: string = process.cwd()
 ): Promise<ChangesetState> {
   let preState = await readPreState(cwd);
+  let isInPreMode = preState !== undefined && preState.mode === "pre";
+
   let changesets = await readChangesets(cwd);
 
-  if (preState !== undefined && preState.mode === "pre") {
+  if (isInPreMode) {
     let changesetsToFilter = new Set(preState.changesets);
-
+    changesets = changesets.filter((x) => !changesetsToFilter.has(x.id));
-    return {
-      preState,
-      changesets: changesets.filter((x) => !changesetsToFilter.has(x.id)),
-    };
   }
 
   return {
-    preState: undefined,
+    preState: isInPreMode ? preState : undefined,
     changesets,
   };
 }

src/run.ts

@@ -17,6 +17,8 @@ import * as gitUtils from "./gitUtils";
 import readChangesetState from "./readChangesetState";
 import resolveFrom from "resolve-from";
 import { throttling } from "@octokit/plugin-throttling";
+// temporary workaround for https://github.com/octokit/plugin-throttling.js/pull/590
+import type {} from "@octokit/plugin-throttling/dist-types/types.d";
 
 // GitHub Issues/PRs messages have a max size limit on the
 // message body payload.
@@ -24,7 +26,7 @@ import { throttling } from "@octokit/plugin-throttling";
 // To avoid that, we ensure to cap the message to 60k chars.
 const MAX_CHARACTERS_PER_MESSAGE = 60000;
 
-const setupOctokit = (githubToken: string) => {
+const setupOctokit = (githubToken) => {
   return new (GitHub.plugin(throttling))(
     getOctokitOptions(githubToken, {
       throttle: {
@@ -59,7 +61,7 @@ const setupOctokit = (githubToken: string) => {
 };
 
 const createRelease = async (
-  octokit: ReturnType<typeof setupOctokit>,
+  octokit: ReturnType<typeof GitHub>,
   { pkg, tagName }: { pkg: Package; tagName: string }
 ) => {
   try {
@@ -85,12 +87,7 @@ const createRelease = async (
     });
   } catch (err) {
     // if we can't find a changelog, the user has probably disabled changelogs
-    if (
+    if (err.code !== "ENOENT") {
-      err &&
-      typeof err === "object" &&
-      "code" in err &&
-      err.code !== "ENOENT"
-    ) {
       throw err;
     }
   }
@@ -208,12 +205,7 @@ const requireChangesetsCliPkgJson = (cwd: string) => {
   try {
     return require(resolveFrom(cwd, "@changesets/cli/package.json"));
   } catch (err) {
-    if (
+    if (err && err.code === "MODULE_NOT_FOUND") {
-      err &&
-      typeof err === "object" &&
-      "code" in err &&
-      err.code === "MODULE_NOT_FOUND"
-    ) {
       throw new Error(
         `Have you forgotten to install \`@changesets/cli\` in "${cwd}"?`
       );

src/utils.ts

@@ -3,6 +3,7 @@ import remarkParse from "remark-parse";
 import remarkStringify from "remark-stringify";
 // @ts-ignore
 import mdastToString from "mdast-util-to-string";
+import { exec } from "@actions/exec";
 import { getPackages, Package } from "@manypkg/get-packages";
 
 export const BumpLevels = {