diff --git a/VERSION b/VERSION index 580eaccf85..88901428bf 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.18 +6.19 diff --git a/app/Http/Controllers/Admin/ExperienceController.php b/app/Http/Controllers/Admin/ExperienceController.php index c5eacb7295..23d54fe27a 100644 --- a/app/Http/Controllers/Admin/ExperienceController.php +++ b/app/Http/Controllers/Admin/ExperienceController.php @@ -127,6 +127,7 @@ protected function previewData($item) { $articles = Article::published() ->orderBy('date', 'desc') + ->listed() ->paginate(4); return [ diff --git a/app/Http/Controllers/DigitalPublicationsController.php b/app/Http/Controllers/DigitalPublicationsController.php index 6a205ef530..42723756fe 100644 --- a/app/Http/Controllers/DigitalPublicationsController.php +++ b/app/Http/Controllers/DigitalPublicationsController.php @@ -41,7 +41,7 @@ public function index(Request $request) public function show($id) { - $page = $this->repository->forSlug($id); + $page = $this->repository->safeForSlug($id); if (!$page) { $page = $this->repository->find((Integer) $id) ?? abort(404); } diff --git a/app/Http/Controllers/EducatorResourcesController.php b/app/Http/Controllers/EducatorResourcesController.php index 90d2c9713b..2131ada2b6 100644 --- a/app/Http/Controllers/EducatorResourcesController.php +++ b/app/Http/Controllers/EducatorResourcesController.php @@ -73,7 +73,7 @@ public function show($id) { $page = $this->repository->find((Integer) $id); if (!$page) { - $page = $this->repository->forSlug($id); + $page = $this->repository->safeForSlug($id); if (!$page) { abort(404); diff --git a/app/Http/Controllers/GenericPagesController.php b/app/Http/Controllers/GenericPagesController.php index 4e77794abc..a65d4778f7 100644 --- a/app/Http/Controllers/GenericPagesController.php +++ b/app/Http/Controllers/GenericPagesController.php @@ -51,7 +51,7 @@ public function show($slug) protected function getPage($slug) { $idSlug = collect(explode("/", $slug))->last(); - $page = $this->genericPageRepository->forSlug($idSlug); + $page = $this->genericPageRepository->safeForSlug($idSlug); if (empty($page)) { $page = $this->genericPageRepository->getById((integer) $idSlug); if (!$page) { diff --git a/app/Http/Controllers/InteractiveFeatureExperiencesController.php b/app/Http/Controllers/InteractiveFeatureExperiencesController.php index 0b8d8112e3..f60da3c7bb 100644 --- a/app/Http/Controllers/InteractiveFeatureExperiencesController.php +++ b/app/Http/Controllers/InteractiveFeatureExperiencesController.php @@ -91,7 +91,7 @@ protected function show($slug) ); } - $experience = $this->repository->forSlug($slug); + $experience = $this->repository->safeForSlug($slug); if (!$experience || $experience->kiosk_only === true) { abort(404); @@ -116,6 +116,7 @@ protected function show($slug) else { $articles = Article::published() ->orderBy('date', 'desc') + ->listed() ->paginate(4); } @@ -134,7 +135,7 @@ protected function show($slug) protected function showKiosk($slug) { - $experience = $this->repository->forSlug($slug); + $experience = $this->repository->safeForSlug($slug); if (!$experience) { abort(404); } diff --git a/app/Http/Controllers/PrintedPublicationsController.php b/app/Http/Controllers/PrintedPublicationsController.php index e8d3ffef34..1314dfd6e9 100644 --- a/app/Http/Controllers/PrintedPublicationsController.php +++ b/app/Http/Controllers/PrintedPublicationsController.php @@ -56,7 +56,7 @@ public function index(Request $request) public function show($id) { - $page = $this->repository->forSlug($id); + $page = $this->repository->safeForSlug($id); if (!$page) { $page = $this->repository->find((Integer) $id) ?? abort(404); } diff --git a/app/Http/Controllers/ResearchGuidesController.php b/app/Http/Controllers/ResearchGuidesController.php index d4cc5b4eab..af26352a38 100644 --- a/app/Http/Controllers/ResearchGuidesController.php +++ b/app/Http/Controllers/ResearchGuidesController.php @@ -57,7 +57,7 @@ public function show($id) { $page = $this->repository->find((Integer) $id); if (!$page) { - $page = $this->repository->forSlug($id); + $page = $this->repository->safeForSlug($id); if (!$page) { abort(404); diff --git a/app/Http/Controllers/VideoController.php b/app/Http/Controllers/VideoController.php index 68831de6eb..ae40caa76b 100644 --- a/app/Http/Controllers/VideoController.php +++ b/app/Http/Controllers/VideoController.php @@ -23,7 +23,7 @@ public function show($id, $slug = null) // Temporary. Remove after redirects are in place! if (empty($item)) { - $item = $this->repository->forSlug($id); + $item = $this->repository->safeForSlug($id); } if (!$item) { diff --git a/app/Http/Resources/Slide.php b/app/Http/Resources/Slide.php index 0b64360af3..2c8d9a4c69 100644 --- a/app/Http/Resources/Slide.php +++ b/app/Http/Resources/Slide.php @@ -212,7 +212,8 @@ protected function get3DTourAttributes() 'model_id' => $model3d->model_id, 'camera_position' => $model3d->camera_position, 'camera_target' => $model3d->camera_target, - 'annotation_list' => json_decode($model3d->annotation_list) + 'annotation_list' => json_decode($model3d->annotation_list), + 'hide_annotation_title' => $model3d->hide_annotation_title ]; } else { return [ diff --git a/app/Models/Model3d.php b/app/Models/Model3d.php index e732d9f56f..7922797961 100644 --- a/app/Models/Model3d.php +++ b/app/Models/Model3d.php @@ -17,7 +17,8 @@ class Model3d extends Model 'model_caption_title', 'model_caption', 'guided_tour', - 'hide_annotation' + 'hide_annotation', + 'hide_annotation_title' ]; protected $casts = [ 'camera_position' => 'array', diff --git a/app/Repositories/AuthorRepository.php b/app/Repositories/AuthorRepository.php index 62f888d60e..1eda02433c 100644 --- a/app/Repositories/AuthorRepository.php +++ b/app/Repositories/AuthorRepository.php @@ -5,7 +5,6 @@ use A17\Twill\Repositories\Behaviors\HandleSlugs; use A17\Twill\Repositories\Behaviors\HandleMedias; use A17\Twill\Repositories\Behaviors\HandleRevisions; -use A17\Twill\Repositories\ModuleRepository; use App\Models\Author; class AuthorRepository extends ModuleRepository diff --git a/app/Repositories/Behaviors/Handle3DModel.php b/app/Repositories/Behaviors/Handle3DModel.php index af76205384..5e078d5137 100644 --- a/app/Repositories/Behaviors/Handle3DModel.php +++ b/app/Repositories/Behaviors/Handle3DModel.php @@ -30,6 +30,7 @@ private function handle3DModel($object, $fields, $fieldName = 'aic_3d_model') 'annotation_list' => $fields["{$fieldName}[annotation_list]"], 'guided_tour' => $fields["{$fieldName}[guided_tour]"] ?? false, 'hide_annotation' => empty($fields["{$fieldName}[hide_annotation]"]) ? false : $fields["{$fieldName}[hide_annotation]"], + 'hide_annotation_title' => empty($fields["{$fieldName}[hide_annotation_title]"]) ? false : $fields["{$fieldName}[hide_annotation_title]"], ] ); $object->model3d()->associate($model); @@ -45,7 +46,7 @@ private function getFormFieldsFor3DModel($object, $fields, $fieldName = 'aic_3d_ $model3d = $object->secondaryExperienceModal->first()->model3d) { $secondaryExperienceModal = $object->secondaryExperienceModal->first(); - $aic3dFields = ['model_url', 'model_id', 'model_caption_title', 'model_caption', 'camera_position', 'guided_tour', 'camera_target', 'annotation_list', 'hide_annotation']; + $aic3dFields = ['model_url', 'model_id', 'model_caption_title', 'model_caption', 'camera_position', 'guided_tour', 'camera_target', 'annotation_list', 'hide_annotation', 'hide_annotation_title']; foreach ($aic3dFields as $aic3dField) { array_push($fields['repeaterFields']['secondary_experience_modal'], [ 'name' => "blocks[secondaryExperienceModal-{$secondaryExperienceModal->id}][aic_split_3d_model][{$aic3dField}]", @@ -64,6 +65,7 @@ private function getFormFieldsFor3DModel($object, $fields, $fieldName = 'aic_3d_ $fields["{$fieldName}[camera_target]"] = $model3d->getOriginal('camera_target'); $fields["{$fieldName}[annotation_list]"] = $model3d->getOriginal('annotation_list'); $fields["{$fieldName}[hide_annotation]"] = $model3d->getOriginal('hide_annotation'); + $fields["{$fieldName}[hide_annotation_title]"] = $model3d->getOriginal('hide_annotation_title'); }; return $fields; diff --git a/app/Repositories/EmailSeriesRepository.php b/app/Repositories/EmailSeriesRepository.php index 72b769e868..3bac1846f1 100644 --- a/app/Repositories/EmailSeriesRepository.php +++ b/app/Repositories/EmailSeriesRepository.php @@ -2,14 +2,10 @@ namespace App\Repositories; - -use A17\Twill\Repositories\ModuleRepository; use App\Models\EmailSeries; class EmailSeriesRepository extends ModuleRepository { - - public function __construct(EmailSeries $model) { $this->model = $model; diff --git a/app/Repositories/ExperienceImageRepository.php b/app/Repositories/ExperienceImageRepository.php index 95a9bff162..829bb98c2f 100644 --- a/app/Repositories/ExperienceImageRepository.php +++ b/app/Repositories/ExperienceImageRepository.php @@ -7,7 +7,6 @@ use A17\Twill\Repositories\Behaviors\HandleMedias; use A17\Twill\Repositories\Behaviors\HandleRevisions; use A17\Twill\Repositories\Behaviors\HandleSlugs; -use A17\Twill\Repositories\ModuleRepository; use App\Models\Api\Artwork; use App\Models\ExperienceImage; diff --git a/app/Repositories/ExperienceModalRepository.php b/app/Repositories/ExperienceModalRepository.php index a4f8f5d696..d80a98716e 100644 --- a/app/Repositories/ExperienceModalRepository.php +++ b/app/Repositories/ExperienceModalRepository.php @@ -6,7 +6,6 @@ use A17\Twill\Repositories\Behaviors\HandleFiles; use A17\Twill\Repositories\Behaviors\HandleMedias; use A17\Twill\Repositories\Behaviors\HandleRevisions; -use A17\Twill\Repositories\ModuleRepository; use App\Models\ExperienceModal; use App\Repositories\Behaviors\HandleExperienceModule; use App\Repositories\Behaviors\Handle3DModel; @@ -42,7 +41,7 @@ public function prepareFieldsBeforeSave($object, $fields) $fields['repeaters'] = $fields['blocks']; unset($fields['blocks']); }; - + return parent::prepareFieldsBeforeCreate($fields); } } diff --git a/app/Repositories/ExperienceRepository.php b/app/Repositories/ExperienceRepository.php index 90f2af5901..51f5ebced9 100644 --- a/app/Repositories/ExperienceRepository.php +++ b/app/Repositories/ExperienceRepository.php @@ -9,7 +9,6 @@ use A17\Twill\Repositories\Behaviors\HandleRevisions; use A17\Twill\Repositories\Behaviors\HandleSlugs; use A17\Twill\Repositories\Behaviors\HandleTranslations; -use A17\Twill\Repositories\ModuleRepository; use App\Models\Experience; use App\Repositories\Behaviors\HandleExperienceModule; use App\Repositories\Behaviors\HandleMagazine; diff --git a/app/Repositories/HomeArtistRepository.php b/app/Repositories/HomeArtistRepository.php index ab5b277b4e..2c2ad783ce 100644 --- a/app/Repositories/HomeArtistRepository.php +++ b/app/Repositories/HomeArtistRepository.php @@ -3,7 +3,6 @@ namespace App\Repositories; use A17\Twill\Repositories\Behaviors\HandleMedias; -use A17\Twill\Repositories\ModuleRepository; use App\Models\HomeArtist; use App\Repositories\Behaviors\HandleApiRelations; diff --git a/app/Repositories/InteractiveFeatureRepository.php b/app/Repositories/InteractiveFeatureRepository.php index d0eef826c4..56abdf99ea 100644 --- a/app/Repositories/InteractiveFeatureRepository.php +++ b/app/Repositories/InteractiveFeatureRepository.php @@ -7,7 +7,6 @@ use A17\Twill\Repositories\Behaviors\HandleRepeaters; use A17\Twill\Repositories\Behaviors\HandleRevisions; use A17\Twill\Repositories\Behaviors\HandleSlugs; -use A17\Twill\Repositories\ModuleRepository; use App\Models\InteractiveFeature; use App\Models\Experience; use Artisan; @@ -36,5 +35,5 @@ public function search($search) { return Experience::where('title', 'ILIKE', "%{$search}%")->published(); } - + } diff --git a/app/Repositories/IssueArticleRepository.php b/app/Repositories/IssueArticleRepository.php index 6d4842830a..f00898f55a 100644 --- a/app/Repositories/IssueArticleRepository.php +++ b/app/Repositories/IssueArticleRepository.php @@ -6,7 +6,6 @@ use A17\Twill\Repositories\Behaviors\HandleMedias; use A17\Twill\Repositories\Behaviors\HandleRevisions; use A17\Twill\Repositories\Behaviors\HandleBlocks; -use A17\Twill\Repositories\ModuleRepository; use App\Models\IssueArticle; use App\Models\Api\Search; diff --git a/app/Repositories/IssueRepository.php b/app/Repositories/IssueRepository.php index d3c59d6aa4..da15187de7 100644 --- a/app/Repositories/IssueRepository.php +++ b/app/Repositories/IssueRepository.php @@ -5,7 +5,6 @@ use A17\Twill\Repositories\Behaviors\HandleSlugs; use A17\Twill\Repositories\Behaviors\HandleMedias; use A17\Twill\Repositories\Behaviors\HandleRevisions; -use A17\Twill\Repositories\ModuleRepository; use App\Models\Issue; use App\Models\Api\Search; diff --git a/app/Repositories/MagazineIssueRepository.php b/app/Repositories/MagazineIssueRepository.php index b093e7c539..a0a8fa7cf4 100644 --- a/app/Repositories/MagazineIssueRepository.php +++ b/app/Repositories/MagazineIssueRepository.php @@ -8,7 +8,6 @@ use A17\Twill\Repositories\Behaviors\HandleBlocks; use A17\Twill\Repositories\Behaviors\HandleMedias; use A17\Twill\Repositories\Behaviors\HandleRevisions; -use A17\Twill\Repositories\ModuleRepository; use App\Repositories\Behaviors\HandleApiBlocks; class MagazineIssueRepository extends ModuleRepository diff --git a/app/Repositories/ModuleRepository.php b/app/Repositories/ModuleRepository.php index 92c81701be..c81d709dd2 100644 --- a/app/Repositories/ModuleRepository.php +++ b/app/Repositories/ModuleRepository.php @@ -2,6 +2,7 @@ namespace App\Repositories; +use BadMethodCallException; use A17\Twill\Repositories\ModuleRepository as BaseModuleRepository; class ModuleRepository extends BaseModuleRepository @@ -29,4 +30,16 @@ public function prepareFieldsBeforeSave($object, $fields) return parent::prepareFieldsBeforeSave($object, $fields); } + /** + * Temporary work-around for https://github.com/area17/twill/issues/723 + */ + public function safeForSlug($slug, $with = [], $withCount = [], $scopes = []) + { + try { + return $this->forSlug(...func_get_args()); + } catch (BadMethodCallException $e) { + abort(404); + } + } + } diff --git a/app/Repositories/SlideRepository.php b/app/Repositories/SlideRepository.php index 689f56af4c..162ec5e01c 100644 --- a/app/Repositories/SlideRepository.php +++ b/app/Repositories/SlideRepository.php @@ -7,7 +7,6 @@ use A17\Twill\Repositories\Behaviors\HandleMedias; use A17\Twill\Repositories\Behaviors\HandleRevisions; use A17\Twill\Repositories\Behaviors\HandleSlugs; -use A17\Twill\Repositories\ModuleRepository; use App\Models\Slide; use App\Repositories\Behaviors\HandleExperienceModule; use App\Repositories\Behaviors\Handle3DModel; diff --git a/app/Repositories/VanityRedirectRepository.php b/app/Repositories/VanityRedirectRepository.php index ac29497592..7c7e451d3a 100644 --- a/app/Repositories/VanityRedirectRepository.php +++ b/app/Repositories/VanityRedirectRepository.php @@ -3,7 +3,6 @@ namespace App\Repositories; use A17\Twill\Repositories\Behaviors\HandleRevisions; -use A17\Twill\Repositories\ModuleRepository; use App\Models\VanityRedirect; class VanityRedirectRepository extends ModuleRepository diff --git a/app/Repositories/WhatToExpectRepository.php b/app/Repositories/WhatToExpectRepository.php index 28b95c6d52..0ae2c40483 100644 --- a/app/Repositories/WhatToExpectRepository.php +++ b/app/Repositories/WhatToExpectRepository.php @@ -4,7 +4,6 @@ use A17\Twill\Repositories\Behaviors\HandleTranslations; use A17\Twill\Repositories\Behaviors\HandleRevisions; -use A17\Twill\Repositories\ModuleRepository; use App\Models\WhatToExpect; class WhatToExpectRepository extends ModuleRepository diff --git a/database/migrations/2020_08_12_163624_add_hide_annotation_title_to_3d_models.php b/database/migrations/2020_08_12_163624_add_hide_annotation_title_to_3d_models.php new file mode 100644 index 0000000000..1592de4df6 --- /dev/null +++ b/database/migrations/2020_08_12_163624_add_hide_annotation_title_to_3d_models.php @@ -0,0 +1,32 @@ +boolean('hide_annotation_title')->default(false); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('3d_models', function (Blueprint $table) { + $table->dropColumn('hide_annotation_title'); + }); + } +} diff --git a/frontend/js/behaviors/viewer3D.js b/frontend/js/behaviors/viewer3D.js index 66471342bc..1dac618c04 100644 --- a/frontend/js/behaviors/viewer3D.js +++ b/frontend/js/behaviors/viewer3D.js @@ -16,6 +16,7 @@ const viewer3D = function(container) { let btnExplore = wrapper.querySelector('.m-viewer-3d__overlay'); let btnCloseAnnotation = descriptionBlock.querySelector('.m-viewer-3d__annotation__close'); let hideAnnots = JSON.parse(wrapper.dataset.hideannot); + let hideAnnotTitles = JSON.parse(wrapper.dataset.hideannottitle); let cc0 = JSON.parse(wrapper.dataset.cc); let isGuided = JSON.parse(wrapper.dataset.guided); let uid = wrapper.dataset.uid; @@ -256,10 +257,13 @@ const viewer3D = function(container) { var blockWindow = document.createElement("div"); blockWindow.classList.add('m-media--3d-tour__sep'); blockWindow.setAttribute('data-hotspot', i); - blockText.innerHTML = '

' + annot.name + '' + annot.content.raw + '

'; + if(hideAnnotTitles) { + blockText.innerHTML = '

' + annot.content.raw + '

'; + } else { + blockText.innerHTML = '

' + annot.name + '' + annot.content.raw + '

'; + } containerText.appendChild(blockWindow); containerText.appendChild(blockText); - containerText.classList.remove('is-not-loaded'); } if(i == 0) { diff --git a/frontend/scss/molecules/_m-listing.scss b/frontend/scss/molecules/_m-listing.scss index 41ad326037..cacdf85e74 100644 --- a/frontend/scss/molecules/_m-listing.scss +++ b/frontend/scss/molecules/_m-listing.scss @@ -1417,7 +1417,7 @@ $f-audio-subtitle: generate-font-obj( // Quick aside for artwork detail's sound variant .m-listing--inline.m-listing--sound { - .m-listing__meta { + .m-listing__meta--sound { @include font-styles($f-module-title-1); } diff --git a/frontend/scss/molecules/_m-media.scss b/frontend/scss/molecules/_m-media.scss index 12ec7eecc7..40f5e61201 100644 --- a/frontend/scss/molecules/_m-media.scss +++ b/frontend/scss/molecules/_m-media.scss @@ -73,16 +73,6 @@ padding: 40vh 0 80vh 0; } - &.is-not-loaded { - padding-bottom:0; - margin-top:0 !important; - - .m-viewer-3d { - opacity:0; - //visibility:hidden; - } - } - &.no-annotations { .m-media--3d-tour__p { opacity:0; @@ -209,8 +199,8 @@ background-position: 50% 50%; overflow: hidden; - .m-media--m &::before, - .m-media--l &::before, + .m-media--m:not(.m-media--contain) &::before, + .m-media--l:not(.m-media--contain) &::before, &.m-media__img--video::before { content: ''; display: block; @@ -218,6 +208,13 @@ padding-bottom: percentage(10 / 16); } + .m-media--m.m-media--contain .m-media__contain--spacer, + .m-media--l.m-media--contain .m-media__contain--spacer { + content: ''; + display: block; + height: 0; + } + .m-media--m &.m-media__img--video, .m-media--l &.m-media__img--video { max-height: 80vh; @@ -311,8 +308,8 @@ object-fit: contain; } -.m-media--m .m-media__img img, -.m-media--l .m-media__img img, +.m-media--m:not(.m-media--contain) .m-media__img img, +.m-media--l:not(.m-media--contain) .m-media__img img, .m-media__img.m-media__img--video img { object-fit: cover; } diff --git a/package-lock.json b/package-lock.json index f56773910b..f2080a4fd8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -49,9 +49,9 @@ } }, "@babel/runtime": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz", - "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==", + "version": "7.11.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz", + "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -401,6 +401,7 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/archive-type/-/archive-type-3.2.0.tgz", "integrity": "sha1-nNnABpV+vpX62tW9YJiUKoE3N/Y=", + "optional": true, "requires": { "file-type": "^3.1.0" }, @@ -408,7 +409,8 @@ "file-type": { "version": "3.9.0", "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", - "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=" + "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=", + "optional": true } } }, @@ -806,6 +808,7 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz", "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==", + "optional": true, "requires": { "readable-stream": "^2.3.5", "safe-buffer": "^5.1.1" @@ -998,6 +1001,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", + "optional": true, "requires": { "buffer-alloc-unsafe": "^1.1.0", "buffer-fill": "^1.0.0" @@ -1006,12 +1010,14 @@ "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==" + "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==", + "optional": true }, "buffer-crc32": { "version": "0.2.13", "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=" + "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", + "optional": true }, "buffer-equal": { "version": "1.0.0", @@ -1021,7 +1027,8 @@ "buffer-fill": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", - "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=" + "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=", + "optional": true }, "buffer-from": { "version": "1.1.1", @@ -1032,6 +1039,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/buffer-to-vinyl/-/buffer-to-vinyl-1.1.0.tgz", "integrity": "sha1-APFfruOreh3aLN5tkSG//dB7ImI=", + "optional": true, "requires": { "file-type": "^3.1.0", "readable-stream": "^2.0.2", @@ -1042,32 +1050,38 @@ "clone": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=" + "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", + "optional": true }, "clone-stats": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", - "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=" + "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", + "optional": true }, "file-type": { "version": "3.9.0", "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", - "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=" + "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=", + "optional": true }, "replace-ext": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", - "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=" + "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", + "optional": true }, "uuid": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", - "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=" + "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=", + "optional": true }, "vinyl": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz", "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", + "optional": true, "requires": { "clone": "^1.0.0", "clone-stats": "^0.0.1", @@ -1191,7 +1205,8 @@ "capture-stack-trace": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz", - "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==" + "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==", + "optional": true }, "caseless": { "version": "0.12.0", @@ -1202,6 +1217,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/caw/-/caw-1.2.0.tgz", "integrity": "sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ=", + "optional": true, "requires": { "get-proxy": "^1.0.1", "is-obj": "^1.0.0", @@ -1212,12 +1228,14 @@ "object-assign": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", - "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=" + "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=", + "optional": true }, "tunnel-agent": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", - "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=" + "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=", + "optional": true } } }, @@ -1396,7 +1414,7 @@ } }, "closer-look": { - "version": "git+ssh://git@github.com/art-institute-of-chicago/digital-labels-ui.git#2fbfc09654a4699f64405e0cd8c98504e5988865", + "version": "git+ssh://git@github.com/art-institute-of-chicago/digital-labels-ui.git#fa41643efe71416e74de2c3c0d37bebe3485056d", "from": "git+ssh://git@github.com/art-institute-of-chicago/digital-labels-ui.git#master", "requires": { "@area17/a17-helpers": "^0.8.4", @@ -1442,7 +1460,8 @@ "co": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/co/-/co-3.1.0.tgz", - "integrity": "sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g=" + "integrity": "sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g=", + "optional": true }, "coa": { "version": "2.0.2", @@ -1535,6 +1554,7 @@ "version": "2.8.1", "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", + "optional": true, "requires": { "graceful-readlink": ">= 1.0.0" } @@ -1764,9 +1784,9 @@ "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" }, "core-js": { - "version": "3.6.4", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz", - "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==" + "version": "3.6.5", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz", + "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==" }, "core-util-is": { "version": "1.0.2", @@ -1786,6 +1806,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz", "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", + "optional": true, "requires": { "capture-stack-trace": "^1.0.0" } @@ -2051,6 +2072,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/decompress/-/decompress-3.0.0.tgz", "integrity": "sha1-rx3VDQbjv8QyRh033hGzjA2ZG+0=", + "optional": true, "requires": { "buffer-to-vinyl": "^1.0.0", "concat-stream": "^1.4.6", @@ -2067,6 +2089,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", + "optional": true, "requires": { "arr-flatten": "^1.0.1" } @@ -2074,12 +2097,14 @@ "array-unique": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=" + "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", + "optional": true }, "braces": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", + "optional": true, "requires": { "expand-range": "^1.8.1", "preserve": "^0.2.0", @@ -2089,17 +2114,20 @@ "clone": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=" + "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", + "optional": true }, "clone-stats": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", - "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=" + "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", + "optional": true }, "expand-brackets": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", + "optional": true, "requires": { "is-posix-bracket": "^0.1.0" } @@ -2108,6 +2136,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "optional": true, "requires": { "is-extendable": "^0.1.0" } @@ -2116,6 +2145,7 @@ "version": "0.3.2", "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", + "optional": true, "requires": { "is-extglob": "^1.0.0" } @@ -2124,6 +2154,7 @@ "version": "5.3.5", "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz", "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=", + "optional": true, "requires": { "extend": "^3.0.0", "glob": "^5.0.3", @@ -2139,6 +2170,7 @@ "version": "1.0.34", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "optional": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.1", @@ -2150,6 +2182,7 @@ "version": "0.6.5", "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "optional": true, "requires": { "readable-stream": ">=1.0.33-1 <1.1.0-0", "xtend": ">=4.0.0 <4.1.0-0" @@ -2161,6 +2194,7 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz", "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=", + "optional": true, "requires": { "convert-source-map": "^1.1.1", "graceful-fs": "^4.1.2", @@ -2172,12 +2206,14 @@ "is-extglob": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "optional": true }, "is-glob": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "optional": true, "requires": { "is-extglob": "^1.0.0" } @@ -2185,17 +2221,20 @@ "is-valid-glob": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz", - "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=" + "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=", + "optional": true }, "isarray": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "optional": true }, "micromatch": { "version": "2.3.11", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", + "optional": true, "requires": { "arr-diff": "^2.0.0", "array-unique": "^0.2.1", @@ -2216,6 +2255,7 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz", "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=", + "optional": true, "requires": { "is-stream": "^1.0.1", "readable-stream": "^2.0.1" @@ -2224,17 +2264,20 @@ "replace-ext": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", - "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=" + "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", + "optional": true }, "string_decoder": { "version": "0.10.31", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "optional": true }, "through2-filter": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz", "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=", + "optional": true, "requires": { "through2": "~2.0.0", "xtend": "~4.0.0" @@ -2244,6 +2287,7 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz", "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=", + "optional": true, "requires": { "extend-shallow": "^2.0.1" } @@ -2252,6 +2296,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz", "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", + "optional": true, "requires": { "clone": "^1.0.0", "clone-stats": "^0.0.1", @@ -2262,6 +2307,7 @@ "version": "2.4.4", "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz", "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=", + "optional": true, "requires": { "duplexify": "^3.2.0", "glob-stream": "^5.3.2", @@ -2288,6 +2334,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-3.1.0.tgz", "integrity": "sha1-IXx4n5uURQ76rcXF5TeXj8MzxGY=", + "optional": true, "requires": { "is-tar": "^1.0.0", "object-assign": "^2.0.0", @@ -2300,27 +2347,32 @@ "clone": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", - "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=" + "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=", + "optional": true }, "clone-stats": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", - "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=" + "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", + "optional": true }, "isarray": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "optional": true }, "object-assign": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz", - "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=" + "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=", + "optional": true }, "readable-stream": { "version": "1.0.34", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "optional": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.1", @@ -2331,12 +2383,14 @@ "string_decoder": { "version": "0.10.31", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "optional": true }, "through2": { "version": "0.6.5", "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "optional": true, "requires": { "readable-stream": ">=1.0.33-1 <1.1.0-0", "xtend": ">=4.0.0 <4.1.0-0" @@ -2346,6 +2400,7 @@ "version": "0.4.6", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", + "optional": true, "requires": { "clone": "^0.2.0", "clone-stats": "^0.0.1" @@ -2357,6 +2412,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz", "integrity": "sha1-iyOTVoE1X58YnYclag+L3ZbZZm0=", + "optional": true, "requires": { "is-bzip2": "^1.0.0", "object-assign": "^2.0.0", @@ -2370,27 +2426,32 @@ "clone": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", - "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=" + "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=", + "optional": true }, "clone-stats": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", - "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=" + "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", + "optional": true }, "isarray": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "optional": true }, "object-assign": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz", - "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=" + "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=", + "optional": true }, "readable-stream": { "version": "1.0.34", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "optional": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.1", @@ -2401,12 +2462,14 @@ "string_decoder": { "version": "0.10.31", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "optional": true }, "through2": { "version": "0.6.5", "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "optional": true, "requires": { "readable-stream": ">=1.0.33-1 <1.1.0-0", "xtend": ">=4.0.0 <4.1.0-0" @@ -2416,6 +2479,7 @@ "version": "0.4.6", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", + "optional": true, "requires": { "clone": "^0.2.0", "clone-stats": "^0.0.1" @@ -2427,6 +2491,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-3.1.0.tgz", "integrity": "sha1-ssE9+YFmJomRtxXWRH9kLpaW9aA=", + "optional": true, "requires": { "is-gzip": "^1.0.0", "object-assign": "^2.0.0", @@ -2439,27 +2504,32 @@ "clone": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", - "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=" + "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=", + "optional": true }, "clone-stats": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", - "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=" + "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", + "optional": true }, "isarray": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "optional": true }, "object-assign": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz", - "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=" + "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=", + "optional": true }, "readable-stream": { "version": "1.0.34", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "optional": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.1", @@ -2470,12 +2540,14 @@ "string_decoder": { "version": "0.10.31", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "optional": true }, "through2": { "version": "0.6.5", "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "optional": true, "requires": { "readable-stream": ">=1.0.33-1 <1.1.0-0", "xtend": ">=4.0.0 <4.1.0-0" @@ -2485,6 +2557,7 @@ "version": "0.4.6", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", + "optional": true, "requires": { "clone": "^0.2.0", "clone-stats": "^0.0.1" @@ -2496,6 +2569,7 @@ "version": "3.4.0", "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-3.4.0.tgz", "integrity": "sha1-YUdbQVIGa74/7hL51inRX+ZHjus=", + "optional": true, "requires": { "is-zip": "^1.0.0", "read-all-stream": "^3.0.0", @@ -2509,22 +2583,26 @@ "clone": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=" + "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", + "optional": true }, "clone-stats": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", - "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=" + "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", + "optional": true }, "replace-ext": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", - "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=" + "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", + "optional": true }, "vinyl": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz", "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", + "optional": true, "requires": { "clone": "^1.0.0", "clone-stats": "^0.0.1", @@ -2536,7 +2614,8 @@ "deep-extend": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "optional": true }, "defaults": { "version": "1.0.3", @@ -2761,6 +2840,7 @@ "version": "4.4.3", "resolved": "https://registry.npmjs.org/download/-/download-4.4.3.tgz", "integrity": "sha1-qlX9rTktldS2jowr4D4MKqIbqaw=", + "optional": true, "requires": { "caw": "^1.0.1", "concat-stream": "^1.4.7", @@ -2783,6 +2863,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", + "optional": true, "requires": { "arr-flatten": "^1.0.1" } @@ -2790,12 +2871,14 @@ "array-unique": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=" + "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", + "optional": true }, "braces": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", + "optional": true, "requires": { "expand-range": "^1.8.1", "preserve": "^0.2.0", @@ -2805,17 +2888,20 @@ "clone": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=" + "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", + "optional": true }, "clone-stats": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", - "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=" + "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", + "optional": true }, "expand-brackets": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", + "optional": true, "requires": { "is-posix-bracket": "^0.1.0" } @@ -2824,6 +2910,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "optional": true, "requires": { "is-extendable": "^0.1.0" } @@ -2832,6 +2919,7 @@ "version": "0.3.2", "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", + "optional": true, "requires": { "is-extglob": "^1.0.0" } @@ -2840,6 +2928,7 @@ "version": "5.3.5", "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz", "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=", + "optional": true, "requires": { "extend": "^3.0.0", "glob": "^5.0.3", @@ -2855,6 +2944,7 @@ "version": "1.0.34", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "optional": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.1", @@ -2866,6 +2956,7 @@ "version": "0.6.5", "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "optional": true, "requires": { "readable-stream": ">=1.0.33-1 <1.1.0-0", "xtend": ">=4.0.0 <4.1.0-0" @@ -2877,6 +2968,7 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz", "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=", + "optional": true, "requires": { "convert-source-map": "^1.1.1", "graceful-fs": "^4.1.2", @@ -2888,12 +2980,14 @@ "is-extglob": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "optional": true }, "is-glob": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "optional": true, "requires": { "is-extglob": "^1.0.0" } @@ -2901,17 +2995,20 @@ "is-valid-glob": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz", - "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=" + "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=", + "optional": true }, "isarray": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "optional": true }, "micromatch": { "version": "2.3.11", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", + "optional": true, "requires": { "arr-diff": "^2.0.0", "array-unique": "^0.2.1", @@ -2932,6 +3029,7 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz", "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=", + "optional": true, "requires": { "is-stream": "^1.0.1", "readable-stream": "^2.0.1" @@ -2940,17 +3038,20 @@ "replace-ext": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", - "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=" + "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", + "optional": true }, "string_decoder": { "version": "0.10.31", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "optional": true }, "through2-filter": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz", "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=", + "optional": true, "requires": { "through2": "~2.0.0", "xtend": "~4.0.0" @@ -2960,6 +3061,7 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz", "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=", + "optional": true, "requires": { "extend-shallow": "^2.0.1" } @@ -2968,6 +3070,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz", "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", + "optional": true, "requires": { "clone": "^1.0.0", "clone-stats": "^0.0.1", @@ -2978,6 +3081,7 @@ "version": "2.4.4", "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz", "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=", + "optional": true, "requires": { "duplexify": "^3.2.0", "glob-stream": "^5.3.2", @@ -3051,6 +3155,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz", "integrity": "sha1-3uUim98KtrogEqOV4bhpq/iBNHM=", + "optional": true, "requires": { "onetime": "^1.0.0", "set-immediate-shim": "^1.0.0" @@ -3447,6 +3552,7 @@ "version": "1.8.2", "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", + "optional": true, "requires": { "fill-range": "^2.1.0" }, @@ -3455,6 +3561,7 @@ "version": "2.2.4", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz", "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==", + "optional": true, "requires": { "is-number": "^2.1.0", "isobject": "^2.0.0", @@ -3467,6 +3574,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", + "optional": true, "requires": { "kind-of": "^3.0.2" } @@ -3475,6 +3583,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "optional": true, "requires": { "isarray": "1.0.0" } @@ -3641,6 +3750,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", + "optional": true, "requires": { "pend": "~1.2.0" } @@ -3673,17 +3783,20 @@ "filename-regex": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", - "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=" + "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", + "optional": true }, "filename-reserved-regex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz", - "integrity": "sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q=" + "integrity": "sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q=", + "optional": true }, "filenamify": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-1.2.1.tgz", "integrity": "sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=", + "optional": true, "requires": { "filename-reserved-regex": "^1.0.0", "strip-outer": "^1.0.0", @@ -3877,7 +3990,8 @@ "fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "optional": true }, "fs-extra": { "version": "5.0.0", @@ -3943,7 +4057,8 @@ "ansi-regex": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "optional": true }, "aproba": { "version": "1.2.0", @@ -3964,12 +4079,14 @@ "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "optional": true }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3984,17 +4101,20 @@ "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", + "optional": true }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "optional": true }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -4111,7 +4231,8 @@ "inherits": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "optional": true }, "ini": { "version": "1.3.5", @@ -4123,6 +4244,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4137,6 +4259,7 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -4144,12 +4267,14 @@ "minimist": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "optional": true }, "minipass": { "version": "2.3.5", "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -4168,6 +4293,7 @@ "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "optional": true, "requires": { "minimist": "0.0.8" } @@ -4248,7 +4374,8 @@ "number-is-nan": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", + "optional": true }, "object-assign": { "version": "4.1.1", @@ -4260,6 +4387,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "optional": true, "requires": { "wrappy": "1" } @@ -4345,7 +4473,8 @@ "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -4381,6 +4510,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -4400,6 +4530,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -4443,12 +4574,14 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "optional": true }, "yallist": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", - "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==" + "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", + "optional": true } } }, @@ -4500,6 +4633,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-1.1.0.tgz", "integrity": "sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus=", + "optional": true, "requires": { "rc": "^1.1.2" } @@ -4559,6 +4693,7 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", + "optional": true, "requires": { "glob-parent": "^2.0.0", "is-glob": "^2.0.0" @@ -4568,6 +4703,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", + "optional": true, "requires": { "is-glob": "^2.0.0" } @@ -4575,12 +4711,14 @@ "is-extglob": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "optional": true }, "is-glob": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "optional": true, "requires": { "is-extglob": "^1.0.0" } @@ -4780,6 +4918,7 @@ "version": "5.7.1", "resolved": "https://registry.npmjs.org/got/-/got-5.7.1.tgz", "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=", + "optional": true, "requires": { "create-error-class": "^3.0.1", "duplexer2": "^0.1.4", @@ -4802,6 +4941,7 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", + "optional": true, "requires": { "readable-stream": "^2.0.2" } @@ -4816,7 +4956,8 @@ "graceful-readlink": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", - "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=" + "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", + "optional": true }, "growl": { "version": "1.10.5", @@ -5108,6 +5249,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/gulp-decompress/-/gulp-decompress-1.2.0.tgz", "integrity": "sha1-jutlpeAV+O2FMsr+KEVJYGJvDcc=", + "optional": true, "requires": { "archive-type": "^3.0.0", "decompress": "^3.0.0", @@ -6029,9 +6171,9 @@ "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=" }, "hyphenate-style-name": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz", - "integrity": "sha512-EcuixamT82oplpoJ2XU4pDtKGWQ7b00CD9f1ug9IaQ3p1bkHMiKCZ9ut9QDI6qsa6cpUuB+A/I+zLtdNK4n2DQ==" + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz", + "integrity": "sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==" }, "ieee754": { "version": "1.1.13", @@ -6267,7 +6409,8 @@ "is-bzip2": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-bzip2/-/is-bzip2-1.0.0.tgz", - "integrity": "sha1-XuWOqlounIDiFAe+3yOuWsCRs/w=" + "integrity": "sha1-XuWOqlounIDiFAe+3yOuWsCRs/w=", + "optional": true }, "is-callable": { "version": "1.1.4", @@ -6307,12 +6450,14 @@ "is-dotfile": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", - "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=" + "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", + "optional": true }, "is-equal-shallow": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", + "optional": true, "requires": { "is-primitive": "^2.0.0" } @@ -6360,7 +6505,8 @@ "is-gzip": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz", - "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=" + "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=", + "optional": true }, "is-jpg": { "version": "1.0.1", @@ -6371,7 +6517,8 @@ "is-natural-number": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-2.1.1.tgz", - "integrity": "sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec=" + "integrity": "sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec=", + "optional": true }, "is-negated-glob": { "version": "1.0.0", @@ -6389,7 +6536,8 @@ "is-obj": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" + "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", + "optional": true }, "is-object": { "version": "1.0.1", @@ -6439,12 +6587,14 @@ "is-posix-bracket": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", - "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=" + "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", + "optional": true }, "is-primitive": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", - "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=" + "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", + "optional": true }, "is-promise": { "version": "2.1.0", @@ -6454,7 +6604,8 @@ "is-redirect": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz", - "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=" + "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=", + "optional": true }, "is-regex": { "version": "1.0.4", @@ -6475,7 +6626,8 @@ "is-retry-allowed": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz", - "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==" + "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==", + "optional": true }, "is-stream": { "version": "1.1.0", @@ -6502,7 +6654,8 @@ "is-tar": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-tar/-/is-tar-1.0.0.tgz", - "integrity": "sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0=" + "integrity": "sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0=", + "optional": true }, "is-typedarray": { "version": "1.0.0", @@ -6520,7 +6673,8 @@ "is-url": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz", - "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==" + "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==", + "optional": true }, "is-utf8": { "version": "0.2.1", @@ -6545,7 +6699,8 @@ "is-zip": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-zip/-/is-zip-1.0.0.tgz", - "integrity": "sha1-R7Co/004p2QxzP2ZqOFaTIa6IyU=" + "integrity": "sha1-R7Co/004p2QxzP2ZqOFaTIa6IyU=", + "optional": true }, "isarray": { "version": "1.0.0", @@ -6993,7 +7148,8 @@ "lodash.isequal": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", - "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=" + "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", + "optional": true }, "lodash.istypedarray": { "version": "3.0.6", @@ -7135,7 +7291,8 @@ "lowercase-keys": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", - "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==" + "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", + "optional": true }, "lpad-align": { "version": "1.1.2", @@ -7294,7 +7451,8 @@ "math-random": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz", - "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==" + "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==", + "optional": true }, "md5.js": { "version": "1.3.5", @@ -7839,7 +7997,8 @@ "node-status-codes": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz", - "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=" + "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=", + "optional": true }, "node.extend": { "version": "2.0.2", @@ -8029,6 +8188,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", + "optional": true, "requires": { "for-own": "^0.1.4", "is-extendable": "^0.1.1" @@ -8038,6 +8198,7 @@ "version": "0.1.5", "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", + "optional": true, "requires": { "for-in": "^1.0.1" } @@ -8079,7 +8240,8 @@ "onetime": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", - "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=" + "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=", + "optional": true }, "openseadragon": { "version": "2.4.2", @@ -8275,6 +8437,7 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", + "optional": true, "requires": { "glob-base": "^0.3.0", "is-dotfile": "^1.0.0", @@ -8285,12 +8448,14 @@ "is-extglob": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "optional": true }, "is-glob": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "optional": true, "requires": { "is-extglob": "^1.0.0" } @@ -8502,14 +8667,14 @@ } }, "plyr": { - "version": "3.5.10", - "resolved": "https://registry.npmjs.org/plyr/-/plyr-3.5.10.tgz", - "integrity": "sha512-wbbSuzk3yKVOmYWQUnxG1bxikqZNkxZmL3OjS1DFVU0D2Uko1evGY72LuD9rm/HnNCNzcTuc0c6MCn7bRRpUTA==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/plyr/-/plyr-3.6.2.tgz", + "integrity": "sha512-CjAhRDtzyGqMRte9Phj4FsZFegS9VxW60boOhQsAnZHuiFG3yVBRcodWsGZ79GuXHHelc4DxMHO+z0QggY+9qQ==", "requires": { - "core-js": "^3.6.4", + "core-js": "^3.6.5", "custom-event-polyfill": "^1.0.7", "loadjs": "^4.2.0", - "rangetouch": "^2.0.0", + "rangetouch": "^2.0.1", "url-polyfill": "^1.1.8" } }, @@ -8551,12 +8716,14 @@ "prepend-http": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", - "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" + "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=", + "optional": true }, "preserve": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", - "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=" + "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", + "optional": true }, "prettier": { "version": "1.18.2", @@ -8717,6 +8884,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz", "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==", + "optional": true, "requires": { "is-number": "^4.0.0", "kind-of": "^6.0.0", @@ -8726,12 +8894,14 @@ "is-number": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", - "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==" + "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==", + "optional": true }, "kind-of": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "optional": true } } }, @@ -8761,6 +8931,7 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "optional": true, "requires": { "deep-extend": "^0.6.0", "ini": "~1.3.0", @@ -8771,7 +8942,8 @@ "strip-json-comments": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "optional": true } } }, @@ -8840,9 +9012,9 @@ } }, "react-idle-timer": { - "version": "4.2.12", - "resolved": "https://registry.npmjs.org/react-idle-timer/-/react-idle-timer-4.2.12.tgz", - "integrity": "sha512-YD/2Oe4PU5uRv/TH6zTxykKMHpRHWHPEWCUohda81o/jzsrlgyUrklfy46fd8WjgYhlNkJKsiX/GXJAQQC1hcQ==" + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/react-idle-timer/-/react-idle-timer-4.3.6.tgz", + "integrity": "sha512-sJS4w123E4HkuM/l3j8FTVl0St6ghGA22Ich/Nz/luJSM4MEA6PvSwEBaAXLx3uCLB1fK7CACjvB4ozW3uWuCA==" }, "react-intersection-observer": { "version": "6.4.2", @@ -8970,9 +9142,9 @@ } }, "react-tooltip-lite": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/react-tooltip-lite/-/react-tooltip-lite-1.11.2.tgz", - "integrity": "sha512-zFVKAFta5nC1763B1XCeFhSBRYblVgLxRCnXu4ucMqaJQ7UxpZV4gFgou9gesfLWKr4Cgvx1bpy6L9msKXQqCw==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/react-tooltip-lite/-/react-tooltip-lite-1.12.0.tgz", + "integrity": "sha512-QjDnmDmjtLNKvLY6bzUOG8W6ZDBTiE4UXugGzClOQEGvMvbkJn2GvZvLwRaxsN/GCx7589RgbGaESMiJAm+zWg==", "requires": { "prop-types": "^15.5.8" } @@ -8993,6 +9165,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz", "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=", + "optional": true, "requires": { "pinkie-promise": "^2.0.0", "readable-stream": "^2.0.0" @@ -9170,14 +9343,15 @@ } }, "regenerator-runtime": { - "version": "0.13.5", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", - "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" + "version": "0.13.7", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz", + "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==" }, "regex-cache": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", + "optional": true, "requires": { "is-equal-shallow": "^0.1.3" } @@ -9539,6 +9713,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz", "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=", + "optional": true, "requires": { "commander": "~2.8.1" } @@ -9581,7 +9756,8 @@ "set-immediate-shim": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=" + "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", + "optional": true }, "set-value": { "version": "2.0.1", @@ -9980,7 +10156,8 @@ "stat-mode": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz", - "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=" + "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=", + "optional": true }, "static-extend": { "version": "0.1.2", @@ -10031,6 +10208,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz", "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=", + "optional": true, "requires": { "duplexer2": "~0.1.0", "readable-stream": "^2.0.2" @@ -10040,6 +10218,7 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", + "optional": true, "requires": { "readable-stream": "^2.0.2" } @@ -10146,6 +10325,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz", "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=", + "optional": true, "requires": { "first-chunk-stream": "^1.0.0", "strip-bom": "^2.0.0" @@ -10160,6 +10340,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz", "integrity": "sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=", + "optional": true, "requires": { "chalk": "^1.0.0", "get-stdin": "^4.0.1", @@ -10173,6 +10354,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "optional": true, "requires": { "ansi-styles": "^2.2.1", "escape-string-regexp": "^1.0.2", @@ -10185,6 +10367,7 @@ "version": "0.1.7", "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz", "integrity": "sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=", + "optional": true, "requires": { "is-relative": "^0.1.0" } @@ -10192,7 +10375,8 @@ "is-relative": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz", - "integrity": "sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI=" + "integrity": "sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI=", + "optional": true } } }, @@ -10218,6 +10402,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz", "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==", + "optional": true, "requires": { "escape-string-regexp": "^1.0.2" } @@ -10226,6 +10411,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/sum-up/-/sum-up-1.0.3.tgz", "integrity": "sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=", + "optional": true, "requires": { "chalk": "^1.0.0" }, @@ -10234,6 +10420,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "optional": true, "requires": { "ansi-styles": "^2.2.1", "escape-string-regexp": "^1.0.2", @@ -10511,6 +10698,7 @@ "version": "1.6.2", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz", "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==", + "optional": true, "requires": { "bl": "^1.0.0", "buffer-alloc": "^1.2.0", @@ -10650,7 +10838,8 @@ "timed-out": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz", - "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc=" + "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc=", + "optional": true }, "timers-browserify": { "version": "2.0.11", @@ -10696,7 +10885,8 @@ "to-buffer": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz", - "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==" + "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==", + "optional": true }, "to-object-path": { "version": "0.3.0", @@ -10788,6 +10978,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz", "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=", + "optional": true, "requires": { "escape-string-regexp": "^1.0.2" } @@ -11051,7 +11242,8 @@ "unzip-response": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz", - "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=" + "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=", + "optional": true }, "upath": { "version": "1.2.0", @@ -11091,14 +11283,15 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", + "optional": true, "requires": { "prepend-http": "^1.0.1" } }, "url-polyfill": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/url-polyfill/-/url-polyfill-1.1.8.tgz", - "integrity": "sha512-Ey61F4FEqhcu1vHSOMmjl0Vd/RPRLEjMj402qszD/dhMBrVfoUsnIj8KSZo2yj+eIlxJGKFdnm6ES+7UzMgZ3Q==" + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/url-polyfill/-/url-polyfill-1.1.10.tgz", + "integrity": "sha512-vSaPpaRgBrf41+Uky1myiSh6gpcbw8FpwHYnEy0abxndojOBnIs+yh/49gKYFLtUMP9qoNWjn6j9aUVy23Ie2A==" }, "url-regex": { "version": "3.2.0", @@ -11164,7 +11357,8 @@ "vali-date": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz", - "integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=" + "integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=", + "optional": true }, "validate-npm-package-license": { "version": "3.0.4", @@ -11212,6 +11406,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/vinyl-assign/-/vinyl-assign-1.2.1.tgz", "integrity": "sha1-TRmIkbVRWRHXcajNnFSApGoHSkU=", + "optional": true, "requires": { "object-assign": "^4.0.1", "readable-stream": "^2.0.0" @@ -11310,6 +11505,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz", "integrity": "sha1-0bFPOdLiy0q4xAmPdW/ksWTkc9Q=", + "optional": true, "requires": { "wrap-fn": "^0.1.0" } @@ -11788,6 +11984,7 @@ "version": "0.1.5", "resolved": "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz", "integrity": "sha1-8htuQQFv9KfjFyDbxjoJAWvfmEU=", + "optional": true, "requires": { "co": "3.1.0" } @@ -11861,6 +12058,7 @@ "version": "2.10.0", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", + "optional": true, "requires": { "buffer-crc32": "~0.2.3", "fd-slicer": "~1.1.0" diff --git a/resources/assets/js/blocks/BlockAic_3D_Model.vue b/resources/assets/js/blocks/BlockAic_3D_Model.vue index f7580bc817..e602266bc6 100644 --- a/resources/assets/js/blocks/BlockAic_3D_Model.vue +++ b/resources/assets/js/blocks/BlockAic_3D_Model.vue @@ -42,6 +42,7 @@ + @@ -74,6 +75,10 @@ optionalAnnotation: { type: Boolean, default: false + }, + optionalAnnotationTitle: { + type: Boolean, + default: false } }, computed: { diff --git a/resources/assets/js/blocks/BlockAic_3D_Tour.vue b/resources/assets/js/blocks/BlockAic_3D_Tour.vue index 0aeb1bd77a..7cb021f2b9 100644 --- a/resources/assets/js/blocks/BlockAic_3D_Tour.vue +++ b/resources/assets/js/blocks/BlockAic_3D_Tour.vue @@ -1,7 +1,7 @@ diff --git a/resources/assets/js/blocks/BlockImage.vue b/resources/assets/js/blocks/BlockImage.vue index 38d03247ac..4b433889d5 100644 --- a/resources/assets/js/blocks/BlockImage.vue +++ b/resources/assets/js/blocks/BlockImage.vue @@ -1,7 +1,8 @@ diff --git a/resources/views/admin/blocks/image.blade.php b/resources/views/admin/blocks/image.blade.php index 0ecf63fe39..ca315d51b9 100644 --- a/resources/views/admin/blocks/image.blade.php +++ b/resources/views/admin/blocks/image.blade.php @@ -19,6 +19,11 @@ ] ]) +@formField('checkbox', [ + 'name' => 'use_contain', + 'label' => 'Always show the whole image instead of cropping to the container', +]) + @formField('medias', [ 'name' => 'image', 'label' => 'Image' diff --git a/resources/views/admin/experiences/slides/_3dtour.blade.php b/resources/views/admin/experiences/slides/_3dtour.blade.php index f427e61f90..91d4f84894 100644 --- a/resources/views/admin/experiences/slides/_3dtour.blade.php +++ b/resources/views/admin/experiences/slides/_3dtour.blade.php @@ -3,12 +3,12 @@ 'fieldValues' => '3dtour', 'keepAlive' => true, ]) - + @endcomponent @push('vuexStore') @php($model3d = $item->model3d) - @foreach (['model_url', 'model_caption_title', 'model_caption', 'model_id', 'camera_position', 'camera_target', 'annotation_list', 'hide_annotation', 'guided_tour'] as $name) + @foreach (['model_url', 'model_caption_title', 'model_caption', 'model_id', 'camera_position', 'camera_target', 'annotation_list', 'hide_annotation', 'hide_annotation_title', 'guided_tour'] as $name) window.STORE.form.fields.push({ name: "{{ 'aic_3d_model[' . $name . ']' }}", value: {!! json_encode($model3d ? $model3d->$name : '') !!} diff --git a/resources/views/components/molecules/_m-listing----sound.blade.php b/resources/views/components/molecules/_m-listing----sound.blade.php index e5cfcc6579..0c02f4bfe4 100644 --- a/resources/views/components/molecules/_m-listing----sound.blade.php +++ b/resources/views/components/molecules/_m-listing----sound.blade.php @@ -1,7 +1,7 @@ {{-- This assumes `href` is a direct link to an MP3 file --}}
  • -
    +
    {!! $item->title !!}
    diff --git a/resources/views/components/molecules/_m-media.blade.php b/resources/views/components/molecules/_m-media.blade.php index 3d9afff15b..62a4bdda70 100644 --- a/resources/views/components/molecules/_m-media.blade.php +++ b/resources/views/components/molecules/_m-media.blade.php @@ -2,6 +2,7 @@ $type = isset($item['type']) ? $item['type'] : 'video'; $size = isset($item['size']) ? $item['size'] : 's'; + $useContain = $item['useContain'] ?? false; $hasRestriction = isset($item['restricted']) ? $item['restricted'] : false; $media = $item['media']; $fullscreen = (isset($item['fullscreen']) && $item['fullscreen']) && (!isset($media['restrict']) || !$media['restrict']); @@ -123,8 +124,11 @@ @endphp -<{{ $tag ?? 'figure' }} {!! isset($_figureCount) ? 'id="fig-' . $_figureCount . '" ' : '' !!} data-type="{{ $type }}" data-title="{{ $item['captionTitle'] ?? $item['caption'] ?? $media['caption'] ?? (isset($media['title']) && $media['title'] ? ' data-title="'.$media['title'].'"' : '') }}"{!! $hasRestriction ? ' data-restricted="true"' : '' !!} class="m-media m-media--{{ $size }}{{ (isset($item['variation'])) ? ' '.$item['variation'] : '' }}{{ (isset($variation)) ? ' '.$variation : '' }}"{!! (isset($item['gtmAttributes'])) ? ' '.$item['gtmAttributes'].'' : '' !!}> +<{{ $tag ?? 'figure' }} {!! isset($_figureCount) ? 'id="fig-' . $_figureCount . '" ' : '' !!} data-type="{{ $type }}" data-title="{{ $item['captionTitle'] ?? $item['caption'] ?? $media['caption'] ?? (isset($media['title']) && $media['title'] ? ' data-title="'.$media['title'].'"' : '') }}"{!! $hasRestriction ? ' data-restricted="true"' : '' !!} class="m-media m-media--{{ $size }}{{ $useContain ? ' m-media--contain' : '' }}{{ (isset($item['variation'])) ? ' '.$item['variation'] : '' }}{{ (isset($variation)) ? ' '.$variation : '' }}"{!! (isset($item['gtmAttributes'])) ? ' '.$item['gtmAttributes'].'' : '' !!}>
    + @if ($useContain && ($size === 'm' || $size === 'l')) +
    + @endif @if ($type == 'image') @if ($showUrlFullscreen) diff --git a/resources/views/components/molecules/_m-viewer-3d.blade.php b/resources/views/components/molecules/_m-viewer-3d.blade.php index 9884b905a7..74234d7a0d 100644 --- a/resources/views/components/molecules/_m-viewer-3d.blade.php +++ b/resources/views/components/molecules/_m-viewer-3d.blade.php @@ -1,4 +1,4 @@ -
    +
    diff --git a/resources/views/site/blocks/3d_tour.blade.php b/resources/views/site/blocks/3d_tour.blade.php index 4bab0278f0..308c91ea9d 100644 --- a/resources/views/site/blocks/3d_tour.blade.php +++ b/resources/views/site/blocks/3d_tour.blade.php @@ -5,15 +5,17 @@ $camera_target = $block->input('camera_target'); $annotation_list = $block->input('annotation_list'); $hide_annotation = $block->input('hide_annotation'); + $hide_annotation_title = $block->input('hide_annotation_title'); @endphp @if ($model_url) -
    +
    @component('components.molecules._m-viewer-3d') @slot('type', 'article') @slot('uid', $model_id) @slot('annotations', $annotation_list) @slot('hideannot', $hide_annotation) + @slot('hideannottitle', $hide_annotation_title) @endcomponent
    @endif \ No newline at end of file diff --git a/resources/views/site/blocks/image.blade.php b/resources/views/site/blocks/image.blade.php index bfcab206d3..0160be4323 100644 --- a/resources/views/site/blocks/image.blade.php +++ b/resources/views/site/blocks/image.blade.php @@ -14,6 +14,7 @@ @slot('item', [ 'type' => 'image', 'size' => $block->input('size'), + 'useContain' => $block->input('use_contain'), 'caption' => $subtitle, 'captionTitle' => $title, 'media' => [