add angular new router prompt

app/prompts.json

@@ -131,6 +131,13 @@
         },
         "name": "ngRoute, the official router"
       },
+      {
+        "value": {
+          "key": "new-router",
+          "module": "ngNewRouter"
+        },
+        "name": "Angular 2 new router which is compatible with Angular 1 (experimental)"
+      },
       {
         "value": {
           "key": "none",

app/src/bower.js

@@ -58,6 +58,12 @@ module.exports = function(GulpAngularGenerator) {
       }
     }
 
+    if (this.props.router.key === 'new-router') {
+      bowerOverrides['angular-new-router'] = {
+        main: [ 'dist/router.es5.js' ]
+      };
+    }
+
     if (_.isEmpty(bowerOverrides)) {
       this.bowerOverrides = null;
     } else {

app/src/router.js

@@ -9,20 +9,27 @@ module.exports = function(GulpAngularGenerator) {
   GulpAngularGenerator.prototype.computeRouter = function computeRouter() {
     var routerPartialSrc = 'src/app/main/__' + this.props.ui.key + '.html';
 
-    if (this.props.router.module === 'ngRoute') {
+    if (this.props.router.key === 'angular-route') {
       this.routerHtml = '<div ng-view></div>';
       this.files.push({
         src: 'src/app/_ngroute/__ngroute.' + this.props.jsPreprocessor.srcExtension,
         dest: 'src/app/index.route.' + this.props.jsPreprocessor.extension,
         template: true
       });
-    } else if (this.props.router.module === 'ui.router') {
+    } else if (this.props.router.key === 'ui-router') {
       this.routerHtml = '<div ui-view></div>';
       this.files.push({
         src: 'src/app/_uirouter/__uirouter.' + this.props.jsPreprocessor.srcExtension,
         dest: 'src/app/index.route.' + this.props.jsPreprocessor.extension,
         template: true
       });
+    } else if (this.props.router.key === 'new-router') {
+      this.routerHtml = '<div ng-viewport ng-controller="RouterController"></div>';
+      this.files.push({
+        src: 'src/app/_newrouter/__newrouter.' + this.props.jsPreprocessor.srcExtension,
+        dest: 'src/app/index.route.' + this.props.jsPreprocessor.extension,
+        template: true
+      });
     } else {
       this.routerHtml = this.fs.read(this.templatePath(routerPartialSrc));
       this.routerHtml = this.routerHtml.replace(

app/templates/_bower.json

@@ -26,6 +26,8 @@
     "angular-route": "<%- props.angularVersion %>",
 <% } if (props.router.key === 'ui-router') { -%>
     "angular-ui-router": "~0.2.15",
+<% } if (props.router.key === 'new-router') { -%>
+    "angular-new-router": "~0.5.3",
 <% } if(props.ui.key === 'bootstrap') { -%>
 <%   if(props.cssPreprocessor.extension === 'scss') { -%>
     "bootstrap-sass": "~3.3.4",

app/templates/src/app/_index.module.es6

@@ -1,8 +1,11 @@
 /* global malarkey:false, moment:false */
+
 import config from './index.config';
-<% if (props.router.key !== 'none') { %>
+<% if (props.router.key === 'new-router') { -%>
+import { routerConfig, RouterController } from './index.route';
+<% } else if (props.router.key !== 'none') { -%>
 import routerConfig from './index.route';
-<% } %>
+<% } -%>
 import runBlock from './index.run';
 import MainController from './main/main.controller';
 import GithubContributorService from '../app/components/githubContributor/githubContributor.service';
@@ -14,12 +17,15 @@ angular.module('<%- appName %>', [<%- modulesDependencies %>])
   .constant('malarkey', malarkey)
   .constant('moment', moment)
   .config(config)
-<% if (props.router.key !== 'none') { %>
+<% if (props.router.key !== 'none') { -%>
   .config(routerConfig)
-<% } %>
+<% } -%>
   .run(runBlock)
   .service('githubContributor', GithubContributorService)
   .service('webDevTec', WebDevTecService)
+<% if (props.router.key !== 'none') { -%>
+  .controller('RouterController', RouterController)
+<% } -%>
   .controller('MainController', MainController)
   .directive('acmeNavbar', () => new NavbarDirective())
   .directive('acmeMalarkey', () => new MalarkeyDirective(malarkey));

app/templates/src/app/_index.module.ts

@@ -14,16 +14,23 @@ import { acmeMalarkey } from '../app/components/malarkey/malarkey.directive';
 declare var malarkey: any;
 declare var moment: moment.MomentStatic;
 
-angular.module('<%- appName %>', [<%- modulesDependencies %>])
-  .constant('malarkey', malarkey)
-  .constant('moment', moment)
-  .config(config)
+module <%- appName %> {
+  'use strict';
+
+  angular.module('<%- appName %>', [<%- modulesDependencies %>])
+    .constant('malarkey', malarkey)
+    .constant('moment', moment)
+    .config(config)
 <% if (props.router.key !== 'none') { -%>
-  .config(routerConfig)
+    .config(routerConfig)
+<% } -%>
+    .run(runBlock)
+    .service('githubContributor', GithubContributor)
+    .service('webDevTec', WebDevTecService)
+<% if (props.router.key === 'new-router') { -%>
+    .controller('RouterController', RouterController)
 <% } -%>
-  .run(runBlock)
-  .service('githubContributor', GithubContributor)
-  .service('webDevTec', WebDevTecService)
-  .controller('MainController', MainController)
-  .directive('acmeNavbar', acmeNavbar)
-  .directive('acmeMalarkey', acmeMalarkey);
+    .controller('MainController', MainController)
+    .directive('acmeNavbar', acmeNavbar)
+    .directive('acmeMalarkey', acmeMalarkey);
+}

app/templates/src/app/_newrouter/__newrouter.coffee

@@ -0,0 +1,12 @@
+angular.module '<%- appName %>'
+  .config ($componentLoaderProvider) ->
+    'ngInject'
+    $componentLoaderProvider.setTemplateMapping (name) ->
+      "app/#{ name }/#{ name }.html"
+
+  .controller 'RouterController', ($router) ->
+    'ngInject'
+    $router.config [
+      path: '/'
+      component: 'main'
+    ]

app/templates/src/app/_newrouter/__newrouter.es6

@@ -0,0 +1,15 @@
+export function routerConfig($componentLoaderProvider) {
+  'ngInject';
+  $componentLoaderProvider.setTemplateMapping(function(name) {
+    return `app/${ name }/${ name }.html`;
+  });
+}
+
+export class RouterController {
+  constructor($router) {
+    'ngInject';
+    $router.config([
+      { path: '/', component: 'main' }
+    ]);
+  }
+}

app/templates/src/app/_newrouter/__newrouter.js

@@ -0,0 +1,23 @@
+(function() {
+  'use strict';
+
+  angular
+    .module('<%- appName %>')
+    .config(routerConfig)
+    .controller('RouterController', RouterController);
+
+  /** @ngInject */
+  function routerConfig($componentLoaderProvider) {
+    $componentLoaderProvider.setTemplateMapping(function(name) {
+      return 'app/' + name + '/' + name + '.html';
+    });
+  }
+
+  /** @ngInject */
+  function RouterController($router) {
+    $router.config([
+      { path: '/', component: 'main' }
+    ]);
+  }
+
+})();

app/templates/src/app/_newrouter/__newrouter.ts

@@ -0,0 +1,19 @@
+module <%- appName %> {
+  'use strict';
+
+  /** @ngInject */
+  export function routerConfig($componentLoaderProvider) {
+    $componentLoaderProvider.setTemplateMapping(function(name) {
+      return 'app/' + name + '/' + name + '.html';
+    });
+  }
+
+  /** @ngInject */
+  export class RouterController {
+    constructor($router) {
+      $router.config([
+        { path: '/', component: 'main' }
+      ]);
+    }
+  }
+}

app/templates/src/app/_uirouter/__uirouter.js

@@ -3,10 +3,10 @@
 
   angular
     .module('<%- appName %>')
-    .config(routeConfig);
+    .config(routerConfig);
 
   /** @ngInject */
-  function routeConfig($stateProvider, $urlRouterProvider) {
+  function routerConfig($stateProvider, $urlRouterProvider) {
     $stateProvider
       .state('home', {
         url: '/',