feat: update bootstrap template for ng9

ngx-rocket · Feb 16, 2020 · 88d3d58 · 88d3d58
1 parent 15c7615
commit 88d3d58
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/generators/app/templates/_package.json b/generators/app/templates/_package.json
@@ -89,6 +89,7 @@
     "@ng-bootstrap/ng-bootstrap": "^5.0.0-rc.1",
     "bootstrap": "^4.1.1",
     "@fortawesome/fontawesome-free": "^5.1.0",
+    "@angular/localize": "^9.0.1",
 <% } else if (props.ui === 'material') { -%>
     "@angular/cdk": "^9.0.0",
     "@angular/material": "^9.0.0",
@@ -147,7 +148,7 @@
     "electron-reload": "^1.4.0",
 <% } -%>
 <% if (props.tools.includes('hads')) { -%>
-    "hads": "^1.7.0",
+    "hads": "^2.0.1",
 <% } -%>
 <% if (props.tools.includes('compodoc')) { -%>
     "@compodoc/compodoc": "^1.1.9",
@@ -169,10 +170,10 @@
 <% if (props.tools.includes('prettier')) { -%>
     "prettier": "^1.16.3",
     "tslint-config-prettier": "^1.14.0",
-    "stylelint-config-prettier": "^5.1.0",
+    "stylelint-config-prettier": "^8.0.1",
 <%   if (options.git) { -%>
-    "pretty-quick": "^1.10.0",
-    "husky": "^3.0.0",
+    "pretty-quick": "^2.0.1",
+    "husky": "^4.2.3",
 <%   } -%>
 <% } -%>
     "protractor": "~5.4.3",

diff --git a/generators/app/templates/src/polyfills.ts → generators/app/templates/src/_polyfills.ts b/generators/app/templates/src/polyfills.ts → generators/app/templates/src/_polyfills.ts
@@ -57,7 +57,13 @@
  */
 import 'zone.js/dist/zone';  // Included with Angular CLI.
 
+<% if (props.ui === 'bootstrap') { -%>
+/***************************************************************************************************
+ * Load `$localize` onto the global scope - used if i18n tags appear in Angular templates.
+ */
+import '@angular/localize/init';
 
+<% } -%>
 /***************************************************************************************************
  * APPLICATION IMPORTS
  */
diff --git a/generators/app/templates/src/app/shell/header/__bootstrap._header.component.html b/generators/app/templates/src/app/shell/header/__bootstrap._header.component.html
@@ -17,20 +17,20 @@
         </a>
       </div>
       <div class="navbar-nav ml-auto">
-        <div class="nav-item" ngbDropdown display="dynamic" placement="bottom-right">
+        <div class="nav-item" ngbDropdown>
           <a id="language-dropdown" class="nav-link" ngbDropdownToggle>{{currentLanguage}}</a>
-          <div ngbDropdownMenu aria-labelledby="language-dropdown">
+          <div ngbDropdownMenu aria-labelledby="language-dropdown" class="dropdown-menu dropdown-menu-right">
             <button class="dropdown-item" *ngFor="let language of languages" (click)="setLanguage(language)">
               {{language}}
             </button>
           </div>
         </div>
 <% if (props.auth) { -%>
-        <div class="nav-item" ngbDropdown display="dynamic" placement="bottom-right">
+        <div class="nav-item" ngbDropdown>
           <a id="user-dropdown" class="nav-link" ngbDropdownToggle>
             <i class="fas fa-user-circle"></i>
           </a>
-          <div ngbDropdownMenu aria-labelledby="user-dropdown">
+          <div ngbDropdownMenu aria-labelledby="user-dropdown" class="dropdown-menu dropdown-menu-right">
             <h6 class="dropdown-header">
               <span translate>Logged in as</span> <b>{{username}}</b></h6>
             <div class="dropdown-divider"></div>