fix: incorrect updated packages list (#372)

ybiquitous · Apr 5, 2021 · 7c502cc · 7c502cc
1 parent 6f268a5
commit 7c502cc
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 7 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -4052,16 +4052,27 @@ const npmArgs = __webpack_require__(510);
 /**
  * @returns {Promise<Map<string, string>>}
  */
-module.exports = async function listPackages() {
+module.exports = async function listPackages({ silent } = { silent: false }) {
   let lines = "";
-  await exec("npm", npmArgs("ls", "--parseable", "--long"), {
+  let stderr = "";
+  const returnCode = await exec("npm", npmArgs("ls", "--parseable", "--long", "--all"), {
     listeners: {
       stdout: (data) => {
         lines += data.toString();
       },
+      stderr: (data) => {
+        stderr += data.toString();
+      },
     },
+    silent,
+    ignoreReturnCode: true,
   });
 
+  // NOTE: Ignore missing peer deps error.
+  if (returnCode !== 0 && !stderr.includes("npm ERR! missing:")) {
+    throw new Error(`"npm ls" failed`);
+  }
+
   const packages = /** @type {Map<string, string>} */ new Map();
   lines
     .split("\n")
@@ -8451,7 +8462,7 @@ module.exports = async function aggregateReport(audit, beforePackages, afterPack
   const updated = [];
   afterPackages.forEach((version, name) => {
     const previousVersion = beforePackages.get(name);
-    if (previousVersion != null) {
+    if (version !== previousVersion && previousVersion != null) {
       const info = audit.get(name);
       const severity = info == null ? null : capitalize(info.severity);
       const title = info == null ? null : info.title;

diff --git a/lib/__tests__/aggregateReport.test.js b/lib/__tests__/aggregateReport.test.js
@@ -18,10 +18,12 @@ test("aggregateReport()", async () => {
   const before = new Map();
   before.set("y18n", "4.0.0");
   before.set("xmldom", "0.5.0");
+  before.set("rimraf", "3.0.2");
 
   const after = new Map();
   after.set("y18n", "4.0.1");
   after.set("arrify", "2.0.1");
+  after.set("rimraf", "3.0.2");
 
   const result = await aggregateReport(audit, before, after);
   expect(result).toMatchSnapshot();

diff --git a/lib/__tests__/listPackages.test.js b/lib/__tests__/listPackages.test.js
@@ -1,7 +1,7 @@
 const listPackages = require("../listPackages");
 
 test("listPackages()", async () => {
-  const packages = await listPackages();
+  const packages = await listPackages({ silent: true });
   expect(packages.size).not.toEqual(0);
   expect(packages.get("jest")).toMatch(/^\d+\.\d+\.\d+$/u);
   expect(packages.get("@actions/core")).toMatch(/^\d+\.\d+\.\d+$/u);

diff --git a/lib/aggregateReport.js b/lib/aggregateReport.js
@@ -47,7 +47,7 @@ module.exports = async function aggregateReport(audit, beforePackages, afterPack
   const updated = [];
   afterPackages.forEach((version, name) => {
     const previousVersion = beforePackages.get(name);
-    if (previousVersion != null) {
+    if (version !== previousVersion && previousVersion != null) {
       const info = audit.get(name);
       const severity = info == null ? null : capitalize(info.severity);
       const title = info == null ? null : info.title;

diff --git a/lib/listPackages.js b/lib/listPackages.js
@@ -4,16 +4,27 @@ const npmArgs = require("./npmArgs");
 /**
  * @returns {Promise<Map<string, string>>}
  */
-module.exports = async function listPackages() {
+module.exports = async function listPackages({ silent } = { silent: false }) {
   let lines = "";
-  await exec("npm", npmArgs("ls", "--parseable", "--long"), {
+  let stderr = "";
+  const returnCode = await exec("npm", npmArgs("ls", "--parseable", "--long", "--all"), {
     listeners: {
       stdout: (data) => {
         lines += data.toString();
       },
+      stderr: (data) => {
+        stderr += data.toString();
+      },
     },
+    silent,
+    ignoreReturnCode: true,
   });
 
+  // NOTE: Ignore missing peer deps error.
+  if (returnCode !== 0 && !stderr.includes("npm ERR! missing:")) {
+    throw new Error(`"npm ls" failed`);
+  }
+
   const packages = /** @type {Map<string, string>} */ new Map();
   lines
     .split("\n")