From 4266090291854b52b41f2267e86c49f1d4409ccb Mon Sep 17 00:00:00 2001 From: inemp <57984363+inemp@users.noreply.github.com> Date: Tue, 3 Mar 2020 14:45:20 +0100 Subject: [PATCH 01/13] Added alphabetical order in the 2 drop downs of edit project ( add Leader and add Lab) --- .../app/entities/project/project-update.component.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/app/entities/project/project-update.component.ts b/src/main/webapp/app/entities/project/project-update.component.ts index 536c8ba..a82ce56 100644 --- a/src/main/webapp/app/entities/project/project-update.component.ts +++ b/src/main/webapp/app/entities/project/project-update.component.ts @@ -66,7 +66,10 @@ export class ProjectUpdateComponent implements OnInit { filter((mayBeOk: HttpResponse) => mayBeOk.ok), map((response: HttpResponse) => response.body) ) - .subscribe((res: IIhiwUser[]) => (this.ihiwusers = res), (res: HttpErrorResponse) => this.onError(res.message)); + .subscribe( + (res: IIhiwUser[]) => (this.ihiwusers = res.sort((a, b) => (a.user.lastName > b.user.lastName ? 1 : -1))), + (res: HttpErrorResponse) => this.onError(res.message) + ); } }); this.ihiwLabService @@ -75,7 +78,10 @@ export class ProjectUpdateComponent implements OnInit { filter((mayBeOk: HttpResponse) => mayBeOk.ok), map((response: HttpResponse) => response.body) ) - .subscribe((res: IIhiwLab[]) => (this.ihiwlabs = res), (res: HttpErrorResponse) => this.onError(res.message)); + .subscribe( + (res: IIhiwLab[]) => (this.ihiwlabs = res.sort((a, b) => (a.labCode > b.labCode ? 1 : -1))), + (res: HttpErrorResponse) => this.onError(res.message) + ); } updateForm(project: IProject) { From 3721b783e40174a98e68e710e35c21d2bc040fe2 Mon Sep 17 00:00:00 2001 From: inemp <57984363+inemp@users.noreply.github.com> Date: Tue, 3 Mar 2020 15:07:53 +0100 Subject: [PATCH 02/13] Now capitals and lowercase both follow the same alphabetical order. (not all caps first and then all lowercase). --- .../webapp/app/entities/project/project-update.component.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/app/entities/project/project-update.component.ts b/src/main/webapp/app/entities/project/project-update.component.ts index a82ce56..22ce16a 100644 --- a/src/main/webapp/app/entities/project/project-update.component.ts +++ b/src/main/webapp/app/entities/project/project-update.component.ts @@ -67,7 +67,8 @@ export class ProjectUpdateComponent implements OnInit { map((response: HttpResponse) => response.body) ) .subscribe( - (res: IIhiwUser[]) => (this.ihiwusers = res.sort((a, b) => (a.user.lastName > b.user.lastName ? 1 : -1))), + (res: IIhiwUser[]) => + (this.ihiwusers = res.sort((a, b) => (a.user.lastName.toUpperCase() > b.user.lastName.toUpperCase() ? 1 : -1))), (res: HttpErrorResponse) => this.onError(res.message) ); } @@ -79,7 +80,7 @@ export class ProjectUpdateComponent implements OnInit { map((response: HttpResponse) => response.body) ) .subscribe( - (res: IIhiwLab[]) => (this.ihiwlabs = res.sort((a, b) => (a.labCode > b.labCode ? 1 : -1))), + (res: IIhiwLab[]) => (this.ihiwlabs = res.sort((a, b) => (a.labCode.toUpperCase() > b.labCode.toUpperCase() ? 1 : -1))), (res: HttpErrorResponse) => this.onError(res.message) ); } From 8151a111a64e57896da128c3b4dd1f3fda4b1074 Mon Sep 17 00:00:00 2001 From: inemp <57984363+inemp@users.noreply.github.com> Date: Tue, 3 Mar 2020 15:08:26 +0100 Subject: [PATCH 03/13] Added alphabetical order in the 2 drop downs of edit project ( add Leader and add Lab) --- src/main/webapp/app/entities/project/project.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/app/entities/project/project.component.html b/src/main/webapp/app/entities/project/project.component.html index b624180..966b372 100644 --- a/src/main/webapp/app/entities/project/project.component.html +++ b/src/main/webapp/app/entities/project/project.component.html @@ -30,7 +30,7 @@

- + {{project.id}} {{project.name}} {{project.component}} @@ -60,7 +60,7 @@

- + {{labWrapper.lab.labCode}} From e2b55547627981a99d098dae591a1984644d9c29 Mon Sep 17 00:00:00 2001 From: cyt-mn Date: Tue, 10 Mar 2020 11:53:13 +0100 Subject: [PATCH 04/13] version up --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4e26242..21ce148 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.ihiw.management ihiw-management - 1.0.14 + 1.0.15 jar Ihiw Management From 7ab2b8c08e1b1bfc5d1811f7b662481e7c8d84da Mon Sep 17 00:00:00 2001 From: inemp <57984363+inemp@users.noreply.github.com> Date: Thu, 26 Mar 2020 11:37:21 +0100 Subject: [PATCH 05/13] You should be able to see the sorting arrows in the window. If you click them, you should get an error 404 because the call is /admin/ihiw-lab?.. --- .../repository/IhiwLabRepository.java | 24 +- .../ihiw/management/service/UserService.java | 13 +- .../ihiw/management/service/dto/LabDTO.java | 393 ++++++++++++++++++ .../management/service/mapper/LabMapper.java | 33 ++ .../management/web/rest/IhiwLabResource.java | 54 ++- .../entities/ihiw-lab/ihiw-lab.component.html | 14 +- .../entities/ihiw-lab/ihiw-lab.component.ts | 76 +++- .../app/entities/ihiw-lab/ihiw-lab.route.ts | 9 +- 8 files changed, 576 insertions(+), 40 deletions(-) create mode 100644 src/main/java/org/ihiw/management/service/dto/LabDTO.java create mode 100644 src/main/java/org/ihiw/management/service/mapper/LabMapper.java diff --git a/src/main/java/org/ihiw/management/repository/IhiwLabRepository.java b/src/main/java/org/ihiw/management/repository/IhiwLabRepository.java index deccd3d..cf98d2d 100644 --- a/src/main/java/org/ihiw/management/repository/IhiwLabRepository.java +++ b/src/main/java/org/ihiw/management/repository/IhiwLabRepository.java @@ -1,9 +1,14 @@ package org.ihiw.management.repository; import org.ihiw.management.domain.IhiwLab; -import org.springframework.data.jpa.repository.*; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import java.util.List; import java.util.Optional; @@ -13,5 +18,20 @@ @SuppressWarnings("unused") @Repository public interface IhiwLabRepository extends JpaRepository { - Optional findByLabCode(String labCode); + Optional findByLabCode(String LabCode); + + Optional findById(Long id); + + Page findAllById(Pageable pageable, Long id); + + @Query("select lab from IhiwLab lab") + Page findAll(Pageable pageable); + + + @Query("select lab from IhiwLab lab WHERE lab.id in (:ids)") + Page findByLabInIds(Pageable pageable, @Param("ids") List ids); } + + + + diff --git a/src/main/java/org/ihiw/management/service/UserService.java b/src/main/java/org/ihiw/management/service/UserService.java index 6cbbd66..703aaec 100644 --- a/src/main/java/org/ihiw/management/service/UserService.java +++ b/src/main/java/org/ihiw/management/service/UserService.java @@ -11,10 +11,13 @@ import org.ihiw.management.repository.UserRepository; import org.ihiw.management.security.AuthoritiesConstants; import org.ihiw.management.security.SecurityUtils; +import org.ihiw.management.service.dto.LabDTO; import org.ihiw.management.service.dto.UserDTO; import org.ihiw.management.service.util.RandomUtil; -import org.ihiw.management.web.rest.errors.*; - +import org.ihiw.management.web.rest.errors.EmailAlreadyUsedException; +import org.ihiw.management.web.rest.errors.InvalidPasswordException; +import org.ihiw.management.web.rest.errors.LabDoesNotExistException; +import org.ihiw.management.web.rest.errors.LoginAlreadyUsedException; import org.ihiw.management.web.rest.vm.ManagedUserVM; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -359,6 +362,12 @@ public Page getAllManagedUsers(Pageable pageable) { return userRepository.findAllByLoginNot(pageable, Constants.ANONYMOUS_USER).map(UserDTO::new); } + @Transactional(readOnly = true) + public Page getAllLabs(Pageable pageable) { + return ihiwLabRepository.findAll(pageable).map(LabDTO::new); + } + + @Transactional(readOnly = true) public Page getMyManagedUsers(Pageable pageable, IhiwLab ihiwLab) { List users = ihiwUserRepository.findByLab(ihiwLab); diff --git a/src/main/java/org/ihiw/management/service/dto/LabDTO.java b/src/main/java/org/ihiw/management/service/dto/LabDTO.java new file mode 100644 index 0000000..bf5e02c --- /dev/null +++ b/src/main/java/org/ihiw/management/service/dto/LabDTO.java @@ -0,0 +1,393 @@ +package org.ihiw.management.service.dto; + +import org.ihiw.management.domain.IhiwLab; + +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.time.ZonedDateTime; + +public class LabDTO { + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + private Long id; + + @NotBlank + //@Pattern(regexp = Constants.LOGIN_REGEX) + @Size(min = 1, max = 50) + private String labCode; + + @Size(max = 50) + private String title; + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + @Size(max = 50) + private String director; + + @Size(max = 50) + private String department; + + @Size(max = 50) + private String firstName; + + @Size(max = 50) + private String lastName; + + @Email + @Size(min = 5, max = 254) + private String email; + + @Size(max = 50) + private String institution; + + @Size(max = 50) + private String address1; + + @Size(max = 50) + private String address2; + + @Size(max = 50) + private String sAddress1; + + @Size(max = 50) + private String sAddress; + + @Size(max = 50) + private String city; + + @Size(max = 50) + private String state; + + @Size(max = 50) + private String zip; + + @Size(max = 100) + private String country; + + @Size(max = 50) + private String phone; + + @Size(max = 50) + private String fax; + + @Size(max = 50) + private String url; + + @Size(max = 50) + private String oldLabCode; + + @Size(max = 50) + private String sName; + + @Size(max = 50) + private String sPhone; + + @Size(max = 50) + private String sEmail; + + @Size(max = 50) + private String dName; + + @Size(max = 50) + private String dEmail; + + public String getLabCode() { + return labCode; + } + + public void setLabCode(String labCode) { + this.labCode = labCode; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getInstitution() { + return institution; + } + + public void setInstitution(String institution) { + this.institution = institution; + } + + public String getAddress1() { + return address1; + } + + public void setAddress1(String address1) { + this.address1 = address1; + } + + public String getAddress2() { + return address2; + } + + public void setAddress2(String address2) { + this.address2 = address2; + } + + public String getsAddress1() { + return sAddress1; + } + + public void setsAddress1(String sAddress1) { + this.sAddress1 = sAddress1; + } + + public String getsAddress() { + return sAddress; + } + + public void setsAddress(String sAddress) { + this.sAddress = sAddress; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getZip() { + return zip; + } + + public void setZip(String zip) { + this.zip = zip; + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getOldLabCode() { + return oldLabCode; + } + + public void setOldLabCode(String oldLabCode) { + this.oldLabCode = oldLabCode; + } + + public String getsName() { + return sName; + } + + public void setsName(String sName) { + this.sName = sName; + } + + public String getsPhone() { + return sPhone; + } + + public void setsPhone(String sPhone) { + this.sPhone = sPhone; + } + + public String getsEmail() { + return sEmail; + } + + public void setsEmail(String sEmail) { + this.sEmail = sEmail; + } + + public String getdName() { + return dName; + } + + public void setdName(String dName) { + this.dName = dName; + } + + public String getdEmail() { + return dEmail; + } + + public void setdEmail(String dEmail) { + this.dEmail = dEmail; + } + + public String getdPhone() { + return dPhone; + } + + public void setdPhone(String dPhone) { + this.dPhone = dPhone; + } + + @Size(max = 50) + private String dPhone; + + public ZonedDateTime getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(ZonedDateTime createdAt) { + this.createdAt = createdAt; + } + + @Size(max = 200) + private ZonedDateTime createdAt; + + + public LabDTO() { + // Empty constructor needed for Jackson. + } + + public LabDTO(IhiwLab lab) { + this.id = lab.getId(); + this.labCode = lab.getLabCode(); + this.firstName = lab.getFirstName(); + this.lastName = lab.getLastName(); + this.email = lab.getEmail(); + this.title = lab.getTitle(); + this.institution = lab.getInstitution(); + this.address1 = lab.getAddress1(); + this.address2 = lab.getAddress2(); + this.sAddress1 = lab.getsAddress1(); + this.sAddress = lab.getsAddress(); + this.city = lab.getCity(); + this.state = lab.getState(); + this.zip = lab.getZip(); + this.country=lab.getCountry(); + this.phone = lab.getPhone(); + this.fax = lab.getFax(); + this.url = lab.getUrl(); + this.oldLabCode = lab.getOldLabCode(); + this.dName = lab.getdName(); + this.dEmail= lab.getdEmail(); + this.dPhone = lab.getdPhone(); + this.createdAt = lab.getCreatedAt(); + this.department = lab.getDepartment(); + this.director = lab.getDirector(); + //this.authorities = lab.getAuthorities().stream() + // .map(Authority::getName) + // .collect(Collectors.toSet()); + } + + @Override + public String toString() { + return "IhiwLab{" + + "id=" + getId() + + ", labCode='" + getLabCode() + "'" + + ", title='" + getTitle() + "'" + + ", firstName='" + getFirstName() + "'" + + ", lastName='" + getLastName() + "'" + + ", director='" + getDirector() + "'" + + ", department='" + getDepartment() + "'" + + ", institution='" + getInstitution() + "'" + + ", address1='" + getAddress1() + "'" + + ", address2='" + getAddress2() + "'" + + ", sAddress1='" + getsAddress1() + "'" + + ", sAddress='" + getsAddress() + "'" + + ", city='" + getCity() + "'" + + ", state='" + getState() + "'" + + ", zip='" + getZip() + "'" + + ", country='" + getCountry() + "'" + + ", phone='" + getPhone() + "'" + + ", fax='" + getFax() + "'" + + ", email='" + getEmail() + "'" + + ", url='" + getUrl() + "'" + + ", oldLabCode='" + getOldLabCode() + "'" + + ", sName='" + getsName() + "'" + + ", sPhone='" + getsPhone() + "'" + + ", sEmail='" + getsEmail() + "'" + + ", dName='" + getdName() + "'" + + ", dEmail='" + getdEmail() + "'" + + ", dPhone='" + getdPhone() + "'" + + ", createdAt='" + getCreatedAt() + "'" + + "}"; + } + + +} diff --git a/src/main/java/org/ihiw/management/service/mapper/LabMapper.java b/src/main/java/org/ihiw/management/service/mapper/LabMapper.java new file mode 100644 index 0000000..66f9a71 --- /dev/null +++ b/src/main/java/org/ihiw/management/service/mapper/LabMapper.java @@ -0,0 +1,33 @@ +package org.ihiw.management.service.mapper; + +import org.ihiw.management.domain.IhiwLab; +import org.ihiw.management.domain.User; +import org.ihiw.management.service.dto.LabDTO; +import org.ihiw.management.service.dto.UserDTO; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +/** + * Mapper for the entity {@link User} and its DTO called {@link UserDTO}. + * + * Normal mappers are generated using MapStruct, this one is hand-coded as MapStruct + * support is still in beta, and requires a manual step with an IDE. + */ +@Service +public class LabMapper { + + public List labToLabDTO(List labs) { + return labs.stream() + .filter(Objects::nonNull) + .map(this::labToLabDTO) + .collect(Collectors.toList()); + } + + public LabDTO labToLabDTO(IhiwLab lab) { + return new LabDTO(lab); + } + +} diff --git a/src/main/java/org/ihiw/management/web/rest/IhiwLabResource.java b/src/main/java/org/ihiw/management/web/rest/IhiwLabResource.java index 0d8e249..abf0568 100644 --- a/src/main/java/org/ihiw/management/web/rest/IhiwLabResource.java +++ b/src/main/java/org/ihiw/management/web/rest/IhiwLabResource.java @@ -1,34 +1,36 @@ package org.ihiw.management.web.rest; +import io.github.jhipster.web.util.HeaderUtil; +import io.github.jhipster.web.util.PaginationUtil; import org.ihiw.management.domain.*; import org.ihiw.management.repository.IhiwLabRepository; import org.ihiw.management.repository.IhiwUserRepository; import org.ihiw.management.repository.ProjectRepository; import org.ihiw.management.security.AuthoritiesConstants; import org.ihiw.management.service.UserService; +import org.ihiw.management.service.dto.LabDTO; +import org.ihiw.management.service.mapper.LabMapper; import org.ihiw.management.web.rest.errors.BadRequestAlertException; - -import io.github.jhipster.web.util.HeaderUtil; -import io.github.jhipster.web.util.ResponseUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; +import org.springframework.data.domain.*; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import javax.validation.Valid; import java.net.URI; import java.net.URISyntaxException; - import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.List; import java.util.Optional; -import static org.ihiw.management.security.AuthoritiesConstants.ADMIN; -import static org.ihiw.management.security.AuthoritiesConstants.PI; -import static org.ihiw.management.security.AuthoritiesConstants.PROJECT_LEADER; +import static org.ihiw.management.security.AuthoritiesConstants.*; /** * REST controller for managing {@link org.ihiw.management.domain.IhiwLab}. @@ -117,17 +119,30 @@ public ResponseEntity updateIhiwLab(@Valid @RequestBody IhiwLab ihiwLab * @return the {@link ResponseEntity} with status {@code 200 (OK)} and the list of ihiwLabs in body. */ + + @GetMapping("/ihiw-labs") - public List getAllIhiwLabs() { + public ResponseEntity> getAllIhiwLabs(@RequestParam(value = "page" , required = false) Integer offset, + @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sort", required = false) String sort) { log.debug("REST request to get all IhiwLabs"); IhiwUser currentIhiwUser = ihiwUserRepository.findByUserIsCurrentUser(); Optional currentUser = userService.getUserWithAuthorities(); List result = new ArrayList<>(); + //Optional currentLab = .getUserWithAuthorities(); + Page page = null; + Pageable pageable; + if(offset != null && size != null) { + Sort sorting = Sort.by(Sort.Direction.fromString(sort.split(",")[1]), sort.split(",")[0]); + pageable = PageRequest.of(offset, size, sorting); + } else { + pageable = Pageable.unpaged(); + } + //if it is an admin, return all labs if (currentUser.get().getAuthorities().contains(new Authority(ADMIN))) { - return ihiwLabRepository.findAll(); + page = userService.getAllLabs(pageable); } //if it is a project leader, add all his projects' labs to the list @@ -140,13 +155,25 @@ public List getAllIhiwLabs() { } } } + LabMapper myMap = new LabMapper(); + List entityToDto = myMap.labToLabDTO(result); + page = new PageImpl<>(entityToDto); } //and finally add the lab of the current user - if (!result.contains(currentIhiwUser.getLab())){ - result.add(currentIhiwUser.getLab()); + if (page == null) { + if (!result.contains(currentIhiwUser.getLab())){ + result.add(currentIhiwUser.getLab()); + LabMapper myMap = new LabMapper(); + List entityToDto = myMap.labToLabDTO(result); + page = new PageImpl<>(entityToDto); + } } - return result; + + + HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(ServletUriComponentsBuilder.fromCurrentRequest(), page); + return new ResponseEntity<>(page.getContent(), headers, HttpStatus.OK); + //return result; } /** @@ -154,7 +181,7 @@ public List getAllIhiwLabs() { * * @param id the id of the ihiwLab to retrieve. * @return the {@link ResponseEntity} with status {@code 200 (OK)} and with body the ihiwLab, or with status {@code 404 (Not Found)}. - */ + @GetMapping("/ihiw-labs/{id}") public ResponseEntity getIhiwLab(@PathVariable Long id) { log.debug("REST request to get IhiwLab : {}", id); @@ -179,6 +206,7 @@ public ResponseEntity getIhiwLab(@PathVariable Long id) { } return ResponseEntity.noContent().headers(HeaderUtil.createAlert(applicationName, ENTITY_NAME, id.toString())).build(); } + */ /** * {@code DELETE /ihiw-labs/:id} : delete the "id" ihiwLab. diff --git a/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.component.html b/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.component.html index f51b895..692e7b2 100644 --- a/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.component.html +++ b/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.component.html @@ -16,12 +16,12 @@

- - - - - - + + + + + + - + diff --git a/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.component.ts b/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.component.ts index a9f46db..057cbcc 100644 --- a/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.component.ts +++ b/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.component.ts @@ -2,11 +2,13 @@ import { Component, OnInit, OnDestroy } from '@angular/core'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { Subscription } from 'rxjs'; import { filter, map } from 'rxjs/operators'; -import { JhiEventManager, JhiAlertService } from 'ng-jhipster'; +import { JhiEventManager, JhiAlertService, JhiParseLinks } from 'ng-jhipster'; import { IIhiwLab } from 'app/shared/model/ihiw-lab.model'; -import { AccountService } from 'app/core'; +import { AccountService, UserService, User } from 'app/core'; import { IhiwLabService } from './ihiw-lab.service'; +import { ActivatedRoute, Router } from '@angular/router'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; @Component({ selector: 'jhi-ihiw-lab', @@ -15,18 +17,36 @@ import { IhiwLabService } from './ihiw-lab.service'; export class IhiwLabComponent implements OnInit, OnDestroy { ihiwLabs: IIhiwLab[]; currentAccount: any; - eventSubscriber: Subscription; + predicate: any; + routeData: any; + page: any; + previousPage: any; + itemsPerPage: any; + reverse: any; + // eventSubscriber: Subscription; constructor( protected ihiwLabService: IhiwLabService, protected jhiAlertService: JhiAlertService, - protected eventManager: JhiEventManager, - protected accountService: AccountService - ) {} + private eventManager: JhiEventManager, + private router: Router, + private activatedRoute: ActivatedRoute, + private parseLinks: JhiParseLinks, + protected accountService: AccountService, + private modalService: NgbModal + ) { + this.itemsPerPage = 500; + this.routeData = this.activatedRoute.data.subscribe(data => { + this.page = data['pagingParams'].page; + this.previousPage = data['pagingParams'].page; + this.reverse = data['pagingParams'].ascending; + this.predicate = data['pagingParams'].predicate; + }); + } loadAll() { this.ihiwLabService - .query() + .query({ sort: this.sort() }) .pipe( filter((res: HttpResponse) => res.ok), map((res: HttpResponse) => res.body) @@ -35,31 +55,59 @@ export class IhiwLabComponent implements OnInit, OnDestroy { (res: IIhiwLab[]) => { this.ihiwLabs = res; }, - (res: HttpErrorResponse) => this.onError(res.message) + (res: HttpResponse) => this.onError(res.body) ); } ngOnInit() { - this.loadAll(); this.accountService.identity().then(account => { this.currentAccount = account; + this.loadAll(); + this.registerChangeInIhiwLabs(); }); - this.registerChangeInIhiwLabs(); } ngOnDestroy() { - this.eventManager.destroy(this.eventSubscriber); + // this.eventManager.destroy(this.eventSubscriber); + this.routeData.unsubscribe(); } trackId(index: number, item: IIhiwLab) { return item.id; } + sort() { + const result = [this.predicate + ',' + (this.reverse ? 'asc' : 'desc')]; + if (this.predicate !== 'id') { + result.push('id'); + } + return result; + } + + transition() { + this.router.navigate(['/admin/ihiw-lab'], { + queryParams: { + page: this.page, + sort: this.predicate + ',' + (this.reverse ? 'asc' : 'desc') + } + }); + this.loadAll(); + } + + loadPage(page: number) { + if (page !== this.previousPage) { + this.previousPage = page; + this.transition(); + } + } + registerChangeInIhiwLabs() { - this.eventSubscriber = this.eventManager.subscribe('ihiwLabListModification', response => this.loadAll()); + // this.eventManager.subscribe('userListModification', response => this.loadAll()); + this.eventManager.subscribe('ihiwLabListModification', response => this.loadAll()); + // this.eventManager = this.eventManager.subscribe('ihiwLabListModification', response => this.loadAll()); } - protected onError(errorMessage: string) { - this.jhiAlertService.error(errorMessage, null, null); + protected onError(error) { + this.jhiAlertService.error(error, null, null); } } diff --git a/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.route.ts b/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.route.ts index 635d566..afbb3c2 100644 --- a/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.route.ts +++ b/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.route.ts @@ -11,6 +11,8 @@ import { IhiwLabDetailComponent } from './ihiw-lab-detail.component'; import { IhiwLabUpdateComponent } from './ihiw-lab-update.component'; import { IhiwLabDeletePopupComponent } from './ihiw-lab-delete-dialog.component'; import { IIhiwLab } from 'app/shared/model/ihiw-lab.model'; +import { UserMgmtComponent } from 'app/admin'; +import { JhiResolvePagingParams } from 'ng-jhipster'; @Injectable({ providedIn: 'root' }) export class IhiwLabResolve implements Resolve { @@ -32,9 +34,12 @@ export const ihiwLabRoute: Routes = [ { path: '', component: IhiwLabComponent, + resolve: { + pagingParams: JhiResolvePagingParams + }, data: { - authorities: ['ROLE_USER'], - pageTitle: 'ihiwManagementApp.ihiwLab.home.title' + pageTitle: 'ihiwManagementApp.ihiwLab.home.title', + page: 1 }, canActivate: [UserRouteAccessService] }, From 45aab4c3f24de18d4a54b02ec145d39d28dbc740 Mon Sep 17 00:00:00 2001 From: cyt-mn Date: Thu, 26 Mar 2020 15:01:48 +0100 Subject: [PATCH 06/13] fix sorting, add pagination, revert incorrect changes. --- .../management/web/rest/IhiwLabResource.java | 5 ++- .../entities/ihiw-lab/ihiw-lab.component.html | 10 ++++- .../entities/ihiw-lab/ihiw-lab.component.ts | 44 +++++++++++-------- .../app/entities/ihiw-lab/ihiw-lab.route.ts | 5 +-- .../entities/project/project.component.html | 2 +- 5 files changed, 40 insertions(+), 26 deletions(-) diff --git a/src/main/java/org/ihiw/management/web/rest/IhiwLabResource.java b/src/main/java/org/ihiw/management/web/rest/IhiwLabResource.java index abf0568..9e457c1 100644 --- a/src/main/java/org/ihiw/management/web/rest/IhiwLabResource.java +++ b/src/main/java/org/ihiw/management/web/rest/IhiwLabResource.java @@ -11,6 +11,8 @@ import org.ihiw.management.service.dto.LabDTO; import org.ihiw.management.service.mapper.LabMapper; import org.ihiw.management.web.rest.errors.BadRequestAlertException; + +import io.github.jhipster.web.util.ResponseUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -181,7 +183,7 @@ public ResponseEntity> getAllIhiwLabs(@RequestParam(value = "page" * * @param id the id of the ihiwLab to retrieve. * @return the {@link ResponseEntity} with status {@code 200 (OK)} and with body the ihiwLab, or with status {@code 404 (Not Found)}. - + */ @GetMapping("/ihiw-labs/{id}") public ResponseEntity getIhiwLab(@PathVariable Long id) { log.debug("REST request to get IhiwLab : {}", id); @@ -206,7 +208,6 @@ public ResponseEntity getIhiwLab(@PathVariable Long id) { } return ResponseEntity.noContent().headers(HeaderUtil.createAlert(applicationName, ENTITY_NAME, id.toString())).build(); } - */ /** * {@code DELETE /ihiw-labs/:id} : delete the "id" ihiwLab. diff --git a/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.component.html b/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.component.html index 692e7b2..358cda6 100644 --- a/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.component.html +++ b/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.component.html @@ -17,7 +17,7 @@

IDLab CodeDepartmentInstitutionCity
ID100 Lab Code Department Institution City
- + @@ -94,6 +94,14 @@

ID100 ID Lab Code Department Institution
+
+
+ +
+
+ +
+
diff --git a/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.component.ts b/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.component.ts index 057cbcc..1ab26d7 100644 --- a/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.component.ts +++ b/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.component.ts @@ -23,16 +23,17 @@ export class IhiwLabComponent implements OnInit, OnDestroy { previousPage: any; itemsPerPage: any; reverse: any; - // eventSubscriber: Subscription; + totalItems: any; + eventSubscriber: Subscription; constructor( protected ihiwLabService: IhiwLabService, protected jhiAlertService: JhiAlertService, - private eventManager: JhiEventManager, + protected eventManager: JhiEventManager, + protected accountService: AccountService, private router: Router, private activatedRoute: ActivatedRoute, private parseLinks: JhiParseLinks, - protected accountService: AccountService, private modalService: NgbModal ) { this.itemsPerPage = 500; @@ -46,30 +47,27 @@ export class IhiwLabComponent implements OnInit, OnDestroy { loadAll() { this.ihiwLabService - .query({ sort: this.sort() }) - .pipe( - filter((res: HttpResponse) => res.ok), - map((res: HttpResponse) => res.body) - ) + .query({ + page: this.page - 1, + size: this.itemsPerPage, + sort: this.sort() + }) .subscribe( - (res: IIhiwLab[]) => { - this.ihiwLabs = res; - }, + (res: HttpResponse) => this.onSuccess(res.body, res.headers), (res: HttpResponse) => this.onError(res.body) ); } ngOnInit() { + this.loadAll(); this.accountService.identity().then(account => { this.currentAccount = account; - this.loadAll(); - this.registerChangeInIhiwLabs(); }); + this.registerChangeInIhiwLabs(); } ngOnDestroy() { - // this.eventManager.destroy(this.eventSubscriber); - this.routeData.unsubscribe(); + this.eventManager.destroy(this.eventSubscriber); } trackId(index: number, item: IIhiwLab) { @@ -85,9 +83,10 @@ export class IhiwLabComponent implements OnInit, OnDestroy { } transition() { - this.router.navigate(['/admin/ihiw-lab'], { + this.router.navigate(['/ihiw-lab'], { queryParams: { page: this.page, + size: this.itemsPerPage, sort: this.predicate + ',' + (this.reverse ? 'asc' : 'desc') } }); @@ -102,12 +101,19 @@ export class IhiwLabComponent implements OnInit, OnDestroy { } registerChangeInIhiwLabs() { + this.eventSubscriber = this.eventManager.subscribe('ihiwLabListModification', response => this.loadAll()); + // this.eventManager.subscribe('userListModification', response => this.loadAll()); - this.eventManager.subscribe('ihiwLabListModification', response => this.loadAll()); + // this.eventManager.subscribe('ihiwLabListModification', response => this.loadAll()); // this.eventManager = this.eventManager.subscribe('ihiwLabListModification', response => this.loadAll()); } - protected onError(error) { - this.jhiAlertService.error(error, null, null); + private onSuccess(data, headers) { + this.totalItems = headers.get('X-Total-Count'); + this.ihiwLabs = data; + } + + protected onError(errorMessage: string) { + this.jhiAlertService.error(errorMessage, null, null); } } diff --git a/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.route.ts b/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.route.ts index afbb3c2..df7fa8c 100644 --- a/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.route.ts +++ b/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.route.ts @@ -11,7 +11,6 @@ import { IhiwLabDetailComponent } from './ihiw-lab-detail.component'; import { IhiwLabUpdateComponent } from './ihiw-lab-update.component'; import { IhiwLabDeletePopupComponent } from './ihiw-lab-delete-dialog.component'; import { IIhiwLab } from 'app/shared/model/ihiw-lab.model'; -import { UserMgmtComponent } from 'app/admin'; import { JhiResolvePagingParams } from 'ng-jhipster'; @Injectable({ providedIn: 'root' }) @@ -38,8 +37,8 @@ export const ihiwLabRoute: Routes = [ pagingParams: JhiResolvePagingParams }, data: { - pageTitle: 'ihiwManagementApp.ihiwLab.home.title', - page: 1 + authorities: ['ROLE_USER'], + pageTitle: 'ihiwManagementApp.ihiwLab.home.title' }, canActivate: [UserRouteAccessService] }, diff --git a/src/main/webapp/app/entities/project/project.component.html b/src/main/webapp/app/entities/project/project.component.html index b624180..c4e5ef0 100644 --- a/src/main/webapp/app/entities/project/project.component.html +++ b/src/main/webapp/app/entities/project/project.component.html @@ -30,7 +30,7 @@

- + {{project.id}} {{project.name}} {{project.component}} From 23c550ff5dfba7a9b399654b6f1a1851798bd361 Mon Sep 17 00:00:00 2001 From: cyt-mn Date: Fri, 27 Mar 2020 09:19:55 +0100 Subject: [PATCH 07/13] fix selecting dropdown in Chrome --- .../entities/project/project-update.component.html | 6 +++--- .../entities/project/project-update.component.ts | 14 ++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/webapp/app/entities/project/project-update.component.html b/src/main/webapp/app/entities/project/project-update.component.html index 08d78a0..a53586f 100644 --- a/src/main/webapp/app/entities/project/project-update.component.html +++ b/src/main/webapp/app/entities/project/project-update.component.html @@ -98,9 +98,9 @@

- + + diff --git a/src/main/webapp/app/entities/project/project-update.component.ts b/src/main/webapp/app/entities/project/project-update.component.ts index 22ce16a..c385d1b 100644 --- a/src/main/webapp/app/entities/project/project-update.component.ts +++ b/src/main/webapp/app/entities/project/project-update.component.ts @@ -80,7 +80,9 @@ export class ProjectUpdateComponent implements OnInit { map((response: HttpResponse) => response.body) ) .subscribe( - (res: IIhiwLab[]) => (this.ihiwlabs = res.sort((a, b) => (a.labCode.toUpperCase() > b.labCode.toUpperCase() ? 1 : -1))), + (res: IIhiwLab[]) => { + this.ihiwlabs = res.sort((a, b) => (a.labCode.toUpperCase() > b.labCode.toUpperCase() ? 1 : -1)); + }, (res: HttpErrorResponse) => this.onError(res.message) ); } @@ -120,10 +122,10 @@ export class ProjectUpdateComponent implements OnInit { } removeLab(lab: IProjectIhiwLab) { - console.log(lab); - console.log(this.editForm.get(['labs'])); + // console.log(lab); + // console.log(this.editForm.get(['labs'])); const index = this.editForm.get(['labs']).value.indexOf(lab, 0); - console.log(index); + // console.log(index); if (index > -1) { this.editForm.get(['labs']).value.splice(index, 1); } @@ -133,9 +135,9 @@ export class ProjectUpdateComponent implements OnInit { lab.status = 'SUBSCRIBED'; } - addIhiwLab(lab: IIhiwLab) { + addIhiwLab(event: any) { const labWrapper = { - lab, + lab: this.ihiwlabs[event.target.selectedIndex - 1], status: 'SUBSCRIBED' }; const index = this.editForm.get(['labs']).value.indexOf(labWrapper, 0); From 392c7300c581ba3f28f89fb4cce6bf4c916a5a26 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 30 Mar 2020 09:07:15 +0200 Subject: [PATCH 08/13] Update IhiwLabRepository.java --- .../java/org/ihiw/management/repository/IhiwLabRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/ihiw/management/repository/IhiwLabRepository.java b/src/main/java/org/ihiw/management/repository/IhiwLabRepository.java index cf98d2d..55b0bde 100644 --- a/src/main/java/org/ihiw/management/repository/IhiwLabRepository.java +++ b/src/main/java/org/ihiw/management/repository/IhiwLabRepository.java @@ -18,7 +18,7 @@ @SuppressWarnings("unused") @Repository public interface IhiwLabRepository extends JpaRepository { - Optional findByLabCode(String LabCode); + Optional findByLabCode(String labCode); Optional findById(Long id); From 14053df99fb6948b2fe0f9d9bdad6e0ffd082068 Mon Sep 17 00:00:00 2001 From: cyt-mn Date: Mon, 30 Mar 2020 09:51:58 +0200 Subject: [PATCH 09/13] fix listing labs with respect to many-to-many relationship between project leaders and projects --- .../repository/ProjectRepository.java | 2 + .../management/web/rest/IhiwLabResource.java | 42 ++++++++----------- 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/src/main/java/org/ihiw/management/repository/ProjectRepository.java b/src/main/java/org/ihiw/management/repository/ProjectRepository.java index a8cd997..2f7fde9 100644 --- a/src/main/java/org/ihiw/management/repository/ProjectRepository.java +++ b/src/main/java/org/ihiw/management/repository/ProjectRepository.java @@ -22,5 +22,7 @@ public interface ProjectRepository extends JpaRepository { List findByCreatedBy(IhiwUser currentIhiwUser); + List findAllByLeaders(IhiwUser leader); + List findAllByOrderByComponent(); } diff --git a/src/main/java/org/ihiw/management/web/rest/IhiwLabResource.java b/src/main/java/org/ihiw/management/web/rest/IhiwLabResource.java index 9e457c1..46f0197 100644 --- a/src/main/java/org/ihiw/management/web/rest/IhiwLabResource.java +++ b/src/main/java/org/ihiw/management/web/rest/IhiwLabResource.java @@ -118,11 +118,8 @@ public ResponseEntity updateIhiwLab(@Valid @RequestBody IhiwLab ihiwLab /** * {@code GET /ihiw-labs} : get all the ihiwLabs. * - * @return the {@link ResponseEntity} with status {@code 200 (OK)} and the list of ihiwLabs in body. */ - - @GetMapping("/ihiw-labs") public ResponseEntity> getAllIhiwLabs(@RequestParam(value = "page" , required = false) Integer offset, @RequestParam(value = "size", required = false) Integer size, @RequestParam(value = "sort", required = false) String sort) { @@ -145,37 +142,34 @@ public ResponseEntity> getAllIhiwLabs(@RequestParam(value = "page" //if it is an admin, return all labs if (currentUser.get().getAuthorities().contains(new Authority(ADMIN))) { page = userService.getAllLabs(pageable); - } - - //if it is a project leader, add all his projects' labs to the list - if (currentUser.get().getAuthorities().contains(new Authority(PROJECT_LEADER))) { - List projectsOfUser = projectRepository.findByCreatedBy(currentIhiwUser); - for (Project project : projectsOfUser){ - for (ProjectIhiwLab lab : project.getLabs()){ - if (!result.contains(lab.getLab())){ - result.add(lab.getLab()); + } else { + //if it is a project leader, add all his projects' labs to the list + if (currentUser.get().getAuthorities().contains(new Authority(PROJECT_LEADER))) { + List projectsOfUser = projectRepository.findAllByLeaders(currentIhiwUser); + for (Project project : projectsOfUser){ + for (ProjectIhiwLab lab : project.getLabs()){ + if (!result.contains(lab.getLab())){ + result.add(lab.getLab()); + } } } } + + //and finally add the lab of the current user if it's not already contained + if (page == null) { + if (!result.contains(currentIhiwUser.getLab())){ + result.add(currentIhiwUser.getLab()); + } + } + + //map to DTO and create page LabMapper myMap = new LabMapper(); List entityToDto = myMap.labToLabDTO(result); page = new PageImpl<>(entityToDto); } - //and finally add the lab of the current user - if (page == null) { - if (!result.contains(currentIhiwUser.getLab())){ - result.add(currentIhiwUser.getLab()); - LabMapper myMap = new LabMapper(); - List entityToDto = myMap.labToLabDTO(result); - page = new PageImpl<>(entityToDto); - } - } - - HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(ServletUriComponentsBuilder.fromCurrentRequest(), page); return new ResponseEntity<>(page.getContent(), headers, HttpStatus.OK); - //return result; } /** From facbba4658daa426727e6286d967cc9afd19e418 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 30 Mar 2020 09:54:19 +0200 Subject: [PATCH 10/13] Update ihiw-lab.component.ts --- src/main/webapp/app/entities/ihiw-lab/ihiw-lab.component.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.component.ts b/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.component.ts index 1ab26d7..9e621e4 100644 --- a/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.component.ts +++ b/src/main/webapp/app/entities/ihiw-lab/ihiw-lab.component.ts @@ -102,10 +102,6 @@ export class IhiwLabComponent implements OnInit, OnDestroy { registerChangeInIhiwLabs() { this.eventSubscriber = this.eventManager.subscribe('ihiwLabListModification', response => this.loadAll()); - - // this.eventManager.subscribe('userListModification', response => this.loadAll()); - // this.eventManager.subscribe('ihiwLabListModification', response => this.loadAll()); - // this.eventManager = this.eventManager.subscribe('ihiwLabListModification', response => this.loadAll()); } private onSuccess(data, headers) { From 73071a8fa5a6bfb70a601157007073a335c99db5 Mon Sep 17 00:00:00 2001 From: cyt-mn Date: Mon, 30 Mar 2020 10:01:28 +0200 Subject: [PATCH 11/13] version up --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 21ce148..b07ee3c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.ihiw.management ihiw-management - 1.0.15 + 1.0.16 jar Ihiw Management From d28f1b89daab53e7fa1354a4a4275b5515a25268 Mon Sep 17 00:00:00 2001 From: cyt-mn Date: Mon, 30 Mar 2020 14:42:51 +0200 Subject: [PATCH 12/13] fix drop down selection for project leaders as well --- pom.xml | 2 +- .../app/entities/project/project-update.component.html | 8 ++++---- .../app/entities/project/project-update.component.ts | 6 ++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index b07ee3c..4e56526 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.ihiw.management ihiw-management - 1.0.16 + 1.0.17 jar Ihiw Management diff --git a/src/main/webapp/app/entities/project/project-update.component.html b/src/main/webapp/app/entities/project/project-update.component.html index a53586f..1b9a909 100644 --- a/src/main/webapp/app/entities/project/project-update.component.html +++ b/src/main/webapp/app/entities/project/project-update.component.html @@ -99,7 +99,7 @@

@@ -113,9 +113,9 @@

- + + diff --git a/src/main/webapp/app/entities/project/project-update.component.ts b/src/main/webapp/app/entities/project/project-update.component.ts index c385d1b..8fd34dd 100644 --- a/src/main/webapp/app/entities/project/project-update.component.ts +++ b/src/main/webapp/app/entities/project/project-update.component.ts @@ -114,7 +114,8 @@ export class ProjectUpdateComponent implements OnInit { } } - addProjectLeader(leader: IIhiwUser) { + addProjectLeader(event: any) { + const leader = this.ihiwusers[event.target.selectedIndex - 1]; const index = this.editForm.get(['leaders']).value.indexOf(leader, 0); if (index < 0) { this.editForm.get(['leaders']).value.push(leader); @@ -122,10 +123,7 @@ export class ProjectUpdateComponent implements OnInit { } removeLab(lab: IProjectIhiwLab) { - // console.log(lab); - // console.log(this.editForm.get(['labs'])); const index = this.editForm.get(['labs']).value.indexOf(lab, 0); - // console.log(index); if (index > -1) { this.editForm.get(['labs']).value.splice(index, 1); } From 1946305c8f12afd09f4f86b53b26df95d31e1a8c Mon Sep 17 00:00:00 2001 From: cyt-mn Date: Mon, 6 Apr 2020 09:36:08 +0200 Subject: [PATCH 13/13] update npm packages (including acorn) due to security issue --- package-lock.json | 2523 +++++---------------------------------------- package.json | 10 +- 2 files changed, 246 insertions(+), 2287 deletions(-) diff --git a/package-lock.json b/package-lock.json index e46fd56..d3bd1ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -866,12 +866,6 @@ } } }, - "@sindresorhus/is": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz", - "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==", - "dev": true - }, "@types/babel__core": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.2.tgz", @@ -1004,9 +998,9 @@ "dev": true }, "@types/marked": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/@types/marked/-/marked-0.6.5.tgz", - "integrity": "sha512-6kBKf64aVfx93UJrcyEZ+OBM5nGv4RLsI6sR1Ar34bpgvGVRoyTgpxn4ZmtxOM5aDTAaaznYuYUH8bUX3Nk3YA==" + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/@types/marked/-/marked-0.7.3.tgz", + "integrity": "sha512-WXdEKuT3azHxLTThd5dwnpLt2Q9QiC8iKj09KZRtVqro3pX8hhY+GbD8FZOae6SBBEJ22yKJn3c7ejL0aucAcA==" }, "@types/minimatch": { "version": "3.0.3", @@ -1021,9 +1015,9 @@ "dev": true }, "@types/node": { - "version": "10.12.27", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.27.tgz", - "integrity": "sha512-e9wgeY6gaY21on3ve0xAjgBVjGDWq/xUteK0ujsE53bUoxycMkqfnkUgMt6ffZtykZ5X12Mg3T7Pw4TRCObDKg==", + "version": "10.17.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.18.tgz", + "integrity": "sha512-DQ2hl/Jl3g33KuAUOcMrcAOtsbzb+y/ufakzAdeK9z/H/xsvkpbETZZbPNMIiQuk24f5ZRMCcZIViAwyFIiKmg==", "dev": true }, "@types/normalize-package-data": { @@ -1039,9 +1033,9 @@ "dev": true }, "@types/qs": { - "version": "6.9.0", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.0.tgz", - "integrity": "sha512-c4zji5CjWv1tJxIZkz1oUtGcdOlsH3aza28Nqmm+uNDWBRHoMsjooBEN4czZp1V3iXPihE/VRUOBqg+4Xq0W4g==", + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.1.tgz", + "integrity": "sha512-lhbQXx9HKZAPgBkISrBcmAcMpZsmpe/Cd/hY7LGZS5OfkySUBItnPZHgQPssWYUET8elF+yCFBbP1Q0RZPTdaw==", "dev": true }, "@types/react": { @@ -1358,16 +1352,6 @@ "humanize-ms": "^1.2.1" } }, - "aggregate-error": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-1.0.0.tgz", - "integrity": "sha1-iINE2tAiCnLjr1CQYRf0h3GSX6w=", - "dev": true, - "requires": { - "clean-stack": "^1.0.0", - "indent-string": "^3.0.0" - } - }, "ajv": { "version": "6.10.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz", @@ -1454,15 +1438,6 @@ "integrity": "sha1-DELU+xcWDVqa8eSEus4cZpIsGyE=", "dev": true }, - "ansi-align": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz", - "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", - "dev": true, - "requires": { - "string-width": "^2.0.0" - } - }, "ansi-colors": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", @@ -2205,48 +2180,6 @@ "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", "dev": true }, - "bin-version": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/bin-version/-/bin-version-2.0.0.tgz", - "integrity": "sha1-LMldg7Uive8umZeOdq61SRyBFP8=", - "dev": true, - "requires": { - "execa": "^0.1.1", - "find-versions": "^2.0.0" - }, - "dependencies": { - "execa": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.1.1.tgz", - "integrity": "sha1-sJwqkwm8DvBQFHlHLbMYD41MPt0=", - "dev": true, - "requires": { - "cross-spawn-async": "^2.1.1", - "object-assign": "^4.0.1", - "strip-eof": "^1.0.0" - } - } - } - }, - "bin-version-check": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bin-version-check/-/bin-version-check-3.0.0.tgz", - "integrity": "sha1-4k6/prY8sDh8X8F0+G5cyBLKfMk=", - "dev": true, - "requires": { - "bin-version": "^2.0.0", - "semver": "^5.1.0", - "semver-truncate": "^1.0.0" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - } - } - }, "binary-extensions": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", @@ -2392,44 +2325,15 @@ "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", "dev": true }, - "boolean": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.0.tgz", - "integrity": "sha512-OElxJ1lUSinuoUnkpOgLmxp0DC4ytEhODEL6QJU0NpxE/mI4rUSh8h1P1Wkvfi3xQEBcxXR2gBIPNYNuaFcAbQ==", - "dev": true - }, "bootstrap": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz", "integrity": "sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==" }, "bootswatch": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/bootswatch/-/bootswatch-4.3.1.tgz", - "integrity": "sha512-kNdpo/TnhO++aic1IODLIe1V0lx6pXwHMpwXMacpANDnuVDtgU1MUgUbVMC3rSWm4UcbImfwPraNYgjKDT0BtA==" - }, - "boxen": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", - "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", - "dev": true, - "requires": { - "ansi-align": "^2.0.0", - "camelcase": "^4.0.0", - "chalk": "^2.0.1", - "cli-boxes": "^1.0.0", - "string-width": "^2.0.0", - "term-size": "^1.2.0", - "widest-line": "^2.0.0" - }, - "dependencies": { - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - } - } + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/bootswatch/-/bootswatch-4.4.1.tgz", + "integrity": "sha512-Kx3z6+3Jpg9g6l/xZBCnc8d6KeJK0QawxCZWOomdcI5AuSZLZb+DoH5X9RJH+cOcSeMAxyzdIjkVUR01+Db5bQ==" }, "brace-expansion": { "version": "1.1.11", @@ -2871,28 +2775,6 @@ "isarray": "^1.0.0" } }, - "buffer-alloc": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", - "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", - "dev": true, - "requires": { - "buffer-alloc-unsafe": "^1.1.0", - "buffer-fill": "^1.0.0" - } - }, - "buffer-alloc-unsafe": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", - "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==", - "dev": true - }, - "buffer-fill": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", - "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=", - "dev": true - }, "buffer-from": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", @@ -2994,35 +2876,6 @@ "schema-utils": "^1.0.0" } }, - "cacheable-request": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz", - "integrity": "sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=", - "dev": true, - "requires": { - "clone-response": "1.0.2", - "get-stream": "3.0.0", - "http-cache-semantics": "3.8.1", - "keyv": "3.0.0", - "lowercase-keys": "1.0.0", - "normalize-url": "2.0.1", - "responselike": "1.0.2" - }, - "dependencies": { - "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", - "dev": true - }, - "lowercase-keys": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz", - "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=", - "dev": true - } - } - }, "call-me-maybe": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz", @@ -3235,12 +3088,6 @@ "tslib": "^1.9.0" } }, - "ci-info": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz", - "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==", - "dev": true - }, "cipher-base": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", @@ -3296,18 +3143,6 @@ } } }, - "clean-stack": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz", - "integrity": "sha1-noIVAa6XmYbEax1m0tQy2y/UrjE=", - "dev": true - }, - "cli-boxes": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz", - "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=", - "dev": true - }, "cli-cursor": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", @@ -3317,16 +3152,10 @@ "restore-cursor": "^2.0.0" } }, - "cli-list": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/cli-list/-/cli-list-0.2.0.tgz", - "integrity": "sha1-fmc+4N05phGkhkduU/PGs5QctYI=", - "dev": true - }, "cli-spinners": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.2.0.tgz", - "integrity": "sha512-tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.3.0.tgz", + "integrity": "sha512-Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w==", "dev": true }, "cli-table": { @@ -3400,9 +3229,9 @@ "dev": true }, "clipboard": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.4.tgz", - "integrity": "sha512-Vw26VSLRpJfBofiVaFb/I8PVfdI1OxKcYShe6fm0sP/DtmiWQNCjhM/okTvdCo0G+lMMm1rMYbk4IK4x1X+kgQ==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.6.tgz", + "integrity": "sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==", "optional": true, "requires": { "good-listener": "^1.2.2", @@ -3456,25 +3285,6 @@ "shallow-clone": "^1.0.0" } }, - "clone-regexp": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.1.tgz", - "integrity": "sha512-Fcij9IwRW27XedRIJnSOEupS7RVcXtObJXbcUOX93UCLqqOdRpkvzKywOOSizmEK/Is3S/RHX9dLdfo6R1Q1mw==", - "dev": true, - "requires": { - "is-regexp": "^1.0.0", - "is-supported-regexp-flag": "^1.0.0" - } - }, - "clone-response": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", - "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", - "dev": true, - "requires": { - "mimic-response": "^1.0.0" - } - }, "clone-stats": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", @@ -3618,8 +3428,7 @@ "commander": { "version": "2.20.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", - "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==", - "dev": true + "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==" }, "common-tags": { "version": "1.8.0", @@ -3799,47 +3608,6 @@ } } }, - "config-chain": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", - "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==", - "dev": true, - "requires": { - "ini": "^1.3.4", - "proto-list": "~1.2.1" - } - }, - "configstore": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz", - "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", - "dev": true, - "requires": { - "dot-prop": "^4.1.0", - "graceful-fs": "^4.1.2", - "make-dir": "^1.0.0", - "unique-string": "^1.0.0", - "write-file-atomic": "^2.0.0", - "xdg-basedir": "^3.0.0" - }, - "dependencies": { - "make-dir": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", - "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", - "dev": true, - "requires": { - "pify": "^3.0.0" - } - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - } - } - }, "connect": { "version": "3.6.6", "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz", @@ -4212,34 +3980,6 @@ } } }, - "cross-spawn-async": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz", - "integrity": "sha1-hF/wwINKPe2dFg2sptOQkGuyiMw=", - "dev": true, - "requires": { - "lru-cache": "^4.0.0", - "which": "^1.2.8" - }, - "dependencies": { - "lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", - "dev": true, - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", - "dev": true - } - } - }, "crypto-browserify": { "version": "3.12.0", "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", @@ -4259,12 +3999,6 @@ "randomfill": "^1.0.3" } }, - "crypto-random-string": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", - "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=", - "dev": true - }, "css-color-names": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", @@ -4663,15 +4397,6 @@ "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", "dev": true }, - "decompress-response": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", - "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", - "dev": true, - "requires": { - "mimic-response": "^1.0.0" - } - }, "dedent": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", @@ -4721,12 +4446,6 @@ "ip-regex": "^2.1.0" } }, - "default-uid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/default-uid/-/default-uid-1.0.0.tgz", - "integrity": "sha1-/O+p359axAyJFtkS3R/hFGqjxZ4=", - "dev": true - }, "defaults": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", @@ -4879,12 +4598,6 @@ "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", "dev": true }, - "detect-conflict": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/detect-conflict/-/detect-conflict-1.0.1.tgz", - "integrity": "sha1-CIZXpmqWHAUBnbfEIwiDsca0F24=", - "dev": true - }, "detect-file": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", @@ -5109,16 +4822,6 @@ "is-obj": "^1.0.0" } }, - "downgrade-root": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/downgrade-root/-/downgrade-root-1.2.2.tgz", - "integrity": "sha1-UxMZcVsOgf/MIusoR4uidkPhLGw=", - "dev": true, - "requires": { - "default-uid": "^1.0.0", - "is-root": "^1.0.0" - } - }, "drange": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/drange/-/drange-1.1.1.tgz", @@ -5409,9 +5112,9 @@ "dev": true }, "env-variable": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.5.tgz", - "integrity": "sha512-zoB603vQReOFvTg5xMl9I1P2PnHsHQQKTEowsKKD7nseUfJq6UWzK+4YtlWUO1nhiQUxe6XMkk+JleSZD1NZFA==", + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz", + "integrity": "sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==", "dev": true }, "envify": { @@ -5431,9 +5134,9 @@ "dev": true }, "errlop": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/errlop/-/errlop-2.0.0.tgz", - "integrity": "sha512-z00WIrQhtOMUnjdTG0O4f6hMG64EVccVDBy2WwgjcF8S4UB1exGYuc2OFwmdQmsJwLQVEIHWHPCz/omXXgAZHw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/errlop/-/errlop-2.1.0.tgz", + "integrity": "sha512-sEmQX03aJkWsqTPDYaymq3ROJmKxMHhFS4UN8fWwr5ZiRtw3p61QHRk2QQj68DiaTIXWujJP+uEUS1Zx3spxlw==", "dev": true }, "errno": { @@ -5507,12 +5210,6 @@ "next-tick": "^1.0.0" } }, - "es6-error": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", - "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", - "dev": true - }, "es6-iterator": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", @@ -5711,15 +5408,6 @@ "strip-eof": "^1.0.0" } }, - "execall": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz", - "integrity": "sha1-c9CQTjlbPKsGWLCNCewlMH8pu3M=", - "dev": true, - "requires": { - "clone-regexp": "^1.0.0" - } - }, "exit": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", @@ -6223,12 +5911,6 @@ } } }, - "filter-obj": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz", - "integrity": "sha1-mzERErxsYSehbgFsbF1/GeCAXFs=", - "dev": true - }, "finalhandler": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz", @@ -6281,16 +5963,6 @@ "locate-path": "^3.0.0" } }, - "find-versions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-2.0.0.tgz", - "integrity": "sha1-KtkNSQ9oKMGqQCks9wmsMxghDDw=", - "dev": true, - "requires": { - "array-uniq": "^1.0.0", - "semver-regex": "^1.0.0" - } - }, "findup-sync": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz", @@ -6397,12 +6069,6 @@ "for-in": "^1.0.1" } }, - "foreachasync": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz", - "integrity": "sha1-VQKYfchxS+M5IJfzLgBxyd7gfPY=", - "dev": true - }, "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", @@ -7114,86 +6780,6 @@ } } }, - "fullname": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/fullname/-/fullname-3.3.0.tgz", - "integrity": "sha1-oIdH1pISKWELgXi3YU/OEMsYX1o=", - "dev": true, - "requires": { - "execa": "^0.6.0", - "filter-obj": "^1.1.0", - "mem": "^1.1.0", - "p-any": "^1.0.0", - "p-try": "^1.0.0", - "passwd-user": "^2.1.0", - "rc": "^1.1.6" - }, - "dependencies": { - "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "dev": true, - "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "execa": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.6.3.tgz", - "integrity": "sha1-V7aaWU8IF1nGnlNw8NF7nLEWWP4=", - "dev": true, - "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - }, - "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", - "dev": true - }, - "lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", - "dev": true, - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "mem": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", - "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", - "dev": true, - "requires": { - "mimic-fn": "^1.0.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true - }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", - "dev": true - } - } - }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -7224,9 +6810,9 @@ } }, "generator-jhipster": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/generator-jhipster/-/generator-jhipster-6.5.1.tgz", - "integrity": "sha512-uNnf537amD4G1KOkQ4GWlY5Fjkf4zUxFfAB5JVLq1xCWsK8p/1mEs5E/ElNmLhHwhVeVwhe/ptZWIzd4Mv5JQA==", + "version": "6.8.0", + "resolved": "https://registry.npmjs.org/generator-jhipster/-/generator-jhipster-6.8.0.tgz", + "integrity": "sha512-fyM0byAbju+Utr5objid5HWQ3SGSWQZr5+cYb76AefNIrk47M1Rgw7Uae7DywQbQrodRQUs2LXbwVWskWwknfA==", "dev": true, "requires": { "aws-sdk": "2.533.0", @@ -7240,7 +6826,7 @@ "glob": "7.1.3", "gulp-filter": "5.1.0", "insight": "0.10.1", - "jhipster-core": "6.0.4", + "jhipster-core": "7.1.1", "js-object-pretty-print": "0.3.0", "js-yaml": "3.13.1", "lodash": "4.17.13", @@ -7250,7 +6836,8 @@ "os-locale": "3.1.0", "parse-gitignore": "1.0.1", "pluralize": "7.0.0", - "prettier": "1.16.4", + "prettier": "1.19.1", + "prettier-plugin-java": "0.7.1", "progress": "2.0.3", "randexp": "0.5.3", "semver": "5.6.0", @@ -7259,9 +6846,8 @@ "tabtab": "2.2.2", "through2": "3.0.1", "uuid": "3.3.3", - "yeoman-environment": "2.3.4", - "yeoman-generator": "3.2.0", - "yo": "3.1.0" + "yeoman-environment": "2.8.0", + "yeoman-generator": "4.6.0" }, "dependencies": { "commander": { @@ -7291,9 +6877,9 @@ "dev": true }, "prettier": { - "version": "1.16.4", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.16.4.tgz", - "integrity": "sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", + "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", "dev": true }, "semver": { @@ -7343,12 +6929,6 @@ "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=", "dev": true }, - "get-stdin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", - "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", - "dev": true - }, "get-stream": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", @@ -7374,22 +6954,22 @@ } }, "gh-got": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/gh-got/-/gh-got-6.0.0.tgz", - "integrity": "sha512-F/mS+fsWQMo1zfgG9MD8KWvTWPPzzhuVwY++fhQ5Ggd+0P+CAMHtzMZhNxG+TqGfHDChJKsbh6otfMGqO2AKBw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/gh-got/-/gh-got-5.0.0.tgz", + "integrity": "sha1-7pW+NxBv2HSKlvjR20uuqJ4b+oo=", "dev": true, "requires": { - "got": "^7.0.0", + "got": "^6.2.0", "is-plain-obj": "^1.1.0" } }, "github-username": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/github-username/-/github-username-4.1.0.tgz", - "integrity": "sha1-y+KABBiDIG2kISrp5LXxacML9Bc=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/github-username/-/github-username-3.0.0.tgz", + "integrity": "sha1-CnciGbMTB0NCnyRW0L3T21Xc57E=", "dev": true, "requires": { - "gh-got": "^6.0.0" + "gh-got": "^5.0.0" } }, "glob": { @@ -7433,63 +7013,10 @@ "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=", "dev": true }, - "global-agent": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-2.1.7.tgz", - "integrity": "sha512-ooK7eqGYZku+LgnbfH/Iv0RJ74XfhrBZDlke1QSzcBt0bw1PmJcnRADPAQuFE+R45pKKDTynAr25SBasY2kvow==", - "dev": true, - "requires": { - "boolean": "^3.0.0", - "core-js": "^3.4.1", - "es6-error": "^4.1.1", - "matcher": "^2.0.0", - "roarr": "^2.14.5", - "semver": "^6.3.0", - "serialize-error": "^5.0.0" - }, - "dependencies": { - "core-js": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.5.0.tgz", - "integrity": "sha512-Ifh3kj78gzQ7NAoJXeTu+XwzDld0QRIwjBLRqAMhuLhP3d2Av5wmgE9ycfnvK6NAEjTkQ1sDPeoEZAWO3Hx1Uw==", - "dev": true - }, - "escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", - "dev": true - }, - "matcher": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/matcher/-/matcher-2.1.0.tgz", - "integrity": "sha512-o+nZr+vtJtgPNklyeUKkkH42OsK8WAfdgaJE2FNxcjLPg+5QbeEoT6vRj8Xq/iv18JlQ9cmKsEu0b94ixWf1YQ==", - "dev": true, - "requires": { - "escape-string-regexp": "^2.0.0" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "global-dirs": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz", - "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=", - "dev": true, - "requires": { - "ini": "^1.3.4" - } - }, - "global-modules": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", + "global-modules": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", + "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", "dev": true, "requires": { "global-prefix": "^1.0.1", @@ -7510,33 +7037,12 @@ "which": "^1.2.14" } }, - "global-tunnel-ng": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz", - "integrity": "sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==", - "dev": true, - "requires": { - "encodeurl": "^1.0.2", - "lodash": "^4.17.10", - "npm-conf": "^1.1.3", - "tunnel": "^0.0.6" - } - }, "globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", "dev": true }, - "globalthis": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.1.tgz", - "integrity": "sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==", - "dev": true, - "requires": { - "define-properties": "^1.1.3" - } - }, "globby": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz", @@ -7569,25 +7075,22 @@ } }, "got": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz", - "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==", + "version": "6.7.1", + "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz", + "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", "dev": true, "requires": { - "decompress-response": "^3.2.0", + "create-error-class": "^3.0.0", "duplexer3": "^0.1.4", "get-stream": "^3.0.0", - "is-plain-obj": "^1.1.0", + "is-redirect": "^1.0.0", "is-retry-allowed": "^1.0.0", "is-stream": "^1.0.0", - "isurl": "^1.0.0-alpha5", "lowercase-keys": "^1.0.0", - "p-cancelable": "^0.3.0", - "p-timeout": "^1.1.1", "safe-buffer": "^5.0.1", "timed-out": "^4.0.0", - "url-parse-lax": "^1.0.0", - "url-to-options": "^1.0.1" + "unzip-response": "^2.0.1", + "url-parse-lax": "^1.0.0" }, "dependencies": { "get-stream": { @@ -7605,12 +7108,12 @@ "dev": true }, "grouped-queue": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/grouped-queue/-/grouped-queue-0.3.3.tgz", - "integrity": "sha1-wWfSpTGcWg4JZO9qJbfC34mWyFw=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/grouped-queue/-/grouped-queue-1.0.0.tgz", + "integrity": "sha512-XslfWrAGCYovQjveHODR0hllUrsn3UtvPFTkamHbgVHmkUA6eCIDmw3JDWVLJvuntTvYjwaPGamlyzK4/HAEOA==", "dev": true, "requires": { - "lodash": "^4.17.2" + "lodash": "^4.17.15" } }, "growl": { @@ -7742,27 +7245,12 @@ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", "dev": true }, - "has-symbol-support-x": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz", - "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==", - "dev": true - }, "has-symbols": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz", "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=", "dev": true }, - "has-to-string-tag-x": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz", - "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", - "dev": true, - "requires": { - "has-symbol-support-x": "^1.4.1" - } - }, "has-unicode": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", @@ -8197,15 +7685,6 @@ "ms": "^2.0.0" } }, - "humanize-string": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/humanize-string/-/humanize-string-1.0.2.tgz", - "integrity": "sha512-PH5GBkXqFxw5+4eKaKRIkD23y6vRd/IXSl7IldyJxEXpDH9SEIXRORkBtkGni/ae2P7RVOw6Wxypd2tGXhha1w==", - "dev": true, - "requires": { - "decamelize": "^1.0.0" - } - }, "husky": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/husky/-/husky-2.4.1.tgz", @@ -8359,12 +7838,6 @@ "resolve-from": "^3.0.0" } }, - "import-lazy": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", - "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=", - "dev": true - }, "import-local": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz", @@ -8592,24 +8065,6 @@ "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==", "dev": true }, - "into-stream": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz", - "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=", - "dev": true, - "requires": { - "from2": "^2.1.1", - "p-is-promise": "^1.1.0" - }, - "dependencies": { - "p-is-promise": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz", - "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=", - "dev": true - } - } - }, "invariant": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", @@ -8700,15 +8155,6 @@ "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==", "dev": true }, - "is-ci": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz", - "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==", - "dev": true, - "requires": { - "ci-info": "^1.5.0" - } - }, "is-color-stop": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz", @@ -8773,12 +8219,6 @@ "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=", "dev": true }, - "is-docker": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-1.1.0.tgz", - "integrity": "sha1-8EN01O7lMQ6ajhE78UlUEeRhdqE=", - "dev": true - }, "is-dom": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-dom/-/is-dom-1.1.0.tgz", @@ -8800,15 +8240,6 @@ "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", "dev": true }, - "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, "is-fullwidth-code-point": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", @@ -8830,22 +8261,6 @@ "is-extglob": "^2.1.1" } }, - "is-installed-globally": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz", - "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=", - "dev": true, - "requires": { - "global-dirs": "^0.1.0", - "is-path-inside": "^1.0.0" - } - }, - "is-npm": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz", - "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=", - "dev": true - }, "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", @@ -8971,12 +8386,6 @@ "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==", "dev": true }, - "is-root": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-root/-/is-root-1.0.0.tgz", - "integrity": "sha1-B7bCM7w5TNnQK6FclmvWZg1jQtU=", - "dev": true - }, "is-scoped": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-scoped/-/is-scoped-1.0.0.tgz", @@ -8991,12 +8400,6 @@ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" }, - "is-supported-regexp-flag": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.1.tgz", - "integrity": "sha512-3vcJecUUrpgCqc/ca0aWeNu64UGgxcvO60K/Fkr1N6RSvfGCTU60UKN68JDmKokgba0rFFJs12EnzOQa14ubKQ==", - "dev": true - }, "is-svg": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz", @@ -9050,13 +8453,10 @@ "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, "isbinaryfile": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz", - "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", - "dev": true, - "requires": { - "buffer-alloc": "^1.2.0" - } + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.6.tgz", + "integrity": "sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==", + "dev": true }, "isexe": { "version": "2.0.0", @@ -9248,16 +8648,6 @@ "textextensions": "^2.5.0" } }, - "isurl": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz", - "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", - "dev": true, - "requires": { - "has-to-string-tag-x": "^1.2.0", - "is-object": "^1.0.1" - } - }, "jasmine": { "version": "2.8.0", "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.8.0.tgz", @@ -9281,6 +8671,16 @@ "integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=", "dev": true }, + "java-parser": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/java-parser/-/java-parser-0.7.1.tgz", + "integrity": "sha512-YAF5LvO+QurATwcA/YJKneVTjjmE0udAiCEE7ou+SmsXfx/gGZmr4xTbhU4qIWoGkTQJw5mhAuSk9Lq4AGNayg==", + "dev": true, + "requires": { + "chevrotain": "6.5.0", + "lodash": "4.17.15" + } + }, "jest": { "version": "24.8.0", "resolved": "https://registry.npmjs.org/jest/-/jest-24.8.0.tgz", @@ -9999,9 +9399,9 @@ } }, "jhipster-core": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/jhipster-core/-/jhipster-core-6.0.4.tgz", - "integrity": "sha512-BrJB8QGkqCIxMQmjSk1QEgx7jLy727cJbOoyoA8XjX6hp15XEu2biVdFBNqQqiJ5WsXZhOs9ybOyAQGTB7DVtA==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/jhipster-core/-/jhipster-core-7.1.1.tgz", + "integrity": "sha512-CiSOseJB9pGpI9Bevp8pll361BCQQ4A6FHye8Oe4SHe74SOFyKizvvRv/629Rlj8o/jK5zW4hTUDg5waI88rbQ==", "dev": true, "requires": { "chevrotain": "6.5.0", @@ -10126,12 +9526,6 @@ "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "dev": true }, - "json-buffer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", - "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=", - "dev": true - }, "json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", @@ -10269,13 +9663,12 @@ "set-immediate-shim": "~1.0.1" } }, - "keyv": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz", - "integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==", - "dev": true, + "katex": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/katex/-/katex-0.11.1.tgz", + "integrity": "sha512-5oANDICCTX0NqYIyAiFCCwjQ7ERu3DQG2JFHLbYOf+fXaMoH8eg/zOq5WSYJsKMi/QebW+Eh3gSM+oss1H/bww==", "requires": { - "json-buffer": "3.0.0" + "commander": "^2.19.0" } }, "killable": { @@ -10315,60 +9708,6 @@ "webpack-sources": "^1.1.0" } }, - "latest-version": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz", - "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=", - "dev": true, - "requires": { - "package-json": "^4.0.0" - }, - "dependencies": { - "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", - "dev": true - }, - "got": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz", - "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", - "dev": true, - "requires": { - "create-error-class": "^3.0.0", - "duplexer3": "^0.1.4", - "get-stream": "^3.0.0", - "is-redirect": "^1.0.0", - "is-retry-allowed": "^1.0.0", - "is-stream": "^1.0.0", - "lowercase-keys": "^1.0.0", - "safe-buffer": "^5.0.1", - "timed-out": "^4.0.0", - "unzip-response": "^2.0.1", - "url-parse-lax": "^1.0.0" - } - }, - "package-json": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz", - "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=", - "dev": true, - "requires": { - "got": "^6.7.1", - "registry-auth-token": "^3.0.1", - "registry-url": "^3.0.3", - "semver": "^5.1.0" - } - }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - } - } - }, "lcid": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", @@ -10774,15 +10113,6 @@ "path-exists": "^3.0.0" } }, - "locutus": { - "version": "2.0.11", - "resolved": "https://registry.npmjs.org/locutus/-/locutus-2.0.11.tgz", - "integrity": "sha512-C0q1L38lK5q1t+wE0KY21/9szrBHxye6o2z5EJzU+5B79tubNOC+nLAEzTTn1vPUGoUuehKh8kYKqiVUTWRyaQ==", - "dev": true, - "requires": { - "es6-promise": "^4.2.5" - } - }, "lodash": { "version": "4.17.15", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", @@ -11143,24 +10473,36 @@ } }, "mem-fs-editor": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-5.1.0.tgz", - "integrity": "sha512-2Yt2GCYEbcotYbIJagmow4gEtHDqzpq5XN94+yAx/NT5+bGqIjkXnm3KCUQfE6kRfScGp9IZknScoGRKu8L78w==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-6.0.0.tgz", + "integrity": "sha512-e0WfJAMm8Gv1mP5fEq/Blzy6Lt1VbLg7gNnZmZak7nhrBTibs+c6nQ4SKs/ZyJYHS1mFgDJeopsLAv7Ow0FMFg==", "dev": true, "requires": { "commondir": "^1.0.1", "deep-extend": "^0.6.0", - "ejs": "^2.5.9", - "glob": "^7.0.3", - "globby": "^8.0.1", - "isbinaryfile": "^3.0.2", + "ejs": "^2.6.1", + "glob": "^7.1.4", + "globby": "^9.2.0", + "isbinaryfile": "^4.0.0", "mkdirp": "^0.5.0", - "multimatch": "^2.0.0", - "rimraf": "^2.2.8", - "through2": "^2.0.0", - "vinyl": "^2.0.1" + "multimatch": "^4.0.0", + "rimraf": "^2.6.3", + "through2": "^3.0.1", + "vinyl": "^2.2.0" }, "dependencies": { + "array-differ": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz", + "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==", + "dev": true + }, + "arrify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", + "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", + "dev": true + }, "clone": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", @@ -11173,44 +10515,53 @@ "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=", "dev": true }, - "dir-glob": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz", - "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==", - "dev": true, - "requires": { - "arrify": "^1.0.1", - "path-type": "^3.0.0" - } - }, "globby": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz", - "integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==", + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz", + "integrity": "sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==", "dev": true, "requires": { - "array-union": "^1.0.1", - "dir-glob": "2.0.0", - "fast-glob": "^2.0.2", - "glob": "^7.1.2", - "ignore": "^3.3.5", - "pify": "^3.0.0", - "slash": "^1.0.0" + "@types/glob": "^7.1.1", + "array-union": "^1.0.2", + "dir-glob": "^2.2.2", + "fast-glob": "^2.2.6", + "glob": "^7.1.3", + "ignore": "^4.0.3", + "pify": "^4.0.1", + "slash": "^2.0.0" } }, - "path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true + }, + "multimatch": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz", + "integrity": "sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ==", "dev": true, "requires": { - "pify": "^3.0.0" + "@types/minimatch": "^3.0.3", + "array-differ": "^3.0.0", + "array-union": "^2.1.0", + "arrify": "^2.0.1", + "minimatch": "^3.0.4" + }, + "dependencies": { + "array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true + } } }, "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", "dev": true }, "replace-ext": { @@ -11219,6 +10570,21 @@ "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=", "dev": true }, + "slash": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", + "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", + "dev": true + }, + "through2": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz", + "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==", + "dev": true, + "requires": { + "readable-stream": "2 || 3" + } + }, "vinyl": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz", @@ -11519,12 +10885,6 @@ "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", "dev": true }, - "mimic-response": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", - "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", - "dev": true - }, "mini-css-extract-plugin": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.7.0.tgz", @@ -11957,11 +11317,12 @@ } }, "ngx-markdown": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/ngx-markdown/-/ngx-markdown-8.1.0.tgz", - "integrity": "sha512-baEQJlcl9AD+V9UR1QBOBaWwCNzB6iSpFGQI/RQb3fuQPzE/+Um80/AgLSHPo+Vth4ZsaiyMoAXp7Oz+SlFR8Q==", + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/ngx-markdown/-/ngx-markdown-8.2.2.tgz", + "integrity": "sha512-wo2M2LIiLsuLqvmpeKwk8CDiT0qkxMdyNyCeypwJRcrfkzb6qjWEycA8i9VBBXwFze+8rS2BZn1YXrdezGi/3w==", "requires": { - "@types/marked": "^0.6.5", + "@types/marked": "^0.7.0", + "katex": "^0.11.0", "marked": "^0.7.0", "prismjs": "^1.16.0", "tslib": "^1.9.0" @@ -12155,59 +11516,12 @@ "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", "dev": true }, - "normalize-url": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz", - "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==", - "dev": true, - "requires": { - "prepend-http": "^2.0.0", - "query-string": "^5.0.1", - "sort-keys": "^2.0.0" - }, - "dependencies": { - "prepend-http": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", - "dev": true - } - } - }, "npm-bundled": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz", "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==", "dev": true }, - "npm-conf": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", - "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==", - "dev": true, - "requires": { - "config-chain": "^1.1.11", - "pify": "^3.0.0" - }, - "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - } - } - }, - "npm-keyword": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/npm-keyword/-/npm-keyword-5.0.0.tgz", - "integrity": "sha1-mbha7Cn8s4jS3TUfABO/Umh4fmc=", - "dev": true, - "requires": { - "got": "^7.1.0", - "registry-url": "^3.0.3" - } - }, "npm-package-arg": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz", @@ -12648,21 +11962,6 @@ "os-tmpdir": "^1.0.0" } }, - "p-any": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-any/-/p-any-1.1.0.tgz", - "integrity": "sha512-Ef0tVa4CZ5pTAmKn+Cg3w8ABBXh+hHO1aV8281dKOoUHfX+3tjG2EaFcC+aZyagg9b4EYGsHEjz21DnEE8Og2g==", - "dev": true, - "requires": { - "p-some": "^2.0.0" - } - }, - "p-cancelable": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz", - "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==", - "dev": true - }, "p-defer": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", @@ -12737,117 +12036,12 @@ } } }, - "p-some": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/p-some/-/p-some-2.0.1.tgz", - "integrity": "sha1-Zdh8ixVO289SIdFnd4ttLhUPbwY=", - "dev": true, - "requires": { - "aggregate-error": "^1.0.0" - } - }, - "p-timeout": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz", - "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=", - "dev": true, - "requires": { - "p-finally": "^1.0.0" - } - }, "p-try": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true }, - "package-json": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-5.0.0.tgz", - "integrity": "sha512-EeHQFFTlEmLrkIQoxbE9w0FuAWHoc1XpthDqnZ/i9keOt701cteyXwAxQFLpVqVjj3feh2TodkihjLaRUtIgLg==", - "dev": true, - "requires": { - "got": "^8.3.1", - "registry-auth-token": "^3.3.2", - "registry-url": "^3.1.0", - "semver": "^5.5.0" - }, - "dependencies": { - "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", - "dev": true - }, - "got": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz", - "integrity": "sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==", - "dev": true, - "requires": { - "@sindresorhus/is": "^0.7.0", - "cacheable-request": "^2.1.1", - "decompress-response": "^3.3.0", - "duplexer3": "^0.1.4", - "get-stream": "^3.0.0", - "into-stream": "^3.1.0", - "is-retry-allowed": "^1.1.0", - "isurl": "^1.0.0-alpha5", - "lowercase-keys": "^1.0.0", - "mimic-response": "^1.0.0", - "p-cancelable": "^0.4.0", - "p-timeout": "^2.0.1", - "pify": "^3.0.0", - "safe-buffer": "^5.1.1", - "timed-out": "^4.0.1", - "url-parse-lax": "^3.0.0", - "url-to-options": "^1.0.1" - } - }, - "p-cancelable": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz", - "integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==", - "dev": true - }, - "p-timeout": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz", - "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==", - "dev": true, - "requires": { - "p-finally": "^1.0.0" - } - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - }, - "prepend-http": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", - "dev": true - }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - }, - "url-parse-lax": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", - "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", - "dev": true, - "requires": { - "prepend-http": "^2.0.0" - } - } - } - }, "pacote": { "version": "9.5.0", "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.0.tgz", @@ -12891,12 +12085,6 @@ } } }, - "pad-component": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/pad-component/-/pad-component-0.0.1.tgz", - "integrity": "sha1-rR8izhvw/cDW3dkIrxfzUaQEuKw=", - "dev": true - }, "pako": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz", @@ -12949,15 +12137,6 @@ "integrity": "sha512-UGyowyjtx26n65kdAMWhm6/3uy5uSrpcuH7tt+QEVudiBoVS+eqHxD5kbi9oWVRwj7sCzXqwuM+rUGw7earl6A==", "dev": true }, - "parse-help": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/parse-help/-/parse-help-1.0.0.tgz", - "integrity": "sha512-dlOrbBba6Rrw/nrJ+V7/vkGZdiimWJQzMHZZrYsUq03JE8AV3fAv6kOYX7dP/w2h67lIdmRf8ES8mU44xAgE/Q==", - "dev": true, - "requires": { - "execall": "^1.0.0" - } - }, "parse-json": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", @@ -13009,47 +12188,6 @@ "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", "dev": true }, - "passwd-user": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/passwd-user/-/passwd-user-2.1.0.tgz", - "integrity": "sha1-+tnbauJS+LCI4MXezSCn2gxdnx4=", - "dev": true, - "requires": { - "execa": "^0.4.0", - "pify": "^2.3.0" - }, - "dependencies": { - "execa": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz", - "integrity": "sha1-TrZGejaglfq7KXD/nV4/t7zm68M=", - "dev": true, - "requires": { - "cross-spawn-async": "^2.1.1", - "is-stream": "^1.1.0", - "npm-run-path": "^1.0.0", - "object-assign": "^4.0.1", - "path-key": "^1.0.0", - "strip-eof": "^1.0.0" - } - }, - "npm-run-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz", - "integrity": "sha1-9cMr9ZX+ga6Sfa7FLoL4sACsPI8=", - "dev": true, - "requires": { - "path-key": "^1.0.0" - } - }, - "path-key": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz", - "integrity": "sha1-XVPVeAGWRsDWiADbThRua9wqx68=", - "dev": true - } - } - }, "path-browserify": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz", @@ -13876,6 +13014,25 @@ "integrity": "sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==", "dev": true }, + "prettier-plugin-java": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/prettier-plugin-java/-/prettier-plugin-java-0.7.1.tgz", + "integrity": "sha512-QmtXjOY6cDgSwC87GA41xxvPdWGEJo41PMHJiOLw7TT/9wEUlFmMGhwztC7ydPA1KzB0HYrBqvnClER2XZtYIQ==", + "dev": true, + "requires": { + "java-parser": "^0.7.1", + "lodash": "4.17.15", + "prettier": "1.19.1" + }, + "dependencies": { + "prettier": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", + "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", + "dev": true + } + } + }, "pretty-bytes": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.3.0.tgz", @@ -13913,9 +13070,9 @@ } }, "prismjs": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.17.1.tgz", - "integrity": "sha512-PrEDJAFdUGbOP6xK/UsfkC5ghJsPJviKgnQOoxaDbBjwc8op68Quupwt1DeAFoG8GImPhiKXAvvsH7wDSLsu1Q==", + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.20.0.tgz", + "integrity": "sha512-AEDjSrVNkynnw6A+B1DsFkd6AVdTnp+/WoUixFRULlCLZVRZlVQMVWio/16jv7G1FscUxQxOQhWwApgbnxr6kQ==", "requires": { "clipboard": "^2.0.0" } @@ -13993,12 +13150,6 @@ "integrity": "sha512-CGuc0VUTGthpJXL36ydB6jnbyOf/rAHFvmVrJlH+Rg0DqqLFQGAP6hIaxD/G0OAmBJPhXDHuEJigrp0e0wFV6g==", "dev": true }, - "proto-list": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", - "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=", - "dev": true - }, "protoduck": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz", @@ -14122,12 +13273,6 @@ "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", "dev": true }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", - "dev": true - }, "psl": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz", @@ -14198,17 +13343,6 @@ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" }, - "query-string": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz", - "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==", - "dev": true, - "requires": { - "decode-uri-component": "^0.2.0", - "object-assign": "^4.1.0", - "strict-uri-encode": "^1.0.0" - } - }, "querystring": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", @@ -14299,26 +13433,6 @@ "unpipe": "1.0.0" } }, - "rc": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "dev": true, - "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } - } - }, "react": { "version": "0.14.9", "resolved": "https://registry.npmjs.org/react/-/react-0.14.9.tgz", @@ -14657,25 +13771,6 @@ "regjsparser": "^0.1.4" } }, - "registry-auth-token": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz", - "integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==", - "dev": true, - "requires": { - "rc": "^1.1.6", - "safe-buffer": "^5.0.1" - } - }, - "registry-url": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz", - "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=", - "dev": true, - "requires": { - "rc": "^1.0.1" - } - }, "regjsgen": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", @@ -14753,15 +13848,6 @@ "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" }, - "repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "dev": true, - "requires": { - "is-finite": "^1.0.0" - } - }, "replace-ext": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", @@ -14905,15 +13991,6 @@ } } }, - "responselike": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", - "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", - "dev": true, - "requires": { - "lowercase-keys": "^1.0.0" - } - }, "restore-cursor": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", @@ -14967,30 +14044,6 @@ "inherits": "^2.0.1" } }, - "roarr": { - "version": "2.14.6", - "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.14.6.tgz", - "integrity": "sha512-qjbw0BEesKA+3XFBPt+KVe1PC/Z6ShfJ4wPlx2XifqH5h2Lj8/KQT5XJTsy3n1Es5kai+BwKALaECW3F70B1cg==", - "dev": true, - "requires": { - "boolean": "^3.0.0", - "detect-node": "^2.0.4", - "globalthis": "^1.0.0", - "json-stringify-safe": "^5.0.1", - "semver-compare": "^1.0.0", - "sprintf-js": "^1.1.2" - } - }, - "root-check": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/root-check/-/root-check-1.0.0.tgz", - "integrity": "sha1-xSp5S/Dbn61WdTbkGJjwyeCoZpc=", - "dev": true, - "requires": { - "downgrade-root": "^1.0.0", - "sudo-block": "^1.1.0" - } - }, "rsvp": { "version": "4.8.5", "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz", @@ -15214,23 +14267,6 @@ "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=", "dev": true }, - "semver-diff": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz", - "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=", - "dev": true, - "requires": { - "semver": "^5.0.3" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - } - } - }, "semver-dsl": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/semver-dsl/-/semver-dsl-1.0.1.tgz", @@ -15265,29 +14301,6 @@ } } }, - "semver-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz", - "integrity": "sha1-kqSWkGX5xwxpR1PVUkj8aPj2Usk=", - "dev": true - }, - "semver-truncate": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/semver-truncate/-/semver-truncate-1.1.2.tgz", - "integrity": "sha1-V/Qd5pcHpicJp+AQS6IRcQnqR+g=", - "dev": true, - "requires": { - "semver": "^5.3.0" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - } - } - }, "send": { "version": "0.16.2", "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz", @@ -15356,23 +14369,6 @@ } } }, - "serialize-error": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-5.0.0.tgz", - "integrity": "sha512-/VtpuyzYf82mHYTtI4QKtwHa79vAdU5OQpNPAmE/0UDdlGT0ZxHwC+J6gXkw29wwoVI8fMPsfcVHOwXtUQYYQA==", - "dev": true, - "requires": { - "type-fest": "^0.8.0" - }, - "dependencies": { - "type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", - "dev": true - } - } - }, "serialize-javascript": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz", @@ -16052,25 +15048,6 @@ } } }, - "sort-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz", - "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=", - "dev": true, - "requires": { - "is-plain-obj": "^1.0.0" - } - }, - "sort-on": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/sort-on/-/sort-on-3.0.0.tgz", - "integrity": "sha512-e2RHeY1iM6dT9od3RoqeJSyz3O7naNFsGy34+EFEcwghjAncuOXC2/Xwq87S4FbypqLVp6PcizYEsGEGsGIDXA==", - "dev": true, - "requires": { - "arrify": "^1.0.0", - "dot-prop": "^4.1.1" - } - }, "source-list-map": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", @@ -16562,59 +15539,6 @@ } } }, - "sudo-block": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/sudo-block/-/sudo-block-1.2.0.tgz", - "integrity": "sha1-zFOb+BkWJNT1B9g+60W0zqJ/NGM=", - "dev": true, - "requires": { - "chalk": "^1.0.0", - "is-docker": "^1.0.0", - "is-root": "^1.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -16967,9 +15891,9 @@ } }, "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true }, "ms": { @@ -17037,24 +15961,6 @@ } } }, - "taketalk": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/taketalk/-/taketalk-1.0.0.tgz", - "integrity": "sha1-tNTw3u0gauffd1sSnqLKbeUvJt0=", - "dev": true, - "requires": { - "get-stdin": "^4.0.1", - "minimist": "^1.1.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } - } - }, "tapable": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz", @@ -17076,65 +15982,6 @@ "yallist": "^3.0.3" } }, - "term-size": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz", - "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=", - "dev": true, - "requires": { - "execa": "^0.7.0" - }, - "dependencies": { - "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "dev": true, - "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", - "dev": true, - "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - }, - "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", - "dev": true - }, - "lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", - "dev": true, - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", - "dev": true - } - } - }, "terser": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/terser/-/terser-4.2.1.tgz", @@ -17396,9 +16243,9 @@ "dev": true }, "promise": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/promise/-/promise-8.0.3.tgz", - "integrity": "sha512-HeRDUL1RJiLhyA0/grn+PTShlBAcLuh/1BJGtrvjwbvRDCTLLMEz9rOGCV+R3vHY4MixIuoMEd9Yq/XvsTPcjw==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz", + "integrity": "sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q==", "dev": true, "requires": { "asap": "~2.0.6" @@ -17480,12 +16327,6 @@ "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==", "optional": true }, - "titleize": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/titleize/-/titleize-1.0.1.tgz", - "integrity": "sha512-rUwGDruKq1gX+FFHbTl5qjI7teVO7eOe+C8IcQ7QT+1BK3eEUXJqbZcBOeaRP4FwSC/C1A5jDoIVta0nIQ9yew==", - "dev": true - }, "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -17874,12 +16715,6 @@ "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", "dev": true }, - "tunnel": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", - "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==", - "dev": true - }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -17895,29 +16730,6 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", "dev": true }, - "twig": { - "version": "1.14.0", - "resolved": "https://registry.npmjs.org/twig/-/twig-1.14.0.tgz", - "integrity": "sha512-ut1LslUKAeF56TYQglabJaATUqbNuGO3EcXDhUspAdNbxez5VwTk2n8H00V0VfNy9Scet+VGQP8oPxt4v6mykQ==", - "dev": true, - "requires": { - "@babel/runtime": "^7.6.3", - "locutus": "^2.0.5", - "minimatch": "3.0.x", - "walk": "2.3.x" - }, - "dependencies": { - "@babel/runtime": { - "version": "7.7.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.6.tgz", - "integrity": "sha512-BWAJxpNVa0QlE5gZdWjSxXtemZyZ9RmrmVozxt3NUXeZhVIJ5ANyqmMc0JDrivBZyxUuQvFxlvH4OWWOogGfUw==", - "dev": true, - "requires": { - "regenerator-runtime": "^0.13.2" - } - } - } - }, "type": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz", @@ -18044,15 +16856,6 @@ "imurmurhash": "^0.1.4" } }, - "unique-string": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz", - "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=", - "dev": true, - "requires": { - "crypto-random-string": "^1.0.0" - } - }, "universal-analytics": { "version": "0.4.20", "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.20.tgz", @@ -18151,24 +16954,6 @@ "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==", "dev": true }, - "update-notifier": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz", - "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==", - "dev": true, - "requires": { - "boxen": "^1.2.1", - "chalk": "^2.0.1", - "configstore": "^3.0.0", - "import-lazy": "^2.1.0", - "is-ci": "^1.0.10", - "is-installed-globally": "^0.1.0", - "is-npm": "^1.0.0", - "latest-version": "^3.0.0", - "semver-diff": "^2.0.0", - "xdg-basedir": "^3.0.0" - } - }, "upper-case": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", @@ -18224,27 +17009,12 @@ "prepend-http": "^1.0.1" } }, - "url-to-options": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz", - "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=", - "dev": true - }, "use": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", "dev": true }, - "user-home": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz", - "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=", - "dev": true, - "requires": { - "os-homedir": "^1.0.0" - } - }, "utf8-bytes": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/utf8-bytes/-/utf8-bytes-0.0.1.tgz", @@ -18404,15 +17174,6 @@ "xml-name-validator": "^3.0.0" } }, - "walk": { - "version": "2.3.14", - "resolved": "https://registry.npmjs.org/walk/-/walk-2.3.14.tgz", - "integrity": "sha512-5skcWAUmySj6hkBdH6B6+3ddMjVQYH5Qy9QGbPmN8kVmLteXk+yVXg+yfk1nbX30EYakahLrr8iPcCxJQSCBeg==", - "dev": true, - "requires": { - "foreachasync": "^3.0.0" - } - }, "walker": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz", @@ -19145,15 +17906,6 @@ "string-width": "^1.0.2 || 2" } }, - "widest-line": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz", - "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==", - "dev": true, - "requires": { - "string-width": "^2.1.1" - } - }, "win-release": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/win-release/-/win-release-1.1.1.tgz", @@ -19177,15 +17929,6 @@ "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=", "dev": true }, - "windows-release": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.2.0.tgz", - "integrity": "sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA==", - "dev": true, - "requires": { - "execa": "^1.0.0" - } - }, "winston": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/winston/-/winston-3.2.1.tgz", @@ -19213,9 +17956,9 @@ } }, "readable-stream": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", - "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "dev": true, "requires": { "inherits": "^2.0.3", @@ -19564,12 +18307,6 @@ "async-limiter": "~1.0.0" } }, - "xdg-basedir": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz", - "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=", - "dev": true - }, "xml": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz", @@ -19738,62 +18475,10 @@ "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=", "dev": true }, - "yeoman-character": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/yeoman-character/-/yeoman-character-1.1.0.tgz", - "integrity": "sha1-kNS1vq+SdZCGF3AVsv36LgaE18c=", - "dev": true, - "requires": { - "supports-color": "^3.1.2" - }, - "dependencies": { - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "^1.0.0" - } - } - } - }, - "yeoman-doctor": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yeoman-doctor/-/yeoman-doctor-4.0.0.tgz", - "integrity": "sha512-CP0fwGk5Y+jel+A0AQbyqnIFZRRpkKOeYUibiTSmlgV9PcgNFFVwn86VcUIpDLOqVjF+9v+O9FWQMo+IUcV2mA==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.0", - "bin-version-check": "^3.0.0", - "chalk": "^2.3.0", - "global-agent": "^2.0.0", - "global-tunnel-ng": "^2.5.3", - "latest-version": "^3.1.0", - "log-symbols": "^2.1.0", - "semver": "^5.0.3", - "twig": "^1.10.5", - "user-home": "^2.0.0" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - } - } - }, "yeoman-environment": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.3.4.tgz", - "integrity": "sha512-KLxE5ft/74Qj7h3AsQZv8G6MEEHYJwmD5F99nfOVaep3rBzCtbrJKkdqWc7bDV141Nr8UZZsIXmzc3IcCm6E2w==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.8.0.tgz", + "integrity": "sha512-BbJeEna23Qx90fBiJt1awcZ9okfPY/rP3xZYsk1rD3x8LuQgpo4BfegPvQT1sqqh2+gYVZmYZMv5pS8+Muyr9Q==", "dev": true, "requires": { "chalk": "^2.4.1", @@ -19802,7 +18487,7 @@ "diff": "^3.5.0", "escape-string-regexp": "^1.0.2", "globby": "^8.0.1", - "grouped-queue": "^0.3.3", + "grouped-queue": "^1.0.0", "inquirer": "^6.0.0", "is-scoped": "^1.0.0", "lodash": "^4.17.10", @@ -19874,36 +18559,36 @@ } }, "yeoman-generator": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-3.2.0.tgz", - "integrity": "sha512-iR/qb2je3GdXtSfxgvOXxUW0Cp8+C6LaZaNlK2BAICzFNzwHtM10t/QBwz5Ea9nk6xVDQNj4Q889TjCXGuIv8w==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.6.0.tgz", + "integrity": "sha512-Hq65rLqMNCS0h0n1yakSZjHsEZHm0ZpOM02Nja6O03s2k5WHvAhGOx7uxs93vrJv62zFrJtD9e9mVhgoVbi7CQ==", "dev": true, "requires": { - "async": "^2.6.0", - "chalk": "^2.3.0", + "async": "^2.6.2", + "chalk": "^2.4.2", "cli-table": "^0.3.1", "cross-spawn": "^6.0.5", - "dargs": "^6.0.0", + "dargs": "^6.1.0", "dateformat": "^3.0.3", - "debug": "^4.1.0", - "detect-conflict": "^1.0.0", + "debug": "^4.1.1", + "diff": "^4.0.1", "error": "^7.0.2", "find-up": "^3.0.0", - "github-username": "^4.0.0", - "istextorbinary": "^2.2.1", - "lodash": "^4.17.10", - "make-dir": "^1.1.0", - "mem-fs-editor": "^5.0.0", + "github-username": "^3.0.0", + "istextorbinary": "^2.5.1", + "lodash": "^4.17.11", + "make-dir": "^3.0.0", + "mem-fs-editor": "^6.0.0", "minimist": "^1.2.0", - "pretty-bytes": "^5.1.0", - "read-chunk": "^3.0.0", - "read-pkg-up": "^4.0.0", - "rimraf": "^2.6.2", + "pretty-bytes": "^5.2.0", + "read-chunk": "^3.2.0", + "read-pkg-up": "^5.0.0", + "rimraf": "^2.6.3", "run-async": "^2.0.0", - "shelljs": "^0.8.0", + "shelljs": "^0.8.3", "text-table": "^0.2.0", - "through2": "^3.0.0", - "yeoman-environment": "^2.0.5" + "through2": "^3.0.1", + "yeoman-environment": "^2.3.4" }, "dependencies": { "async": { @@ -19915,85 +18600,52 @@ "lodash": "^4.17.14" } }, - "load-json-file": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", - "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^4.0.0", - "pify": "^3.0.0", - "strip-bom": "^3.0.0" - } - }, - "make-dir": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", - "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", - "dev": true, - "requires": { - "pify": "^3.0.0" - } + "diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true }, "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true }, "parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz", + "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==", "dev": true, "requires": { + "@babel/code-frame": "^7.0.0", "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - } - }, - "path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", - "dev": true, - "requires": { - "pify": "^3.0.0" + "json-parse-better-errors": "^1.0.1", + "lines-and-columns": "^1.1.6" } }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - }, "read-pkg": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", - "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", + "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", "dev": true, "requires": { - "load-json-file": "^4.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^3.0.0" + "@types/normalize-package-data": "^2.4.0", + "normalize-package-data": "^2.5.0", + "parse-json": "^5.0.0", + "type-fest": "^0.6.0" } }, "read-pkg-up": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz", - "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-5.0.0.tgz", + "integrity": "sha512-XBQjqOBtTzyol2CpsQOw8LHV0XbDZVG7xMMjmXAJomlVY03WOBRmYgDJETlvcg0H63AJvPRwT7GFi5rvOzUOKg==", "dev": true, "requires": { "find-up": "^3.0.0", - "read-pkg": "^3.0.0" + "read-pkg": "^5.0.0" } }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true - }, "through2": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz", @@ -20011,699 +18663,6 @@ "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", "dev": true }, - "yo": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/yo/-/yo-3.1.0.tgz", - "integrity": "sha512-boSESRRyvfyns3DfzxF2F0LVV97wSEFbKUi1oC7RwnZTA66KZ7Bo3JjOLe7mM6IjjeI0vEZcr4BbFjrSHh8d0Q==", - "dev": true, - "requires": { - "async": "^2.6.1", - "chalk": "^2.4.1", - "cli-list": "^0.2.0", - "configstore": "^3.1.2", - "cross-spawn": "^6.0.5", - "figures": "^2.0.0", - "fullname": "^3.2.0", - "global-agent": "^2.0.0", - "global-tunnel-ng": "^2.7.1", - "got": "^8.3.2", - "humanize-string": "^1.0.2", - "inquirer": "^6.0.0", - "insight": "^0.10.3", - "lodash": "^4.17.11", - "meow": "^3.0.0", - "npm-keyword": "^5.0.0", - "open": "^6.3.0", - "package-json": "^5.0.0", - "parse-help": "^1.0.0", - "read-pkg-up": "^4.0.0", - "root-check": "^1.0.0", - "sort-on": "^3.0.0", - "string-length": "^2.0.0", - "tabtab": "^1.3.2", - "titleize": "^1.0.1", - "update-notifier": "^2.5.0", - "user-home": "^2.0.0", - "yeoman-character": "^1.0.0", - "yeoman-doctor": "^4.0.0", - "yeoman-environment": "^2.4.0", - "yosay": "^2.0.2" - }, - "dependencies": { - "ansi-escapes": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz", - "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=", - "dev": true - }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", - "dev": true, - "requires": { - "lodash": "^4.17.14" - } - }, - "camelcase": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", - "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", - "dev": true - }, - "camelcase-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", - "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", - "dev": true, - "requires": { - "camelcase": "^2.0.0", - "map-obj": "^1.0.0" - } - }, - "cli-cursor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz", - "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", - "dev": true, - "requires": { - "restore-cursor": "^1.0.1" - } - }, - "conf": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/conf/-/conf-1.4.0.tgz", - "integrity": "sha512-bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg==", - "dev": true, - "requires": { - "dot-prop": "^4.1.0", - "env-paths": "^1.0.0", - "make-dir": "^1.0.0", - "pkg-up": "^2.0.0", - "write-file-atomic": "^2.3.0" - } - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "dir-glob": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz", - "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==", - "dev": true, - "requires": { - "arrify": "^1.0.1", - "path-type": "^3.0.0" - } - }, - "external-editor": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-1.1.1.tgz", - "integrity": "sha1-Etew24UPf/fnCBuvQAVwAGDEYAs=", - "dev": true, - "requires": { - "extend": "^3.0.0", - "spawn-sync": "^1.0.15", - "tmp": "^0.0.29" - } - }, - "find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", - "dev": true, - "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", - "dev": true - }, - "globby": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz", - "integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==", - "dev": true, - "requires": { - "array-union": "^1.0.1", - "dir-glob": "2.0.0", - "fast-glob": "^2.0.2", - "glob": "^7.1.2", - "ignore": "^3.3.5", - "pify": "^3.0.0", - "slash": "^1.0.0" - } - }, - "got": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz", - "integrity": "sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==", - "dev": true, - "requires": { - "@sindresorhus/is": "^0.7.0", - "cacheable-request": "^2.1.1", - "decompress-response": "^3.3.0", - "duplexer3": "^0.1.4", - "get-stream": "^3.0.0", - "into-stream": "^3.1.0", - "is-retry-allowed": "^1.1.0", - "isurl": "^1.0.0-alpha5", - "lowercase-keys": "^1.0.0", - "mimic-response": "^1.0.0", - "p-cancelable": "^0.4.0", - "p-timeout": "^2.0.1", - "pify": "^3.0.0", - "safe-buffer": "^5.1.1", - "timed-out": "^4.0.1", - "url-parse-lax": "^3.0.0", - "url-to-options": "^1.0.1" - } - }, - "indent-string": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", - "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", - "dev": true, - "requires": { - "repeating": "^2.0.0" - } - }, - "insight": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/insight/-/insight-0.10.3.tgz", - "integrity": "sha512-YOncxSN6Omh+1Oqxt+OJAvJVMDKw7l6IEG0wT2cTMGxjsTcroOGW4IR926QDzxg/uZHcFZ2cZbckDWdZhc2pZw==", - "dev": true, - "requires": { - "async": "^2.6.2", - "chalk": "^2.4.2", - "conf": "^1.4.0", - "inquirer": "^6.3.1", - "lodash.debounce": "^4.0.8", - "os-name": "^3.1.0", - "request": "^2.88.0", - "tough-cookie": "^3.0.1", - "uuid": "^3.3.2" - } - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "load-json-file": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", - "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^4.0.0", - "pify": "^3.0.0", - "strip-bom": "^3.0.0" - } - }, - "macos-release": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.3.0.tgz", - "integrity": "sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA==", - "dev": true - }, - "make-dir": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", - "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", - "dev": true, - "requires": { - "pify": "^3.0.0" - } - }, - "map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "dev": true - }, - "meow": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", - "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", - "dev": true, - "requires": { - "camelcase-keys": "^2.0.0", - "decamelize": "^1.1.2", - "loud-rejection": "^1.0.0", - "map-obj": "^1.0.1", - "minimist": "^1.1.3", - "normalize-package-data": "^2.3.4", - "object-assign": "^4.0.1", - "read-pkg-up": "^1.0.1", - "redent": "^1.0.0", - "trim-newlines": "^1.0.0" - }, - "dependencies": { - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", - "dev": true, - "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" - } - } - } - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "mute-stream": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz", - "integrity": "sha1-SJYrGeFp/R38JAs/HnMXYnu8R9s=", - "dev": true - }, - "onetime": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", - "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=", - "dev": true - }, - "open": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz", - "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==", - "dev": true, - "requires": { - "is-wsl": "^1.1.0" - } - }, - "os-name": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz", - "integrity": "sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==", - "dev": true, - "requires": { - "macos-release": "^2.2.0", - "windows-release": "^3.1.0" - } - }, - "p-cancelable": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz", - "integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==", - "dev": true - }, - "p-timeout": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz", - "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==", - "dev": true, - "requires": { - "p-finally": "^1.0.0" - } - }, - "parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "dev": true, - "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - } - }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", - "dev": true, - "requires": { - "pinkie-promise": "^2.0.0" - } - }, - "path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", - "dev": true, - "requires": { - "pify": "^3.0.0" - } - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - }, - "prepend-http": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", - "dev": true - }, - "read-pkg-up": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz", - "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==", - "dev": true, - "requires": { - "find-up": "^3.0.0", - "read-pkg": "^3.0.0" - }, - "dependencies": { - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "requires": { - "locate-path": "^3.0.0" - } - }, - "read-pkg": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", - "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", - "dev": true, - "requires": { - "load-json-file": "^4.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^3.0.0" - } - } - } - }, - "redent": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", - "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", - "dev": true, - "requires": { - "indent-string": "^2.1.0", - "strip-indent": "^1.0.1" - } - }, - "restore-cursor": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz", - "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", - "dev": true, - "requires": { - "exit-hook": "^1.0.0", - "onetime": "^1.0.0" - } - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true - }, - "strip-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", - "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", - "dev": true, - "requires": { - "get-stdin": "^4.0.1" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - }, - "tabtab": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/tabtab/-/tabtab-1.3.2.tgz", - "integrity": "sha1-u5wspjJPZZ/edjTCyvPAluEYfKc=", - "dev": true, - "requires": { - "debug": "^2.2.0", - "inquirer": "^1.0.2", - "minimist": "^1.2.0", - "mkdirp": "^0.5.1", - "npmlog": "^2.0.3", - "object-assign": "^4.1.0" - }, - "dependencies": { - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "figures": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", - "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", - "dev": true, - "requires": { - "escape-string-regexp": "^1.0.5", - "object-assign": "^4.1.0" - } - }, - "inquirer": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-1.2.3.tgz", - "integrity": "sha1-TexvMvN+97sLLtPx0aXD9UUHSRg=", - "dev": true, - "requires": { - "ansi-escapes": "^1.1.0", - "chalk": "^1.0.0", - "cli-cursor": "^1.0.1", - "cli-width": "^2.0.0", - "external-editor": "^1.1.0", - "figures": "^1.3.5", - "lodash": "^4.3.0", - "mute-stream": "0.0.6", - "pinkie-promise": "^2.0.0", - "run-async": "^2.2.0", - "rx": "^4.1.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.0", - "through": "^2.3.6" - } - } - } - }, - "tmp": { - "version": "0.0.29", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz", - "integrity": "sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA=", - "dev": true, - "requires": { - "os-tmpdir": "~1.0.1" - } - }, - "tough-cookie": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", - "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==", - "dev": true, - "requires": { - "ip-regex": "^2.1.0", - "psl": "^1.1.28", - "punycode": "^2.1.1" - } - }, - "trim-newlines": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", - "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", - "dev": true - }, - "url-parse-lax": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", - "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", - "dev": true, - "requires": { - "prepend-http": "^2.0.0" - } - }, - "yeoman-environment": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.7.0.tgz", - "integrity": "sha512-YNzSUWgJVSgnm0qgLON4Gb2nTm+kywBiWjK4MbvosjUP2YJJ30lNhEx7ukyzKRPUlsavd5IsuALtF6QaVrq81A==", - "dev": true, - "requires": { - "chalk": "^2.4.1", - "cross-spawn": "^6.0.5", - "debug": "^3.1.0", - "diff": "^3.5.0", - "escape-string-regexp": "^1.0.2", - "globby": "^8.0.1", - "grouped-queue": "^0.3.3", - "inquirer": "^6.0.0", - "is-scoped": "^1.0.0", - "lodash": "^4.17.10", - "log-symbols": "^2.2.0", - "mem-fs": "^1.1.0", - "strip-ansi": "^4.0.0", - "text-table": "^0.2.0", - "untildify": "^3.0.3" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - } - } - }, - "yosay": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/yosay/-/yosay-2.0.2.tgz", - "integrity": "sha512-avX6nz2esp7IMXGag4gu6OyQBsMh/SEn+ZybGu3yKPlOTE6z9qJrzG/0X5vCq/e0rPFy0CUYCze0G5hL310ibA==", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0", - "ansi-styles": "^3.0.0", - "chalk": "^1.0.0", - "cli-boxes": "^1.0.0", - "pad-component": "0.0.1", - "string-width": "^2.0.0", - "strip-ansi": "^3.0.0", - "taketalk": "^1.0.0", - "wrap-ansi": "^2.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - } - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, "yup": { "version": "0.27.0", "resolved": "https://registry.npmjs.org/yup/-/yup-0.27.0.tgz", diff --git a/package.json b/package.json index 05dc05a..d11f56a 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "@ngx-translate/core": "11.0.1", "@ngx-translate/http-loader": "4.0.0", "bootstrap": "4.3.1", - "bootswatch": "^4.3.1", + "bootswatch": "^4.4.1", "core-js": "3.1.3", "country-code-lookup": "0.0.15", "file-saver": "^2.0.2", @@ -30,7 +30,7 @@ "ng-jhipster": "0.10.1", "ngx-cookie": "4.0.2", "ngx-infinite-scroll": "7.2.0", - "ngx-markdown": "^8.1.0", + "ngx-markdown": "^8.2.2", "ngx-webstorage": "4.0.1", "rxjs": "6.5.2", "swagger-ui": "3.23.11", @@ -45,9 +45,9 @@ "@types/chai-string": "1.4.1", "@types/jest": "24.0.14", "@types/mocha": "5.2.7", - "@types/node": "^10.12.27", + "@types/node": "^10.17.18", "@types/selenium-webdriver": "4.0.0", - "acorn": "6.1.1", + "acorn": "^6.4.1", "angular-router-loader": "0.8.5", "angular2-template-loader": "0.6.2", "autoprefixer": "9.6.0", @@ -64,7 +64,7 @@ "file-loader": "4.0.0", "fork-ts-checker-webpack-plugin": "1.3.6", "friendly-errors-webpack-plugin": "1.7.0", - "generator-jhipster": "^6.5.1", + "generator-jhipster": "^6.8.0", "html-loader": "0.5.5", "html-webpack-plugin": "3.2.0", "husky": "2.4.1",