From 056df36a8fea428cf8eb80104229ae85f9b197ef Mon Sep 17 00:00:00 2001 From: Evan Morikawa Date: Tue, 17 May 2016 09:32:35 -0700 Subject: [PATCH] fix(bootstrap): properly dedupe all node modules --- script/bootstrap | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/script/bootstrap b/script/bootstrap index 8483a3cb2..c1d54a325 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -31,7 +31,7 @@ function executeCommands(commands, done, index) { function printArgs(args) { out = ""; for(key in args) { - out += "--"+key+"="+args[key]+" "; + out += "--"+key+"="+JSON.stringify(args[key])+" "; } return out; } @@ -65,8 +65,6 @@ function bootstrap() { var gruntPath = '"' + path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'grunt') + '"'; - var packagesToDedupe = ['fs-plus', 'humanize-plus', 'roaster', 'season', 'grim']; - // use the system version of npm to install build folder dependencies, including our // own copy of NPM 3.x, which we'll use for subsequent commands var buildInstallCommand = 'npm' + npmFlags + 'install'; @@ -140,7 +138,7 @@ function bootstrap() { m4 += " $ "+apmInstallCommand+"\n" m5 = "\n\n---> De-duping packages `apm dedupe`\n\n" - m5 += " $ "+apmDedupeCommand+" "+packagesToDedupe.join(' ')+"\n" + m5 += " $ "+apmDedupeCommand+"\n" m6 = "\n\n---> Request version `apm dedupe`\n\n" m6 += " $ "+apmDedupeCommand+" request semver "+printArgs(semverOptions)+"\n" @@ -217,7 +215,7 @@ function bootstrap() { message: m4 }, { - command: apmDedupeCommand + ' ' + packagesToDedupe.join(' '), + command: apmDedupeCommand, options: { env: apmEnv }, message: m5 },