Merge pull request #1670 from rytmis/feature/yarnpkg-shim

feat: support yarnpkg as an alias for yarn

Author: chriskrycho

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

@@ -96,7 +96,7 @@ fn get_executor(
                     binary::command(exe, args, session)
                 }
             }
-            Some("yarn") => yarn::command(args, session),
+            Some("yarn") | Some("yarnpkg") => yarn::command(args, session),
             _ => binary::command(exe, args, session),
         }
     }

crates/volta-core/src/shim.rs

@@ -36,6 +36,7 @@ fn get_shim_list_deduped(dir: &Path) -> Fallible<HashSet<String>> {
         shims.insert("npx".into());
         shims.insert("pnpm".into());
         shims.insert("yarn".into());
+        shims.insert("yarnpkg".into());
         Ok(shims)
     }
 

dev/unix/install.sh.in

@@ -92,6 +92,7 @@ volta_create_binaries() {
   ln -s "${INSTALL_DIR}"/shim "${INSTALL_DIR}"/bin/npm
   ln -s "${INSTALL_DIR}"/shim "${INSTALL_DIR}"/bin/npx
   ln -s "${INSTALL_DIR}"/shim "${INSTALL_DIR}"/bin/yarn
+  ln -s "${INSTALL_DIR}"/shim "${INSTALL_DIR}"/bin/yarnpkg
 
   chmod 755 "${INSTALL_DIR}/"/volta "${INSTALL_DIR}/bin"/* "${INSTALL_DIR}"/shim
 }

dev/unix/volta-install-legacy.sh

@@ -74,7 +74,7 @@ create_symlinks() {
   local install_dir="$1"
 
   info 'Creating' "symlinks and shims"
-  local main_shims=( node npm npx yarn )
+  local main_shims=( node npm npx yarn yarnpkg )
   local shim_exec="$install_dir/shim"
   local main_exec="$install_dir/volta"
 

tests/acceptance/volta_run.rs

@@ -370,6 +370,12 @@ fn command_line_yarn_1() {
             .with_status(ExitCode::Success as i32)
             .with_stderr_contains("[..]Yarn: 1.7.71 from command-line configuration")
     );
+    assert_that!(
+        s.volta("run --node 10.99.1040 --yarn 1.7.71 yarnpkg --version"),
+        execs()
+            .with_status(ExitCode::Success as i32)
+            .with_stderr_contains("[..]Yarn: 1.7.71 from command-line configuration")
+    );
 }
 
 #[test]

wix/main.wxs

@@ -170,6 +170,22 @@
                     Source='wix\shim.cmd'
                     KeyPath='yes'/>
             </Component>
+            <Component Id='yarnPkgBinary' Guid='*' Win64='$(var.Win64)'>
+                <File
+                    Id='yarnpgkEXE'
+                    Name='yarnpkg.exe'
+                    DiskId='1'
+                    Source='target\release\volta-shim.exe'
+                    KeyPath='yes'/>
+            </Component>
+            <Component Id='yarnPkgScript' Guid='*' Win64='$(var.Win64)'>
+                <File
+                    Id='yarnpkgCMD'
+                    Name='yarnpkg.cmd'
+                    DiskId='1'
+                    Source='wix\shim.cmd'
+                    KeyPath='yes'/>
+            </Component>
         </ComponentGroup>
 
         <Feature Id='MainProgram'>