Merge branch 'canary' into chore/generated-dep-update

Author: Awk34

templates/app/client/components/directives.module.js

@@ -1,6 +1,7 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { CollapseModule } from 'ngx-bootstrap';
+<% if(filters.uibootstrap) { %>
+import { CollapseModule } from 'ngx-bootstrap';<% } %>
 
 <%_ if (filters.uirouter) { -%>
 import { UIRouterModule } from 'ui-router-ng2';<% } %>
@@ -17,7 +18,7 @@ import { OauthButtonsComponent } from './oauth-buttons/oauth-buttons.component';
 @NgModule({
   imports: [
     CommonModule,
-    CollapseModule,
+  <% if(filters.uibootstrap) { %>CollapseModule,<% } %>
     AuthModule,
     <%_ if (filters.uirouter) { -%>
     UIRouterModule,<% } %>

templates/app/client/components/navbar/navbar.html

@@ -9,7 +9,7 @@
       </button>
       <a href="/" class="navbar-brand"><%= lodash.slugify(lodash.humanize(appname)) %></a>
     </div>
-    <div [collapse]="isCollapsed" class="navbar-collapse collapse" id="navbar-main">
+    <div <% if(filters.uibootstrap) { %>[collapse]="isCollapsed"<% } %> class="navbar-collapse collapse" id="navbar-main">
       <ul class="nav navbar-nav">
         <li *ngFor="let item of menu" <% if(filters.uirouter) { %>uiSrefActive="active"<% } else { %>routerLinkActive="active"<% } %>>
             <a <% if(filters.uirouter) { %>uiSref="{{item.state}}"<% } else { %>routerLink="{{item.link}}"<% } %>>{{item.title}}</a>

templates/app/tsconfig(ts).json

@@ -20,7 +20,8 @@
     "./node_modules/@types/"
   ],
   "exclude": [
-    "node_modules"
+    "node_modules",
+    "client/**/*.spec.ts"
   ],
   "filesGlob": [
     "client/{app,components}/**/!(*.spec).ts"