Skip to content

Commit

Permalink
feat(@angular/cli): add warning when angular-cli is detected locally
Browse files Browse the repository at this point in the history
Closes #4466
  • Loading branch information
beeman authored and hansl committed Feb 23, 2017
1 parent d4b56e4 commit ae89fde
Showing 1 changed file with 27 additions and 0 deletions.
27 changes: 27 additions & 0 deletions packages/@angular/cli/bin/ng
Expand Up @@ -8,6 +8,7 @@ const CliConfig = require('../models/config').CliConfig;
const Version = require('../upgrade/version').Version;

const fs = require('fs');
const findUp = require('../utilities/find-up').findUp;
const packageJson = require('../package.json');
const path = require('path');
const resolve = require('resolve');
Expand Down Expand Up @@ -87,6 +88,32 @@ if (require('../package.json')['name'] == 'angular-cli'
`));
}

const packageJsonProjectPath = findUp('package.json', process.cwd(), true);
if (packageJsonProjectPath && fs.existsSync(packageJsonProjectPath)) {
const packageJsonProject = require(packageJsonProjectPath);
const hasOldDep = !!packageJsonProject.dependencies['angular-cli'];
const hasOldDevDep = !!packageJsonProject.devDependencies['angular-cli'];
const hasDevDep = !!packageJsonProject.devDependencies['@angular/cli'];

if (hasOldDep || hasOldDevDep || !hasDevDep) {
const warnings = [
'The package "angular-cli" has been renamed to "@angular/cli". The old package will be '
+ 'deprecated soon.',
'',
'Please take the following steps to avoid issues:'
];
if (hasOldDep) {
warnings.push('"npm uninstall --save angular-cli"');
}
if (hasOldDevDep) {
warnings.push('"npm uninstall --save-dev angular-cli"');
}
if (!hasDevDep) {
warnings.push('"npm install --save-dev @angular/cli@latest"');
}
process.stderr.write(yellow(warnings.join('\n'), '\n\n'));
}
}

resolve('@angular/cli', { basedir: process.cwd() },
function (error, projectLocalCli) {
Expand Down

0 comments on commit ae89fde

Please sign in to comment.