Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/angular/cli/commands/update-impl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
// Check if the current installed CLI version is older than the latest version.
if (await this.checkCLILatestVersion(options.verbose, options.next)) {
this.logger.warn(
'The installed Angular CLI version is older than the latest published version.\n' +
`The installed Angular CLI version is older than the latest ${options.next ? 'pre-release' : 'stable'} version.\n` +
'Installing a temporary version to perform the update.',
);

Expand Down
21 changes: 16 additions & 5 deletions packages/angular/cli/tasks/install-package.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export function installTempPackage(
process.on('exit', () => {
try {
rimraf.sync(tempPath);
} catch {}
} catch { }
});

// setup prefix/global modules path
Expand Down Expand Up @@ -145,19 +145,30 @@ export function runTempPackageBin(
}

function getPackageManagerArguments(packageManager: PackageManager): PackageManagerOptions {
return packageManager === PackageManager.Yarn
? {
switch (packageManager) {
case PackageManager.Yarn:
return {
silent: '--silent',
saveDev: '--dev',
install: 'add',
prefix: '--modules-folder',
noLockfile: '--no-lockfile',
}
: {
};
case PackageManager.Pnpm:
return {
silent: '--silent',
saveDev: '--save-dev',
install: 'add',
prefix: '--prefix',
noLockfile: '--no-lockfile',
};
default:
return {
silent: '--quiet',
saveDev: '--save-dev',
install: 'install',
prefix: '--prefix',
noLockfile: '--no-package-lock',
};
}
}
4 changes: 3 additions & 1 deletion packages/schematics/update/update/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@
"default": "npm",
"enum": [
"npm",
"yarn"
"yarn",
"cnpm",
"pnpm"
]
},
"migrateExternal": {
Expand Down