From 2deeddc27ca85ead5abba7857f44ba8874fe4500 Mon Sep 17 00:00:00 2001
From: Luke Karrys <luke@lukekarrys.com>
Date: Fri, 23 Jun 2023 16:54:26 -0700
Subject: [PATCH] tools: install npm PowerShell scripts on Windows

npm 9.8.0 added PowerShell scripts that should be installed alongside
the cmd and shell scripts on Windows.

Closes: https://github.com/nodejs/node/issues/48471
Ref: https://github.com/npm/cli/pull/6548
---
 tools/msvs/msi/nodemsi/product.wxs | 10 ++++++++++
 vcbuild.bat                        |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/tools/msvs/msi/nodemsi/product.wxs b/tools/msvs/msi/nodemsi/product.wxs
index 991b8176554f0a..ff66ade6816aaa 100644
--- a/tools/msvs/msi/nodemsi/product.wxs
+++ b/tools/msvs/msi/nodemsi/product.wxs
@@ -88,8 +88,10 @@
              Description="!(loc.npm_Description)">
       <ComponentRef Id="NpmCmdScript"/>
       <ComponentRef Id="NpmBashScript"/>
+      <ComponentRef Id="NpmPowerShellScript"/>
       <ComponentRef Id="NpxCmdScript"/>
       <ComponentRef Id="NpxBashScript"/>
+      <ComponentRef Id="NpxPowerShellScript"/>
       <ComponentRef Id="NpmConfigurationFile"/>
       <ComponentRef Id="SetInstallDirPermission" />
       <ComponentGroupRef Id="NpmSourceFiles"/>
@@ -224,6 +226,10 @@
         <File Id="npm.sh" KeyPath="yes" Source="$(var.NpmSourceDir)\bin\npm"/>
       </Component>
 
+      <Component Id="NpmPowerShellScript">
+        <File Id="npm.ps1" KeyPath="yes" Source="$(var.NpmSourceDir)\bin\npm.ps1"/>
+      </Component>
+
       <Component Id="NpxCmdScript">
         <File Id="npx.cmd" KeyPath="yes" Source="$(var.NpmSourceDir)\bin\npx.cmd"/>
       </Component>
@@ -232,6 +238,10 @@
         <File Id="npx.sh" KeyPath="yes" Source="$(var.NpmSourceDir)\bin\npx"/>
       </Component>
 
+      <Component Id="NpxPowerShellScript">
+        <File Id="npx.ps1" KeyPath="yes" Source="$(var.NpmSourceDir)\bin\npx.ps1"/>
+      </Component>
+
       <Directory Id="NodeModulesFolder" Name="node_modules">
         <Directory Id="NpmFolder" Name="npm">
           <Component Id="NpmConfigurationFile">
diff --git a/vcbuild.bat b/vcbuild.bat
index e1607504dcb7ee..122e6b86ecc74f 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -406,6 +406,10 @@ if not defined nonpm (
   if errorlevel 1 echo Cannot copy npx && goto package_error
   copy /Y ..\deps\npm\bin\npx.cmd %TARGET_NAME%\ > nul
   if errorlevel 1 echo Cannot copy npx.cmd && goto package_error
+  copy /Y ..\deps\npm\bin\npm.ps1 %TARGET_NAME%\ > nul
+  if errorlevel 1 echo Cannot copy npm.ps1 && goto package_error
+  copy /Y ..\deps\npm\bin\npx.ps1 %TARGET_NAME%\ > nul
+  if errorlevel 1 echo Cannot copy npx.ps1 && goto package_error
 )
 
 if not defined nocorepack (