Use resolved CLI paths again

To protect Windows from itself, use explicit 'node <execFile>' call style.

Refs lerna#759
Fixes lerna#708

src/ConventionalCommitUtilities.js

@@ -11,12 +11,22 @@ const CHANGELOG_HEADER = dedent(`# Change Log
   All notable changes to this project will be documented in this file.
   See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.`);
 
+// We call these resolved CLI files in the "path/to/node path/to/cli <..args>"
+// pattern to avoid Windows hangups with shebangs (e.g., WSH can't handle it)
+const RECOMMEND_CLI = require.resolve("conventional-recommended-bump/cli");
+const CHANGELOG_CLI = require.resolve("conventional-changelog-cli/cli");
+
 export default class ConventionalCommitUtilities {
   @logger.logifySync()
   static recommendVersion(pkg, opts) {
     const recommendedBump = ChildProcessUtilities.execSync(
-      "conventional-recommended-bump",
-      ["-l", pkg.name, "--commit-path", pkg.location, "-p", "angular"],
+      process.execPath,
+      [
+        RECOMMEND_CLI,
+        "-l", pkg.name,
+        "--commit-path", pkg.location,
+        "-p", "angular",
+      ],
       opts
     );
 
@@ -36,8 +46,14 @@ export default class ConventionalCommitUtilities {
     // run conventional-changelog-cli to generate the markdown
     // for the upcoming release.
     const newEntry = ChildProcessUtilities.execSync(
-      "conventional-changelog",
-      ["-l", pkg.name, "--commit-path", pkg.location, "--pkg", pkgJsonLocation, "-p", "angular"],
+      process.execPath,
+      [
+        CHANGELOG_CLI,
+        "-l", pkg.name,
+        "--commit-path", pkg.location,
+        "--pkg", pkgJsonLocation,
+        "-p", "angular",
+      ],
       opts
     );
 

src/FileSystemUtilities.js

@@ -12,6 +12,9 @@ function ensureEndsWithNewLine(string) {
   return ENDS_WITH_NEW_LINE.test(string) ? string : string + "\n";
 }
 
+// NOTE: if rimraf moves the location of its executable, this will need to be updated
+const RIMRAF_CLI = require.resolve("rimraf/bin");
+
 // globs only return directories with a trailing slash
 function trailingSlash(filePath) {
   return path.normalize(`${filePath}/`);
@@ -79,8 +82,11 @@ export default class FileSystemUtilities {
 
         const args = candidates.map(trailingSlash);
         args.unshift("--no-glob");
+        args.unshift(RIMRAF_CLI);
 
-        return ChildProcessUtilities.spawn("rimraf", args, {}, callback);
+        // We call this resolved CLI path in the "path/to/node path/to/cli <..args>"
+        // pattern to avoid Windows hangups with shebangs (e.g., WSH can't handle it)
+        return ChildProcessUtilities.spawn(process.execPath, args, {}, callback);
       });
   }
 

test/ConventionalCommitUtilities.js

@@ -31,8 +31,13 @@ describe("ConventionalCommitUtilities", () => {
 
       expect(recommendVersion).toBe("2.0.0");
       expect(ChildProcessUtilities.execSync).lastCalledWith(
-        "conventional-recommended-bump",
-        ["-l", "bar", "--commit-path", "/foo/bar", "-p", "angular"],
+        process.execPath,
+        [
+          require.resolve("conventional-recommended-bump/cli"),
+          "-l", "bar",
+          "--commit-path", "/foo/bar",
+          "-p", "angular",
+        ],
         opts,
       );
     });
@@ -54,8 +59,14 @@ describe("ConventionalCommitUtilities", () => {
         path.normalize("/foo/bar/CHANGELOG.md")
       );
       expect(ChildProcessUtilities.execSync).lastCalledWith(
-        "conventional-changelog",
-        ["-l", "bar", "--commit-path", "/foo/bar", "--pkg", path.normalize("/foo/bar/package.json"), "-p", "angular"],
+        process.execPath,
+        [
+          require.resolve("conventional-changelog-cli/cli"),
+          "-l", "bar",
+          "--commit-path", "/foo/bar",
+          "--pkg", path.normalize("/foo/bar/package.json"),
+          "-p", "angular",
+        ],
         opts,
       );
       expect(FileSystemUtilities.writeFileSync).lastCalledWith(

test/FileSystemUtilities.js

@@ -99,8 +99,12 @@ describe("FileSystemUtilities", () => {
       FileSystemUtilities.rimraf(["rimraf/test"], () => {
         try {
           expect(ChildProcessUtilities.spawn).lastCalledWith(
-            "rimraf",
-            ["--no-glob", path.normalize("rimraf/test/")],
+            process.execPath,
+            [
+              require.resolve("rimraf/bin"),
+              "--no-glob",
+              path.normalize("rimraf/test/"),
+            ],
             {},
             expect.any(Function)
           );