Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(@angular/cli): fix access to sections of package.json that dont exist #5074

Merged
merged 1 commit into from
Feb 28, 2017
Merged

fix(@angular/cli): fix access to sections of package.json that dont exist #5074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions packages/@angular/cli/bin/ng
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,11 @@ 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'];
const deps = packageJsonProject['dependencies'] || {};
const devDeps = packageJsonProject['devDependencies'] || {};
const hasOldDep = !!deps['angular-cli'];
const hasOldDevDep = !!devDeps['angular-cli'];
const hasDevDep = !!devDeps['@angular/cli'];

if (hasOldDep || hasOldDevDep || !hasDevDep) {
const warnings = [
Expand Down
1 change: 0 additions & 1 deletion packages/@angular/cli/commands/new.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ const NewCommand = Command.extend({
}

validateProjectName(packageName);

commandOptions.name = packageName;
if (commandOptions.dryRun) {
commandOptions.skipGit = true;
Expand Down
4 changes: 2 additions & 2 deletions packages/@angular/cli/commands/version.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ const VersionCommand = Command.extend({
getDependencyVersions: function(pkg: any, prefix: string): any {
const modules: any = {};

Object.keys(pkg.dependencies || {})
.concat(Object.keys(pkg.devDependencies || {}))
Object.keys(pkg['dependencies'] || {})
.concat(Object.keys(pkg['devDependencies'] || {}))
.filter(depName => depName && depName.startsWith(prefix))
.forEach(key => modules[key] = this.getVersion(key));

Expand Down
3 changes: 3 additions & 0 deletions packages/@angular/cli/tasks/eject.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,9 @@ export default Task.extend({

// Add new dependencies based on our dependencies.
const ourPackageJson = require('../package.json');
if (!packageJson['devDependencies']) {
packageJson['devDependencies'] = {};
}
packageJson['devDependencies']['webpack-dev-server']
= ourPackageJson['dependencies']['webpack-dev-server'];

Expand Down
6 changes: 6 additions & 0 deletions tests/e2e/setup/010-build.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ export default function() {
.then(() => Promise.all(Object.keys(packages).map(pkgName => {
return updateJsonFile(join(packages[pkgName].dist, 'package.json'), json => {
Object.keys(packages).forEach(pkgName => {
if (!json['dependencies']) {
json['dependencies'] = {};
}
if (!json['devDependencies']) {
json['devDependencies'] = {};
}
if (json['dependencies'] && pkgName in json['dependencies']) {
json['dependencies'][pkgName] = packages[pkgName].dist;
} else if (json['devDependencies'] && pkgName in json['devDependencies']) {
Expand Down
7 changes: 7 additions & 0 deletions tests/e2e/utils/assets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@ export function createProjectFromAsset(assetName: string) {
.then(() => copyAssets(assetName))
.then(dir => process.chdir(dir))
.then(() => updateJsonFile('package.json', json => {
if (!json['dependencies']) {
json['dependencies'] = {};
}
if (!json['devDependencies']) {
json['devDependencies'] = {};
}

for (const packageName of Object.keys(packages)) {
if (json['dependencies'].hasOwnProperty(packageName)) {
json['dependencies'][packageName] = packages[packageName].dist;
Expand Down