fix(@angular/cli): fix package name fetching from package.json

sumitarora · Brocco · commit 9c83f3b3caee · 2017-05-24T17:28:17.000-04:00
diff --git a/packages/@angular/cli/commands/generate.ts b/packages/@angular/cli/commands/generate.ts
@@ -3,6 +3,7 @@ import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
 import { oneLine } from 'common-tags';
+import { CliConfig } from '../models/config';
 
 const Command = require('../ember-cli/lib/models/command');
 const Blueprint = require('../ember-cli/lib/models/blueprint');
@@ -96,12 +97,14 @@ export default Command.extend({
     const blueprint = this.blueprints.find((bp: any) => bp.name === name
                                         || (bp.aliases && bp.aliases.includes(name)));
 
+    const projectName = CliConfig.getValue('project.name');
     const blueprintOptions = {
       target: this.project.root,
       entity: {
         name: rawArgs[1],
         options: parseOptions(rawArgs.slice(2))
       },
+      projectName,
       ui: this.ui,
       project: this.project,
       settings: this.settings,
diff --git a/packages/@angular/cli/ember-cli/lib/models/blueprint.js b/packages/@angular/cli/ember-cli/lib/models/blueprint.js
@@ -848,7 +848,7 @@ Blueprint.prototype._generateFileMapVariables = function(moduleName, locals, opt
   @return {Object}
 */
 Blueprint.prototype._locals = function(options) {
-  var packageName = options.project.name();
+  var packageName = options.project.name() || options.projectName;
   var moduleName = options.entity && options.entity.name || packageName;
   var sanitizedModuleName = moduleName.replace(/\//g, '-');
 
diff --git a/tests/e2e/tests/generate/generate-name-check.ts b/tests/e2e/tests/generate/generate-name-check.ts
@@ -0,0 +1,24 @@
+import {join} from 'path';
+import {ng} from '../../utils/process';
+import {expectFileToExist} from '../../utils/fs';
+import {updateJsonFile} from '../../utils/project';
+
+
+export default function() {
+  const compDir = join('src', 'app', 'test-component');
+
+  return Promise.resolve()
+    .then(() => updateJsonFile('package.json', configJson => {
+      delete configJson.name;
+      return configJson;
+    }))
+    .then(() => ng('generate', 'component', 'test-component'))
+    .then(() => expectFileToExist(compDir))
+    .then(() => expectFileToExist(join(compDir, 'test-component.component.ts')))
+    .then(() => expectFileToExist(join(compDir, 'test-component.component.spec.ts')))
+    .then(() => expectFileToExist(join(compDir, 'test-component.component.html')))
+    .then(() => expectFileToExist(join(compDir, 'test-component.component.css')))
+
+    // Try to run the unit tests.
+    .then(() => ng('test', '--single-run'));
+}
