got yarn PnP working + tested for unix

Author: mikrostew

crates/volta-core/fixtures/plug-n-play/pnp-cjs/.pnp.cjs

@@ -0,0 +1,11 @@
+{
+  "name": "plug-n-play-cjs",
+  "version": "2.0.0",
+  "description": "Testing that Plug-n-Play things work",
+  "license": "To Ill",
+  "volta": {
+    "node": "6.11.1",
+    "npm": "3.10.10",
+    "yarn": "3.2.0"
+  }
+}

crates/volta-core/fixtures/plug-n-play/pnp-cjs/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "plug-n-play-js",
+  "version": "2.0.0",
+  "description": "Testing that Plug-n-Play things work",
+  "license": "To Ill",
+  "volta": {
+    "node": "6.11.1",
+    "npm": "3.10.10",
+    "yarn": "2.4.0"
+  }
+}

crates/volta-core/fixtures/plug-n-play/pnp-js/.pnp.js

@@ -171,6 +171,14 @@ impl Project {
         })
     }
 
+    /// Does this project use Plug-n-Play?
+    // (Do either of the files '.pnp.js' or '.pnp.cjs' exist?)
+    pub fn is_plug_n_play(&self) -> bool {
+        self.manifest_file.parent().map_or(false, |base_dir| {
+            base_dir.join(".pnp.js").exists() || base_dir.join(".pnp.cjs").exists()
+        })
+    }
+
     /// Pins the Node version in this project's manifest file
     pub fn pin_node(&mut self, version: Version) -> Fallible<()> {
         update_manifest(&self.manifest_file, ManifestKey::Node, Some(&version))?;

crates/volta-core/fixtures/plug-n-play/pnp-js/package.json

@@ -217,3 +217,28 @@ mod project {
         }
     }
 }
+
+mod plug_n_play {
+    use super::*;
+
+    #[test]
+    fn project_is_not_pnp() {
+        let project_path = fixture_path(&["basic"]);
+        let test_project = Project::for_dir(project_path).unwrap().unwrap();
+        assert_eq!(test_project.is_plug_n_play(), false);
+    }
+
+    #[test]
+    fn project_has_pnp_js() {
+        let project_path = fixture_path(&["plug-n-play", "pnp-js"]);
+        let test_project = Project::for_dir(project_path).unwrap().unwrap();
+        assert_eq!(test_project.is_plug_n_play(), true);
+    }
+
+    #[test]
+    fn project_has_pnp_cjs() {
+        let project_path = fixture_path(&["plug-n-play", "pnp-cjs"]);
+        let test_project = Project::for_dir(project_path).unwrap().unwrap();
+        assert_eq!(test_project.is_plug_n_play(), true);
+    }
+}

crates/volta-core/src/project/mod.rs

@@ -20,6 +20,17 @@ pub(super) fn command(exe: &OsStr, args: &[OsString], session: &mut Session) ->
     if let Some(project) = session.project()? {
         // Check if the executable is a direct dependency
         if project.has_direct_bin(exe)? {
+            if project
+                .platform()
+                .map_or(false, |platform| platform.yarn.is_some())
+                && project.is_plug_n_play()
+            {
+                debug!("Project uses Yarn PnP, calling {} with 'yarn'", bin);
+                let platform = Platform::current(session)?;
+                let mut exe_and_args = vec![exe.to_os_string()];
+                exe_and_args.extend_from_slice(args);
+                return Ok(ToolCommand::new("yarn", exe_and_args, platform, ToolKind::Yarn).into());
+            }
             let path_to_bin =
                 project
                     .find_bin(exe)

crates/volta-core/src/project/tests.rs

@@ -121,7 +121,7 @@ fn npm_uninstall_uses_volta_logic() {
         .binary_config("cowthink", &bin_config("cowthink", "cowsay"))
         .shim("cowsay")
         .shim("cowthink")
-        .package_image("cowsay", "1.4.0")
+        .package_image("cowsay", "1.4.0", None)
         .env("VOLTA_LOGLEVEL", "info")
         .build();
 
@@ -141,7 +141,7 @@ fn npm_uninstall_uses_volta_logic() {
     assert!(!Sandbox::bin_config_exists("cowthink"));
     assert!(!Sandbox::shim_exists("cowsay"));
     assert!(!Sandbox::shim_exists("cowthink"));
-    assert!(!Sandbox::package_image_exists("cowsay", "1.4.0"));
+    assert!(!Sandbox::package_image_exists("cowsay"));
 }
 
 #[test]
@@ -153,13 +153,13 @@ fn npm_uninstall_supports_multiples() {
         .binary_config("cowthink", &bin_config("cowthink", "cowsay"))
         .shim("cowsay")
         .shim("cowthink")
-        .package_image("cowsay", "1.4.0")
+        .package_image("cowsay", "1.4.0", None)
         .package_config("typescript", PKG_CONFIG_TYPESCRIPT)
         .binary_config("tsc", &bin_config("tsc", "typescript"))
         .binary_config("tsserver", &bin_config("tsserver", "typescript"))
         .shim("tsc")
         .shim("tsserver")
-        .package_image("typescript", "1.4.0")
+        .package_image("typescript", "1.4.0", None)
         .env("VOLTA_LOGLEVEL", "info")
         .build();
 
@@ -183,14 +183,14 @@ fn npm_uninstall_supports_multiples() {
     assert!(!Sandbox::bin_config_exists("cowthink"));
     assert!(!Sandbox::shim_exists("cowsay"));
     assert!(!Sandbox::shim_exists("cowthink"));
-    assert!(!Sandbox::package_image_exists("cowsay", "1.4.0"));
+    assert!(!Sandbox::package_image_exists("cowsay"));
 
     assert!(!Sandbox::package_config_exists("typescript"));
     assert!(!Sandbox::bin_config_exists("tsc"));
     assert!(!Sandbox::bin_config_exists("tsserver"));
     assert!(!Sandbox::shim_exists("tsc"));
     assert!(!Sandbox::shim_exists("tsserver"));
-    assert!(!Sandbox::package_image_exists("typescript", "1.4.0"));
+    assert!(!Sandbox::package_image_exists("typescript"));
 }
 
 #[test]
@@ -218,7 +218,7 @@ fn yarn_remove_uses_volta_logic() {
         .binary_config("cowthink", &bin_config("cowthink", "cowsay"))
         .shim("cowsay")
         .shim("cowthink")
-        .package_image("cowsay", "1.4.0")
+        .package_image("cowsay", "1.4.0", None)
         .env("VOLTA_LOGLEVEL", "info")
         .build();
 
@@ -238,7 +238,7 @@ fn yarn_remove_uses_volta_logic() {
     assert!(!Sandbox::bin_config_exists("cowthink"));
     assert!(!Sandbox::shim_exists("cowsay"));
     assert!(!Sandbox::shim_exists("cowthink"));
-    assert!(!Sandbox::package_image_exists("cowsay", "1.4.0"));
+    assert!(!Sandbox::package_image_exists("cowsay"));
 }
 
 #[test]
@@ -250,13 +250,13 @@ fn yarn_remove_supports_multiples() {
         .binary_config("cowthink", &bin_config("cowthink", "cowsay"))
         .shim("cowsay")
         .shim("cowthink")
-        .package_image("cowsay", "1.4.0")
+        .package_image("cowsay", "1.4.0", None)
         .package_config("typescript", PKG_CONFIG_TYPESCRIPT)
         .binary_config("tsc", &bin_config("tsc", "typescript"))
         .binary_config("tsserver", &bin_config("tsserver", "typescript"))
         .shim("tsc")
         .shim("tsserver")
-        .package_image("typescript", "1.4.0")
+        .package_image("typescript", "1.4.0", None)
         .env("VOLTA_LOGLEVEL", "info")
         .build();
 
@@ -280,14 +280,14 @@ fn yarn_remove_supports_multiples() {
     assert!(!Sandbox::bin_config_exists("cowthink"));
     assert!(!Sandbox::shim_exists("cowsay"));
     assert!(!Sandbox::shim_exists("cowthink"));
-    assert!(!Sandbox::package_image_exists("cowsay", "1.4.0"));
+    assert!(!Sandbox::package_image_exists("cowsay"));
 
     assert!(!Sandbox::package_config_exists("typescript"));
     assert!(!Sandbox::bin_config_exists("tsc"));
     assert!(!Sandbox::bin_config_exists("tsserver"));
     assert!(!Sandbox::shim_exists("tsc"));
     assert!(!Sandbox::shim_exists("tsserver"));
-    assert!(!Sandbox::package_image_exists("typescript", "1.4.0"));
+    assert!(!Sandbox::package_image_exists("typescript"));
 }
 
 #[test]