Merge branch 'master' of https://github.com/yeoman/generator-angular into add-decorator-generator

Author: robinboehm

app/index.js

@@ -14,7 +14,7 @@ var Generator = module.exports = function Generator(args, options) {
 
   if (typeof this.env.options.appPath === 'undefined') {
     try {
-      this.env.options.appPath = require(path.join(process.cwd(), 'component.json')).appPath;
+      this.env.options.appPath = require(path.join(process.cwd(), 'bower.json')).appPath;
     } catch (e) {}
     this.env.options.appPath = this.env.options.appPath || 'app';
   }
@@ -103,17 +103,17 @@ Generator.prototype.askForModules = function askForModules() {
     name: 'resourceModule',
     message: 'Would you like to include angular-resource.js?',
     default: 'Y/n',
-    warning: 'Yes: angular-resource added to component.json'
+    warning: 'Yes: angular-resource added to bower.json'
   }, {
     name: 'cookiesModule',
     message: 'Would you like to include angular-cookies.js?',
     default: 'Y/n',
-    warning: 'Yes: angular-cookies added to component.json'
+    warning: 'Yes: angular-cookies added to bower.json'
   }, {
     name: 'sanitizeModule',
     message: 'Would you like to include angular-sanitize.js?',
     default: 'Y/n',
-    warning: 'Yes: angular-sanitize added to component.json'
+    warning: 'Yes: angular-sanitize added to bower.json'
   }];
 
   this.prompt(prompts, function (err, props) {
@@ -159,7 +159,7 @@ Generator.prototype.createIndexHtml = function createIndexHtml() {
 };
 
 Generator.prototype.packageFiles = function () {
-  this.template('../../templates/common/component.json', 'component.json');
+  this.template('../../templates/common/bower.json', 'bower.json');
   this.template('../../templates/common/package.json', 'package.json');
   this.template('../../templates/common/Gruntfile.js', 'Gruntfile.js');
 };

readme.md

@@ -238,7 +238,7 @@ All of these can be updated with `bower update` as new versions of AngularJS are
 Yeoman generated projects can be further tweaked according to your needs by modifying project files appropriately.
 
 ### Output
-You can change the `app` directory by adding a `appPath` property to `component.json`. For instance, if you wanted to easily integrate with Express.js, you could add the following:
+You can change the `app` directory by adding a `appPath` property to `bower.json`. For instance, if you wanted to easily integrate with Express.js, you could add the following:
 
 ```json
 {
@@ -254,7 +254,7 @@ This will cause Yeoman-generated client-side files to be placed in `public`.
 ## Testing
 
 For tests to work properly, karma needs the `angular-mocks` bower package.
-This script is included in the component.json in the `devDependencies` section, which will
+This script is included in the bower.json in the `devDependencies` section, which will
 be available very soon, probably with the next minor release of bower.
 
 While bower `devDependencies` are not yet implemented, you can fix it by running:

script-base.js

@@ -10,21 +10,21 @@ function Generator() {
   yeoman.generators.NamedBase.apply(this, arguments);
 
   try {
-    this.appname = require(path.join(process.cwd(), 'component.json')).name;
+    this.appname = require(path.join(process.cwd(), 'bower.json')).name;
   } catch (e) {
     this.appname = path.basename(process.cwd());
   }
 
   if (typeof this.env.options.appPath === 'undefined') {
     try {
-      this.env.options.appPath = require(path.join(process.cwd(), 'component.json')).appPath;
+      this.env.options.appPath = require(path.join(process.cwd(), 'bower.json')).appPath;
     } catch (e) {}
     this.env.options.appPath = this.env.options.appPath || 'app';
   }
 
   if (typeof this.env.options.testPath === 'undefined') {
     try {
-      this.env.options.testPath = require(path.join(process.cwd(), 'component.json')).testPath;
+      this.env.options.testPath = require(path.join(process.cwd(), 'bower.json')).testPath;
     } catch (e) {}
     this.env.options.testPath = this.env.options.testPath || 'test/spec';
   }

templates/common/Gruntfile.js

@@ -15,7 +15,7 @@ module.exports = function (grunt) {
   };
 
   try {
-    yeomanConfig.app = require('./component.json').appPath || yeomanConfig.app;
+    yeomanConfig.app = require('./bower.json').appPath || yeomanConfig.app;
   } catch (e) {}
 
   grunt.initConfig({

templates/common/component.json templates/common/bower.jsontemplates/common/component.json renamed to templates/common/bower.json

@@ -50,7 +50,7 @@ describe('Angular generator', function () {
                     ['.bowerrc', /"directory": "app\/components"/],
                     'Gruntfile.js',
                     'package.json',
-                    ['component.json', /"name":\s+"temp"/],
+                    ['bower.json', /"name":\s+"temp"/],
                     'app/scripts/app.js',
                     'app/index.html',
                     'app/scripts/controllers/main.js',
@@ -74,7 +74,7 @@ describe('Angular generator', function () {
                     ['.bowerrc', /"directory": "app\/components"/],
                     'Gruntfile.js',
                     'package.json',
-                    ['component.json', /"name":\s+"temp"/],
+                    ['bower.json', /"name":\s+"temp"/],
                     'app/scripts/app.coffee',
                     'app/index.html',
                     'app/scripts/controllers/main.coffee',

test/test-file-creation.js

@@ -12,7 +12,7 @@ function Generator() {
 
   if (typeof this.env.options.appPath === 'undefined') {
     try {
-      this.env.options.appPath = require(path.join(process.cwd(), 'component.json')).appPath;
+      this.env.options.appPath = require(path.join(process.cwd(), 'bower.json')).appPath;
     } catch (e) {}
     this.env.options.appPath = this.env.options.appPath || 'app';
   }