fix(deps): Switch to actively-maintained @zkochan/cmd-shim

evocateur · evocateur · commit 60d1100a559f · 2019-07-22T12:37:13.000-07:00
This addresses a bug with missing link sources on Windows, among other things.
diff --git a/helpers/pkg-matchers/index.js b/helpers/pkg-matchers/index.js
@@ -1,7 +1,6 @@
 "use strict";
 
 const fs = require("fs");
-const os = require("os");
 const path = require("path");
 const semver = require("semver");
 const Package = require("@lerna/package");
@@ -81,8 +80,18 @@ function createDependencyMatcher(dependencyType) {
 function toHaveBinaryLinks(received, ...inputs) {
   const pkg = Package.lazy(received);
   const links =
-    os.platform() === "win32"
-      ? inputs.reduce((acc, input) => [...acc, input, [input, "cmd"].join(".")], [])
+    process.platform === "win32"
+      ? inputs.reduce(
+          (acc, input) => [
+            ...acc,
+            input,
+            // cmd.exe
+            [input, "cmd"].join("."),
+            // powershell
+            [input, "ps1"].join("."),
+          ],
+          []
+        )
       : inputs;
 
   const expectedName = `expected ${pkg.name}`;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -56,6 +56,7 @@
     "@lerna-test/show-commit": "file:helpers/show-commit",
     "@lerna-test/silence-logging": "file:helpers/silence-logging",
     "@lerna-test/update-lerna-config": "file:helpers/update-lerna-config",
+    "@zkochan/cmd-shim": "^3.1.0",
     "camelcase": "^5.3.1",
     "debug": "^4.1.1",
     "eslint": "^5.16.0",
diff --git a/utils/create-symlink/__tests__/create-symlink.test.js b/utils/create-symlink/__tests__/create-symlink.test.js
@@ -1,12 +1,11 @@
 "use strict";
 
-jest.mock("cmd-shim");
+jest.mock("@zkochan/cmd-shim");
 jest.mock("fs-extra");
 
-const cmdShim = require("cmd-shim");
+const cmdShim = require("@zkochan/cmd-shim");
 const fs = require("fs-extra");
 const path = require("path");
-const callsBack = require("@lerna-test/calls-back");
 const createSymlink = require("..");
 
 const linkRelative = (from, to) => path.relative(path.dirname(to), from);
@@ -16,8 +15,7 @@ describe("create-symlink", () => {
   fs.unlink.mockResolvedValue();
   fs.symlink.mockResolvedValue();
   fs.pathExists.mockResolvedValue(true);
-  // cmdShim is a traditional errback
-  cmdShim.mockImplementation(callsBack());
+  cmdShim.mockResolvedValue();
 
   if (process.platform !== "win32") {
     it("creates relative symlink to a directory", async () => {
@@ -63,11 +61,11 @@ describe("create-symlink", () => {
       await createSymlink(src, dst, type);
 
       expect(fs.lstat).not.toHaveBeenCalled();
-      expect(cmdShim).toHaveBeenLastCalledWith(src, dst, expect.any(Function));
+      expect(cmdShim).toHaveBeenLastCalledWith(src, dst);
     });
 
     it("rejects when cmd-shim errors", async () => {
-      cmdShim.mockImplementationOnce(callsBack(new Error("yikes")));
+      cmdShim.mockImplementationOnce(() => Promise.reject(new Error("yikes")));
 
       try {
         await createSymlink("src", "dst", "exec");
diff --git a/utils/create-symlink/create-symlink.js b/utils/create-symlink/create-symlink.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const cmdShim = require("cmd-shim");
+const cmdShim = require("@zkochan/cmd-shim");
 const fs = require("fs-extra");
 const log = require("npmlog");
 const path = require("path");
@@ -49,15 +49,7 @@ function createPosixSymlink(origin, dest, _type) {
 
 function createWindowsSymlink(src, dest, type) {
   if (type === "exec") {
-    return new Promise((resolve, reject) => {
-      cmdShim(src, dest, err => {
-        if (err) {
-          reject(err);
-        } else {
-          resolve();
-        }
-      });
-    });
+    return cmdShim(src, dest);
   }
 
   return createSymbolicLink(src, dest, type);
diff --git a/utils/create-symlink/package.json b/utils/create-symlink/package.json
@@ -31,7 +31,7 @@
     "test": "echo \"Run tests from root\" && exit 1"
   },
   "dependencies": {
-    "cmd-shim": "^2.0.2",
+    "@zkochan/cmd-shim": "^3.1.0",
     "fs-extra": "^8.1.0",
     "npmlog": "^4.1.2"
   }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`"test": "echo \"Run tests from root\" && exit 1"`
`32`	`32`	`},`
`33`	`33`	`"dependencies": {`
`34`		`- "cmd-shim": "^2.0.2",`
	`34`	`+ "@zkochan/cmd-shim": "^3.1.0",`
`35`	`35`	`"fs-extra": "^8.1.0",`
`36`	`36`	`"npmlog": "^4.1.2"`
`37`	`37`	`}`