Merge branch 'master' of github.com:angular-fullstack/generator-angular-fullstack into canary

# Conflicts:
#	package.json
#	src/generators/app/index.js
#	templates/app/_package.json
#	templates/app/gulpfile.babel(gulp).js
#	templates/app/server/config/environment/production.js

Author: Awk34

Diff for: CHANGELOG.md

@@ -1,3 +1,14 @@
+<a name="3.7.6"></a>
+## [3.7.6](https://github.com/angular-fullstack/generator-angular-fullstack/compare/3.7.5...v3.7.6) (2016-06-21)
+
+
+### Notable Changes
+
+* Add deprecation warning about Grunt
+* Bumped a few generator dependencies
+
+
+
 <a name="3.7.5"></a>
 ## [3.7.5](https://github.com/angular-fullstack/generator-angular-fullstack/compare/3.7.4...v3.7.5) (2016-06-02)
 

Diff for: docs/generators/app.md

@@ -11,6 +11,9 @@ Options:
         --skip-cache    # Do not remember prompt answers                        Default: false
         --skip-install  # Do not install dependencies                           Default: false
         --app-suffix    # Allow a custom suffix to be added to the module name  Default: App
+        --dev-port      # Port to use for the development HTTP server           Default: 9000
+        --debug-port    # Port to use for the server debugger                   Default: 5858
+        --prod-port     # Port to use for the production HTTP Server            Default: 8080
 
 Arguments:
   name    Type: String  Required: false

Diff for: docs/index.md

@@ -110,7 +110,7 @@ Overview
     ├── client
     │   ├── app                 - All of our app specific components go in here
     │   ├── assets              - Custom assets: fonts, images, etc…
-    │   ├── components          - Our reusable components, non-specific to to our app
+    │   ├── components          - Our reusable components, non-specific to our app
     │
     ├── e2e                     - Our protractor end to end tests
     │

Diff for: package.json

@@ -67,7 +67,7 @@
     "grunt-david": "~0.7.0",
     "grunt-env": "^0.4.1",
     "grunt-mocha-test": "^0.12.7",
-    "grunt-release": "^0.13.0",
+    "grunt-release": "^0.14.0",
     "gulp": "^3.9.1",
     "gulp-if": "^2.0.1",
     "gulp-mocha": "^2.2.0",
@@ -76,13 +76,13 @@
     "jit-grunt": "~0.10.0",
     "lazypipe": "^1.0.1",
     "merge-stream": "^1.0.0",
-    "minimatch": "^3.0.0",
+    "minimatch": "^3.0.2",
     "mocha": "^2.5.2",
     "q": "^1.0.1",
     "recursive-readdir": "^2.0.0",
     "run-sequence": "^1.2.1",
     "shelljs": "^0.7.0",
-    "should": "^9.0.0",
+    "should": "^9.0.2",
     "yeoman-assert": "^2.0.0",
     "yeoman-test": "~1.4.0"
   },

Diff for: readme.md

@@ -19,6 +19,8 @@ Install `yo`, `grunt-cli`/`gulp-cli`, `bower`, and `generator-angular-fullstack`
 npm install -g yo grunt-cli gulp-cli bower generator-angular-fullstack
 ```
 
+> To install the latest 4.0.0 Beta with Webpack support, use `generator-angular-fullstack@beta`
+
 Make a new directory, and `cd` into it:
 ```
 mkdir my-new-project && cd $_
@@ -40,7 +42,7 @@ Run `grunt`/`gulp build` for building, `grunt serve`/`gulp serve` for developmen
 
 **General**
 
-* Build Systems: `Grunt`, `Gulp`
+* Build Systems: `Grunt` (deprecated, will be removed in 4.0.0), `Gulp`
 * Testing: 
   * `Jasmine`
   * `Mocha + Chai + Sinon`

Diff for: src/generators/app/index.js

@@ -38,6 +38,24 @@ export class Generator extends Base {
       type: String,
       defaults: 'App'
     });
+
+    this.option('dev-port', {
+      desc: 'Port to use for the development HTTP server',
+      type: String,
+      defaults: '9000'
+    });
+
+    this.option('debug-port', {
+      desc: 'Port to use for the server debugger',
+      type: String,
+      defaults: '5858'
+    });
+
+    this.option('prod-port', {
+      desc: 'Port to use for the production HTTP Server',
+      type: String,
+      defaults: '8080'
+    });
   }
 
   get initializing() {
@@ -308,9 +326,12 @@ export class Generator extends Base {
           type: 'list',
           name: 'buildtool',
           message: 'Would you like to use Gulp or Grunt?',
-          choices: ['Grunt', 'Gulp'],
-          default: 1,
-          filter: val => val.toLowerCase()
+          choices: ['Gulp', 'Grunt (deprecated)'],
+          default: 0,
+          filter: val => ({
+            'Gulp': 'gulp',
+            'Grunt (deprecated)': 'grunt'
+          })[val]
         }, {
           type: 'list',
           name: 'testing',

Diff for: templates/app/Gruntfile(grunt).js

@@ -36,7 +36,7 @@ module.exports = function(grunt) {
     },
     express: {
       options: {
-        port: process.env.PORT || 9000
+        port: process.env.PORT || <%= devPort %>
       },
       dev: {
         options: {
@@ -239,7 +239,7 @@ module.exports = function(grunt) {
         options: {
           nodeArgs: ['--debug-brk'],
           env: {
-            PORT: process.env.PORT || 9000
+            PORT: process.env.PORT || <%= devPort %>
           },
           callback: function(nodemon) {
             nodemon.on('log', function(event) {
@@ -249,7 +249,7 @@ module.exports = function(grunt) {
             // opens browser on initial server start
             nodemon.on('config:update', function() {
               setTimeout(function() {
-                require('open')('http://localhost:8080/debug?port=5858');
+                require('open')('http://localhost:<%= devPort %>/debug?port=<%= debugPort %>');
               }, 500);
             });
           }

Diff for: templates/app/_package.json

@@ -38,7 +38,7 @@
     "ejs": "^2.3.3",<% } %><% if(filters.mongoose) { %>
     "mongoose": "^4.1.2",
     "bluebird": "^3.3.3",
-    "connect-mongo": "^1.1.0",<% } %><% if(filters.sequelize) { %>
+    "connect-mongo": "^1.2.1",<% } %><% if(filters.sequelize) { %>
     "sequelize": "^3.5.1",
     "sqlite3": "~3.1.1",
     "express-sequelize-session": "0.4.0",<% } %><% if(filters.auth) { %>
@@ -76,7 +76,7 @@
     "del": "^2.0.2",
     "gulp": "^3.9.1",
     "gulp-add-src": "^0.2.0",
-    "gulp-angular-templatecache": "^1.7.0",
+    "gulp-angular-templatecache": "^2.0.0",
     "gulp-autoprefixer": "^3.1.0",
     "gulp-babel": "^6.1.2",<% if(filters.ts) { %>
     "gulp-typescript": "~2.13.0",

Diff for: templates/app/gulpfile.babel(gulp).js

@@ -353,13 +353,15 @@ gulp.task('start:server:prod', () => {
 
 gulp.task('start:inspector', () => {
     gulp.src([])
-        .pipe(plugins.nodeInspector());
+        .pipe(plugins.nodeInspector({
+          debugPort: <%= debugPort %>
+        }));
 });
 
 gulp.task('start:server:debug', () => {
     process.env.NODE_ENV = process.env.NODE_ENV || 'development';
-        config = require(`./${serverPath}/config/environment`);
-    nodemon(`-w ${serverPath} --debug-brk ${serverPath}`)
+    config = require(`./${serverPath}/config/environment`);
+    nodemon(`-w ${serverPath} --debug=<%= debugPort %> --debug-brk ${serverPath}`)
         .on('log', onServerLog);
 });
 

Diff for: templates/app/karma.conf.js

@@ -67,7 +67,7 @@ module.exports = function(config) {
     exclude: [],
 
     // web server port
-    port: 8080,
+    port: <%= devPort %>,
 
     // level of logging
     // possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG

Diff for: templates/app/protractor.conf.js

@@ -10,7 +10,7 @@ var config = {
 
   // A base URL for your application under test. Calls to protractor.get()
   // with relative paths will be prepended with this.
-  baseUrl: 'http://localhost:' + (process.env.PORT || '9000'),
+  baseUrl: 'http://localhost:' + (process.env.PORT || '<%= devPort %>'),
 
   // Credientials for Saucelabs
   sauceUser: process.env.SAUCE_USERNAME,

Diff for: templates/app/server/config/_local.env.js

@@ -6,7 +6,7 @@
 // You will need to set these on the server you deploy to.
 
 module.exports = {
-  DOMAIN: 'http://localhost:9000',
+  DOMAIN: 'http://localhost:<%= devPort %>',
   SESSION_SECRET: '<%= lodash.slugify(appname) + "-secret" %>',<% if (filters.facebookAuth) { %>
 
   FACEBOOK_ID: 'app-id',

Diff for: templates/app/server/config/_local.env.sample.js

@@ -6,7 +6,7 @@
 // You will need to set these on the server you deploy to.
 
 module.exports = {
-  DOMAIN:           'http://localhost:9000',
+  DOMAIN:           'http://localhost:<%= devPort %>',
   SESSION_SECRET:   '<%= lodash.slugify(appname) + "-secret" %>',<% if (filters.facebookAuth) { %>
 
   FACEBOOK_ID:      'app-id',

Diff for: templates/app/server/config/environment/index.js

@@ -20,7 +20,7 @@ var all = {
   root: path.normalize(`${__dirname}/../../..`),
 
   // Server port
-  port: process.env.PORT || 9000,
+  port: process.env.PORT || <%= devPort %>,
 
   // Server IP
   ip: process.env.IP || '0.0.0.0',

Diff for: templates/app/server/config/environment/production.js

@@ -12,7 +12,7 @@ module.exports = {
   // Server port
   port: process.env.OPENSHIFT_NODEJS_PORT
     || process.env.port
-    || 8080<% if (filters.mongoose) { %>,
+    || <%= prodPort %><% if(filters.mongoose) { %>,
 
   // MongoDB connection options
   mongo: {