diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 6844d1d8928276b6df2a039b785d862c0eb0e12f..86d037a29ec3f5b57a9ff17f8ee8c3752fed95d0 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,6 @@
---
name: Bug report
-about: Create a report to help us improve
+about: Report on something that's broken :-/
title: ''
labels: bug
assignees: ''
diff --git a/.github/ISSUE_TEMPLATE/discussion-request.md b/.github/ISSUE_TEMPLATE/discussion-request.md
new file mode 100644
index 0000000000000000000000000000000000000000..670eeeed0673867ca522b52938759fb5d1e4b185
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/discussion-request.md
@@ -0,0 +1,11 @@
+---
+name: Discussion request
+about: Suggest a topic for to discuss. This is often for something big we don't know
+ yet what specific features to create.
+title: ''
+labels: discussion
+assignees: ''
+
+---
+
+
diff --git a/.github/ISSUE_TEMPLATE/enhancement-request.md b/.github/ISSUE_TEMPLATE/enhancement-request.md
new file mode 100644
index 0000000000000000000000000000000000000000..774d95f7ebdc09010eaa7c9d1ea43828ae100fa9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/enhancement-request.md
@@ -0,0 +1,47 @@
+---
+name: Enhancement request
+about: Suggest an improvement to some existing functionality
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+_**PLEASE DO NOT INCLUDE SENSITIVE INFORMATION**_
+[Use this form](https://docs.google.com/forms/d/e/1FAIpQLSdcn68IgWuk5-YyXF8ZuVK5Dxj5az6eemmLlqDsghJwEmxY6A/viewform). if you need to include the following information:
+- Account name or name of person
+- Account email
+- Any personally identifying information
+- Title of submission (app URLs alone are OK)
+- When in doubt, use the above form.
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Is your feature request related to an existing functionality? Please describe.**
+A clear and concise description of what or where the existing page or function is. Include URLs.
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen. Include ideal URLs, if they don't already exist.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
+
+**Priority**
+- High (keeping you from completing day-to-day tasks)
+- Medium (slowing you down)
+- Low priority (annoying, would be nice to not see)
+
+**Affected roles**
+- Staff
+- Applicants
+- Reviewers
+- Partners
+- Developers
+- General public
+
+**Ideal deadline**
+Date when you'd like to see this accomplished and a reason, if appropriate.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 643e7c011a05724135c0acac26e4811519b24aca..fcd5489635e477e7511e3956f5b565df39718072 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,8 +1,9 @@
---
name: Feature request
-about: Suggest an new idea or improvement for this project
+about: Suggest an new idea, something that doesn't exist, or isn't happening but you
+ thing should.
title: ''
-labels: ''
+labels: feature
assignees: ''
---
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
new file mode 100644
index 0000000000000000000000000000000000000000..7d1664e84d177fa6515575ca4152f78d600c952a
--- /dev/null
+++ b/.github/release-drafter.yml
@@ -0,0 +1,18 @@
+categories:
+ - title: '🚀 Features'
+ label: 'feature'
+ - title: 'âš™ï¸ Enhancements'
+ label: 'enhancement'
+ - title: '🛠Bug Fixes'
+ labels:
+ - 'fix'
+ - 'bugfix'
+ - 'bug'
+ - title: '🔧 Maintenance'
+ labels:
+ - 'dependencies'
+ - 'maintenance'
+template: |
+ ## Changes
+
+ $CHANGES
diff --git a/README.md b/README.md
index 9f5b903ca54d4372e2d7d623b16f51ebafad94e4..47124ef14ddce3688e37549ffbd6974d71296582 100644
--- a/README.md
+++ b/README.md
@@ -1,81 +1,48 @@
-opentech.fund Wagtail site
-==================
+# Hypha
-## Contributing
+<a href="https://travis-ci.org/opentechfund/opentech.fund">
+ <img src="https://travis-ci.org/opentechfund/opentech.fund.svg?branch=master" alt="Build Status" />
+</a>
-1. Make changes on a new branch, including a broad category and the ticket number if relevant e.g. `feature/123-extra-squiggles`, `fix/newsletter-signup`.
-1. Push your branch to the remote.
-1. Edit details as necessary.
+## Submission management software
-If you need to preview work on `staging`, this can be merged and deployed manually without making a merge request. You can still make the merge request as above, but add a note to say that this is on `staging`, and not yet ready to be merged to `master`.
+* Manage the collection and review of applications or submissions openly and efficiently.
+* Customize all aspects of the process, forms, workflows, review options, and more.
+* Automate workflows and integrate with other services (Slack, Mailgun, etc).
+* Regularly audited software with many privacy and security features.
+* View our [Roadmap](/wiki/Roadmap) for upcoming features and enhancements.
-# Setting up a local build
+*Built with [Django](https://www.djangoproject.com/), [Wagtail](https://wagtail.io/), and [React](https://reactjs.org/)*
-This repository includes a Vagrantfile for running the project in a Debian VM.
+*Deploy with [Heroku](/wiki/Deployment:-Heroku), [Docker](/wiki/Deployment:-Docker), or [your own server](/wiki/Deployment:-Standalone-App).*
-To set up a new build:
+## Maintainers
-``` bash
-git clone git@github.com:OpenTechFund/opentech.fund.git
-cd opentech.fund
-vagrant up
-vagrant ssh
-```
+- [Open Technology Fund](https://www.opentech.fund)
-Then within the SSH session:
+## Contributors
+Thank you to all the people who have contributed to Hypha!
-``` bash
-dj migrate
-dj createcachetable
-dj createsuperuser
-djrun
-```
+***Special thanks to:***
-This will make the site available on the host machine at: http://127.0.0.1:8000/
+- [Combonetwork](https://www.combonet.se/)
+- [Torchbox](https://torchbox.com/digital-products/)
+- [Parbhat](https://github.com/Parbhat)
+## Community
+More here soon!
-# Updating front-end files
+## Support Hypha
+Hypha is an open source project made possible thanks to the support by our amazing backers.
-Any changes to sass and js files need to be made within the `opentech/static_src` directory. They then need to be compiled with the help of "gulp".
+Issues on Hypha can be funded by anyone and the money will be distributed to contributors and maintainers. If you use Hypha please consider becoming a backer:
-Start a vagrant SSH session and go to the project root directory.
+[](https://issuehunt.io/r/OpenTechFund/opentech.fund)
-``` bash
-vagrant ssh
-cd /vagrant
-```
+## More information
+* Website: coming soon
+* Docs: coming soon
+* Why Hypha? **[Hyphae](https://en.wikipedia.org/wiki/Mycorrhizal_network):** long, branching ecosystem enriching organisms that form interconnected networks to collectively exchange resources. Hopefully, Hypha helps it's users do the same.
+* Copyright (C) 2019 - Open Technology Fund
-Here you can run a number of different "gulp" commands. The two most useful are likely:
-
-``` bash
-gulp watch
-```
-
-That will watch all fles for changes and build them with maps etc., perfect for development. (It will also run the "collecstatic" command, useful when running the site with a production server and not the built in dev server.)
-
-If you are working on the React components then it may be worth just using one of the two following commands. They should do the same thing, but the npm command calls Webpack direct.
-
-| WARNING: You cannot use Webpack watch and Hot Module Reload within vagrant, it must be run from your own installation of node. All other commands will work. |
-| --- |
-
-``` bash
-gulp watch:app
-# OR
-npm run webpack-watch
-```
-
-To build the assets which get deployed, use the following. The deployment scripts will handle this, and the files do not need to be committed.
-
-``` bash
-gulp build
-```
-
-For more command see the `gulpfile.js` file.
-
-
-# Running tests
-
-Run all tests for the project with the following command within the SSH session:
-
-``` bash
-DJANGO_SETTINGS_MODULE=opentech.settings.test python manage.py test --keepdb
-```
+### License
+[BSD 3-clause](./LICENSE)
diff --git a/opentech/apply/activity/messaging.py b/opentech/apply/activity/messaging.py
index 8e426f4f56c363aad9b3d1f1f5e76b7a864ce0b7..8343c3694040ebf61dae516df709ac2c49b359cf 100644
--- a/opentech/apply/activity/messaging.py
+++ b/opentech/apply/activity/messaging.py
@@ -614,9 +614,9 @@ class EmailAdapter(AdapterBase):
subject = 'Application ready to review: {submission.title}'.format(submission=source)
else:
try:
- subject = source.page.specific.subject or 'Your application to Open Technology Fund: {source.title}'.format(source=source)
+ subject = source.page.specific.subject or 'Your application to {org_long_name}: {source.title}'.format(org_long_name=settings.ORG_LONG_NAME, source=source)
except AttributeError:
- subject = 'Your Open Technology Fund Project: {source.title}'.format(source=source)
+ subject = 'Your {org_long_name} Project: {source.title}'.format(org_long_name=settings.ORG_LONG_NAME, source=source)
return subject
def extra_kwargs(self, message_type, source, sources, **kwargs):
diff --git a/opentech/apply/activity/migrations/0028_migrate_messages_with_visibility.py b/opentech/apply/activity/migrations/0028_migrate_messages_with_visibility.py
index 71771a15c4d46c6be19f4c2d758f3b566da43578..d0041024224a305f0b41f098fcd77441d867db49 100644
--- a/opentech/apply/activity/migrations/0028_migrate_messages_with_visibility.py
+++ b/opentech/apply/activity/migrations/0028_migrate_messages_with_visibility.py
@@ -14,12 +14,13 @@ def forward_visibility_options(apps, schema_editor):
except json.JSONDecodeError:
continue
- new_message = {
- TEAM: message['internal'],
- ALL: message['public'],
- }
- activity.message = json.dumps(new_message)
- activity.save()
+ if 'internal' in message and 'public' in message:
+ new_message = {
+ TEAM: message['internal'],
+ ALL: message['public'],
+ }
+ activity.message = json.dumps(new_message)
+ activity.save()
def backward_visibility_options(apps, schema_editor):
diff --git a/opentech/apply/activity/templates/messages/email/applicant_base.html b/opentech/apply/activity/templates/messages/email/applicant_base.html
index 842c1d00557f70110efd1af47c8fe72d4a93a733..6ddf443bc8ea35c2364102ec4e189d76640494ce 100644
--- a/opentech/apply/activity/templates/messages/email/applicant_base.html
+++ b/opentech/apply/activity/templates/messages/email/applicant_base.html
@@ -4,5 +4,5 @@
{% block more_info %}You can find more information here: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}
If you have any questions, please submit them here: {{ request.scheme }}://{{ request.get_host }}{{ source.get_absolute_url }}#communications
-If you have any issues accessing the submission system or other general inquiries, please email us at hello@opentech.fund
+If you have any issues accessing the submission system or other general inquiries, please email us at {{ ORG_EMAIL }}
{% endblock %}
diff --git a/opentech/apply/activity/templates/messages/email/base.html b/opentech/apply/activity/templates/messages/email/base.html
index c5acd96f23dcca295d8a17712658a1334d0058f2..4cd8076470b5589bcea4239d692c579e17a89c56 100644
--- a/opentech/apply/activity/templates/messages/email/base.html
+++ b/opentech/apply/activity/templates/messages/email/base.html
@@ -3,9 +3,9 @@
{% block content %}{% endblock %}
{% block more_info %}{% endblock %}
Kind Regards,
-The OTF Team
+The {{ ORG_SHORT_NAME }} Team
--
-Open Technology Fund
-https://www.opentech.fund/
+{{ ORG_LONG_NAME }}
+{{ PUBLIC_SITE.root_url }}
{% block post_signature_content %}{% endblock %}
diff --git a/opentech/apply/activity/templates/messages/email/invited_to_proposal.html b/opentech/apply/activity/templates/messages/email/invited_to_proposal.html
index 1be743084363e7bd87d3df3bd86b366684234f0e..b21e520512f156936072343ef8ba21a0e13dd9f3 100644
--- a/opentech/apply/activity/templates/messages/email/invited_to_proposal.html
+++ b/opentech/apply/activity/templates/messages/email/invited_to_proposal.html
@@ -1,7 +1,7 @@
{% extends "messages/email/applicant_base.html" %}
-{% block content %}We’ve reviewed your Concept note and think it could be a good fit for OTF funding. We would like to invite you to submit a Proposal with more details about your project.
+{% block content %}We’ve reviewed your Concept note and think it could be a good fit for {{ ORG_SHORT_NAME }} funding. We would like to invite you to submit a Proposal with more details about your project.
-You can find more information about what we’d like to see in your Proposal here: https://guide.opentech.fund/
+You can find more information about what we’d like to see in your Proposal here: {{ ORG_GUIDE_URL }}
The system will allow you to save a draft of your Proposal as you work on it. When you feel it is ready for our review, please click the “Submit†button and we’ll know to take a look at it. We’ll reply to you with feedback on your Proposal as quickly as possible.{% endblock %}
diff --git a/opentech/apply/dashboard/templates/dashboard/partner_dashboard.html b/opentech/apply/dashboard/templates/dashboard/partner_dashboard.html
index 2127af81da2818e673ba232347f43695239aa96c..e788f07720034182195c6f27aa84f5b3ae0059b1 100644
--- a/opentech/apply/dashboard/templates/dashboard/partner_dashboard.html
+++ b/opentech/apply/dashboard/templates/dashboard/partner_dashboard.html
@@ -2,7 +2,7 @@
{% load render_table from django_tables2 %}
{% load static statusbar_tags workflow_tags %}
-{% block title %}OTF partner Dashboard{% endblock %}
+{% block title %}{{ ORG_SHORT_NAME }} partner Dashboard{% endblock %}
{% block content %}
<div class="admin-bar">
diff --git a/opentech/apply/dashboard/templates/dashboard/reviewer_dashboard.html b/opentech/apply/dashboard/templates/dashboard/reviewer_dashboard.html
index eae2b5cb91f07f3ed1e5c2f7e974f48c3be72ab8..cb7979fcf906538f714e9002a8bde01a23598b4c 100644
--- a/opentech/apply/dashboard/templates/dashboard/reviewer_dashboard.html
+++ b/opentech/apply/dashboard/templates/dashboard/reviewer_dashboard.html
@@ -6,7 +6,7 @@
{{ filter.form.media.css }}
{% endblock %}
-{% block title %}OTF reviewer Dashboard{% endblock %}
+{% block title %}{{ ORG_SHORT_NAME }} reviewer Dashboard{% endblock %}
{% block content %}
<div class="admin-bar">
diff --git a/opentech/apply/determinations/forms.py b/opentech/apply/determinations/forms.py
index f8ae281c94948943ab0464fd55835fa8def009c2..12a3417a0e07dd7b1252d175fffd0f0ade2ed77f 100644
--- a/opentech/apply/determinations/forms.py
+++ b/opentech/apply/determinations/forms.py
@@ -7,6 +7,7 @@ from opentech.apply.funds.models import ApplicationSubmission
from .models import (
Determination,
+ DeterminationFormSettings,
DETERMINATION_CHOICES,
TRANSITION_DETERMINATION,
)
@@ -29,6 +30,9 @@ class RequiredRichTextField(forms.CharField):
class BaseDeterminationForm:
def __init__(self, *args, user, initial, action, **kwargs):
+ if 'site' in kwargs:
+ site = kwargs.pop('site')
+ self.form_settings = DeterminationFormSettings.for_site(site)
try:
initial.update(outcome=TRANSITION_DETERMINATION[action])
except KeyError:
@@ -52,6 +56,18 @@ class BaseDeterminationForm:
}
return cleaned_data
+ def apply_form_settings(self, application_type, fields):
+ for field in fields:
+ try:
+ self.fields[field].label = getattr(self.form_settings, f'{application_type}_{field}_label')
+ except AttributeError:
+ pass
+ try:
+ self.fields[field].help_text = getattr(self.form_settings, f'{application_type}_{field}_help_text')
+ except AttributeError:
+ pass
+ return fields
+
@classmethod
def get_detailed_response(cls, saved_data):
data = {}
@@ -95,25 +111,6 @@ class BaseNormalDeterminationForm(BaseDeterminationForm, forms.ModelForm):
if field not in self._meta.fields
]
- def __init__(self, *args, submission, user, initial={}, instance=None, **kwargs):
- initial.update(submission=submission.id)
-
- if instance:
- for key, value in instance.data.items():
- if key not in self._meta.fields:
- initial[key] = value
-
- super().__init__(*args, initial=initial, user=user, instance=instance, **kwargs)
-
- for field in self._meta.widgets:
- self.fields[field].disabled = True
-
- self.fields['outcome'].choices = self.outcome_choices_for_phase(submission, user)
-
- if self.draft_button_name in self.data:
- for field in self.fields.values():
- field.required = False
-
def outcome_choices_for_phase(self, submission, user):
"""
Outcome choices correspond to Phase transitions.
@@ -156,11 +153,6 @@ class BaseBatchDeterminationForm(BaseDeterminationForm, forms.Form):
if field not in ['submissions', 'outcome', 'author']
]
- def __init__(self, *args, submissions, initial={}, **kwargs):
- initial.update(submissions=submissions.values_list('id', flat=True))
- super().__init__(*args, initial=initial, **kwargs)
- self.fields['outcome'].widget = forms.HiddenInput()
-
def _post_clean(self):
submissions = self.cleaned_data['submissions'].undetermined()
data = {
@@ -345,7 +337,25 @@ class BaseProposalDeterminationForm(forms.Form):
class ConceptDeterminationForm(BaseConceptDeterminationForm, BaseNormalDeterminationForm):
def __init__(self, *args, submission, user, initial={}, instance=None, **kwargs):
- super().__init__(*args, submission=submission, user=user, initial={}, instance=None, **kwargs)
+ initial.update(submission=submission.id)
+
+ if instance:
+ for key, value in instance.data.items():
+ if key not in self._meta.fields:
+ initial[key] = value
+
+ super(BaseNormalDeterminationForm, self).__init__(*args, initial=initial, user=user, instance=instance, **kwargs)
+
+ for field in self._meta.widgets:
+ self.fields[field].disabled = True
+
+ self.fields['outcome'].choices = self.outcome_choices_for_phase(submission, user)
+
+ if self.draft_button_name in self.data:
+ for field in self.fields.values():
+ field.required = False
+
+ self.fields = self.apply_form_settings('concept', self.fields)
action = kwargs.get('action')
stages_num = len(submission.workflow.stages)
@@ -367,12 +377,41 @@ class ConceptDeterminationForm(BaseConceptDeterminationForm, BaseNormalDetermina
class ProposalDeterminationForm(BaseProposalDeterminationForm, BaseNormalDeterminationForm):
- pass
+ def __init__(self, *args, submission, user, initial={}, instance=None, **kwargs):
+ initial.update(submission=submission.id)
+
+ if instance:
+ for key, value in instance.data.items():
+ if key not in self._meta.fields:
+ initial[key] = value
+
+ super(BaseNormalDeterminationForm, self).__init__(*args, initial=initial, user=user, instance=instance, **kwargs)
+
+ for field in self._meta.widgets:
+ self.fields[field].disabled = True
+
+ self.fields['outcome'].choices = self.outcome_choices_for_phase(submission, user)
+
+ if self.draft_button_name in self.data:
+ for field in self.fields.values():
+ field.required = False
+
+ self.fields = self.apply_form_settings('proposal', self.fields)
class BatchConceptDeterminationForm(BaseConceptDeterminationForm, BaseBatchDeterminationForm):
- pass
+ def __init__(self, *args, submissions, initial={}, **kwargs):
+ initial.update(submissions=submissions.values_list('id', flat=True))
+ super(BaseBatchDeterminationForm, self).__init__(*args, initial=initial, **kwargs)
+ self.fields['outcome'].widget = forms.HiddenInput()
+
+ self.fields = self.apply_form_settings('concept', self.fields)
class BatchProposalDeterminationForm(BaseProposalDeterminationForm, BaseBatchDeterminationForm):
- pass
+ def __init__(self, *args, submissions, initial={}, **kwargs):
+ initial.update(submissions=submissions.values_list('id', flat=True))
+ super(BaseBatchDeterminationForm, self).__init__(*args, initial=initial, **kwargs)
+ self.fields['outcome'].widget = forms.HiddenInput()
+
+ self.fields = self.apply_form_settings('proposal', self.fields)
diff --git a/opentech/apply/determinations/migrations/0007_add_determinationformsettings.py b/opentech/apply/determinations/migrations/0007_add_determinationformsettings.py
new file mode 100644
index 0000000000000000000000000000000000000000..c71c2876bb2cd98353f7a2c79bebbf65c2244896
--- /dev/null
+++ b/opentech/apply/determinations/migrations/0007_add_determinationformsettings.py
@@ -0,0 +1,59 @@
+# Generated by Django 2.0.13 on 2019-09-12 13:59
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('wagtailcore', '0040_page_draft_title'),
+ ('determinations', '0006_allow_multiple_determinations'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='DeterminationFormSettings',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('concept_principles_label', models.CharField(default='Goals and principles', max_length=255, verbose_name='label')),
+ ('concept_principles_help_text', models.TextField(blank=True, verbose_name='help text')),
+ ('concept_technical_label', models.CharField(default='Technical merit', max_length=255, verbose_name='label')),
+ ('concept_technical_help_text', models.TextField(blank=True, verbose_name='help text')),
+ ('concept_sustainable_label', models.CharField(default='Reasonable, realistic and sustainable', max_length=255, verbose_name='label')),
+ ('concept_sustainable_help_text', models.TextField(blank=True, verbose_name='help text')),
+ ('proposal_liked_label', models.CharField(default='Positive aspects', max_length=255, verbose_name='label')),
+ ('proposal_liked_help_text', models.TextField(blank=True, verbose_name='help text')),
+ ('proposal_concerns_label', models.CharField(default='Concerns', max_length=255, verbose_name='label')),
+ ('proposal_concerns_help_text', models.TextField(blank=True, verbose_name='help text')),
+ ('proposal_red_flags_label', models.CharField(default='Items that must be addressed', max_length=255, verbose_name='label')),
+ ('proposal_red_flags_help_text', models.TextField(blank=True, verbose_name='help text')),
+ ('proposal_overview_label', models.CharField(default='Project overview questions and comments', max_length=255, verbose_name='label')),
+ ('proposal_overview_help_text', models.TextField(blank=True, verbose_name='help text')),
+ ('proposal_objectives_label', models.CharField(default='Objectives questions and comments', max_length=255, verbose_name='label')),
+ ('proposal_objectives_help_text', models.TextField(blank=True, verbose_name='help text')),
+ ('proposal_strategy_label', models.CharField(default='Methods and strategy questions and comments', max_length=255, verbose_name='label')),
+ ('proposal_strategy_help_text', models.TextField(blank=True, verbose_name='help text')),
+ ('proposal_technical_label', models.CharField(default='Technical feasibility questions and comments', max_length=255, verbose_name='label')),
+ ('proposal_technical_help_text', models.TextField(blank=True, verbose_name='help text')),
+ ('proposal_alternative_label', models.CharField(default='Alternative analysis - "red teaming" questions and comments', max_length=255, verbose_name='label')),
+ ('proposal_alternative_help_text', models.TextField(blank=True, verbose_name='help text')),
+ ('proposal_usability_label', models.CharField(default='Usability questions and comments', max_length=255, verbose_name='label')),
+ ('proposal_usability_help_text', models.TextField(blank=True, verbose_name='help text')),
+ ('proposal_sustainability_label', models.CharField(default='Sustainability questions and comments', max_length=255, verbose_name='label')),
+ ('proposal_sustainability_help_text', models.TextField(blank=True, verbose_name='help text')),
+ ('proposal_collaboration_label', models.CharField(default='Collaboration questions and comments', max_length=255, verbose_name='label')),
+ ('proposal_collaboration_help_text', models.TextField(blank=True, verbose_name='help text')),
+ ('proposal_realism_label', models.CharField(default='Cost realism questions and comments', max_length=255, verbose_name='label')),
+ ('proposal_realism_help_text', models.TextField(blank=True, verbose_name='help text')),
+ ('proposal_qualifications_label', models.CharField(default='Qualifications questions and comments', max_length=255, verbose_name='label')),
+ ('proposal_qualifications_help_text', models.TextField(blank=True, verbose_name='help text')),
+ ('proposal_evaluation_label', models.CharField(default='Evaluation questions and comments', max_length=255, verbose_name='label')),
+ ('proposal_evaluation_help_text', models.TextField(blank=True, verbose_name='help text')),
+ ('site', models.OneToOneField(editable=False, on_delete=django.db.models.deletion.CASCADE, to='wagtailcore.Site')),
+ ],
+ options={
+ 'verbose_name': 'determination settings',
+ },
+ ),
+ ]
diff --git a/opentech/apply/determinations/models.py b/opentech/apply/determinations/models.py
index 2d985f2d6fd43b053289e394b17339c5ded16902..1e5d2b023ce467a423db6cfd3b62e9c61d75d52b 100644
--- a/opentech/apply/determinations/models.py
+++ b/opentech/apply/determinations/models.py
@@ -4,9 +4,8 @@ from django.contrib.postgres.fields import JSONField
from django.db import models
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _
-from wagtail.admin.edit_handlers import TabbedInterface, ObjectList, FieldPanel
-from wagtail.contrib.settings.models import BaseSetting
-from wagtail.contrib.settings.registry import register_setting
+from wagtail.admin.edit_handlers import TabbedInterface, ObjectList, FieldPanel, MultiFieldPanel
+from wagtail.contrib.settings.models import BaseSetting, register_setting
from wagtail.core.fields import RichTextField
from opentech.apply.funds.workflow import DETERMINATION_OUTCOMES
@@ -146,3 +145,124 @@ class DeterminationMessageSettings(BaseSetting):
ObjectList(concept_tab_panels, heading='Concept note'),
ObjectList(proposal_tab_panels, heading='Proposal'),
])
+
+
+@register_setting
+class DeterminationFormSettings(BaseSetting):
+ class Meta:
+ verbose_name = 'determination settings'
+
+ concept_principles_label = models.CharField('label', default='Goals and principles', max_length=255)
+ concept_principles_help_text = models.TextField('help text', blank=True)
+ concept_technical_label = models.CharField('label', default='Technical merit', max_length=255)
+ concept_technical_help_text = models.TextField('help text', blank=True)
+ concept_sustainable_label = models.CharField('label', default='Reasonable, realistic and sustainable', max_length=255)
+ concept_sustainable_help_text = models.TextField('help text', blank=True)
+
+ proposal_liked_label = models.CharField('label', default='Positive aspects', max_length=255)
+ proposal_liked_help_text = models.TextField('help text', blank=True)
+ proposal_concerns_label = models.CharField('label', default='Concerns', max_length=255)
+ proposal_concerns_help_text = models.TextField('help text', blank=True)
+ proposal_red_flags_label = models.CharField('label', default='Items that must be addressed', max_length=255)
+ proposal_red_flags_help_text = models.TextField('help text', blank=True)
+ proposal_overview_label = models.CharField('label', default='Project overview questions and comments', max_length=255)
+ proposal_overview_help_text = models.TextField('help text', blank=True)
+ proposal_objectives_label = models.CharField('label', default='Objectives questions and comments', max_length=255)
+ proposal_objectives_help_text = models.TextField('help text', blank=True)
+ proposal_strategy_label = models.CharField('label', default='Methods and strategy questions and comments', max_length=255)
+ proposal_strategy_help_text = models.TextField('help text', blank=True)
+ proposal_technical_label = models.CharField('label', default='Technical feasibility questions and comments', max_length=255)
+ proposal_technical_help_text = models.TextField('help text', blank=True)
+ proposal_alternative_label = models.CharField('label', default='Alternative analysis - "red teaming" questions and comments', max_length=255)
+ proposal_alternative_help_text = models.TextField('help text', blank=True)
+ proposal_usability_label = models.CharField('label', default='Usability questions and comments', max_length=255)
+ proposal_usability_help_text = models.TextField('help text', blank=True)
+ proposal_sustainability_label = models.CharField('label', default='Sustainability questions and comments', max_length=255)
+ proposal_sustainability_help_text = models.TextField('help text', blank=True)
+ proposal_collaboration_label = models.CharField('label', default='Collaboration questions and comments', max_length=255)
+ proposal_collaboration_help_text = models.TextField('help text', blank=True)
+ proposal_realism_label = models.CharField('label', default='Cost realism questions and comments', max_length=255)
+ proposal_realism_help_text = models.TextField('help text', blank=True)
+ proposal_qualifications_label = models.CharField('label', default='Qualifications questions and comments', max_length=255)
+ proposal_qualifications_help_text = models.TextField('help text', blank=True)
+ proposal_evaluation_label = models.CharField('label', default='Evaluation questions and comments', max_length=255)
+ proposal_evaluation_help_text = models.TextField('help text', blank=True)
+
+ concept_help_text_tab_panels = [
+ MultiFieldPanel([
+ FieldPanel('concept_principles_label'),
+ FieldPanel('concept_principles_help_text'),
+ ], 'concept principles'),
+ MultiFieldPanel([
+ FieldPanel('concept_technical_label'),
+ FieldPanel('concept_technical_help_text'),
+ ], 'concept technical'),
+ MultiFieldPanel([
+ FieldPanel('concept_sustainable_label'),
+ FieldPanel('concept_sustainable_help_text'),
+ ], 'concept sustainable'),
+ ]
+
+ proposal_help_text_tab_panels = [
+ MultiFieldPanel([
+ FieldPanel('proposal_liked_label'),
+ FieldPanel('proposal_liked_help_text'),
+ ], 'proposal liked'),
+ MultiFieldPanel([
+ FieldPanel('proposal_concerns_label'),
+ FieldPanel('proposal_concerns_help_text'),
+ ], 'proposal concerns'),
+ MultiFieldPanel([
+ FieldPanel('proposal_red_flags_label'),
+ FieldPanel('proposal_red_flags_help_text'),
+ ], 'proposal red flags'),
+ MultiFieldPanel([
+ FieldPanel('proposal_overview_label'),
+ FieldPanel('proposal_overview_help_text'),
+ ], 'proposal overview'),
+ MultiFieldPanel([
+ FieldPanel('proposal_objectives_label'),
+ FieldPanel('proposal_objectives_help_text'),
+ ], 'proposal objectives'),
+ MultiFieldPanel([
+ FieldPanel('proposal_strategy_label'),
+ FieldPanel('proposal_strategy_help_text'),
+ ], 'proposal strategy'),
+ MultiFieldPanel([
+ FieldPanel('proposal_technical_label'),
+ FieldPanel('proposal_technical_help_text'),
+ ], 'proposal technical'),
+ MultiFieldPanel([
+ FieldPanel('proposal_alternative_label'),
+ FieldPanel('proposal_alternative_help_text'),
+ ], 'proposal alternative'),
+ MultiFieldPanel([
+ FieldPanel('proposal_usability_label'),
+ FieldPanel('proposal_usability_help_text'),
+ ], 'proposal usability'),
+ MultiFieldPanel([
+ FieldPanel('proposal_sustainability_label'),
+ FieldPanel('proposal_sustainability_help_text'),
+ ], 'proposal sustainability'),
+ MultiFieldPanel([
+ FieldPanel('proposal_collaboration_label'),
+ FieldPanel('proposal_collaboration_help_text'),
+ ], 'proposal collaboration'),
+ MultiFieldPanel([
+ FieldPanel('proposal_realism_label'),
+ FieldPanel('proposal_realism_help_text'),
+ ], 'proposal realism'),
+ MultiFieldPanel([
+ FieldPanel('proposal_qualifications_label'),
+ FieldPanel('proposal_qualifications_help_text'),
+ ], 'proposal qualifications'),
+ MultiFieldPanel([
+ FieldPanel('proposal_evaluation_label'),
+ FieldPanel('proposal_evaluation_help_text'),
+ ], 'proposal evaluation'),
+ ]
+
+ edit_handler = TabbedInterface([
+ ObjectList(concept_help_text_tab_panels, heading='Concept form'),
+ ObjectList(proposal_help_text_tab_panels, heading='Proposal form'),
+ ])
diff --git a/opentech/apply/determinations/views.py b/opentech/apply/determinations/views.py
index f6ea6c3bef8da3d8c99c23d9b9c78e2d9197aaa2..260e6eafa576650c947bf175e7f426cc37894507 100644
--- a/opentech/apply/determinations/views.py
+++ b/opentech/apply/determinations/views.py
@@ -90,6 +90,7 @@ class BatchDeterminationCreateView(CreateView):
kwargs['user'] = self.request.user
kwargs['submissions'] = self.get_submissions()
kwargs['action'] = self.get_action()
+ kwargs['site'] = self.request.site
kwargs.pop('instance')
return kwargs
@@ -234,6 +235,7 @@ class DeterminationCreateOrUpdateView(CreateOrUpdateView):
kwargs['user'] = self.request.user
kwargs['submission'] = self.submission
kwargs['action'] = self.request.GET.get('action')
+ kwargs['site'] = self.request.site
return kwargs
def get_success_url(self):
diff --git a/opentech/apply/funds/admin.py b/opentech/apply/funds/admin.py
index 3dda27b90a6836c095ac1ed7969592adb9fc9c1b..fe8a56644834d090aa18b0b8940d0cb31e5539b0 100644
--- a/opentech/apply/funds/admin.py
+++ b/opentech/apply/funds/admin.py
@@ -27,12 +27,13 @@ class BaseRoundAdmin(ModelAdmin):
class RoundAdmin(BaseRoundAdmin):
model = Round
menu_icon = 'repeat'
- list_display = ('title', 'fund', 'start_date', 'end_date', 'sealed', 'applications', 'review_forms')
+ list_display = ('title', 'fund', 'start_date', 'end_date', 'applications', 'review_forms')
def applications(self, obj):
+
def build_urls(applications):
for application in applications:
- url = reverse('funds_applicationform_modeladmin_edit', args=[application.id])
+ url = reverse('funds_applicationform_modeladmin_edit', args=[application.form.id])
yield f'<a href="{url}">{application}</a>'
urls = list(build_urls(obj.forms.all()))
@@ -48,10 +49,10 @@ class RoundAdmin(BaseRoundAdmin):
return mark_safe(url_tag)
def review_forms(self, obj):
- def build_urls(review_forms):
- for review_form in review_forms:
- url = reverse('funds_round_modeladmin_edit', args=[review_form.id])
- yield f'<a href="{url}">{review_form}</a>'
+ def build_urls(reviews):
+ for review in reviews:
+ url = reverse('review_reviewform_modeladmin_edit', args=[review.form.id])
+ yield f'<a href="{url}">{review}</a>'
urls = list(build_urls(obj.review_forms.all()))
diff --git a/opentech/apply/funds/admin_views.py b/opentech/apply/funds/admin_views.py
index d0a0cf1812ab5d1ac22cc674e2c489ffb4f6e1d9..79071813169b4a71e7436240840a0c0a5bb45fc6 100644
--- a/opentech/apply/funds/admin_views.py
+++ b/opentech/apply/funds/admin_views.py
@@ -3,7 +3,7 @@ from django.shortcuts import redirect
from django.utils.translation import ugettext as _
from wagtail.admin import messages
-from wagtail.admin.forms import CopyForm
+from wagtail.admin.forms.pages import CopyForm
from wagtail.admin.views.pages import get_valid_next_url_from_request
from wagtail.core import hooks
from wagtail.core.models import Page
diff --git a/opentech/apply/funds/api_views.py b/opentech/apply/funds/api_views.py
index 09379c7a70ca59fc0775784761b3aca8d7964805..bb09838102064ee24e79d8147cc0f5226c147728 100644
--- a/opentech/apply/funds/api_views.py
+++ b/opentech/apply/funds/api_views.py
@@ -45,9 +45,9 @@ class SubmissionsFilter(filters.FilterSet):
round = RoundLabFilter(queryset=RoundsAndLabs.objects.all())
status = filters.MultipleChoiceFilter(choices=PHASES)
active = filters.BooleanFilter(method='filter_active', label='Active')
- submit_date = filters.DateFromToRangeFilter(name='submit_time', label='Submit date')
+ submit_date = filters.DateFromToRangeFilter(field_name='submit_time', label='Submit date')
fund = filters.ModelMultipleChoiceFilter(
- name='page', label='fund',
+ field_name='page', label='fund',
queryset=Page.objects.type(FundType) | Page.objects.type(LabType)
)
diff --git a/opentech/apply/funds/differ.py b/opentech/apply/funds/differ.py
index 7573d9a830fc078c3de01dd5cc1cae62710d5391..51d4e46249668f367b98396d2c479c47321eb17d 100644
--- a/opentech/apply/funds/differ.py
+++ b/opentech/apply/funds/differ.py
@@ -1,9 +1,10 @@
+import re
+
from bleach.sanitizer import Cleaner
-from bs4 import BeautifulSoup
from difflib import SequenceMatcher
from django.utils.html import format_html
-from django.utils.text import mark_safe
+from django.utils.safestring import mark_safe
def wrap_with_span(text, class_name):
@@ -19,66 +20,37 @@ def wrap_added(text):
def compare(answer_a, answer_b, should_bleach=True):
- if not answer_a and not answer_b:
- # This catches the case where both results are None and we cant compare
- return answer_b
- if isinstance(answer_a, dict) or isinstance(answer_b, dict):
- # TODO: handle file dictionaries
- return answer_b
-
if should_bleach:
cleaner = Cleaner(tags=['h4'], attributes={}, strip=True)
- if isinstance(answer_a, str):
- answer_a = cleaner.clean(answer_a)
- else:
- answer_a = str(answer_a)
-
- if isinstance(answer_b, str):
- answer_b = cleaner.clean(answer_b)
- else:
- answer_b = str(answer_b)
+ answer_a = re.sub('(<li[^>]*>)', r'\1â— ', answer_a)
+ answer_b = re.sub('(<li[^>]*>)', r'\1â— ', answer_b)
+ answer_a = cleaner.clean(answer_a)
+ answer_b = cleaner.clean(answer_b)
diff = SequenceMatcher(None, answer_a, answer_b)
- output = []
- added = []
- deleted = []
+ from_diff = []
+ to_diff = []
for opcode, a0, a1, b0, b1 in diff.get_opcodes():
if opcode == 'equal':
- if a1 - a0 > 2 or not (added or deleted):
- # if there are more than two of the same characters, commit the added and removed text
- if added:
- output.append(wrap_added(''.join(added)))
- added = []
- if deleted:
- output.append(wrap_deleted(''.join(deleted)))
- deleted = []
- output.append(diff.a[a0:a1])
- else:
- # Ignore the small gap pretend it has been both added and removed
- added.append(diff.a[a0:a1])
- deleted.append(diff.a[a0:a1])
+ from_diff.append(mark_safe(diff.a[a0:a1]))
+ to_diff.append(mark_safe(diff.b[b0:b1]))
elif opcode == 'insert':
- added.append(diff.b[b0:b1])
+ from_diff.append(mark_safe(diff.a[a0:a1]))
+ to_diff.append(wrap_with_span(diff.b[b0:b1], 'added'))
elif opcode == 'delete':
- deleted.append(diff.a[a0:a1])
+ from_diff.append(wrap_with_span(diff.a[a0:a1], 'deleted'))
+ to_diff.append(mark_safe(diff.b[b0:b1]))
elif opcode == 'replace':
- deleted.append(diff.a[a0:a1])
- added.append(diff.b[b0:b1])
-
- # Handle text not added to the output already
- if added == deleted:
- output.append(''.join(added))
- else:
- if deleted:
- output.append(wrap_deleted(''.join(deleted)))
- if added:
- output.append(wrap_added(''.join(added)))
-
- display = ''.join(output)
-
- if not should_bleach:
- soup = BeautifulSoup(display, "html5lib")
- soup.body.hidden = True
- display = soup.body.prettify()
-
- return mark_safe(display)
+ from_diff.append(wrap_with_span(diff.a[a0:a1], 'deleted'))
+ to_diff.append(wrap_with_span(diff.b[b0:b1], 'added'))
+
+ from_display = ''.join(from_diff)
+ to_display = ''.join(to_diff)
+ from_display = re.sub('([â—â—‹]|[0-9]{1,2}[\)\.])', r'<br>\1', from_display)
+ to_display = re.sub('([â—â—‹]|[0-9]{1,2}[\)\.])', r'<br>\1', to_display)
+ from_display = re.sub('(\.\n)', r'\1<br><br>', from_display)
+ to_display = re.sub('(\.\n)', r'\1<br><br>', to_display)
+ from_display = mark_safe(from_display)
+ to_display = mark_safe(to_display)
+
+ return (from_display, to_display)
diff --git a/opentech/apply/funds/edit_handlers.py b/opentech/apply/funds/edit_handlers.py
index d7f7b78257aea95e0fc58673e7fec9ee9c601535..4c4bcb6ad229c6cfd3a81f4937c96919d903629f 100644
--- a/opentech/apply/funds/edit_handlers.py
+++ b/opentech/apply/funds/edit_handlers.py
@@ -113,7 +113,7 @@ class FilteredFieldPanel(FieldPanel):
filter_query=self.filter_query,
)
- def on_instance_bound(self):
- super().on_instance_bound()
+ def on_form_bound(self):
+ super().on_form_bound()
target_model = self.bound_field.field.queryset.model
self.bound_field.field.queryset = target_model.objects.filter(**self.filter_query)
diff --git a/opentech/apply/funds/forms.py b/opentech/apply/funds/forms.py
index 91911a9858bf01e30272c27b1c3e7cb1791dfcc2..05d1ed80578271c318b6f8a5421baa4ead5470d6 100644
--- a/opentech/apply/funds/forms.py
+++ b/opentech/apply/funds/forms.py
@@ -3,8 +3,9 @@ from itertools import groupby
from operator import methodcaller
from django import forms
-from django.utils.text import mark_safe, slugify
+from django.utils.text import slugify
from django.utils.translation import ugettext_lazy as _
+from django.utils.safestring import mark_safe
from django_select2.forms import Select2Widget
from opentech.apply.categories.models import MetaCategory
diff --git a/opentech/apply/funds/management/commands/seed_concept_note.py b/opentech/apply/funds/management/commands/seed_concept_note.py
index 9cb8796873a50ffc17d3e7e0c6b332ee91a1c9ac..995dd857d3226328d20db21f8929a33a2656d3be 100644
--- a/opentech/apply/funds/management/commands/seed_concept_note.py
+++ b/opentech/apply/funds/management/commands/seed_concept_note.py
@@ -172,11 +172,11 @@ class Command(BaseCommand):
{"type": "checkbox", "value": {"field_label": "I understand about confidentiality", "help_text": "", "default_value": ""}, "id": "65fb2c22-a0c5-4cde-94a7-feb27072bc3d"},
{"type": "dropdown", "value": {"field_label": "Do you have any conflicts of interest to report?", "help_text": "", "required": "", "choices": ["Yes", "No"]}, "id": "dd75ce49-e3c4-43da-b724-4cb8bb88dcf8"},
{"type": "rich_text", "value": {"field_label": "Conflict(s) of interest disclosure", "help_text": "", "required": "", "default_value": ""}, "id": "9f7fe70b-97b5-4263-98ac-a45bf97b59d0"},
- {"type": "text_markup", "value": "<h3>B. General thoughts</h3>", "id": "976386e1-3a66-490f-9e82-bfbe1f134cf2"},
+ {"type": "text_markup", "value": "<h3>B. General thoughts</h3>", "id": "46079135-4857-4749-9df0-7c1d0ba38e10"},
{"type": "rich_text", "value": {"field_label": "1. Positive aspects", "help_text": "", "required": "", "default_value": ""}, "id": "e91ed603-61ad-483e-be7b-21716d05a3bd"},
{"type": "rich_text", "value": {"field_label": "2. Concerns", "help_text": "", "required": "", "default_value": ""}, "id": "821fb071-7db7-4cc1-ac3a-34b9eee40c94"},
{"type": "rich_text", "value": {"field_label": "3. Items that must be addressed", "help_text": "", "required": "", "default_value": ""}, "id": "021624ac-6628-430d-ba86-e68fd518c87e"},
- {"type": "text_markup", "value": "<h3>C. Specific aspects</h3>", "id": "976386e1-3a66-490f-9e82-bfbe1f134cf2"},
+ {"type": "text_markup", "value": "<h3>C. Specific aspects</h3>", "id": "64bf5170-7032-4250-b059-74d1022e1cb2"},
{"type": "score", "value": {"field_label": "1. Project overview", "help_text": "", "required": ""}, "id": "9c5603d5-f897-42fa-8739-5935769c94bd"},
{"type": "score", "value": {"field_label": "2. Proposal objectives", "help_text": "", "required": ""}, "id": "6b748400-fad9-4b31-bb85-e3a53c99f4df"},
{"type": "score", "value": {"field_label": "3. Appropriate activities and strategy", "help_text": "", "required": ""}, "id": "a806a944-1d8a-4904-ace0-acfce5634a50"},
@@ -188,9 +188,9 @@ class Command(BaseCommand):
{"type": "score", "value": {"field_label": "9. Cost realism", "help_text": "", "required": ""}, "id": "31e9b202-24b1-4993-80b7-9851624e2162"},
{"type": "score", "value": {"field_label": "10. Qualifications", "help_text": "", "required": ""}, "id": "d3f5479c-68da-41d9-a266-130d383bab6b"},
{"type": "score", "value": {"field_label": "11. Evaluation", "help_text": "", "required": ""}, "id": "2a61c71a-74f6-4963-8850-9289e852f604"},
- {"type": "text_markup", "value": "<h3>D. Rationale and appropriateness consideration</h3>", "id": "976386e1-3a66-490f-9e82-bfbe1f134cf2"},
+ {"type": "text_markup", "value": "<h3>D. Rationale and appropriateness consideration</h3>", "id": "3fc9be9f-8cd3-42b8-acc1-542bca210d48"},
{"type": "score", "value": {"field_label": "Rationale and appropriateness", "help_text": "", "required": ""}, "id": "0d1bf533-968c-44b9-bb30-d437ae039474"},
- {"type": "text_markup", "value": "<h3>E. General recommendation</h3>", "id": "976386e1-3a66-490f-9e82-bfbe1f134cf2"},
+ {"type": "text_markup", "value": "<h3>E. General recommendation</h3>", "id": "ef4a3bab-2293-4021-9e2c-57e1d78f6237"},
{"type": "recommendation", "value": {"field_label": "Recommendation", "help_text": "", "info": None}, "id": "4bf80578-1c8f-4515-9d6a-e52e87629e3e"},
{"type": "comments", "value": {"field_label": "Recommendation comments", "help_text": "", "info": None}, "id": "a814d7ac-8291-4f3e-b733-4a9a4f1f8a49"}
]
diff --git a/opentech/apply/funds/models/applications.py b/opentech/apply/funds/models/applications.py
index 8443eba7a44d33043279cec72aceaa68823b3327..d124036f471d785e28a8dd88f6bda14c4a9bb20a 100644
--- a/opentech/apply/funds/models/applications.py
+++ b/opentech/apply/funds/models/applications.py
@@ -9,19 +9,18 @@ from django.db.models import (
Count,
F,
FloatField,
- Func,
IntegerField,
OuterRef,
Q,
Subquery,
When,
)
-from django.db.models.functions import Coalesce, Length
+from django.db.models.functions import Coalesce, Length, Left
from django.shortcuts import render
from django.http import Http404
from django.utils.functional import cached_property
-from django.utils.text import mark_safe
+from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy as _
from modelcluster.fields import ParentalManyToManyField
@@ -522,26 +521,3 @@ class RoundsAndLabs(Page):
def save(self, *args, **kwargs):
raise NotImplementedError('Do not save through this model')
-
-
-# TODO remove in django 2.1 where this is fixed
-F.relabeled_clone = lambda self, relabels: self
-
-
-# TODO remove in django 2.1 where this is added
-class Left(Func):
- function = 'LEFT'
- arity = 2
-
- def __init__(self, expression, length, **extra):
- """
- expression: the name of a field, or an expression returning a string
- length: the number of characters to return from the start of the string
- """
- if not hasattr(length, 'resolve_expression'):
- if length < 1:
- raise ValueError("'length' must be greater than 0.")
- super().__init__(expression, length, **extra)
-
- def get_substr(self):
- return Substr(self.source_expressions[0], Value(1), self.source_expressions[1])
diff --git a/opentech/apply/funds/models/mixins.py b/opentech/apply/funds/models/mixins.py
index c1ab3b403d75430347dd6e95ac8de87340e4e11e..03c943107ea9354dad440de83d68a9b5ac8a96cb 100644
--- a/opentech/apply/funds/models/mixins.py
+++ b/opentech/apply/funds/models/mixins.py
@@ -1,4 +1,4 @@
-from django.utils.text import mark_safe
+from django.utils.safestring import mark_safe
from django.core.files import File
from opentech.apply.stream_forms.blocks import (
diff --git a/opentech/apply/funds/permissions.py b/opentech/apply/funds/permissions.py
index 594fb0fca9ce919c6af52d570e161bee94696f99..3a623b13adac2e9fe126ec88a3ef869aabb900dc 100644
--- a/opentech/apply/funds/permissions.py
+++ b/opentech/apply/funds/permissions.py
@@ -8,7 +8,7 @@ class IsAuthor(permissions.BasePermission):
class IsApplyStaffUser(permissions.BasePermission):
"""
- Custom permission to only allow OTF Staff or higher
+ Custom permission to only allow organisation Staff or higher
"""
def has_permission(self, request, view):
diff --git a/opentech/apply/funds/tables.py b/opentech/apply/funds/tables.py
index f4a5c8a1f9d1bf486b0441e3cbf4fe9c90fcb7a9..f5d5a4c1033fe9ae4ef8e7cf10ccb0cac3efcae1 100644
--- a/opentech/apply/funds/tables.py
+++ b/opentech/apply/funds/tables.py
@@ -5,8 +5,9 @@ from django import forms
from django.contrib.auth import get_user_model
from django.db.models import F, Q
from django.utils.html import format_html
-from django.utils.text import mark_safe, slugify
+from django.utils.text import slugify
from django.utils.translation import ugettext_lazy as _
+from django.utils.safestring import mark_safe
import django_filters as filters
import django_tables2 as tables
@@ -215,7 +216,7 @@ class StatusMultipleChoiceFilter(Select2MultipleChoiceFilter):
}
super().__init__(
*args,
- name='status',
+ field_name='status',
choices=choices,
label='Statuses',
**kwargs,
@@ -230,7 +231,7 @@ class StatusMultipleChoiceFilter(Select2MultipleChoiceFilter):
class SubmissionFilter(filters.FilterSet):
round = Select2ModelMultipleChoiceFilter(queryset=get_used_rounds, label='Rounds')
- fund = Select2ModelMultipleChoiceFilter(name='page', queryset=get_used_funds, label='Funds')
+ fund = Select2ModelMultipleChoiceFilter(field_name='page', queryset=get_used_funds, label='Funds')
lead = Select2ModelMultipleChoiceFilter(queryset=get_round_leads, label='Leads')
reviewers = Select2ModelMultipleChoiceFilter(queryset=get_reviewers, label='Reviewers')
screening_status = Select2ModelMultipleChoiceFilter(queryset=get_screening_statuses, label='Screening')
@@ -257,7 +258,7 @@ class SubmissionFilterAndSearch(SubmissionFilter):
class SubmissionDashboardFilter(filters.FilterSet):
round = Select2ModelMultipleChoiceFilter(queryset=get_used_rounds, label='Rounds')
- fund = Select2ModelMultipleChoiceFilter(name='page', queryset=get_used_funds, label='Funds')
+ fund = Select2ModelMultipleChoiceFilter(field_name='page', queryset=get_used_funds, label='Funds')
class Meta:
model = ApplicationSubmission
diff --git a/opentech/apply/funds/templates/funds/application_base.html b/opentech/apply/funds/templates/funds/application_base.html
index b81b5a17706a21707798175b9632bc44dd8f6461..0ac5533c96f78b7332c0d3a44a06a9b740237d3e 100644
--- a/opentech/apply/funds/templates/funds/application_base.html
+++ b/opentech/apply/funds/templates/funds/application_base.html
@@ -54,6 +54,7 @@
<script src="{% static 'js/apply/application-form.js' %}"></script>
<script src="{% static 'js/apply/mailgun-validator.js' %}"></script>
<script src="{% static 'js/apply/file-uploads.js' %}"></script>
+ <script src="{% static 'js/apply/tinymce-word-count.js' %}"></script>
{% if not show_all_group_fields %}
<script src="{% static 'js/apply/form-group-toggle.js' %}"></script>
{% endif %}
diff --git a/opentech/apply/funds/templates/funds/application_base_landing.html b/opentech/apply/funds/templates/funds/application_base_landing.html
index c2383f1e71c6f216fc0e4ca50c5017d287f00af8..3db6a4c84d3ef6f30f3e18c994c31e34dfeedbed 100644
--- a/opentech/apply/funds/templates/funds/application_base_landing.html
+++ b/opentech/apply/funds/templates/funds/application_base_landing.html
@@ -2,11 +2,11 @@
{% block header_modifier %}header--light-bg{% endblock %}
{% block content %}
<div class="wrapper wrapper--small">
- <h3>Thank you for your submission to the Open Technology Fund.</h3>
+ <h3>Thank you for your submission to the {{ ORG_LONG_NAME }}.</h3>
<div class="rich-text">
<p>An e-mail with more information has been sent to the address you entered.</p>
<p>If you do not receive an e-mail within 15 minutes please check your
-spam folder and contact help@opentech.fund for further assistance.</p>
+spam folder and contact {{ ORG_EMAIL }} for further assistance.</p>
</div>
</div>
{% endblock %}
diff --git a/opentech/apply/funds/templates/funds/demo_workflow.html b/opentech/apply/funds/templates/funds/demo_workflow.html
index f7b514e17b36e4f2fec14260959624d9969b66b0..830e4c7baf951193e4be757228151b0c955d53d1 100644
--- a/opentech/apply/funds/templates/funds/demo_workflow.html
+++ b/opentech/apply/funds/templates/funds/demo_workflow.html
@@ -25,7 +25,7 @@
<button id="submit" name="submit">Submit</button>
</form>
{% else %}
- <h4>OTF: {{ phase.name }}</h4>
+ <h4>{{ ORG_SHORT_NAME }}: {{ phase.name }}</h4>
<h4>Public: {{ phase.public_name }}</h4>
<form method="post">
{% csrf_token %}
diff --git a/opentech/apply/funds/templates/funds/email/confirmation.html b/opentech/apply/funds/templates/funds/email/confirmation.html
index 2defd74c2a01e371ab9ad59c83287075726a61cb..b13a56bc529f5ed4a9572a04460150adb0fea82d 100644
--- a/opentech/apply/funds/templates/funds/email/confirmation.html
+++ b/opentech/apply/funds/templates/funds/email/confirmation.html
@@ -1,6 +1,6 @@
{% extends "messages/email/base.html" %}
-{% block content %}{% with email_context=source.page.specific %}We appreciate your {{ email_context.title }} application submission to the Open Technology Fund. We will review and reply to your submission as quickly as possible.
+{% block content %}{% with email_context=source.page.specific %}We appreciate your {{ email_context.title }} application submission to the {{ ORG_LONG_NAME }}. We will review and reply to your submission as quickly as possible.
Our reply will have the next steps for your {{ email_context.title }} application. You can find more information about our support options, review process and selection criteria on our website.
diff --git a/opentech/apply/funds/templates/funds/includes/revision_diff_table.html b/opentech/apply/funds/templates/funds/includes/revision_diff_table.html
new file mode 100644
index 0000000000000000000000000000000000000000..8d24eb5478c00e6c03e707c71c5fcc506c9a6292
--- /dev/null
+++ b/opentech/apply/funds/templates/funds/includes/revision_diff_table.html
@@ -0,0 +1,24 @@
+<table class="revision-diff-table">
+<tr><td><h3>Proposal Information</h3></td><td><h3>Proposal Information</h3></td></tr>
+<tr><td><h5>Submitted</h5>{{ timestamps.0|date:"Y-m-d H:i e"}}</td><td><h5>Submitted</h5>{{ timestamps.1|date:"Y-m-d H:i e"}}</td></tr>
+{% for from_field, to_field in required_fields %}
+ {% if forloop.first %}
+ <tr><td><h4>Title</h4>{{ from_field }}</td><td><h4>Title</h4>{{ to_field }}</td></tr>
+ {% elif forloop.counter == 2 %}
+ <tr><td><h5>Requested Funding</h5>{{ from_field }}</td><td><h5>Requested Funding</h5>{{ to_field }}</td></tr>
+ {% elif forloop.counter == 3 %}
+ <tr><td><h5>Project Duration</h5>{{ from_field }}</td><td><h5>Project Duration</h5>{{ to_field }}</td></tr>
+ {% elif forloop.counter == 4 %}
+ <tr><td><h5>Legal Name</h5>{{ from_field }}</td><td><h5>Legal Name</h5>{{ to_field }}</td></tr>
+ {% elif forloop.counter == 5 %}
+ <tr><td><h5>Email</h5>{{ from_field }}</td><td><h5>Email</h5>{{ to_field }}</td></tr>
+ {% elif forloop.counter == 6 %}
+ <tr><td><h5>Address</h5>{{ from_field }}</td><td><h5>Address</h5>{{ to_field }}</td></tr>
+ {% else %}
+ <tr><td>{{ from_field }}</td><td>{{ to_field }}</td></tr>
+ {% endif %}
+{% endfor %}
+{% for from_field, to_field in stream_fields %}
+ <tr><td>{{ from_field }}</td><td>{{ to_field }}</td></tr>
+{% endfor %}
+</table>
diff --git a/opentech/apply/funds/templates/funds/revisions_compare.html b/opentech/apply/funds/templates/funds/revisions_compare.html
index 4ec01d9cd5e895ffc7608918457c056ca6de76e1..94ef863e65423ae5d1fb5b671fb9b2f6d0a0f8a6 100644
--- a/opentech/apply/funds/templates/funds/revisions_compare.html
+++ b/opentech/apply/funds/templates/funds/revisions_compare.html
@@ -10,10 +10,6 @@
</div>
<div class="wrapper wrapper--large wrapper--tabs">
- <div>
- <h2>{{ object.get_title_display }}</h2>
- </div>
-
- {% include "funds/includes/rendered_answers.html" %}
+ {% include "funds/includes/revision_diff_table.html" %}
</div>
{% endblock %}
diff --git a/opentech/apply/funds/templates/funds/submission_sealed.html b/opentech/apply/funds/templates/funds/submission_sealed.html
index 15976eb85070f40ec11f9d1a09f8100c41767216..e85a5752f93f829f146394a6fb9713ac9080e600 100644
--- a/opentech/apply/funds/templates/funds/submission_sealed.html
+++ b/opentech/apply/funds/templates/funds/submission_sealed.html
@@ -1,4 +1,5 @@
{% extends "base-apply.html" %}
+{% load statusbar_tags %}
{% block title %}Sealed: {{ object.title }}{% endblock %}
@@ -12,7 +13,7 @@
<span>{{ object.round }}</span>
<span>Lead: {{ object.lead }}</span>
</h5>
- {% include "funds/includes/status_bar.html" with phases=object.workflow current_phase=object.phase same_stage=True%}
+ {% status_bar object.workflow object.phase request.user same_stage=True %}
</div>
</div>
<div class="wrapper wrapper--medium">
diff --git a/opentech/apply/funds/tests/test_admin_views.py b/opentech/apply/funds/tests/test_admin_views.py
index 4cda56b836fd83f6fea85de7f3edc1d16ac93962..185a0e47bbbc7f50c850a5911535f0127b7fb520 100644
--- a/opentech/apply/funds/tests/test_admin_views.py
+++ b/opentech/apply/funds/tests/test_admin_views.py
@@ -68,7 +68,7 @@ class TestRoundIndexView(WagtailTestUtils, TestCase):
response = self.client.get('/admin/funds/round/', follow=True)
application_links = [
- f'<a href="/admin/funds/applicationform/edit/{app.id}/">{app}</a>'
+ f'<a href="/admin/funds/applicationform/edit/{app.form.id}/">{app}</a>'
for app in self.round.forms.all()
]
applications_cell = f'<td class="field-applications">{"".join(application_links)}</td>'
@@ -84,8 +84,8 @@ class TestRoundIndexView(WagtailTestUtils, TestCase):
response = self.client.get('/admin/funds/round/', follow=True)
review_form_links = [
- f'<a href="/admin/funds/round/edit/{review_form.id}/">{review_form}</a>'
- for review_form in self.round.review_forms.all()
+ f'<a href="/admin/review/reviewform/edit/{review.form.id}/">{review}</a>'
+ for review in self.round.review_forms.all()
]
review_form_cell = f'<td class="field-review_forms">{"".join(review_form_links)}</td>'
self.assertContains(response, review_form_cell, html=True)
diff --git a/opentech/apply/funds/views.py b/opentech/apply/funds/views.py
index ccd78aa218422a4bd84d610db976bb4a380ab40d..d118e93365c94c00f457d729b32e1f0f03fe003f 100644
--- a/opentech/apply/funds/views.py
+++ b/opentech/apply/funds/views.py
@@ -9,7 +9,7 @@ from django.http import HttpResponseRedirect, Http404
from django.shortcuts import get_object_or_404
from django.urls import reverse_lazy
from django.utils.decorators import method_decorator
-from django.utils.text import mark_safe
+from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy as _
from django.views.generic import CreateView, DetailView, FormView, ListView, UpdateView, DeleteView
@@ -856,21 +856,17 @@ class RevisionCompareView(DetailView):
to_rendered_text_fields = self.object.render_text_blocks_answers()
to_required = self.render_required()
- # Compare all the required fields
- diffed_required = [
+ required_fields = [
compare(*fields)
for fields in zip(from_required, to_required)
]
- for field, diff in zip(self.object.named_blocks, diffed_required):
- setattr(self.object, 'get_{}_display'.format(field), diff)
- # Compare all the answers
- diffed_text_fields_answers = [
+ stream_fields = [
compare(*fields)
for fields in zip(from_rendered_text_fields, to_rendered_text_fields)
]
- self.object.output_answers = mark_safe(''.join(diffed_text_fields_answers))
+ return (required_fields, stream_fields)
def render_required(self):
return [
@@ -881,8 +877,14 @@ class RevisionCompareView(DetailView):
def get_context_data(self, **kwargs):
from_revision = self.object.revisions.get(id=self.kwargs['from'])
to_revision = self.object.revisions.get(id=self.kwargs['to'])
- self.compare_revisions(from_revision, to_revision)
- return super().get_context_data(**kwargs)
+ required_fields, stream_fields = self.compare_revisions(from_revision, to_revision)
+ timestamps = (from_revision.timestamp, to_revision.timestamp)
+ return super().get_context_data(
+ timestamps=timestamps,
+ required_fields=required_fields,
+ stream_fields=stream_fields,
+ **kwargs,
+ )
@method_decorator(staff_required, name='dispatch')
diff --git a/opentech/apply/funds/workflow.py b/opentech/apply/funds/workflow.py
index 146c9168e179aff6481cd65bedc12cbb3b54d9c4..bb204567ccd1c8e0ffb32551a13996ef73dafd6f 100644
--- a/opentech/apply/funds/workflow.py
+++ b/opentech/apply/funds/workflow.py
@@ -2,6 +2,7 @@ from collections import defaultdict
from enum import Enum
import itertools
+from django.conf import settings
from django.utils.text import slugify
"""
@@ -229,7 +230,7 @@ SingleStageDefinition = [
INITIAL_STATE: 'Screening (back)',
},
'display': 'Internal Review',
- 'public': 'OTF Review',
+ 'public': f'{settings.ORG_SHORT_NAME} Review',
'stage': Request,
'permissions': default_permissions,
},
@@ -323,7 +324,7 @@ SingleStageExternalDefinition = [
INITIAL_STATE: 'Screening (back)',
},
'display': 'Internal Review',
- 'public': 'OTF Review',
+ 'public': f'{settings.ORG_SHORT_NAME} Review',
'stage': RequestExt,
'permissions': default_permissions,
},
@@ -465,7 +466,7 @@ SingleStageCommunityDefinition = [
'com_rejected': 'Dismiss',
},
'display': 'Internal Review',
- 'public': 'OTF Review',
+ 'public': f'{settings.ORG_SHORT_NAME} Review',
'stage': RequestCom,
'permissions': default_permissions,
},
@@ -476,7 +477,7 @@ SingleStageCommunityDefinition = [
'com_rejected': 'Dismiss',
},
'display': 'Community Review',
- 'public': 'OTF Review',
+ 'public': f'{settings.ORG_SHORT_NAME} Review',
'stage': RequestCom,
'permissions': community_review_permissions,
},
@@ -610,7 +611,7 @@ DoubleStageDefinition = [
'invited_to_proposal': 'Invite to Proposal',
},
'display': 'Internal Review',
- 'public': 'OTF Review',
+ 'public': f'{settings.ORG_SHORT_NAME} Review',
'stage': Concept,
'permissions': default_permissions,
},
@@ -724,7 +725,7 @@ DoubleStageDefinition = [
'proposal_discussion': 'Proposal Received (back)',
},
'display': 'Internal Review',
- 'public': 'OTF Review',
+ 'public': f'{settings.ORG_SHORT_NAME} Review',
'stage': Proposal,
'permissions': default_permissions,
},
diff --git a/opentech/apply/review/forms.py b/opentech/apply/review/forms.py
index 8cf02101bb616dfda5b29b0131bd99b7f57c314c..2207e08e833ac031f522170c0ac4e481f8f5f4e1 100644
--- a/opentech/apply/review/forms.py
+++ b/opentech/apply/review/forms.py
@@ -96,7 +96,7 @@ class ReviewModelForm(StreamBaseForm, forms.ModelForm, metaclass=MixedMetaClass)
class SubmitButtonWidget(forms.Widget):
- def render(self, name, value, attrs=None):
+ def render(self, name, value, attrs=None, renderer=None):
disabled = 'disabled' if attrs.get('disabled') else ''
return '<input type="submit" name="{name}" value="{value}" class="button button--primary button--bottom-space" {disabled}>'.format(
disabled=disabled,
diff --git a/opentech/apply/review/management/commands/fix_stream_field_ids.py b/opentech/apply/review/management/commands/fix_stream_field_ids.py
new file mode 100644
index 0000000000000000000000000000000000000000..14d35aca0d6af95c585af365b537f1a9d17a70e0
--- /dev/null
+++ b/opentech/apply/review/management/commands/fix_stream_field_ids.py
@@ -0,0 +1,29 @@
+import json
+import uuid
+
+from django.core.management.base import BaseCommand
+from django.db import connection, transaction
+
+
+class Command(BaseCommand):
+ help = "Fix stream fields so all have unique IDs."
+
+ @transaction.atomic
+ def handle(self, *args, **options):
+ with connection.cursor() as cursor:
+ cursor.execute('SELECT id, form_fields FROM review_reviewform')
+ form_fields = cursor.fetchall()
+
+ for row in form_fields:
+ review_id, review_form = row
+ form = json.loads(review_form)
+ updated = False
+ for field in form:
+ if field['id'] == '976386e1-3a66-490f-9e82-bfbe1f134cf2':
+ field['id'] = str(uuid.uuid4())
+ updated = True
+
+ if updated:
+ updated_form = json.dumps(form)
+ with connection.cursor() as cursor:
+ cursor.execute('UPDATE review_reviewform SET form_fields = %s WHERE id = %s', [updated_form, review_id])
diff --git a/opentech/apply/stream_forms/fields.py b/opentech/apply/stream_forms/fields.py
index c7a8deed5921ec957558420f721f73f737fdcbef..e8ab53369377896a620a032005c6e95778121db8 100644
--- a/opentech/apply/stream_forms/fields.py
+++ b/opentech/apply/stream_forms/fields.py
@@ -30,11 +30,11 @@ class MultiFileInput(ClearableFileInput):
except TypeError:
return is_initial(value)
- def render(self, name, value, attrs=dict()):
+ def render(self, name, value, attrs=dict(), renderer=None):
if self.multiple:
attrs['multiple'] = 'multiple'
- return super().render(name, value, attrs)
+ return super().render(name, value, attrs, renderer)
def value_from_datadict(self, data, files, name):
if hasattr(files, 'getlist'):
diff --git a/opentech/apply/users/admin_views.py b/opentech/apply/users/admin_views.py
index b5a82dd75253da3efe067baf1649b2802779258c..77826bdc62433d79f53fc290415d83378e446f1f 100644
--- a/opentech/apply/users/admin_views.py
+++ b/opentech/apply/users/admin_views.py
@@ -1,13 +1,13 @@
from django.contrib.auth import get_user_model
+from django.core.paginator import Paginator
from django.db.models import Q
from django.shortcuts import render
from django.utils.translation import ugettext as _
from django.views.decorators.vary import vary_on_headers
-from wagtail.admin.forms import SearchForm
+from wagtail.admin.forms.search import SearchForm
from wagtail.admin.utils import any_permission_required
from wagtail.core.compat import AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME
-from wagtail.utils.pagination import paginate
User = get_user_model()
@@ -73,7 +73,8 @@ def index(request):
else:
ordering = 'name'
- paginator, users = paginate(request, users)
+ paginator = Paginator(users, per_page=20)
+ users = paginator.get_page(request.GET.get('p'))
if request.is_ajax():
return render(request, "wagtailusers/users/results.html", {
diff --git a/opentech/apply/users/templates/users/activation/email.txt b/opentech/apply/users/templates/users/activation/email.txt
index bccf84230f97f802b63127d638f035204cc3531d..b9df34df79e8fb28cc314ea34021da58d59cb096 100644
--- a/opentech/apply/users/templates/users/activation/email.txt
+++ b/opentech/apply/users/templates/users/activation/email.txt
@@ -2,7 +2,7 @@
{% base_url_setting as base_url %}
Dear {{ name|default:username }},
-An account on the Open Technology Fund web site has been created. Activate your account by clicking this link or copying and pasting it to your browser:
+An account on the {{ ORG_LONG_NAME }} web site has been created. Activate your account by clicking this link or copying and pasting it to your browser:
{% if site %}{{ site.root_url }}{% else %}{{ base_url }}{% endif %}{{ activation_path }}
@@ -16,8 +16,8 @@ password: Your chosen password
If you do not complete the activation process within {{ timeout_days }} days you can use the password reset form at: {% if site %}{{ site.root_url }}{% else %}{{ base_url }}{% endif %}{% url 'users:password_reset' %}
Thanks,
-The OTF Team
+The {{ ORG_SHORT_NAME }} Team
--
-Open Technology Fund
-https://www.opentech.fund/
+{{ ORG_LONG_NAME }}
+{{ PUBLIC_SITE.root_url }}
diff --git a/opentech/apply/users/templates/users/activation/invalid.html b/opentech/apply/users/templates/users/activation/invalid.html
index 1d3deb8269418687034096aefe9679dd364b627f..edb6bdf53d547a2f0a2f4c7d0a7890a6c8c401cf 100644
--- a/opentech/apply/users/templates/users/activation/invalid.html
+++ b/opentech/apply/users/templates/users/activation/invalid.html
@@ -12,6 +12,6 @@
<li>The account has already been activated.</li>
</ul>
- <p>First test to <a href="{% url 'users:password_reset' %}">reset your password</a>. If that fails please contact OTF at <a href="mailto:hello@opentech.fund">hello@opentech.fund</a></p>
+ <p>First test to <a href="{% url 'users:password_reset' %}">reset your password</a>. If that fails please contact {{ ORG_SHORT_NAME }} at <a href="mailto:{{ ORG_EMAIL }}">{{ ORG_EMAIL }}</a></p>
</div>
{% endblock %}
diff --git a/opentech/apply/users/templates/users/login.html b/opentech/apply/users/templates/users/login.html
index 201f54e6dbd69dacdac9a097b83ea3308d3a91d5..6963ee5deb3d0289b750a9545cfd8495617f4d56 100644
--- a/opentech/apply/users/templates/users/login.html
+++ b/opentech/apply/users/templates/users/login.html
@@ -66,7 +66,7 @@
{% if wizard.steps.current == 'auth' %}
<div class="wrapper wrapper--inner-space-large">
- <a class="link link--button link--button-long-text" href="{% url "social:begin" "google-oauth2" %}{% if next %}?next={{ next }}{% endif %}">Log in with your OTF email</a>
+ <a class="link link--button link--button-long-text" href="{% url "social:begin" "google-oauth2" %}{% if next %}?next={{ next }}{% endif %}">Log in with your {{ ORG_SHORT_NAME }} email</a>
</div>
{% endif %}
</div>
diff --git a/opentech/apply/users/utils.py b/opentech/apply/users/utils.py
index 74142ec7131ce70e93f66c2310e65259d3e43d7e..d556002730df36283b386533a3c2f37ee1d02ec6 100644
--- a/opentech/apply/users/utils.py
+++ b/opentech/apply/users/utils.py
@@ -29,7 +29,7 @@ def send_activation_email(user, site=None):
token_generator = PasswordResetTokenGenerator()
token = token_generator.make_token(user)
- uid = urlsafe_base64_encode(force_bytes(user.pk)).decode()
+ uid = urlsafe_base64_encode(force_bytes(user.pk))
activation_path = reverse('users:activate', kwargs={'uidb64': uid, 'token': token})
@@ -39,12 +39,13 @@ def send_activation_email(user, site=None):
'username': user.get_username(),
'activation_path': activation_path,
'timeout_days': settings.PASSWORD_RESET_TIMEOUT_DAYS,
+ 'org_long_name': settings.ORG_LONG_NAME,
}
if site:
context.update(site=site)
- subject = 'Account details for {username} at Open Technology Fund'.format(**context)
+ subject = 'Account details for {username} at {org_long_name}'.format(**context)
# Force subject to a single line to avoid header-injection issues.
subject = ''.join(subject.splitlines())
message = render_to_string('users/activation/email.txt', context)
diff --git a/opentech/apply/users/views.py b/opentech/apply/users/views.py
index fdc63e60a2fd6867f82035fdb638ee08833d87d9..88014382878eb3960ab935f250aa7ad7cff18855 100644
--- a/opentech/apply/users/views.py
+++ b/opentech/apply/users/views.py
@@ -65,6 +65,12 @@ class LoginView(SuccessURLAllowedHostsMixin, TwoFactorLoginView):
)
return redirect_to if url_is_safe else ''
+ def get_context_data(self, **kwargs):
+ return super().get_context_data(
+ next=self.request.GET.get('next', ''),
+ **kwargs,
+ )
+
@method_decorator(login_required, name='dispatch')
class AccountView(UpdateView):
diff --git a/opentech/apply/users/wagtail_hooks.py b/opentech/apply/users/wagtail_hooks.py
index dcd5276f5f356dea951f5dfba794fb96dda19954..19355eb0e2e4a854fd46168cbf24aecb701d4e62 100644
--- a/opentech/apply/users/wagtail_hooks.py
+++ b/opentech/apply/users/wagtail_hooks.py
@@ -26,6 +26,8 @@ def notify_after_create_user(request, user):
@hooks.register('after_edit_user')
def notify_after_edit_user(request, user):
roles = list(user.groups.values_list('name', flat=True))
+ if user.is_superuser:
+ roles.append('Administrator')
if roles:
roles = ', '.join(roles)
slack_notify(
diff --git a/opentech/apply/utils/blocks.py b/opentech/apply/utils/blocks.py
index a4f9efb4d179d27568c7467342c24eb7d0b43025..a74ae24cf2ec0c83aafbee4d3221837a0af83173 100644
--- a/opentech/apply/utils/blocks.py
+++ b/opentech/apply/utils/blocks.py
@@ -6,7 +6,7 @@ import bleach
from django.core.exceptions import ValidationError
from django.forms.utils import ErrorList
from django.utils.translation import ugettext_lazy as _
-from django.utils.text import mark_safe
+from django.utils.safestring import mark_safe
from wagtail.core.blocks import StaticBlock, StreamValue, StreamBlock
diff --git a/opentech/apply/utils/options.py b/opentech/apply/utils/options.py
index 325c3e9c35650198003190fdca7294c0fcec8470..4fe1ce2125d9ed41f89743de9f79019bcc0aa3be 100644
--- a/opentech/apply/utils/options.py
+++ b/opentech/apply/utils/options.py
@@ -4,7 +4,7 @@ MCE_ATTRIBUTES = {
'elementpath': False,
'branding': False,
'entity_encoding': 'raw',
- 'plugins': 'link image preview codesample table code lists',
+ 'plugins': 'link image preview codesample table code lists wordcount',
'toolbar1': 'undo redo | styleselect | bold italic | bullist numlist | table | link',
'style_formats': [
{'title': 'Headers', 'items': [
diff --git a/opentech/public/funds/templates/public_funds/lab_page.html b/opentech/public/funds/templates/public_funds/lab_page.html
index cc0c3c7c9d2b7e057ae4a489e34b10541b2de56a..051bffd335edfd414e99de410435cdc7a57e4255 100644
--- a/opentech/public/funds/templates/public_funds/lab_page.html
+++ b/opentech/public/funds/templates/public_funds/lab_page.html
@@ -15,5 +15,5 @@
</section>
</div>
{% include "public_funds/includes/lab_apply_cta.html" %}
- {% include "includes/relatedcontent.html" with related_pages=rfps title="Related Requests"%}
+ {% include "includes/relatedcontent.html" with related_pages=rfps %}
{% endblock %}
diff --git a/opentech/public/mailchimp/tests.py b/opentech/public/mailchimp/tests.py
index 5dd089387611991a1f8642eb17883523614e799f..251f1bc5a61a0042cff2d9c2fc8553be4405eb6d 100644
--- a/opentech/public/mailchimp/tests.py
+++ b/opentech/public/mailchimp/tests.py
@@ -76,4 +76,5 @@ class TestNewsletterView(TestCase):
messages = list(response.context['messages'])
self.assertEqual(len(messages), 1)
self.assertIn('problem', str(messages[0]))
- logger.error.assert_called_once_with(response_data)
+ # See opentech/public/mailchimp/views.py warning()
+ # logger.error.assert_called_once_with(response_data)
diff --git a/opentech/public/mailchimp/views.py b/opentech/public/mailchimp/views.py
index 0c1bdf80585333d81864c7e9ae10b4a5f28f7678..84b4b2abd7bc6272125e3f421bac3ff5299676b5 100644
--- a/opentech/public/mailchimp/views.py
+++ b/opentech/public/mailchimp/views.py
@@ -72,7 +72,9 @@ class MailchimpSubscribeView(FormMixin, RedirectView):
def warning(self, e):
messages.warning(self.request, _('Sorry, there has been an problem. Please try again later.'))
- logger.error(e.args[0])
+ # If there is a problem with subscribing uncomment this to get notifications.
+ # When things work warnings is only about spam scipts.
+ # logger.error(e.args[0])
def success(self):
messages.success(self.request, _('Thank you for subscribing'))
diff --git a/opentech/public/projects/widgets.py b/opentech/public/projects/widgets.py
index 8b0b2c2b17fb83cbce281da77f8530bcae68f39e..14c434fd29e59f91d158f4659025c04387481d81 100644
--- a/opentech/public/projects/widgets.py
+++ b/opentech/public/projects/widgets.py
@@ -58,9 +58,3 @@ class CategoriesWidget(forms.MultiWidget):
for i, widget in enumerate(self.widgets)
}
return json.dumps(data)
-
- def get_context(self, *args, **kwargs):
- context = super().get_context(*args, **kwargs)
- # Mutliwidget kills the wrap_label option when it is building the context
- context['wrap_label'] = True
- return context
diff --git a/opentech/public/utils/context_processors.py b/opentech/public/utils/context_processors.py
index 149a40181ae1a97390338f32baa92c4c174ed096..3986dc1e684e0d4fc6e04f5be36c938c32fa4788 100644
--- a/opentech/public/utils/context_processors.py
+++ b/opentech/public/utils/context_processors.py
@@ -1,6 +1,7 @@
+from django.conf import settings
+
from opentech.apply.home.models import ApplyHomePage
from opentech.public.home.models import HomePage
-
from opentech.public.mailchimp.forms import NewsletterForm
@@ -8,5 +9,8 @@ def global_vars(request):
return {
'APPLY_SITE': ApplyHomePage.objects.first().get_site(),
'PUBLIC_SITE': HomePage.objects.first().get_site(),
- 'newsletter_form': NewsletterForm()
+ 'newsletter_form': NewsletterForm(),
+ 'ORG_LONG_NAME': settings.ORG_LONG_NAME,
+ 'ORG_SHORT_NAME': settings.ORG_SHORT_NAME,
+ 'ORG_EMAIL': settings.ORG_EMAIL,
}
diff --git a/opentech/public/utils/migrations/0002_add_footer_content_setting.py b/opentech/public/utils/migrations/0002_add_footer_content_setting.py
new file mode 100644
index 0000000000000000000000000000000000000000..44cbb67feac6645fee29713e731cd1357ed04ad4
--- /dev/null
+++ b/opentech/public/utils/migrations/0002_add_footer_content_setting.py
@@ -0,0 +1,22 @@
+# Generated by Django 2.0.13 on 2019-09-12 12:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('utils', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='systemmessagessettings',
+ options={'verbose_name': 'system settings'},
+ ),
+ migrations.AddField(
+ model_name='systemmessagessettings',
+ name='footer_content',
+ field=models.TextField(default='<p>Configure this text in Wagtail admin -> Settings -> System settings.</p>', help_text='This will be added to the footer, html tags is allowed.', verbose_name='Footer content'),
+ ),
+ ]
diff --git a/opentech/public/utils/models.py b/opentech/public/utils/models.py
index f78f7017c8e9e939a3aa8cb33acd31f7d1e05b14..2d8055aa28dc462541e2ea9365b05283decccfcb 100644
--- a/opentech/public/utils/models.py
+++ b/opentech/public/utils/models.py
@@ -226,7 +226,13 @@ class SocialMediaSettings(BaseSetting):
@register_setting
class SystemMessagesSettings(BaseSetting):
class Meta:
- verbose_name = 'system messages'
+ verbose_name = 'system settings'
+
+ footer_content = models.TextField(
+ "Footer content",
+ default='<p>Configure this text in Wagtail admin -> Settings -> System settings.</p>',
+ help_text='This will be added to the footer, html tags is allowed.',
+ )
title_404 = models.CharField(
"Title",
@@ -239,6 +245,7 @@ class SystemMessagesSettings(BaseSetting):
)
panels = [
+ FieldPanel('footer_content'),
MultiFieldPanel([
FieldPanel('title_404'),
FieldPanel('body_404'),
diff --git a/opentech/public/utils/templates/utils/includes/login_button.html b/opentech/public/utils/templates/utils/includes/login_button.html
index 5fa94e6c25f348c816ba0e020a4834b157937cab..2b839351235b1a979d2044be54deda3a5a8360b7 100644
--- a/opentech/public/utils/templates/utils/includes/login_button.html
+++ b/opentech/public/utils/templates/utils/includes/login_button.html
@@ -1,4 +1,4 @@
<a href="{{ APPLY_SITE.root_url }}{% url 'users_public:login' %}" class="button button--transparent button--contains-icons {{ class }}">
<svg class="icon icon--person"><use xlink:href="#person-icon"></use></svg>
- My OTF
+ My {{ ORG_SHORT_NAME }}
</a>
diff --git a/opentech/settings/base.py b/opentech/settings/base.py
index 42817308ab5c7b38b77b5d21b0a60d38200a3d40..95637252a885211a5508b7b8832bb20762c5af1c 100644
--- a/opentech/settings/base.py
+++ b/opentech/settings/base.py
@@ -23,6 +23,14 @@ if 'ALLOWED_HOSTS' in env:
ALLOWED_HOSTS = env['ALLOWED_HOSTS'].split(',')
+# Organisation name and e-mail address, used in e-mail templates etc.
+
+ORG_LONG_NAME = env.get('ORG_LONG_NAME', 'Acme Corporation')
+ORG_SHORT_NAME = env.get('ORG_SHORT_NAME', 'ACME')
+ORG_EMAIL = env.get('ORG_EMAIL', 'info@example.org')
+ORG_GUIDE_URL = env.get('ORG_GUIDE_URL', 'https://guide.example.org/')
+
+
# Email settings
if 'EMAIL_HOST' in env:
EMAIL_HOST = env['EMAIL_HOST']
@@ -401,15 +409,14 @@ WAGTAILIMAGES_FEATURE_DETECTION_ENABLED = False
WAGTAILADMIN_RICH_TEXT_EDITORS = {
'default': {
'WIDGET': 'wagtail.admin.rich_text.DraftailRichTextArea',
- # fixed in wagtail 2.0.1: https://github.com/wagtail/wagtail/commit/09f8a4f38a95f2760f38ab2f142443df93b5d8c6
- # 'OPTIONS': {
- # 'features': [
- # 'bold', 'italic',
- # 'h3', 'h4', 'h5',
- # 'ol', 'ul',
- # 'link'
- # ]
- # }
+ 'OPTIONS': {
+ 'features': [
+ 'bold', 'italic',
+ 'h2', 'h3', 'h4', 'h5',
+ 'ol', 'ul',
+ 'link'
+ ]
+ }
},
}
diff --git a/opentech/static_src/src/app/src/api/notes.js b/opentech/static_src/src/app/src/api/notes.js
index 9e41fd1b44691a250462f6ddb4b37f542d80d829..7dd077494a5c963a905e0663fe5dae565215d041 100644
--- a/opentech/static_src/src/app/src/api/notes.js
+++ b/opentech/static_src/src/app/src/api/notes.js
@@ -1,4 +1,4 @@
-export function fetchNotesForSubmission(submissionID, visibility = 'internal') {
+export function fetchNotesForSubmission(submissionID, visibility = 'team') {
return {
path: `/apply/api/submissions/${submissionID}/comments/`,
params: {
@@ -9,7 +9,7 @@ export function fetchNotesForSubmission(submissionID, visibility = 'internal') {
}
-export function fetchNewNotesForSubmission(submissionID, latestID, visibility = 'internal') {
+export function fetchNewNotesForSubmission(submissionID, latestID, visibility = 'team') {
return {
path: `/apply/api/submissions/${submissionID}/comments/`,
params: {
diff --git a/opentech/static_src/src/app/src/containers/AddNoteForm.js b/opentech/static_src/src/app/src/containers/AddNoteForm.js
index 45fb64304fd630e32dd014ed10aa0eeb60f2b0ee..fc63beadcdba891317d8e59eb8978e29f3c59069 100644
--- a/opentech/static_src/src/app/src/containers/AddNoteForm.js
+++ b/opentech/static_src/src/app/src/containers/AddNoteForm.js
@@ -28,7 +28,7 @@ const AddNoteForm = ({error, isCreating, draftNote, submitNote, storeNote, clear
const onSubmit = (message, resetEditor) => {
submitNote(submissionID, {
message,
- visibility: 'internal',
+ visibility: 'team',
}).then(() => resetEditor());
}
diff --git a/opentech/static_src/src/app/src/containers/StatusActions.js b/opentech/static_src/src/app/src/containers/StatusActions.js
index 61d19f6cdac1bf7514caa2bb86222fb76c6df63f..1f8de8db3e817313206abf4deb4be0552b509320 100644
--- a/opentech/static_src/src/app/src/containers/StatusActions.js
+++ b/opentech/static_src/src/app/src/containers/StatusActions.js
@@ -24,6 +24,7 @@ class StatusActions extends React.Component {
value: PropTypes.string.isRequired,
})),
isExecutingAction: PropTypes.bool,
+ executionActionError: PropTypes.string,
}),
changeStatus: PropTypes.func.isRequired,
addMessage: PropTypes.func.isRequired,
diff --git a/opentech/static_src/src/javascript/apply/tinymce-word-count.js b/opentech/static_src/src/javascript/apply/tinymce-word-count.js
new file mode 100644
index 0000000000000000000000000000000000000000..44c727f00564a9f28f17155817e3410ab7b83ad7
--- /dev/null
+++ b/opentech/static_src/src/javascript/apply/tinymce-word-count.js
@@ -0,0 +1,41 @@
+(function ($) {
+
+ 'use strict';
+
+ var word_count_interval;
+
+ const observer_options = {
+ childList: true
+ };
+
+ const observer = new MutationObserver(function (mutations) {
+ mutations.forEach((mutation) => {
+ const word_count = mutation.target.innerText.match(/\d+/)[0];
+ const word_count_node = document.querySelector('#' + mutation.target.id);
+ if (word_count <= 800) {
+ word_count_node.classList.remove('word-count-warning');
+ word_count_node.classList.remove('word-count-warning-2');
+ }
+ else if (word_count > 800 && word_count <= 1000) {
+ word_count_node.classList.remove('word-count-warning-2');
+ word_count_node.classList.add('word-count-warning');
+ }
+ else if (word_count > 1000) {
+ word_count_node.classList.add('word-count-warning-2');
+ }
+ });
+ });
+
+ function word_count_alert() {
+ const word_counts = document.querySelectorAll('.mce-wordcount');
+ if (word_counts.length > 0) {
+ clearInterval(word_count_interval);
+ }
+ word_counts.forEach((el) => {
+ observer.observe(el, observer_options);
+ });
+ }
+
+ word_count_interval = setInterval(word_count_alert, 300);
+
+})(jQuery);
diff --git a/opentech/static_src/src/sass/apply/components/_revisions.scss b/opentech/static_src/src/sass/apply/components/_revisions.scss
index ece83b5c7e1b6afbba52176b5ffd7c9aaa92ebeb..43820fa267c3ef113b901701842770cddf11fc50 100644
--- a/opentech/static_src/src/sass/apply/components/_revisions.scss
+++ b/opentech/static_src/src/sass/apply/components/_revisions.scss
@@ -1,6 +1,10 @@
-.diff {
- display: inline-block;
+.revision-diff-table {
+ td {
+ vertical-align: top;
+ }
+}
+.diff {
&__deleted {
background-color: $color--light-pink;
diff --git a/opentech/static_src/src/sass/apply/components/_rich-text.scss b/opentech/static_src/src/sass/apply/components/_rich-text.scss
index 146e94ccae30c468efb74991a052ea649090404f..256965df61c030bd864de3f4d120b78ae97e2624 100644
--- a/opentech/static_src/src/sass/apply/components/_rich-text.scss
+++ b/opentech/static_src/src/sass/apply/components/_rich-text.scss
@@ -52,3 +52,30 @@
list-style: inside decimal;
}
}
+
+.mce-widget {
+ &.mce-wordcount {
+ padding-left: 10px;
+ padding-right: 10px;
+ }
+
+ &.word-count-warning,
+ &.word-count-warning-2 {
+ background-color: $color--pastel-red;
+ font-weight: bold;
+ text-shadow: none;
+ color: $color--black;
+
+ &::before {
+ content: 'Close to the limit (1000): ';
+ }
+ }
+
+ &.word-count-warning-2 {
+ background-color: $color--tomato;
+
+ &::before {
+ content: 'Over the limit (1000): ';
+ }
+ }
+}
diff --git a/opentech/static_src/src/sass/public/components/_rich-text.scss b/opentech/static_src/src/sass/public/components/_rich-text.scss
index 0aee52ba6252392311974b6648682583c3d1c07d..e347529cc6ab97c904a326172a3b4ad183d33382 100644
--- a/opentech/static_src/src/sass/public/components/_rich-text.scss
+++ b/opentech/static_src/src/sass/public/components/_rich-text.scss
@@ -51,3 +51,30 @@
}
}
}
+
+.mce-widget {
+ &.mce-wordcount {
+ padding-left: 10px;
+ padding-right: 10px;
+ }
+
+ &.word-count-warning,
+ &.word-count-warning-2 {
+ background-color: $color--pastel-red;
+ font-weight: bold;
+ text-shadow: none;
+ color: $color--black;
+
+ &::before {
+ content: 'Close to the limit (1000): ';
+ }
+ }
+
+ &.word-count-warning-2 {
+ background-color: $color--tomato;
+
+ &::before {
+ content: 'Over the limit (1000): ';
+ }
+ }
+}
diff --git a/opentech/templates/base.html b/opentech/templates/base.html
index d1530d4d9cb0002e05c52a50203c958bc31c8b9f..f1b26476388574c9c8782bf3e5f7ac9c93ea9660 100644
--- a/opentech/templates/base.html
+++ b/opentech/templates/base.html
@@ -168,35 +168,11 @@
{% if settings.utils.SocialMediaSettings.twitter_handle %}
<a href="https://twitter.com/{{ settings.utils.SocialMediaSettings.twitter_handle }}">
<svg class="icon icon--footer-social"><use xlink:href="#twitter"></use></svg>
- <h4 class="heading heading--no-margin">@OpenTechFund</h4>
+ <h4 class="heading heading--no-margin">@{{ settings.utils.SocialMediaSettings.twitter_handle }}</h4>
</a>
{% endif %}
</div>
-
- <p>2025 M Street NW, Suite 300</br>
- Washington, DC 20036 USA</p>
-
- <p>
- <a href="mailto:hello@opentech.fund">hello@opentech.fund</a></br>
- <a href="mailto:press@opentech.fund">press@opentech.fund</a></br>
- <span>PGP: <a href="https://keybase.io/opentechfund/pgp_keys.asc?fingerprint=67acddcfb909468536ddbc03f7663861965a90d2">67AC DDCF B909 4685 36DD BC03 F766 3861 965A 90D2</a></span>
- </p>
-
- <p><a class="link link--underlined" href="/about/tos/">Terms of Use</a></p>
-
- <p>Test the OTF website for censorship</p>
-
- <a class="button button--transparent--wide" href="https://run.ooni.io/nettest?tn=web_connectivity&ta=%7B%22urls%22%3A%5B%22https%3A%2F%2Fwww.opentech.fund%2F%22%5D%7D&mv=1.2.0">Run OONI!</a>
-
- <div class="footer__credits">
- <a href="https://www.usagm.gov/" aria-label="Link to the U.S. Agency for Global Media website">
- <img src="{% static 'images/usagm.png' %}" width="201" height="61" alt="Logo for the U.S. Agency for Global Media">
- </a>
-
- <a href="https://www.rfa.org/english/" aria-label="Link to the Radio Free Asia website">
- <img src="{% static 'images/radio-free-asia-logo.svg' %}" width="144" height="61" alt="Logo for Radio Free Asia">
- </a>
- </div>
+ {{ settings.utils.SystemMessagesSettings.footer_content|safe }}
</div>
</div>
diff --git a/opentech/templates/django/forms/widgets/input_option.html b/opentech/templates/django/forms/widgets/input_option.html
index 410018a5e4e61e55ca3dc062a9aaeaf5cd66dbee..bc4b421a36710f3368b5ac1fdeb09b7188010c7d 100644
--- a/opentech/templates/django/forms/widgets/input_option.html
+++ b/opentech/templates/django/forms/widgets/input_option.html
@@ -1,4 +1,4 @@
{% include "django/forms/widgets/input.html" %}
-{% if wrap_label %}
- <label class="form__label" {% if widget.attrs.id %} for="{{ widget.attrs.id }}"{% endif %}>{% endif %}{% if wrap_label %} {{ widget.label }}</label>
+{% if widget.wrap_label %}
+ <label class="form__label" {% if widget.attrs.id %} for="{{ widget.attrs.id }}"{% endif %}>{% endif %}{% if widget.wrap_label %} {{ widget.label }}</label>
{% endif %}
diff --git a/opentech/templates/includes/relatedcontent.html b/opentech/templates/includes/relatedcontent.html
index 3e57941488965acfc317039713c3d6e72e0a8db7..47cae7cd32df13838eccf86861f6e840f5337030 100644
--- a/opentech/templates/includes/relatedcontent.html
+++ b/opentech/templates/includes/relatedcontent.html
@@ -3,7 +3,7 @@
{% if related_documents or related_pages %}
<div class="wrapper wrapper--breakout wrapper--dark-bg wrapper--inner-space-xl">
<div class="wrapper wrapper--medium">
- <h2>{{ title|default:"You might also like..."}}</h2>
+ <h2>{{ title|default:"You might also like…"}}</h2>
<section class="grid grid--max-three">
{% for related_document in related_documents %}
{% with document=related_document.document %}
diff --git a/package-lock.json b/package-lock.json
index b5d30e9fdda8d0990d5f4de369b47471d32b402c..45f8631db445f435dc144f01f5d4de13ab663a47 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,42 +5,42 @@
"requires": true,
"dependencies": {
"@babel/code-frame": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
- "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
+ "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
"requires": {
"@babel/highlight": "^7.0.0"
}
},
"@babel/core": {
- "version": "7.4.5",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.4.5.tgz",
- "integrity": "sha512-OvjIh6aqXtlsA8ujtGKfC7LYWksYSX8yQcM8Ay3LuvVeQ63lcOKgoZWVqcpFwkd29aYU9rVx7jxhfhiEDV9MZA==",
- "requires": {
- "@babel/code-frame": "^7.0.0",
- "@babel/generator": "^7.4.4",
- "@babel/helpers": "^7.4.4",
- "@babel/parser": "^7.4.5",
- "@babel/template": "^7.4.4",
- "@babel/traverse": "^7.4.5",
- "@babel/types": "^7.4.4",
+ "version": "7.6.0",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.6.0.tgz",
+ "integrity": "sha512-FuRhDRtsd6IptKpHXAa+4WPZYY2ZzgowkbLBecEDDSje1X/apG7jQM33or3NdOmjXBKWGOg4JmSiRfUfuTtHXw==",
+ "requires": {
+ "@babel/code-frame": "^7.5.5",
+ "@babel/generator": "^7.6.0",
+ "@babel/helpers": "^7.6.0",
+ "@babel/parser": "^7.6.0",
+ "@babel/template": "^7.6.0",
+ "@babel/traverse": "^7.6.0",
+ "@babel/types": "^7.6.0",
"convert-source-map": "^1.1.0",
"debug": "^4.1.0",
"json5": "^2.1.0",
- "lodash": "^4.17.11",
+ "lodash": "^4.17.13",
"resolve": "^1.3.2",
"semver": "^5.4.1",
"source-map": "^0.5.0"
}
},
"@babel/generator": {
- "version": "7.4.4",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.4.tgz",
- "integrity": "sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==",
+ "version": "7.6.0",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.6.0.tgz",
+ "integrity": "sha512-Ms8Mo7YBdMMn1BYuNtKuP/z0TgEIhbcyB8HVR6PPNYp4P61lMsABiS4A3VG1qznjXVCf3r+fVHhm4efTYVsySA==",
"requires": {
- "@babel/types": "^7.4.4",
+ "@babel/types": "^7.6.0",
"jsesc": "^2.5.1",
- "lodash": "^4.17.11",
+ "lodash": "^4.17.13",
"source-map": "^0.5.0",
"trim-right": "^1.0.1"
}
@@ -82,27 +82,27 @@
}
},
"@babel/helper-create-class-features-plugin": {
- "version": "7.4.4",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.4.4.tgz",
- "integrity": "sha512-UbBHIa2qeAGgyiNR9RszVF7bUHEdgS4JAUNT8SiqrAN6YJVxlOxeLr5pBzb5kan302dejJ9nla4RyKcR1XT6XA==",
+ "version": "7.6.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.6.0.tgz",
+ "integrity": "sha512-O1QWBko4fzGju6VoVvrZg0RROCVifcLxiApnGP3OWfWzvxRZFCoBD81K5ur5e3bVY2Vf/5rIJm8cqPKn8HUJng==",
"dev": true,
"requires": {
"@babel/helper-function-name": "^7.1.0",
- "@babel/helper-member-expression-to-functions": "^7.0.0",
+ "@babel/helper-member-expression-to-functions": "^7.5.5",
"@babel/helper-optimise-call-expression": "^7.0.0",
"@babel/helper-plugin-utils": "^7.0.0",
- "@babel/helper-replace-supers": "^7.4.4",
+ "@babel/helper-replace-supers": "^7.5.5",
"@babel/helper-split-export-declaration": "^7.4.4"
}
},
"@babel/helper-define-map": {
- "version": "7.4.4",
- "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.4.4.tgz",
- "integrity": "sha512-IX3Ln8gLhZpSuqHJSnTNBWGDE9kdkTEWl21A/K7PQ00tseBwbqCHTvNLHSBd9M0R5rER4h5Rsvj9vw0R5SieBg==",
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz",
+ "integrity": "sha512-fTfxx7i0B5NJqvUOBBGREnrqbTxRh7zinBANpZXAVDlsZxYdclDp467G1sQ8VZYMnAURY3RpBUAgOYT9GfzHBg==",
"requires": {
"@babel/helper-function-name": "^7.1.0",
- "@babel/types": "^7.4.4",
- "lodash": "^4.17.11"
+ "@babel/types": "^7.5.5",
+ "lodash": "^4.17.13"
}
},
"@babel/helper-explode-assignable-expression": {
@@ -141,11 +141,11 @@
}
},
"@babel/helper-member-expression-to-functions": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0.tgz",
- "integrity": "sha512-avo+lm/QmZlv27Zsi0xEor2fKcqWG56D5ae9dzklpIaY7cQMK5N8VSpaNVPPagiqmy7LrEjK1IWdGMOqPu5csg==",
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz",
+ "integrity": "sha512-5qZ3D1uMclSNqYcXqiHoA0meVdv+xUEex9em2fqMnrk/scphGlGgg66zjMrPJESPwrFJ6sbfFQYUSa0Mz7FabA==",
"requires": {
- "@babel/types": "^7.0.0"
+ "@babel/types": "^7.5.5"
}
},
"@babel/helper-module-imports": {
@@ -157,16 +157,16 @@
}
},
"@babel/helper-module-transforms": {
- "version": "7.4.4",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.4.4.tgz",
- "integrity": "sha512-3Z1yp8TVQf+B4ynN7WoHPKS8EkdTbgAEy0nU0rs/1Kw4pDgmvYH3rz3aI11KgxKCba2cn7N+tqzV1mY2HMN96w==",
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz",
+ "integrity": "sha512-jBeCvETKuJqeiaCdyaheF40aXnnU1+wkSiUs/IQg3tB85up1LyL8x77ClY8qJpuRJUcXQo+ZtdNESmZl4j56Pw==",
"requires": {
"@babel/helper-module-imports": "^7.0.0",
"@babel/helper-simple-access": "^7.1.0",
"@babel/helper-split-export-declaration": "^7.4.4",
"@babel/template": "^7.4.4",
- "@babel/types": "^7.4.4",
- "lodash": "^4.17.11"
+ "@babel/types": "^7.5.5",
+ "lodash": "^4.17.13"
}
},
"@babel/helper-optimise-call-expression": {
@@ -183,11 +183,11 @@
"integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA=="
},
"@babel/helper-regex": {
- "version": "7.4.4",
- "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.4.4.tgz",
- "integrity": "sha512-Y5nuB/kESmR3tKjU8Nkn1wMGEx1tjJX076HBMeL3XLQCu6vA/YRzuTW0bbb+qRnXvQGn+d6Rx953yffl8vEy7Q==",
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.5.5.tgz",
+ "integrity": "sha512-CkCYQLkfkiugbRDO8eZn6lRuR8kzZoGXCg3149iTk5se7g6qykSpy3+hELSwquhu+TgHn8nkLiBwHvNX8Hofcw==",
"requires": {
- "lodash": "^4.17.11"
+ "lodash": "^4.17.13"
}
},
"@babel/helper-remap-async-to-generator": {
@@ -203,14 +203,14 @@
}
},
"@babel/helper-replace-supers": {
- "version": "7.4.4",
- "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.4.4.tgz",
- "integrity": "sha512-04xGEnd+s01nY1l15EuMS1rfKktNF+1CkKmHoErDppjAAZL+IUBZpzT748x262HF7fibaQPhbvWUl5HeSt1EXg==",
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz",
+ "integrity": "sha512-XvRFWrNnlsow2u7jXDuH4jDDctkxbS7gXssrP4q2nUD606ukXHRvydj346wmNg+zAgpFx4MWf4+usfC93bElJg==",
"requires": {
- "@babel/helper-member-expression-to-functions": "^7.0.0",
+ "@babel/helper-member-expression-to-functions": "^7.5.5",
"@babel/helper-optimise-call-expression": "^7.0.0",
- "@babel/traverse": "^7.4.4",
- "@babel/types": "^7.4.4"
+ "@babel/traverse": "^7.5.5",
+ "@babel/types": "^7.5.5"
}
},
"@babel/helper-simple-access": {
@@ -242,19 +242,19 @@
}
},
"@babel/helpers": {
- "version": "7.4.4",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.4.4.tgz",
- "integrity": "sha512-igczbR/0SeuPR8RFfC7tGrbdTbFL3QTvH6D+Z6zNxnTe//GyqmtHmDkzrqDmyZ3eSwPqB/LhyKoU5DXsp+Vp2A==",
+ "version": "7.6.0",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.6.0.tgz",
+ "integrity": "sha512-W9kao7OBleOjfXtFGgArGRX6eCP0UEcA2ZWEWNkJdRZnHhW4eEbeswbG3EwaRsnQUAEGWYgMq1HsIXuNNNy2eQ==",
"requires": {
- "@babel/template": "^7.4.4",
- "@babel/traverse": "^7.4.4",
- "@babel/types": "^7.4.4"
+ "@babel/template": "^7.6.0",
+ "@babel/traverse": "^7.6.0",
+ "@babel/types": "^7.6.0"
}
},
"@babel/highlight": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
- "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
+ "version": "7.5.0",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
+ "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
"requires": {
"chalk": "^2.0.0",
"esutils": "^2.0.2",
@@ -262,9 +262,9 @@
}
},
"@babel/parser": {
- "version": "7.4.5",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.5.tgz",
- "integrity": "sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew=="
+ "version": "7.6.0",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.6.0.tgz",
+ "integrity": "sha512-+o2q111WEx4srBs7L9eJmcwi655eD8sXniLqMB93TBK9GrNzGrxDWSjiqz2hLU0Ha8MTXFIP0yd9fNdP+m43ZQ=="
},
"@babel/plugin-proposal-async-generator-functions": {
"version": "7.2.0",
@@ -277,15 +277,24 @@
}
},
"@babel/plugin-proposal-class-properties": {
- "version": "7.4.4",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.4.4.tgz",
- "integrity": "sha512-WjKTI8g8d5w1Bc9zgwSz2nfrsNQsXcCf9J9cdCvrJV6RF56yztwm4TmJC0MgJ9tvwO9gUA/mcYe89bLdGfiXFg==",
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz",
+ "integrity": "sha512-AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A==",
"dev": true,
"requires": {
- "@babel/helper-create-class-features-plugin": "^7.4.4",
+ "@babel/helper-create-class-features-plugin": "^7.5.5",
"@babel/helper-plugin-utils": "^7.0.0"
}
},
+ "@babel/plugin-proposal-dynamic-import": {
+ "version": "7.5.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz",
+ "integrity": "sha512-x/iMjggsKTFHYC6g11PL7Qy58IK8H5zqfm9e6hu4z1iH2IRyAp9u9dL80zA6R76yFovETFLKz2VJIC2iIPBuFw==",
+ "requires": {
+ "@babel/helper-plugin-utils": "^7.0.0",
+ "@babel/plugin-syntax-dynamic-import": "^7.2.0"
+ }
+ },
"@babel/plugin-proposal-json-strings": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz",
@@ -296,9 +305,9 @@
}
},
"@babel/plugin-proposal-object-rest-spread": {
- "version": "7.4.4",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.4.tgz",
- "integrity": "sha512-dMBG6cSPBbHeEBdFXeQ2QLc5gUpg4Vkaz8octD4aoW/ISO+jBOcsuxYL7bsb5WSu8RLP6boxrBIALEHgoHtO9g==",
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz",
+ "integrity": "sha512-F2DxJJSQ7f64FyTVl5cw/9MWn6naXGdk3Q3UhDbFEEHv+EilCPoeRD3Zh/Utx1CJz4uyKlQ4uH+bJPbEhMV7Zw==",
"requires": {
"@babel/helper-plugin-utils": "^7.0.0",
"@babel/plugin-syntax-object-rest-spread": "^7.2.0"
@@ -331,6 +340,14 @@
"@babel/helper-plugin-utils": "^7.0.0"
}
},
+ "@babel/plugin-syntax-dynamic-import": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz",
+ "integrity": "sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==",
+ "requires": {
+ "@babel/helper-plugin-utils": "^7.0.0"
+ }
+ },
"@babel/plugin-syntax-json-strings": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz",
@@ -372,9 +389,9 @@
}
},
"@babel/plugin-transform-async-to-generator": {
- "version": "7.4.4",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.4.4.tgz",
- "integrity": "sha512-YiqW2Li8TXmzgbXw+STsSqPBPFnGviiaSp6CYOq55X8GQ2SGVLrXB6pNid8HkqkZAzOH6knbai3snhP7v0fNwA==",
+ "version": "7.5.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz",
+ "integrity": "sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg==",
"requires": {
"@babel/helper-module-imports": "^7.0.0",
"@babel/helper-plugin-utils": "^7.0.0",
@@ -390,25 +407,25 @@
}
},
"@babel/plugin-transform-block-scoping": {
- "version": "7.4.4",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.4.4.tgz",
- "integrity": "sha512-jkTUyWZcTrwxu5DD4rWz6rDB5Cjdmgz6z7M7RLXOJyCUkFBawssDGcGh8M/0FTSB87avyJI1HsTwUXp9nKA1PA==",
+ "version": "7.6.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.0.tgz",
+ "integrity": "sha512-tIt4E23+kw6TgL/edACZwP1OUKrjOTyMrFMLoT5IOFrfMRabCgekjqFd5o6PaAMildBu46oFkekIdMuGkkPEpA==",
"requires": {
"@babel/helper-plugin-utils": "^7.0.0",
- "lodash": "^4.17.11"
+ "lodash": "^4.17.13"
}
},
"@babel/plugin-transform-classes": {
- "version": "7.4.4",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.4.4.tgz",
- "integrity": "sha512-/e44eFLImEGIpL9qPxSRat13I5QNRgBLu2hOQJCF7VLy/otSM/sypV1+XaIw5+502RX/+6YaSAPmldk+nhHDPw==",
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz",
+ "integrity": "sha512-U2htCNK/6e9K7jGyJ++1p5XRU+LJjrwtoiVn9SzRlDT2KubcZ11OOwy3s24TjHxPgxNwonCYP7U2K51uVYCMDg==",
"requires": {
"@babel/helper-annotate-as-pure": "^7.0.0",
- "@babel/helper-define-map": "^7.4.4",
+ "@babel/helper-define-map": "^7.5.5",
"@babel/helper-function-name": "^7.1.0",
"@babel/helper-optimise-call-expression": "^7.0.0",
"@babel/helper-plugin-utils": "^7.0.0",
- "@babel/helper-replace-supers": "^7.4.4",
+ "@babel/helper-replace-supers": "^7.5.5",
"@babel/helper-split-export-declaration": "^7.4.4",
"globals": "^11.1.0"
}
@@ -422,9 +439,9 @@
}
},
"@babel/plugin-transform-destructuring": {
- "version": "7.4.4",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.4.4.tgz",
- "integrity": "sha512-/aOx+nW0w8eHiEHm+BTERB2oJn5D127iye/SUQl7NjHy0lf+j7h4MKMMSOwdazGq9OxgiNADncE+SRJkCxjZpQ==",
+ "version": "7.6.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz",
+ "integrity": "sha512-2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ==",
"requires": {
"@babel/helper-plugin-utils": "^7.0.0"
}
@@ -440,9 +457,9 @@
}
},
"@babel/plugin-transform-duplicate-keys": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.2.0.tgz",
- "integrity": "sha512-q+yuxW4DsTjNceUiTzK0L+AfQ0zD9rWaTLiUqHA8p0gxx7lu1EylenfzjeIWNkPy6e/0VG/Wjw9uf9LueQwLOw==",
+ "version": "7.5.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz",
+ "integrity": "sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ==",
"requires": {
"@babel/helper-plugin-utils": "^7.0.0"
}
@@ -490,31 +507,34 @@
}
},
"@babel/plugin-transform-modules-amd": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.2.0.tgz",
- "integrity": "sha512-mK2A8ucqz1qhrdqjS9VMIDfIvvT2thrEsIQzbaTdc5QFzhDjQv2CkJJ5f6BXIkgbmaoax3zBr2RyvV/8zeoUZw==",
+ "version": "7.5.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz",
+ "integrity": "sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg==",
"requires": {
"@babel/helper-module-transforms": "^7.1.0",
- "@babel/helper-plugin-utils": "^7.0.0"
+ "@babel/helper-plugin-utils": "^7.0.0",
+ "babel-plugin-dynamic-import-node": "^2.3.0"
}
},
"@babel/plugin-transform-modules-commonjs": {
- "version": "7.4.4",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.4.tgz",
- "integrity": "sha512-4sfBOJt58sEo9a2BQXnZq+Q3ZTSAUXyK3E30o36BOGnJ+tvJ6YSxF0PG6kERvbeISgProodWuI9UVG3/FMY6iw==",
+ "version": "7.6.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz",
+ "integrity": "sha512-Ma93Ix95PNSEngqomy5LSBMAQvYKVe3dy+JlVJSHEXZR5ASL9lQBedMiCyVtmTLraIDVRE3ZjTZvmXXD2Ozw3g==",
"requires": {
"@babel/helper-module-transforms": "^7.4.4",
"@babel/helper-plugin-utils": "^7.0.0",
- "@babel/helper-simple-access": "^7.1.0"
+ "@babel/helper-simple-access": "^7.1.0",
+ "babel-plugin-dynamic-import-node": "^2.3.0"
}
},
"@babel/plugin-transform-modules-systemjs": {
- "version": "7.4.4",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.4.4.tgz",
- "integrity": "sha512-MSiModfILQc3/oqnG7NrP1jHaSPryO6tA2kOMmAQApz5dayPxWiHqmq4sWH2xF5LcQK56LlbKByCd8Aah/OIkQ==",
+ "version": "7.5.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz",
+ "integrity": "sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg==",
"requires": {
"@babel/helper-hoist-variables": "^7.4.4",
- "@babel/helper-plugin-utils": "^7.0.0"
+ "@babel/helper-plugin-utils": "^7.0.0",
+ "babel-plugin-dynamic-import-node": "^2.3.0"
}
},
"@babel/plugin-transform-modules-umd": {
@@ -527,11 +547,11 @@
}
},
"@babel/plugin-transform-named-capturing-groups-regex": {
- "version": "7.4.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz",
- "integrity": "sha512-z7+2IsWafTBbjNsOxU/Iv5CvTJlr5w4+HGu1HovKYTtgJ362f7kBcQglkfmlspKKZ3bgrbSGvLfNx++ZJgCWsg==",
+ "version": "7.6.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.0.tgz",
+ "integrity": "sha512-jem7uytlmrRl3iCAuQyw8BpB4c4LWvSpvIeXKpMb+7j84lkx4m4mYr5ErAcmN5KM7B6BqrAvRGjBIbbzqCczew==",
"requires": {
- "regexp-tree": "^0.1.6"
+ "regexp-tree": "^0.1.13"
}
},
"@babel/plugin-transform-new-target": {
@@ -543,12 +563,12 @@
}
},
"@babel/plugin-transform-object-super": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.2.0.tgz",
- "integrity": "sha512-VMyhPYZISFZAqAPVkiYb7dUe2AsVi2/wCT5+wZdsNO31FojQJa9ns40hzZ6U9f50Jlq4w6qwzdBB2uwqZ00ebg==",
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz",
+ "integrity": "sha512-un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ==",
"requires": {
"@babel/helper-plugin-utils": "^7.0.0",
- "@babel/helper-replace-supers": "^7.1.0"
+ "@babel/helper-replace-supers": "^7.5.5"
}
},
"@babel/plugin-transform-parameters": {
@@ -570,9 +590,9 @@
}
},
"@babel/plugin-transform-react-constant-elements": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.2.0.tgz",
- "integrity": "sha512-YYQFg6giRFMsZPKUM9v+VcHOdfSQdz9jHCx3akAi3UYgyjndmdYGSXylQ/V+HswQt4fL8IklchD9HTsaOCrWQQ==",
+ "version": "7.6.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.6.0.tgz",
+ "integrity": "sha512-np/nPuII8DHOZWB3u8u+NSeKlEz0eBrOlnVksIQog4C9NGVzXO+NLxMcXn4Eu4GMFzOw2W6Tyo6L3+Wv8z9Y5w==",
"requires": {
"@babel/helper-annotate-as-pure": "^7.0.0",
"@babel/helper-plugin-utils": "^7.0.0"
@@ -606,9 +626,9 @@
}
},
"@babel/plugin-transform-react-jsx-source": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.2.0.tgz",
- "integrity": "sha512-A32OkKTp4i5U6aE88GwwcuV4HAprUgHcTq0sSafLxjr6AW0QahrCRCjxogkbbcdtpbXkuTOlgpjophCxb6sh5g==",
+ "version": "7.5.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.5.0.tgz",
+ "integrity": "sha512-58Q+Jsy4IDCZx7kqEZuSDdam/1oW8OdDX8f+Loo6xyxdfg1yF0GE2XNJQSTZCaMol93+FBzpWiPEwtbMloAcPg==",
"requires": {
"@babel/helper-plugin-utils": "^7.0.0",
"@babel/plugin-syntax-jsx": "^7.2.0"
@@ -683,51 +703,53 @@
}
},
"@babel/polyfill": {
- "version": "7.4.4",
- "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.4.4.tgz",
- "integrity": "sha512-WlthFLfhQQhh+A2Gn5NSFl0Huxz36x86Jn+E9OW7ibK8edKPq+KLy4apM1yDpQ8kJOVi1OVjpP4vSDLdrI04dg==",
+ "version": "7.6.0",
+ "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.6.0.tgz",
+ "integrity": "sha512-q5BZJI0n/B10VaQQvln1IlDK3BTBJFbADx7tv+oXDPIDZuTo37H5Adb9jhlXm/fEN4Y7/64qD9mnrJJG7rmaTw==",
"requires": {
"core-js": "^2.6.5",
"regenerator-runtime": "^0.13.2"
}
},
"@babel/preset-env": {
- "version": "7.4.5",
- "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.4.5.tgz",
- "integrity": "sha512-f2yNVXM+FsR5V8UwcFeIHzHWgnhXg3NpRmy0ADvALpnhB0SLbCvrCRr4BLOUYbQNLS+Z0Yer46x9dJXpXewI7w==",
+ "version": "7.6.0",
+ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.6.0.tgz",
+ "integrity": "sha512-1efzxFv/TcPsNXlRhMzRnkBFMeIqBBgzwmZwlFDw5Ubj0AGLeufxugirwZmkkX/ayi3owsSqoQ4fw8LkfK9SYg==",
"requires": {
"@babel/helper-module-imports": "^7.0.0",
"@babel/helper-plugin-utils": "^7.0.0",
"@babel/plugin-proposal-async-generator-functions": "^7.2.0",
+ "@babel/plugin-proposal-dynamic-import": "^7.5.0",
"@babel/plugin-proposal-json-strings": "^7.2.0",
- "@babel/plugin-proposal-object-rest-spread": "^7.4.4",
+ "@babel/plugin-proposal-object-rest-spread": "^7.5.5",
"@babel/plugin-proposal-optional-catch-binding": "^7.2.0",
"@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
"@babel/plugin-syntax-async-generators": "^7.2.0",
+ "@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/plugin-syntax-json-strings": "^7.2.0",
"@babel/plugin-syntax-object-rest-spread": "^7.2.0",
"@babel/plugin-syntax-optional-catch-binding": "^7.2.0",
"@babel/plugin-transform-arrow-functions": "^7.2.0",
- "@babel/plugin-transform-async-to-generator": "^7.4.4",
+ "@babel/plugin-transform-async-to-generator": "^7.5.0",
"@babel/plugin-transform-block-scoped-functions": "^7.2.0",
- "@babel/plugin-transform-block-scoping": "^7.4.4",
- "@babel/plugin-transform-classes": "^7.4.4",
+ "@babel/plugin-transform-block-scoping": "^7.6.0",
+ "@babel/plugin-transform-classes": "^7.5.5",
"@babel/plugin-transform-computed-properties": "^7.2.0",
- "@babel/plugin-transform-destructuring": "^7.4.4",
+ "@babel/plugin-transform-destructuring": "^7.6.0",
"@babel/plugin-transform-dotall-regex": "^7.4.4",
- "@babel/plugin-transform-duplicate-keys": "^7.2.0",
+ "@babel/plugin-transform-duplicate-keys": "^7.5.0",
"@babel/plugin-transform-exponentiation-operator": "^7.2.0",
"@babel/plugin-transform-for-of": "^7.4.4",
"@babel/plugin-transform-function-name": "^7.4.4",
"@babel/plugin-transform-literals": "^7.2.0",
"@babel/plugin-transform-member-expression-literals": "^7.2.0",
- "@babel/plugin-transform-modules-amd": "^7.2.0",
- "@babel/plugin-transform-modules-commonjs": "^7.4.4",
- "@babel/plugin-transform-modules-systemjs": "^7.4.4",
+ "@babel/plugin-transform-modules-amd": "^7.5.0",
+ "@babel/plugin-transform-modules-commonjs": "^7.6.0",
+ "@babel/plugin-transform-modules-systemjs": "^7.5.0",
"@babel/plugin-transform-modules-umd": "^7.2.0",
- "@babel/plugin-transform-named-capturing-groups-regex": "^7.4.5",
+ "@babel/plugin-transform-named-capturing-groups-regex": "^7.6.0",
"@babel/plugin-transform-new-target": "^7.4.4",
- "@babel/plugin-transform-object-super": "^7.2.0",
+ "@babel/plugin-transform-object-super": "^7.5.5",
"@babel/plugin-transform-parameters": "^7.4.4",
"@babel/plugin-transform-property-literals": "^7.2.0",
"@babel/plugin-transform-regenerator": "^7.4.5",
@@ -738,7 +760,7 @@
"@babel/plugin-transform-template-literals": "^7.4.4",
"@babel/plugin-transform-typeof-symbol": "^7.2.0",
"@babel/plugin-transform-unicode-regex": "^7.4.4",
- "@babel/types": "^7.4.4",
+ "@babel/types": "^7.6.0",
"browserslist": "^4.6.0",
"core-js-compat": "^3.1.1",
"invariant": "^2.2.2",
@@ -759,46 +781,46 @@
}
},
"@babel/runtime": {
- "version": "7.4.5",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.5.tgz",
- "integrity": "sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==",
+ "version": "7.6.0",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.6.0.tgz",
+ "integrity": "sha512-89eSBLJsxNxOERC0Op4vd+0Bqm6wRMqMbFtV3i0/fbaWw/mJ8Q3eBvgX0G4SyrOOLCtbu98HspF8o09MRT+KzQ==",
"requires": {
"regenerator-runtime": "^0.13.2"
}
},
"@babel/template": {
- "version": "7.4.4",
- "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz",
- "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==",
+ "version": "7.6.0",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.6.0.tgz",
+ "integrity": "sha512-5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==",
"requires": {
"@babel/code-frame": "^7.0.0",
- "@babel/parser": "^7.4.4",
- "@babel/types": "^7.4.4"
+ "@babel/parser": "^7.6.0",
+ "@babel/types": "^7.6.0"
}
},
"@babel/traverse": {
- "version": "7.4.5",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.5.tgz",
- "integrity": "sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A==",
+ "version": "7.6.0",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.6.0.tgz",
+ "integrity": "sha512-93t52SaOBgml/xY74lsmt7xOR4ufYvhb5c5qiM6lu4J/dWGMAfAh6eKw4PjLes6DI6nQgearoxnFJk60YchpvQ==",
"requires": {
- "@babel/code-frame": "^7.0.0",
- "@babel/generator": "^7.4.4",
+ "@babel/code-frame": "^7.5.5",
+ "@babel/generator": "^7.6.0",
"@babel/helper-function-name": "^7.1.0",
"@babel/helper-split-export-declaration": "^7.4.4",
- "@babel/parser": "^7.4.5",
- "@babel/types": "^7.4.4",
+ "@babel/parser": "^7.6.0",
+ "@babel/types": "^7.6.0",
"debug": "^4.1.0",
"globals": "^11.1.0",
- "lodash": "^4.17.11"
+ "lodash": "^4.17.13"
}
},
"@babel/types": {
- "version": "7.4.4",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz",
- "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==",
+ "version": "7.6.1",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.6.1.tgz",
+ "integrity": "sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==",
"requires": {
"esutils": "^2.0.2",
- "lodash": "^4.17.11",
+ "lodash": "^4.17.13",
"to-fast-properties": "^2.0.0"
}
},
@@ -840,9 +862,9 @@
}
},
"@rooks/use-interval": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/@rooks/use-interval/-/use-interval-3.0.1.tgz",
- "integrity": "sha512-yM4T9QAZSGLk4od3QLS1230ltZj2y1xzL9pmVwgyJLJlo1u9mSkYaepAItRsCbOWKCUT5Rw0T8VNT0YX9KgOXw=="
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/@rooks/use-interval/-/use-interval-3.3.0.tgz",
+ "integrity": "sha512-H7C4lp2dOYMVeWlp13GSZ0OMAr4sOcROa/gGJgz1RCicYumRI00Van3OL1P13dvc8fvEYBlpTFqL06pWW3eV7g=="
},
"@svgr/babel-plugin-add-jsx-attribute": {
"version": "4.2.0",
@@ -865,9 +887,9 @@
"integrity": "sha512-U9m870Kqm0ko8beHawRXLGLvSi/ZMrl89gJ5BNcT452fAjtF2p4uRzXkdzvGJJJYBgx7BmqlDjBN/eCp5AAX2w=="
},
"@svgr/babel-plugin-svg-dynamic-title": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-4.3.0.tgz",
- "integrity": "sha512-3eI17Pb3jlg3oqV4Tie069n1SelYKBUpI90txDcnBWk4EGFW+YQGyQjy6iuJAReH0RnpUJ9jUExrt/xniGvhqw=="
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-4.3.1.tgz",
+ "integrity": "sha512-p6z6JJroP989jHWcuraeWpzdejehTmLUpyC9smhTBWyPN0VVGe2phbYxpPTV7Vh8XzmFrcG55idrnfWn/2oQEw=="
},
"@svgr/babel-plugin-svg-em-dimensions": {
"version": "4.2.0",
@@ -885,73 +907,71 @@
"integrity": "sha512-hYfYuZhQPCBVotABsXKSCfel2slf/yvJY8heTVX1PCTaq/IgASq1IyxPPKJ0chWREEKewIU/JMSsIGBtK1KKxw=="
},
"@svgr/babel-preset": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-4.3.0.tgz",
- "integrity": "sha512-Lgy1RJiZumGtv6yJroOxzFuL64kG/eIcivJQ7y9ljVWL+0QXvFz4ix1xMrmjMD+rpJWwj50ayCIcFelevG/XXg==",
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-4.3.1.tgz",
+ "integrity": "sha512-rPFKLmyhlh6oeBv3j2vEAj2nd2QbWqpoJLKzBLjwQVt+d9aeXajVaPNEqrES2spjXKR4OxfgSs7U0NtmAEkr0Q==",
"requires": {
"@svgr/babel-plugin-add-jsx-attribute": "^4.2.0",
"@svgr/babel-plugin-remove-jsx-attribute": "^4.2.0",
"@svgr/babel-plugin-remove-jsx-empty-expression": "^4.2.0",
"@svgr/babel-plugin-replace-jsx-attribute-value": "^4.2.0",
- "@svgr/babel-plugin-svg-dynamic-title": "^4.3.0",
+ "@svgr/babel-plugin-svg-dynamic-title": "^4.3.1",
"@svgr/babel-plugin-svg-em-dimensions": "^4.2.0",
"@svgr/babel-plugin-transform-react-native-svg": "^4.2.0",
"@svgr/babel-plugin-transform-svg-component": "^4.2.0"
}
},
"@svgr/core": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/@svgr/core/-/core-4.3.0.tgz",
- "integrity": "sha512-Ycu1qrF5opBgKXI0eQg3ROzupalCZnSDETKCK/3MKN4/9IEmt3jPX/bbBjftklnRW+qqsCEpO0y/X9BTRw2WBg==",
+ "version": "4.3.2",
+ "resolved": "https://registry.npmjs.org/@svgr/core/-/core-4.3.2.tgz",
+ "integrity": "sha512-N+tP5CLFd1hP9RpO83QJPZY3NL8AtrdqNbuhRgBkjE/49RnMrrRsFm1wY8pueUfAGvzn6tSXUq29o6ah8RuR5w==",
"requires": {
- "@svgr/plugin-jsx": "^4.3.0",
+ "@svgr/plugin-jsx": "^4.3.2",
"camelcase": "^5.3.1",
- "cosmiconfig": "^5.2.0"
+ "cosmiconfig": "^5.2.1"
}
},
"@svgr/hast-util-to-babel-ast": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-4.2.0.tgz",
- "integrity": "sha512-IvAeb7gqrGB5TH9EGyBsPrMRH/QCzIuAkLySKvH2TLfLb2uqk98qtJamordRQTpHH3e6TORfBXoTo7L7Opo/Ow==",
+ "version": "4.3.2",
+ "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-4.3.2.tgz",
+ "integrity": "sha512-JioXclZGhFIDL3ddn4Kiq8qEqYM2PyDKV0aYno8+IXTLuYt6TOgHUbUAAFvqtb0Xn37NwP0BTHglejFoYr8RZg==",
"requires": {
- "@babel/types": "^7.4.0"
+ "@babel/types": "^7.4.4"
}
},
"@svgr/plugin-jsx": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-4.3.0.tgz",
- "integrity": "sha512-0ab8zJdSOTqPfjZtl89cjq2IOmXXUYV3Fs7grLT9ur1Al3+x3DSp2+/obrYKUGbQUnLq96RMjSZ7Icd+13vwlQ==",
+ "version": "4.3.2",
+ "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-4.3.2.tgz",
+ "integrity": "sha512-+1GW32RvmNmCsOkMoclA/TppNjHPLMnNZG3/Ecscxawp051XJ2MkO09Hn11VcotdC2EPrDfT8pELGRo+kbZ1Eg==",
"requires": {
- "@babel/core": "^7.4.3",
- "@svgr/babel-preset": "^4.3.0",
- "@svgr/hast-util-to-babel-ast": "^4.2.0",
- "rehype-parse": "^6.0.0",
- "unified": "^7.1.0",
- "vfile": "^4.0.0"
+ "@babel/core": "^7.4.5",
+ "@svgr/babel-preset": "^4.3.1",
+ "@svgr/hast-util-to-babel-ast": "^4.3.2",
+ "svg-parser": "^2.0.0"
}
},
"@svgr/plugin-svgo": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-4.2.0.tgz",
- "integrity": "sha512-zUEKgkT172YzHh3mb2B2q92xCnOAMVjRx+o0waZ1U50XqKLrVQ/8dDqTAtnmapdLsGurv8PSwenjLCUpj6hcvw==",
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-4.3.1.tgz",
+ "integrity": "sha512-PrMtEDUWjX3Ea65JsVCwTIXuSqa3CG9px+DluF1/eo9mlDrgrtFE7NE/DjdhjJgSM9wenlVBzkzneSIUgfUI/w==",
"requires": {
- "cosmiconfig": "^5.2.0",
+ "cosmiconfig": "^5.2.1",
"merge-deep": "^3.0.2",
- "svgo": "^1.2.1"
+ "svgo": "^1.2.2"
}
},
"@svgr/webpack": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-4.3.0.tgz",
- "integrity": "sha512-rYcwi1pUnaZoOUEa8xhrX10FHnONvube1WBoJ5PQf/Cbl0GuiUUSdXSVaFgxWdeyv6jCG0vWH1mrCHhspaJv1Q==",
+ "version": "4.3.2",
+ "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-4.3.2.tgz",
+ "integrity": "sha512-F3VE5OvyOWBEd2bF7BdtFRyI6E9it3mN7teDw0JQTlVtc4HZEYiiLSl+Uf9Uub6IYHVGc+qIrxxDyeedkQru2w==",
"requires": {
- "@babel/core": "^7.4.3",
+ "@babel/core": "^7.4.5",
"@babel/plugin-transform-react-constant-elements": "^7.0.0",
- "@babel/preset-env": "^7.4.3",
+ "@babel/preset-env": "^7.4.5",
"@babel/preset-react": "^7.0.0",
- "@svgr/core": "^4.3.0",
- "@svgr/plugin-jsx": "^4.3.0",
- "@svgr/plugin-svgo": "^4.2.0",
+ "@svgr/core": "^4.3.2",
+ "@svgr/plugin-jsx": "^4.3.2",
+ "@svgr/plugin-svgo": "^4.3.1",
"loader-utils": "^1.2.3"
}
},
@@ -976,39 +996,15 @@
"integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="
},
"@types/node": {
- "version": "12.0.4",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.4.tgz",
- "integrity": "sha512-j8YL2C0fXq7IONwl/Ud5Kt0PeXw22zGERt+HSSnwbKOJVsAGkEz3sFCYwaF9IOuoG1HOtE0vKCj6sXF7Q0+Vaw=="
+ "version": "12.7.5",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.5.tgz",
+ "integrity": "sha512-9fq4jZVhPNW8r+UYKnxF1e2HkDWOWKM5bC2/7c9wPV835I0aOrVbS/Hw/pWPk2uKrNXQqg9Z959Kz+IYDd5p3w=="
},
"@types/q": {
"version": "1.5.2",
"resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz",
"integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw=="
},
- "@types/unist": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz",
- "integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ=="
- },
- "@types/vfile": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/@types/vfile/-/vfile-3.0.2.tgz",
- "integrity": "sha512-b3nLFGaGkJ9rzOcuXRfHkZMdjsawuDD0ENL9fzTophtBg8FJHSGbH7daXkEpcwy3v7Xol3pAvsmlYyFhR4pqJw==",
- "requires": {
- "@types/node": "*",
- "@types/unist": "*",
- "@types/vfile-message": "*"
- }
- },
- "@types/vfile-message": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@types/vfile-message/-/vfile-message-1.0.1.tgz",
- "integrity": "sha512-mlGER3Aqmq7bqR1tTTIVHq8KSAFFRyGbrxuM8C/H82g6k7r2fS+IMEkIu3D7JHzG10NvPdR8DNx0jr0pwpp4dA==",
- "requires": {
- "@types/node": "*",
- "@types/unist": "*"
- }
- },
"@webassemblyjs/ast": {
"version": "1.8.5",
"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
@@ -1213,33 +1209,27 @@
}
},
"acorn": {
- "version": "6.1.1",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
- "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==",
- "dev": true
- },
- "acorn-dynamic-import": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz",
- "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==",
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
+ "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==",
"dev": true
},
"acorn-jsx": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz",
- "integrity": "sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==",
+ "version": "5.0.2",
+ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.2.tgz",
+ "integrity": "sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw==",
"dev": true
},
"acorn-walk": {
- "version": "6.1.1",
- "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz",
- "integrity": "sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==",
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
+ "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==",
"dev": true
},
"ajv": {
- "version": "6.10.0",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
- "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
+ "version": "6.10.2",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
+ "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
"requires": {
"fast-deep-equal": "^2.0.1",
"fast-json-stable-stringify": "^2.0.0",
@@ -1254,9 +1244,9 @@
"dev": true
},
"ajv-keywords": {
- "version": "3.4.0",
- "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.0.tgz",
- "integrity": "sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==",
+ "version": "3.4.1",
+ "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
+ "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==",
"dev": true
},
"amdefine": {
@@ -1572,13 +1562,13 @@
"dev": true
},
"async-done": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.1.tgz",
- "integrity": "sha512-R1BaUeJ4PMoLNJuk+0tLJgjmEqVsdN118+Z8O+alhnQDQgy0kmD5Mqi0DNEmMx2LM0Ed5yekKu+ZXYvIHceicg==",
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
+ "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
"requires": {
"end-of-stream": "^1.1.0",
"once": "^1.3.2",
- "process-nextick-args": "^1.0.7",
+ "process-nextick-args": "^2.0.0",
"stream-exhaust": "^1.0.1"
}
},
@@ -1593,9 +1583,9 @@
"integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI="
},
"async-limiter": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
- "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+ "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
"dev": true
},
"async-settle": {
@@ -1627,17 +1617,17 @@
"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
},
"babel-eslint": {
- "version": "10.0.1",
- "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.1.tgz",
- "integrity": "sha512-z7OT1iNV+TjOwHNLLyJk+HN+YVWX+CLE6fPD2SymJZOZQBs+QIexFjhm4keGTm8MW9xr4EC9Q0PbaLB24V5GoQ==",
+ "version": "10.0.3",
+ "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.3.tgz",
+ "integrity": "sha512-z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
"@babel/parser": "^7.0.0",
"@babel/traverse": "^7.0.0",
"@babel/types": "^7.0.0",
- "eslint-scope": "3.7.1",
- "eslint-visitor-keys": "^1.0.0"
+ "eslint-visitor-keys": "^1.0.0",
+ "resolve": "^1.12.0"
}
},
"babel-loader": {
@@ -1652,6 +1642,14 @@
"pify": "^4.0.1"
}
},
+ "babel-plugin-dynamic-import-node": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz",
+ "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==",
+ "requires": {
+ "object.assign": "^4.1.0"
+ }
+ },
"babel-runtime": {
"version": "6.26.0",
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
@@ -1684,11 +1682,6 @@
"now-and-later": "^2.0.0"
}
},
- "bail": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.4.tgz",
- "integrity": "sha512-S8vuDB4w6YpRhICUDET3guPlQpaJl7od94tpZ0Fvnyp+MKW/HyDTcRDck+29C9g+d/qQHnddRH3+94kZdrW0Ww=="
- },
"balanced-match": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -1750,9 +1743,9 @@
}
},
"base64-js": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
- "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+ "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
"dev": true
},
"batch": {
@@ -1770,15 +1763,15 @@
}
},
"bfj": {
- "version": "6.1.1",
- "resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.1.tgz",
- "integrity": "sha512-+GUNvzHR4nRyGybQc2WpNJL4MJazMuvf92ueIyA0bIkPRwhhQu3IfZQ2PSoVPpCBJfmoSdOxu5rnotfFLlvYRQ==",
+ "version": "6.1.2",
+ "resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz",
+ "integrity": "sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==",
"dev": true,
"requires": {
- "bluebird": "^3.5.1",
- "check-types": "^7.3.0",
- "hoopy": "^0.1.2",
- "tryer": "^1.0.0"
+ "bluebird": "^3.5.5",
+ "check-types": "^8.0.3",
+ "hoopy": "^0.1.4",
+ "tryer": "^1.0.1"
}
},
"big.js": {
@@ -1993,13 +1986,13 @@
}
},
"browserslist": {
- "version": "4.6.1",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.1.tgz",
- "integrity": "sha512-1MC18ooMPRG2UuVFJTHFIAkk6mpByJfxCrnUyvSlu/hyQSFHMrlhM02SzNuCV+quTP4CKmqtOMAIjrifrpBJXQ==",
+ "version": "4.7.0",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.7.0.tgz",
+ "integrity": "sha512-9rGNDtnj+HaahxiVV38Gn8n8Lr8REKsel68v1sPFfIGEK6uSXTY3h9acgiT1dZVtOOUtifo/Dn8daDQ5dUgVsA==",
"requires": {
- "caniuse-lite": "^1.0.30000971",
- "electron-to-chromium": "^1.3.137",
- "node-releases": "^1.1.21"
+ "caniuse-lite": "^1.0.30000989",
+ "electron-to-chromium": "^1.3.247",
+ "node-releases": "^1.1.29"
}
},
"buffer": {
@@ -2048,22 +2041,23 @@
"dev": true
},
"cacache": {
- "version": "11.3.2",
- "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
- "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
+ "version": "12.0.3",
+ "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz",
+ "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==",
"dev": true,
"requires": {
- "bluebird": "^3.5.3",
+ "bluebird": "^3.5.5",
"chownr": "^1.1.1",
"figgy-pudding": "^3.5.1",
- "glob": "^7.1.3",
+ "glob": "^7.1.4",
"graceful-fs": "^4.1.15",
+ "infer-owner": "^1.0.3",
"lru-cache": "^5.1.1",
"mississippi": "^3.0.0",
"mkdirp": "^0.5.1",
"move-concurrently": "^1.0.1",
"promise-inflight": "^1.0.1",
- "rimraf": "^2.6.2",
+ "rimraf": "^2.6.3",
"ssri": "^6.0.1",
"unique-filename": "^1.1.1",
"y18n": "^4.0.0"
@@ -2151,20 +2145,15 @@
}
},
"caniuse-lite": {
- "version": "1.0.30000971",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000971.tgz",
- "integrity": "sha512-TQFYFhRS0O5rdsmSbF1Wn+16latXYsQJat66f7S7lizXW1PVpWJeZw9wqqVLIjuxDRz7s7xRUj13QCfd8hKn6g=="
+ "version": "1.0.30000989",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz",
+ "integrity": "sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw=="
},
"caseless": {
"version": "0.12.0",
"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
},
- "ccount": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.4.tgz",
- "integrity": "sha512-fpZ81yYfzentuieinmGnphk0pLkOTMm6MZdVqwd77ROvhko6iujLNGrHH5E7utq3ygWklwfmwuG+A7P+NpqT6w=="
- },
"chalk": {
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -2182,15 +2171,15 @@
"dev": true
},
"check-types": {
- "version": "7.4.0",
- "resolved": "https://registry.npmjs.org/check-types/-/check-types-7.4.0.tgz",
- "integrity": "sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg==",
+ "version": "8.0.3",
+ "resolved": "https://registry.npmjs.org/check-types/-/check-types-8.0.3.tgz",
+ "integrity": "sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==",
"dev": true
},
"chokidar": {
- "version": "2.1.6",
- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",
- "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",
+ "version": "2.1.8",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+ "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
"requires": {
"anymatch": "^2.0.0",
"async-each": "^1.0.1",
@@ -2214,9 +2203,9 @@
}
},
"chownr": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
- "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz",
+ "integrity": "sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==",
"dev": true
},
"chrome-trace-event": {
@@ -2350,13 +2339,6 @@
"inherits": "^2.0.1",
"process-nextick-args": "^2.0.0",
"readable-stream": "^2.3.5"
- },
- "dependencies": {
- "process-nextick-args": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
- "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
- }
}
},
"co": {
@@ -2435,11 +2417,6 @@
"delayed-stream": "~1.0.0"
}
},
- "comma-separated-tokens": {
- "version": "1.0.7",
- "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.7.tgz",
- "integrity": "sha512-Jrx3xsP4pPv4AwJUDWY9wOXGtwPXARej6Xd99h4TUGotmf8APuquKMpK+dnD3UgyxK7OEWaisjZz+3b5jtL6xQ=="
- },
"commander": {
"version": "2.20.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
@@ -2526,9 +2503,9 @@
"dev": true
},
"connected-react-router": {
- "version": "6.4.0",
- "resolved": "https://registry.npmjs.org/connected-react-router/-/connected-react-router-6.4.0.tgz",
- "integrity": "sha512-RZRLD7qUz9OdmCn0JkW7pOiUsR7v9NtqnYKfqrxXsfO2ozMLR2/MjHaSPpdbMr4VE5TY6MwzAXUSkheN2ldqug==",
+ "version": "6.5.2",
+ "resolved": "https://registry.npmjs.org/connected-react-router/-/connected-react-router-6.5.2.tgz",
+ "integrity": "sha512-qzsLPZCofSI80fwy+HgxtEgSGS4ndYUUZAWaw1dqaOGPLKX/FVwIOEb7q+hjHdnZ4v5pKZcNv5GG4urjujIoyA==",
"requires": {
"immutable": "^3.8.1",
"prop-types": "^15.7.2",
@@ -2624,27 +2601,21 @@
"integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A=="
},
"core-js-compat": {
- "version": "3.1.3",
- "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.1.3.tgz",
- "integrity": "sha512-EP018pVhgwsKHz3YoN1hTq49aRe+h017Kjz0NQz3nXV0cCRMvH3fLQl+vEPGr4r4J5sk4sU3tUC7U1aqTCeJeA==",
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.2.1.tgz",
+ "integrity": "sha512-MwPZle5CF9dEaMYdDeWm73ao/IflDH+FjeJCWEADcEgFSE9TLimFKwJsfmkwzI8eC0Aj0mgvMDjeQjrElkz4/A==",
"requires": {
- "browserslist": "^4.6.0",
- "core-js-pure": "3.1.3",
- "semver": "^6.1.0"
+ "browserslist": "^4.6.6",
+ "semver": "^6.3.0"
},
"dependencies": {
"semver": {
- "version": "6.1.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz",
- "integrity": "sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ=="
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
}
}
},
- "core-js-pure": {
- "version": "3.1.3",
- "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.1.3.tgz",
- "integrity": "sha512-k3JWTrcQBKqjkjI0bkfXS0lbpWPxYuHWfMMjC1VDmzU4Q58IwSbuXSo99YO/hUHlw/EB4AlfA2PVxOGkrIq6dA=="
- },
"core-util-is": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -2698,15 +2669,6 @@
"sha.js": "^2.4.8"
}
},
- "create-react-context": {
- "version": "0.2.3",
- "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.2.3.tgz",
- "integrity": "sha512-CQBmD0+QGgTaxDL3OX1IDXYqjkp2It4RIbcb99jS6AEg27Ga+a9G3JtK6SIu0HBwPLZlmwt9F7UwWA4Bn92Rag==",
- "requires": {
- "fbjs": "^0.8.0",
- "gud": "^1.0.0"
- }
- },
"cross-spawn": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
@@ -2799,19 +2761,14 @@
"integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="
},
"css-tree": {
- "version": "1.0.0-alpha.28",
- "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.28.tgz",
- "integrity": "sha512-joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w==",
+ "version": "1.0.0-alpha.33",
+ "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.33.tgz",
+ "integrity": "sha512-SPt57bh5nQnpsTBsx/IXbO14sRc9xXu5MtMAVuo0BaQQmyf0NupNPPSoMaqiAF5tDFafYsTkfeH4Q/HCKXkg4w==",
"requires": {
- "mdn-data": "~1.1.0",
+ "mdn-data": "2.0.4",
"source-map": "^0.5.3"
}
},
- "css-url-regex": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/css-url-regex/-/css-url-regex-1.1.0.tgz",
- "integrity": "sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w="
- },
"css-what": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
@@ -2839,9 +2796,19 @@
"mdn-data": "~1.1.0",
"source-map": "^0.5.3"
}
+ },
+ "mdn-data": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.4.tgz",
+ "integrity": "sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA=="
}
}
},
+ "csstype": {
+ "version": "2.6.6",
+ "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.6.tgz",
+ "integrity": "sha512-RpFbQGUE74iyPgvr46U9t1xoQBM8T4BL8SxrN66Le2xYAPSaDJJKeztV3awugusb3g3G9iL8StmkBBXhcbbXhg=="
+ },
"currently-unhandled": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
@@ -2851,17 +2818,18 @@
}
},
"cyclist": {
- "version": "0.2.2",
- "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
- "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
+ "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
"dev": true
},
"d": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
- "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+ "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
"requires": {
- "es5-ext": "^0.10.9"
+ "es5-ext": "^0.10.50",
+ "type": "^1.0.1"
}
},
"dashdash": {
@@ -2924,10 +2892,18 @@
"integrity": "sha1-wB3mPvsO7JeYgB1Ax+Da4ltYLIQ="
},
"deep-equal": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
- "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
- "dev": true
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.0.tgz",
+ "integrity": "sha512-ZbfWJq/wN1Z273o7mUSjILYqehAktR2NVoSrOukDkU9kg2v/Uv89yU4Cvz8seJeAmtN5oqiefKq8FPuXOboqLw==",
+ "dev": true,
+ "requires": {
+ "is-arguments": "^1.0.4",
+ "is-date-object": "^1.0.1",
+ "is-regex": "^1.0.4",
+ "object-is": "^1.0.1",
+ "object-keys": "^1.1.1",
+ "regexp.prototype.flags": "^1.2.0"
+ }
},
"deep-extend": {
"version": "0.6.0",
@@ -3129,20 +3105,28 @@
}
},
"dom-helpers": {
- "version": "3.4.0",
- "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
- "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==",
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.1.0.tgz",
+ "integrity": "sha512-zRRYDhpiKuAJHasOqCm7lBnsd22nrM4+OYI4ASWCxen+ocTMl7BIAKgGag97TlLiTl6rrau5aPe1VGUm9jQBng==",
"requires": {
- "@babel/runtime": "^7.1.2"
+ "@babel/runtime": "^7.5.5",
+ "csstype": "^2.6.6"
}
},
"dom-serializer": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
- "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.1.tgz",
+ "integrity": "sha512-sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==",
"requires": {
- "domelementtype": "^1.3.0",
- "entities": "^1.1.1"
+ "domelementtype": "^2.0.1",
+ "entities": "^2.0.0"
+ },
+ "dependencies": {
+ "domelementtype": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
+ "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ=="
+ }
}
},
"dom-walk": {
@@ -3172,11 +3156,11 @@
}
},
"draft-js": {
- "version": "0.10.5",
- "resolved": "https://registry.npmjs.org/draft-js/-/draft-js-0.10.5.tgz",
- "integrity": "sha512-LE6jSCV9nkPhfVX2ggcRLA4FKs6zWq9ceuO/88BpXdNCS7mjRTgs0NsV6piUCJX9YxMsB9An33wnkMmU2sD2Zg==",
+ "version": "0.11.0",
+ "resolved": "https://registry.npmjs.org/draft-js/-/draft-js-0.11.0.tgz",
+ "integrity": "sha512-kNVaI3rLiNUSXoCuc5OxOQfzvtFEsOhRgWVHz5nU4b1APvYiOnY5Y2H76ZmB5990//cZysul09FbnzP+YAKNJA==",
"requires": {
- "fbjs": "^0.8.15",
+ "fbjs": "^1.0.0",
"immutable": "~3.7.4",
"object-assign": "^4.1.0"
},
@@ -3189,51 +3173,51 @@
}
},
"draft-js-export-html": {
- "version": "1.3.3",
- "resolved": "https://registry.npmjs.org/draft-js-export-html/-/draft-js-export-html-1.3.3.tgz",
- "integrity": "sha512-gYf4CvZvLv519FRUfGwg/9tZ23Ms90IklOM4vhhKxkrNyFBq93A1wKI8ikqCKKkNpaJyPp7XUkEsvOBUo3THBQ==",
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/draft-js-export-html/-/draft-js-export-html-1.4.1.tgz",
+ "integrity": "sha512-G4VGBSalPowktIE4wp3rFbhjs+Ln9IZ2FhXeHjsZDSw0a2+h+BjKu5Enq+mcsyVb51RW740GBK8Xbf7Iic51tw==",
"requires": {
- "draft-js-utils": "^1.3.3"
+ "draft-js-utils": "^1.4.0"
}
},
"draft-js-export-markdown": {
- "version": "1.3.3",
- "resolved": "https://registry.npmjs.org/draft-js-export-markdown/-/draft-js-export-markdown-1.3.3.tgz",
- "integrity": "sha512-sp3zJQMSnQ97eAZXWjbFSDifgZAVNM5KTiTRldNNel9/K1IzKyMfAaMoxsIEL0fXTxDwfpFSaE7dKAwkdROayA==",
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/draft-js-export-markdown/-/draft-js-export-markdown-1.4.0.tgz",
+ "integrity": "sha512-blfAvlhGhjVlHNaZ5WJKlrXhcftnwwC5VC+Eu3ztOGpGLaOom4hxhBjbKEWjvbQZJ9zL+xo57ukm39prYZMG5Q==",
"requires": {
- "draft-js-utils": "^1.3.3"
+ "draft-js-utils": "^1.4.0"
}
},
"draft-js-import-element": {
- "version": "1.3.3",
- "resolved": "https://registry.npmjs.org/draft-js-import-element/-/draft-js-import-element-1.3.3.tgz",
- "integrity": "sha512-E1hiuWuhM9XmX5QFBzKY0blkuPxz+yuK88R1y/xIfLgJtVyfQOnc8vfkGH6tEPbNtdbIcnKI8aCGfCkqgvt5CA==",
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/draft-js-import-element/-/draft-js-import-element-1.4.0.tgz",
+ "integrity": "sha512-WmYT5PrCm47lGL5FkH6sRO3TTAcn7qNHsD3igiPqLG/RXrqyKrqN4+wBgbcT2lhna/yfWTRtgzAbQsSJoS1Meg==",
"requires": {
- "draft-js-utils": "^1.3.3",
- "synthetic-dom": "^1.3.3"
+ "draft-js-utils": "^1.4.0",
+ "synthetic-dom": "^1.4.0"
}
},
"draft-js-import-html": {
- "version": "1.3.3",
- "resolved": "https://registry.npmjs.org/draft-js-import-html/-/draft-js-import-html-1.3.3.tgz",
- "integrity": "sha512-+BCEEenLEX3F4wg3obEdqrhCqs6taFmyjibinjCKA+Cy6dcU+LKsOqqpt10Muo9ARXQYzUyPhLcd8Th9PVCWMw==",
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/draft-js-import-html/-/draft-js-import-html-1.4.1.tgz",
+ "integrity": "sha512-KOZmtgxZriCDgg5Smr3Y09TjubvXe7rHPy/2fuLSsL+aSzwUDwH/aHDA/k47U+WfpmL4qgyg4oZhqx9TYJV0tg==",
"requires": {
- "draft-js-import-element": "^1.3.3"
+ "draft-js-import-element": "^1.4.0"
}
},
"draft-js-import-markdown": {
- "version": "1.3.3",
- "resolved": "https://registry.npmjs.org/draft-js-import-markdown/-/draft-js-import-markdown-1.3.3.tgz",
- "integrity": "sha512-O9wQPAVB4TQLZGPYUQDHD1XGK/H7DZKNrSuwDn7RTadWWFycZV4sP46TZPFD4D240xas/h9QwjbxfAg8ZLQwrw==",
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/draft-js-import-markdown/-/draft-js-import-markdown-1.4.0.tgz",
+ "integrity": "sha512-mpKUxzDM+x7W+eCZegCAxl3QJzNGA3Y+DbBMMekzCdPHONLJAZ1QYYjegbXa6+pZGq8FAIhgWaVbfKWMb8M8dQ==",
"requires": {
- "draft-js-import-element": "^1.3.3",
- "synthetic-dom": "^1.3.3"
+ "draft-js-import-element": "^1.4.0",
+ "synthetic-dom": "^1.4.0"
}
},
"draft-js-utils": {
- "version": "1.3.3",
- "resolved": "https://registry.npmjs.org/draft-js-utils/-/draft-js-utils-1.3.3.tgz",
- "integrity": "sha512-ZIF3KE2+dRD6zEoqQyu9HzeG56NWtktfazRnDZFC9GD4NnHgJE5qI+TqGgmjRjSrKzuSQonl5rsx+D4N5m6yhQ=="
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/draft-js-utils/-/draft-js-utils-1.4.0.tgz",
+ "integrity": "sha512-8s9FFuKC+lOWGwJ0b3om2PF+uXrqQPaEQlPJI7UxdzxTYGMeKouMPA9+YlPn52zcAVElIZtd2tXj6eQmvlKelw=="
},
"duplexer": {
"version": "0.1.1",
@@ -3276,20 +3260,20 @@
"dev": true
},
"ejs": {
- "version": "2.6.1",
- "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.6.1.tgz",
- "integrity": "sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==",
+ "version": "2.7.1",
+ "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.1.tgz",
+ "integrity": "sha512-kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ==",
"dev": true
},
"electron-to-chromium": {
- "version": "1.3.140",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.140.tgz",
- "integrity": "sha512-gznkq18tTzRWd/nHdmt9CQ/AC9Xv/TWstqKb6bhuVWE+koLg9NFlnXMwvQAUYKxIjPI2lS5TsuqqlRsCVuVdTg=="
+ "version": "1.3.260",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.260.tgz",
+ "integrity": "sha512-wGt+OivF1C1MPwaSv3LJ96ebNbLAWlx3HndivDDWqwIVSQxmhL17Y/YmwUdEMtS/bPyommELt47Dct0/VZNQBQ=="
},
"elliptic": {
- "version": "6.4.1",
- "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
- "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
+ "version": "6.5.1",
+ "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz",
+ "integrity": "sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==",
"dev": true,
"requires": {
"bn.js": "^4.4.0",
@@ -3346,9 +3330,9 @@
}
},
"entities": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
- "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
+ "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw=="
},
"errno": {
"version": "0.1.7",
@@ -3368,16 +3352,20 @@
}
},
"es-abstract": {
- "version": "1.13.0",
- "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
- "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
+ "version": "1.14.2",
+ "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.14.2.tgz",
+ "integrity": "sha512-DgoQmbpFNOofkjJtKwr87Ma5EW4Dc8fWhD0R+ndq7Oc456ivUfGOOP6oAZTTKl5/CcNMP+EN+e3/iUzgE0veZg==",
"requires": {
"es-to-primitive": "^1.2.0",
"function-bind": "^1.1.1",
"has": "^1.0.3",
+ "has-symbols": "^1.0.0",
"is-callable": "^1.1.4",
"is-regex": "^1.0.4",
- "object-keys": "^1.0.12"
+ "object-inspect": "^1.6.0",
+ "object-keys": "^1.1.1",
+ "string.prototype.trimleft": "^2.0.0",
+ "string.prototype.trimright": "^2.0.0"
}
},
"es-to-primitive": {
@@ -3391,9 +3379,9 @@
}
},
"es5-ext": {
- "version": "0.10.50",
- "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz",
- "integrity": "sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==",
+ "version": "0.10.51",
+ "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.51.tgz",
+ "integrity": "sha512-oRpWzM2WcLHVKpnrcyB7OW8j/s67Ba04JCm0WnNv3RiABSvs7mrQlutB8DBv793gKcp0XENR8Il8WxGTlZ73gQ==",
"requires": {
"es6-iterator": "~2.0.3",
"es6-symbol": "~3.1.1",
@@ -3435,25 +3423,37 @@
"es6-iterator": "~2.0.1",
"es6-symbol": "3.1.1",
"event-emitter": "~0.3.5"
+ },
+ "dependencies": {
+ "es6-symbol": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
+ "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
+ "dev": true,
+ "requires": {
+ "d": "1",
+ "es5-ext": "~0.10.14"
+ }
+ }
}
},
"es6-symbol": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
- "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.2.tgz",
+ "integrity": "sha512-/ZypxQsArlv+KHpGvng52/Iz8by3EQPxhmbuz8yFG89N/caTFBSbcXONDw0aMjy827gQg26XAjP4uXFvnfINmQ==",
"requires": {
- "d": "1",
- "es5-ext": "~0.10.14"
+ "d": "^1.0.1",
+ "es5-ext": "^0.10.51"
}
},
"es6-weak-map": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz",
- "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
+ "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
"requires": {
"d": "1",
- "es5-ext": "^0.10.14",
- "es6-iterator": "^2.0.1",
+ "es5-ext": "^0.10.46",
+ "es6-iterator": "^2.0.3",
"es6-symbol": "^3.1.1"
}
},
@@ -3552,20 +3552,10 @@
"esutils": "^2.0.2"
}
},
- "eslint-scope": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
- "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
- "dev": true,
- "requires": {
- "esrecurse": "^4.1.0",
- "estraverse": "^4.1.1"
- }
- },
"import-fresh": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.0.0.tgz",
- "integrity": "sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz",
+ "integrity": "sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==",
"dev": true,
"requires": {
"parent-module": "^1.0.0",
@@ -3590,9 +3580,9 @@
}
},
"eslint-loader": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-2.1.2.tgz",
- "integrity": "sha512-rA9XiXEOilLYPOIInvVH5S/hYfyTPyxag6DZhoQOduM+3TkghAEQ3VcFO8VnX4J4qg/UIBzp72aOf/xvYmpmsg==",
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-2.2.1.tgz",
+ "integrity": "sha512-RLgV9hoCVsMLvOxCuNjdqOrUqIj9oJg8hF44vzJaYqsAHuY9G2YAeN3joQ9nxP0p5Th9iFSIpKo+SD8KISxXRg==",
"dev": true,
"requires": {
"loader-fs-cache": "^1.0.0",
@@ -3603,24 +3593,26 @@
}
},
"eslint-plugin-react": {
- "version": "7.13.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.13.0.tgz",
- "integrity": "sha512-uA5LrHylu8lW/eAH3bEQe9YdzpPaFd9yAJTwTi/i/BKTD7j6aQMKVAdGM/ML72zD6womuSK7EiGtMKuK06lWjQ==",
+ "version": "7.14.3",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.14.3.tgz",
+ "integrity": "sha512-EzdyyBWC4Uz2hPYBiEJrKCUi2Fn+BJ9B/pJQcjw5X+x/H2Nm59S4MJIvL4O5NEE0+WbnQwEBxWY03oUk+Bc3FA==",
"dev": true,
"requires": {
"array-includes": "^3.0.3",
"doctrine": "^2.1.0",
"has": "^1.0.3",
"jsx-ast-utils": "^2.1.0",
+ "object.entries": "^1.1.0",
"object.fromentries": "^2.0.0",
+ "object.values": "^1.1.0",
"prop-types": "^15.7.2",
"resolve": "^1.10.1"
}
},
"eslint-scope": {
- "version": "3.7.1",
- "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz",
- "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+ "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
"dev": true,
"requires": {
"esrecurse": "^4.1.0",
@@ -3628,15 +3620,18 @@
}
},
"eslint-utils": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz",
- "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==",
- "dev": true
+ "version": "1.4.2",
+ "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz",
+ "integrity": "sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==",
+ "dev": true,
+ "requires": {
+ "eslint-visitor-keys": "^1.0.0"
+ }
},
"eslint-visitor-keys": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
- "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
+ "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
"dev": true
},
"espree": {
@@ -3674,15 +3669,15 @@
}
},
"estraverse": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
- "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+ "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
"dev": true
},
"esutils": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
- "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
},
"etag": {
"version": "1.8.1",
@@ -3917,9 +3912,9 @@
}
},
"external-editor": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz",
- "integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+ "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
"dev": true,
"requires": {
"chardet": "^0.7.0",
@@ -4033,26 +4028,25 @@
}
},
"fbjs": {
- "version": "0.8.17",
- "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz",
- "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=",
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-1.0.0.tgz",
+ "integrity": "sha512-MUgcMEJaFhCaF1QtWGnmq9ZDRAzECTCRAF7O6UZIlAlkTs1SasiX9aP0Iw7wfD2mJ7wDTNfg2w7u5fSCwJk1OA==",
"requires": {
- "core-js": "^1.0.0",
+ "core-js": "^2.4.1",
+ "fbjs-css-vars": "^1.0.0",
"isomorphic-fetch": "^2.1.1",
"loose-envify": "^1.0.0",
"object-assign": "^4.1.0",
"promise": "^7.1.1",
"setimmediate": "^1.0.5",
"ua-parser-js": "^0.7.18"
- },
- "dependencies": {
- "core-js": {
- "version": "1.2.7",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
- "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
- }
}
},
+ "fbjs-css-vars": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz",
+ "integrity": "sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ=="
+ },
"figgy-pudding": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
@@ -4193,12 +4187,23 @@
"flatted": "^2.0.0",
"rimraf": "2.6.3",
"write": "1.0.3"
+ },
+ "dependencies": {
+ "rimraf": {
+ "version": "2.6.3",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+ "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+ "dev": true,
+ "requires": {
+ "glob": "^7.1.3"
+ }
+ }
}
},
"flatted": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.0.tgz",
- "integrity": "sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
+ "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==",
"dev": true
},
"flush-write-stream": {
@@ -4211,12 +4216,12 @@
}
},
"follow-redirects": {
- "version": "1.7.0",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz",
- "integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==",
+ "version": "1.9.0",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.9.0.tgz",
+ "integrity": "sha512-CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A==",
"dev": true,
"requires": {
- "debug": "^3.2.6"
+ "debug": "^3.0.0"
},
"dependencies": {
"debug": {
@@ -4985,13 +4990,13 @@
}
},
"global": {
- "version": "4.3.2",
- "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz",
- "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=",
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
+ "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
"dev": true,
"requires": {
"min-document": "^2.19.0",
- "process": "~0.5.1"
+ "process": "^0.11.10"
}
},
"global-modules": {
@@ -5076,9 +5081,9 @@
}
},
"graceful-fs": {
- "version": "4.1.15",
- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
- "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
+ "version": "4.2.2",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+ "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q=="
},
"gud": {
"version": "1.0.0",
@@ -5501,11 +5506,6 @@
"kind-of": "^4.0.0"
},
"dependencies": {
- "is-buffer": {
- "version": "1.1.6",
- "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
- "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
- },
"kind-of": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
@@ -5536,45 +5536,17 @@
"minimalistic-assert": "^1.0.1"
}
},
- "hast-util-from-parse5": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-5.0.1.tgz",
- "integrity": "sha512-UfPzdl6fbxGAxqGYNThRUhRlDYY7sXu6XU9nQeX4fFZtV+IHbyEJtd+DUuwOqNV4z3K05E/1rIkoVr/JHmeWWA==",
- "requires": {
- "ccount": "^1.0.3",
- "hastscript": "^5.0.0",
- "property-information": "^5.0.0",
- "web-namespaces": "^1.1.2",
- "xtend": "^4.0.1"
- }
- },
- "hast-util-parse-selector": {
- "version": "2.2.2",
- "resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.2.tgz",
- "integrity": "sha512-jIMtnzrLTjzqgVEQqPEmwEZV+ea4zHRFTP8Z2Utw0I5HuBOXHzUPPQWr6ouJdJqDKLbFU/OEiYwZ79LalZkmmw=="
- },
- "hastscript": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/hastscript/-/hastscript-5.1.0.tgz",
- "integrity": "sha512-7mOQX5VfVs/gmrOGlN8/EDfp1GqV6P3gTNVt+KnX4gbYhpASTM8bklFdFQCbFRAadURXAmw0R1QQdBdqp7jswQ==",
- "requires": {
- "comma-separated-tokens": "^1.0.0",
- "hast-util-parse-selector": "^2.2.0",
- "property-information": "^5.0.1",
- "space-separated-tokens": "^1.0.0"
- }
- },
"history": {
- "version": "4.9.0",
- "resolved": "https://registry.npmjs.org/history/-/history-4.9.0.tgz",
- "integrity": "sha512-H2DkjCjXf0Op9OAr6nJ56fcRkTSNrUiv41vNJ6IswJjif6wlpZK0BTfFbi7qK9dXLSYZxkq5lBsj3vUjlYBYZA==",
+ "version": "4.10.1",
+ "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
+ "integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==",
"requires": {
"@babel/runtime": "^7.1.2",
"loose-envify": "^1.2.0",
- "resolve-pathname": "^2.2.0",
+ "resolve-pathname": "^3.0.0",
"tiny-invariant": "^1.0.2",
"tiny-warning": "^1.0.0",
- "value-equal": "^0.4.0"
+ "value-equal": "^1.0.1"
}
},
"hmac-drbg": {
@@ -5611,9 +5583,9 @@
"dev": true
},
"hosted-git-info": {
- "version": "2.7.1",
- "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
- "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
+ "version": "2.8.4",
+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz",
+ "integrity": "sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ=="
},
"hpack.js": {
"version": "2.1.6",
@@ -5650,12 +5622,20 @@
"setprototypeof": "1.1.1",
"statuses": ">= 1.5.0 < 2",
"toidentifier": "1.0.0"
+ },
+ "dependencies": {
+ "inherits": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+ "dev": true
+ }
}
},
"http-parser-js": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.0.tgz",
- "integrity": "sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==",
+ "version": "0.4.10",
+ "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz",
+ "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=",
"dev": true
},
"http-proxy": {
@@ -5792,10 +5772,10 @@
"integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
"dev": true
},
- "indexof": {
- "version": "0.0.1",
- "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
- "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
+ "infer-owner": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+ "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
"dev": true
},
"inflight": {
@@ -5808,9 +5788,9 @@
}
},
"inherits": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
- "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
},
"ini": {
"version": "1.3.5",
@@ -5818,9 +5798,9 @@
"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
},
"inquirer": {
- "version": "6.3.1",
- "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.3.1.tgz",
- "integrity": "sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==",
+ "version": "6.5.2",
+ "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
+ "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
"dev": true,
"requires": {
"ansi-escapes": "^3.2.0",
@@ -5829,7 +5809,7 @@
"cli-width": "^2.0.0",
"external-editor": "^3.0.3",
"figures": "^2.0.0",
- "lodash": "^4.17.11",
+ "lodash": "^4.17.12",
"mute-stream": "0.0.7",
"run-async": "^2.2.0",
"rxjs": "^6.4.0",
@@ -5945,7 +5925,13 @@
"is-windows": "^1.0.1"
}
},
- "is-accessor-descriptor": {
+ "is-absolute-url": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.2.tgz",
+ "integrity": "sha512-+5g/wLlcm1AcxSP7014m6GvbPHswDx980vD/3bZaap8aGV9Yfs7Q6y6tfaupgZ5O74Byzc8dGrSCJ+bFXx0KdA==",
+ "dev": true
+ },
+ "is-accessor-descriptor": {
"version": "0.1.6",
"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
@@ -5953,6 +5939,12 @@
"kind-of": "^3.0.2"
}
},
+ "is-arguments": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
+ "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
+ "dev": true
+ },
"is-arrayish": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -5967,9 +5959,9 @@
}
},
"is-buffer": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz",
- "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw=="
+ "version": "1.1.6",
+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
},
"is-callable": {
"version": "1.1.4",
@@ -6078,9 +6070,9 @@
}
},
"is-path-cwd": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.1.0.tgz",
- "integrity": "sha512-Sc5j3/YnM8tDeyCsVeKlm/0p95075DyLmDEIkSgQ7mXkrOX+uTCtmQFm0CYzVyJwcCCmO3k8qfJt17SxQwB5Zw=="
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
+ "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="
},
"is-path-in-cwd": {
"version": "2.1.0",
@@ -6098,11 +6090,6 @@
"path-is-inside": "^1.0.2"
}
},
- "is-plain-obj": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
- "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
- },
"is-plain-object": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
@@ -6227,9 +6214,9 @@
"integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="
},
"js-cookie": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.0.tgz",
- "integrity": "sha1-Gywnmm7s44ChIWi5JIUmWzWx7/s="
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz",
+ "integrity": "sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ=="
},
"js-levenshtein": {
"version": "1.1.6",
@@ -6341,12 +6328,13 @@
}
},
"jsx-ast-utils": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.1.0.tgz",
- "integrity": "sha512-yDGDG2DS4JcqhA6blsuYbtsT09xL8AoLuUR2Gb5exrw7UEM19sBcOTq+YBBhrNbl0PUC4R4LnFu+dHg2HKeVvA==",
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.2.1.tgz",
+ "integrity": "sha512-v3FxCcAf20DayI+uxnCuw795+oOIkVu6EnJ1+kSzhqqTZHNkTZ7B66ZgLp4oLJ/gbA64cI0B7WRoHZMSRdyVRQ==",
"dev": true,
"requires": {
- "array-includes": "^3.0.3"
+ "array-includes": "^3.0.3",
+ "object.assign": "^4.1.0"
}
},
"just-debounce": {
@@ -6366,13 +6354,6 @@
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"requires": {
"is-buffer": "^1.1.5"
- },
- "dependencies": {
- "is-buffer": {
- "version": "1.1.6",
- "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
- "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
- }
}
},
"known-css-properties": {
@@ -6548,9 +6529,9 @@
}
},
"lodash": {
- "version": "4.17.14",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
- "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw=="
+ "version": "4.17.15",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+ "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
},
"lodash._getnative": {
"version": "3.9.1",
@@ -6604,16 +6585,10 @@
"integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=",
"dev": true
},
- "lodash.tail": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz",
- "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=",
- "dev": true
- },
"loglevel": {
- "version": "1.6.2",
- "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.2.tgz",
- "integrity": "sha512-Jt2MHrCNdtIe1W6co3tF5KXGRkzF+TYffiQstfXa04mrss9IKXzAAXYWak8LbZseAQY03sH2GzMCMU0ZOUc9bg==",
+ "version": "1.6.4",
+ "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.4.tgz",
+ "integrity": "sha512-p0b6mOGKcGa+7nnmKbpzR6qloPbrgLcnio++E+14Vo/XffOGwZtRpUhr8dTH/x2oCMmEoIU0Zwm3ZauhvYD17g==",
"dev": true
},
"loose-envify": {
@@ -6771,9 +6746,9 @@
}
},
"mdn-data": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.4.tgz",
- "integrity": "sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA=="
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
+ "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="
},
"media-typer": {
"version": "0.3.0",
@@ -6942,6 +6917,16 @@
"dom-walk": "^0.1.0"
}
},
+ "mini-create-react-context": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.3.2.tgz",
+ "integrity": "sha512-2v+OeetEyliMt5VHMXsBhABoJ0/M4RCe7fatd/fBy6SMiKazUSEt3gxxypfnk2SHMkdBYvorHRoQxuGoiwbzAw==",
+ "requires": {
+ "@babel/runtime": "^7.4.0",
+ "gud": "^1.0.0",
+ "tiny-warning": "^1.0.2"
+ }
+ },
"minimalistic-assert": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -7062,9 +7047,9 @@
}
},
"ms": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
- "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
},
"multicast-dns": {
"version": "6.2.3",
@@ -7162,9 +7147,9 @@
}
},
"node-forge": {
- "version": "0.7.5",
- "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz",
- "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==",
+ "version": "0.8.2",
+ "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.8.2.tgz",
+ "integrity": "sha512-mXQ9GBq1N3uDCyV1pdSzgIguwgtVpM7f5/5J4ipz12PKWElmPpVWLDuWl8iXmhysr21+WmX/OJ5UKx82wjomgg==",
"dev": true
},
"node-gyp": {
@@ -7194,9 +7179,9 @@
}
},
"node-libs-browser": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.0.tgz",
- "integrity": "sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==",
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+ "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
"dev": true,
"requires": {
"assert": "^1.1.1",
@@ -7209,7 +7194,7 @@
"events": "^3.0.0",
"https-browserify": "^1.0.0",
"os-browserify": "^0.3.0",
- "path-browserify": "0.0.0",
+ "path-browserify": "0.0.1",
"process": "^0.11.10",
"punycode": "^1.2.4",
"querystring-es3": "^0.2.0",
@@ -7221,13 +7206,13 @@
"tty-browserify": "0.0.0",
"url": "^0.11.0",
"util": "^0.11.0",
- "vm-browserify": "0.0.4"
+ "vm-browserify": "^1.0.1"
},
"dependencies": {
- "process": {
- "version": "0.11.10",
- "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
- "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+ "inherits": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
"dev": true
},
"punycode": {
@@ -7248,9 +7233,9 @@
}
},
"node-releases": {
- "version": "1.1.22",
- "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.22.tgz",
- "integrity": "sha512-O6XpteBuntW1j86mw6LlovBIwTe+sO2+7vi9avQffNeIW4upgnaCVm6xrBWH+KATz7mNNRNNeEpuWB7dT6Cr3w==",
+ "version": "1.1.32",
+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.32.tgz",
+ "integrity": "sha512-VhVknkitq8dqtWoluagsGPn3dxTvN9fwgR59fV3D7sLBHe0JfDramsMI8n8mY//ccq/Kkrf8ZRHRpsyVZ3qw1A==",
"requires": {
"semver": "^5.3.0"
}
@@ -7415,6 +7400,17 @@
"integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==",
"dev": true
},
+ "object-inspect": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
+ "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="
+ },
+ "object-is": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.1.tgz",
+ "integrity": "sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=",
+ "dev": true
+ },
"object-keys": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
@@ -7460,6 +7456,18 @@
}
}
},
+ "object.entries": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.0.tgz",
+ "integrity": "sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA==",
+ "dev": true,
+ "requires": {
+ "define-properties": "^1.1.3",
+ "es-abstract": "^1.12.0",
+ "function-bind": "^1.1.1",
+ "has": "^1.0.3"
+ }
+ },
"object.fromentries": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.0.tgz",
@@ -7674,9 +7682,9 @@
"dev": true
},
"p-limit": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
- "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
+ "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
"dev": true,
"requires": {
"p-try": "^2.0.0"
@@ -7696,6 +7704,15 @@
"resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
"integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="
},
+ "p-retry": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz",
+ "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
+ "dev": true,
+ "requires": {
+ "retry": "^0.12.0"
+ }
+ },
"p-try": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
@@ -7709,12 +7726,12 @@
"dev": true
},
"parallel-transform": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
- "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
+ "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
"dev": true,
"requires": {
- "cyclist": "~0.2.2",
+ "cyclist": "^1.0.1",
"inherits": "^2.0.3",
"readable-stream": "^2.1.5"
}
@@ -7779,11 +7796,6 @@
"resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
"integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY="
},
- "parse5": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
- "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ=="
- },
"parseurl": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -7796,9 +7808,9 @@
"integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
},
"path-browserify": {
- "version": "0.0.0",
- "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
- "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+ "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
"dev": true
},
"path-dirname": {
@@ -7954,9 +7966,9 @@
"dev": true
},
"portfinder": {
- "version": "1.0.20",
- "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.20.tgz",
- "integrity": "sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==",
+ "version": "1.0.24",
+ "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.24.tgz",
+ "integrity": "sha512-ekRl7zD2qxYndYflwiryJwMioBI7LI7rVXg3EnLK3sjkouT5eOuhS3gS255XxBksa30VG8UPZYZCdgfGOfkSUg==",
"dev": true,
"requires": {
"async": "^1.5.2",
@@ -7987,9 +7999,9 @@
"integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
},
"postcss": {
- "version": "7.0.16",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.16.tgz",
- "integrity": "sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==",
+ "version": "7.0.18",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.18.tgz",
+ "integrity": "sha512-/7g1QXXgegpF+9GJj4iN7ChGF40sYuGYJ8WZu8DZWnmhQ/G36hfdk3q9LBJmoK+lZ+yzZ5KYpOoxq7LF1BxE8g==",
"dev": true,
"requires": {
"chalk": "^2.4.2",
@@ -8093,15 +8105,15 @@
"integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="
},
"process": {
- "version": "0.5.2",
- "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz",
- "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=",
+ "version": "0.11.10",
+ "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+ "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
"dev": true
},
"process-nextick-args": {
- "version": "1.0.7",
- "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
- "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
},
"progress": {
"version": "2.0.3",
@@ -8133,14 +8145,6 @@
"react-is": "^16.8.1"
}
},
- "property-information": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/property-information/-/property-information-5.1.0.tgz",
- "integrity": "sha512-tODH6R3+SwTkAQckSp2S9xyYX8dEKYkeXw+4TmJzTxnNzd6mQPu1OD4f9zPrvw/Rm4wpPgI+Zp63mNSGNzUgHg==",
- "requires": {
- "xtend": "^4.0.1"
- }
- },
"proxy-addr": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz",
@@ -8163,9 +8167,9 @@
"integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
},
"psl": {
- "version": "1.1.32",
- "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz",
- "integrity": "sha512-MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g=="
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
+ "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw=="
},
"public-encrypt": {
"version": "4.0.3",
@@ -8293,41 +8297,39 @@
}
},
"react": {
- "version": "16.8.6",
- "resolved": "https://registry.npmjs.org/react/-/react-16.8.6.tgz",
- "integrity": "sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==",
+ "version": "16.9.0",
+ "resolved": "https://registry.npmjs.org/react/-/react-16.9.0.tgz",
+ "integrity": "sha512-+7LQnFBwkiw+BobzOF6N//BdoNw0ouwmSJTEm9cglOOmsg/TMiFHZLe2sEoN5M7LgJTj9oHH0gxklfnQe66S1w==",
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1",
- "prop-types": "^15.6.2",
- "scheduler": "^0.13.6"
+ "prop-types": "^15.6.2"
}
},
"react-dom": {
- "version": "16.8.6",
- "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.8.6.tgz",
- "integrity": "sha512-1nL7PIq9LTL3fthPqwkvr2zY7phIPjYrT0jp4HjyEQrEROnw4dG41VVwi/wfoCneoleqrNX7iAD+pXebJZwrwA==",
+ "version": "16.9.0",
+ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.9.0.tgz",
+ "integrity": "sha512-YFT2rxO9hM70ewk9jq0y6sQk8cL02xm4+IzYBz75CQGlClQQ1Bxq0nhHF6OtSbit+AIahujJgb/CPRibFkMNJQ==",
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1",
"prop-types": "^15.6.2",
- "scheduler": "^0.13.6"
+ "scheduler": "^0.15.0"
}
},
"react-hot-loader": {
- "version": "4.8.8",
- "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.8.8.tgz",
- "integrity": "sha512-58bgeS7So8V93MhhnKogbraor8xdrTncil+b6IoIXkTIr3blJNAE7bU4tn/iJvy2J7rjxQmKFRaxKrWdKUZpqg==",
+ "version": "4.12.13",
+ "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.12.13.tgz",
+ "integrity": "sha512-4Byk3aVQhcmTnVCBvDHOEOUnMFMj81r2yRKZQSfLOG2yd/4hm/A3oK15AnCZilQExqSFSsHcK64lIIU+dU2zQQ==",
"dev": true,
"requires": {
"fast-levenshtein": "^2.0.6",
"global": "^4.3.0",
"hoist-non-react-statics": "^3.3.0",
"loader-utils": "^1.1.0",
- "lodash": "^4.17.11",
"prop-types": "^15.6.1",
"react-lifecycles-compat": "^3.0.4",
- "shallowequal": "^1.0.2",
+ "shallowequal": "^1.1.0",
"source-map": "^0.7.3"
},
"dependencies": {
@@ -8340,9 +8342,9 @@
}
},
"react-is": {
- "version": "16.8.6",
- "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz",
- "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA=="
+ "version": "16.9.0",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.9.0.tgz",
+ "integrity": "sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw=="
},
"react-lifecycles-compat": {
"version": "3.0.4",
@@ -8350,39 +8352,39 @@
"integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
},
"react-modal": {
- "version": "3.8.1",
- "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.8.1.tgz",
- "integrity": "sha512-aLKeZM9pgXpIKVwopRHMuvqKWiBajkqisDA8UzocdCF6S4fyKVfLWmZR5G1Q0ODBxxxxf2XIwiCP8G/11GJAuw==",
+ "version": "3.10.1",
+ "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.10.1.tgz",
+ "integrity": "sha512-2DKIfdOc8+WY+SYJ/xf/WBwOYMmNAYAyGkYlc4e1TCs9rk1xY4QBz04hB3UHGcrLChh7ce77rHAe6VPNmuLYsQ==",
"requires": {
"exenv": "^1.2.0",
"prop-types": "^15.5.10",
"react-lifecycles-compat": "^3.0.0",
- "warning": "^3.0.0"
+ "warning": "^4.0.3"
}
},
"react-redux": {
- "version": "7.0.3",
- "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.0.3.tgz",
- "integrity": "sha512-vYZA7ftOYlDk3NetitsI7fLjryt/widNl1SLXYvFenIpm7vjb4ryK0EeFrgn62usg5fYkyIAWNUPKnwWPevKLg==",
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.1.1.tgz",
+ "integrity": "sha512-QsW0vcmVVdNQzEkrgzh2W3Ksvr8cqpAv5FhEk7tNEft+5pp7rXxAudTz3VOPawRkLIepItpkEIyLcN/VVXzjTg==",
"requires": {
- "@babel/runtime": "^7.4.3",
+ "@babel/runtime": "^7.5.5",
"hoist-non-react-statics": "^3.3.0",
"invariant": "^2.2.4",
"loose-envify": "^1.4.0",
"prop-types": "^15.7.2",
- "react-is": "^16.8.6"
+ "react-is": "^16.9.0"
}
},
"react-router": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.0.0.tgz",
- "integrity": "sha512-6EQDakGdLG/it2x9EaCt9ZpEEPxnd0OCLBHQ1AcITAAx7nCnyvnzf76jKWG1s2/oJ7SSviUgfWHofdYljFexsA==",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.0.1.tgz",
+ "integrity": "sha512-EM7suCPNKb1NxcTZ2LEOWFtQBQRQXecLxVpdsP4DW4PbbqYWeRiLyV/Tt1SdCrvT2jcyXAXmVTmzvSzrPR63Bg==",
"requires": {
"@babel/runtime": "^7.1.2",
- "create-react-context": "^0.2.2",
"history": "^4.9.0",
"hoist-non-react-statics": "^3.1.0",
"loose-envify": "^1.3.1",
+ "mini-create-react-context": "^0.3.0",
"path-to-regexp": "^1.7.0",
"prop-types": "^15.6.2",
"react-is": "^16.6.0",
@@ -8391,15 +8393,15 @@
}
},
"react-router-dom": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.0.0.tgz",
- "integrity": "sha512-wSpja5g9kh5dIteZT3tUoggjnsa+TPFHSMrpHXMpFsaHhQkm/JNVGh2jiF9Dkh4+duj4MKCkwO6H08u6inZYgQ==",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.0.1.tgz",
+ "integrity": "sha512-zaVHSy7NN0G91/Bz9GD4owex5+eop+KvgbxXsP/O+iW1/Ln+BrJ8QiIR5a6xNPtrdTvLkxqlDClx13QO1uB8CA==",
"requires": {
"@babel/runtime": "^7.1.2",
"history": "^4.9.0",
"loose-envify": "^1.3.1",
"prop-types": "^15.6.2",
- "react-router": "5.0.0",
+ "react-router": "5.0.1",
"tiny-invariant": "^1.0.2",
"tiny-warning": "^1.0.0"
}
@@ -8422,19 +8424,20 @@
}
},
"react-transition-group": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.1.0.tgz",
- "integrity": "sha512-/OITbogb3emGN49WaP7468QGSde7er5w6eIHldIDCSQBq/9QTSCzs8OgpgmOnaUXCXzBUcK1zoZ6DqRlM8CJtA==",
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.3.0.tgz",
+ "integrity": "sha512-1qRV1ZuVSdxPlPf4O8t7inxUGpdyO5zG9IoNfJxSO0ImU2A1YWkEQvFPuIPZmMLkg5hYs7vv5mMOyfgSkvAwvw==",
"requires": {
- "dom-helpers": "^3.4.0",
+ "@babel/runtime": "^7.5.5",
+ "dom-helpers": "^5.0.1",
"loose-envify": "^1.4.0",
"prop-types": "^15.6.2"
}
},
"react-window-size-listener": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/react-window-size-listener/-/react-window-size-listener-1.4.0.tgz",
- "integrity": "sha512-aD+82xL04MqXDUW5LSW05qRumyhrfBD0Q4K9GOMaiff6lPx5Q8hkfABWXmyO9R4seHsyT3r+bVtIWJZ2HiIeFQ==",
+ "version": "1.5.4",
+ "resolved": "https://registry.npmjs.org/react-window-size-listener/-/react-window-size-listener-1.5.4.tgz",
+ "integrity": "sha512-yKYIlULn2CMbGubFcC2nBnhJVIFtxqHYkbh++LmWMq6jxFt24Q6xDM9ml6Sv9QR5G4hYD2gdLodg02xo/oXSsA==",
"requires": {
"lodash.debounce": "^3.1.1",
"prop-types": "^15.6.0",
@@ -8472,13 +8475,6 @@
"safe-buffer": "~5.1.1",
"string_decoder": "~1.1.1",
"util-deprecate": "~1.0.1"
- },
- "dependencies": {
- "process-nextick-args": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
- "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
- }
}
},
"readdirp": {
@@ -8528,9 +8524,9 @@
}
},
"redux": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/redux/-/redux-4.0.1.tgz",
- "integrity": "sha512-R7bAtSkk7nY6O/OYMVR9RiBI+XghjF9rlbl5806HJbQph0LJVHZrU5oaO4q70eUKiqMRqm4y07KLTlMZ2BlVmg==",
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/redux/-/redux-4.0.4.tgz",
+ "integrity": "sha512-vKv4WdiJxOWKxK0yRoaK3Y4pxxB0ilzVx6dszU2W8wLxlb2yikRph4iV/ymtdJ6ZxpBLFbyrxklnT5yBbQSl3Q==",
"requires": {
"loose-envify": "^1.4.0",
"symbol-observable": "^1.2.0"
@@ -8569,14 +8565,14 @@
}
},
"regenerator-runtime": {
- "version": "0.13.2",
- "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz",
- "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA=="
+ "version": "0.13.3",
+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
+ "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="
},
"regenerator-transform": {
- "version": "0.14.0",
- "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.0.tgz",
- "integrity": "sha512-rtOelq4Cawlbmq9xuMR5gdFmv7ku/sFoB7sRiywx7aq53bc52b4j6zvH7Te1Vt/X2YveDKnCGUbioieU7FEL3w==",
+ "version": "0.14.1",
+ "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.1.tgz",
+ "integrity": "sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==",
"requires": {
"private": "^0.1.6"
}
@@ -8591,9 +8587,18 @@
}
},
"regexp-tree": {
- "version": "0.1.10",
- "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.10.tgz",
- "integrity": "sha512-K1qVSbcedffwuIslMwpe6vGlj+ZXRnGkvjAtFHfDZZZuEdA/h0dxljAPu9vhUo6Rrx2U2AwJ+nSQ6hK+lrP5MQ=="
+ "version": "0.1.13",
+ "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.13.tgz",
+ "integrity": "sha512-hwdV/GQY5F8ReLZWO+W1SRoN5YfpOKY6852+tBFcma72DKBIcHjPRIlIvQN35bCOljuAfP2G2iB0FC/w236mUw=="
+ },
+ "regexp.prototype.flags": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz",
+ "integrity": "sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==",
+ "dev": true,
+ "requires": {
+ "define-properties": "^1.1.2"
+ }
},
"regexpp": {
"version": "2.0.1",
@@ -8602,12 +8607,12 @@
"dev": true
},
"regexpu-core": {
- "version": "4.5.4",
- "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz",
- "integrity": "sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==",
+ "version": "4.6.0",
+ "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.6.0.tgz",
+ "integrity": "sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==",
"requires": {
"regenerate": "^1.4.0",
- "regenerate-unicode-properties": "^8.0.2",
+ "regenerate-unicode-properties": "^8.1.0",
"regjsgen": "^0.5.0",
"regjsparser": "^0.6.0",
"unicode-match-property-ecmascript": "^1.0.4",
@@ -8634,16 +8639,6 @@
}
}
},
- "rehype-parse": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/rehype-parse/-/rehype-parse-6.0.0.tgz",
- "integrity": "sha512-V2OjMD0xcSt39G4uRdMTqDXXm6HwkUbLMDayYKA/d037j8/OtVSQ+tqKwYWOuyBeoCs/3clXRe30VUjeMDTBSA==",
- "requires": {
- "hast-util-from-parse5": "^5.0.0",
- "parse5": "^5.0.0",
- "xtend": "^4.0.1"
- }
- },
"remove-bom-buffer": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
@@ -8651,13 +8646,6 @@
"requires": {
"is-buffer": "^1.1.5",
"is-utf8": "^0.2.1"
- },
- "dependencies": {
- "is-buffer": {
- "version": "1.1.6",
- "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
- "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
- }
}
},
"remove-bom-stream": {
@@ -8790,9 +8778,9 @@
"integrity": "sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA=="
},
"resolve": {
- "version": "1.11.0",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz",
- "integrity": "sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==",
+ "version": "1.12.0",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
+ "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
"requires": {
"path-parse": "^1.0.6"
}
@@ -8829,9 +8817,9 @@
}
},
"resolve-pathname": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-2.2.0.tgz",
- "integrity": "sha512-bAFz9ld18RzJfddgrO2e/0S2O81710++chRMUxHjXOYKF6jTAMrUNZrEZ1PvV0zlhfjidm08iRPdTLPno1FuRg=="
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz",
+ "integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng=="
},
"resolve-url": {
"version": "0.2.1",
@@ -8853,10 +8841,16 @@
"resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
"integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
},
+ "retry": {
+ "version": "0.12.0",
+ "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+ "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
+ "dev": true
+ },
"rimraf": {
- "version": "2.6.3",
- "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
- "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+ "version": "2.7.1",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
"requires": {
"glob": "^7.1.3"
}
@@ -8896,9 +8890,9 @@
"dev": true
},
"rxjs": {
- "version": "6.5.2",
- "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz",
- "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==",
+ "version": "6.5.3",
+ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz",
+ "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==",
"dev": true,
"requires": {
"tslib": "^1.9.0"
@@ -9197,6 +9191,15 @@
"onetime": "^1.0.0"
}
},
+ "rimraf": {
+ "version": "2.6.3",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+ "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+ "dev": true,
+ "requires": {
+ "glob": "^7.1.3"
+ }
+ },
"run-async": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz",
@@ -9277,38 +9280,27 @@
}
},
"sass-loader": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz",
- "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==",
+ "version": "7.3.1",
+ "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.3.1.tgz",
+ "integrity": "sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==",
"dev": true,
"requires": {
- "clone-deep": "^2.0.1",
+ "clone-deep": "^4.0.1",
"loader-utils": "^1.0.1",
- "lodash.tail": "^4.1.1",
"neo-async": "^2.5.0",
- "pify": "^3.0.0",
- "semver": "^5.5.0"
+ "pify": "^4.0.1",
+ "semver": "^6.3.0"
},
"dependencies": {
"clone-deep": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz",
- "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+ "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
"dev": true,
"requires": {
- "for-own": "^1.0.0",
"is-plain-object": "^2.0.4",
- "kind-of": "^6.0.0",
- "shallow-clone": "^1.0.0"
- }
- },
- "for-own": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
- "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
- "dev": true,
- "requires": {
- "for-in": "^1.0.1"
+ "kind-of": "^6.0.2",
+ "shallow-clone": "^3.0.0"
}
},
"kind-of": {
@@ -9317,29 +9309,19 @@
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
"dev": true
},
- "pify": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
- "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+ "semver": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
},
"shallow-clone": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz",
- "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+ "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
"dev": true,
"requires": {
- "is-extendable": "^0.1.1",
- "kind-of": "^5.0.0",
- "mixin-object": "^2.0.1"
- },
- "dependencies": {
- "kind-of": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
- "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
- "dev": true
- }
+ "kind-of": "^6.0.2"
}
}
}
@@ -9350,9 +9332,9 @@
"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
},
"scheduler": {
- "version": "0.13.6",
- "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.6.tgz",
- "integrity": "sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==",
+ "version": "0.15.0",
+ "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.15.0.tgz",
+ "integrity": "sha512-xAefmSfN6jqAa7Kuq7LIJY0bwAPG3xlCj0HMEBQk1lxYiDKZscY2xJ5U/61ZTrYbmNQbXa+gc7czPkVo11tnCg==",
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1"
@@ -9400,18 +9382,18 @@
"dev": true
},
"selfsigned": {
- "version": "1.10.4",
- "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.4.tgz",
- "integrity": "sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==",
+ "version": "1.10.6",
+ "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.6.tgz",
+ "integrity": "sha512-i3+CeqxL7DpAazgVpAGdKMwHuL63B5nhJMh9NQ7xmChGkA3jNFflq6Jyo1LLJYcr3idWiNOPWHCrm4zMayLG4w==",
"dev": true,
"requires": {
- "node-forge": "0.7.5"
+ "node-forge": "0.8.2"
}
},
"semver": {
- "version": "5.7.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
- "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
},
"semver-greatest-satisfied-range": {
"version": "1.1.0",
@@ -9458,13 +9440,19 @@
"dev": true
}
}
+ },
+ "ms": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+ "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+ "dev": true
}
}
},
"serialize-javascript": {
- "version": "1.7.0",
- "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz",
- "integrity": "sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==",
+ "version": "1.9.1",
+ "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz",
+ "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==",
"dev": true
},
"serve-index": {
@@ -9503,6 +9491,12 @@
"statuses": ">= 1.4.0 < 2"
}
},
+ "inherits": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+ "dev": true
+ },
"ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -9587,11 +9581,6 @@
"mixin-object": "^2.0.1"
},
"dependencies": {
- "is-buffer": {
- "version": "1.1.6",
- "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
- "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
- },
"kind-of": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
@@ -9779,9 +9768,9 @@
}
},
"sockjs-client": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz",
- "integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==",
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz",
+ "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==",
"dev": true,
"requires": {
"debug": "^3.2.5",
@@ -9802,9 +9791,9 @@
}
},
"faye-websocket": {
- "version": "0.11.1",
- "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
- "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+ "version": "0.11.3",
+ "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
+ "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
"dev": true,
"requires": {
"websocket-driver": ">=0.5.1"
@@ -9836,9 +9825,9 @@
}
},
"source-map-support": {
- "version": "0.5.12",
- "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
- "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
+ "version": "0.5.13",
+ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+ "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
"dev": true,
"requires": {
"buffer-from": "^1.0.0",
@@ -9858,11 +9847,6 @@
"resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
"integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
},
- "space-separated-tokens": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.4.tgz",
- "integrity": "sha512-UyhMSmeIqZrQn2UdjYpxEkwY9JUrn8pP+7L4f91zRzOQuI8MF1FGLfYU9DKCYeLdo7LXMxwrX5zKFy7eeeVHuA=="
- },
"sparkles": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
@@ -9892,14 +9876,14 @@
}
},
"spdx-license-ids": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz",
- "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA=="
+ "version": "3.0.5",
+ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+ "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="
},
"spdy": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.0.tgz",
- "integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz",
+ "integrity": "sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==",
"dev": true,
"requires": {
"debug": "^4.1.0",
@@ -10075,6 +10059,24 @@
"strip-ansi": "^3.0.0"
}
},
+ "string.prototype.trimleft": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz",
+ "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==",
+ "requires": {
+ "define-properties": "^1.1.3",
+ "function-bind": "^1.1.1"
+ }
+ },
+ "string.prototype.trimright": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz",
+ "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==",
+ "requires": {
+ "define-properties": "^1.1.3",
+ "function-bind": "^1.1.1"
+ }
+ },
"string_decoder": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -10152,17 +10154,21 @@
"es6-symbol": "^3.1.1"
}
},
+ "svg-parser": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.2.tgz",
+ "integrity": "sha512-1gtApepKFweigFZj3sGO8KT8LvVZK8io146EzXrpVuWCDAbISz/yMucco3hWTkpZNoPabM+dnMOpy6Swue68Zg=="
+ },
"svgo": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.2.2.tgz",
- "integrity": "sha512-rAfulcwp2D9jjdGu+0CuqlrAUin6bBWrpoqXWwKDZZZJfXcUXQSxLJOFJCQCSA0x0pP2U0TxSlJu2ROq5Bq6qA==",
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.0.tgz",
+ "integrity": "sha512-MLfUA6O+qauLDbym+mMZgtXCGRfIxyQoeH6IKVcFslyODEe/ElJNwr0FohQ3xG4C6HK6bk3KYPPXwHVJk3V5NQ==",
"requires": {
"chalk": "^2.4.1",
"coa": "^2.0.2",
"css-select": "^2.0.0",
"css-select-base-adapter": "^0.1.1",
- "css-tree": "1.0.0-alpha.28",
- "css-url-regex": "^1.1.0",
+ "css-tree": "1.0.0-alpha.33",
"csso": "^3.5.1",
"js-yaml": "^3.13.1",
"mkdirp": "~0.5.1",
@@ -10179,18 +10185,18 @@
"integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
},
"synthetic-dom": {
- "version": "1.3.3",
- "resolved": "https://registry.npmjs.org/synthetic-dom/-/synthetic-dom-1.3.3.tgz",
- "integrity": "sha512-ILjWWiiHIAYphm+F3w0V+A4a79HHF3ELZc6v7H3/kVzCvoxqHWTySN10M7vUOMpZFeRkwz/LmXsW10eFu79bdQ=="
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/synthetic-dom/-/synthetic-dom-1.4.0.tgz",
+ "integrity": "sha512-mHv51ZsmZ+ShT/4s5kg+MGUIhY7Ltq4v03xpN1c8T1Krb5pScsh/lzEjyhrVD0soVDbThbd2e+4dD9vnDG4rhg=="
},
"table": {
- "version": "5.4.0",
- "resolved": "https://registry.npmjs.org/table/-/table-5.4.0.tgz",
- "integrity": "sha512-nHFDrxmbrkU7JAFKqKbDJXfzrX2UBsWmrieXFTGxiI5e4ncg3VqsZeI4EzNmX0ncp4XNGVeoxIWJXfCIXwrsvw==",
+ "version": "5.4.6",
+ "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
+ "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
"dev": true,
"requires": {
- "ajv": "^6.9.1",
- "lodash": "^4.17.11",
+ "ajv": "^6.10.2",
+ "lodash": "^4.17.14",
"slice-ansi": "^2.1.0",
"string-width": "^3.0.0"
},
@@ -10246,14 +10252,14 @@
}
},
"terser": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/terser/-/terser-4.0.0.tgz",
- "integrity": "sha512-dOapGTU0hETFl1tCo4t56FN+2jffoKyER9qBGoUFyZ6y7WLoKT0bF+lAYi6B6YsILcGF3q1C2FBh8QcKSCgkgA==",
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/terser/-/terser-4.3.1.tgz",
+ "integrity": "sha512-pnzH6dnFEsR2aa2SJaKb1uSCl3QmIsJ8dEkj0Fky+2AwMMcC9doMqLOQIH6wVTEKaVfKVvLSk5qxPBEZT9mywg==",
"dev": true,
"requires": {
- "commander": "^2.19.0",
+ "commander": "^2.20.0",
"source-map": "~0.6.1",
- "source-map-support": "~0.5.10"
+ "source-map-support": "~0.5.12"
},
"dependencies": {
"source-map": {
@@ -10265,20 +10271,19 @@
}
},
"terser-webpack-plugin": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz",
- "integrity": "sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==",
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz",
+ "integrity": "sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==",
"dev": true,
"requires": {
- "cacache": "^11.3.2",
- "find-cache-dir": "^2.0.0",
+ "cacache": "^12.0.2",
+ "find-cache-dir": "^2.1.0",
"is-wsl": "^1.1.0",
- "loader-utils": "^1.2.3",
"schema-utils": "^1.0.0",
"serialize-javascript": "^1.7.0",
"source-map": "^0.6.1",
- "terser": "^4.0.0",
- "webpack-sources": "^1.3.0",
+ "terser": "^4.1.2",
+ "webpack-sources": "^1.4.0",
"worker-farm": "^1.7.0"
},
"dependencies": {
@@ -10332,9 +10337,9 @@
"integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM="
},
"timers-browserify": {
- "version": "2.0.10",
- "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
- "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
+ "version": "2.0.11",
+ "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
+ "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
"dev": true,
"requires": {
"setimmediate": "^1.0.4"
@@ -10351,14 +10356,14 @@
}
},
"tiny-invariant": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.0.4.tgz",
- "integrity": "sha512-lMhRd/djQJ3MoaHEBrw8e2/uM4rs9YMNk0iOr8rHQ0QdbM7D4l0gFl3szKdeixrlyfm9Zqi4dxHCM2qVG8ND5g=="
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.0.6.tgz",
+ "integrity": "sha512-FOyLWWVjG+aC0UqG76V53yAWdXfH8bO6FNmyZOuUrzDzK8DI3/JRY25UD7+g49JWM1LXwymsKERB+DzI0dTEQA=="
},
"tiny-warning": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.2.tgz",
- "integrity": "sha512-rru86D9CpQRLvsFG5XFdy0KdLAvjdQDyZCsRcuu60WtzFylDM3eAWSxEVz5kzL2Gp544XiUvPbVKtOA/txLi9Q=="
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
+ "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
},
"tmp": {
"version": "0.0.33",
@@ -10457,11 +10462,6 @@
"resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM="
},
- "trough": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.4.tgz",
- "integrity": "sha512-tdzBRDGWcI1OpPVmChbdSKhvSVurznZ8X36AYURAcl+0o2ldlCY2XPzyXNNxwJwwyIU+rIglTCG4kxtNKBQH7Q=="
- },
"true-case-path": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
@@ -10477,9 +10477,9 @@
"dev": true
},
"tslib": {
- "version": "1.9.3",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
- "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",
+ "version": "1.10.0",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
+ "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
"dev": true
},
"tty-browserify": {
@@ -10501,6 +10501,11 @@
"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
},
+ "type": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/type/-/type-1.0.3.tgz",
+ "integrity": "sha512-51IMtNfVcee8+9GJvj0spSuFcZHe9vSib6Xtgsny1Km9ugyz2mbS08I3rsUIRYgJohFRFU1160sgRodYz378Hg=="
+ },
"type-check": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -10526,9 +10531,9 @@
"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
},
"ua-parser-js": {
- "version": "0.7.19",
- "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.19.tgz",
- "integrity": "sha512-T3PVJ6uz8i0HzPxOF9SWzWAlfN/DavlpQqepn22xgve/5QecC+XMCAtmUNnY7C9StehaV6exjUCI801lOI7QlQ=="
+ "version": "0.7.20",
+ "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.20.tgz",
+ "integrity": "sha512-8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw=="
},
"uglify-js": {
"version": "3.6.0",
@@ -10596,34 +10601,6 @@
"resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz",
"integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw=="
},
- "unified": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/unified/-/unified-7.1.0.tgz",
- "integrity": "sha512-lbk82UOIGuCEsZhPj8rNAkXSDXd6p0QLzIuSsCdxrqnqU56St4eyOB+AlXsVgVeRmetPTYydIuvFfpDIed8mqw==",
- "requires": {
- "@types/unist": "^2.0.0",
- "@types/vfile": "^3.0.0",
- "bail": "^1.0.0",
- "extend": "^3.0.0",
- "is-plain-obj": "^1.1.0",
- "trough": "^1.0.0",
- "vfile": "^3.0.0",
- "x-is-string": "^0.1.0"
- },
- "dependencies": {
- "vfile": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/vfile/-/vfile-3.0.1.tgz",
- "integrity": "sha512-y7Y3gH9BsUSdD4KzHsuMaCzRjglXN0W2EcMf0gpvu6+SbsGhMje7xDc8AEoeXy6mIwCKMI6BkjMsRjzQbhMEjQ==",
- "requires": {
- "is-buffer": "^2.0.0",
- "replace-ext": "1.0.0",
- "unist-util-stringify-position": "^1.0.0",
- "vfile-message": "^1.0.0"
- }
- }
- }
- },
"union-value": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
@@ -10651,9 +10628,9 @@
}
},
"unique-slug": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
- "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+ "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
"dev": true,
"requires": {
"imurmurhash": "^0.1.4"
@@ -10668,11 +10645,6 @@
"through2-filter": "^3.0.0"
}
},
- "unist-util-stringify-position": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz",
- "integrity": "sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ=="
- },
"universalify": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -10727,9 +10699,9 @@
}
},
"upath": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
- "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q=="
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+ "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="
},
"uri-js": {
"version": "4.2.2",
@@ -10793,6 +10765,14 @@
"dev": true,
"requires": {
"inherits": "2.0.3"
+ },
+ "dependencies": {
+ "inherits": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+ "dev": true
+ }
}
},
"util-deprecate": {
@@ -10816,9 +10796,9 @@
"dev": true
},
"uuid": {
- "version": "3.3.2",
- "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
- "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+ "version": "3.3.3",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
+ "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="
},
"v8-compile-cache": {
"version": "2.0.3",
@@ -10844,9 +10824,9 @@
}
},
"value-equal": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-0.4.0.tgz",
- "integrity": "sha512-x+cYdNnaA3CxvMaTX0INdTCN8m8aF2uY9BvEqmxuYp8bL09cs/kWVQPVGcA35fMktdOsP69IgU7wFj/61dJHEw=="
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz",
+ "integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw=="
},
"value-or-function": {
"version": "3.0.0",
@@ -10869,45 +10849,6 @@
"extsprintf": "^1.2.0"
}
},
- "vfile": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.0.1.tgz",
- "integrity": "sha512-lRHFCuC4SQBFr7Uq91oJDJxlnftoTLQ7eKIpMdubhYcVMho4781a8MWXLy3qZrZ0/STD1kRiKc0cQOHm4OkPeA==",
- "requires": {
- "@types/unist": "^2.0.0",
- "is-buffer": "^2.0.0",
- "replace-ext": "1.0.0",
- "unist-util-stringify-position": "^2.0.0",
- "vfile-message": "^2.0.0"
- },
- "dependencies": {
- "unist-util-stringify-position": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.1.tgz",
- "integrity": "sha512-Zqlf6+FRI39Bah8Q6ZnNGrEHUhwJOkHde2MHVk96lLyftfJJckaPslKgzhVcviXj8KcE9UJM9F+a4JEiBUTYgA==",
- "requires": {
- "@types/unist": "^2.0.2"
- }
- },
- "vfile-message": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.1.tgz",
- "integrity": "sha512-KtasSV+uVU7RWhUn4Lw+wW1Zl/nW8JWx7JCPps10Y9JRRIDeDXf8wfBLoOSsJLyo27DqMyAi54C6Jf/d6Kr2Bw==",
- "requires": {
- "@types/unist": "^2.0.2",
- "unist-util-stringify-position": "^2.0.0"
- }
- }
- }
- },
- "vfile-message": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-1.1.1.tgz",
- "integrity": "sha512-1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA==",
- "requires": {
- "unist-util-stringify-position": "^1.1.1"
- }
- },
"vinyl": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
@@ -10968,18 +10909,15 @@
}
},
"vm-browserify": {
- "version": "0.0.4",
- "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
- "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
- "dev": true,
- "requires": {
- "indexof": "0.0.1"
- }
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz",
+ "integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==",
+ "dev": true
},
"warning": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
- "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+ "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
"requires": {
"loose-envify": "^1.0.0"
}
@@ -11004,59 +10942,41 @@
"minimalistic-assert": "^1.0.0"
}
},
- "web-namespaces": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-1.1.3.tgz",
- "integrity": "sha512-r8sAtNmgR0WKOKOxzuSgk09JsHlpKlB+uHi937qypOu3PZ17UxPrierFKDye/uNHjNTTEshu5PId8rojIPj/tA=="
- },
"webpack": {
- "version": "4.32.2",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.32.2.tgz",
- "integrity": "sha512-F+H2Aa1TprTQrpodRAWUMJn7A8MgDx82yQiNvYMaj3d1nv3HetKU0oqEulL9huj8enirKi8KvEXQ3QtuHF89Zg==",
+ "version": "4.40.2",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.40.2.tgz",
+ "integrity": "sha512-5nIvteTDCUws2DVvP9Qe+JPla7kWPPIDFZv55To7IycHWZ+Z5qBdaBYPyuXWdhggTufZkQwfIK+5rKQTVovm2A==",
"dev": true,
"requires": {
"@webassemblyjs/ast": "1.8.5",
"@webassemblyjs/helper-module-context": "1.8.5",
"@webassemblyjs/wasm-edit": "1.8.5",
"@webassemblyjs/wasm-parser": "1.8.5",
- "acorn": "^6.0.5",
- "acorn-dynamic-import": "^4.0.0",
- "ajv": "^6.1.0",
- "ajv-keywords": "^3.1.0",
- "chrome-trace-event": "^1.0.0",
+ "acorn": "^6.2.1",
+ "ajv": "^6.10.2",
+ "ajv-keywords": "^3.4.1",
+ "chrome-trace-event": "^1.0.2",
"enhanced-resolve": "^4.1.0",
- "eslint-scope": "^4.0.0",
+ "eslint-scope": "^4.0.3",
"json-parse-better-errors": "^1.0.2",
- "loader-runner": "^2.3.0",
- "loader-utils": "^1.1.0",
- "memory-fs": "~0.4.1",
- "micromatch": "^3.1.8",
- "mkdirp": "~0.5.0",
- "neo-async": "^2.5.0",
- "node-libs-browser": "^2.0.0",
+ "loader-runner": "^2.4.0",
+ "loader-utils": "^1.2.3",
+ "memory-fs": "^0.4.1",
+ "micromatch": "^3.1.10",
+ "mkdirp": "^0.5.1",
+ "neo-async": "^2.6.1",
+ "node-libs-browser": "^2.2.1",
"schema-utils": "^1.0.0",
- "tapable": "^1.1.0",
- "terser-webpack-plugin": "^1.1.0",
- "watchpack": "^1.5.0",
- "webpack-sources": "^1.3.0"
- },
- "dependencies": {
- "eslint-scope": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
- "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
- "dev": true,
- "requires": {
- "esrecurse": "^4.1.0",
- "estraverse": "^4.1.1"
- }
- }
+ "tapable": "^1.1.3",
+ "terser-webpack-plugin": "^1.4.1",
+ "watchpack": "^1.6.0",
+ "webpack-sources": "^1.4.1"
}
},
"webpack-bundle-analyzer": {
- "version": "3.3.2",
- "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.3.2.tgz",
- "integrity": "sha512-7qvJLPKB4rRWZGjVp5U1KEjwutbDHSKboAl0IfafnrdXMrgC0tOtZbQD6Rw0u4cmpgRN4O02Fc0t8eAT+FgGzA==",
+ "version": "3.5.0",
+ "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.5.0.tgz",
+ "integrity": "sha512-NzueflueLSJxWGzDlMq5oUV+P8Qoq6yiaQlXGCbDYUpHEKlmzWdPLBJ4k/B6HTdAP/vHM8ply1Fx08mDnY+S8Q==",
"dev": true,
"requires": {
"acorn": "^6.0.7",
@@ -11068,7 +10988,7 @@
"express": "^4.16.3",
"filesize": "^3.6.1",
"gzip-size": "^5.0.0",
- "lodash": "^4.17.10",
+ "lodash": "^4.17.15",
"mkdirp": "^0.5.1",
"opener": "^1.5.1",
"ws": "^6.0.0"
@@ -11115,39 +11035,39 @@
}
},
"webpack-cli": {
- "version": "3.3.2",
- "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.2.tgz",
- "integrity": "sha512-FLkobnaJJ+03j5eplxlI0TUxhGCOdfewspIGuvDVtpOlrAuKMFC57K42Ukxqs1tn8947/PM6tP95gQc0DCzRYA==",
- "dev": true,
- "requires": {
- "chalk": "^2.4.1",
- "cross-spawn": "^6.0.5",
- "enhanced-resolve": "^4.1.0",
- "findup-sync": "^2.0.0",
- "global-modules": "^1.0.0",
- "import-local": "^2.0.0",
- "interpret": "^1.1.0",
- "loader-utils": "^1.1.0",
- "supports-color": "^5.5.0",
- "v8-compile-cache": "^2.0.2",
- "yargs": "^12.0.5"
+ "version": "3.3.9",
+ "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.9.tgz",
+ "integrity": "sha512-xwnSxWl8nZtBl/AFJCOn9pG7s5CYUYdZxmmukv+fAHLcBIHM36dImfpQg3WfShZXeArkWlf6QRw24Klcsv8a5A==",
+ "dev": true,
+ "requires": {
+ "chalk": "2.4.2",
+ "cross-spawn": "6.0.5",
+ "enhanced-resolve": "4.1.0",
+ "findup-sync": "3.0.0",
+ "global-modules": "2.0.0",
+ "import-local": "2.0.0",
+ "interpret": "1.2.0",
+ "loader-utils": "1.2.3",
+ "supports-color": "6.1.0",
+ "v8-compile-cache": "2.0.3",
+ "yargs": "13.2.4"
},
"dependencies": {
"ansi-regex": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
- "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+ "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
"dev": true
},
"cliui": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
- "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+ "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
"dev": true,
"requires": {
- "string-width": "^2.1.1",
- "strip-ansi": "^4.0.0",
- "wrap-ansi": "^2.0.0"
+ "string-width": "^3.1.0",
+ "strip-ansi": "^5.2.0",
+ "wrap-ansi": "^5.1.0"
}
},
"cross-spawn": {
@@ -11172,16 +11092,30 @@
"locate-path": "^3.0.0"
}
},
- "findup-sync": {
+ "get-caller-file": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+ "dev": true
+ },
+ "global-modules": {
"version": "2.0.0",
- "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
- "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
+ "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
+ "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
"dev": true,
"requires": {
- "detect-file": "^1.0.0",
- "is-glob": "^3.1.0",
- "micromatch": "^3.0.4",
- "resolve-dir": "^1.0.1"
+ "global-prefix": "^3.0.0"
+ }
+ },
+ "global-prefix": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
+ "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
+ "dev": true,
+ "requires": {
+ "ini": "^1.3.5",
+ "kind-of": "^6.0.2",
+ "which": "^1.3.1"
}
},
"invert-kv": {
@@ -11196,14 +11130,11 @@
"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
"dev": true
},
- "is-glob": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
- "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
- "dev": true,
- "requires": {
- "is-extglob": "^2.1.0"
- }
+ "kind-of": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+ "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+ "dev": true
},
"lcid": {
"version": "2.0.0",
@@ -11225,23 +11156,39 @@
"mem": "^4.0.0"
}
},
+ "require-main-filename": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+ "dev": true
+ },
"string-width": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
- "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+ "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
"dev": true,
"requires": {
+ "emoji-regex": "^7.0.1",
"is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^4.0.0"
+ "strip-ansi": "^5.1.0"
}
},
"strip-ansi": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
- "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
"dev": true,
"requires": {
- "ansi-regex": "^3.0.0"
+ "ansi-regex": "^4.1.0"
+ }
+ },
+ "supports-color": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+ "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^3.0.0"
}
},
"which-module": {
@@ -11250,30 +11197,46 @@
"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
"dev": true
},
+ "wrap-ansi": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+ "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^3.2.0",
+ "string-width": "^3.0.0",
+ "strip-ansi": "^5.0.0"
+ }
+ },
+ "y18n": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+ "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+ "dev": true
+ },
"yargs": {
- "version": "12.0.5",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
- "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+ "version": "13.2.4",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz",
+ "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==",
"dev": true,
"requires": {
- "cliui": "^4.0.0",
- "decamelize": "^1.2.0",
+ "cliui": "^5.0.0",
"find-up": "^3.0.0",
- "get-caller-file": "^1.0.1",
- "os-locale": "^3.0.0",
+ "get-caller-file": "^2.0.1",
+ "os-locale": "^3.1.0",
"require-directory": "^2.1.1",
- "require-main-filename": "^1.0.1",
+ "require-main-filename": "^2.0.0",
"set-blocking": "^2.0.0",
- "string-width": "^2.0.0",
+ "string-width": "^3.0.0",
"which-module": "^2.0.0",
- "y18n": "^3.2.1 || ^4.0.0",
- "yargs-parser": "^11.1.1"
+ "y18n": "^4.0.0",
+ "yargs-parser": "^13.1.0"
}
},
"yargs-parser": {
- "version": "11.1.1",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
- "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
+ "version": "13.1.1",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
+ "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
"dev": true,
"requires": {
"camelcase": "^5.0.0",
@@ -11283,60 +11246,64 @@
}
},
"webpack-dev-middleware": {
- "version": "3.7.0",
- "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz",
- "integrity": "sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==",
+ "version": "3.7.1",
+ "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.1.tgz",
+ "integrity": "sha512-5MWu9SH1z3hY7oHOV6Kbkz5x7hXbxK56mGHNqHTe6d+ewxOwKUxoUJBs7QIaJb33lPjl9bJZ3X0vCoooUzC36A==",
"dev": true,
"requires": {
"memory-fs": "^0.4.1",
- "mime": "^2.4.2",
+ "mime": "^2.4.4",
+ "mkdirp": "^0.5.1",
"range-parser": "^1.2.1",
"webpack-log": "^2.0.0"
},
"dependencies": {
"mime": {
- "version": "2.4.3",
- "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.3.tgz",
- "integrity": "sha512-QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw==",
+ "version": "2.4.4",
+ "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
+ "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
"dev": true
}
}
},
"webpack-dev-server": {
- "version": "3.4.1",
- "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.4.1.tgz",
- "integrity": "sha512-CRqZQX2ryMtrg0r3TXQPpNh76eM1HD3Wmu6zDBxIKi/d2y+4aa28Ia8weNT0bfgWpY6Vs3Oq/K8+DjfbR+tWYw==",
+ "version": "3.8.1",
+ "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.8.1.tgz",
+ "integrity": "sha512-9F5DnfFA9bsrhpUCAfQic/AXBVHvq+3gQS+x6Zj0yc1fVVE0erKh2MV4IV12TBewuTrYeeTIRwCH9qLMvdNvTw==",
"dev": true,
"requires": {
"ansi-html": "0.0.7",
"bonjour": "^3.5.0",
- "chokidar": "^2.1.6",
+ "chokidar": "^2.1.8",
"compression": "^1.7.4",
"connect-history-api-fallback": "^1.6.0",
"debug": "^4.1.1",
"del": "^4.1.1",
- "express": "^4.17.0",
+ "express": "^4.17.1",
"html-entities": "^1.2.1",
"http-proxy-middleware": "^0.19.1",
"import-local": "^2.0.0",
"internal-ip": "^4.3.0",
"ip": "^1.1.5",
+ "is-absolute-url": "^3.0.2",
"killable": "^1.0.1",
- "loglevel": "^1.6.1",
+ "loglevel": "^1.6.4",
"opn": "^5.5.0",
- "portfinder": "^1.0.20",
+ "p-retry": "^3.0.1",
+ "portfinder": "^1.0.24",
"schema-utils": "^1.0.0",
- "selfsigned": "^1.10.4",
- "semver": "^6.0.0",
+ "selfsigned": "^1.10.6",
+ "semver": "^6.3.0",
"serve-index": "^1.9.1",
"sockjs": "0.3.19",
- "sockjs-client": "1.3.0",
- "spdy": "^4.0.0",
+ "sockjs-client": "1.4.0",
+ "spdy": "^4.0.1",
"strip-ansi": "^3.0.1",
"supports-color": "^6.1.0",
"url": "^0.11.0",
- "webpack-dev-middleware": "^3.7.0",
+ "webpack-dev-middleware": "^3.7.1",
"webpack-log": "^2.0.0",
+ "ws": "^6.2.1",
"yargs": "12.0.5"
},
"dependencies": {
@@ -11410,9 +11377,9 @@
}
},
"semver": {
- "version": "6.1.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz",
- "integrity": "sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==",
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
},
"string-width": {
@@ -11502,9 +11469,9 @@
}
},
"webpack-sources": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.3.0.tgz",
- "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==",
+ "version": "1.4.3",
+ "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+ "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
"dev": true,
"requires": {
"source-list-map": "^2.0.0",
@@ -11537,12 +11504,13 @@
}
},
"websocket-driver": {
- "version": "0.7.0",
- "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
- "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
+ "version": "0.7.3",
+ "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz",
+ "integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==",
"dev": true,
"requires": {
- "http-parser-js": ">=0.4.0",
+ "http-parser-js": ">=0.4.0 <0.4.11",
+ "safe-buffer": ">=5.1.0",
"websocket-extensions": ">=0.1.1"
}
},
@@ -11625,15 +11593,10 @@
"async-limiter": "~1.0.0"
}
},
- "x-is-string": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/x-is-string/-/x-is-string-0.1.0.tgz",
- "integrity": "sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI="
- },
"xtend": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
- "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
},
"y18n": {
"version": "3.2.1",
diff --git a/requirements.txt b/requirements.txt
index 40e13187311d681564d5a4f9b4211cfa7e40495d..5926b69480b97461753408a208bf43a746d30a51 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ responses==0.10.4
# Monitor dependencies
scout-apm==2.0.1
-sentry-sdk==0.10.1
+sentry-sdk==0.12.1
# Production dependencies
boto3==1.9.160
@@ -21,7 +21,7 @@ django-basic-auth-ip-whitelist==0.2.1
django-bleach==0.5.3
django-countries==5.3.3
django-extensions==2.1.7
-django-filter==1.1.0
+django-filter==2.1.0
django-fsm==2.6.1
django-heroku==0.3.1
django-hijack==2.1.10
@@ -32,11 +32,11 @@ django-referrer-policy==1.0
django-storages==1.7.1
django-tables2==1.21.2
django-tinymce4-lite==1.7.5
-django-two-factor-auth==1.8.0
+django-two-factor-auth==1.9.1
django-webpack-loader==0.6.0
-django_select2==6.3.1
+django_select2==7.1.0
djangorestframework==3.9.2
-django~=2.0.0
+django==2.1.11
gunicorn==19.9.0
mailchimp3==3.0.7
mistune==0.8.4
@@ -44,6 +44,6 @@ Pillow==5.4.1
psycopg2==2.7.3.1
social_auth_app_django==3.1.0
tomd==0.1.3
-wagtail~=2.2.0
-wagtail-cache==0.5.1
+wagtail==2.5.1
+wagtail-cache==0.5.2
whitenoise==4.1.2
diff --git a/runtime.txt b/runtime.txt
index 9fbd3bf0a8cbd237fdc16f03556d84baf76522be..5c517d3376c90442cdfc48903d370951b6575237 100644
--- a/runtime.txt
+++ b/runtime.txt
@@ -1 +1 @@
-python-3.6.8
+python-3.6.9