fix: windows support

medikoo · Nov 15, 2018 · 35d0f5e · 35d0f5e
1 parent 0c256b0
commit 35d0f5e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/lib/get-npm-modules-path.js b/lib/get-npm-modules-path.js
@@ -13,6 +13,7 @@ module.exports = memoize(
 		const [npmPathPrefix] = String(stdout).split("\n", 1);
 		if (!npmPathPrefix) throw new Error("Could not resolve npm path prefix");
 		log.notice("npm path prefix: %s", npmPathPrefix);
+		if (process.platform === "win32") return resolve(npmPathPrefix, "node_modules");
 		return resolve(npmPathPrefix, "lib", "node_modules");
 	},
 	{ promise: true }

diff --git a/lib/private/setup-dependencies/setup-dependency/npm-link-dependency/install-external.js b/lib/private/setup-dependencies/setup-dependency/npm-link-dependency/install-external.js
@@ -66,7 +66,10 @@ module.exports = async dependencyContext => {
 		Object.entries(getPackageJson(path).bin || {}).map(async ([targetName, linkedPath]) => {
 			const targetPath = resolve(dependentContext.path, "node_modules/.bin", targetName);
 			await rm(targetPath, { loose: true, force: true, recursive: true });
-			await symlink(join("../", name, linkedPath), targetPath, { intermediate: true });
+			await symlink(join("../", name, linkedPath), targetPath, {
+				type: "junction",
+				intermediate: true
+			});
 		})
 	);
 };
diff --git a/lib/run-program.js b/lib/run-program.js
@@ -4,9 +4,14 @@ const isObject  = require("es5-ext/object/is-object")
     , { spawn } = require("child-process-es6-promise")
     , split     = require("split");
 
+const winCmdCommands = new Set();
+
 module.exports = (command, args, options = {}) => {
 	if (!isObject(options)) options = {};
-	const { logger } = options, promise = spawn(command, args, { cwd: options.cwd });
+	const { logger } = options;
+	const promise = spawn(command + (winCmdCommands.has(command) ? ".cmd" : ""), args, {
+		cwd: options.cwd
+	});
 	const { child } = promise;
 
 	if (logger) {
@@ -17,5 +22,12 @@ module.exports = (command, args, options = {}) => {
 			.pipe(split(/\r?\n/u, null, { trailing: false }))
 			.on("data", data => logger.notice(String(data)));
 	}
-	return promise;
+
+	if (process.platform !== "win32") return promise;
+	if (winCmdCommands.has(command)) return promise;
+	return promise.catch(error => {
+		if (error.code !== "ENOENT") throw error;
+		winCmdCommands.add(command);
+		return module.exports(command, args, options);
+	});
 };