From 065520dbf871cea15a3c9c8e9bc9ec7d352ed7cd Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 24 Sep 2019 09:33:11 -0400
Subject: [PATCH] Move node_modules/pacote to
 node_modules/npm/node_modules/pacote.

---
 scripts/generate-dev-bundle.ps1 | 3 ++-
 scripts/generate-dev-bundle.sh  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 1bc4075a6f..bff9d37c40 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -330,7 +330,7 @@ Function Add-NpmModulesFromJsBundleFile {
   if ((Test-Path "@babel\runtime\helpers") -And
       !(Test-Path "@babel\runtime\helpers\builtin")) {
     cd @babel\runtime\helpers
-    & "$($Commands.node)" -e 'require("fs").symlinkSync(".", "builtin", "junction")'
+    & "$($Commands.node)" -e "require('fs').symlinkSync('.', 'builtin', 'junction')"
     cd ..\..\..
   }
 
@@ -338,6 +338,7 @@ Function Add-NpmModulesFromJsBundleFile {
   # we need to remove npm's bundled version to make it use the new one.
   if (Test-Path "pacote") {
     Remove-DirectoryRecursively "npm\node_modules\pacote"
+    & "$($Commands.node)" -e "require('fs').renameSync('pacote', 'npm\\node_modules\\pacote')"
   }
 
   cd "$previousCwd"
diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index 57db624c73..ccd5c60c1f 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -175,6 +175,7 @@ delete () {
 if [ -d "pacote" ]
 then
     delete npm/node_modules/pacote
+    mv pacote npm/node_modules/
 fi
 
 delete sqlite3/deps