update to bootstrap 5

changhuixu · Feb 18, 2022 · 762baf6 · 762baf6
1 parent 1756f4d
commit 762baf6
Show file tree

Hide file tree

Showing 8 changed files with 2,699 additions and 4,856 deletions.
diff --git a/README.md b/README.md
@@ -2,6 +2,8 @@
 
 An Angular library of Date Range Picker. Dependencies: Angular, ng-bootstrap, Bootstrap >4 (css)
 
+Since **v7.0.0**, this library is only compatible with Angular >=13 and ng-bootstrap >=12.
+
 Since **v6.0.0**, this library is only compatible with Angular >=13 and ng-bootstrap >=11.
 
 Since **v5.0.0**, this library is only compatible with Angular >=12 and ng-bootstrap >=10.

diff --git a/cypress/integration/date-picker.spec.ts b/cypress/integration/date-picker.spec.ts
@@ -19,9 +19,9 @@ describe('date-picker tests', () => {
   });
 
   it('should click icon and open', () => {
-    cy.get('date-picker > .input-group > .input-group-append > .btn').click();
+    cy.get('date-picker > .input-group > .btn').click();
     cy.get('ngb-datepicker').should('have.class', 'show');
-    cy.get('date-picker > .input-group > .input-group-append > .btn').click();
+    cy.get('date-picker > .input-group > .btn').click();
     cy.get('ngb-datepicker').should('not.exist');
   });
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -14,29 +14,29 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~13.1.0",
-    "@angular/common": "~13.1.0",
-    "@angular/compiler": "~13.1.0",
-    "@angular/core": "~13.1.0",
-    "@angular/forms": "~13.1.0",
-    "@angular/localize": "~13.1.0",
-    "@angular/platform-browser": "~13.1.0",
-    "@angular/platform-browser-dynamic": "~13.1.0",
-    "@angular/router": "~13.1.0",
-    "@ng-bootstrap/ng-bootstrap": "^11.0.0",
-    "bootstrap": "^4.6.0",
+    "@angular/animations": "~13.2.3",
+    "@angular/common": "~13.2.3",
+    "@angular/compiler": "~13.2.3",
+    "@angular/core": "~13.2.3",
+    "@angular/forms": "~13.2.3",
+    "@angular/localize": "~13.2.3",
+    "@angular/platform-browser": "~13.2.3",
+    "@angular/platform-browser-dynamic": "~13.2.3",
+    "@angular/router": "~13.2.3",
+    "@ng-bootstrap/ng-bootstrap": "^12.0.0",
+    "bootstrap": "^5.1.3",
     "rxjs": "~7.4.0",
     "tslib": "^2.3.0",
     "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~13.1.2",
-    "@angular/cli": "~13.1.2",
-    "@angular/compiler-cli": "~13.1.0",
+    "@angular-devkit/build-angular": "~13.2.4",
+    "@angular/cli": "~13.2.4",
+    "@angular/compiler-cli": "~13.2.3",
     "@types/node": "^12.11.1",
-    "cypress": "^9.2.0",
-    "ng-packagr": "^13.0.0",
+    "cypress": "^9.5.0",
+    "ng-packagr": "^13.2.1",
     "start-server-and-test": "^1.14.0",
     "typescript": "~4.5.2"
   }
-}
+}
diff --git a/projects/uiowa/date-range-picker/README.md b/projects/uiowa/date-range-picker/README.md
@@ -2,6 +2,8 @@
 
 An Angular library of Date Range Picker. Dependencies: Angular, ng-bootstrap, Bootstrap >4 (css)
 
+Since **v7.0.0**, this library is only compatible with Angular >=13 and ng-bootstrap >=12.
+
 Since **v6.0.0**, this library is only compatible with Angular >=13 and ng-bootstrap >=11.
 
 Since **v5.0.0**, this library is only compatible with Angular >=12 and ng-bootstrap >=10.

diff --git a/projects/uiowa/date-range-picker/package.json b/projects/uiowa/date-range-picker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uiowa/date-range-picker",
-  "version": "6.0.0",
+  "version": "7.0.0",
   "author": "Changhui Xu <[email protected]>",
   "contributors": [
     "Jacob Feuerbach <[email protected]>"
@@ -21,7 +21,7 @@
     "@angular/common": ">=13.0.0",
     "@angular/core": ">=13.0.0",
     "@angular/localize": ">=13.0.0",
-    "@ng-bootstrap/ng-bootstrap": ">=11.0.0"
+    "@ng-bootstrap/ng-bootstrap": ">=12.0.0"
   },
   "dependencies": {
     "tslib": "^2.3.0"

diff --git a/projects/uiowa/date-range-picker/src/lib/date-picker/date-picker.component.html b/projects/uiowa/date-range-picker/src/lib/date-picker/date-picker.component.html
@@ -14,25 +14,23 @@
     style="max-width: 208px; cursor: pointer"
     title="click to select a date"
   />
-  <div class="input-group-append">
-    <button
-      class="btn btn-outline-secondary d-flex align-items-center"
-      (click)="d.toggle()"
-      type="button"
-    >
-      <svg
-        aria-hidden="true"
-        role="icon"
-        xmlns="http://www.w3.org/2000/svg"
-        viewBox="0 0 448 512"
-      >
-        <path
-          fill="currentColor"
-          d="M148 288h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12zm108-12v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm96 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm-96 96v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm-96 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm192 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm96-260v352c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V112c0-26.5 21.5-48 48-48h48V12c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v52h128V12c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v52h48c26.5 0 48 21.5 48 48zm-48 346V160H48v298c0 3.3 2.7 6 6 6h340c3.3 0 6-2.7 6-6z"
-        ></path>
-      </svg>
-    </button>
-  </div>
+  <button
+  class="btn btn-outline-secondary d-flex align-items-center"
+  (click)="d.toggle()"
+  type="button"
+>
+  <svg
+    aria-hidden="true"
+    role="icon"
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 448 512"
+  >
+    <path
+      fill="currentColor"
+      d="M148 288h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12zm108-12v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm96 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm-96 96v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm-96 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm192 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm96-260v352c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V112c0-26.5 21.5-48 48-48h48V12c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v52h128V12c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v52h48c26.5 0 48 21.5 48 48zm-48 346V160H48v298c0 3.3 2.7 6 6 6h340c3.3 0 6-2.7 6-6z"
+    ></path>
+  </svg>
+</button>
 </div>
 
 <ng-template #t let-date="date" let-currentMonth="currentMonth">

diff --git a/projects/uiowa/date-range-picker/src/lib/date-range-picker/date-range-picker.component.html b/projects/uiowa/date-range-picker/src/lib/date-range-picker/date-range-picker.component.html
@@ -17,25 +17,23 @@
     (dateSelect)="onDateChange($event, dp)"
     title="click to select a date range"
   />
-  <div class="input-group-append">
-    <button
-      class="btn btn-outline-secondary d-flex align-items-center"
-      (click)="dp.toggle()"
-      type="button"
+  <button
+    class="btn btn-outline-secondary d-flex align-items-center"
+    (click)="dp.toggle()"
+    type="button"
+  >
+    <svg
+      aria-hidden="true"
+      role="icon"
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 448 512"
     >
-      <svg
-        aria-hidden="true"
-        role="icon"
-        xmlns="http://www.w3.org/2000/svg"
-        viewBox="0 0 448 512"
-      >
-        <path
-          fill="currentColor"
-          d="M148 288h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12zm108-12v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm96 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm-96 96v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm-96 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm192 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm96-260v352c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V112c0-26.5 21.5-48 48-48h48V12c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v52h128V12c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v52h48c26.5 0 48 21.5 48 48zm-48 346V160H48v298c0 3.3 2.7 6 6 6h340c3.3 0 6-2.7 6-6z"
-        ></path>
-      </svg>
-    </button>
-  </div>
+      <path
+        fill="currentColor"
+        d="M148 288h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12zm108-12v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm96 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm-96 96v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm-96 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm192 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm96-260v352c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V112c0-26.5 21.5-48 48-48h48V12c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v52h128V12c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v52h48c26.5 0 48 21.5 48 48zm-48 346V160H48v298c0 3.3 2.7 6 6 6h340c3.3 0 6-2.7 6-6z"
+      ></path>
+    </svg>
+  </button>
 </div>
 
 <ng-template