From af4f6cbefcc0e4501459b9af473932d96c912684 Mon Sep 17 00:00:00 2001
From: Nikola Holst Nikolic <nikola.holst-nikolic@arbetsformedlingen.se>
Date: Tue, 30 Nov 2021 08:33:55 +0100
Subject: [PATCH] feature(filuppladdning): Informativ rapport med bilaga.
 (TV-874)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge in TEA/mina-sidor-fa-web from feature/TV-874-fe-lagg-till-mojlighet-att-lagga-upp-fil-och-synka-med-be to develop

Squashed commit of the following:

commit 2fdc27affebd4310fa432830ae4e2cf19a3669e9
Merge: 2706cd4e 609698eb
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
Date:   Tue Nov 30 08:29:48 2021 +0100

    Merge branch 'develop' into feature/TV-874-fe-lagg-till-mojlighet-att-lagga-upp-fil-och-synka-med-be

commit 2706cd4e61b497b50d82518bdfd5e5c310dcc7aa
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
Date:   Mon Nov 29 13:33:24 2021 +0100

    Added uploaded file to submitData

commit aa477af83df371e7701885aed7418a283fcf0a2d
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
Date:   Mon Nov 29 10:12:34 2021 +0100

    Amends

commit 8c36a32e3d5f9c7d9530959d341d1ebf3e41be9d
Merge: b49a06f3 85f398ca
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
Date:   Fri Nov 26 10:28:19 2021 +0100

    Merge branch 'develop' into feature/TV-874-fe-lagg-till-mojlighet-att-lagga-upp-fil-och-synka-med-be

commit b49a06f36616f2b49b62f66dfc53fb5ee7572273
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
Date:   Wed Nov 24 09:39:42 2021 +0100

    Laddningssnurra för informativ rapport

commit 1fb6b51af5325a199b86630a12769ab3ac00f70c
Merge: c516a91b f0354d0a
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
Date:   Mon Nov 22 14:17:14 2021 +0100

    - Merge branch 'develop' into feature/TV-874-fe-lagg-till-mojlighet-att-lagga-upp-fil-och-synka-med-be
    - Added label text to ui-select to prevent digi-core warning in console and added display:none; to hide it.

commit c516a91b8f2aabca7e2393f2ccb997447be5bedf
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
Date:   Mon Nov 22 13:57:55 2021 +0100

    Prettier, changed in-parameter type.

commit d78e8e867ca3b632e86669af1780b5e5249eacd2
Merge: 1aa96b52 a0d10765
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
Date:   Mon Nov 15 09:57:13 2021 +0100

    Merge branch 'develop' into feature/TV-874-fe-lagg-till-mojlighet-att-lagga-upp-fil-och-synka-med-be

commit 1aa96b5275115f0d60d0c0637b34bfc3174a4b34
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
Date:   Fri Nov 12 11:20:51 2021 +0100

    - Reset package-lock.json
    - Changed type from unknown to file

commit abae56f4e3b9803552d2028f3c55184662181b22
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
Date:   Fri Nov 12 11:13:35 2021 +0100

    File-upload

commit b1bc6f931a6fd043573a57cf489cf964796e2943
Merge: 5fe8cace 873b6a0c
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
Date:   Wed Nov 10 12:49:57 2021 +0100

    Merge branch 'develop' into feature/TV-874-fe-lagg-till-mojlighet-att-lagga-upp-fil-och-synka-med-be

commit 5fe8cace262a75b75e4bebde6fa4c3effb11e39f
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
Date:   Tue Nov 9 14:21:24 2021 +0100

    - Fortsatt utveckling av filuppladdaren
    - Byt alla af till ui, digi-ng referenser till digi-core/projektets
    - Ersätt digiNgFormValidatioMmesage till digi-cores
    - Validering (Måste ha fil) (funkar inte riktigt ännu då valideringens sker på alla kategorier eftersom den finns i modellen.

commit bda789b4451983ad69ab6c05a3bad1723b438c2d
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
Date:   Mon Nov 1 16:40:16 2021 +0100

    File-upload
---
 .../informativ-rapport-form.component.html    |  37 +-
 .../informativ-rapport-form.component.ts      |  53 +-
 .../informativ-rapport-form.module.ts         |   4 +
 .../enums/informativ-rapport-category.enum.ts |   1 +
 .../api/informativ-rapport.request.model.ts   |   7 +
 .../file-upload/file-upload.component.html    |  52 ++
 .../file-upload/file-upload.component.scss    |  61 ++
 .../src/file-upload/file-upload.component.ts  | 190 +++++
 libs/ui/src/file-upload/file-upload.module.ts |  15 +
 libs/ui/src/icon/icon-type.enum.ts            |   1 +
 libs/ui/src/icon/icon.component.html          |   1 +
 package-lock.json                             | 757 ++++++++++--------
 12 files changed, 855 insertions(+), 324 deletions(-)
 create mode 100644 libs/ui/src/file-upload/file-upload.component.html
 create mode 100644 libs/ui/src/file-upload/file-upload.component.scss
 create mode 100644 libs/ui/src/file-upload/file-upload.component.ts
 create mode 100644 libs/ui/src/file-upload/file-upload.module.ts

diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.html
index 73ce3d1..b9fe07a 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.html
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.html
@@ -57,7 +57,30 @@
               [uiInvalid]="formControlIsInvalid('category')"
               [uiOptions]="categorySelectItems"
               [uiValidationMessage]="categoryFormControl.errors?.required"
+              (uiOnChange)="categorySelectChange(categoryFormControl.value)"
             ></ui-select>
+            <ng-container *ngIf="formData$ | async as formData">
+              <ui-file-upload
+                *ngIf="formData.category === 'dokument'"
+                ngDefaultControl
+                [formControl]="fileFormControl"
+                uiId="informativRapportFileUpload"
+                uiUploadBtnText="Välj fil"
+                uiLabel="Bifoga dokument"
+                uiLabelDescription="Exempel på dokument är individuell utvecklingsplan."
+                [uiRequired]="true"
+                [uiInvalid]="fileFormControl.invalid && informativRapportFormGroup.touched"
+                [uiAnnounceIfOptional]="true"
+                uploadBtnAriaLabel="Välj en fil att ladda upp"
+                [uiMultiple]="false"
+                [uiMaxFileSize]="8192"
+                uiAccept="application/pdf"
+                uiName="informativRapportFileUpload"
+                (uiOnUploadFiles)="setUploadedFile($event)"
+                (uiOnRemoveFile)="removeUploadedFile()"
+                [uiInvalidMessage]="fileFormControl.errors?.required"
+              ></ui-file-upload>
+            </ng-container>
           </div>
           <div class="informativ-rapport-form__form-item">
             <ui-textarea
@@ -71,7 +94,6 @@
               [uiMaxLength]="2000"
             ></ui-textarea>
           </div>
-
           <footer class="informativ-rapport-form__footer">
             <div class="informativ-rapport-form__cta-wrapper">
               <digi-button af-type="submit" af-size="m">Förhandsgranska</digi-button>
@@ -81,7 +103,6 @@
               </ui-link-button>
             </div>
           </footer>
-
           <digi-ng-dialog
             [afActive]="confirmDialogOpen$ | async"
             (afOnPrimaryClick)="submitAndCloseConfirmDialog()"
@@ -101,6 +122,14 @@
                 <dd>{{getInformativRapportCategory(submitData.category)}}</dd>
                 <dt>Kompletterande information</dt>
                 <dd>{{submitData.comment}}</dd>
+                <ng-container *ngIf="submitData.file?.size">
+                  <dt>Dokument</dt>
+                  <dd>
+                    <a [href]="getInformativRapportFileUrl(submitData.file)" [download]="submitData.file?.name">
+                      {{submitData.file?.name}}
+                    </a>
+                  </dd>
+                </ng-container>
               </ng-container>
             </msfa-report-description-list>
             <digi-notification-alert
@@ -123,8 +152,6 @@
             afAriaLabel="Här står det mer detaljerad information för vad kategorierna innebär"
             id="category-information"
           >
-            <!-- <h3>Skicka dokumentation till Arbetsförmedlingen</h3>
-          <p>Skicka in dokumentation som Arbetsförmedlingen begärt.</p> -->
             <h3>Behov av annan insats</h3>
             <p>
               Informera om att deltagaren kan behöva en arbetsmarknadspolitisk insats, exempelvis utbildning,
@@ -142,6 +169,8 @@
               Informera om att det behövs dialog gällande deltagarens ärende, exempelvis inför eventuellt
               stöd/anpassning eller hälsa.
             </p>
+            <h3>Skicka dokumentation till Arbetsförmedlingen</h3>
+            <p>Skicka in dokumentation som Arbetsförmedlingen begärt.</p>
           </digi-ng-dialog>
         </form>
       </ng-template>
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.ts
index 745d567..e05ca88 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.ts
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.component.ts
@@ -3,7 +3,10 @@ import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
 import { InformativRapportCategory, InformativRapportCategoryKey } from '@msfa-enums/informativ-rapport-category.enum';
-import { InformativRapportRequest } from '@msfa-models/api/informativ-rapport.request.model';
+import {
+  InformativRapportRequest,
+  InformativRapportWithFileRequest,
+} from '@msfa-models/api/informativ-rapport.request.model';
 import { DeltagareAvrop } from '@msfa-models/avrop.model';
 import { CustomError } from '@msfa-models/error/custom-error';
 import { RequiredValidator } from '@msfa-utils/validators/required.validator';
@@ -11,6 +14,7 @@ import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
 import { map, shareReplay, switchMap, take } from 'rxjs/operators';
 import { InformativRapportFormData } from './informativ-rapport-form.model';
 import { InformativRapportFormService } from './informativ-rapport-form.service';
+import { DomSanitizer } from '@angular/platform-browser';
 
 @Component({
   selector: 'msfa-informativ-rapport-form',
@@ -19,6 +23,7 @@ import { InformativRapportFormService } from './informativ-rapport-form.service'
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class InformativRapportFormComponent {
+  categoryDocumentSelected = false;
   shouldValidate$ = new BehaviorSubject<boolean>(false);
   confirmDialogOpen$ = new BehaviorSubject<boolean>(false);
   categoryInformationDialogOpen$ = new BehaviorSubject<boolean>(false);
@@ -36,6 +41,7 @@ export class InformativRapportFormComponent {
   informativRapportFormGroup = new FormGroup({
     category: new FormControl(null, [RequiredValidator('Ett ärende måste väljas')]),
     comment: new FormControl('', [RequiredValidator('Kompletterande information är obligatoriskt')]),
+    file: new FormControl(null),
   });
   categorySelectItems: SelectOption[] = Object.entries(InformativRapportCategory).map(([value, name]) => ({
     name,
@@ -51,7 +57,8 @@ export class InformativRapportFormComponent {
   );
   constructor(
     private informativRapportFormService: InformativRapportFormService,
-    private activatedRoute: ActivatedRoute
+    private activatedRoute: ActivatedRoute,
+    private domSanitizer: DomSanitizer
   ) {}
 
   get categoryFormControl(): FormControl {
@@ -60,23 +67,41 @@ export class InformativRapportFormComponent {
   get commentFormControl(): FormControl {
     return this.informativRapportFormGroup.get('comment') as FormControl;
   }
+  get fileFormControl(): FormControl {
+    return this.informativRapportFormGroup.get('file') as FormControl;
+  }
 
   private _formDataToSubmitData(
     genomforandeReferens: number,
     formData: InformativRapportFormData
-  ): InformativRapportRequest {
+  ): InformativRapportRequest | InformativRapportWithFileRequest {
     const { category, comment } = formData;
-    return {
-      genomforandeReferens,
-      category,
-      comment,
-    };
+
+    const file: File = (this.fileFormControl?.value as File) ?? null;
+
+    return this.categoryDocumentSelected
+      ? { genomforandeReferens, category, comment, file }
+      : { genomforandeReferens, category, comment };
+  }
+
+  getInformativRapportFileUrl(doc: File): string {
+    const url = URL.createObjectURL(new Blob([doc]));
+    return this.domSanitizer.bypassSecurityTrustUrl(url) as string;
   }
 
   private _markFormAsTouchedAndDirty(): void {
     this.informativRapportFormGroup.markAllAsTouched();
     this.commentFormControl.markAsDirty();
     this.categoryFormControl.markAsDirty();
+    this.fileFormControl?.markAsDirty();
+  }
+
+  setUploadedFile(file: File): void {
+    this.fileFormControl.setValue(file[0]);
+  }
+
+  removeUploadedFile(): void {
+    this.fileFormControl.setValue(null);
   }
 
   getInformativRapportCategory(category: InformativRapportCategoryKey): InformativRapportCategory {
@@ -95,6 +120,18 @@ export class InformativRapportFormComponent {
     this.categoryInformationDialogOpen$.next(false);
   }
 
+  categorySelectChange(category: string): void {
+    this.categoryDocumentSelected = category === 'dokument';
+
+    this.informativRapportFormGroup
+      .get('file')
+      .setValidators(this.categoryDocumentSelected ? [RequiredValidator('En fil måste väljas')] : null);
+
+    if (!this.categoryDocumentSelected) {
+      this.removeUploadedFile();
+    }
+  }
+
   openConfirmDialog(): void {
     this.shouldValidate$.next(true);
     this._markFormAsTouchedAndDirty();
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.module.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.module.ts
index c310e3b..90a7e9e 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.module.ts
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/informativ-rapport-form/informativ-rapport-form.module.ts
@@ -13,7 +13,9 @@ import { ReportDescriptionListModule } from '../../../components/report-descript
 import { ReportLayoutModule } from '../../../components/report-layout/report-layout.module';
 import { InformativRapportFormComponent } from './informativ-rapport-form.component';
 import { InformativRapportFormService } from './informativ-rapport-form.service';
+import { UiFileUploadModule } from '@ui/file-upload/file-upload.module';
 import { UiSelectModule } from '@ui/select/select.module';
+import { UiLoaderModule } from '@ui/loader/loader.module';
 
 @NgModule({
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
@@ -31,7 +33,9 @@ import { UiSelectModule } from '@ui/select/select.module';
     UiSelectModule,
     DigiNgDialogModule,
     UiTextareaModule,
+    UiFileUploadModule,
     UiLinkButtonModule,
+    UiLoaderModule,
   ],
   providers: [InformativRapportFormService],
   exports: [InformativRapportFormComponent],
diff --git a/apps/mina-sidor-fa/src/app/shared/enums/informativ-rapport-category.enum.ts b/apps/mina-sidor-fa/src/app/shared/enums/informativ-rapport-category.enum.ts
index cf2dd38..f9bd4a9 100644
--- a/apps/mina-sidor-fa/src/app/shared/enums/informativ-rapport-category.enum.ts
+++ b/apps/mina-sidor-fa/src/app/shared/enums/informativ-rapport-category.enum.ts
@@ -3,6 +3,7 @@ export enum InformativRapportCategory {
   hjalpmedel = 'Behov av hjälpmedel',
   teckensprakstolk = 'Behov av teckenspråkstolk',
   dialog = 'Behov av dialog med Arbetsförmedlingen',
+  dokument = 'Skicka dokumentation till Arbetsförmedlingen',
 }
 
 export type InformativRapportCategoryKey = keyof InformativRapportCategory;
diff --git a/apps/mina-sidor-fa/src/app/shared/models/api/informativ-rapport.request.model.ts b/apps/mina-sidor-fa/src/app/shared/models/api/informativ-rapport.request.model.ts
index bcbd643..641d146 100644
--- a/apps/mina-sidor-fa/src/app/shared/models/api/informativ-rapport.request.model.ts
+++ b/apps/mina-sidor-fa/src/app/shared/models/api/informativ-rapport.request.model.ts
@@ -4,3 +4,10 @@ export interface InformativRapportRequest {
   category: InformativRapportCategoryKey;
   comment: string;
 }
+
+export interface InformativRapportWithFileRequest {
+  genomforandeReferens: number;
+  category: InformativRapportCategoryKey;
+  comment: string;
+  file: File;
+}
diff --git a/libs/ui/src/file-upload/file-upload.component.html b/libs/ui/src/file-upload/file-upload.component.html
new file mode 100644
index 0000000..c9fa0d6
--- /dev/null
+++ b/libs/ui/src/file-upload/file-upload.component.html
@@ -0,0 +1,52 @@
+<div class="ui-file-upload">
+  <digi-form-label
+    class="ui-file-upload__label"
+    [afFor]="uiId"
+    [afLabel]="uiLabel"
+    [afRequired]="uiRequired"
+    [afDescription]="uiLabelDescription"
+    [afAnnounceIfOptional]="uiAnnounceIfOptional"
+  ></digi-form-label>
+  <digi-button
+    *ngIf="uiMultiple || files.length < 1"
+    af-variation="secondary"
+    [afAriaLabel]="uploadBtnAriaLabel"
+    (afOnClick)="fileInput.click()"
+  >
+    {{ uiUploadBtnText }}
+    <ui-icon [uiType]="iconType.PAPERCLIP" slot="icon"></ui-icon>
+    <input
+      #fileInput
+      (change)="onUploadFileHandler($event)"
+      [id]="uiId"
+      class="ui-file-upload__input"
+      [attr.multiple]="uiMultiple"
+      type="file"
+      [attr.accept]="uiAccept"
+      [attr.name]="uiName"
+      [attr.required]="uiRequired"
+    />
+  </digi-button>
+  <digi-form-validation-message class="ui-file-upload__validation-message" *ngIf="uiInvalid" af-variation="error">
+    {{ this.uiInvalidMessage }}
+  </digi-form-validation-message>
+  <p class="ui-file-upload__status-message" #statusMessage aria-live="polite"></p>
+  <dl *ngIf="files.length" class="ui-file-upload__file-row-container">
+    <dt>
+      <h2 class="msfa__a11y-sr-only">Uppladdade filer</h2>
+    </dt>
+    <dd *ngFor="let file of files" class="ui-file-upload__file-row">
+      <p class="ui-file-upload__file-name">{{ file.name }}</p>
+      <digi-button
+        (afOnClick)="onRemoveFileHandler(file['id'])"
+        class="ui-file-upload__file-row-btn"
+        [afAriaLabel]="'Ta bort ' + file.name"
+        af-size="s"
+        af-variation="secondary"
+      >
+        <ui-icon size="m" class="ui-file-upload__icon-remove" [icon]="iconType.X" slot="icon"></ui-icon>
+        Ta bort
+      </digi-button>
+    </dd>
+  </dl>
+</div>
diff --git a/libs/ui/src/file-upload/file-upload.component.scss b/libs/ui/src/file-upload/file-upload.component.scss
new file mode 100644
index 0000000..f7bbbe8
--- /dev/null
+++ b/libs/ui/src/file-upload/file-upload.component.scss
@@ -0,0 +1,61 @@
+@import 'variables/gutters';
+
+$ui__color--gray-20: #efefef;
+
+.ui-file-upload {
+  &__label {
+    ::ng-deep .digi-form-label {
+      margin-bottom: $digi--layout--gutter--s;
+      margin-top: $digi--layout--gutter--m;
+    }
+  }
+
+  &__file-row {
+    display: inline-flex;
+    width: 100%;
+    margin-bottom: $digi--layout--gutter;
+  }
+
+  &__input {
+    display: none;
+  }
+
+  &__file-row-container {
+    margin-bottom: 0;
+    margin-top: $digi--layout--gutter--l;
+  }
+
+  &__file-name {
+    font-family: var(--digi--typography--font-family);
+    flex: 1;
+    background-color: $ui__color--gray-20;
+    color: var(--digi--typography--color--text);
+    max-width: u(60);
+    padding: u(1);
+    font-weight: var(--digi--typography--font-weight--semibold);
+    margin-right: u(1.6);
+    margin-bottom: 0;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  &__status-message {
+    clip: rect(0 0 0 0);
+    clip-path: inset(50%);
+    height: 1px;
+    overflow: hidden;
+    position: absolute;
+    white-space: nowrap;
+    width: 1px;
+  }
+
+  &__icon-remove {
+    --digi--ui--width--icon: 100%;
+  }
+
+  &__validation-message {
+    display: block;
+    margin-top: var(--digi--layout--gutter--s);
+  }
+}
diff --git a/libs/ui/src/file-upload/file-upload.component.ts b/libs/ui/src/file-upload/file-upload.component.ts
new file mode 100644
index 0000000..8406a23
--- /dev/null
+++ b/libs/ui/src/file-upload/file-upload.component.ts
@@ -0,0 +1,190 @@
+import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  ElementRef,
+  EventEmitter,
+  Input,
+  Output,
+  ViewChild,
+} from '@angular/core';
+import { randomIdGenerator } from '@digi/core/dist/collection/global/utils/randomIdGenerator';
+import { UiIconType } from '@ui/icon/icon-type.enum';
+/**
+ * This component is used for uploading files. It restyles an input type file and emits events when a file is added or
+ * removed. It is up to the implementor to actually save the file to a backend.
+ */
+
+@Component({
+  selector: 'ui-file-upload',
+  templateUrl: './file-upload.component.html',
+  styleUrls: ['./file-upload.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class FileUploadComponent {
+  iconType = UiIconType;
+  /**
+   * Label for button
+   */
+  @Input() uiUploadBtnText = 'Välj filer';
+  /**
+   * If multiple file upload
+   */
+  @Input() uiMultiple = false;
+  /**
+   * UiHeader is used to set the header to the component
+   */
+  @Input() uiLabel?: string;
+  /**
+   * If invalid
+   */
+  @Input() uiInvalid = false;
+  /**
+   * UiText is used to set the information text
+   */
+  @Input() uiLabelDescription?: string;
+  /**
+   * ID for the input
+   */
+  @Input() uiId: string = randomIdGenerator('ui-fileupload');
+  /**
+   * uiSecondary is to set outlined or contained variant on the button.
+   * Defaults to true.
+   */
+  @Input() uiSecondary = false;
+  /**
+   * Maps directly to the input field's accept attribute. Use this to limit accepted file types.
+   */
+  @Input() uiAccept?: string;
+  /**
+   * Maps directly to the input field's name attribute.
+   */
+  @Input() uiName?: string;
+  /**
+   * Is this a required form field?
+   */
+  @Input() uiRequired = false;
+  /**
+   * Max file size allowed in kb
+   */
+  @Input() uiMaxFileSize: number;
+  /**
+   * Normally a required field is visually and semantically emphasized.
+   * This flips that and emphasizes the field if it is not required.
+   * Set this to true if your form contains more required fields than not.
+   */
+  @Input() uiAnnounceIfOptional = false;
+  /**
+   * Invalid message
+   */
+  @Input() uiInvalidMessage?: string;
+  /**
+   * UiOnUploadFiles is a function which emits all selected files.
+   */
+  @Output() uiOnUploadFiles: EventEmitter<File[]> = new EventEmitter<File[]>();
+  /**
+   * UiOnRemoveFile emits when the selected file is successfully removed.
+   * Emits the updated array with files.
+   */
+  @Output() uiOnRemoveFile: EventEmitter<File> = new EventEmitter<File>();
+  /**
+   * @ignore
+   */
+  @ViewChild('fileInput') fileInput: HTMLInputElement;
+  /**
+   * @ignore
+   */
+  @ViewChild('statusMessage') statusMessage: ElementRef;
+  /**
+   * @ignore
+   */
+  files: File[] = [];
+
+  constructor(private changeDetector: ChangeDetectorRef) {}
+
+  /**
+   * @ignore
+   */
+  onUploadFileHandler(event: any): void {
+    if (!event.target.files) {
+      return;
+    }
+
+    if (this.uiMaxFileSize) {
+      if (this.convertBytesToKb(2, event.target.files[0].size) > this.uiMaxFileSize) {
+        this.uiInvalid = true;
+        this.uiInvalidMessage = `
+          Filen överskrider max tillåten storlek på
+          ${this.convertKbToMb(this.uiMaxFileSize)} MB
+        `;
+        return;
+      } else {
+        this.uiInvalid = false;
+        this.uiInvalidMessage = '';
+      }
+    }
+
+    this.files = [...this.files, ...event.target.files];
+    this.files.forEach(file => (file['id'] = randomIdGenerator('file')));
+    this.uiOnUploadFiles.emit(this.files);
+
+    const fileName = event.target.files[0] ? event.target.files[0].name : '';
+    this.updateStatusMessage('add', fileName);
+  }
+
+  convertBytesToKb(decimals: number, fileSize: number): number {
+    const k = 1024;
+    const dm = decimals < 0 ? 0 : decimals;
+    const i = Math.floor(Math.log(fileSize) / Math.log(k));
+    return parseFloat((fileSize / Math.pow(k, i)).toFixed(dm));
+  }
+
+  convertKbToMb(size: number): string {
+    return (size / 1024).toFixed(2);
+  }
+
+  /**
+   * @ignore
+   */
+  onRemoveFileHandler(id: string) {
+    const index = this.files.findIndex(file => file['id'] === id);
+    if (index === -1) {
+      return;
+    }
+    const fileToRemove = this.files[index];
+    this.files = [...this.files.slice(0, index), ...this.files.slice(index + 1)];
+    this.uiOnRemoveFile.emit(fileToRemove);
+    this.changeDetector.detectChanges();
+
+    this.updateStatusMessage('remove');
+  }
+
+  /**
+   * @ignore
+   */
+  updateStatusMessage(type: string, fileName: string = '') {
+    const statusMessage = this.statusMessage.nativeElement;
+    statusMessage.textContent = '';
+
+    setTimeout(() => {
+      switch (type) {
+        case 'remove':
+          statusMessage.textContent =
+            this.files.length > 0 ? 'Fil borttagen' : 'Fil borttagen. Du har inga filer uppladdade';
+          break;
+        case 'add':
+          statusMessage.textContent = `Fil uppladdad ${fileName}`;
+          break;
+        default:
+          statusMessage.textContent = '';
+      }
+    }, 50);
+  }
+
+  /**
+   * @ignore
+   */
+  get uploadBtnAriaLabel() {
+    return this.files.length > 0 && this.uiMultiple ? 'Välj ny fil' : 'Välj fil';
+  }
+}
diff --git a/libs/ui/src/file-upload/file-upload.module.ts b/libs/ui/src/file-upload/file-upload.module.ts
new file mode 100644
index 0000000..b817e2e
--- /dev/null
+++ b/libs/ui/src/file-upload/file-upload.module.ts
@@ -0,0 +1,15 @@
+import { CommonModule } from '@angular/common';
+import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { FileUploadComponent } from './file-upload.component';
+import { UiIconModule } from '@ui/icon/icon.module';
+
+const COMPONENTS = [FileUploadComponent];
+const MODULES = [CommonModule];
+
+@NgModule({
+  schemas: [CUSTOM_ELEMENTS_SCHEMA],
+  imports: [...MODULES, UiIconModule],
+  declarations: [...COMPONENTS],
+  exports: [...COMPONENTS],
+})
+export class UiFileUploadModule {}
diff --git a/libs/ui/src/icon/icon-type.enum.ts b/libs/ui/src/icon/icon-type.enum.ts
index b9121bc..9033a25 100644
--- a/libs/ui/src/icon/icon-type.enum.ts
+++ b/libs/ui/src/icon/icon-type.enum.ts
@@ -22,4 +22,5 @@ export enum UiIconType {
   EYE = 'eye',
   EYESLASH = 'eyeslash',
   ARCHIVE = 'archive',
+  PAPERCLIP = 'paperclip'
 }
diff --git a/libs/ui/src/icon/icon.component.html b/libs/ui/src/icon/icon.component.html
index 9700ad6..e48594e 100644
--- a/libs/ui/src/icon/icon.component.html
+++ b/libs/ui/src/icon/icon.component.html
@@ -99,5 +99,6 @@
     <digi-icon-eye *ngSwitchCase="iconType.EYE" [ngClass]="iconClass"></digi-icon-eye>
     <digi-icon-eye-slash *ngSwitchCase="iconType.EYESLASH" [ngClass]="iconClass"></digi-icon-eye-slash>
     <digi-icon-archive *ngSwitchCase="iconType.ARCHIVE" [ngClass]="iconClass"></digi-icon-archive>
+    <digi-icon-paperclip *ngSwitchCase="iconType.PAPERCLIP" [ngClass]="iconClass"></digi-icon-paperclip>
   </ng-container>
 </ng-template>
diff --git a/package-lock.json b/package-lock.json
index 0af7d9d..ab0ec51 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,6 +5,7 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "mina-sidor-fa-web",
       "version": "2.4.0",
       "hasInstallScript": true,
       "license": "MIT",
@@ -31459,30 +31460,30 @@
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/abbrev": {
       "version": "1.1.1",
-      "extraneous": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/ansi-regex": {
       "version": "2.1.1",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/aproba": {
       "version": "1.2.0",
-      "extraneous": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/are-we-there-yet": {
       "version": "1.1.5",
-      "extraneous": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "delegates": "^1.0.0",
         "readable-stream": "^2.0.6"
@@ -31490,15 +31491,15 @@
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/balanced-match": {
       "version": "1.0.0",
-      "extraneous": true,
       "inBundle": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/brace-expansion": {
       "version": "1.1.11",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -31506,66 +31507,66 @@
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/chownr": {
       "version": "1.1.4",
-      "extraneous": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/code-point-at": {
       "version": "1.1.0",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/concat-map": {
       "version": "0.0.1",
-      "extraneous": true,
       "inBundle": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/console-control-strings": {
       "version": "1.1.0",
-      "extraneous": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/core-util-is": {
       "version": "1.0.2",
-      "extraneous": true,
       "inBundle": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/debug": {
       "version": "3.2.6",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/deep-extend": {
       "version": "0.6.0",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "engines": {
         "node": ">=4.0.0"
       }
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/delegates": {
       "version": "1.0.0",
-      "extraneous": true,
       "inBundle": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/detect-libc": {
       "version": "1.0.3",
-      "extraneous": true,
       "inBundle": true,
       "license": "Apache-2.0",
+      "optional": true,
       "bin": {
         "detect-libc": "bin/detect-libc.js"
       },
@@ -31575,24 +31576,24 @@
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/fs-minipass": {
       "version": "1.2.7",
-      "extraneous": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "minipass": "^2.6.0"
       }
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/fs.realpath": {
       "version": "1.0.0",
-      "extraneous": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/gauge": {
       "version": "2.7.4",
-      "extraneous": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "aproba": "^1.0.3",
         "console-control-strings": "^1.0.0",
@@ -31606,9 +31607,9 @@
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/glob": {
       "version": "7.1.6",
-      "extraneous": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -31626,15 +31627,15 @@
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/has-unicode": {
       "version": "2.0.1",
-      "extraneous": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/iconv-lite": {
       "version": "0.4.24",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
       },
@@ -31644,18 +31645,18 @@
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/ignore-walk": {
       "version": "3.0.3",
-      "extraneous": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "minimatch": "^3.0.4"
       }
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/inflight": {
       "version": "1.0.6",
-      "extraneous": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -31663,24 +31664,24 @@
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/inherits": {
       "version": "2.0.4",
-      "extraneous": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/ini": {
       "version": "1.3.5",
-      "extraneous": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "engines": {
         "node": "*"
       }
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/is-fullwidth-code-point": {
       "version": "1.0.0",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "number-is-nan": "^1.0.0"
       },
@@ -31690,15 +31691,15 @@
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/isarray": {
       "version": "1.0.0",
-      "extraneous": true,
       "inBundle": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/minimatch": {
       "version": "3.0.4",
-      "extraneous": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -31708,15 +31709,15 @@
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/minimist": {
       "version": "1.2.5",
-      "extraneous": true,
       "inBundle": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/minipass": {
       "version": "2.9.0",
-      "extraneous": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "safe-buffer": "^5.1.2",
         "yallist": "^3.0.0"
@@ -31724,9 +31725,9 @@
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/minizlib": {
       "version": "1.3.3",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "minipass": "^2.9.0"
       }
@@ -31734,9 +31735,9 @@
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/mkdirp": {
       "version": "0.5.3",
       "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "minimist": "^1.2.5"
       },
@@ -31746,15 +31747,15 @@
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/ms": {
       "version": "2.1.2",
-      "extraneous": true,
       "inBundle": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/needle": {
       "version": "2.3.3",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "debug": "^3.2.6",
         "iconv-lite": "^0.4.4",
@@ -31769,9 +31770,9 @@
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/node-pre-gyp": {
       "version": "0.14.0",
-      "extraneous": true,
       "inBundle": true,
       "license": "BSD-3-Clause",
+      "optional": true,
       "dependencies": {
         "detect-libc": "^1.0.2",
         "mkdirp": "^0.5.1",
@@ -31790,9 +31791,9 @@
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/nopt": {
       "version": "4.0.3",
-      "extraneous": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "abbrev": "1",
         "osenv": "^0.1.4"
@@ -31803,24 +31804,24 @@
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/npm-bundled": {
       "version": "1.1.1",
-      "extraneous": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "npm-normalize-package-bin": "^1.0.1"
       }
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/npm-normalize-package-bin": {
       "version": "1.0.1",
-      "extraneous": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/npm-packlist": {
       "version": "1.4.8",
-      "extraneous": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "ignore-walk": "^3.0.1",
         "npm-bundled": "^1.0.1",
@@ -31829,9 +31830,9 @@
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/npmlog": {
       "version": "4.1.2",
-      "extraneous": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "are-we-there-yet": "~1.1.2",
         "console-control-strings": "~1.1.0",
@@ -31841,54 +31842,54 @@
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/number-is-nan": {
       "version": "1.0.1",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/object-assign": {
       "version": "4.1.1",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/once": {
       "version": "1.4.0",
-      "extraneous": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "wrappy": "1"
       }
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/os-homedir": {
       "version": "1.0.2",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/os-tmpdir": {
       "version": "1.0.2",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/osenv": {
       "version": "0.1.5",
-      "extraneous": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "os-homedir": "^1.0.0",
         "os-tmpdir": "^1.0.0"
@@ -31896,24 +31897,24 @@
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/path-is-absolute": {
       "version": "1.0.1",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/process-nextick-args": {
       "version": "2.0.1",
-      "extraneous": true,
       "inBundle": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/rc": {
       "version": "1.2.8",
-      "extraneous": true,
       "inBundle": true,
       "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
+      "optional": true,
       "dependencies": {
         "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
@@ -31926,9 +31927,9 @@
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/readable-stream": {
       "version": "2.3.7",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -31941,9 +31942,9 @@
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/rimraf": {
       "version": "2.7.1",
-      "extraneous": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -31953,57 +31954,57 @@
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/safe-buffer": {
       "version": "5.1.2",
-      "extraneous": true,
       "inBundle": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/safer-buffer": {
       "version": "2.1.2",
-      "extraneous": true,
       "inBundle": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/sax": {
       "version": "1.2.4",
-      "extraneous": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/semver": {
       "version": "5.7.1",
-      "extraneous": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "bin": {
         "semver": "bin/semver"
       }
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/set-blocking": {
       "version": "2.0.0",
-      "extraneous": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/signal-exit": {
       "version": "3.0.2",
-      "extraneous": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/string_decoder": {
       "version": "1.1.1",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/string-width": {
       "version": "1.0.2",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "code-point-at": "^1.0.0",
         "is-fullwidth-code-point": "^1.0.0",
@@ -32015,9 +32016,9 @@
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/strip-ansi": {
       "version": "3.0.1",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "ansi-regex": "^2.0.0"
       },
@@ -32027,18 +32028,18 @@
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/strip-json-comments": {
       "version": "2.0.1",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/tar": {
       "version": "4.4.13",
-      "extraneous": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "chownr": "^1.1.1",
         "fs-minipass": "^1.2.5",
@@ -32054,30 +32055,30 @@
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/util-deprecate": {
       "version": "1.0.2",
-      "extraneous": true,
       "inBundle": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/wide-align": {
       "version": "1.1.3",
-      "extraneous": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "string-width": "^1.0.2 || 2"
       }
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/wrappy": {
       "version": "1.0.2",
-      "extraneous": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/watchpack-chokidar2/node_modules/fsevents/node_modules/yallist": {
       "version": "3.1.1",
-      "extraneous": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/watchpack-chokidar2/node_modules/glob-parent": {
       "version": "3.1.0",
@@ -32741,30 +32742,34 @@
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/abbrev": {
       "version": "1.1.1",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/ansi-regex": {
       "version": "2.1.1",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/aproba": {
       "version": "1.2.0",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/are-we-there-yet": {
       "version": "1.1.5",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "delegates": "^1.0.0",
         "readable-stream": "^2.0.6"
@@ -32772,15 +32777,17 @@
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/balanced-match": {
       "version": "1.0.0",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/brace-expansion": {
       "version": "1.1.11",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -32788,66 +32795,75 @@
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/chownr": {
       "version": "1.1.4",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/code-point-at": {
       "version": "1.1.0",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/concat-map": {
       "version": "0.0.1",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/console-control-strings": {
       "version": "1.1.0",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/core-util-is": {
       "version": "1.0.2",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/debug": {
       "version": "3.2.6",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/deep-extend": {
       "version": "0.6.0",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "engines": {
         "node": ">=4.0.0"
       }
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/delegates": {
       "version": "1.0.0",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/detect-libc": {
       "version": "1.0.3",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "Apache-2.0",
+      "optional": true,
       "bin": {
         "detect-libc": "bin/detect-libc.js"
       },
@@ -32857,24 +32873,27 @@
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/fs-minipass": {
       "version": "1.2.7",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "minipass": "^2.6.0"
       }
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/fs.realpath": {
       "version": "1.0.0",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/gauge": {
       "version": "2.7.4",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "aproba": "^1.0.3",
         "console-control-strings": "^1.0.0",
@@ -32888,9 +32907,10 @@
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/glob": {
       "version": "7.1.6",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -32908,15 +32928,17 @@
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/has-unicode": {
       "version": "2.0.1",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/iconv-lite": {
       "version": "0.4.24",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
       },
@@ -32926,18 +32948,20 @@
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/ignore-walk": {
       "version": "3.0.3",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "minimatch": "^3.0.4"
       }
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/inflight": {
       "version": "1.0.6",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -32945,24 +32969,27 @@
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/inherits": {
       "version": "2.0.4",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/ini": {
       "version": "1.3.5",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "engines": {
         "node": "*"
       }
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/is-fullwidth-code-point": {
       "version": "1.0.0",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "number-is-nan": "^1.0.0"
       },
@@ -32972,15 +32999,17 @@
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/isarray": {
       "version": "1.0.0",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/minimatch": {
       "version": "3.0.4",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -32990,15 +33019,17 @@
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/minimist": {
       "version": "1.2.5",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/minipass": {
       "version": "2.9.0",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "safe-buffer": "^5.1.2",
         "yallist": "^3.0.0"
@@ -33006,9 +33037,10 @@
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/minizlib": {
       "version": "1.3.3",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "minipass": "^2.9.0"
       }
@@ -33016,9 +33048,10 @@
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/mkdirp": {
       "version": "0.5.3",
       "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "minimist": "^1.2.5"
       },
@@ -33028,15 +33061,17 @@
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/ms": {
       "version": "2.1.2",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/needle": {
       "version": "2.3.3",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "debug": "^3.2.6",
         "iconv-lite": "^0.4.4",
@@ -33051,9 +33086,10 @@
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/node-pre-gyp": {
       "version": "0.14.0",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "BSD-3-Clause",
+      "optional": true,
       "dependencies": {
         "detect-libc": "^1.0.2",
         "mkdirp": "^0.5.1",
@@ -33072,9 +33108,10 @@
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/nopt": {
       "version": "4.0.3",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "abbrev": "1",
         "osenv": "^0.1.4"
@@ -33085,24 +33122,27 @@
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/npm-bundled": {
       "version": "1.1.1",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "npm-normalize-package-bin": "^1.0.1"
       }
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/npm-normalize-package-bin": {
       "version": "1.0.1",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/npm-packlist": {
       "version": "1.4.8",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "ignore-walk": "^3.0.1",
         "npm-bundled": "^1.0.1",
@@ -33111,9 +33151,10 @@
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/npmlog": {
       "version": "4.1.2",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "are-we-there-yet": "~1.1.2",
         "console-control-strings": "~1.1.0",
@@ -33123,54 +33164,60 @@
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/number-is-nan": {
       "version": "1.0.1",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/object-assign": {
       "version": "4.1.1",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/once": {
       "version": "1.4.0",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "wrappy": "1"
       }
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/os-homedir": {
       "version": "1.0.2",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/os-tmpdir": {
       "version": "1.0.2",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/osenv": {
       "version": "0.1.5",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "os-homedir": "^1.0.0",
         "os-tmpdir": "^1.0.0"
@@ -33178,24 +33225,27 @@
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/path-is-absolute": {
       "version": "1.0.1",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/process-nextick-args": {
       "version": "2.0.1",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/rc": {
       "version": "1.2.8",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
+      "optional": true,
       "dependencies": {
         "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
@@ -33208,9 +33258,10 @@
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/readable-stream": {
       "version": "2.3.7",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -33223,9 +33274,10 @@
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/rimraf": {
       "version": "2.7.1",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -33235,57 +33287,65 @@
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/safe-buffer": {
       "version": "5.1.2",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/safer-buffer": {
       "version": "2.1.2",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/sax": {
       "version": "1.2.4",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/semver": {
       "version": "5.7.1",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "bin": {
         "semver": "bin/semver"
       }
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/set-blocking": {
       "version": "2.0.0",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/signal-exit": {
       "version": "3.0.2",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/string_decoder": {
       "version": "1.1.1",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/string-width": {
       "version": "1.0.2",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "code-point-at": "^1.0.0",
         "is-fullwidth-code-point": "^1.0.0",
@@ -33297,9 +33357,10 @@
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/strip-ansi": {
       "version": "3.0.1",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "ansi-regex": "^2.0.0"
       },
@@ -33309,18 +33370,20 @@
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/strip-json-comments": {
       "version": "2.0.1",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "MIT",
+      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/tar": {
       "version": "4.4.13",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "chownr": "^1.1.1",
         "fs-minipass": "^1.2.5",
@@ -33336,30 +33399,34 @@
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/util-deprecate": {
       "version": "1.0.2",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/wide-align": {
       "version": "1.1.3",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "string-width": "^1.0.2 || 2"
       }
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/wrappy": {
       "version": "1.0.2",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/webpack-dev-server/node_modules/fsevents/node_modules/yallist": {
       "version": "3.1.1",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/webpack-dev-server/node_modules/glob-parent": {
       "version": "3.1.0",
@@ -57012,22 +57079,22 @@
             "abbrev": {
               "version": "1.1.1",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "ansi-regex": {
               "version": "2.1.1",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "aproba": {
               "version": "1.2.0",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "are-we-there-yet": {
               "version": "1.1.5",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "delegates": "^1.0.0",
                 "readable-stream": "^2.0.6"
@@ -57036,12 +57103,12 @@
             "balanced-match": {
               "version": "1.0.0",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "brace-expansion": {
               "version": "1.1.11",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -57050,32 +57117,32 @@
             "chownr": {
               "version": "1.1.4",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "concat-map": {
               "version": "0.0.1",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "core-util-is": {
               "version": "1.0.2",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "debug": {
               "version": "3.2.6",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "ms": "^2.1.1"
               }
@@ -57083,22 +57150,22 @@
             "deep-extend": {
               "version": "0.6.0",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "delegates": {
               "version": "1.0.0",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "detect-libc": {
               "version": "1.0.3",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "fs-minipass": {
               "version": "1.2.7",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "minipass": "^2.6.0"
               }
@@ -57106,12 +57173,12 @@
             "fs.realpath": {
               "version": "1.0.0",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "gauge": {
               "version": "2.7.4",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "aproba": "^1.0.3",
                 "console-control-strings": "^1.0.0",
@@ -57126,7 +57193,7 @@
             "glob": {
               "version": "7.1.6",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "fs.realpath": "^1.0.0",
                 "inflight": "^1.0.4",
@@ -57139,12 +57206,12 @@
             "has-unicode": {
               "version": "2.0.1",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "iconv-lite": {
               "version": "0.4.24",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "safer-buffer": ">= 2.1.2 < 3"
               }
@@ -57152,7 +57219,7 @@
             "ignore-walk": {
               "version": "3.0.3",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "minimatch": "^3.0.4"
               }
@@ -57160,7 +57227,7 @@
             "inflight": {
               "version": "1.0.6",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "once": "^1.3.0",
                 "wrappy": "1"
@@ -57169,17 +57236,17 @@
             "inherits": {
               "version": "2.0.4",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "ini": {
               "version": "1.3.5",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "is-fullwidth-code-point": {
               "version": "1.0.0",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -57187,12 +57254,12 @@
             "isarray": {
               "version": "1.0.0",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "minimatch": {
               "version": "3.0.4",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
@@ -57200,12 +57267,12 @@
             "minimist": {
               "version": "1.2.5",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "minipass": {
               "version": "2.9.0",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -57214,7 +57281,7 @@
             "minizlib": {
               "version": "1.3.3",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "minipass": "^2.9.0"
               }
@@ -57222,7 +57289,7 @@
             "mkdirp": {
               "version": "0.5.3",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "minimist": "^1.2.5"
               }
@@ -57230,12 +57297,12 @@
             "ms": {
               "version": "2.1.2",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "needle": {
               "version": "2.3.3",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "debug": "^3.2.6",
                 "iconv-lite": "^0.4.4",
@@ -57245,7 +57312,7 @@
             "node-pre-gyp": {
               "version": "0.14.0",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "detect-libc": "^1.0.2",
                 "mkdirp": "^0.5.1",
@@ -57262,7 +57329,7 @@
             "nopt": {
               "version": "4.0.3",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "abbrev": "1",
                 "osenv": "^0.1.4"
@@ -57271,7 +57338,7 @@
             "npm-bundled": {
               "version": "1.1.1",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "npm-normalize-package-bin": "^1.0.1"
               }
@@ -57279,12 +57346,12 @@
             "npm-normalize-package-bin": {
               "version": "1.0.1",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "npm-packlist": {
               "version": "1.4.8",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "ignore-walk": "^3.0.1",
                 "npm-bundled": "^1.0.1",
@@ -57294,7 +57361,7 @@
             "npmlog": {
               "version": "4.1.2",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "are-we-there-yet": "~1.1.2",
                 "console-control-strings": "~1.1.0",
@@ -57305,17 +57372,17 @@
             "number-is-nan": {
               "version": "1.0.1",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "object-assign": {
               "version": "4.1.1",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "once": {
               "version": "1.4.0",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -57323,17 +57390,17 @@
             "os-homedir": {
               "version": "1.0.2",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "os-tmpdir": {
               "version": "1.0.2",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "osenv": {
               "version": "0.1.5",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "os-homedir": "^1.0.0",
                 "os-tmpdir": "^1.0.0"
@@ -57342,17 +57409,17 @@
             "path-is-absolute": {
               "version": "1.0.1",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "process-nextick-args": {
               "version": "2.0.1",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "rc": {
               "version": "1.2.8",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "deep-extend": "^0.6.0",
                 "ini": "~1.3.0",
@@ -57363,7 +57430,7 @@
             "readable-stream": {
               "version": "2.3.7",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.3",
@@ -57377,7 +57444,7 @@
             "rimraf": {
               "version": "2.7.1",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "glob": "^7.1.3"
               }
@@ -57385,37 +57452,37 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "safer-buffer": {
               "version": "2.1.2",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "sax": {
               "version": "1.2.4",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "semver": {
               "version": "5.7.1",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "set-blocking": {
               "version": "2.0.0",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "signal-exit": {
               "version": "3.0.2",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "string_decoder": {
               "version": "1.1.1",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "safe-buffer": "~5.1.0"
               }
@@ -57423,7 +57490,7 @@
             "string-width": {
               "version": "1.0.2",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -57433,7 +57500,7 @@
             "strip-ansi": {
               "version": "3.0.1",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -57441,12 +57508,12 @@
             "strip-json-comments": {
               "version": "2.0.1",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "tar": {
               "version": "4.4.13",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "chownr": "^1.1.1",
                 "fs-minipass": "^1.2.5",
@@ -57460,12 +57527,12 @@
             "util-deprecate": {
               "version": "1.0.2",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "wide-align": {
               "version": "1.1.3",
               "bundled": true,
-              "extraneous": true,
+              "optional": true,
               "requires": {
                 "string-width": "^1.0.2 || 2"
               }
@@ -57473,12 +57540,12 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             },
             "yallist": {
               "version": "3.1.1",
               "bundled": true,
-              "extraneous": true
+              "optional": true
             }
           }
         },
@@ -58315,22 +58382,26 @@
             "abbrev": {
               "version": "1.1.1",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "ansi-regex": {
               "version": "2.1.1",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "aproba": {
               "version": "1.2.0",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "are-we-there-yet": {
               "version": "1.1.5",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "delegates": "^1.0.0",
                 "readable-stream": "^2.0.6"
@@ -58339,12 +58410,14 @@
             "balanced-match": {
               "version": "1.0.0",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "brace-expansion": {
               "version": "1.1.11",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -58353,32 +58426,38 @@
             "chownr": {
               "version": "1.1.4",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "concat-map": {
               "version": "0.0.1",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "core-util-is": {
               "version": "1.0.2",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "debug": {
               "version": "3.2.6",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "ms": "^2.1.1"
               }
@@ -58386,22 +58465,26 @@
             "deep-extend": {
               "version": "0.6.0",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "delegates": {
               "version": "1.0.0",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "detect-libc": {
               "version": "1.0.3",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "fs-minipass": {
               "version": "1.2.7",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "minipass": "^2.6.0"
               }
@@ -58409,12 +58492,14 @@
             "fs.realpath": {
               "version": "1.0.0",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "gauge": {
               "version": "2.7.4",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "aproba": "^1.0.3",
                 "console-control-strings": "^1.0.0",
@@ -58429,7 +58514,8 @@
             "glob": {
               "version": "7.1.6",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "fs.realpath": "^1.0.0",
                 "inflight": "^1.0.4",
@@ -58442,12 +58528,14 @@
             "has-unicode": {
               "version": "2.0.1",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "iconv-lite": {
               "version": "0.4.24",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "safer-buffer": ">= 2.1.2 < 3"
               }
@@ -58455,7 +58543,8 @@
             "ignore-walk": {
               "version": "3.0.3",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "minimatch": "^3.0.4"
               }
@@ -58463,7 +58552,8 @@
             "inflight": {
               "version": "1.0.6",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "once": "^1.3.0",
                 "wrappy": "1"
@@ -58472,17 +58562,20 @@
             "inherits": {
               "version": "2.0.4",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "ini": {
               "version": "1.3.5",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "is-fullwidth-code-point": {
               "version": "1.0.0",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -58490,12 +58583,14 @@
             "isarray": {
               "version": "1.0.0",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "minimatch": {
               "version": "3.0.4",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
@@ -58503,12 +58598,14 @@
             "minimist": {
               "version": "1.2.5",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "minipass": {
               "version": "2.9.0",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -58517,7 +58614,8 @@
             "minizlib": {
               "version": "1.3.3",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "minipass": "^2.9.0"
               }
@@ -58525,7 +58623,8 @@
             "mkdirp": {
               "version": "0.5.3",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "minimist": "^1.2.5"
               }
@@ -58533,12 +58632,14 @@
             "ms": {
               "version": "2.1.2",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "needle": {
               "version": "2.3.3",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "debug": "^3.2.6",
                 "iconv-lite": "^0.4.4",
@@ -58548,7 +58649,8 @@
             "node-pre-gyp": {
               "version": "0.14.0",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "detect-libc": "^1.0.2",
                 "mkdirp": "^0.5.1",
@@ -58565,7 +58667,8 @@
             "nopt": {
               "version": "4.0.3",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "abbrev": "1",
                 "osenv": "^0.1.4"
@@ -58574,7 +58677,8 @@
             "npm-bundled": {
               "version": "1.1.1",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "npm-normalize-package-bin": "^1.0.1"
               }
@@ -58582,12 +58686,14 @@
             "npm-normalize-package-bin": {
               "version": "1.0.1",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "npm-packlist": {
               "version": "1.4.8",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "ignore-walk": "^3.0.1",
                 "npm-bundled": "^1.0.1",
@@ -58597,7 +58703,8 @@
             "npmlog": {
               "version": "4.1.2",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "are-we-there-yet": "~1.1.2",
                 "console-control-strings": "~1.1.0",
@@ -58608,17 +58715,20 @@
             "number-is-nan": {
               "version": "1.0.1",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "object-assign": {
               "version": "4.1.1",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "once": {
               "version": "1.4.0",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -58626,17 +58736,20 @@
             "os-homedir": {
               "version": "1.0.2",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "os-tmpdir": {
               "version": "1.0.2",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "osenv": {
               "version": "0.1.5",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "os-homedir": "^1.0.0",
                 "os-tmpdir": "^1.0.0"
@@ -58645,17 +58758,20 @@
             "path-is-absolute": {
               "version": "1.0.1",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "process-nextick-args": {
               "version": "2.0.1",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "rc": {
               "version": "1.2.8",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "deep-extend": "^0.6.0",
                 "ini": "~1.3.0",
@@ -58666,7 +58782,8 @@
             "readable-stream": {
               "version": "2.3.7",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "core-util-is": "~1.0.0",
                 "inherits": "~2.0.3",
@@ -58680,7 +58797,8 @@
             "rimraf": {
               "version": "2.7.1",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "glob": "^7.1.3"
               }
@@ -58688,37 +58806,44 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "safer-buffer": {
               "version": "2.1.2",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "sax": {
               "version": "1.2.4",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "semver": {
               "version": "5.7.1",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "set-blocking": {
               "version": "2.0.0",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "signal-exit": {
               "version": "3.0.2",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "string_decoder": {
               "version": "1.1.1",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "safe-buffer": "~5.1.0"
               }
@@ -58726,7 +58851,8 @@
             "string-width": {
               "version": "1.0.2",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -58736,7 +58862,8 @@
             "strip-ansi": {
               "version": "3.0.1",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -58744,12 +58871,14 @@
             "strip-json-comments": {
               "version": "2.0.1",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "tar": {
               "version": "4.4.13",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "chownr": "^1.1.1",
                 "fs-minipass": "^1.2.5",
@@ -58763,12 +58892,14 @@
             "util-deprecate": {
               "version": "1.0.2",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "wide-align": {
               "version": "1.1.3",
               "bundled": true,
-              "extraneous": true,
+              "dev": true,
+              "optional": true,
               "requires": {
                 "string-width": "^1.0.2 || 2"
               }
@@ -58776,12 +58907,14 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             },
             "yallist": {
               "version": "3.1.1",
               "bundled": true,
-              "extraneous": true
+              "dev": true,
+              "optional": true
             }
           }
         },