From a01cba532cbfff1762ede66814263fe72a2d4f18 Mon Sep 17 00:00:00 2001
From: Mark Harris <mark.harris@safelite.com>
Date: Wed, 1 Dec 2021 17:10:08 -0500
Subject: [PATCH 01/12] miscellaneous comments

---
 src/layouts/vehicle-year/vehicle-year.vue | 11 ++++++-----
 src/store/index.js                        |  7 +++++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/layouts/vehicle-year/vehicle-year.vue b/src/layouts/vehicle-year/vehicle-year.vue
index 941d1328c..8c0c24004 100644
--- a/src/layouts/vehicle-year/vehicle-year.vue
+++ b/src/layouts/vehicle-year/vehicle-year.vue
@@ -30,11 +30,14 @@ export default {
     };
   },
   computed: {},
+
   beforeRouteEnter(to, from, next) {
 
+    // Call APIs
     const contentPromise = fetchCmsContentForPage(to.query.fmgPage);
     const getVehicleYearPromise = store.dispatch(storeActions.GET_VEHICLE_YEARS, {});
 
+    // Settle promises and get results
     const promiseResultMap = [
       {
         resultKey: "getPageContent",
@@ -45,19 +48,17 @@ export default {
         promise: getVehicleYearPromise,
       },
     ];
-
     settleAllPromises(promiseResultMap).then((resultMap) => {
 
-      // Call our next function to transition to the next page.
+      // Call the "next" function to complete the transition to this page.
       next((vm) => {
         vm.pageHeaderWidgets = resultMap.getPageContent.PageHeaderWidget[0];
         vm.radioQuestionWidgets = resultMap.getPageContent.RadioQuestionWidget[0];
         vm.vehicleYears = resultMap.getVehicleYear;
-      });
-      
+      });      
     });
-
   },
+
   components: {
     yearQuestion,
     pageHeader,
diff --git a/src/store/index.js b/src/store/index.js
index 0976690b7..abe72764e 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -9,6 +9,11 @@ export default createStore({
       storage: window.sessionStorage,
     }),
   ],
+
+  // IMPORTANT: Be VERY careful when modifying these fields for at least a few reasons:
+  //    * The CMS can reference the fields by name
+  //    * Return users may have a previous "version" of the model, and we don't want
+  //      them to have a breaking experience, because the model might have changed.
   state: {
     order: {
       vehicle: {
@@ -63,6 +68,8 @@ export default createStore({
       experiments: null,
     }
   },
+  // See IMPORTANT note at top of "state" declaration.
+
   mutations: {
     updateVehicleImage(state, data) {
       state.order.vehicle.imageSrc = data.imgSrc;

From fb027c281e92b03bcb731918ffb436d8f6e66f25 Mon Sep 17 00:00:00 2001
From: bmauger <mauger.bryan@gmail.com>
Date: Wed, 1 Dec 2021 17:34:51 -0500
Subject: [PATCH 02/12] WIP CSR-186 radio button updates.

---
 src/layouts/component-test/component-test.vue | 21 ++++++---
 src/styles/common-radio-styles.scss           |  3 ++
 src/styles/common-typography-styles.scss      |  4 +-
 .../button-primary/button-primary.vue         |  2 +-
 .../button-secondary/button-secondary.vue     |  2 +-
 src/ux-components/list-button/list-button.vue |  2 +-
 src/ux-components/radio/radio.spec.js         |  2 +-
 src/ux-components/radio/radio.vue             | 47 ++++++++-----------
 8 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/src/layouts/component-test/component-test.vue b/src/layouts/component-test/component-test.vue
index df7578bf0..f4b4047fc 100644
--- a/src/layouts/component-test/component-test.vue
+++ b/src/layouts/component-test/component-test.vue
@@ -81,6 +81,7 @@
         groupName="demo-1"
         ariaLabelBy="vehicle-year"
         radioID="2021"
+        radioLabelValue="2021"
         textPosition="text-start"
         loaderColor="blue"
         loaderPosition="right"
@@ -90,6 +91,7 @@
         groupName="demo-1"
         ariaLabelBy="vehicle-year"
         radioID="2020"
+        radioLabelValue="2020"
         textPosition="text-start"
         loaderColor="blue"
         loaderPosition="right"
@@ -99,6 +101,7 @@
         groupName="demo-1"
         ariaLabelBy="vehicle-year"
         radioID="2019"
+        radioLabelValue="2019"
         textPosition="text-start"
         loaderColor="blue"
         loaderPosition="right"
@@ -120,7 +123,8 @@
         groupName="demo-2"
         ariaLabelBy="vehicle-make"
         radioID="Chevrolet"
-        radioSubID="Test sub-headline"
+        radioLabelValue="Chevrolet"
+        radioLabelSubCopy="Test sub-headline"
         textPosition="text-start"
         loaderColor="blue"
         loaderPosition="right"
@@ -130,7 +134,8 @@
         groupName="demo-2"
         ariaLabelBy="vehicle-make"
         radioID="Dodge"
-        radioSubID="Test sub-headline"
+        radioLabelValue="Dodge"
+        radioLabelSubCopy="Test sub-headline"
         textPosition="text-start"
         loaderColor="blue"
         loaderPosition="right"
@@ -140,7 +145,8 @@
         groupName="demo-2"
         ariaLabelBy="vehicle-make"
         radioID="Ford"
-        radioSubID="Test sub-headline"
+        radioLabelValue="Ford"
+        radioLabelSubCopy="Test sub-headline"
         textPosition="text-start"
         loaderColor="blue"
         loaderPosition="right"
@@ -157,7 +163,8 @@
         groupName="demo-3"
         ariaLabelBy="vehicle-model"
         radioID="Corvette"
-        radioSubID="Test sub-headline"
+        radioLabelValue="Corvette"
+        radioLabelSubCopy="Test sub-headline"
         textPosition="text-center"
         loaderColor="blue"
         loaderPosition="right"
@@ -167,7 +174,8 @@
         groupName="demo-3"
         ariaLabelBy="vehicle-model"
         radioID="Testarosa"
-        radioSubID="Test sub-headline"
+        radioLabelValue="Testarosa"
+        radioLabelSubCopy="Test sub-headline"
         textPosition="text-center"
         loaderColor="blue"
         loaderPosition="right"
@@ -177,7 +185,8 @@
         groupName="demo-3"
         ariaLabelBy="vehicle-model"
         radioID="S600"
-        radioSubID="Test sub-headline"
+        radioLabelValue="S600"
+        radioLabelSubCopy="Test sub-headline"
         textPosition="text-center"
         loaderColor="blue"
         loaderPosition="right"
diff --git a/src/styles/common-radio-styles.scss b/src/styles/common-radio-styles.scss
index 5457db992..2bee198bf 100644
--- a/src/styles/common-radio-styles.scss
+++ b/src/styles/common-radio-styles.scss
@@ -14,6 +14,9 @@
         background: $blue-100;
         box-shadow: 0 0 0 1px $blue;
       }
+      &:checked + label p:first-child {
+        font-weight: 500;
+      }
     }
     label {
       position: relative;
diff --git a/src/styles/common-typography-styles.scss b/src/styles/common-typography-styles.scss
index 05af0defc..7f6163193 100644
--- a/src/styles/common-typography-styles.scss
+++ b/src/styles/common-typography-styles.scss
@@ -34,7 +34,7 @@ h6,.h6 {
 }
 
 label {
-  line-height: 1.625;
+  line-height: 1.5;
   font-weight: 400;
 }
 
@@ -54,4 +54,4 @@ caption {
   font-size: 1rem !important;
   line-height: 1.4;
   font-weight: 500;
-}
\ No newline at end of file
+}
diff --git a/src/ux-components/button-primary/button-primary.vue b/src/ux-components/button-primary/button-primary.vue
index c129115c4..7da10a107 100644
--- a/src/ux-components/button-primary/button-primary.vue
+++ b/src/ux-components/button-primary/button-primary.vue
@@ -5,7 +5,7 @@
     class="btn btn-primary d-flex align-items-center py-3 px-4"
     @click='displayComponent'
     >
-    <p class="m-0">{{ this.buttonText }}</p>
+    <span class="m-0">{{ this.buttonText }}</span>
     <loader
     class="ms-2"
     v-if="display"
diff --git a/src/ux-components/button-secondary/button-secondary.vue b/src/ux-components/button-secondary/button-secondary.vue
index 9cdf7483f..ddbde2a7d 100644
--- a/src/ux-components/button-secondary/button-secondary.vue
+++ b/src/ux-components/button-secondary/button-secondary.vue
@@ -5,7 +5,7 @@
     class="btn btn-secondary d-flex align-items-center py-3 px-4"
     @click='displayComponent'
     >
-    <p class="m-0">{{ this.buttonText }}</p>
+    <span class="m-0">{{ this.buttonText }}</span>
     <loader
     class="ms-2"
     v-if="display"
diff --git a/src/ux-components/list-button/list-button.vue b/src/ux-components/list-button/list-button.vue
index 1a3f49190..6937ea93c 100644
--- a/src/ux-components/list-button/list-button.vue
+++ b/src/ux-components/list-button/list-button.vue
@@ -8,7 +8,7 @@
     this.isError ? 'error' : '',
     ]"
     >
-    <p class="m-0">{{ this.buttonText }}</p>
+    <span class="m-0">{{ this.buttonText }}</span>
     <loader
     v-if="display"
     v-bind:style="{width: `${sizeInRem}rem`, height: `${sizeInRem}rem`}"
diff --git a/src/ux-components/radio/radio.spec.js b/src/ux-components/radio/radio.spec.js
index c86de39b1..d98130c33 100644
--- a/src/ux-components/radio/radio.spec.js
+++ b/src/ux-components/radio/radio.spec.js
@@ -18,7 +18,7 @@ describe("radio.vue", () => {
     // Assert
     const input = wrapper.find("input");
     const label = wrapper.find("label");
-    const paragraph = wrapper.find("p");
+    const paragraph = wrapper.find("span");
 
     await label.trigger('click');
 
diff --git a/src/ux-components/radio/radio.vue b/src/ux-components/radio/radio.vue
index 78d6e4144..48d70821d 100644
--- a/src/ux-components/radio/radio.vue
+++ b/src/ux-components/radio/radio.vue
@@ -1,24 +1,17 @@
 <template>
+  <!-- See the component-test.vue page for example implementation -->
+  <!-- role="radiogroup" and aria-labelledby must be included in the parent component for the radio group -->
+  <!-- Example: -->
+  <!-- <div role="radiogroup" aria-labelledby="demo-radio-group" class="col my-3 d-flex align-items-center flex-column"> -->
+  <!-- An h3 with id must be included just before the opening radio button group. ***The id must match the aria-labelledby of the parent div.*** -->
+  <!-- Example -->
+  <!-- <h3 class="visually-hidden" id="demo-radio-group">Select Vehicle Year</h3> -->
   <div class="radiogroup radio-list-button d-flex flex-column w-100 mb-2">
-    <input type="radio"
-    :id="radioID"
-    :name="groupName"
-    :value="radioID">
-    <label role="radio" tabindex="0" aria-checked="false"
-    :for="radioID"
-    class="d-flex flex-column justify-content-center py-3 px-4"
-    @click='displayComponent'
-    ><p class="m-0"
-    :class="[this.textPosition]"
-    >{{radioID}}</p>
-    <p class="m-0 small"
-    :class="[this.textPosition]"
-    >{{radioSubID}}</p>
-    <loader
-    v-if="display"
-    :style="{width: `${sizeInRem}rem`, height: `${sizeInRem}rem`}"
-    :class="[this.loaderColor, this.loaderPosition]"
-    />
+    <input type="radio" :id="radioID" :name="groupName" :value="radioID">
+    <label role="radio" tabindex="0" aria-checked="false" :for="radioID" class="d-flex flex-column justify-content-center py-3 px-4" @click='displayComponent'>
+      <span class="m-0" :class="[this.textPosition]">{{radioID}}</span>
+      <span class="m-0 small" :class="[this.textPosition]">{{radioLabelSubCopy}}</span>
+    <loader v-if="display" :style="{width: `${sizeInRem}rem`, height: `${sizeInRem}rem`}" :class="[this.loaderColor, this.loaderPosition]" />
   </label>
   <p class="small">{{errorMessage}}</p>
 </div>
@@ -29,14 +22,14 @@ import loader from "@/ux-components/loader/loader";
 export default {
   name: "radioList",
   props: [
-    "groupName",
-    "radioID",
-    "radioSubID",
-    "textPosition", /* Use Bootstrap classes: text-start, text-center, text-end. Default (empty) is text-start */
-    "errorMessage",
-    "loaderColor",
-    "loaderPosition",
-    "sizeInRem"
+    "groupName", /* Required, unique for each radio button GROUP */
+    "radioID", /* Required, unique for each radio button. Used for button id, label and <label for> */
+    "radioLabelSubCopy", /* Optional, used for multi-line radio buttons */
+    "textPosition", /* Optional, use Bootstrap classes: text-start, text-center, text-end. Default (empty) is text-start */
+    "errorMessage", /* Optional */
+    "loaderColor", /* Optional */
+    "loaderPosition", /* Optional */
+    "sizeInRem" /* Optional */
   ],
   data() {
     return {

From 9b65586121b46d017e2214fbe267e503284319d7 Mon Sep 17 00:00:00 2001
From: bmauger <mauger.bryan@gmail.com>
Date: Thu, 2 Dec 2021 07:57:14 -0500
Subject: [PATCH 03/12] Remove unneeded prop.

---
 src/layouts/component-test/component-test.vue | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/layouts/component-test/component-test.vue b/src/layouts/component-test/component-test.vue
index f4b4047fc..c64a3fe0a 100644
--- a/src/layouts/component-test/component-test.vue
+++ b/src/layouts/component-test/component-test.vue
@@ -81,7 +81,6 @@
         groupName="demo-1"
         ariaLabelBy="vehicle-year"
         radioID="2021"
-        radioLabelValue="2021"
         textPosition="text-start"
         loaderColor="blue"
         loaderPosition="right"
@@ -91,7 +90,6 @@
         groupName="demo-1"
         ariaLabelBy="vehicle-year"
         radioID="2020"
-        radioLabelValue="2020"
         textPosition="text-start"
         loaderColor="blue"
         loaderPosition="right"
@@ -101,7 +99,6 @@
         groupName="demo-1"
         ariaLabelBy="vehicle-year"
         radioID="2019"
-        radioLabelValue="2019"
         textPosition="text-start"
         loaderColor="blue"
         loaderPosition="right"
@@ -123,7 +120,6 @@
         groupName="demo-2"
         ariaLabelBy="vehicle-make"
         radioID="Chevrolet"
-        radioLabelValue="Chevrolet"
         radioLabelSubCopy="Test sub-headline"
         textPosition="text-start"
         loaderColor="blue"
@@ -134,7 +130,6 @@
         groupName="demo-2"
         ariaLabelBy="vehicle-make"
         radioID="Dodge"
-        radioLabelValue="Dodge"
         radioLabelSubCopy="Test sub-headline"
         textPosition="text-start"
         loaderColor="blue"
@@ -145,7 +140,6 @@
         groupName="demo-2"
         ariaLabelBy="vehicle-make"
         radioID="Ford"
-        radioLabelValue="Ford"
         radioLabelSubCopy="Test sub-headline"
         textPosition="text-start"
         loaderColor="blue"
@@ -163,7 +157,6 @@
         groupName="demo-3"
         ariaLabelBy="vehicle-model"
         radioID="Corvette"
-        radioLabelValue="Corvette"
         radioLabelSubCopy="Test sub-headline"
         textPosition="text-center"
         loaderColor="blue"
@@ -174,7 +167,6 @@
         groupName="demo-3"
         ariaLabelBy="vehicle-model"
         radioID="Testarosa"
-        radioLabelValue="Testarosa"
         radioLabelSubCopy="Test sub-headline"
         textPosition="text-center"
         loaderColor="blue"
@@ -185,7 +177,6 @@
         groupName="demo-3"
         ariaLabelBy="vehicle-model"
         radioID="S600"
-        radioLabelValue="S600"
         radioLabelSubCopy="Test sub-headline"
         textPosition="text-center"
         loaderColor="blue"

From c98a7a3f5d890c39a4976e78d3f83555ac40ac5b Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 2 Dec 2021 10:27:49 -0500
Subject: [PATCH 04/12] CSR-120: update with CMS content for blurry vehicle
 image

---
 .../vehicle-banner/vehicle-banner.spec.js     | 36 +++++++++++++++++++
 .../vehicle-banner/vehicle-banner.vue         | 26 +++++++++++---
 src/constants/widget-names.js                 |  1 +
 3 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/src/common-components/vehicle-banner/vehicle-banner.spec.js b/src/common-components/vehicle-banner/vehicle-banner.spec.js
index 316c9225d..470410842 100644
--- a/src/common-components/vehicle-banner/vehicle-banner.spec.js
+++ b/src/common-components/vehicle-banner/vehicle-banner.spec.js
@@ -3,6 +3,12 @@ import vehicleBanner from './vehicle-banner';
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
 import { storeActions } from "@/constants/store-actions";
 import { nextTick } from 'vue';
+import { settleAllPromises } from "@/helpers/layout-helper";
+
+// Mock our module for promises.
+jest.mock("@/helpers/layout-helper.js", () => ({ 
+    settleAllPromises: jest.fn()
+}));
 
 describe('vehicleBanner', () => {
     const $store = {
@@ -45,6 +51,17 @@ describe('vehicleBanner', () => {
         ]
     };
 
+    // Our mock data for our call to settleAllPromises
+    const mockData = {
+        getPageContent: {
+            VehicleBannerWidget: [{ GenericVehicleImage: "testurl" }],
+            isCmsContentReady: true,
+        }
+    }
+
+    // our mock implementation of settleAllPromises
+    settleAllPromises.mockImplementation(() => { return Promise.resolve(mockData);});
+
     test('renders the blurrycar image when vehicleImageSrc is not present', () => {
         // Arrange
         const mountOptions = getMountOptions(actionList);
@@ -141,4 +158,23 @@ describe('vehicleBanner', () => {
         wrapper.unmount();
     });
 
+    test("vehicle-banner.vue should render data from CMS", async () => {
+        // Arrange
+        const mountOptions = getMountOptions(actionList);
+        mountOptions.global.mocks = {
+            ...mountOptions.global.mocks,
+            $store
+        }
+        // Act
+        const wrapper = shallowMount(vehicleBanner, {
+            ...mountOptions
+        });
+        // Call method getGenericVehicleImage on the component.
+        await wrapper.vm.getGenericVehicleImage();
+        // Wait for the DOM to update.
+        await nextTick(); 
+        // Assert
+        expect(wrapper.vm.genericVehicleImageSrc).toEqual("testurl");
+    });
+
 });
diff --git a/src/common-components/vehicle-banner/vehicle-banner.vue b/src/common-components/vehicle-banner/vehicle-banner.vue
index 9d91beb74..c1376710b 100644
--- a/src/common-components/vehicle-banner/vehicle-banner.vue
+++ b/src/common-components/vehicle-banner/vehicle-banner.vue
@@ -8,7 +8,7 @@
     />
     <img
       class="vehicle-image img-fluid blurrycar"
-      src='@/assets/img/blurrycar.png'
+      :src="genericVehicleImageSrc"
       alt=""
       v-else
     />
@@ -16,6 +16,9 @@
 </template>
 
 <script>
+import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
+import { settleAllPromises } from "@/helpers/layout-helper";
+
 export default {
   name: "vehicle-banner",
   computed: {
@@ -28,8 +31,8 @@ export default {
           make: this.$store.state.order.vehicle.make,
           model: this.$store.state.order.vehicle.model,
           style: this.$store.state.order.vehicle.style
-        }
-      }
+        };
+      },
   },
   props: {
     passedCarId: String
@@ -39,9 +42,12 @@ export default {
           years: [],
           carId: '',
           vehicleImageSrc: '',
+          genericVehicleImageSrc: '',
       };
   },
   created() {
+    this.getGenericVehicleImage();
+
     if (this.passedCarId && this.passedCarId.length > 0) {
       this.getVehicleImage(this.passedCarId)
     } else if (this.vin && this.vin.length > 0) {
@@ -69,8 +75,20 @@ export default {
           this.vehicleImageSrc = response.data.imgSrc;
         }
       });
+    },
+    getGenericVehicleImage() {  // retrieve generic blurry vehicle image
+      const contentPromise = fetchCmsContentForPage("vehicle-year");
+      const promiseResultMap = [
+        {
+          resultKey: "getPageContent",
+          promise: contentPromise,
+        }
+      ];
+      settleAllPromises(promiseResultMap).then((resultMap) => {
+        this.genericVehicleImageSrc = resultMap.getPageContent.VehicleBannerWidget[0].GenericVehicleImage;
+      });
     }
-  }
+  },
 }
 </script>
 
diff --git a/src/constants/widget-names.js b/src/constants/widget-names.js
index bad1390c6..ed8c1a8a6 100644
--- a/src/constants/widget-names.js
+++ b/src/constants/widget-names.js
@@ -1,6 +1,7 @@
 const widgetNames = {
   PAGE_HEADER_WIDGET: "PageHeaderWidget",
   RADIO_QUESTION_WIDGET: "RadioQuestionWidget",
+  VEHICLE_BANNER_WIDGET: "VehicleBannerWidget",
 };
 
 export { widgetNames };

From 2471fb9b03cea8ab1b9ec8f45092ab5de407512e Mon Sep 17 00:00:00 2001
From: Mark Harris <mark.harris@safelite.com>
Date: Thu, 2 Dec 2021 10:34:40 -0500
Subject: [PATCH 05/12] Removing non-mvp fields from the store

---
 src/store/index.js | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/store/index.js b/src/store/index.js
index abe72764e..5636ab2cc 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -27,7 +27,6 @@ export default createStore({
         evoxImageId: null,
         hasSplitWindshieldOption: null,
         hasBackglassSliderOption: null,
-        imageSrc: '',
         registration: {
           rawAddress: null,
           zipCode: null,
@@ -40,28 +39,19 @@ export default createStore({
           isReplacement: null,
           numberOfChips: null,
           glassToReplace: null,
-          problemGlassQuestions: null,
-          problemMoldingQuestions: null,
-          problemPropertyQuestions: null,
+          problemGlassQuestionAnswers: null,
+          problemMoldingQuestionAnswers: null,
+          problemPropertyQuestionAnswers: null,
         },
-        items: null,
+        lineItems: null,
         customer: {
           emailAddress: null,
-          firstName: null,
-          lastName: null,
-          phoneNumber: {
-            isMobile: null,
-            optInSms: null,
-          }
         },
         payment: {
           isInsurance: null,
           isCash: null,
         },
-        referral: {
-          referralSeqNum: null,
-          workOrderId: null
-        }
+        referralSeqNum: null,
       }
     },
     applicationUser: {
@@ -71,9 +61,6 @@ export default createStore({
   // See IMPORTANT note at top of "state" declaration.
 
   mutations: {
-    updateVehicleImage(state, data) {
-      state.order.vehicle.imageSrc = data.imgSrc;
-    },
   },
   actions: {
     // Vehicle API Actions

From b248a3169a26ded6f1a92028bc8e3d5ed0824b66 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 2 Dec 2021 11:39:13 -0500
Subject: [PATCH 06/12] CSR-120: updates to move CMS logic into parent
 vehicle-year layout

---
 .../vehicle-banner/vehicle-banner.spec.js     | 35 -------------------
 .../vehicle-banner/vehicle-banner.vue         | 21 ++---------
 src/layouts/component-test/component-test.vue |  8 ++---
 src/layouts/vehicle-year/vehicle-year.spec.js |  1 +
 src/layouts/vehicle-year/vehicle-year.vue     |  4 ++-
 5 files changed, 8 insertions(+), 61 deletions(-)

diff --git a/src/common-components/vehicle-banner/vehicle-banner.spec.js b/src/common-components/vehicle-banner/vehicle-banner.spec.js
index 470410842..2194b4140 100644
--- a/src/common-components/vehicle-banner/vehicle-banner.spec.js
+++ b/src/common-components/vehicle-banner/vehicle-banner.spec.js
@@ -5,11 +5,6 @@ import { storeActions } from "@/constants/store-actions";
 import { nextTick } from 'vue';
 import { settleAllPromises } from "@/helpers/layout-helper";
 
-// Mock our module for promises.
-jest.mock("@/helpers/layout-helper.js", () => ({ 
-    settleAllPromises: jest.fn()
-}));
-
 describe('vehicleBanner', () => {
     const $store = {
         state: {
@@ -51,17 +46,6 @@ describe('vehicleBanner', () => {
         ]
     };
 
-    // Our mock data for our call to settleAllPromises
-    const mockData = {
-        getPageContent: {
-            VehicleBannerWidget: [{ GenericVehicleImage: "testurl" }],
-            isCmsContentReady: true,
-        }
-    }
-
-    // our mock implementation of settleAllPromises
-    settleAllPromises.mockImplementation(() => { return Promise.resolve(mockData);});
-
     test('renders the blurrycar image when vehicleImageSrc is not present', () => {
         // Arrange
         const mountOptions = getMountOptions(actionList);
@@ -158,23 +142,4 @@ describe('vehicleBanner', () => {
         wrapper.unmount();
     });
 
-    test("vehicle-banner.vue should render data from CMS", async () => {
-        // Arrange
-        const mountOptions = getMountOptions(actionList);
-        mountOptions.global.mocks = {
-            ...mountOptions.global.mocks,
-            $store
-        }
-        // Act
-        const wrapper = shallowMount(vehicleBanner, {
-            ...mountOptions
-        });
-        // Call method getGenericVehicleImage on the component.
-        await wrapper.vm.getGenericVehicleImage();
-        // Wait for the DOM to update.
-        await nextTick(); 
-        // Assert
-        expect(wrapper.vm.genericVehicleImageSrc).toEqual("testurl");
-    });
-
 });
diff --git a/src/common-components/vehicle-banner/vehicle-banner.vue b/src/common-components/vehicle-banner/vehicle-banner.vue
index c1376710b..36642288d 100644
--- a/src/common-components/vehicle-banner/vehicle-banner.vue
+++ b/src/common-components/vehicle-banner/vehicle-banner.vue
@@ -16,9 +16,6 @@
 </template>
 
 <script>
-import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
-import { settleAllPromises } from "@/helpers/layout-helper";
-
 export default {
   name: "vehicle-banner",
   computed: {
@@ -35,19 +32,17 @@ export default {
       },
   },
   props: {
-    passedCarId: String
+    passedCarId: String,
+    genericVehicleImageSrc: String
   },
   data() {
       return {
           years: [],
           carId: '',
           vehicleImageSrc: '',
-          genericVehicleImageSrc: '',
       };
   },
   created() {
-    this.getGenericVehicleImage();
-
     if (this.passedCarId && this.passedCarId.length > 0) {
       this.getVehicleImage(this.passedCarId)
     } else if (this.vin && this.vin.length > 0) {
@@ -76,18 +71,6 @@ export default {
         }
       });
     },
-    getGenericVehicleImage() {  // retrieve generic blurry vehicle image
-      const contentPromise = fetchCmsContentForPage("vehicle-year");
-      const promiseResultMap = [
-        {
-          resultKey: "getPageContent",
-          promise: contentPromise,
-        }
-      ];
-      settleAllPromises(promiseResultMap).then((resultMap) => {
-        this.genericVehicleImageSrc = resultMap.getPageContent.VehicleBannerWidget[0].GenericVehicleImage;
-      });
-    }
   },
 }
 </script>
diff --git a/src/layouts/component-test/component-test.vue b/src/layouts/component-test/component-test.vue
index c64a3fe0a..ff80496fc 100644
--- a/src/layouts/component-test/component-test.vue
+++ b/src/layouts/component-test/component-test.vue
@@ -314,12 +314,8 @@
     </div>
     <div class="row my-3">
       <div class="col">
-        <vehicleBanner
-          passedCarId=""
-        />
-        <vehicleBanner
-          passedCarId="CR00068434"
-        />
+        <vehicleBanner genericVehicleImageSrc="https://digitalconsumercms-dev.safelite.com/images/default-source/default-album/blurred-image.jpg?sfvrsn=a6ce3034_3" />
+        <vehicleBanner passedCarId="CR00068434" />
       </div>
     </div>
   </div>
diff --git a/src/layouts/vehicle-year/vehicle-year.spec.js b/src/layouts/vehicle-year/vehicle-year.spec.js
index d3fd4fe77..60d3b8353 100644
--- a/src/layouts/vehicle-year/vehicle-year.spec.js
+++ b/src/layouts/vehicle-year/vehicle-year.spec.js
@@ -19,6 +19,7 @@ describe("vehicle-year.vue", () => {
       getPageContent: {
         PageHeaderWidget: [{ HeaderText: "Select a year to get started" }],
         RadioQuestionWidget: [{ QuestionText: "What year is your vehicle?" }],
+        VehicleBannerWidget: [{ GenericVehicleImage: "https://digitalconsumercms-dev.safelite.com/images/default-source/default-album/blurred-image.jpg?sfvrsn=a6ce3034_3" }],
         isCmsContentReady: true,
       },
       getVehicleYear: [2023, 2022, 2021]
diff --git a/src/layouts/vehicle-year/vehicle-year.vue b/src/layouts/vehicle-year/vehicle-year.vue
index 8c0c24004..e47c1b219 100644
--- a/src/layouts/vehicle-year/vehicle-year.vue
+++ b/src/layouts/vehicle-year/vehicle-year.vue
@@ -1,7 +1,7 @@
 <template v-if="isCmsContentReady">
   <div class="select-car">
     <div class="select-car-form rounded text-center">
-      <vehicleBanner />
+      <vehicleBanner :genericVehicleImageSrc="vehicleBannerWidget.GenericVehicleImage" />
       <pageHeader :text="pageHeaderWidgets.HeaderText" class="Header" />
       <yearQuestion :questionText="radioQuestionWidgets.QuestionText" :years="vehicleYears" />
     </div>
@@ -27,6 +27,7 @@ export default {
       pageHeaderWidgets: {},
       radioQuestionWidgets: {},
       vehicleYears: [],
+      vehicleBannerWidget: {}
     };
   },
   computed: {},
@@ -54,6 +55,7 @@ export default {
       next((vm) => {
         vm.pageHeaderWidgets = resultMap.getPageContent.PageHeaderWidget[0];
         vm.radioQuestionWidgets = resultMap.getPageContent.RadioQuestionWidget[0];
+        vm.vehicleBannerWidget = resultMap.getPageContent.VehicleBannerWidget[0];
         vm.vehicleYears = resultMap.getVehicleYear;
       });      
     });

From 2273567856854971637e48a08233607fe1c812b9 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 2 Dec 2021 11:41:18 -0500
Subject: [PATCH 07/12] CSR-120: remove unneeded line

---
 src/common-components/vehicle-banner/vehicle-banner.spec.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/common-components/vehicle-banner/vehicle-banner.spec.js b/src/common-components/vehicle-banner/vehicle-banner.spec.js
index 2194b4140..316c9225d 100644
--- a/src/common-components/vehicle-banner/vehicle-banner.spec.js
+++ b/src/common-components/vehicle-banner/vehicle-banner.spec.js
@@ -3,7 +3,6 @@ import vehicleBanner from './vehicle-banner';
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
 import { storeActions } from "@/constants/store-actions";
 import { nextTick } from 'vue';
-import { settleAllPromises } from "@/helpers/layout-helper";
 
 describe('vehicleBanner', () => {
     const $store = {

From 56fd342cd6b470ef8c6b3633c8b1579d92b261d0 Mon Sep 17 00:00:00 2001
From: bmauger <mauger.bryan@gmail.com>
Date: Thu, 2 Dec 2021 12:22:28 -0500
Subject: [PATCH 08/12] Update tabindex to resolve issue where

tabbing goes to each button instead of the next group.
---
 src/ux-components/radio/radio.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ux-components/radio/radio.vue b/src/ux-components/radio/radio.vue
index 48d70821d..0db8c91d4 100644
--- a/src/ux-components/radio/radio.vue
+++ b/src/ux-components/radio/radio.vue
@@ -8,7 +8,7 @@
   <!-- <h3 class="visually-hidden" id="demo-radio-group">Select Vehicle Year</h3> -->
   <div class="radiogroup radio-list-button d-flex flex-column w-100 mb-2">
     <input type="radio" :id="radioID" :name="groupName" :value="radioID">
-    <label role="radio" tabindex="0" aria-checked="false" :for="radioID" class="d-flex flex-column justify-content-center py-3 px-4" @click='displayComponent'>
+    <label role="radio" tabindex="-1" aria-checked="false" :for="radioID" class="d-flex flex-column justify-content-center py-3 px-4" @click='displayComponent'>
       <span class="m-0" :class="[this.textPosition]">{{radioID}}</span>
       <span class="m-0 small" :class="[this.textPosition]">{{radioLabelSubCopy}}</span>
     <loader v-if="display" :style="{width: `${sizeInRem}rem`, height: `${sizeInRem}rem`}" :class="[this.loaderColor, this.loaderPosition]" />

From c1e935c3d993057a3323ddbe2c55348160800b72 Mon Sep 17 00:00:00 2001
From: bmauger <mauger.bryan@gmail.com>
Date: Thu, 2 Dec 2021 12:28:31 -0500
Subject: [PATCH 09/12] Fix unit test tabindex.

---
 src/ux-components/radio/radio.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ux-components/radio/radio.spec.js b/src/ux-components/radio/radio.spec.js
index d98130c33..faaab08e7 100644
--- a/src/ux-components/radio/radio.spec.js
+++ b/src/ux-components/radio/radio.spec.js
@@ -31,7 +31,7 @@ describe("radio.vue", () => {
 
     expect(label.attributes()).toEqual({
       role: "radio",
-      tabindex: "0",
+      tabindex: "-1",
       for: "2023",
       class: "d-flex flex-column justify-content-center py-3 px-4",
       "aria-checked": "false"

From a0ea1016544b84f48a9f39ba80298faed7dacc00 Mon Sep 17 00:00:00 2001
From: Frank <frank.rua@safelite.com>
Date: Thu, 2 Dec 2021 13:01:10 -0500
Subject: [PATCH 10/12] added junit back for code coverage, re-generated
 package lock

---
 package-lock.json | 239 +++++++++++++++++-----------------------------
 package.json      |   2 +-
 2 files changed, 86 insertions(+), 155 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 88a73ac4d..ae299fce6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,6 +14,7 @@
         "canvas-confetti": "^1.4.0",
         "core-js": "^3.6.5",
         "http-status-codes": "^2.1.4",
+        "jest-junit": "^13.0.0",
         "vue": "^3.0.0",
         "vue-router": "^4.0.11",
         "vuex": "^4.0.2",
@@ -31,7 +32,6 @@
         "eslint": "^6.7.2",
         "eslint-plugin-prettier": "^3.3.1",
         "eslint-plugin-vue": "^7.0.0",
-        "jest-junit": "^13.0.0",
         "prettier": "^2.2.1",
         "sass": "^1.26.5",
         "sass-loader": "^8.0.2",
@@ -445,9 +445,7 @@
       "version": "7.15.6",
       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.6.tgz",
       "integrity": "sha512-S/TSCcsRuCkmpUuoWijua0Snt+f3ewU/8spLo+4AXJCZfT0bVCzLD5MuOKdrx0mlAptbKzn5AdgEIIKXxXkz9Q==",
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
+      "bin": "./bin/babel-parser.js",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -2727,6 +2725,7 @@
         "thread-loader": "^2.1.3",
         "url-loader": "^2.2.0",
         "vue-loader": "^15.9.2",
+        "vue-loader-v16": "npm:vue-loader@^16.1.0",
         "vue-style-loader": "^4.1.2",
         "webpack": "^4.0.0",
         "webpack-bundle-analyzer": "^3.8.0",
@@ -2776,15 +2775,13 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "funding": "https://github.com/chalk/ansi-styles?sponsor=1",
       "optional": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/@vue/cli-service/node_modules/chalk": {
@@ -2792,6 +2789,7 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "funding": "https://github.com/chalk/chalk?sponsor=1",
       "optional": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -2799,9 +2797,6 @@
       },
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/@vue/cli-service/node_modules/color-convert": {
@@ -3032,6 +3027,7 @@
         "merge-source-map": "^1.1.0",
         "postcss": "^7.0.36",
         "postcss-selector-parser": "^6.0.2",
+        "prettier": "^1.18.2",
         "source-map": "~0.6.1",
         "vue-template-es2015-compiler": "^1.9.0"
       },
@@ -3062,7 +3058,7 @@
       "dev": true,
       "optional": true,
       "bin": {
-        "prettier": "bin-prettier.js"
+        "prettier": "./bin-prettier.js"
       },
       "engines": {
         "node": ">=4"
@@ -3511,14 +3507,12 @@
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
       "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
       "dev": true,
+      "funding": "https://github.com/sponsors/sindresorhus",
       "dependencies": {
         "type-fest": "^0.21.3"
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/ansi-escapes/node_modules/type-fest": {
@@ -3526,11 +3520,9 @@
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
       "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "dev": true,
+      "funding": "https://github.com/sponsors/sindresorhus",
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/ansi-html": {
@@ -3542,7 +3534,7 @@
         "node >= 0.8.0"
       ],
       "bin": {
-        "ansi-html": "bin/ansi-html"
+        "ansi-html": "./bin/ansi-html"
       }
     },
     "node_modules/ansi-regex": {
@@ -4267,7 +4259,7 @@
       "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
       "dev": true,
       "bin": {
-        "babylon": "bin/babylon.js"
+        "babylon": "./bin/babylon.js"
       }
     },
     "node_modules/balanced-match": {
@@ -4897,11 +4889,9 @@
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
       "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
       "dev": true,
+      "funding": "https://github.com/sponsors/sindresorhus",
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/caniuse-api": {
@@ -4996,6 +4986,7 @@
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
+        "fsevents": "~2.3.2",
         "glob-parent": "~5.1.2",
         "is-binary-path": "~2.1.0",
         "is-glob": "~4.0.1",
@@ -5254,14 +5245,12 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "funding": "https://github.com/chalk/ansi-styles?sponsor=1",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/cli-highlight/node_modules/chalk": {
@@ -5269,15 +5258,13 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "funding": "https://github.com/chalk/chalk?sponsor=1",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
       },
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/cli-highlight/node_modules/color-convert": {
@@ -5324,11 +5311,9 @@
       "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.0.tgz",
       "integrity": "sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q==",
       "dev": true,
+      "funding": "https://github.com/sponsors/sindresorhus",
       "engines": {
         "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/cli-width": {
@@ -5940,7 +5925,7 @@
       "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true,
       "bin": {
-        "semver": "bin/semver"
+        "semver": "./bin/semver"
       }
     },
     "node_modules/copy-webpack-plugin/node_modules/slash": {
@@ -6071,7 +6056,7 @@
       "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true,
       "bin": {
-        "semver": "bin/semver"
+        "semver": "./bin/semver"
       }
     },
     "node_modules/crypto-browserify": {
@@ -6575,14 +6560,12 @@
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
       "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
       "dev": true,
+      "funding": "https://github.com/sponsors/sindresorhus",
       "dependencies": {
         "pump": "^3.0.0"
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/default-gateway/node_modules/is-stream": {
@@ -6590,11 +6573,9 @@
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
       "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "dev": true,
+      "funding": "https://github.com/sponsors/sindresorhus",
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/default-gateway/node_modules/mimic-fn": {
@@ -6623,14 +6604,12 @@
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
       "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
       "dev": true,
+      "funding": "https://github.com/sponsors/sindresorhus",
       "dependencies": {
         "mimic-fn": "^2.1.0"
       },
       "engines": {
         "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/default-gateway/node_modules/p-finally": {
@@ -6681,7 +6660,7 @@
         "isexe": "^2.0.0"
       },
       "bin": {
-        "node-which": "bin/node-which"
+        "node-which": "./bin/node-which"
       },
       "engines": {
         "node": ">= 8"
@@ -6902,13 +6881,11 @@
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
       "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
       "dev": true,
+      "funding": "https://github.com/cheeriojs/dom-serializer?sponsor=1",
       "dependencies": {
         "domelementtype": "^2.0.1",
         "domhandler": "^4.2.0",
         "entities": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
       }
     },
     "node_modules/domain-browser": {
@@ -7072,7 +7049,7 @@
       "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true,
       "bin": {
-        "semver": "bin/semver"
+        "semver": "./bin/semver"
       }
     },
     "node_modules/editorconfig/node_modules/yallist": {
@@ -7189,9 +7166,7 @@
       "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
       "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
       "dev": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
+      "funding": "https://github.com/fb55/entities?sponsor=1"
     },
     "node_modules/errno": {
       "version": "0.1.8",
@@ -7305,7 +7280,8 @@
         "esprima": "^4.0.1",
         "estraverse": "^4.2.0",
         "esutils": "^2.0.2",
-        "optionator": "^0.8.1"
+        "optionator": "^0.8.1",
+        "source-map": "~0.6.1"
       },
       "bin": {
         "escodegen": "bin/escodegen.js",
@@ -7333,6 +7309,7 @@
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz",
       "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
       "dev": true,
+      "funding": "https://opencollective.com/eslint",
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "ajv": "^6.10.0",
@@ -7373,13 +7350,10 @@
         "v8-compile-cache": "^2.0.3"
       },
       "bin": {
-        "eslint": "bin/eslint.js"
+        "eslint": "./bin/eslint.js"
       },
       "engines": {
         "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/eslint-config-prettier": {
@@ -7459,14 +7433,12 @@
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
       "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
       "dev": true,
+      "funding": "https://github.com/sponsors/mysticatea",
       "dependencies": {
         "eslint-visitor-keys": "^1.1.0"
       },
       "engines": {
         "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
       }
     },
     "node_modules/eslint-scope": {
@@ -7533,14 +7505,12 @@
       "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
       "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
       "dev": true,
+      "funding": "https://github.com/sponsors/sindresorhus",
       "dependencies": {
         "type-fest": "^0.8.1"
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/eslint/node_modules/import-fresh": {
@@ -7548,15 +7518,13 @@
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
+      "funding": "https://github.com/sponsors/sindresorhus",
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
       },
       "engines": {
         "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/eslint/node_modules/resolve-from": {
@@ -7597,8 +7565,8 @@
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "dev": true,
       "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
+        "esparse": "./bin/esparse.js",
+        "esvalidate": "./bin/esvalidate.js"
       },
       "engines": {
         "node": ">=4"
@@ -8156,14 +8124,12 @@
       "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
       "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
       "dev": true,
+      "funding": "https://github.com/sponsors/sindresorhus",
       "dependencies": {
         "escape-string-regexp": "^1.0.5"
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/file-entry-cache": {
@@ -8314,6 +8280,7 @@
       "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
       "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
       "dev": true,
+      "funding": "https://github.com/avajs/find-cache-dir?sponsor=1",
       "dependencies": {
         "commondir": "^1.0.1",
         "make-dir": "^3.0.2",
@@ -8321,9 +8288,6 @@
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
       }
     },
     "node_modules/find-up": {
@@ -8362,7 +8326,7 @@
         "glob": "^7.1.3"
       },
       "bin": {
-        "rimraf": "bin.js"
+        "rimraf": "./bin.js"
       }
     },
     "node_modules/flatted": {
@@ -9047,7 +9011,7 @@
         "uglify-js": "3.4.x"
       },
       "bin": {
-        "html-minifier": "cli.js"
+        "html-minifier": "./cli.js"
       },
       "engines": {
         "node": ">=4"
@@ -9282,7 +9246,8 @@
     "node_modules/http-status-codes": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/http-status-codes/-/http-status-codes-2.1.4.tgz",
-      "integrity": "sha512-MZVIsLKGVOVE1KEnldppe6Ij+vmemMuApDfjhVSLzyYP+td0bREEYyAoIw9yFePoBXManCuBqmiNP5FqJS5Xkg=="
+      "integrity": "sha512-MZVIsLKGVOVE1KEnldppe6Ij+vmemMuApDfjhVSLzyYP+td0bREEYyAoIw9yFePoBXManCuBqmiNP5FqJS5Xkg==",
+      "license": "MIT"
     },
     "node_modules/https-browserify": {
       "version": "1.0.0",
@@ -9556,14 +9521,12 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "funding": "https://github.com/chalk/ansi-styles?sponsor=1",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/inquirer/node_modules/chalk": {
@@ -9571,15 +9534,13 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "funding": "https://github.com/chalk/chalk?sponsor=1",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
       },
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/inquirer/node_modules/cli-cursor": {
@@ -9644,14 +9605,12 @@
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
       "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
       "dev": true,
+      "funding": "https://github.com/sponsors/sindresorhus",
       "dependencies": {
         "mimic-fn": "^2.1.0"
       },
       "engines": {
         "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/inquirer/node_modules/restore-cursor": {
@@ -9972,14 +9931,12 @@
       "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
       "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
       "dev": true,
+      "funding": "https://github.com/sponsors/sindresorhus",
       "bin": {
         "is-docker": "cli.js"
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/is-extendable": {
@@ -10131,11 +10088,9 @@
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
       "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
       "dev": true,
+      "funding": "https://github.com/sponsors/sindresorhus",
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/is-plain-object": {
@@ -10334,7 +10289,7 @@
       "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true,
       "bin": {
-        "semver": "bin/semver"
+        "semver": "./bin/semver"
       }
     },
     "node_modules/istanbul-lib-report/node_modules/supports-color": {
@@ -10384,7 +10339,7 @@
       "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true,
       "bin": {
-        "semver": "bin/semver"
+        "semver": "./bin/semver"
       }
     },
     "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
@@ -10424,7 +10379,7 @@
         "jest-cli": "^24.9.0"
       },
       "bin": {
-        "jest": "bin/jest.js"
+        "jest": "./bin/jest.js"
       },
       "engines": {
         "node": ">= 6"
@@ -10465,7 +10420,7 @@
         "yargs": "^13.3.0"
       },
       "bin": {
-        "jest": "bin/jest.js"
+        "jest": "./bin/jest.js"
       },
       "engines": {
         "node": ">= 6"
@@ -10874,6 +10829,7 @@
         "@jest/types": "^24.9.0",
         "anymatch": "^2.0.0",
         "fb-watchman": "^2.0.0",
+        "fsevents": "^1.2.7",
         "graceful-fs": "^4.1.15",
         "invariant": "^2.2.4",
         "jest-serializer": "^24.9.0",
@@ -10962,7 +10918,6 @@
       "version": "13.0.0",
       "resolved": "https://registry.npmjs.org/jest-junit/-/jest-junit-13.0.0.tgz",
       "integrity": "sha512-JSHR+Dhb32FGJaiKkqsB7AR3OqWKtldLd6ZH2+FJ8D4tsweb8Id8zEVReU4+OlrRO1ZluqJLQEETm+Q6/KilBg==",
-      "dev": true,
       "dependencies": {
         "mkdirp": "^1.0.4",
         "strip-ansi": "^6.0.1",
@@ -10977,7 +10932,6 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -10986,7 +10940,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
       "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true,
       "bin": {
         "mkdirp": "bin/cmd.js"
       },
@@ -10998,7 +10951,6 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -11010,7 +10962,6 @@
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true,
       "bin": {
         "uuid": "dist/bin/uuid"
       }
@@ -11191,7 +11142,7 @@
         "yargs": "^13.3.0"
       },
       "bin": {
-        "jest-runtime": "bin/jest-runtime.js"
+        "jest-runtime": "./bin/jest-runtime.js"
       },
       "engines": {
         "node": ">= 6"
@@ -11748,6 +11699,9 @@
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
       "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
       "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.6"
+      },
       "optionalDependencies": {
         "graceful-fs": "^4.1.6"
       }
@@ -12103,14 +12057,12 @@
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
       "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
       "dev": true,
+      "funding": "https://github.com/sponsors/sindresorhus",
       "dependencies": {
         "semver": "^6.0.0"
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/make-error": {
@@ -12708,7 +12660,7 @@
       "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true,
       "bin": {
-        "semver": "bin/semver"
+        "semver": "./bin/semver"
       }
     },
     "node_modules/node-releases": {
@@ -12750,7 +12702,7 @@
       "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true,
       "bin": {
-        "semver": "bin/semver"
+        "semver": "./bin/semver"
       }
     },
     "node_modules/normalize-path": {
@@ -13227,14 +13179,12 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
+      "funding": "https://github.com/sponsors/sindresorhus",
       "dependencies": {
         "p-try": "^2.0.0"
       },
       "engines": {
         "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/p-locate": {
@@ -13505,11 +13455,9 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
       "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
       "dev": true,
+      "funding": "https://github.com/sponsors/jonschlinkert",
       "engines": {
         "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
     "node_modules/pify": {
@@ -14818,6 +14766,7 @@
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
       "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "dev": true,
+      "funding": "https://github.com/sponsors/sindresorhus",
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
@@ -14826,9 +14775,6 @@
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/readable-stream": {
@@ -15231,7 +15177,7 @@
         "glob": "^7.1.3"
       },
       "bin": {
-        "rimraf": "bin.js"
+        "rimraf": "./bin.js"
       }
     },
     "node_modules/ripemd160": {
@@ -15322,7 +15268,7 @@
         "walker": "~1.0.5"
       },
       "bin": {
-        "sane": "src/cli.js"
+        "sane": "./src/cli.js"
       },
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
@@ -15459,7 +15405,7 @@
       "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
       "dev": true,
       "bin": {
-        "semver": "bin/semver.js"
+        "semver": "./bin/semver.js"
       }
     },
     "node_modules/send": {
@@ -15667,7 +15613,7 @@
         "safe-buffer": "^5.0.1"
       },
       "bin": {
-        "sha.js": "bin.js"
+        "sha.js": "./bin.js"
       }
     },
     "node_modules/shallow-clone": {
@@ -16589,11 +16535,9 @@
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true,
+      "funding": "https://github.com/sponsors/sindresorhus",
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/stylehacks": {
@@ -16664,7 +16608,7 @@
         "util.promisify": "~1.0.0"
       },
       "bin": {
-        "svgo": "bin/svgo"
+        "svgo": "./bin/svgo"
       },
       "engines": {
         "node": ">=4.0.0"
@@ -16687,11 +16631,9 @@
       "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
       "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
       "dev": true,
+      "funding": "https://github.com/sponsors/fb55",
       "engines": {
         "node": ">= 6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
       }
     },
     "node_modules/svgo/node_modules/dom-serializer": {
@@ -16933,7 +16875,7 @@
       "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true,
       "bin": {
-        "semver": "bin/semver"
+        "semver": "./bin/semver"
       }
     },
     "node_modules/terser-webpack-plugin/node_modules/source-map": {
@@ -17234,7 +17176,7 @@
       "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true,
       "bin": {
-        "semver": "bin/semver"
+        "semver": "./bin/semver"
       }
     },
     "node_modules/ts-jest/node_modules/yargs-parser": {
@@ -17719,7 +17661,7 @@
       "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
       "dev": true,
       "bin": {
-        "uuid": "bin/uuid"
+        "uuid": "./bin/uuid"
       }
     },
     "node_modules/v8-compile-cache": {
@@ -17798,6 +17740,7 @@
       "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz",
       "integrity": "sha512-qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg==",
       "dev": true,
+      "funding": "https://github.com/sponsors/mysticatea",
       "dependencies": {
         "debug": "^4.1.1",
         "eslint-scope": "^5.1.1",
@@ -17810,9 +17753,6 @@
       "engines": {
         "node": ">=8.10"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
       "peerDependencies": {
         "eslint": ">=5.0.0"
       }
@@ -18005,8 +17945,10 @@
       "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
       "dev": true,
       "dependencies": {
+        "chokidar": "^3.4.1",
         "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
+        "neo-async": "^2.5.0",
+        "watchpack-chokidar2": "^2.0.1"
       },
       "optionalDependencies": {
         "chokidar": "^3.4.1",
@@ -18068,6 +18010,7 @@
         "anymatch": "^2.0.0",
         "async-each": "^1.0.1",
         "braces": "^2.3.2",
+        "fsevents": "^1.2.7",
         "glob-parent": "^3.1.0",
         "inherits": "^2.0.3",
         "is-binary-path": "^1.0.0",
@@ -18380,6 +18323,7 @@
         "anymatch": "^2.0.0",
         "async-each": "^1.0.1",
         "braces": "^2.3.2",
+        "fsevents": "^1.2.7",
         "glob-parent": "^3.1.0",
         "inherits": "^2.0.3",
         "is-binary-path": "^1.0.0",
@@ -18807,7 +18751,7 @@
         "isexe": "^2.0.0"
       },
       "bin": {
-        "which": "bin/which"
+        "which": "./bin/which"
       }
     },
     "node_modules/which-boxed-primitive": {
@@ -18878,14 +18822,12 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "funding": "https://github.com/chalk/ansi-styles?sponsor=1",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/wrap-ansi/node_modules/color-convert": {
@@ -18982,8 +18924,7 @@
     "node_modules/xml": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
-      "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=",
-      "dev": true
+      "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU="
     },
     "node_modules/xml-name-validator": {
       "version": "3.0.0",
@@ -19059,14 +19000,12 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "funding": "https://github.com/chalk/ansi-styles?sponsor=1",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/yargs/node_modules/cliui": {
@@ -19138,6 +19077,7 @@
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
+      "funding": "https://github.com/chalk/wrap-ansi?sponsor=1",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -19145,9 +19085,6 @@
       },
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
     "node_modules/yargs/node_modules/y18n": {
@@ -27873,7 +27810,6 @@
       "version": "13.0.0",
       "resolved": "https://registry.npmjs.org/jest-junit/-/jest-junit-13.0.0.tgz",
       "integrity": "sha512-JSHR+Dhb32FGJaiKkqsB7AR3OqWKtldLd6ZH2+FJ8D4tsweb8Id8zEVReU4+OlrRO1ZluqJLQEETm+Q6/KilBg==",
-      "dev": true,
       "requires": {
         "mkdirp": "^1.0.4",
         "strip-ansi": "^6.0.1",
@@ -27884,20 +27820,17 @@
         "ansi-regex": {
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-          "dev": true
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
         },
         "mkdirp": {
           "version": "1.0.4",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-          "dev": true
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
         },
         "strip-ansi": {
           "version": "6.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
           "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-          "dev": true,
           "requires": {
             "ansi-regex": "^5.0.1"
           }
@@ -27905,8 +27838,7 @@
         "uuid": {
           "version": "8.3.2",
           "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-          "dev": true
+          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
         }
       }
     },
@@ -34460,8 +34392,7 @@
     "xml": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
-      "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=",
-      "dev": true
+      "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU="
     },
     "xml-name-validator": {
       "version": "3.0.0",
diff --git a/package.json b/package.json
index 8b26d9e8e..58b8837dd 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
     "canvas-confetti": "^1.4.0",
     "core-js": "^3.6.5",
     "http-status-codes": "^2.1.4",
+    "jest-junit": "^13.0.0",
     "vue": "^3.0.0",
     "vue-router": "^4.0.11",
     "vuex": "^4.0.2",
@@ -32,7 +33,6 @@
     "eslint": "^6.7.2",
     "eslint-plugin-prettier": "^3.3.1",
     "eslint-plugin-vue": "^7.0.0",
-    "jest-junit": "^13.0.0",
     "prettier": "^2.2.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",

From f8532da43beb3150ebd61ec9ef0d562ebff4e797 Mon Sep 17 00:00:00 2001
From: Frank <frank.rua@safelite.com>
Date: Thu, 2 Dec 2021 13:16:02 -0500
Subject: [PATCH 11/12] Added processor

---
 jest.config.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jest.config.js b/jest.config.js
index 5117c95e0..26f6d5463 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,6 +1,7 @@
 module.exports = {
   verbose: true,
   coverageReporters: ["html", "text", "jest-junit"],
+  testResultsProcessor: "jest-junit",
   preset: "@vue/cli-plugin-unit-jest",
   transform: { "^.+\\.vue$": "vue-jest" },
   moduleFileExtensions: ["js", "vue"],

From 245d515c71e3ddec29715ee280d23f43fa696cb0 Mon Sep 17 00:00:00 2001
From: Frank <frank.rua@safelite.com>
Date: Thu, 2 Dec 2021 13:21:13 -0500
Subject: [PATCH 12/12] added cobertura

---
 jest.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jest.config.js b/jest.config.js
index 26f6d5463..cc95af335 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,6 +1,6 @@
 module.exports = {
   verbose: true,
-  coverageReporters: ["html", "text", "jest-junit"],
+  coverageReporters: ["html", "text", "jest-junit", "cobertura"],
   testResultsProcessor: "jest-junit",
   preset: "@vue/cli-plugin-unit-jest",
   transform: { "^.+\\.vue$": "vue-jest" },