Merge pull request #21140 from mvdbeek/fix_make_client

[25.1] Use corepack to link yarn into $VIRTUALENV/bin

Author: mvdbeek

Makefile

@@ -180,13 +180,13 @@ skip-client: ## Run only the server, skipping the client build.
 
 node-deps: ## Install NodeJS dependencies.
 ifndef YARN
-	npm install -g yarn;
+	corepack enable yarn;
 endif
 	$(IN_VENV) yarn install $(YARN_INSTALL_OPTS)
 
 client-node-deps: ## Install NodeJS dependencies for the client.
 ifndef YARN
-	npm install -g yarn;
+	corepack enable yarn;
 endif
 	$(IN_VENV) cd client && yarn install $(YARN_INSTALL_OPTS)
 

scripts/common_startup.sh

@@ -238,8 +238,8 @@ if [ $SKIP_CLIENT_BUILD -eq 0 ]; then
             echo "Installing yarn into '$CONDA_DEFAULT_ENV' Conda environment with conda."
             $CONDA_EXE install --yes --override-channels --channel conda-forge --name "$CONDA_DEFAULT_ENV" 'yarn<2'
         elif [ -n "$VIRTUAL_ENV" ] && in_venv "$(command -v npm)"; then
-            echo "Installing yarn into $VIRTUAL_ENV with npm."
-            npm install --global yarn
+            echo "Installing yarn into $VIRTUAL_ENV with corepack."
+            corepack enable yarn
         else
             echo "Installing yarn locally with npm."
             npm install yarn