From 7b6703213b8b0021029d16d54a01ac39b103e002 Mon Sep 17 00:00:00 2001 From: Mehul Kar Date: Tue, 8 Oct 2024 10:20:39 -0500 Subject: [PATCH 1/2] chore(ci): enable coreppack for npm in integration tests --- turborepo-tests/helpers/setup_package_manager.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/turborepo-tests/helpers/setup_package_manager.sh b/turborepo-tests/helpers/setup_package_manager.sh index a860d4302c379..c2c05741eada5 100755 --- a/turborepo-tests/helpers/setup_package_manager.sh +++ b/turborepo-tests/helpers/setup_package_manager.sh @@ -33,5 +33,11 @@ else COREPACK_INSTALL_DIR_CMD="--install-directory=${COREPACK_INSTALL_DIR}" fi +# If the pkgManager is npm, enable it specially, because `corepack enable` does not enable +# npm by default. +if [[ "$pkgManager" =~ ^npm ]]; then + coorepack enable npm +fi + # Enable corepack so that the packageManager setting in package.json is respected. corepack enable "${COREPACK_INSTALL_DIR_CMD}" From 5af048a4237396e9eab15ebfbfd3b664c828dc38 Mon Sep 17 00:00:00 2001 From: Mehul Kar Date: Tue, 8 Oct 2024 10:27:13 -0500 Subject: [PATCH 2/2] just use the name --- turborepo-tests/helpers/setup_package_manager.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/turborepo-tests/helpers/setup_package_manager.sh b/turborepo-tests/helpers/setup_package_manager.sh index c2c05741eada5..829e67478dc4b 100755 --- a/turborepo-tests/helpers/setup_package_manager.sh +++ b/turborepo-tests/helpers/setup_package_manager.sh @@ -33,11 +33,10 @@ else COREPACK_INSTALL_DIR_CMD="--install-directory=${COREPACK_INSTALL_DIR}" fi -# If the pkgManager is npm, enable it specially, because `corepack enable` does not enable -# npm by default. -if [[ "$pkgManager" =~ ^npm ]]; then - coorepack enable npm -fi +# get just the packageManager name, without the version +# We pass the name to corepack enable so that it will work for npm also. +# `corepack enable` with no specified packageManager does not work for npm. +pkgManagerName="${pkgManager%%@*}" # Enable corepack so that the packageManager setting in package.json is respected. -corepack enable "${COREPACK_INSTALL_DIR_CMD}" +corepack enable $pkgManagerName "${COREPACK_INSTALL_DIR_CMD}"