From b86dfcb7200e16edd0b56b06342027f71bf4b30b Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Tue, 5 Nov 2019 20:50:35 +0100 Subject: [PATCH] refactor(@angular/cli): fix incorrect merge in install package This is to align with current master https://github.com/angular/angular-cli/blob/85b671147ed67d7aa6ceb4b8fe4d26b73fff75ba/packages/angular/cli/tasks/install-package.ts#L90-L100 --- packages/angular/cli/tasks/install-package.ts | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/packages/angular/cli/tasks/install-package.ts b/packages/angular/cli/tasks/install-package.ts index 6d2edc7fc1ec..534205a4830a 100644 --- a/packages/angular/cli/tasks/install-package.ts +++ b/packages/angular/cli/tasks/install-package.ts @@ -78,14 +78,7 @@ export function installTempPackage( // setup prefix/global modules path const packageManagerArgs = getPackageManagerArguments(packageManager); - let tempNodeModules: string; - if (packageManager !== PackageManager.Yarn && process.platform !== 'win32') { - // Global installs on Unix systems go to {prefix}/lib/node_modules. - // Global installs on Windows go to {prefix}/node_modules (that is, no lib folder.) - tempNodeModules = join(tempPath, 'lib', 'node_modules'); - } else { - tempNodeModules = join(tempPath, 'node_modules'); - } + const tempNodeModules = join(tempPath, 'node_modules'); const installArgs: string[] = [ packageManagerArgs.prefix,