From cc482619eef5c71f42c1dd74d97a60770dcf687e Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Mon, 26 Feb 2024 15:57:31 +0100
Subject: [PATCH 1/4] build: enable `yarn` and `pnpm` Corepack binaries by
 default

---
 tools/install.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tools/install.py b/tools/install.py
index 196bfdf86045b4..3286cbd03c508b 100755
--- a/tools/install.py
+++ b/tools/install.py
@@ -116,11 +116,10 @@ def npm_files(options, action):
 def corepack_files(options, action):
   package_files(options, action, 'corepack', {
     'corepack': 'dist/corepack.js',
-#   Not the default just yet:
-#   'yarn': 'dist/yarn.js',
-#   'yarnpkg': 'dist/yarn.js',
-#   'pnpm': 'dist/pnpm.js',
-#   'pnpx': 'dist/pnpx.js',
+    'yarn': 'dist/yarn.js',
+    'yarnpkg': 'dist/yarn.js',
+    'pnpm': 'dist/pnpm.js',
+    'pnpx': 'dist/pnpx.js',
   })
 
   # On z/OS, we install node-gyp for convenience, as some vendors don't have

From 098a04051fa27001a43148bac0adf77a3b847223 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Mon, 26 Feb 2024 20:57:13 +0100
Subject: [PATCH 2/4] update windows installer files

---
 tools/msvs/msi/nodemsi/i18n/en-us.wxl |  8 +++++--
 tools/msvs/msi/nodemsi/product.wxs    | 32 +++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/tools/msvs/msi/nodemsi/i18n/en-us.wxl b/tools/msvs/msi/nodemsi/i18n/en-us.wxl
index 5074d5a43125f7..6c2be4ef857aa8 100644
--- a/tools/msvs/msi/nodemsi/i18n/en-us.wxl
+++ b/tools/msvs/msi/nodemsi/i18n/en-us.wxl
@@ -20,10 +20,14 @@
     <String Id="NodeRuntime_Description" Value="Install the core [ProductName] runtime (node.exe)."/>
 
     <String Id="npm_Title" Value="npm package manager"/>
-    <String Id="npm_Description" Value="Install npm, the recommended package manager for [ProductName]."/>
+    <String Id="npm_Description" Value="Install npm, a package manager for [ProductName]."/>
 
-    <String Id="corepack_Title" Value="corepack manager"/>
+    <String Id="corepack_Title" Value="Corepack manager"/>
     <String Id="corepack_Description" Value="Install corepack, the universal package manager for [ProductName]."/>
+    <String Id="corepack_pnpm_Title" Value="pnpm package manager"/>
+    <String Id="corepack_pnpm_Description" Value="Install pnpm, a package manager for [ProductName], distributed by Corepack."/>
+    <String Id="corepack_yarn_Title" Value="Yarn package manager"/>
+    <String Id="corepack_yarn_Description" Value="Install Yarn, a package manager for [ProductName], distributed by Corepack."/>
 
     <String Id="DocumentationShortcuts_Title" Value="Online documentation shortcuts"/>
     <String Id="DocumentationShortcuts_Description" Value="Add start menu entries that link the online documentation for [ProductName] [FullVersion] and the [ProductName] website."/>
diff --git a/tools/msvs/msi/nodemsi/product.wxs b/tools/msvs/msi/nodemsi/product.wxs
index 991b8176554f0a..3bc120845149a9 100644
--- a/tools/msvs/msi/nodemsi/product.wxs
+++ b/tools/msvs/msi/nodemsi/product.wxs
@@ -82,6 +82,22 @@
       <ComponentGroupRef Id="CorepackSourceFiles"/>
     </Feature>
 
+    <Feature Id="corepack_pnpm"
+             Level="1"
+             Title="!(loc.corepack_pnpm_Title)"
+             Description="!(loc.corepack_pnpm_Description)">
+      <ComponentRef Id="CorepackpnpmCmdScript"/>
+      <ComponentRef Id="CorepackpnpmBashScript"/>
+    </Feature>
+
+    <Feature Id="corepack_yarn"
+             Level="1"
+             Title="!(loc.corepack_yarn_Title)"
+             Description="!(loc.corepack_yarn_Description)">
+      <ComponentRef Id="CorepackYarnCmdScript"/>
+      <ComponentRef Id="CorepackYarnBashScript"/>
+    </Feature>
+
     <Feature Id="npm"
              Level="1"
              Title="!(loc.npm_Title)"
@@ -216,6 +232,22 @@
         <File Id="corepack.sh" KeyPath="yes" Source="$(var.CorepackSourceDir)\shims\nodewin\corepack"/>
       </Component>
 
+      <Component Id="CorepackPnpmCmdScript">
+        <File Id="corepack.cmd" KeyPath="yes" Source="$(var.CorepackSourceDir)\shims\nodewin\pnpm.cmd"/>
+      </Component>
+
+      <Component Id="CorepackPnpmBashScript">
+        <File Id="corepack.sh" KeyPath="yes" Source="$(var.CorepackSourceDir)\shims\nodewin\pnpm"/>
+      </Component>
+
+      <Component Id="CorepackYarnCmdScript">
+        <File Id="corepack.cmd" KeyPath="yes" Source="$(var.CorepackSourceDir)\shims\nodewin\yarn.cmd"/>
+      </Component>
+
+      <Component Id="CorepackYarnBashScript">
+        <File Id="corepack.sh" KeyPath="yes" Source="$(var.CorepackSourceDir)\shims\nodewin\yarn"/>
+      </Component>
+
       <Component Id="NpmCmdScript">
         <File Id="npm.cmd" KeyPath="yes" Source="$(var.NpmSourceDir)\bin\npm.cmd"/>
       </Component>

From 4f17420ab0699b9ed7adae7a785249b8c861964d Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Sun, 3 Mar 2024 15:25:08 +0100
Subject: [PATCH 3/4] update `corepack.md`

---
 doc/api/corepack.md | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/doc/api/corepack.md b/doc/api/corepack.md
index b9c3ddca09c78c..89e1215f3f46df 100644
--- a/doc/api/corepack.md
+++ b/doc/api/corepack.md
@@ -30,18 +30,6 @@ This feature simplifies two core workflows:
 
 ## Workflows
 
-### Enabling the feature
-
-Due to its experimental status, Corepack currently needs to be explicitly
-enabled to have any effect. To do that, run [`corepack enable`][], which
-will set up the symlinks in your environment next to the `node` binary
-(and overwrite the existing symlinks if necessary).
-
-From this point forward, any call to the [supported binaries][] will work
-without further setup. Should you experience a problem, run
-[`corepack disable`][] to remove the proxies from your system (and consider
-opening an issue on the [Corepack repository][] to let us know).
-
 ### Configuring a package
 
 The Corepack proxies will find the closest [`package.json`][] file in your

From ebf34fa99c452fb8f5a9cd391072efb28a08d7e1 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Sun, 3 Mar 2024 15:52:24 +0100
Subject: [PATCH 4/4] lint

---
 doc/api/corepack.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/doc/api/corepack.md b/doc/api/corepack.md
index 89e1215f3f46df..63927bd5862e7f 100644
--- a/doc/api/corepack.md
+++ b/doc/api/corepack.md
@@ -118,13 +118,11 @@ install. To avoid this problem, consider one of the following options:
 [Corepack repository]: https://github.com/nodejs/corepack
 [Yarn]: https://yarnpkg.com
 [`"packageManager"`]: packages.md#packagemanager
-[`corepack disable`]: https://github.com/nodejs/corepack#corepack-disable--name
 [`corepack enable`]: https://github.com/nodejs/corepack#corepack-enable--name
 [`corepack install`]: https://github.com/nodejs/corepack#corepack-install--g--global---all--nameversion
 [`corepack pack`]: https://github.com/nodejs/corepack#corepack-pack---all--nameversion
 [`corepack use`]: https://github.com/nodejs/corepack#corepack-use-nameversion
 [`package.json`]: packages.md#nodejs-packagejson-field-definitions
 [pnpm]: https://pnpm.js.org
-[supported binaries]: #supported-package-managers
 [supported package manager]: #supported-package-managers
 [various flags]: https://github.com/nodejs/corepack#utility-commands