From 8b8a8c277cdcbc8d96190d5fba76930689228dd2 Mon Sep 17 00:00:00 2001 From: infograf768 Date: Wed, 20 Mar 2019 12:23:38 +0100 Subject: [PATCH 01/48] [4.0] [com_media] Various changes for the delete vue (#24258) --- .../modals/confirm-delete-modal.vue | 78 +++++++++---------- .../com_media/tmpl/media/default_texts.php | 6 +- .../language/en-GB/en-GB.com_media.ini | 5 +- language/en-GB/en-GB.com_media.ini | 5 +- language/en-GB/en-GB.ini | 1 + 5 files changed, 47 insertions(+), 48 deletions(-) diff --git a/administrator/components/com_media/resources/scripts/components/modals/confirm-delete-modal.vue b/administrator/components/com_media/resources/scripts/components/modals/confirm-delete-modal.vue index 2cca3b01df078..4843c6965a174 100644 --- a/administrator/components/com_media/resources/scripts/components/modals/confirm-delete-modal.vue +++ b/administrator/components/com_media/resources/scripts/components/modals/confirm-delete-modal.vue @@ -1,39 +1,39 @@ - - - + + + diff --git a/administrator/components/com_media/tmpl/media/default_texts.php b/administrator/components/com_media/tmpl/media/default_texts.php index ba12c7617ed52..e9b1030572649 100644 --- a/administrator/components/com_media/tmpl/media/default_texts.php +++ b/administrator/components/com_media/tmpl/media/default_texts.php @@ -17,9 +17,8 @@ Text::script('COM_MEDIA_ACTION_RENAME', true); Text::script('COM_MEDIA_ACTION_SHARE', true); Text::script('COM_MEDIA_BREADCRUMB_LABEL', true); -Text::script('COM_MEDIA_CONFIRM_DELETE_MODEL', true); -Text::script('COM_MEDIA_CONFIRM_DELETE_MODEL_DESC', true); -Text::script('COM_MEDIA_CONFIRM_DELETE_MODEL_HEADING', true); +Text::script('COM_MEDIA_CONFIRM_DELETE_MODAL', true); +Text::script('COM_MEDIA_CONFIRM_DELETE_MODAL_HEADING', true); Text::script('COM_MEDIA_CREATE_NEW_FOLDER', true); Text::script('COM_MEDIA_CREATE_NEW_FOLDER_ERROR', true); Text::script('COM_MEDIA_CREATE_NEW_FOLDER_SUCCESS', true); @@ -63,4 +62,5 @@ Text::script('JACTION_CREATE', true); Text::script('JAPPLY', true); Text::script('JCANCEL', true); +Text::script('JGLOBAL_CONFIRM_DELETE', true); Text::script('JLIB_FORM_FIELD_REQUIRED_VALUE', true); diff --git a/administrator/language/en-GB/en-GB.com_media.ini b/administrator/language/en-GB/en-GB.com_media.ini index 0eab00a6328b2..18dd4b0dc1586 100644 --- a/administrator/language/en-GB/en-GB.com_media.ini +++ b/administrator/language/en-GB/en-GB.com_media.ini @@ -12,9 +12,8 @@ COM_MEDIA_ACTION_RENAME="Rename item" COM_MEDIA_ACTION_SHARE="Get a sharable link" COM_MEDIA_BREADCRUMB_LABEL="Breadcrumb" COM_MEDIA_CONFIGURATION="Media: Options" -COM_MEDIA_CONFIRM_DELETE_MODEL="Delete" -COM_MEDIA_CONFIRM_DELETE_MODEL_DESC="Are you sure you want to delete this item?" -COM_MEDIA_CONFIRM_DELETE_MODEL_HEADING="Confirm Delete" +COM_MEDIA_CONFIRM_DELETE_MODAL="Delete" +COM_MEDIA_CONFIRM_DELETE_MODAL_HEADING="Confirm Delete" COM_MEDIA_CREATE_NEW_FOLDER="Create New Folder" COM_MEDIA_CREATE_NEW_FOLDER_ERROR="Error creating folder." COM_MEDIA_CREATE_NEW_FOLDER_SUCCESS="Folder created." diff --git a/language/en-GB/en-GB.com_media.ini b/language/en-GB/en-GB.com_media.ini index 77be15e33b6ba..a43a2c766b13a 100644 --- a/language/en-GB/en-GB.com_media.ini +++ b/language/en-GB/en-GB.com_media.ini @@ -19,9 +19,8 @@ COM_MEDIA_CAPTION_CLASS_DESC="This will apply the entered class to the ' Date: Wed, 20 Mar 2019 13:58:37 +0000 Subject: [PATCH 02/48] [4.0] Add support to unpublish module from Control Panel (#23934) Co-Authored-By: C-Lodder --- .../com_cpanel/tmpl/cpanel/default.php | 9 ++- .../language/en-GB/en-GB.com_cpanel.ini | 2 + administrator/language/en-GB/en-GB.ini | 1 + .../modules/mod_status/tmpl/default.php | 2 +- administrator/templates/atum/html/modules.php | 34 ++++++--- .../templates/atum/scss/_variables.scss | 3 +- .../templates/atum/scss/blocks/_header.scss | 1 - .../templates/atum/scss/blocks/_toolbar.scss | 7 -- .../atum/scss/vendor/bootstrap/_dropdown.scss | 8 ++ .../com_cpanel/js/admin-cpanel-default.es6.js | 76 +++++++++++++++++++ .../system/scss/joomla-toolbar-button.scss | 4 + 11 files changed, 125 insertions(+), 22 deletions(-) create mode 100644 build/media_source/com_cpanel/js/admin-cpanel-default.es6.js create mode 100644 build/media_source/system/scss/joomla-toolbar-button.scss diff --git a/administrator/components/com_cpanel/tmpl/cpanel/default.php b/administrator/components/com_cpanel/tmpl/cpanel/default.php index 5288877d2df70..ff70da5a2adbe 100644 --- a/administrator/components/com_cpanel/tmpl/cpanel/default.php +++ b/administrator/components/com_cpanel/tmpl/cpanel/default.php @@ -10,9 +10,16 @@ defined('_JEXEC') or die; use Joomla\CMS\Factory; +use Joomla\CMS\Language\Text; use Joomla\CMS\Helper\ModuleHelper; use Joomla\CMS\HTML\HTMLHelper; +HTMLHelper::_('behavior.core'); +Text::script('COM_CPANEL_UNPUBLISH_MODULE_SUCCESS'); +Text::script('COM_CPANEL_UNPUBLISH_MODULE_ERROR'); + +HTMLHelper::_('script', 'com_cpanel/admin-cpanel-default.min.js', array('version' => 'auto', 'relative' => true)); + $user = Factory::getUser(); ?> @@ -31,7 +38,7 @@ -
+
modules as $module) diff --git a/administrator/language/en-GB/en-GB.com_cpanel.ini b/administrator/language/en-GB/en-GB.com_cpanel.ini index 057fd02fcf1cf..5352801fa9eb8 100644 --- a/administrator/language/en-GB/en-GB.com_cpanel.ini +++ b/administrator/language/en-GB/en-GB.com_cpanel.ini @@ -24,6 +24,8 @@ COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_BODY="

As part of our security team's rev COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_TITLE="Updated site security recommendations" COM_CPANEL_SYSTEM_SETUP="Setup" COM_CPANEL_TITLE_SYSTEM_PANEL="System Panel" +COM_CPANEL_UNPUBLISH_MODULE_ERROR="Error unpublishing the module" +COM_CPANEL_UNPUBLISH_MODULE_SUCCESS="Module unpublished" COM_CPANEL_WELCOME_BEGINNERS_MESSAGE="

Community resources are available for new users.

" COM_CPANEL_WELCOME_BEGINNERS_TITLE="Welcome to Joomla!" COM_CPANEL_XML_DESCRIPTION="Control Panel component" diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini index ce95576f311bf..9f884096b4647 100644 --- a/administrator/language/en-GB/en-GB.ini +++ b/administrator/language/en-GB/en-GB.ini @@ -152,6 +152,7 @@ JACTION_LOGIN_OFFLINE="Offline Access" JACTION_LOGIN_SITE="Site Login" JACTION_MANAGE="Access Administration Interface" JACTION_OPTIONS="Configure Options Only" +JACTION_UNPUBLISH="Unpublish" JBROWSERTARGET_MODAL="Modal" JBROWSERTARGET_NEW="Open in new window" diff --git a/administrator/modules/mod_status/tmpl/default.php b/administrator/modules/mod_status/tmpl/default.php index 857fa2965bd47..bdae532c97ea7 100644 --- a/administrator/modules/mod_status/tmpl/default.php +++ b/administrator/modules/mod_status/tmpl/default.php @@ -65,7 +65,7 @@ -
+

diff --git a/administrator/templates/atum/html/modules.php b/administrator/templates/atum/html/modules.php index ddb00fea78d55..bbc9bf917b814 100644 --- a/administrator/templates/atum/html/modules.php +++ b/administrator/templates/atum/html/modules.php @@ -51,9 +51,11 @@ function modChrome_well($module, &$params, &$attribs) { if ($module->content) { + $id = $module->id; + // Permission checks $user = Factory::getUser(); - $canEdit = $user->authorise('core.edit', 'com_modules.module.' . $module->id) && $user->authorise('core.manage', 'com_modules'); + $canEdit = $user->authorise('core.edit', 'com_modules.module.' . $id) && $user->authorise('core.manage', 'com_modules'); $moduleTag = $params->get('module_tag', 'div'); $bootstrapSize = (int) $params->get('bootstrap_size', 6); @@ -65,14 +67,19 @@ function modChrome_well($module, &$params, &$attribs) $headerClass = $params->get('header_class'); $headerClass = ($headerClass) ? ' ' . htmlspecialchars($headerClass) : ''; - echo '

'; + echo '
'; echo '<' . $moduleTag . ' class="card mb-3' . $moduleClassSfx . '">'; if ($canEdit) { - echo '
'; - echo '' . Text::_('JACTION_EDIT') . " " . $module->title . ''; + $dropdownPosition = Factory::getLanguage()->isRTL() ? 'left' : 'right'; + + echo '
'; + echo ''; + echo '
'; + echo '' . Text::_('JACTION_EDIT') . ''; + echo '' . Text::_('JACTION_UNPUBLISH') . ''; + echo '
'; echo '
'; } @@ -92,9 +99,11 @@ function modChrome_body($module, &$params, &$attribs) { if ($module->content) { + $id = $module->id; + // Permission checks $user = Factory::getUser(); - $canEdit = $user->authorise('core.edit', 'com_modules.module.' . $module->id); + $canEdit = $user->authorise('core.edit', 'com_modules.module.' . $id); $moduleTag = $params->get('module_tag', 'div'); $bootstrapSize = (int) $params->get('bootstrap_size', 6); @@ -106,14 +115,19 @@ function modChrome_body($module, &$params, &$attribs) $headerClass = $params->get('header_class'); $headerClass = ($headerClass) ? ' ' . htmlspecialchars($headerClass) : ''; - echo '
'; + echo '
'; echo '<' . $moduleTag . ' class="card mb-3' . $moduleClassSfx . '">'; if ($canEdit) { - echo '
'; - echo '' . Text::_('JACTION_EDIT') . " " . $module->title . ''; + $dropdownPosition = Factory::getLanguage()->isRTL() ? 'left' : 'right'; + + echo '
'; + echo ''; + echo '
'; + echo '' . Text::_('JACTION_EDIT') . ''; + echo '' . Text::_('JACTION_UNPUBLISH') . ''; + echo '
'; echo '
'; } diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss index 99f351a691984..d9425d5e4c62c 100644 --- a/administrator/templates/atum/scss/_variables.scss +++ b/administrator/templates/atum/scss/_variables.scss @@ -119,8 +119,7 @@ $btn-border-radius-sm: 0; // Dropdowns $dropdown-padding-y: 0; -$dropdown-border-width: 0; -$dropdown-link-hover-color: $white; +$dropdown-border-width: 1px; $dropdown-item-padding-y: .5rem; $dropdown-item-padding-x: .75rem; $dropdown-spacer: 0; diff --git a/administrator/templates/atum/scss/blocks/_header.scss b/administrator/templates/atum/scss/blocks/_header.scss index b7a3a54384c50..0bbca2e908767 100644 --- a/administrator/templates/atum/scss/blocks/_header.scss +++ b/administrator/templates/atum/scss/blocks/_header.scss @@ -56,7 +56,6 @@ .dropdown-menu { min-width: 280px; padding: 0; - border: 0; z-index: 1041; h2 { diff --git a/administrator/templates/atum/scss/blocks/_toolbar.scss b/administrator/templates/atum/scss/blocks/_toolbar.scss index 4f1d975f9b057..c1d7ac12435e0 100644 --- a/administrator/templates/atum/scss/blocks/_toolbar.scss +++ b/administrator/templates/atum/scss/blocks/_toolbar.scss @@ -56,13 +56,6 @@ } } - .dropdown-item { - - &:hover { - color: #212529; - } - } - .dropdown-toggle { &.btn { diff --git a/administrator/templates/atum/scss/vendor/bootstrap/_dropdown.scss b/administrator/templates/atum/scss/vendor/bootstrap/_dropdown.scss index 514578a7cfdab..184fa27506d3c 100644 --- a/administrator/templates/atum/scss/vendor/bootstrap/_dropdown.scss +++ b/administrator/templates/atum/scss/vendor/bootstrap/_dropdown.scss @@ -9,6 +9,14 @@ } } +.dropdown-menu { + box-shadow: $atum-box-shadow; +} + +.dropdown-item { + cursor: pointer; +} + .dropdown-item:hover, .dropdown-item:focus { .btn-primary + .dropdown-menu & { diff --git a/build/media_source/com_cpanel/js/admin-cpanel-default.es6.js b/build/media_source/com_cpanel/js/admin-cpanel-default.es6.js new file mode 100644 index 0000000000000..4cfcf2f2a4e5c --- /dev/null +++ b/build/media_source/com_cpanel/js/admin-cpanel-default.es6.js @@ -0,0 +1,76 @@ +/** + * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved. + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ + +((window, document, Joomla) => { + let matchesFn = 'matches'; + + const closest = (element, selector) => { + let parent; + let el = element; + + // Traverse parents + while (el) { + parent = el.parentElement; + if (parent && parent[matchesFn](selector)) { + return parent; + } + el = parent; + } + + return null; + }; + + Joomla.unpublishModule = (element) => { + // Get variables + const baseUrl = 'index.php?option=com_modules&task=modules.unpublish&format=json'; + const id = element.getAttribute('data-module-id'); + + Joomla.request({ + url: `${baseUrl}&cid=${id}`, + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + onSuccess: () => { + const wrapper = closest(element, '.module-wrapper'); + wrapper.parentNode.removeChild(wrapper); + + Joomla.renderMessages({ + message: [Joomla.JText._('COM_CPANEL_UNPUBLISH_MODULE_SUCCESS')], + }); + }, + onError: () => { + Joomla.renderMessages({ + error: [Joomla.JText._('COM_CPANEL_UNPUBLISH_MODULE_ERROR')], + }); + }, + }); + }; + + const onBoot = () => { + // Find matchesFn with vendor prefix + ['matches', 'msMatchesSelector'].some((fn) => { + if (typeof document.body[fn] === 'function') { + matchesFn = fn; + return true; + } + return false; + }); + + const cpanelModules = document.getElementById('cpanel-modules'); + if (cpanelModules) { + const links = [].slice.call(cpanelModules.querySelectorAll('.unpublish-module')); + links.forEach((link) => { + link.addEventListener('click', event => Joomla.unpublishModule(event.target)); + }); + } + + // Cleanup + document.removeEventListener('DOMContentLoaded', onBoot); + }; + + // Initialise + document.addEventListener('DOMContentLoaded', onBoot); +})(window, document, window.Joomla); diff --git a/build/media_source/system/scss/joomla-toolbar-button.scss b/build/media_source/system/scss/joomla-toolbar-button.scss new file mode 100644 index 0000000000000..7017556144625 --- /dev/null +++ b/build/media_source/system/scss/joomla-toolbar-button.scss @@ -0,0 +1,4 @@ +joomla-toolbar-button .dropdown-item:focus, +joomla-toolbar-button .dropdown-item:hover { + color: #fff; +} From 82b4a8979189cded8e2a76d1c99ad59ed66c7367 Mon Sep 17 00:00:00 2001 From: SharkyKZ Date: Wed, 20 Mar 2019 17:23:56 +0200 Subject: [PATCH 03/48] [4.0] Replace Joomla\DI\Container::exists() calls (#24263) --- libraries/joomla/base/adapter.php | 2 +- libraries/src/Application/CMSApplication.php | 2 +- libraries/src/Factory.php | 2 +- libraries/src/Installer/Installer.php | 2 +- libraries/src/MVC/Controller/BaseController.php | 2 +- libraries/src/Router/Router.php | 2 +- libraries/src/Table/Table.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/joomla/base/adapter.php b/libraries/joomla/base/adapter.php index be9850e2b21c1..7266d51ec642e 100644 --- a/libraries/joomla/base/adapter.php +++ b/libraries/joomla/base/adapter.php @@ -168,7 +168,7 @@ public function setAdapter($name, &$adapter = null, $options = array()) } // Check for a possible service from the container otherwise manually instantiate the class - if (Factory::getContainer()->exists($class)) + if (Factory::getContainer()->has($class)) { $this->_adapters[$name] = Factory::getContainer()->get($class); } diff --git a/libraries/src/Application/CMSApplication.php b/libraries/src/Application/CMSApplication.php index d2e2a250c6313..4daf84b91e478 100644 --- a/libraries/src/Application/CMSApplication.php +++ b/libraries/src/Application/CMSApplication.php @@ -406,7 +406,7 @@ public static function getInstance($name = null, $prefix = '\JApplication', Cont $container = Factory::getContainer(); } - if ($container->exists($classname)) + if ($container->has($classname)) { static::$instances[$name] = $container->get($classname); } diff --git a/libraries/src/Factory.php b/libraries/src/Factory.php index 489bc7cb93ccb..0f355629ea649 100644 --- a/libraries/src/Factory.php +++ b/libraries/src/Factory.php @@ -395,7 +395,7 @@ public static function getDbo() if (!self::$database) { - if (self::getContainer()->exists('DatabaseDriver')) + if (self::getContainer()->has('DatabaseDriver')) { self::$database = self::getContainer()->get('DatabaseDriver'); } diff --git a/libraries/src/Installer/Installer.php b/libraries/src/Installer/Installer.php index 086a2012e1ce5..1c27fd2d53b44 100644 --- a/libraries/src/Installer/Installer.php +++ b/libraries/src/Installer/Installer.php @@ -2412,7 +2412,7 @@ public function loadAdapter($adapter, $options = array()) $options['type'] = $adapter; // Check for a possible service from the container otherwise manually instantiate the class - if (Factory::getContainer()->exists($class)) + if (Factory::getContainer()->has($class)) { return Factory::getContainer()->get($class); } diff --git a/libraries/src/MVC/Controller/BaseController.php b/libraries/src/MVC/Controller/BaseController.php index bd1364df7c381..5bc79a231af2c 100644 --- a/libraries/src/MVC/Controller/BaseController.php +++ b/libraries/src/MVC/Controller/BaseController.php @@ -339,7 +339,7 @@ public static function getInstance($prefix, $config = array()) } // Check for a possible service from the container otherwise manually instantiate the class - if (Factory::getContainer()->exists($class)) + if (Factory::getContainer()->has($class)) { self::$instance = Factory::getContainer()->get($class); } diff --git a/libraries/src/Router/Router.php b/libraries/src/Router/Router.php index 5df1fce3d5d89..84b7f8c651b6f 100644 --- a/libraries/src/Router/Router.php +++ b/libraries/src/Router/Router.php @@ -110,7 +110,7 @@ public static function getInstance($client, $options = array()) } // Check for a possible service from the container otherwise manually instantiate the class - if (Factory::getContainer()->exists($classname)) + if (Factory::getContainer()->has($classname)) { self::$instances[$client] = Factory::getContainer()->get($classname); } diff --git a/libraries/src/Table/Table.php b/libraries/src/Table/Table.php index 94ac6355b110d..20ba8f0cb5458 100644 --- a/libraries/src/Table/Table.php +++ b/libraries/src/Table/Table.php @@ -312,7 +312,7 @@ public static function getInstance($type, $prefix = 'JTable', $config = array()) $db = $config['dbo'] ?? Factory::getDbo(); // Check for a possible service from the container otherwise manually instantiate the class - if (Factory::getContainer()->exists($tableClass)) + if (Factory::getContainer()->has($tableClass)) { return Factory::getContainer()->get($tableClass); } From c4c005b3ec91090c62a061eae3caf74c0b8b0600 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Wed, 20 Mar 2019 21:45:30 +0000 Subject: [PATCH 04/48] [4.0] Deprecated language strings (#24267) --- administrator/language/en-GB/en-GB.ini | 3 --- language/en-GB/en-GB.com_messages.ini | 2 -- language/en-GB/en-GB.ini | 3 --- 3 files changed, 8 deletions(-) diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini index 9f884096b4647..e28894ad943ac 100644 --- a/administrator/language/en-GB/en-GB.ini +++ b/administrator/language/en-GB/en-GB.ini @@ -295,9 +295,6 @@ JGLOBAL_AUTH_FAILED="Failed to authenticate: %s" JGLOBAL_AUTH_INCORRECT="Incorrect username/password" JGLOBAL_AUTH_INVALID_PASS="Username and password do not match or you do not have an account yet." JGLOBAL_AUTH_INVALID_SECRETKEY="The two factor authentication Secret Key is invalid." -; The following 2 strings are deprecated and will be removed with 4.0. -JGLOBAL_AUTH_NO_BIND="Unable to bind to LDAP" -JGLOBAL_AUTH_NO_CONNECT="Unable to connect to LDAP server" JGLOBAL_AUTH_NO_REDIRECT="Could not redirect to server: %s" JGLOBAL_AUTH_NO_USER="Username and password do not match or you do not have an account yet." JGLOBAL_AUTH_NOT_CONNECT="Unable to connect to authentication service." diff --git a/language/en-GB/en-GB.com_messages.ini b/language/en-GB/en-GB.com_messages.ini index c30a836a9f6dc..515b34c9d8cf2 100644 --- a/language/en-GB/en-GB.com_messages.ini +++ b/language/en-GB/en-GB.com_messages.ini @@ -5,6 +5,4 @@ COM_MESSAGES_ERR_SEND_FAILED="The user has locked their mailbox. Message failed." COM_MESSAGES_NEW_MESSAGE="New Message from %1$s at %2$s" -; The following string is deprecated and will be removed in Joomla 4.0 -COM_MESSAGES_NEW_MESSAGE_ARRIVED="A new private message has arrived from %s" COM_MESSAGES_PLEASE_LOGIN="Please log in to %s to read your message." diff --git a/language/en-GB/en-GB.ini b/language/en-GB/en-GB.ini index b58508c8ac0fc..b5a657c7e0e59 100644 --- a/language/en-GB/en-GB.ini +++ b/language/en-GB/en-GB.ini @@ -186,9 +186,6 @@ JGLOBAL_AUTH_FAILED="Failed to authenticate: %s" JGLOBAL_AUTH_INCORRECT="Incorrect username/password" JGLOBAL_AUTH_INVALID_PASS="Username and password do not match or you do not have an account yet." JGLOBAL_AUTH_INVALID_SECRETKEY="The two factor authentication Secret Key is invalid." -; The following 2 strings are deprecated and will be removed with 4.0. -JGLOBAL_AUTH_NO_BIND="Unable to bind to LDAP" -JGLOBAL_AUTH_NO_CONNECT="Unable to connect to LDAP server" JGLOBAL_AUTH_NO_REDIRECT="Could not redirect to server: %s" JGLOBAL_AUTH_NO_USER="Username and password do not match or you do not have an account yet." JGLOBAL_AUTH_NOT_CONNECT="Unable to connect to authentication service." From 0b3ddba0c1bd4712f806db50a08822ea14a12fbd Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Thu, 21 Mar 2019 11:32:27 +0000 Subject: [PATCH 05/48] [4.0] [a11y] Remove redundant title from templates (#24277) The title attribute is generally not very accessible. Keyboard users and touch screen users will never see it. It is particularly useless to add a title which is the same as other text already present as that can result in a screen reader announcing the same text twice. This PR removes the redundant title attribute where the same text is already present. --- templates/cassiopeia/offline.php | 8 ++++---- templates/system/error.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/cassiopeia/offline.php b/templates/cassiopeia/offline.php index e70bb3184d95e..ab12df2d5eef5 100644 --- a/templates/cassiopeia/offline.php +++ b/templates/cassiopeia/offline.php @@ -53,7 +53,7 @@ } else { - $logo = '' . $sitename . ''; + $logo = '' . $sitename . ''; } ?> @@ -96,14 +96,14 @@
- + - + 1) : ?> - + diff --git a/templates/system/error.php b/templates/system/error.php index 0d4b8cb082ada..9a1b4e1d93610 100644 --- a/templates/system/error.php +++ b/templates/system/error.php @@ -55,7 +55,7 @@

    -
    • +

From f6d952f52c051296f54e5cd743ec853de71ee499 Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Thu, 21 Mar 2019 13:40:07 +0100 Subject: [PATCH 06/48] Removing module chrome "no" (#24010) --- administrator/templates/atum/html/modules.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/administrator/templates/atum/html/modules.php b/administrator/templates/atum/html/modules.php index bbc9bf917b814..41cb8ac550611 100644 --- a/administrator/templates/atum/html/modules.php +++ b/administrator/templates/atum/html/modules.php @@ -39,14 +39,6 @@ function modChrome_title($module, &$params, &$attribs) } } -function modChrome_no($module, &$params, &$attribs) -{ - if ($module->content) - { - echo $module->content; - } -} - function modChrome_well($module, &$params, &$attribs) { if ($module->content) From 15227487c7fa8b9bb8ddbf66dbc39c209ef610cf Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Thu, 21 Mar 2019 12:41:13 +0000 Subject: [PATCH 07/48] [4.0] Fix com_media untranslated string (#24285) --- .../resources/scripts/components/modals/share-modal.vue | 2 +- administrator/components/com_media/tmpl/media/default_texts.php | 1 + administrator/language/en-GB/en-GB.com_media.ini | 1 + language/en-GB/en-GB.com_media.ini | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/administrator/components/com_media/resources/scripts/components/modals/share-modal.vue b/administrator/components/com_media/resources/scripts/components/modals/share-modal.vue index 17e2a4a559abf..106d698ec47f2 100644 --- a/administrator/components/com_media/resources/scripts/components/modals/share-modal.vue +++ b/administrator/components/com_media/resources/scripts/components/modals/share-modal.vue @@ -15,7 +15,7 @@ - + diff --git a/administrator/components/com_media/tmpl/media/default_texts.php b/administrator/components/com_media/tmpl/media/default_texts.php index e9b1030572649..6994c5d87d786 100644 --- a/administrator/components/com_media/tmpl/media/default_texts.php +++ b/administrator/components/com_media/tmpl/media/default_texts.php @@ -52,6 +52,7 @@ Text::script('COM_MEDIA_SELECT_ALL', true); Text::script('COM_MEDIA_SERVER_ERROR', true); Text::script('COM_MEDIA_SHARE', true); +Text::script('COM_MEDIA_SHARE_COPY', true); Text::script('COM_MEDIA_SHARE_COPY_FAILED_ERROR', true); Text::script('COM_MEDIA_SHARE_DESC', true); Text::script('COM_MEDIA_TOGGLE_INFO', true); diff --git a/administrator/language/en-GB/en-GB.com_media.ini b/administrator/language/en-GB/en-GB.com_media.ini index 18dd4b0dc1586..425abc83cf6b8 100644 --- a/administrator/language/en-GB/en-GB.com_media.ini +++ b/administrator/language/en-GB/en-GB.com_media.ini @@ -73,6 +73,7 @@ COM_MEDIA_SEARCH="Search..." COM_MEDIA_SELECT_ALL="Toggle select all" COM_MEDIA_SERVER_ERROR="Internal server error" COM_MEDIA_SHARE="Share the file" +COM_MEDIA_SHARE_COPY="Copy to clipboard" COM_MEDIA_SHARE_COPY_FAILED_ERROR="Error copying to clipboard" COM_MEDIA_SHARE_DESC="Share the file with others. Anyone with link can view the file" COM_MEDIA_TOGGLE_INFO="Toggle item info" diff --git a/language/en-GB/en-GB.com_media.ini b/language/en-GB/en-GB.com_media.ini index a43a2c766b13a..7bae6dc4c418c 100644 --- a/language/en-GB/en-GB.com_media.ini +++ b/language/en-GB/en-GB.com_media.ini @@ -106,6 +106,7 @@ COM_MEDIA_SEARCH="Search..." COM_MEDIA_SELECT_ALL="Toggle select all" COM_MEDIA_SERVER_ERROR="Internal server error" COM_MEDIA_SHARE="Share the file" +COM_MEDIA_SHARE_COPY="Copy to clipboard" COM_MEDIA_SHARE_COPY_FAILED_ERROR="Error copying to clipboard" COM_MEDIA_SHARE_DESC="Share the file with others. Anyone with link can view the file" COM_MEDIA_START_UPLOAD="Start Upload" From c570c6cc1b6d0672f8b1030a285ef895421646c3 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Thu, 21 Mar 2019 12:44:13 +0000 Subject: [PATCH 08/48] [4.0] [a11y] Remove redundant title from site components (#24282) The title attribute is generally not very accessible. Keyboard users and touch screen users will never see it. It is particularly useless to add a title which is the same as other text already present as that can result in a screen reader announcing the same text twice. This PR removes the redundant title attribute where the same text is already displayed and removes/replaces one language string where it wwas not needed NOTE this is just a first pass at removing the low hanging fruit and a further pr will be needed when the tooltips are reviewed --- components/com_contact/tmpl/categories/default_items.php | 2 +- components/com_content/tmpl/categories/default_items.php | 2 +- components/com_content/tmpl/category/blog_children.php | 4 ++-- components/com_content/tmpl/category/default_children.php | 4 ++-- components/com_mailto/tmpl/mailto/default.php | 2 +- components/com_newsfeeds/tmpl/categories/default_items.php | 2 +- components/com_newsfeeds/tmpl/category/default_items.php | 2 +- components/com_users/tmpl/registration/default.php | 2 +- language/en-GB/en-GB.com_content.ini | 1 - 9 files changed, 10 insertions(+), 11 deletions(-) diff --git a/components/com_contact/tmpl/categories/default_items.php b/components/com_contact/tmpl/categories/default_items.php index b68f77c6c52a4..9218a9fbd2208 100644 --- a/components/com_contact/tmpl/categories/default_items.php +++ b/components/com_contact/tmpl/categories/default_items.php @@ -23,7 +23,7 @@ escape($item->title); ?> params->get('show_cat_items_cat') == 1) :?> - +   numitems; ?> diff --git a/components/com_content/tmpl/categories/default_items.php b/components/com_content/tmpl/categories/default_items.php index 83b01123f68e9..169ddb8f695d5 100644 --- a/components/com_content/tmpl/categories/default_items.php +++ b/components/com_content/tmpl/categories/default_items.php @@ -26,7 +26,7 @@ escape($item->title); ?> params->get('show_cat_num_articles_cat') == 1) :?> - +   numitems; ?> diff --git a/components/com_content/tmpl/category/blog_children.php b/components/com_content/tmpl/category/blog_children.php index 287e01d72a3ca..35eb35fe050dd 100644 --- a/components/com_content/tmpl/category/blog_children.php +++ b/components/com_content/tmpl/category/blog_children.php @@ -28,7 +28,7 @@ isRtl()) : ?>

params->get('show_cat_num_articles', 1)) : ?> - + getNumItems(true); ?> @@ -43,7 +43,7 @@

escape($child->title); ?> params->get('show_cat_num_articles', 1)) : ?> - +   getNumItems(true); ?> diff --git a/components/com_content/tmpl/category/default_children.php b/components/com_content/tmpl/category/default_children.php index 367a850304c23..e925cd67cdf28 100644 --- a/components/com_content/tmpl/category/default_children.php +++ b/components/com_content/tmpl/category/default_children.php @@ -28,7 +28,7 @@ isRtl()) : ?>

params->get('show_cat_num_articles', 1)) : ?> - + getNumItems(true); ?> @@ -43,7 +43,7 @@

escape($child->title); ?> params->get('show_cat_num_articles', 1)) : ?> - + getNumItems(true); ?> diff --git a/components/com_mailto/tmpl/mailto/default.php b/components/com_mailto/tmpl/mailto/default.php index 0db3184dfdbc1..749d4d5c9f03a 100644 --- a/components/com_mailto/tmpl/mailto/default.php +++ b/components/com_mailto/tmpl/mailto/default.php @@ -26,7 +26,7 @@

- + diff --git a/components/com_newsfeeds/tmpl/categories/default_items.php b/components/com_newsfeeds/tmpl/categories/default_items.php index 6821f6b20108b..e9c47b143c978 100644 --- a/components/com_newsfeeds/tmpl/categories/default_items.php +++ b/components/com_newsfeeds/tmpl/categories/default_items.php @@ -24,7 +24,7 @@ escape($item->title); ?> params->get('show_cat_items_cat') == 1) : ?> - +   numitems; ?> diff --git a/components/com_newsfeeds/tmpl/category/default_items.php b/components/com_newsfeeds/tmpl/category/default_items.php index bd5a5fed0b07f..fe61ba3771bf3 100644 --- a/components/com_newsfeeds/tmpl/category/default_items.php +++ b/components/com_newsfeeds/tmpl/category/default_items.php @@ -35,7 +35,7 @@ - +
params->get('show_pagination_limit')) : ?> diff --git a/components/com_users/tmpl/registration/default.php b/components/com_users/tmpl/registration/default.php index 18e2d99bc5ac5..70ad9be5c4c23 100644 --- a/components/com_users/tmpl/registration/default.php +++ b/components/com_users/tmpl/registration/default.php @@ -61,7 +61,7 @@ - + diff --git a/language/en-GB/en-GB.com_content.ini b/language/en-GB/en-GB.com_content.ini index 2aa41af2e03e2..f9f737c2b6ceb 100644 --- a/language/en-GB/en-GB.com_content.ini +++ b/language/en-GB/en-GB.com_content.ini @@ -59,7 +59,6 @@ COM_CONTENT_NEW_ARTICLE="New Article" COM_CONTENT_NO_ARTICLES="There are no articles in this category. If subcategories display on this page, they may have articles." COM_CONTENT_NONE="None" COM_CONTENT_NUM_ITEMS="Article Count:" -COM_CONTENT_NUM_ITEMS_TIP="Article Count" COM_CONTENT_ON_NEW_CONTENT="A new Article has been submitted by '%1$s' entitled '%2$s'." COM_CONTENT_ORDERING="Ordering:
New articles default to the first position in the Category. The ordering can be changed in Backend." COM_CONTENT_PAGEBREAK_DOC_TITLE="Page Break" From 73c7fb0e8d6565500ff1049bf0e8f20dadd69d9a Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Thu, 21 Mar 2019 12:45:29 +0000 Subject: [PATCH 09/48] [4.0] [a11y] Remove redundant title from modules (#24278) --- administrator/modules/mod_stats_admin/tmpl/default.php | 2 +- language/en-GB/en-GB.mod_finder.ini | 1 - modules/mod_finder/tmpl/default.php | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/administrator/modules/mod_stats_admin/tmpl/default.php b/administrator/modules/mod_stats_admin/tmpl/default.php index 6e362b9f3e261..635a3b8a3446b 100644 --- a/administrator/modules/mod_stats_admin/tmpl/default.php +++ b/administrator/modules/mod_stats_admin/tmpl/default.php @@ -11,6 +11,6 @@ ?>
    -
  • title; ?> data; ?>
    • +
  • title; ?> data; ?>
diff --git a/language/en-GB/en-GB.mod_finder.ini b/language/en-GB/en-GB.mod_finder.ini index 160b491cd640d..d35bbd3f056be 100644 --- a/language/en-GB/en-GB.mod_finder.ini +++ b/language/en-GB/en-GB.mod_finder.ini @@ -24,7 +24,6 @@ MOD_FINDER_FIELDSET_BASIC_SHOW_ADVANCED_OPTION_LINK="Link to Component" MOD_FINDER_FIELD_OPENSEARCH_LABEL="Enable OpenSearch" MOD_FINDER_FIELD_OPENSEARCH_TEXT_LABEL="OpenSearch Name" MOD_FINDER_SEARCHBUTTON_TEXT="Search" -MOD_FINDER_SEARCH_BUTTON="Go" MOD_FINDER_SEARCH_VALUE="Search ..." MOD_FINDER_SELECT_MENU_ITEMID="Select a menu item" MOD_FINDER_XML_DESCRIPTION="This is a Smart Search module." diff --git a/modules/mod_finder/tmpl/default.php b/modules/mod_finder/tmpl/default.php index 07d25803c1682..3e83defd7deaf 100644 --- a/modules/mod_finder/tmpl/default.php +++ b/modules/mod_finder/tmpl/default.php @@ -34,7 +34,7 @@ $output .= '
'; $output .= $input; $output .= ''; - $output .= ''; + $output .= ''; $output .= ''; $output .= '
'; } From 5255bf42e8a774a6c6d9174d1dae5bea4e09ad03 Mon Sep 17 00:00:00 2001 From: Nitish Bahl Date: Thu, 21 Mar 2019 18:28:44 +0530 Subject: [PATCH 10/48] [4.0]improved contrast in icon during installation (#24213) --- installation/template/scss/template.scss | 3 --- 1 file changed, 3 deletions(-) diff --git a/installation/template/scss/template.scss b/installation/template/scss/template.scss index 11e99a5919f63..1a3696bfb4093 100644 --- a/installation/template/scss/template.scss +++ b/installation/template/scss/template.scss @@ -278,9 +278,6 @@ legend { caption { caption-side: top; } -.badge-warning { - color: #292b2c; -} .fa-eye:before, .icon-eye-open:before, .icon-eye:before { font-family: FontAwesome; From 489f5274e33dc81d1488728125862ae7af877d6c Mon Sep 17 00:00:00 2001 From: SharkyKZ Date: Thu, 21 Mar 2019 15:00:23 +0200 Subject: [PATCH 11/48] [4.0][com_users] Add cancel action to profile form (#24088) --- .../Controller/ProfileController.php | 19 +++++++++++++++++++ components/com_users/tmpl/profile/edit.php | 13 ++++++------- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/components/com_users/Controller/ProfileController.php b/components/com_users/Controller/ProfileController.php index 4aa2703452c16..2c28c3a57753c 100644 --- a/components/com_users/Controller/ProfileController.php +++ b/components/com_users/Controller/ProfileController.php @@ -250,6 +250,25 @@ public function save() $app->setUserState('com_users.edit.profile.data', null); } + /** + * Method to cancel an edit. + * + * @return void + * + * @since __DEPLOY_VERSION__ + */ + public function cancel() + { + // Check for request forgeries. + $this->checkToken(); + + // Flush the data from the session. + $this->app->setUserState('com_users.edit.profile', null); + + // Redirect to user profile. + $this->setRedirect(Route::_('index.php?option=com_users&view=profile', false)); + } + /** * Function that allows child controller access to model data after the data has been saved. * diff --git a/components/com_users/tmpl/profile/edit.php b/components/com_users/tmpl/profile/edit.php index 97ac2cb168eff..8696c698e6349 100644 --- a/components/com_users/tmpl/profile/edit.php +++ b/components/com_users/tmpl/profile/edit.php @@ -33,7 +33,7 @@

- + form->getFieldsets() as $group => $fieldset) : ?> form->getFieldset($group); ?> @@ -124,14 +124,13 @@
- + - -
From d6901df63e937e443b9e9050e6dfdf63e5da9866 Mon Sep 17 00:00:00 2001 From: infograf768 Date: Thu, 21 Mar 2019 14:03:51 +0100 Subject: [PATCH 12/48] [4.0] Modals: using default padding (#24274) --- administrator/templates/atum/scss/blocks/_modals.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/administrator/templates/atum/scss/blocks/_modals.scss b/administrator/templates/atum/scss/blocks/_modals.scss index 4ee9aa761f3d7..c3328431fc862 100644 --- a/administrator/templates/atum/scss/blocks/_modals.scss +++ b/administrator/templates/atum/scss/blocks/_modals.scss @@ -32,7 +32,6 @@ } .modal-body { - padding: 0; overflow-y: auto; } From d8da24636b237de24c11a7170a71e627f4f16cb3 Mon Sep 17 00:00:00 2001 From: Christiane Maier-Stadtherr Date: Thu, 21 Mar 2019 14:04:53 +0100 Subject: [PATCH 13/48] [4.0][a11y]Extra column for icon featured (#23757) --- .../components/com_content/tmpl/featured/default.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/administrator/components/com_content/tmpl/featured/default.php b/administrator/components/com_content/tmpl/featured/default.php index 90a63fbb2ebe4..2201d2b64515c 100644 --- a/administrator/components/com_content/tmpl/featured/default.php +++ b/administrator/components/com_content/tmpl/featured/default.php @@ -104,6 +104,9 @@ + + + @@ -207,10 +210,12 @@ id); ?> + + render($item->featured, $i, ['disabled' => !$canChange]); ?> +
- render($item->featured, $i, ['disabled' => !$canChange]); ?> Date: Thu, 21 Mar 2019 13:06:54 +0000 Subject: [PATCH 14/48] [4.0] Remove sidebar from com_installer (#24080) This pr removes the sidebar from all the views previously accessed (in J3) from the extensions menu. As in J4 they all have their own place in the system menu they can simply be removed Co-Authored-By: brianteeman --- .../com_installer/Helper/InstallerHelper.php | 53 ------------------- .../com_installer/View/Discover/HtmlView.php | 2 - .../com_installer/View/Installer/HtmlView.php | 3 -- .../com_installer/View/Manage/HtmlView.php | 2 - .../com_installer/View/Update/HtmlView.php | 2 - .../View/Updatesites/HtmlView.php | 2 - .../com_installer/tmpl/database/default.php | 5 +- .../com_installer/tmpl/discover/default.php | 5 +- .../com_installer/tmpl/install/default.php | 5 +- .../com_installer/tmpl/languages/default.php | 5 +- .../com_installer/tmpl/manage/default.php | 5 +- .../com_installer/tmpl/update/default.php | 5 +- .../tmpl/updatesites/default.php | 5 +- .../com_installer/tmpl/warnings/default.php | 5 +- .../language/en-GB/en-GB.com_installer.ini | 7 --- 15 files changed, 8 insertions(+), 103 deletions(-) diff --git a/administrator/components/com_installer/Helper/InstallerHelper.php b/administrator/components/com_installer/Helper/InstallerHelper.php index 3d287872ae3b3..e14d5305185a0 100644 --- a/administrator/components/com_installer/Helper/InstallerHelper.php +++ b/administrator/components/com_installer/Helper/InstallerHelper.php @@ -22,59 +22,6 @@ */ class InstallerHelper { - /** - * Configure the Linkbar. - * - * @param string $vName The name of the active view. - * - * @return void - * - * @since 1.6 - */ - public static function addSubmenu($vName = 'install') - { - \JHtmlSidebar::addEntry( - Text::_('COM_INSTALLER_SUBMENU_INSTALL'), - 'index.php?option=com_installer', - $vName == 'install' - ); - \JHtmlSidebar::addEntry( - Text::_('COM_INSTALLER_SUBMENU_UPDATE'), - 'index.php?option=com_installer&view=update', - $vName == 'update' - ); - \JHtmlSidebar::addEntry( - Text::_('COM_INSTALLER_SUBMENU_MANAGE'), - 'index.php?option=com_installer&view=manage', - $vName == 'manage' - ); - \JHtmlSidebar::addEntry( - Text::_('COM_INSTALLER_SUBMENU_DISCOVER'), - 'index.php?option=com_installer&view=discover', - $vName == 'discover' - ); - \JHtmlSidebar::addEntry( - Text::_('COM_INSTALLER_SUBMENU_DATABASE'), - 'index.php?option=com_installer&view=database', - $vName == 'database' - ); - \JHtmlSidebar::addEntry( - Text::_('COM_INSTALLER_SUBMENU_WARNINGS'), - 'index.php?option=com_installer&view=warnings', - $vName == 'warnings' - ); - \JHtmlSidebar::addEntry( - Text::_('COM_INSTALLER_SUBMENU_LANGUAGES'), - 'index.php?option=com_installer&view=languages', - $vName == 'languages' - ); - \JHtmlSidebar::addEntry( - Text::_('COM_INSTALLER_SUBMENU_UPDATESITES'), - 'index.php?option=com_installer&view=updatesites', - $vName == 'updatesites' - ); - } - /** * Get a list of filter options for the extension types. * diff --git a/administrator/components/com_installer/View/Discover/HtmlView.php b/administrator/components/com_installer/View/Discover/HtmlView.php index 6aeed8489370d..6171fb6c364ce 100644 --- a/administrator/components/com_installer/View/Discover/HtmlView.php +++ b/administrator/components/com_installer/View/Discover/HtmlView.php @@ -70,8 +70,6 @@ protected function addToolbar() ToolbarHelper::custom('discover.refresh', 'refresh', 'refresh', 'COM_INSTALLER_TOOLBAR_DISCOVER', false); ToolbarHelper::divider(); - \JHtmlSidebar::setAction('index.php?option=com_installer&view=discover'); - parent::addToolbar(); ToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_DISCOVER'); diff --git a/administrator/components/com_installer/View/Installer/HtmlView.php b/administrator/components/com_installer/View/Installer/HtmlView.php index 9ceb0729d2c2c..e385693dd7adf 100644 --- a/administrator/components/com_installer/View/Installer/HtmlView.php +++ b/administrator/components/com_installer/View/Installer/HtmlView.php @@ -111,8 +111,5 @@ protected function addToolbar() ToolbarHelper::preferences('com_installer'); ToolbarHelper::divider(); } - - // Render side bar. - $this->sidebar = \JHtmlSidebar::render(); } } diff --git a/administrator/components/com_installer/View/Manage/HtmlView.php b/administrator/components/com_installer/View/Manage/HtmlView.php index d7cef4c956a19..c94de5562bfb3 100644 --- a/administrator/components/com_installer/View/Manage/HtmlView.php +++ b/administrator/components/com_installer/View/Manage/HtmlView.php @@ -82,8 +82,6 @@ protected function addToolbar() ToolbarHelper::divider(); } - \JHtmlSidebar::setAction('index.php?option=com_installer&view=manage'); - parent::addToolbar(); ToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_MANAGE'); } diff --git a/administrator/components/com_installer/View/Update/HtmlView.php b/administrator/components/com_installer/View/Update/HtmlView.php index 9bd669f756e3e..ed85362446d53 100644 --- a/administrator/components/com_installer/View/Update/HtmlView.php +++ b/administrator/components/com_installer/View/Update/HtmlView.php @@ -81,8 +81,6 @@ protected function addToolbar() ToolbarHelper::custom('update.purge', 'purge', 'purge', 'COM_INSTALLER_TOOLBAR_PURGE', false); ToolbarHelper::divider(); - \JHtmlSidebar::setAction('index.php?option=com_installer&view=manage'); - parent::addToolbar(); ToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_UPDATE'); } diff --git a/administrator/components/com_installer/View/Updatesites/HtmlView.php b/administrator/components/com_installer/View/Updatesites/HtmlView.php index 0af6247b4dc06..dcfe7829136ed 100644 --- a/administrator/components/com_installer/View/Updatesites/HtmlView.php +++ b/administrator/components/com_installer/View/Updatesites/HtmlView.php @@ -88,8 +88,6 @@ protected function addToolbar() ToolbarHelper::custom('updatesites.rebuild', 'refresh.png', 'refresh_f2.png', 'JTOOLBAR_REBUILD', false); } - \JHtmlSidebar::setAction('index.php?option=com_installer&view=updatesites'); - parent::addToolbar(); ToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_UPDATESITES'); } diff --git a/administrator/components/com_installer/tmpl/database/default.php b/administrator/components/com_installer/tmpl/database/default.php index b9f8e37e2b21f..01c3da3de43c5 100644 --- a/administrator/components/com_installer/tmpl/database/default.php +++ b/administrator/components/com_installer/tmpl/database/default.php @@ -24,10 +24,7 @@
-
- sidebar; ?> -
-
+
$this)); ?> diff --git a/administrator/components/com_installer/tmpl/discover/default.php b/administrator/components/com_installer/tmpl/discover/default.php index 4876f1440651b..3fd27d66b140e 100644 --- a/administrator/components/com_installer/tmpl/discover/default.php +++ b/administrator/components/com_installer/tmpl/discover/default.php @@ -22,10 +22,7 @@
-
- sidebar; ?> -
-
+
showMessage) : ?> loadTemplate('message'); ?> diff --git a/administrator/components/com_installer/tmpl/install/default.php b/administrator/components/com_installer/tmpl/install/default.php index ddf90a9269bfb..03b2962e83acc 100644 --- a/administrator/components/com_installer/tmpl/install/default.php +++ b/administrator/components/com_installer/tmpl/install/default.php @@ -31,10 +31,7 @@
-
- sidebar; ?> -
-
+
showMessage) : ?> diff --git a/administrator/components/com_installer/tmpl/languages/default.php b/administrator/components/com_installer/tmpl/languages/default.php index 583e364e375ad..ac3ae2ff108ac 100644 --- a/administrator/components/com_installer/tmpl/languages/default.php +++ b/administrator/components/com_installer/tmpl/languages/default.php @@ -22,10 +22,7 @@
-
- sidebar; ?> -
-
+
$this, 'options' => array('filterButton' => false))); ?> items)) : ?> diff --git a/administrator/components/com_installer/tmpl/manage/default.php b/administrator/components/com_installer/tmpl/manage/default.php index 99e384e987da3..b31e99688a9db 100644 --- a/administrator/components/com_installer/tmpl/manage/default.php +++ b/administrator/components/com_installer/tmpl/manage/default.php @@ -22,10 +22,7 @@
-
- sidebar; ?> -
-
+
showMessage) : ?> loadTemplate('message'); ?> diff --git a/administrator/components/com_installer/tmpl/update/default.php b/administrator/components/com_installer/tmpl/update/default.php index 222ea6bd0ab54..80ca2014605d3 100644 --- a/administrator/components/com_installer/tmpl/update/default.php +++ b/administrator/components/com_installer/tmpl/update/default.php @@ -22,10 +22,7 @@
-
- sidebar; ?> -
-
+
showMessage) : ?> loadTemplate('message'); ?> diff --git a/administrator/components/com_installer/tmpl/updatesites/default.php b/administrator/components/com_installer/tmpl/updatesites/default.php index 5d7517ff25dcc..e295ab7304d09 100644 --- a/administrator/components/com_installer/tmpl/updatesites/default.php +++ b/administrator/components/com_installer/tmpl/updatesites/default.php @@ -22,10 +22,7 @@
-
- sidebar; ?> -
-
+
$this)); ?> items)) : ?> diff --git a/administrator/components/com_installer/tmpl/warnings/default.php b/administrator/components/com_installer/tmpl/warnings/default.php index 1b40eff8060fe..2c90198305349 100644 --- a/administrator/components/com_installer/tmpl/warnings/default.php +++ b/administrator/components/com_installer/tmpl/warnings/default.php @@ -17,10 +17,7 @@
-
- sidebar; ?> -
-
+
messages)) : ?> messages as $message) : ?> diff --git a/administrator/language/en-GB/en-GB.com_installer.ini b/administrator/language/en-GB/en-GB.com_installer.ini index 1b9e9e191d49d..985575ca48742 100644 --- a/administrator/language/en-GB/en-GB.com_installer.ini +++ b/administrator/language/en-GB/en-GB.com_installer.ini @@ -203,13 +203,6 @@ COM_INSTALLER_PACKAGE_FILE="Package File" COM_INSTALLER_PREFERENCES_DESCRIPTION="Fine tune how extensions installation and updates work." COM_INSTALLER_PREFERENCES_LABEL="Preferences" COM_INSTALLER_REINSTALL_BUTTON="Reinstall" -COM_INSTALLER_SUBMENU_DATABASE="Database" -COM_INSTALLER_SUBMENU_DISCOVER="Discover" -COM_INSTALLER_SUBMENU_INSTALL="Install" -COM_INSTALLER_SUBMENU_LANGUAGES="Install Languages" -COM_INSTALLER_SUBMENU_MANAGE="Manage" -COM_INSTALLER_SUBMENU_UPDATE="Update" -COM_INSTALLER_SUBMENU_UPDATESITES="Update Sites" COM_INSTALLER_SUBMENU_WARNINGS="Warnings" COM_INSTALLER_TITLE_DATABASE="Extensions: Database" COM_INSTALLER_TITLE_DISCOVER="Extensions: Discover" From a53a82d1176f0de83b9f2ceb643d10cd3c52b26c Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Thu, 21 Mar 2019 13:07:32 +0000 Subject: [PATCH 15/48] [4.0] com_templates sidebar (#24092) --- .../components/com_templates/View/Styles/HtmlView.php | 3 --- .../components/com_templates/View/Templates/HtmlView.php | 4 ---- .../components/com_templates/tmpl/styles/default.php | 5 +---- .../components/com_templates/tmpl/templates/default.php | 5 +---- 4 files changed, 2 insertions(+), 15 deletions(-) diff --git a/administrator/components/com_templates/View/Styles/HtmlView.php b/administrator/components/com_templates/View/Styles/HtmlView.php index 3e4aa8cef8ac1..b1ce2c1025305 100644 --- a/administrator/components/com_templates/View/Styles/HtmlView.php +++ b/administrator/components/com_templates/View/Styles/HtmlView.php @@ -96,7 +96,6 @@ public function display($tpl = null) } $this->addToolbar(); - $this->sidebar = \JHtmlSidebar::render(); return parent::display($tpl); } @@ -147,7 +146,5 @@ protected function addToolbar() } ToolbarHelper::help('JHELP_EXTENSIONS_TEMPLATE_MANAGER_STYLES'); - - \JHtmlSidebar::setAction('index.php?option=com_templates&view=styles'); } } diff --git a/administrator/components/com_templates/View/Templates/HtmlView.php b/administrator/components/com_templates/View/Templates/HtmlView.php index 8f862be139ce2..25b9ee8fe28ae 100644 --- a/administrator/components/com_templates/View/Templates/HtmlView.php +++ b/administrator/components/com_templates/View/Templates/HtmlView.php @@ -151,9 +151,5 @@ protected function addToolbar() } ToolbarHelper::help('JHELP_EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES'); - - \JHtmlSidebar::setAction('index.php?option=com_templates&view=templates'); - - $this->sidebar = \JHtmlSidebar::render(); } } diff --git a/administrator/components/com_templates/tmpl/styles/default.php b/administrator/components/com_templates/tmpl/styles/default.php index 5cf0824f4935e..1c2416bd358aa 100644 --- a/administrator/components/com_templates/tmpl/styles/default.php +++ b/administrator/components/com_templates/tmpl/styles/default.php @@ -26,10 +26,7 @@ ?>
-
- sidebar; ?> -
-
+
$this, 'options' => array('selectorFieldName' => 'client_id'))); ?> total > 0) : ?> diff --git a/administrator/components/com_templates/tmpl/templates/default.php b/administrator/components/com_templates/tmpl/templates/default.php index e452aaffdf37f..3d213d831f6a0 100644 --- a/administrator/components/com_templates/tmpl/templates/default.php +++ b/administrator/components/com_templates/tmpl/templates/default.php @@ -25,10 +25,7 @@
-
- sidebar; ?> -
-
+
$this, 'options' => array('selectorFieldName' => 'client_id'))); ?> total > 0) : ?> From 0b3e1fe350cf6d0d5103103e4d54353b0db6e3de Mon Sep 17 00:00:00 2001 From: Hard!k 4garwal Date: Thu, 21 Mar 2019 18:39:32 +0530 Subject: [PATCH 16/48] [4.0][a11y] Extra column for icon featured in com_contact (#23885) Co-Authored-By: hardik-codes --- .../components/com_contact/tmpl/contacts/default.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/administrator/components/com_contact/tmpl/contacts/default.php b/administrator/components/com_contact/tmpl/contacts/default.php index 997c8442e4e73..a97d837976693 100644 --- a/administrator/components/com_contact/tmpl/contacts/default.php +++ b/administrator/components/com_contact/tmpl/contacts/default.php @@ -61,6 +61,9 @@ + + + @@ -124,12 +127,17 @@ id); ?> + +
+ featured, $i, $canChange); ?> +
+
published, $i, 'contacts.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?> - featured, $i, $canChange); ?> -
+
+
checked_out) : ?> From 3b46dc30e96d74dfd1a4a366dcdcc137ee09f8fe Mon Sep 17 00:00:00 2001 From: Christiane Maier-Stadtherr Date: Thu, 21 Mar 2019 14:12:08 +0100 Subject: [PATCH 17/48] [4.0] Fix modified time for new entries in fields and field groups (#23978) --- administrator/components/com_fields/Table/FieldTable.php | 8 +++----- administrator/components/com_fields/Table/GroupTable.php | 3 +++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/administrator/components/com_fields/Table/FieldTable.php b/administrator/components/com_fields/Table/FieldTable.php index 5714d3bd1faa4..3a555a9a1b96f 100644 --- a/administrator/components/com_fields/Table/FieldTable.php +++ b/administrator/components/com_fields/Table/FieldTable.php @@ -143,16 +143,14 @@ public function check() } else { + $this->modified_time = $this->getDbo()->getNullDate(); + $this->modified_by = 0; + if (!(int) $this->created_time) { $this->created_time = $date->toSql(); } - if (!(int) $this->modified_time) - { - $this->modified_time = $date->toSql(); - } - if (empty($this->created_user_id)) { $this->created_user_id = $user->get('id'); diff --git a/administrator/components/com_fields/Table/GroupTable.php b/administrator/components/com_fields/Table/GroupTable.php index 0dcf9ec9114f4..7530f575ef8d3 100644 --- a/administrator/components/com_fields/Table/GroupTable.php +++ b/administrator/components/com_fields/Table/GroupTable.php @@ -102,6 +102,9 @@ public function check() } else { + $this->modified = $this->getDbo()->getNullDate(); + $this->modified_by = 0; + if (!(int) $this->created) { $this->created = $date->toSql(); From 2e1b2b33dc4f70518615a996b85ec4ced322b0b3 Mon Sep 17 00:00:00 2001 From: SharkyKZ Date: Thu, 21 Mar 2019 15:12:40 +0200 Subject: [PATCH 18/48] [4.0][mod_articles_category] Remove unused variable (#24053) --- modules/mod_articles_category/mod_articles_category.php | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/mod_articles_category/mod_articles_category.php b/modules/mod_articles_category/mod_articles_category.php index 772d6039f6db3..0fe2aae99b5ab 100644 --- a/modules/mod_articles_category/mod_articles_category.php +++ b/modules/mod_articles_category/mod_articles_category.php @@ -66,7 +66,6 @@ $grouped = false; $article_grouping = $params->get('article_grouping', 'none'); $article_grouping_direction = $params->get('article_grouping_direction', 'ksort'); - $item_heading = $params->get('item_heading'); if ($article_grouping !== 'none') { From bf5d2b4beeab8c4b739cc3bd946463794f0767d8 Mon Sep 17 00:00:00 2001 From: SharkyKZ Date: Thu, 21 Mar 2019 15:17:53 +0200 Subject: [PATCH 19/48] [4.0] Add type attribute (#24123) --- layouts/joomla/editors/buttons/modal.php | 2 +- layouts/joomla/form/field/media.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/layouts/joomla/editors/buttons/modal.php b/layouts/joomla/editors/buttons/modal.php index 811ea03c14cdd..51cfadb2ca1dc 100644 --- a/layouts/joomla/editors/buttons/modal.php +++ b/layouts/joomla/editors/buttons/modal.php @@ -55,7 +55,7 @@ 'width' => array_key_exists('width', $options) ? $options['width'] : '800px', 'bodyHeight' => array_key_exists('bodyHeight', $options) ? $options['bodyHeight'] : '70', 'modalWidth' => array_key_exists('modalWidth', $options) ? $options['modalWidth'] : '80', - 'footer' => $confirm . '' ) ); diff --git a/layouts/joomla/form/field/media.php b/layouts/joomla/form/field/media.php index 2e94a0e250afb..7b9c9929e1fe1 100644 --- a/layouts/joomla/form/field/media.php +++ b/layouts/joomla/form/field/media.php @@ -131,7 +131,8 @@ 'width' => '100%', 'modalWidth' => '80', 'bodyHeight' => '60', - 'footer' => '' + 'footer' => '' + . '', ) ); From 2376b24a8be4059ee4ed65586452e8ccdca78c01 Mon Sep 17 00:00:00 2001 From: Christiane Maier-Stadtherr Date: Thu, 21 Mar 2019 14:18:32 +0100 Subject: [PATCH 20/48] Add role="search" to the form (#23686) --- modules/mod_finder/tmpl/default.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mod_finder/tmpl/default.php b/modules/mod_finder/tmpl/default.php index 3e83defd7deaf..a1969014ccc48 100644 --- a/modules/mod_finder/tmpl/default.php +++ b/modules/mod_finder/tmpl/default.php @@ -58,7 +58,7 @@ } ?> - + get('show_advanced', 0); ?> From 98d1d34f422fb8af30172489f9a84aeda74deef4 Mon Sep 17 00:00:00 2001 From: Christiane Maier-Stadtherr Date: Thu, 21 Mar 2019 14:21:45 +0100 Subject: [PATCH 21/48] Add a filter featured to content articles (#23497) --- .../components/com_content/Model/ArticlesModel.php | 11 +++++++++++ .../components/com_content/forms/filter_articles.xml | 11 +++++++++++ administrator/language/en-GB/en-GB.com_content.ini | 3 +++ 3 files changed, 25 insertions(+) diff --git a/administrator/components/com_content/Model/ArticlesModel.php b/administrator/components/com_content/Model/ArticlesModel.php index 473b4d38ee4cb..9e40977c5fa5f 100644 --- a/administrator/components/com_content/Model/ArticlesModel.php +++ b/administrator/components/com_content/Model/ArticlesModel.php @@ -107,6 +107,9 @@ protected function populateState($ordering = 'a.id', $direction = 'desc') $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search'); $this->setState('filter.search', $search); + $featured = $this->getUserStateFromRequest($this->context . '.filter.featured', 'filter_featured', ''); + $this->setState('filter.featured', $featured); + $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', ''); $this->setState('filter.published', $published); @@ -315,6 +318,14 @@ protected function getListQuery() $query->where('a.access IN (' . $access . ')'); } + // Filter by featured. + $featured = (string) $this->getState('filter.featured'); + + if (in_array($featured, ['0','1'])) + { + $query->where('a.featured =' . (int) $featured); + } + // Filter by access level on categories. if (!$user->authorise('core.admin')) { diff --git a/administrator/components/com_content/forms/filter_articles.xml b/administrator/components/com_content/forms/filter_articles.xml index 63061f4246747..921c9ffa8e786 100644 --- a/administrator/components/com_content/forms/filter_articles.xml +++ b/administrator/components/com_content/forms/filter_articles.xml @@ -9,6 +9,17 @@ hint="JSEARCH_FILTER" /> + + + + + + Date: Thu, 21 Mar 2019 15:25:48 +0200 Subject: [PATCH 22/48] [4.0] Fix disable and enable buttons (#24276) --- .../system/js/joomla-toolbar-button.w-c.es6.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/build/media_source/system/js/joomla-toolbar-button.w-c.es6.js b/build/media_source/system/js/joomla-toolbar-button.w-c.es6.js index a49ce4f5397bc..173d5ae42aa91 100755 --- a/build/media_source/system/js/joomla-toolbar-button.w-c.es6.js +++ b/build/media_source/system/js/joomla-toolbar-button.w-c.es6.js @@ -24,15 +24,7 @@ window.customElements.define('joomla-toolbar-button', class extends HTMLElement if (!Joomla) { throw new Error('Joomla API is not properly initiated'); } - - this.connectedCallback(); - this.disabled = false; - - // If list selection is required, set button to disabled by default - if (this.listSelection) { - this.setDisabled(true); - } - + this.onChange = this.onChange.bind(this); this.addEventListener('click', event => this.executeTask(event)); @@ -50,6 +42,12 @@ window.customElements.define('joomla-toolbar-button', class extends HTMLElement const formSelector = this.form || 'adminForm'; this.formElement = document.getElementById(formSelector); + this.disabled = false; + // If list selection is required, set button to disabled by default + if (this.listSelection) { + this.setDisabled(true); + } + if (this.listSelection) { if (!this.formElement) { throw new Error(`The form "${formSelector}" is required to perform the task, but the form was not found on the page.`); @@ -120,4 +118,4 @@ window.customElements.define('joomla-toolbar-button', class extends HTMLElement return true; } -}); +}); \ No newline at end of file From bb66824e4b6e0f80f77690a62227fe82ccd7596c Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Thu, 21 Mar 2019 13:27:16 +0000 Subject: [PATCH 23/48] [4.0] [a11y] Remove title from fieldset (#24275) The title attribute is generally not very accessible. Keyboard users and touch screen users will never see it. It is particularly useless to add a title which is the same as other text already present as that can result in a screen reader announcing the same text twice. This PR removes the redundant title attribute from two fieldsets as the same text is correctly present in the fieldset legend --- .../components/com_config/tmpl/application/default_ftplogin.php | 2 +- .../components/com_installer/tmpl/installer/default_ftp.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/administrator/components/com_config/tmpl/application/default_ftplogin.php b/administrator/components/com_config/tmpl/application/default_ftplogin.php index fa2e947078418..8321c4fa0da25 100644 --- a/administrator/components/com_config/tmpl/application/default_ftplogin.php +++ b/administrator/components/com_config/tmpl/application/default_ftplogin.php @@ -11,7 +11,7 @@ defined('_JEXEC') or die; ?> -
+
ftp instanceof Exception) : ?> diff --git a/administrator/components/com_installer/tmpl/installer/default_ftp.php b/administrator/components/com_installer/tmpl/installer/default_ftp.php index cac3b78400a07..c9e491d3b79f2 100644 --- a/administrator/components/com_installer/tmpl/installer/default_ftp.php +++ b/administrator/components/com_installer/tmpl/installer/default_ftp.php @@ -12,7 +12,7 @@ use Joomla\CMS\Language\Text; ?> -
+
From da3441424a354c23f1dde9185fb9073bfa1009a5 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Thu, 21 Mar 2019 13:33:01 +0000 Subject: [PATCH 24/48] [4.0] [a11y] Remove redundant title from layouts and plugins (#24280) The title attribute is generally not very accessible. Keyboard users and touch screen users will never see it. It is particularly useless to add a title which is the same as other text already present as that can result in a screen reader announcing the same text twice. This PR removes the redundant title attribute where the same text is already displayed NOTE this is just a first pass at removing the low hanging fruit and a further pr will be needed when the tooltips are reviewed Co-Authored-By: brianteeman --- .../components/com_media/layouts/toolbar/create-folder.php | 2 +- .../components/com_media/layouts/toolbar/delete.php | 2 +- .../components/com_media/layouts/toolbar/upload.php | 2 +- .../components/com_modules/layouts/toolbar/cancelselect.php | 2 +- layouts/joomla/form/field/contenthistory.php | 2 +- layouts/joomla/pagination/link.php | 3 +-- layouts/joomla/searchtools/default/bar.php | 5 ++--- layouts/joomla/tinymce/togglebutton.php | 1 - layouts/joomla/toolbar/modal.php | 2 +- layouts/joomla/toolbar/versions.php | 3 +-- plugins/user/profile/field/tos.php | 1 - 11 files changed, 10 insertions(+), 15 deletions(-) diff --git a/administrator/components/com_media/layouts/toolbar/create-folder.php b/administrator/components/com_media/layouts/toolbar/create-folder.php index 6cdfe97f46b49..13731d105e7e8 100644 --- a/administrator/components/com_media/layouts/toolbar/create-folder.php +++ b/administrator/components/com_media/layouts/toolbar/create-folder.php @@ -14,5 +14,5 @@ $title = Text::_('COM_MEDIA_CREATE_NEW_FOLDER'); ?> diff --git a/administrator/components/com_media/layouts/toolbar/delete.php b/administrator/components/com_media/layouts/toolbar/delete.php index 6ce601a9ccba9..c22c92ede8d5a 100644 --- a/administrator/components/com_media/layouts/toolbar/delete.php +++ b/administrator/components/com_media/layouts/toolbar/delete.php @@ -14,5 +14,5 @@ $title = Text::_('JTOOLBAR_DELETE'); ?> diff --git a/administrator/components/com_media/layouts/toolbar/upload.php b/administrator/components/com_media/layouts/toolbar/upload.php index 23c4a958bb440..b288b73bbafc4 100644 --- a/administrator/components/com_media/layouts/toolbar/upload.php +++ b/administrator/components/com_media/layouts/toolbar/upload.php @@ -14,5 +14,5 @@ $title = Text::_('JTOOLBAR_UPLOAD'); ?> diff --git a/administrator/components/com_modules/layouts/toolbar/cancelselect.php b/administrator/components/com_modules/layouts/toolbar/cancelselect.php index 62ca82f28a97e..97fb09546ed44 100644 --- a/administrator/components/com_modules/layouts/toolbar/cancelselect.php +++ b/administrator/components/com_modules/layouts/toolbar/cancelselect.php @@ -13,6 +13,6 @@ $text = Text::_('JTOOLBAR_CANCEL'); ?> - diff --git a/layouts/joomla/form/field/contenthistory.php b/layouts/joomla/form/field/contenthistory.php index 4120579ed0d71..8cc4e84dbb4a3 100644 --- a/layouts/joomla/form/field/contenthistory.php +++ b/layouts/joomla/form/field/contenthistory.php @@ -63,7 +63,7 @@ ); ?> - diff --git a/layouts/joomla/pagination/link.php b/layouts/joomla/pagination/link.php index fff785256ad29..bf21a0a6913a5 100644 --- a/layouts/joomla/pagination/link.php +++ b/layouts/joomla/pagination/link.php @@ -64,7 +64,6 @@ } $class = 'active'; - $title = 'title="' . $item->text . '"'; $onClick = 'document.adminForm.' . $item->prefix . 'limitstart.value=' . ($item->base > 0 ? $item->base : '0') . '; Joomla.submitform();return false;'; } else @@ -74,7 +73,7 @@ ?>
  • - aria-label="" href="#" onclick=""> +
    • diff --git a/layouts/joomla/searchtools/default/bar.php b/layouts/joomla/searchtools/default/bar.php index 563c421270f6b..498ef901c9b36 100644 --- a/layouts/joomla/searchtools/default/bar.php +++ b/layouts/joomla/searchtools/default/bar.php @@ -9,7 +9,6 @@ defined('JPATH_BASE') or die; -use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\Registry\Registry; @@ -44,13 +43,13 @@ input; ?> -
    -
    diff --git a/layouts/joomla/tinymce/togglebutton.php b/layouts/joomla/tinymce/togglebutton.php index 1a7e03c36fb6a..bb7d4399e7e57 100644 --- a/layouts/joomla/tinymce/togglebutton.php +++ b/layouts/joomla/tinymce/togglebutton.php @@ -18,7 +18,6 @@
    diff --git a/layouts/joomla/toolbar/versions.php b/layouts/joomla/toolbar/versions.php index 1d1ec01514299..1627da4f91c74 100644 --- a/layouts/joomla/toolbar/versions.php +++ b/layouts/joomla/toolbar/versions.php @@ -51,7 +51,6 @@ onclick="document.getElementById('versionsModal').open()" class="btn btn-primary" - data-toggle="modal" - title=""> + data-toggle="modal"> diff --git a/plugins/user/profile/field/tos.php b/plugins/user/profile/field/tos.php index 51ab58473de7e..18c3fa801e5e9 100644 --- a/plugins/user/profile/field/tos.php +++ b/plugins/user/profile/field/tos.php @@ -64,7 +64,6 @@ protected function getLabel() // If a description is specified, use it to build a tooltip. if (!empty($this->description)) { - $label .= ' title="' . htmlspecialchars(trim($text, ':'), ENT_COMPAT, 'UTF-8') . '"'; $label .= ' data-content="' . htmlspecialchars( $this->translateDescription ? Text::_($this->description) : $this->description, ENT_COMPAT, From 38dde05964525a832b6c63ed78cb73d880b35349 Mon Sep 17 00:00:00 2001 From: SharkyKZ Date: Thu, 21 Mar 2019 15:34:06 +0200 Subject: [PATCH 25/48] [4.0] Get document from application in HTMLHelper (#24272) --- libraries/src/HTML/HTMLHelper.php | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/libraries/src/HTML/HTMLHelper.php b/libraries/src/HTML/HTMLHelper.php index cf43f32ea0448..377f761230b21 100644 --- a/libraries/src/HTML/HTMLHelper.php +++ b/libraries/src/HTML/HTMLHelper.php @@ -671,7 +671,7 @@ public static function stylesheet($file, $options = array(), $attribs = array()) } // If inclusion is required - $document = Factory::getDocument(); + $document = Factory::getApplication()->getDocument(); foreach ($includes as $include) { @@ -730,7 +730,7 @@ public static function script($file, $options = array(), $attribs = array()) } // If inclusion is required - $document = Factory::getDocument(); + $document = Factory::getApplication()->getDocument(); foreach ($includes as $include) { @@ -768,9 +768,6 @@ public static function webcomponent(string $file, array $options = []) // Script core.js is responsible for the polyfills and the async loading of the web components static::_('behavior.core'); - $version = ''; - $mediaVersion = Factory::getDocument()->getMediaVersion(); - // Add the css if exists self::_('stylesheet', str_replace('.js', '.css', $file), $options); @@ -787,11 +784,14 @@ public static function webcomponent(string $file, array $options = []) return; } + $document = Factory::getApplication()->getDocument(); + $version = ''; + if (isset($options['version'])) { if ($options['version'] === 'auto') { - $version = '?' . $mediaVersion; + $version = '?' . $document->getMediaVersion(); } else { @@ -799,10 +799,11 @@ public static function webcomponent(string $file, array $options = []) } } + $components = $document->getScriptOptions('webcomponents'); + foreach ($includes as $include) { $potential = $include . ((strpos($include, '?') === false) ? $version : ''); - $components = Factory::getDocument()->getScriptOptions('webcomponents'); if (in_array($potential, $components)) { @@ -810,8 +811,9 @@ public static function webcomponent(string $file, array $options = []) } $components[] = $potential; - Factory::getDocument()->addScriptOptions('webcomponents', $components); } + + $document->addScriptOptions('webcomponents', $components); } /** @@ -1067,7 +1069,7 @@ public static function calendar($value, $name, $id, $format = '%Y-%m-%d', $attri { $tag = Factory::getLanguage()->getTag(); $calendar = Factory::getLanguage()->getCalendar(); - $direction = strtolower(Factory::getDocument()->getDirection()); + $direction = strtolower(Factory::getApplication()->getDocument()->getDirection()); // Get the appropriate file for the current language date helper $helperPath = 'system/fields/calendar-locales/date/gregorian/date-helper.min.js'; From 652cef32d884bf026d18ae609ef3fe83f5c725d8 Mon Sep 17 00:00:00 2001 From: infograf768 Date: Thu, 21 Mar 2019 14:35:02 +0100 Subject: [PATCH 26/48] [4.0] [com_mdules] Batch language broken (#24273) --- .../tmpl/modules/default_batch_body.php | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/administrator/components/com_modules/tmpl/modules/default_batch_body.php b/administrator/components/com_modules/tmpl/modules/default_batch_body.php index d683626e4f1ac..62b105e5d2828 100644 --- a/administrator/components/com_modules/tmpl/modules/default_batch_body.php +++ b/administrator/components/com_modules/tmpl/modules/default_batch_body.php @@ -41,24 +41,18 @@
    -
    -
    +
    +
    -
    -
    +
    +
    -
    -
    +
    +
    -
    -
    - - -
    -
    - +
    -
    +
    From 8499c2cf36bf19ce546b81c6a4a675c52900c921 Mon Sep 17 00:00:00 2001 From: infograf768 Date: Thu, 21 Mar 2019 14:36:18 +0100 Subject: [PATCH 27/48] [4.0] Status Module: Edit Account redirection (#24281) --- .../com_users/Controller/UserController.php | 21 +++++++++++++++++++ .../components/com_users/tmpl/user/edit.php | 4 ++++ .../modules/mod_status/tmpl/default.php | 3 ++- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/administrator/components/com_users/Controller/UserController.php b/administrator/components/com_users/Controller/UserController.php index 3d79b0fec1781..dce81ba851b0c 100644 --- a/administrator/components/com_users/Controller/UserController.php +++ b/administrator/components/com_users/Controller/UserController.php @@ -57,6 +57,27 @@ protected function allowEdit($data = array(), $key = 'id') return parent::allowEdit($data, $key); } + /** + * Override parent cancel to redirect when using status edit account. + * + * @param string $key The name of the primary key of the URL variable. + * + * @return boolean True if access level checks pass, false otherwise. + * + * @since __DEPLOY_VERSION__ + */ + public function cancel($key = null) + { + $result = parent::cancel(); + + if ($return = $this->input->get('return', '', 'BASE64')) + { + $this->app->redirect(base64_decode($return)); + } + + return $result; + } + /** * Method to run batch operations. * diff --git a/administrator/components/com_users/tmpl/user/edit.php b/administrator/components/com_users/tmpl/user/edit.php index d57dffa209fbe..6c023da3af632 100644 --- a/administrator/components/com_users/tmpl/user/edit.php +++ b/administrator/components/com_users/tmpl/user/edit.php @@ -9,6 +9,7 @@ defined('_JEXEC') or die; +use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Layout\LayoutHelper; @@ -18,6 +19,8 @@ HTMLHelper::_('behavior.formvalidator'); HTMLHelper::_('script', 'com_users/admin-users-user.min.js', array('version' => 'auto', 'relative' => true)); +$input = Factory::getApplication()->input; + // Get the form fieldsets. $fieldsets = $this->form->getFieldsets(); $settings = array(); @@ -105,5 +108,6 @@
    +
    diff --git a/administrator/modules/mod_status/tmpl/default.php b/administrator/modules/mod_status/tmpl/default.php index bdae532c97ea7..5e8ec869adeef 100644 --- a/administrator/modules/mod_status/tmpl/default.php +++ b/administrator/modules/mod_status/tmpl/default.php @@ -97,7 +97,8 @@ name; ?>
    - id; ?> + + id . '&return=' . base64_encode($uri); ?> + form->getInput('module'); ?> form->getInput('client_id'); ?> diff --git a/administrator/templates/atum/html/modules.php b/administrator/templates/atum/html/modules.php index 41cb8ac550611..b63fe6787d218 100644 --- a/administrator/templates/atum/html/modules.php +++ b/administrator/templates/atum/html/modules.php @@ -12,6 +12,7 @@ use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; +use Joomla\CMS\Uri\Uri; /** * This is a file to add template specific chrome to module rendering. To use it you would @@ -64,12 +65,15 @@ function modChrome_well($module, &$params, &$attribs) if ($canEdit) { + $uri = Uri::getInstance(); + $url = Route::_('index.php?option=com_modules&task=module.edit&id=' . $id . '&return=' . base64_encode($uri)); + $dropdownPosition = Factory::getLanguage()->isRTL() ? 'left' : 'right'; echo '
    '; echo ''; echo '
    '; - echo '' . Text::_('JACTION_EDIT') . ''; + echo '' . Text::_('JACTION_EDIT') . ''; echo '' . Text::_('JACTION_UNPUBLISH') . ''; echo '
    '; echo '
    '; @@ -112,12 +116,15 @@ function modChrome_body($module, &$params, &$attribs) if ($canEdit) { + $uri = Uri::getInstance(); + $url = Route::_('index.php?option=com_modules&task=module.edit&id=' . $id . '&return=' . base64_encode($uri)); + $dropdownPosition = Factory::getLanguage()->isRTL() ? 'left' : 'right'; echo '
    '; echo ''; echo '
    '; - echo '' . Text::_('JACTION_EDIT') . ''; + echo '' . Text::_('JACTION_EDIT') . ''; echo '' . Text::_('JACTION_UNPUBLISH') . ''; echo '
    '; echo '
    '; From a07df9e19c763207ba1e5dc40774693264d75467 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Thu, 21 Mar 2019 13:37:52 +0000 Subject: [PATCH 29/48] [4.0] [a11y] Remove redundant title from admin components (#24283) The title attribute is generally not very accessible. Keyboard users and touch screen users will never see it. It is particularly useless to add a title which is the same as other text already present as that can result in a screen reader announcing the same text twice. This PR removes the redundant title attribute where the same text is already displayed. NOTE this is just a first pass at removing the low hanging fruit and a MUCH LARGER further pr will be needed when the tooltips are reviewed --- administrator/components/com_menus/Field/MenutypeField.php | 4 ++-- administrator/components/com_menus/tmpl/menutypes/default.php | 2 +- administrator/components/com_users/Service/HTML/Users.php | 2 +- administrator/components/com_users/tmpl/user/edit.php | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/administrator/components/com_menus/Field/MenutypeField.php b/administrator/components/com_menus/Field/MenutypeField.php index 65a4b8524be6c..b80c15151748c 100644 --- a/administrator/components/com_menus/Field/MenutypeField.php +++ b/administrator/components/com_menus/Field/MenutypeField.php @@ -90,8 +90,8 @@ protected function getInput() $link = Route::_('index.php?option=com_menus&view=menutypes&tmpl=component&client_id=' . $clientId . '&recordId=' . $recordId); $html[] = ''; - $html[] = ''; $html[] = HTMLHelper::_( 'bootstrap.renderModal', diff --git a/administrator/components/com_menus/tmpl/menutypes/default.php b/administrator/components/com_menus/tmpl/menutypes/default.php index 24134db0ca682..cfddb2137c585 100644 --- a/administrator/components/com_menus/tmpl/menutypes/default.php +++ b/administrator/components/com_menus/tmpl/menutypes/default.php @@ -30,7 +30,7 @@ $item) : ?> $this->recordId, 'title' => $item->type ?? $item->title, 'request' => $item->request); ?> -
    diff --git a/administrator/components/com_users/Service/HTML/Users.php b/administrator/components/com_users/Service/HTML/Users.php index 6cbc455dfad93..0bb86942be642 100644 --- a/administrator/components/com_users/Service/HTML/Users.php +++ b/administrator/components/com_users/Service/HTML/Users.php @@ -63,7 +63,7 @@ public function addNote($userId) $title = Text::_('COM_USERS_ADD_NOTE'); return ''; } diff --git a/administrator/components/com_users/tmpl/user/edit.php b/administrator/components/com_users/tmpl/user/edit.php index 6c023da3af632..93572c8d8f7cb 100644 --- a/administrator/components/com_users/tmpl/user/edit.php +++ b/administrator/components/com_users/tmpl/user/edit.php @@ -63,8 +63,7 @@
    -
    From c673e96831f6c31a647bf4838d8a418fb1a47c8f Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Thu, 21 Mar 2019 13:39:29 +0000 Subject: [PATCH 30/48] [4.0] Remove description label (#23946) When the only content of a tab is an editor there is no need to have the label displayed next to the editor instead it can be displayed above the editor. This is already the case for categories. This PR adds the same for tags and contacts (miscellaneous information) --- administrator/components/com_contact/tmpl/contact/edit.php | 3 ++- administrator/components/com_tags/tmpl/tag/edit.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/administrator/components/com_contact/tmpl/contact/edit.php b/administrator/components/com_contact/tmpl/contact/edit.php index 8ed6d80cfffbe..b89820c625289 100644 --- a/administrator/components/com_contact/tmpl/contact/edit.php +++ b/administrator/components/com_contact/tmpl/contact/edit.php @@ -80,7 +80,8 @@
    - form->renderField('misc'); ?> + form->getLabel('misc'); ?> + form->getInput('misc'); ?>
    diff --git a/administrator/components/com_tags/tmpl/tag/edit.php b/administrator/components/com_tags/tmpl/tag/edit.php index 68b18b468391a..ec5c7e31270a4 100644 --- a/administrator/components/com_tags/tmpl/tag/edit.php +++ b/administrator/components/com_tags/tmpl/tag/edit.php @@ -35,7 +35,8 @@
    - form->renderField('description'); ?> + form->getLabel('description'); ?> + form->getInput('description'); ?>
    From 20c1c8a599ae9e8e46cabe6671f3ba2e91a84d5e Mon Sep 17 00:00:00 2001 From: Hard!k 4garwal Date: Thu, 21 Mar 2019 19:09:57 +0530 Subject: [PATCH 31/48] [4.0] Label com_content (#24242) Co-Authored-By: hardik-codes --- administrator/components/com_content/tmpl/article/edit.php | 1 + 1 file changed, 1 insertion(+) diff --git a/administrator/components/com_content/tmpl/article/edit.php b/administrator/components/com_content/tmpl/article/edit.php index 311db4b3f1ef6..959e793e3f4e3 100644 --- a/administrator/components/com_content/tmpl/article/edit.php +++ b/administrator/components/com_content/tmpl/article/edit.php @@ -51,6 +51,7 @@
    + form->getLabel('articletext'); ?> form->getInput('articletext'); ?>
    From 5056fb79404070282c2edf17185ef9ce90ae1a8b Mon Sep 17 00:00:00 2001 From: Hard!k 4garwal Date: Thu, 21 Mar 2019 19:11:02 +0530 Subject: [PATCH 32/48] [4.0] Change color to have sufficient contrast as per a11y standards (#24265) --- administrator/templates/atum/scss/_variables.scss | 1 + administrator/templates/atum/scss/blocks/_login.scss | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss index d9425d5e4c62c..1d6cc533df6cc 100644 --- a/administrator/templates/atum/scss/_variables.scss +++ b/administrator/templates/atum/scss/_variables.scss @@ -51,6 +51,7 @@ $colors: ( sidebar-child-link-color: #cbd6e2, login-main-bg: darken(theme-color("primary"), 8%), login-light-bg: #3b97f9, + form-link-feedback: #cbd8e1, border: $gray-400, row-selected: #d9edf7, white-offset: #fefefe, diff --git a/administrator/templates/atum/scss/blocks/_login.scss b/administrator/templates/atum/scss/blocks/_login.scss index 20d0ea1d56f67..d6c08f44ce97d 100644 --- a/administrator/templates/atum/scss/blocks/_login.scss +++ b/administrator/templates/atum/scss/blocks/_login.scss @@ -58,7 +58,7 @@ span { font-size: .9rem; - color: #c6d2de; + color: var(--form-link-feedback); } } } From c481d91ab7764ff06c549ea774385401588d7e91 Mon Sep 17 00:00:00 2001 From: SharkyKZ Date: Thu, 21 Mar 2019 15:41:48 +0200 Subject: [PATCH 33/48] [4.0][plg_authentication_joomla] Use injected app and DB (#24206) --- plugins/authentication/joomla/joomla.php | 38 +++++++++++++++--------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/plugins/authentication/joomla/joomla.php b/plugins/authentication/joomla/joomla.php index 3eb46183ff3b1..5bb40b48b324c 100644 --- a/plugins/authentication/joomla/joomla.php +++ b/plugins/authentication/joomla/joomla.php @@ -10,7 +10,6 @@ defined('_JEXEC') or die; use Joomla\CMS\Authentication\Authentication; -use Joomla\CMS\Factory; use Joomla\CMS\Helper\AuthenticationHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Plugin\CMSPlugin; @@ -25,6 +24,22 @@ */ class PlgAuthenticationJoomla extends CMSPlugin { + /** + * Application object + * + * @var \Joomla\CMS\Application\CMSApplication + * @since __DEPLOY_VERSION__ + */ + protected $app; + + /** + * Database object + * + * @var \Joomla\Database\DatabaseDriver + * @since __DEPLOY_VERSION__ + */ + protected $db; + /** * This method should handle any authentication and report back to the subject * @@ -49,15 +64,13 @@ public function onUserAuthenticate($credentials, $options, &$response) return; } - // Get a database object - $db = Factory::getDbo(); - $query = $db->getQuery(true) + $query = $this->db->getQuery(true) ->select('id, password') ->from('#__users') - ->where('username=' . $db->quote($credentials['username'])); + ->where('username=' . $this->db->quote($credentials['username'])); - $db->setQuery($query); - $result = $db->loadObject(); + $this->db->setQuery($query); + $result = $this->db->loadObject(); if ($result) { @@ -70,7 +83,7 @@ public function onUserAuthenticate($credentials, $options, &$response) $response->email = $user->email; $response->fullname = $user->name; - if (Factory::getApplication()->isClient('administrator')) + if ($this->app->isClient('administrator')) { $response->language = $user->getParam('admin_language'); } @@ -111,8 +124,7 @@ public function onUserAuthenticate($credentials, $options, &$response) return; } - $model = Factory::getApplication()->bootComponent('com_users') - ->getMVCFactory()->createModel('User', 'Administrator', ['ignore_request' => true]); + $model = $this->app->bootComponent('com_users')->getMVCFactory()->createModel('User', 'Administrator', ['ignore_request' => true]); // Load the user's OTP (one time password, a.k.a. two factor auth) configuration if (!array_key_exists('otp_config', $options)) @@ -134,11 +146,9 @@ public function onUserAuthenticate($credentials, $options, &$response) { try { - $app = Factory::getApplication(); - $this->loadLanguage(); - $app->enqueueMessage(Text::_('PLG_AUTH_JOOMLA_ERR_SECRET_CODE_WITHOUT_TFA'), 'warning'); + $this->app->enqueueMessage(Text::_('PLG_AUTH_JOOMLA_ERR_SECRET_CODE_WITHOUT_TFA'), 'warning'); } catch (Exception $exc) { @@ -154,7 +164,7 @@ public function onUserAuthenticate($credentials, $options, &$response) // Try to validate the OTP PluginHelper::importPlugin('twofactorauth'); - $otpAuthReplies = Factory::getApplication()->triggerEvent('onUserTwofactorAuthenticate', array($credentials, $options)); + $otpAuthReplies = $this->app->triggerEvent('onUserTwofactorAuthenticate', array($credentials, $options)); $check = false; From 851ff665346ff2b15679fe247491cadcd8503a68 Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Thu, 21 Mar 2019 14:54:04 +0100 Subject: [PATCH 34/48] [4.0] Use a factory to create user objects from (#22849) --- libraries/src/Application/IdentityAware.php | 25 ++++++- libraries/src/Factory.php | 17 ++++- .../src/Service/Provider/Application.php | 4 + libraries/src/Service/Provider/User.php | 48 ++++++++++++ libraries/src/User/User.php | 22 ++++-- libraries/src/User/UserFactory.php | 74 +++++++++++++++++++ libraries/src/User/UserFactoryInterface.php | 41 ++++++++++ 7 files changed, 219 insertions(+), 12 deletions(-) create mode 100644 libraries/src/Service/Provider/User.php create mode 100644 libraries/src/User/UserFactory.php create mode 100644 libraries/src/User/UserFactoryInterface.php diff --git a/libraries/src/Application/IdentityAware.php b/libraries/src/Application/IdentityAware.php index 1fe220a0a0f44..7281b5833e348 100644 --- a/libraries/src/Application/IdentityAware.php +++ b/libraries/src/Application/IdentityAware.php @@ -11,6 +11,7 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\User\User; +use Joomla\CMS\User\UserFactoryInterface; /** * Trait for application classes which are identity (user) aware @@ -27,6 +28,14 @@ trait IdentityAware */ protected $identity; + /** + * UserFactoryInterface + * + * @var UserFactoryInterface + * @since 4.0.0 + */ + private $userFactory; + /** * Get the application identity. * @@ -50,8 +59,22 @@ public function getIdentity() */ public function loadIdentity(User $identity = null) { - $this->identity = $identity ?: User::getInstance(); + $this->identity = $identity ?: $this->userFactory->loadUserById(0); return $this; } + + /** + * Set the user factory to use. + * + * @param UserFactoryInterface $userFactory The user factory to use + * + * @return void + * + * @since 4.0.0 + */ + public function setUserFactory(UserFactoryInterface $userFactory) + { + $this->userFactory = $userFactory; + } } diff --git a/libraries/src/Factory.php b/libraries/src/Factory.php index 0f355629ea649..0ca96aa4c1ee5 100644 --- a/libraries/src/Factory.php +++ b/libraries/src/Factory.php @@ -300,11 +300,21 @@ public static function getDocument() * * @return User object * - * @see User - * @since 1.7.0 + * @see User + * @since 1.7.0 + * @deprecated 5.0 Load the user service from the dependency injection container or via $app->getIdentity() */ public static function getUser($id = null) { + @trigger_error( + sprintf( + '%1$s() is deprecated. Load the user from the dependency injection container or via %2$s::getApplication()->getIdentity().', + __METHOD__, + __CLASS__ + ), + E_USER_DEPRECATED + ); + $instance = self::getApplication()->getSession()->get('user'); if (is_null($id)) @@ -560,7 +570,8 @@ protected static function createContainer(): Container ->registerServiceProvider(new \Joomla\CMS\Service\Provider\Session) ->registerServiceProvider(new \Joomla\CMS\Service\Provider\Toolbar) ->registerServiceProvider(new \Joomla\CMS\Service\Provider\WebAssetRegistry) - ->registerServiceProvider(new \Joomla\CMS\Service\Provider\ApiRouter); + ->registerServiceProvider(new \Joomla\CMS\Service\Provider\ApiRouter) + ->registerServiceProvider(new \Joomla\CMS\Service\Provider\User); return $container; } diff --git a/libraries/src/Service/Provider/Application.php b/libraries/src/Service/Provider/Application.php index 842b5dcec417e..b68d4cbe9880c 100644 --- a/libraries/src/Service/Provider/Application.php +++ b/libraries/src/Service/Provider/Application.php @@ -20,6 +20,7 @@ use Joomla\CMS\Console\SessionGcCommand; use Joomla\CMS\Console\SessionMetadataGcCommand; use Joomla\CMS\Factory; +use Joomla\CMS\User\UserFactoryInterface; use Joomla\Console\Application as BaseConsoleApplication; use Joomla\Console\Loader\LoaderInterface; use Joomla\DI\Container; @@ -62,6 +63,7 @@ function (Container $container) $app->setDispatcher($container->get(DispatcherInterface::class)); $app->setLogger($container->get(LoggerInterface::class)); $app->setSession($container->get(SessionInterface::class)); + $app->setUserFactory($container->get(UserFactoryInterface::class)); return $app; }, @@ -84,6 +86,7 @@ function (Container $container) $app->setDispatcher($container->get(DispatcherInterface::class)); $app->setLogger($container->get(LoggerInterface::class)); $app->setSession($container->get(SessionInterface::class)); + $app->setUserFactory($container->get(UserFactoryInterface::class)); return $app; }, @@ -108,6 +111,7 @@ function (Container $container) $app->setCommandLoader($container->get(LoaderInterface::class)); $app->setLogger($container->get(LoggerInterface::class)); $app->setSession($container->get(SessionInterface::class)); + $app->setUserFactory($container->get(UserFactoryInterface::class)); return $app; }, diff --git a/libraries/src/Service/Provider/User.php b/libraries/src/Service/Provider/User.php new file mode 100644 index 0000000000000..c172a734a92d6 --- /dev/null +++ b/libraries/src/Service/Provider/User.php @@ -0,0 +1,48 @@ +alias('user.factory', UserFactoryInterface::class) + ->alias(UserFactory::class, UserFactoryInterface::class) + ->share( + UserFactoryInterface::class, + function (Container $container) + { + return new UserFactory($container->get(DatabaseInterface::class)); + }, + true + ); + } +} diff --git a/libraries/src/User/User.php b/libraries/src/User/User.php index 0d7ae5ac473ad..e4992ae99ddec 100644 --- a/libraries/src/User/User.php +++ b/libraries/src/User/User.php @@ -251,18 +251,24 @@ public function __construct($identifier = 0) * * @return User The User object. * - * @since 1.7.0 + * @since 1.7.0 + * @deprecated 5.0 Load the user service from the dependency injection container or via $app->getIdentity() */ public static function getInstance($identifier = 0) { + @trigger_error( + sprintf( + '%1$s() is deprecated. Load the user from the dependency injection container or via %2$s::getApplication()->getIdentity().', + __METHOD__, + __CLASS__ + ), + E_USER_DEPRECATED + ); + // Find the user id if (!is_numeric($identifier)) { - if (!$id = UserHelper::getUserId($identifier)) - { - // If the $identifier doesn't match with any id, just return an empty User. - return new static; - } + return Factory::getContainer()->get(UserFactoryInterface::class)->loadUserByUsername($identifier); } else { @@ -273,13 +279,13 @@ public static function getInstance($identifier = 0) // Note: don't cache this user because it'll have a new ID on save! if ($id === 0) { - return new static; + return Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById($id); } // Check if the user ID is already cached. if (empty(self::$instances[$id])) { - self::$instances[$id] = new static($id); + self::$instances[$id] = Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById($id); } return self::$instances[$id]; diff --git a/libraries/src/User/UserFactory.php b/libraries/src/User/UserFactory.php new file mode 100644 index 0000000000000..6cb9014a3d880 --- /dev/null +++ b/libraries/src/User/UserFactory.php @@ -0,0 +1,74 @@ +db = $db; + } + + /** + * Method to get an instance of a user for the given id. + * + * @param int $id The id + * + * @return User + * + * @since __DEPLOY_VERSION__ + */ + public function loadUserById(int $id): User + { + return new User($id); + } + + /** + * Method to get an instance of a user for the given username. + * + * @param string $username The username + * + * @return User + * + * @since __DEPLOY_VERSION__ + */ + public function loadUserByUsername(string $username): User + { + // Initialise some variables + $query = $this->db->getQuery(true) + ->select($this->db->quoteName('id')) + ->from($this->db->quoteName('#__users')) + ->where($this->db->quoteName('username') . ' = ' . $this->db->quote($username)); + $query->setLimit(1, 0); + $this->db->setQuery($query); + + return $this->loadUserById((int) $this->db->loadResult()); + } +} diff --git a/libraries/src/User/UserFactoryInterface.php b/libraries/src/User/UserFactoryInterface.php new file mode 100644 index 0000000000000..c06f1b1a8c993 --- /dev/null +++ b/libraries/src/User/UserFactoryInterface.php @@ -0,0 +1,41 @@ + Date: Thu, 21 Mar 2019 15:16:48 +0100 Subject: [PATCH 35/48] [4.0] Fix FolderlistField.php on Windows (#23769) --- libraries/src/Form/Field/FolderlistField.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/src/Form/Field/FolderlistField.php b/libraries/src/Form/Field/FolderlistField.php index 9987c1cefcb4e..77da265ea2894 100644 --- a/libraries/src/Form/Field/FolderlistField.php +++ b/libraries/src/Form/Field/FolderlistField.php @@ -226,7 +226,7 @@ protected function getOptions() } // Remove the root part and the leading / - $folder = trim(str_replace($path, '', $folder), '/'); + $folder = trim(str_replace($path, '', $folder), DIRECTORY_SEPARATOR); $options[] = HTMLHelper::_('select.option', $folder, $folder); } From 2fe1ce2ee749c6623d2a6f9fb787370cea1d908b Mon Sep 17 00:00:00 2001 From: Nicola Galgano Date: Thu, 21 Mar 2019 15:17:28 +0100 Subject: [PATCH 36/48] [4.0] - install on Postgresql fixes (#24146) --- .../sql/updates/postgresql/3.9.0-2018-05-02.sql | 4 ++-- installation/sql/postgresql/joomla.sql | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-02.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-02.sql index 04265c994e862..6aae953caff55 100644 --- a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-02.sql +++ b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-02.sql @@ -14,5 +14,5 @@ CREATE TABLE "#__privacy_requests" ( "user_id" bigint DEFAULT 0 NOT NULL, PRIMARY KEY ("id") ); -CREATE INDEX "#__fields_idx_checked_out" ON "#__privacy_requests" ("checked_out"); -CREATE INDEX "#__fields_idx_user_id" ON "#__privacy_requests" ("user_id"); +CREATE INDEX "#__privacy_requests_idx_checked_out" ON "#__privacy_requests" ("checked_out"); +CREATE INDEX "#__privacy_requests_idx_user_id" ON "#__privacy_requests" ("user_id"); diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql index a25634c9ff9b6..109d278e4b4d7 100644 --- a/installation/sql/postgresql/joomla.sql +++ b/installation/sql/postgresql/joomla.sql @@ -451,7 +451,7 @@ CREATE TABLE IF NOT EXISTS "#__contentitem_tag_map" ( "tag_id" integer NOT NULL, "tag_date" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL, "type_id" integer NOT NULL, - CONSTRAINT "#__uc_itemnametagid" UNIQUE ("type_id", "content_item_id", "tag_id") + PRIMARY KEY ("type_id", "content_item_id", "tag_id") ); CREATE INDEX "#__contentitem_tag_map_idx_tag_type" ON "#__contentitem_tag_map" ("tag_id", "type_id"); CREATE INDEX "#__contentitem_tag_map_idx_date_id" ON "#__contentitem_tag_map" ("tag_date", "tag_id"); @@ -692,14 +692,12 @@ INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "elem (494, 0, 'plg_extension_finder', 'plugin', 'finder', 'extension', 0, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0), (495, 0, 'plg_api-authentication_basic', 'plugin', 'basic', 'api-authentication', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0), (496, 0, 'plg_webservices_content', 'plugin', 'content', 'webservices', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0), +(509, 0, 'atum', 'template', 'atum', '', 1, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0), +(510, 0, 'cassiopeia', 'template', 'cassiopeia', '', 0, 1, 1, 0, '', '{"logoFile":"","fluidContainer":"0","sidebarLeftWidth":"3","sidebarRightWidth":"3"}', 0, '1970-01-01 00:00:00', 0, 0), (600, 802, 'English (en-GB)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0), (601, 802, 'English (en-GB)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0), (700, 0, 'files_joomla', 'file', 'joomla', '', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0), -(802, 0, 'English (en-GB) Language Pack', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0, ''); - -INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state") VALUES -(509, 0, 'atum', 'template', 'atum', '', 1, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0), -(510, 0, 'cassiopeia', 'template', 'cassiopeia', '', 0, 1, 1, 0, '', '{"logoFile":"","fluidContainer":"0","sidebarLeftWidth":"3","sidebarRightWidth":"3"}', 0, '1970-01-01 00:00:00', 0, 0); +(802, 0, 'English (en-GB) Language Pack', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0); SELECT setval('#__extensions_extension_id_seq', 10000, false); From 8c4b20591f1fb39817019c1e8d3e7b0ce71a82e4 Mon Sep 17 00:00:00 2001 From: Hard!k 4garwal Date: Thu, 21 Mar 2019 20:09:21 +0530 Subject: [PATCH 37/48] [4.0] Fix inconsistency in order of toolbar buttons in com_users (#24207) Co-Authored-By: hardik-codes --- .../com_modules/View/Modules/HtmlView.php | 13 ++++++++----- .../components/com_users/View/Users/HtmlView.php | 16 ++++++++-------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/administrator/components/com_modules/View/Modules/HtmlView.php b/administrator/components/com_modules/View/Modules/HtmlView.php index f3d1de6ebb8c9..d3bc59d3bf892 100644 --- a/administrator/components/com_modules/View/Modules/HtmlView.php +++ b/administrator/components/com_modules/View/Modules/HtmlView.php @@ -163,11 +163,6 @@ protected function addToolbar() { $toolbar->standardButton('new', 'JTOOLBAR_NEW') ->onclick("location.href='index.php?option=com_modules&view=select'"); - - $toolbar->standardButton('copy') - ->text('JTOOLBAR_DUPLICATE') - ->task('modules.duplicate') - ->listCheck(true); } if ($canDo->get('core.edit.state') || Factory::getUser()->authorise('core.admin')) @@ -209,6 +204,14 @@ protected function addToolbar() ->listCheck(true); } + if ($canDo->get('core.create')) + { + $toolbar->standardButton('copy') + ->text('JTOOLBAR_DUPLICATE') + ->task('modules.duplicate') + ->listCheck(true); + } + if ($state->get('filter.state') == -2 && $canDo->get('core.delete')) { $toolbar->delete('modules.delete') diff --git a/administrator/components/com_users/View/Users/HtmlView.php b/administrator/components/com_users/View/Users/HtmlView.php index 0671a12ae1f8b..9f4dba0b07f27 100644 --- a/administrator/components/com_users/View/Users/HtmlView.php +++ b/administrator/components/com_users/View/Users/HtmlView.php @@ -166,14 +166,6 @@ protected function addToolbar() ->listCheck(true); } - if ($canDo->get('core.delete')) - { - $toolbar->delete('users.delete') - ->text('JTOOLBAR_DELETE') - ->message('JGLOBAL_CONFIRM_DELETE') - ->listCheck(true); - } - // Add a batch button if ($user->authorise('core.create', 'com_users') && $user->authorise('core.edit', 'com_users') @@ -185,6 +177,14 @@ protected function addToolbar() ->listCheck(true); } + if ($canDo->get('core.delete')) + { + $toolbar->delete('users.delete') + ->text('JTOOLBAR_DELETE') + ->message('JGLOBAL_CONFIRM_DELETE') + ->listCheck(true); + } + if ($canDo->get('core.admin') || $canDo->get('core.options')) { $toolbar->preferences('com_users'); From 2bb3bd2b79cd67352a50fcd93abcb94649f616e5 Mon Sep 17 00:00:00 2001 From: SharkyKZ Date: Thu, 21 Mar 2019 17:17:55 +0200 Subject: [PATCH 38/48] [4.0] Use namespaced classes in Form library (#24212) --- libraries/src/Form/Field/AliastagField.php | 5 +-- libraries/src/Form/Field/AuthorField.php | 5 +-- .../src/Form/Field/CachehandlerField.php | 5 +-- libraries/src/Form/Field/CategoryField.php | 5 +-- libraries/src/Form/Field/CheckboxesField.php | 6 +--- libraries/src/Form/Field/ChromestyleField.php | 5 +-- libraries/src/Form/Field/ComboField.php | 6 +--- libraries/src/Form/Field/ComponentsField.php | 5 +-- .../src/Form/Field/ContentlanguageField.php | 5 +-- libraries/src/Form/Field/ContenttypeField.php | 5 +-- .../Form/Field/DatabaseconnectionField.php | 5 +-- libraries/src/Form/Field/EditorField.php | 5 +-- libraries/src/Form/Field/EmailField.php | 6 +--- libraries/src/Form/Field/FilelistField.php | 5 +-- libraries/src/Form/Field/FolderlistField.php | 5 +-- .../src/Form/Field/FrontendlanguageField.php | 5 +-- libraries/src/Form/Field/HeadertagField.php | 5 +-- libraries/src/Form/Field/HelpsiteField.php | 5 +-- libraries/src/Form/Field/ImagelistField.php | 6 +--- libraries/src/Form/Field/IntegerField.php | 5 +-- libraries/src/Form/Field/LanguageField.php | 5 +-- .../Form/Field/LastvisitdaterangeField.php | 5 +-- libraries/src/Form/Field/LimitboxField.php | 5 +-- libraries/src/Form/Field/MenuField.php | 5 +-- libraries/src/Form/Field/MenuitemField.php | 5 +-- libraries/src/Form/Field/MeterField.php | 4 ++- .../src/Form/Field/ModulepositionField.php | 5 +-- libraries/src/Form/Field/ModuletagField.php | 5 +-- .../src/Form/Field/PluginstatusField.php | 6 +--- libraries/src/Form/Field/RadioField.php | 6 +--- libraries/src/Form/Field/RadiobasicField.php | 6 +--- libraries/src/Form/Field/RangeField.php | 6 +--- .../src/Form/Field/RedirectStatusField.php | 6 +--- .../Form/Field/RegistrationdaterangeField.php | 5 +-- .../src/Form/Field/SessionhandlerField.php | 5 +-- libraries/src/Form/Field/SqlField.php | 5 +-- libraries/src/Form/Field/StatusField.php | 6 +--- libraries/src/Form/Field/TelephoneField.php | 6 +--- .../src/Form/Field/TemplatestyleField.php | 5 +-- libraries/src/Form/Field/TimezoneField.php | 5 +-- libraries/src/Form/Field/TransitionField.php | 3 -- libraries/src/Form/Field/UrlField.php | 6 +--- libraries/src/Form/Field/UseractiveField.php | 5 +-- .../src/Form/Field/UsergrouplistField.php | 5 +-- libraries/src/Form/Field/UserstateField.php | 6 +--- libraries/src/Form/Form.php | 32 +++++++++---------- libraries/src/Form/FormField.php | 12 +++---- libraries/src/Form/FormFilterInterface.php | 2 +- 48 files changed, 69 insertions(+), 212 deletions(-) diff --git a/libraries/src/Form/Field/AliastagField.php b/libraries/src/Form/Field/AliastagField.php index f39971a36378a..540a0dcd8a85a 100644 --- a/libraries/src/Form/Field/AliastagField.php +++ b/libraries/src/Form/Field/AliastagField.php @@ -12,17 +12,14 @@ use Joomla\CMS\Factory; use Joomla\CMS\Filesystem\Path; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\Language\Text; -FormHelper::loadFieldClass('list'); - /** * Form Field class for the Joomla Framework. * * @since 2.5.0 */ -class AliastagField extends \JFormFieldList +class AliastagField extends ListField { /** * The field type. diff --git a/libraries/src/Form/Field/AuthorField.php b/libraries/src/Form/Field/AuthorField.php index f3755baef6b65..6bb208a594f82 100644 --- a/libraries/src/Form/Field/AuthorField.php +++ b/libraries/src/Form/Field/AuthorField.php @@ -11,16 +11,13 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Factory; -use Joomla\CMS\Form\FormHelper; - -FormHelper::loadFieldClass('list'); /** * Form Field to load a list of content authors * * @since 3.2 */ -class AuthorField extends \JFormFieldList +class AuthorField extends ListField { /** * The form field type. diff --git a/libraries/src/Form/Field/CachehandlerField.php b/libraries/src/Form/Field/CachehandlerField.php index 53afd810721b8..1ef2edca8046a 100644 --- a/libraries/src/Form/Field/CachehandlerField.php +++ b/libraries/src/Form/Field/CachehandlerField.php @@ -11,12 +11,9 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Cache\Cache; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -FormHelper::loadFieldClass('list'); - /** * Form Field class for the Joomla Platform. * Provides a list of available cache handlers @@ -24,7 +21,7 @@ * @see JCache * @since 1.7.0 */ -class CachehandlerField extends \JFormFieldList +class CachehandlerField extends ListField { /** * The form field type. diff --git a/libraries/src/Form/Field/CategoryField.php b/libraries/src/Form/Field/CategoryField.php index b6d8caba32b38..5c2466831ba85 100644 --- a/libraries/src/Form/Field/CategoryField.php +++ b/libraries/src/Form/Field/CategoryField.php @@ -11,20 +11,17 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Factory; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Log\Log; -FormHelper::loadFieldClass('list'); - /** * Form Field class for the Joomla Platform. * Supports an HTML select list of categories * * @since 1.6 */ -class CategoryField extends \JFormFieldList +class CategoryField extends ListField { /** * The form field type. diff --git a/libraries/src/Form/Field/CheckboxesField.php b/libraries/src/Form/Field/CheckboxesField.php index be61c4b36c32a..dcbc8fd98282d 100644 --- a/libraries/src/Form/Field/CheckboxesField.php +++ b/libraries/src/Form/Field/CheckboxesField.php @@ -10,10 +10,6 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\FormHelper; - -FormHelper::loadFieldClass('list'); - /** * Form Field class for the Joomla Platform. * Displays options as a list of checkboxes. @@ -22,7 +18,7 @@ * @see CheckboxesField * @since 1.7.0 */ -class CheckboxesField extends \JFormFieldList +class CheckboxesField extends ListField { /** * The form field type. diff --git a/libraries/src/Form/Field/ChromestyleField.php b/libraries/src/Form/Field/ChromestyleField.php index b4f4a622009a8..b3ed7ca2f7a16 100644 --- a/libraries/src/Form/Field/ChromestyleField.php +++ b/libraries/src/Form/Field/ChromestyleField.php @@ -13,18 +13,15 @@ use Joomla\CMS\Application\ApplicationHelper; use Joomla\CMS\Factory; use Joomla\CMS\Form\Form; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -FormHelper::loadFieldClass('groupedlist'); - /** * Chrome Styles field. * * @since 3.0 */ -class ChromestyleField extends \JFormFieldGroupedList +class ChromestyleField extends GroupedlistField { /** * The form field type. diff --git a/libraries/src/Form/Field/ComboField.php b/libraries/src/Form/Field/ComboField.php index 6cea25fe73e6e..76f25db6283bd 100644 --- a/libraries/src/Form/Field/ComboField.php +++ b/libraries/src/Form/Field/ComboField.php @@ -10,17 +10,13 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\FormHelper; - -FormHelper::loadFieldClass('list'); - /** * Form Field class for the Joomla Platform. * Implements a combo box field. * * @since 1.7.0 */ -class ComboField extends \JFormFieldList +class ComboField extends ListField { /** * The form field type. diff --git a/libraries/src/Form/Field/ComponentsField.php b/libraries/src/Form/Field/ComponentsField.php index a60f05e0bb5f8..89f94cb75b84a 100644 --- a/libraries/src/Form/Field/ComponentsField.php +++ b/libraries/src/Form/Field/ComponentsField.php @@ -11,18 +11,15 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Factory; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\Language\Text; use Joomla\Utilities\ArrayHelper; -FormHelper::loadFieldClass('list'); - /** * Form Field class for the Joomla Framework. * * @since 3.7.0 */ -class ComponentsField extends \JFormFieldList +class ComponentsField extends ListField { /** * The form field type. diff --git a/libraries/src/Form/Field/ContentlanguageField.php b/libraries/src/Form/Field/ContentlanguageField.php index c892778669a3c..66562c7252fb2 100644 --- a/libraries/src/Form/Field/ContentlanguageField.php +++ b/libraries/src/Form/Field/ContentlanguageField.php @@ -10,18 +10,15 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\HTML\HTMLHelper; -FormHelper::loadFieldClass('list'); - /** * Provides a list of content languages * * @see JFormFieldLanguage for a select list of application languages. * @since 1.6 */ -class ContentlanguageField extends \JFormFieldList +class ContentlanguageField extends ListField { /** * The form field type. diff --git a/libraries/src/Form/Field/ContenttypeField.php b/libraries/src/Form/Field/ContenttypeField.php index fc8a046e4ebae..d58f6f256056b 100644 --- a/libraries/src/Form/Field/ContenttypeField.php +++ b/libraries/src/Form/Field/ContenttypeField.php @@ -11,17 +11,14 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Factory; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\Language\Text; -FormHelper::loadFieldClass('list'); - /** * Content Type field. * * @since 3.1 */ -class ContenttypeField extends \JFormFieldList +class ContenttypeField extends ListField { /** * A flexible tag list that respects access controls diff --git a/libraries/src/Form/Field/DatabaseconnectionField.php b/libraries/src/Form/Field/DatabaseconnectionField.php index 265aa9ab657c1..28b002fd02a5b 100644 --- a/libraries/src/Form/Field/DatabaseconnectionField.php +++ b/libraries/src/Form/Field/DatabaseconnectionField.php @@ -10,12 +10,9 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\Language\Text; use Joomla\Database\DatabaseDriver; -FormHelper::loadFieldClass('list'); - /** * Form Field class for the Joomla Platform. * Provides a list of available database connections, optionally limiting to @@ -24,7 +21,7 @@ * @see DatabaseDriver * @since 1.7.3 */ -class DatabaseconnectionField extends \JFormFieldList +class DatabaseconnectionField extends ListField { /** * The form field type. diff --git a/libraries/src/Form/Field/EditorField.php b/libraries/src/Form/Field/EditorField.php index e112e5da74722..68cd44e2e282e 100644 --- a/libraries/src/Form/Field/EditorField.php +++ b/libraries/src/Form/Field/EditorField.php @@ -12,9 +12,6 @@ use Joomla\CMS\Editor\Editor; use Joomla\CMS\Factory; -use Joomla\CMS\Form\FormHelper; - -FormHelper::loadFieldClass('textarea'); /** * A textarea field for content creation @@ -22,7 +19,7 @@ * @see JEditor * @since 1.6 */ -class EditorField extends \JFormFieldTextarea +class EditorField extends TextareaField { /** * The form field type. diff --git a/libraries/src/Form/Field/EmailField.php b/libraries/src/Form/Field/EmailField.php index dfe6eea83cc71..bc6c0896ef5bf 100644 --- a/libraries/src/Form/Field/EmailField.php +++ b/libraries/src/Form/Field/EmailField.php @@ -10,10 +10,6 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\FormHelper; - -FormHelper::loadFieldClass('text'); - /** * Form Field class for the Joomla Platform. * Provides and input field for email addresses @@ -22,7 +18,7 @@ * @see JFormRuleEmail * @since 1.7.0 */ -class EmailField extends \JFormFieldText +class EmailField extends TextField { /** * The form field type. diff --git a/libraries/src/Form/Field/FilelistField.php b/libraries/src/Form/Field/FilelistField.php index ac0db8f050218..37b4f068bfc5a 100644 --- a/libraries/src/Form/Field/FilelistField.php +++ b/libraries/src/Form/Field/FilelistField.php @@ -10,21 +10,18 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\Filesystem\File; use Joomla\Filesystem\Folder; use Joomla\Filesystem\Path; -FormHelper::loadFieldClass('list'); - /** * Supports an HTML select list of files * * @since 1.7.0 */ -class FilelistField extends \JFormFieldList +class FilelistField extends ListField { /** * The form field type. diff --git a/libraries/src/Form/Field/FolderlistField.php b/libraries/src/Form/Field/FolderlistField.php index 77da265ea2894..84109efdedacc 100644 --- a/libraries/src/Form/Field/FolderlistField.php +++ b/libraries/src/Form/Field/FolderlistField.php @@ -10,20 +10,17 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\Filesystem\Folder; use Joomla\Filesystem\Path; -FormHelper::loadFieldClass('list'); - /** * Supports an HTML select list of folder * * @since 1.7.0 */ -class FolderlistField extends \JFormFieldList +class FolderlistField extends ListField { /** * The form field type. diff --git a/libraries/src/Form/Field/FrontendlanguageField.php b/libraries/src/Form/Field/FrontendlanguageField.php index 7c42d9aa509ff..3c2fcc49394c5 100644 --- a/libraries/src/Form/Field/FrontendlanguageField.php +++ b/libraries/src/Form/Field/FrontendlanguageField.php @@ -11,9 +11,6 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Factory; -use Joomla\CMS\Form\FormHelper; - -FormHelper::loadFieldClass('list'); /** * Provides a list of published content languages with home pages @@ -21,7 +18,7 @@ * @see JFormFieldLanguage for a select list of application languages. * @since 3.5 */ -class FrontendlanguageField extends \JFormFieldList +class FrontendlanguageField extends ListField { /** * The form field type. diff --git a/libraries/src/Form/Field/HeadertagField.php b/libraries/src/Form/Field/HeadertagField.php index 07b94c9bd413a..042a3e6d27617 100644 --- a/libraries/src/Form/Field/HeadertagField.php +++ b/libraries/src/Form/Field/HeadertagField.php @@ -10,17 +10,14 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\HTML\HTMLHelper; -FormHelper::loadFieldClass('list'); - /** * Form Field class for the Joomla! CMS. * * @since 3.0 */ -class HeadertagField extends \JFormFieldList +class HeadertagField extends ListField { /** * The form field type. diff --git a/libraries/src/Form/Field/HelpsiteField.php b/libraries/src/Form/Field/HelpsiteField.php index 731fa12327f56..7a6c4b66b9735 100644 --- a/libraries/src/Form/Field/HelpsiteField.php +++ b/libraries/src/Form/Field/HelpsiteField.php @@ -10,20 +10,17 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\Help\Help; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -FormHelper::loadFieldClass('list'); - /** * Form Field class for the Joomla Platform. * Provides a select list of help sites. * * @since 1.6 */ -class HelpsiteField extends \JFormFieldList +class HelpsiteField extends ListField { /** * The form field type. diff --git a/libraries/src/Form/Field/ImagelistField.php b/libraries/src/Form/Field/ImagelistField.php index 88dbe3e9c843f..438972557e2e5 100644 --- a/libraries/src/Form/Field/ImagelistField.php +++ b/libraries/src/Form/Field/ImagelistField.php @@ -10,16 +10,12 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\FormHelper; - -FormHelper::loadFieldClass('filelist'); - /** * Supports an HTML select list of image * * @since 1.7.0 */ -class ImagelistField extends \JFormFieldFileList +class ImagelistField extends FilelistField { /** * The form field type. diff --git a/libraries/src/Form/Field/IntegerField.php b/libraries/src/Form/Field/IntegerField.php index b998a455c28f2..4ed5f9a7cb3ba 100644 --- a/libraries/src/Form/Field/IntegerField.php +++ b/libraries/src/Form/Field/IntegerField.php @@ -10,18 +10,15 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\HTML\HTMLHelper; -FormHelper::loadFieldClass('list'); - /** * Form Field class for the Joomla Platform. * Provides a select list of integers with specified first, last and step values. * * @since 1.7.0 */ -class IntegerField extends \JFormFieldList +class IntegerField extends ListField { /** * The form field type. diff --git a/libraries/src/Form/Field/LanguageField.php b/libraries/src/Form/Field/LanguageField.php index e6cfe35fd9199..71ce185ed0f42 100644 --- a/libraries/src/Form/Field/LanguageField.php +++ b/libraries/src/Form/Field/LanguageField.php @@ -12,11 +12,8 @@ use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Factory; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\Language\LanguageHelper; -FormHelper::loadFieldClass('list'); - /** * Form Field class for the Joomla Platform. * Supports a list of installed application languages @@ -24,7 +21,7 @@ * @see JFormFieldContentLanguage for a select list of content languages. * @since 1.7.0 */ -class LanguageField extends \JFormFieldList +class LanguageField extends ListField { /** * The form field type. diff --git a/libraries/src/Form/Field/LastvisitdaterangeField.php b/libraries/src/Form/Field/LastvisitdaterangeField.php index 6c31f8c92b460..915e624b4fef7 100644 --- a/libraries/src/Form/Field/LastvisitdaterangeField.php +++ b/libraries/src/Form/Field/LastvisitdaterangeField.php @@ -12,16 +12,13 @@ use Joomla\CMS\Factory; use Joomla\CMS\Form\Form; -use Joomla\CMS\Form\FormHelper; - -FormHelper::loadFieldClass('predefinedlist'); /** * Field to show a list of available date ranges to filter on last visit date. * * @since 3.6 */ -class LastvisitdaterangeField extends \JFormFieldPredefinedList +class LastvisitdaterangeField extends PredefinedlistField { /** * Method to instantiate the form field object. diff --git a/libraries/src/Form/Field/LimitboxField.php b/libraries/src/Form/Field/LimitboxField.php index 3013be76bfce3..92189ecec9cd5 100644 --- a/libraries/src/Form/Field/LimitboxField.php +++ b/libraries/src/Form/Field/LimitboxField.php @@ -10,17 +10,14 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\Language\Text; -FormHelper::loadFieldClass('list'); - /** * Field to load a list of posible item count limits * * @since 3.2 */ -class LimitboxField extends \JFormFieldList +class LimitboxField extends ListField { /** * The form field type. diff --git a/libraries/src/Form/Field/MenuField.php b/libraries/src/Form/Field/MenuField.php index cd4051a8e63c9..db29c743709c0 100644 --- a/libraries/src/Form/Field/MenuField.php +++ b/libraries/src/Form/Field/MenuField.php @@ -11,20 +11,17 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Factory; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\Language\Text; // Import the com_menus helper. require_once realpath(JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php'); -FormHelper::loadFieldClass('GroupedList'); - /** * Supports an HTML select list of menus * * @since 1.6 */ -class MenuField extends \JFormFieldGroupedList +class MenuField extends GroupedlistField { /** * The form field type. diff --git a/libraries/src/Form/Field/MenuitemField.php b/libraries/src/Form/Field/MenuitemField.php index ceede3202e21f..50493f5c9cdd3 100644 --- a/libraries/src/Form/Field/MenuitemField.php +++ b/libraries/src/Form/Field/MenuitemField.php @@ -11,12 +11,9 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Factory; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\HTML\HTMLHelper; use Joomla\Component\Menus\Administrator\Helper\MenusHelper; -FormHelper::loadFieldClass('groupedlist'); - // Import the com_menus helper. require_once realpath(JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php'); @@ -25,7 +22,7 @@ * * @since 1.6 */ -class MenuitemField extends \JFormFieldGroupedList +class MenuitemField extends GroupedlistField { /** * The form field type. diff --git a/libraries/src/Form/Field/MeterField.php b/libraries/src/Form/Field/MeterField.php index 2327a45b2d2ff..1aa308a065ec9 100644 --- a/libraries/src/Form/Field/MeterField.php +++ b/libraries/src/Form/Field/MeterField.php @@ -10,6 +10,8 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Form\FormField; + /** * Form Field class for the Joomla Platform. * Provides a meter to show value in a range. @@ -17,7 +19,7 @@ * @link http://www.w3.org/TR/html-markup/input.text.html#input.text * @since 3.2 */ -class MeterField extends \JFormField +class MeterField extends FormField { /** * The form field type. diff --git a/libraries/src/Form/Field/ModulepositionField.php b/libraries/src/Form/Field/ModulepositionField.php index 4a545a4cf75b3..90637a4fa3ba2 100644 --- a/libraries/src/Form/Field/ModulepositionField.php +++ b/libraries/src/Form/Field/ModulepositionField.php @@ -13,18 +13,15 @@ use Joomla\CMS\Application\ApplicationHelper; use Joomla\CMS\Factory; use Joomla\CMS\Form\Form; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -FormHelper::loadFieldClass('text'); - /** * Module Position field. * * @since 1.6 */ -class ModulepositionField extends \JFormFieldText +class ModulepositionField extends TextField { /** * The form field type. diff --git a/libraries/src/Form/Field/ModuletagField.php b/libraries/src/Form/Field/ModuletagField.php index 2f5c919a942da..92b1764e2a54a 100644 --- a/libraries/src/Form/Field/ModuletagField.php +++ b/libraries/src/Form/Field/ModuletagField.php @@ -10,17 +10,14 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\HTML\HTMLHelper; -FormHelper::loadFieldClass('list'); - /** * Module Tag field. * * @since 3.0 */ -class ModuletagField extends \JFormFieldList +class ModuletagField extends ListField { /** * The form field type. diff --git a/libraries/src/Form/Field/PluginstatusField.php b/libraries/src/Form/Field/PluginstatusField.php index 9f9879e244bfa..964120e24e852 100644 --- a/libraries/src/Form/Field/PluginstatusField.php +++ b/libraries/src/Form/Field/PluginstatusField.php @@ -10,16 +10,12 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\FormHelper; - -FormHelper::loadFieldClass('predefinedlist'); - /** * Plugin Status field. * * @since 3.5 */ -class PluginstatusField extends \JFormFieldPredefinedList +class PluginstatusField extends PredefinedlistField { /** * The form field type. diff --git a/libraries/src/Form/Field/RadioField.php b/libraries/src/Form/Field/RadioField.php index ed88da8b932f1..fbbf01a7507f8 100644 --- a/libraries/src/Form/Field/RadioField.php +++ b/libraries/src/Form/Field/RadioField.php @@ -10,10 +10,6 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\FormHelper; - -FormHelper::loadFieldClass('list'); - /** * Form Field class for the Joomla Platform. * Provides radio button inputs @@ -21,7 +17,7 @@ * @link http://www.w3.org/TR/html-markup/command.radio.html#command.radio * @since 1.7.0 */ -class RadioField extends \JFormFieldList +class RadioField extends ListField { /** * The form field type. diff --git a/libraries/src/Form/Field/RadiobasicField.php b/libraries/src/Form/Field/RadiobasicField.php index 0113eb7e2170d..eda58c2a42d13 100644 --- a/libraries/src/Form/Field/RadiobasicField.php +++ b/libraries/src/Form/Field/RadiobasicField.php @@ -10,17 +10,13 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\FormHelper; - -FormHelper::loadFieldClass('list'); - /** * Form Field class for the Joomla Platform. * Provides radio button inputs using default styling * * @since 4.0.0 */ -class RadiobasicField extends \JFormFieldList +class RadiobasicField extends ListField { /** * The form field type. diff --git a/libraries/src/Form/Field/RangeField.php b/libraries/src/Form/Field/RangeField.php index b2c7b9c9a8a84..53aed40dcf185 100644 --- a/libraries/src/Form/Field/RangeField.php +++ b/libraries/src/Form/Field/RangeField.php @@ -10,10 +10,6 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\FormHelper; - -FormHelper::loadFieldClass('number'); - /** * Form Field class for the Joomla Platform. * Provides a horizontal scroll bar to specify a value in a range. @@ -21,7 +17,7 @@ * @link http://www.w3.org/TR/html-markup/input.text.html#input.text * @since 3.2 */ -class RangeField extends \JFormFieldNumber +class RangeField extends NumberField { /** * The form field type. diff --git a/libraries/src/Form/Field/RedirectStatusField.php b/libraries/src/Form/Field/RedirectStatusField.php index 663bfe270b06d..ca30bb5d63928 100644 --- a/libraries/src/Form/Field/RedirectStatusField.php +++ b/libraries/src/Form/Field/RedirectStatusField.php @@ -10,16 +10,12 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\FormHelper; - -FormHelper::loadFieldClass('predefinedlist'); - /** * Redirect Status field. * * @since 3.8.0 */ -class RedirectStatusField extends \JFormFieldPredefinedList +class RedirectStatusField extends PredefinedlistField { /** * The form field type. diff --git a/libraries/src/Form/Field/RegistrationdaterangeField.php b/libraries/src/Form/Field/RegistrationdaterangeField.php index cf478d486a86b..75537128c5639 100644 --- a/libraries/src/Form/Field/RegistrationdaterangeField.php +++ b/libraries/src/Form/Field/RegistrationdaterangeField.php @@ -12,16 +12,13 @@ use Joomla\CMS\Factory; use Joomla\CMS\Form\Form; -use Joomla\CMS\Form\FormHelper; - -FormHelper::loadFieldClass('predefinedlist'); /** * Registration Date Range field. * * @since 3.2 */ -class RegistrationdaterangeField extends \JFormFieldPredefinedList +class RegistrationdaterangeField extends PredefinedlistField { /** * The form field type. diff --git a/libraries/src/Form/Field/SessionhandlerField.php b/libraries/src/Form/Field/SessionhandlerField.php index 22c3f7b0892b6..7f4b9fb2137dc 100644 --- a/libraries/src/Form/Field/SessionhandlerField.php +++ b/libraries/src/Form/Field/SessionhandlerField.php @@ -10,20 +10,17 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\Session\Session; -FormHelper::loadFieldClass('list'); - /** * Form Field class for the Joomla Platform. * Provides a select list of session handler options. * * @since 1.7.0 */ -class SessionhandlerField extends \JFormFieldList +class SessionhandlerField extends ListField { /** * The form field type. diff --git a/libraries/src/Form/Field/SqlField.php b/libraries/src/Form/Field/SqlField.php index 2df087a6a41a0..05bae695140a1 100644 --- a/libraries/src/Form/Field/SqlField.php +++ b/libraries/src/Form/Field/SqlField.php @@ -11,20 +11,17 @@ defined('JPATH_PLATFORM') or die; use Joomla\CMS\Factory; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\Database\DatabaseQuery; use Joomla\Database\Exception\ExecutionFailureException; -FormHelper::loadFieldClass('list'); - /** * Supports a custom SQL select list * * @since 1.7.0 */ -class SQLField extends \JFormFieldList +class SQLField extends ListField { /** * The form field type. diff --git a/libraries/src/Form/Field/StatusField.php b/libraries/src/Form/Field/StatusField.php index 326e42c298a72..82f838d49152e 100644 --- a/libraries/src/Form/Field/StatusField.php +++ b/libraries/src/Form/Field/StatusField.php @@ -10,16 +10,12 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\FormHelper; - -FormHelper::loadFieldClass('predefinedlist'); - /** * Form Field to load a list of states * * @since 3.2 */ -class StatusField extends \JFormFieldPredefinedList +class StatusField extends PredefinedlistField { /** * The form field type. diff --git a/libraries/src/Form/Field/TelephoneField.php b/libraries/src/Form/Field/TelephoneField.php index 0474f5869694b..81be93612905f 100644 --- a/libraries/src/Form/Field/TelephoneField.php +++ b/libraries/src/Form/Field/TelephoneField.php @@ -10,10 +10,6 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\FormHelper; - -FormHelper::loadFieldClass('text'); - /** * Form Field class for the Joomla Platform. * Supports a text field telephone numbers. @@ -23,7 +19,7 @@ * @see JHtmlTel for rendering of telephone numbers * @since 1.7.0 */ -class TelephoneField extends \JFormFieldText +class TelephoneField extends TextField { /** * The form field type. diff --git a/libraries/src/Form/Field/TemplatestyleField.php b/libraries/src/Form/Field/TemplatestyleField.php index 0d7faaa01677f..2323f2ecb6ac5 100644 --- a/libraries/src/Form/Field/TemplatestyleField.php +++ b/libraries/src/Form/Field/TemplatestyleField.php @@ -12,18 +12,15 @@ use Joomla\CMS\Application\ApplicationHelper; use Joomla\CMS\Factory; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; -FormHelper::loadFieldClass('groupedlist'); - /** * Supports a select grouped list of template styles * * @since 1.6 */ -class TemplatestyleField extends \JFormFieldGroupedList +class TemplatestyleField extends GroupedlistField { /** * The form field type. diff --git a/libraries/src/Form/Field/TimezoneField.php b/libraries/src/Form/Field/TimezoneField.php index 815a3d11f247f..855de0b248b37 100644 --- a/libraries/src/Form/Field/TimezoneField.php +++ b/libraries/src/Form/Field/TimezoneField.php @@ -10,17 +10,14 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\HTML\HTMLHelper; -FormHelper::loadFieldClass('groupedlist'); - /** * Form Field class for the Joomla Platform. * * @since 1.7.0 */ -class TimezoneField extends \JFormFieldGroupedList +class TimezoneField extends GroupedlistField { /** * The form field type. diff --git a/libraries/src/Form/Field/TransitionField.php b/libraries/src/Form/Field/TransitionField.php index 81a2c3c361e06..3e4166908d4a8 100644 --- a/libraries/src/Form/Field/TransitionField.php +++ b/libraries/src/Form/Field/TransitionField.php @@ -11,14 +11,11 @@ defined('JPATH_BASE') or die; use Joomla\CMS\Factory; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Workflow\Workflow; use Joomla\Utilities\ArrayHelper; -FormHelper::loadFieldClass('list'); - /** * Components Category field. * diff --git a/libraries/src/Form/Field/UrlField.php b/libraries/src/Form/Field/UrlField.php index 60fb237954cba..8b2876166684c 100644 --- a/libraries/src/Form/Field/UrlField.php +++ b/libraries/src/Form/Field/UrlField.php @@ -10,10 +10,6 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\FormHelper; - -FormHelper::loadFieldClass('text'); - /** * Form Field class for the Joomla Platform. * Supports a URL text field @@ -22,7 +18,7 @@ * @see JFormRuleUrl for validation of full urls * @since 1.7.0 */ -class UrlField extends \JFormFieldText +class UrlField extends TextField { /** * The form field type. diff --git a/libraries/src/Form/Field/UseractiveField.php b/libraries/src/Form/Field/UseractiveField.php index 4e198fd8297df..96322e7da1dfa 100644 --- a/libraries/src/Form/Field/UseractiveField.php +++ b/libraries/src/Form/Field/UseractiveField.php @@ -12,16 +12,13 @@ use Joomla\CMS\Factory; use Joomla\CMS\Form\Form; -use Joomla\CMS\Form\FormHelper; - -FormHelper::loadFieldClass('predefinedlist'); /** * Field to show a list of available user active statuses * * @since 3.2 */ -class UseractiveField extends \JFormFieldPredefinedList +class UseractiveField extends PredefinedlistField { /** * The form field type. diff --git a/libraries/src/Form/Field/UsergrouplistField.php b/libraries/src/Form/Field/UsergrouplistField.php index 9177bfee3d15c..978ed43a80fc9 100644 --- a/libraries/src/Form/Field/UsergrouplistField.php +++ b/libraries/src/Form/Field/UsergrouplistField.php @@ -12,17 +12,14 @@ use Joomla\CMS\Access\Access; use Joomla\CMS\Factory; -use Joomla\CMS\Form\FormHelper; use Joomla\CMS\Helper\UserGroupsHelper; -FormHelper::loadFieldClass('list'); - /** * Field to load a dropdown list of available user groups * * @since 3.2 */ -class UsergrouplistField extends \JFormFieldList +class UsergrouplistField extends ListField { /** * The form field type. diff --git a/libraries/src/Form/Field/UserstateField.php b/libraries/src/Form/Field/UserstateField.php index bbc0deddbb094..d9d441d47d1eb 100644 --- a/libraries/src/Form/Field/UserstateField.php +++ b/libraries/src/Form/Field/UserstateField.php @@ -10,16 +10,12 @@ defined('JPATH_PLATFORM') or die; -use Joomla\CMS\Form\FormHelper; - -FormHelper::loadFieldClass('predefinedlist'); - /** * Field to load a list of available users statuses * * @since 3.2 */ -class UserstateField extends \JFormFieldPredefinedList +class UserstateField extends PredefinedlistField { /** * The form field type. diff --git a/libraries/src/Form/Form.php b/libraries/src/Form/Form.php index de08ce22e3759..b58ba4c330815 100644 --- a/libraries/src/Form/Form.php +++ b/libraries/src/Form/Form.php @@ -117,7 +117,7 @@ public function __construct($name, array $options = array()) */ public function bind($data) { - // Make sure there is a valid JForm XML document. + // Make sure there is a valid Form XML document. if (!($this->xml instanceof \SimpleXMLElement)) { throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__)); @@ -209,7 +209,7 @@ public function getErrors() */ public function getField($name, $group = null, $value = null) { - // Make sure there is a valid JForm XML document. + // Make sure there is a valid Form XML document. if (!($this->xml instanceof \SimpleXMLElement)) { throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__)); @@ -243,7 +243,7 @@ public function getField($name, $group = null, $value = null) */ public function getFieldAttribute($name, $attribute, $default = null, $group = null) { - // Make sure there is a valid JForm XML document. + // Make sure there is a valid Form XML document. if (!($this->xml instanceof \SimpleXMLElement)) { throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__)); @@ -329,7 +329,7 @@ public function getFieldsets($group = null) $fieldsets = array(); $sets = array(); - // Make sure there is a valid JForm XML document. + // Make sure there is a valid Form XML document. if (!($this->xml instanceof \SimpleXMLElement)) { throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__)); @@ -779,7 +779,7 @@ public function loadFile($file, $reset = true, $xpath = false) */ public function removeField($name, $group = null) { - // Make sure there is a valid JForm XML document. + // Make sure there is a valid Form XML document. if (!($this->xml instanceof \SimpleXMLElement)) { throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__)); @@ -812,7 +812,7 @@ public function removeField($name, $group = null) */ public function removeGroup($group) { - // Make sure there is a valid JForm XML document. + // Make sure there is a valid Form XML document. if (!($this->xml instanceof \SimpleXMLElement)) { throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__)); @@ -870,7 +870,7 @@ public function reset($xml = false) */ public function setField(\SimpleXMLElement $element, $group = null, $replace = true, $fieldset = 'default') { - // Make sure there is a valid JForm XML document. + // Make sure there is a valid Form XML document. if (!($this->xml instanceof \SimpleXMLElement)) { throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__)); @@ -963,7 +963,7 @@ public function setField(\SimpleXMLElement $element, $group = null, $replace = t */ public function setFieldAttribute($name, $attribute, $value, $group = null) { - // Make sure there is a valid JForm XML document. + // Make sure there is a valid Form XML document. if (!($this->xml instanceof \SimpleXMLElement)) { throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__)); @@ -1007,7 +1007,7 @@ public function setFieldAttribute($name, $attribute, $value, $group = null) */ public function setFields(&$elements, $group = null, $replace = true, $fieldset = 'default') { - // Make sure there is a valid JForm XML document. + // Make sure there is a valid Form XML document. if (!($this->xml instanceof \SimpleXMLElement)) { throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__)); @@ -1108,7 +1108,7 @@ public function process($data, $group = null) */ public function filter($data, $group = null) { - // Make sure there is a valid JForm XML document. + // Make sure there is a valid Form XML document. if (!($this->xml instanceof \SimpleXMLElement)) { throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__)); @@ -1170,7 +1170,7 @@ public function filter($data, $group = null) */ public function validate($data, $group = null) { - // Make sure there is a valid JForm XML document. + // Make sure there is a valid Form XML document. if (!($this->xml instanceof \SimpleXMLElement)) { throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__)); @@ -1304,7 +1304,7 @@ protected function findField($name, $group = null) $element = false; $fields = array(); - // Make sure there is a valid JForm XML document. + // Make sure there is a valid Form XML document. if (!($this->xml instanceof \SimpleXMLElement)) { throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__)); @@ -1394,7 +1394,7 @@ protected function &findFieldsByFieldset($name) { $false = false; - // Make sure there is a valid JForm XML document. + // Make sure there is a valid Form XML document. if (!($this->xml instanceof \SimpleXMLElement)) { throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__)); @@ -1428,7 +1428,7 @@ protected function &findFieldsByGroup($group = null, $nested = false) $false = false; $fields = array(); - // Make sure there is a valid JForm XML document. + // Make sure there is a valid Form XML document. if (!($this->xml instanceof \SimpleXMLElement)) { throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__)); @@ -1502,7 +1502,7 @@ protected function &findGroup($group) $groups = array(); $tmp = array(); - // Make sure there is a valid JForm XML document. + // Make sure there is a valid Form XML document. if (!($this->xml instanceof \SimpleXMLElement)) { throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__)); @@ -1652,7 +1652,7 @@ protected function loadField($element, $group = null, $value = null) */ protected function syncPaths() { - // Make sure there is a valid JForm XML document. + // Make sure there is a valid Form XML document. if (!($this->xml instanceof \SimpleXMLElement)) { throw new \UnexpectedValueException(sprintf('%s::%s `xml` is not an instance of SimpleXMLElement', get_class($this), __METHOD__)); diff --git a/libraries/src/Form/FormField.php b/libraries/src/Form/FormField.php index 9696322bf761b..4ce7d5b10ce52 100644 --- a/libraries/src/Form/FormField.php +++ b/libraries/src/Form/FormField.php @@ -84,7 +84,7 @@ abstract class FormField protected $form; /** - * The form control prefix for field names from the JForm object attached to the form field. + * The form control prefix for field names from the Form object attached to the form field. * * @var string * @since 1.7.0 @@ -551,7 +551,7 @@ public function __set($name, $value) /** * Method to attach a Form object to the field. * - * @param Form $form The JForm object to attach to the form field. + * @param Form $form The Form object to attach to the form field. * * @return FormField The form field object so that the method can be used in a chain. * @@ -580,7 +580,7 @@ public function setForm(Form $form) */ public function setup(\SimpleXMLElement $element, $value, $group = null) { - // Make sure there is a valid JFormField XML element. + // Make sure there is a valid FormField XML element. if ((string) $element->getName() != 'field') { return false; @@ -1008,7 +1008,7 @@ public function filter($value, $group = null, Registry $input = null) return call_user_func(explode('::', $filter), $value); } - // Load the JFormRule object for the field. JFormRule objects take precedence over PHP functions + // Load the FormRule object for the field. FormRule objects take precedence over PHP functions $obj = FormHelper::loadFilterType($filter); // Run the filter rule. @@ -1027,7 +1027,7 @@ public function filter($value, $group = null, Registry $input = null) } /** - * Method to validate a JFormField object based on field data. + * Method to validate a FormField object based on field data. * * @param mixed $value The optional value to use as the default for the field. * @param string $group The optional dot-separated form group path on which to find the field. @@ -1073,7 +1073,7 @@ public function validate($value, $group = null, \Joomla\Registry\Registry $input // Get the field validation rule. if ($type = (string) $this->element['validate']) { - // Load the JFormRule object for the field. + // Load the FormRule object for the field. $rule = FormHelper::loadRuleType($type); // If the object could not be loaded return an error message. diff --git a/libraries/src/Form/FormFilterInterface.php b/libraries/src/Form/FormFilterInterface.php index 4a23de25f8439..703ac7dfd53d1 100644 --- a/libraries/src/Form/FormFilterInterface.php +++ b/libraries/src/Form/FormFilterInterface.php @@ -28,7 +28,7 @@ interface FormFilterInterface * For example if the field has name="foo" and the group value is set to "bar" then the * full field name would end up being "bar[foo]". * @param Registry $input An optional Registry object with the entire data set to validate against the entire form. - * @param JForm $form The form object for which the field is being tested. + * @param Form $form The form object for which the field is being tested. * * @return mixed The filtered value. * From 3758b38705b1139d181e2934f067eee1c9d44c98 Mon Sep 17 00:00:00 2001 From: SharkyKZ Date: Thu, 21 Mar 2019 17:18:54 +0200 Subject: [PATCH 39/48] [4.0] Use namespaced classes in Menu library (#24222) --- libraries/src/Menu/AbstractMenu.php | 5 +++-- libraries/src/Menu/SiteMenu.php | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libraries/src/Menu/AbstractMenu.php b/libraries/src/Menu/AbstractMenu.php index 47301bf1b1d48..eefa074c82931 100644 --- a/libraries/src/Menu/AbstractMenu.php +++ b/libraries/src/Menu/AbstractMenu.php @@ -12,6 +12,7 @@ use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; +use Joomla\CMS\User\User; use Joomla\Registry\Registry; /** @@ -56,7 +57,7 @@ abstract class AbstractMenu /** * User object to check access levels for * - * @var \JUser + * @var User * @since 3.5 */ protected $user; @@ -81,7 +82,7 @@ public function __construct($options = array()) } } - $this->user = isset($options['user']) && $options['user'] instanceof \JUser ? $options['user'] : Factory::getUser(); + $this->user = isset($options['user']) && $options['user'] instanceof User ? $options['user'] : Factory::getUser(); } /** diff --git a/libraries/src/Menu/SiteMenu.php b/libraries/src/Menu/SiteMenu.php index 678892e3bef54..e4370bc3228bc 100644 --- a/libraries/src/Menu/SiteMenu.php +++ b/libraries/src/Menu/SiteMenu.php @@ -13,11 +13,13 @@ use Joomla\CMS\Application\CMSApplication; use Joomla\CMS\Cache\CacheControllerFactoryInterface; use Joomla\CMS\Cache\Controller\CallbackController; +use Joomla\CMS\Cache\Exception\CacheExceptionInterface; use Joomla\CMS\Factory; use Joomla\CMS\Language\Language; use Joomla\CMS\Language\Multilanguage; use Joomla\CMS\Language\Text; use Joomla\Database\DatabaseDriver; +use Joomla\Database\Exception\ExecutionFailureException; /** * Menu class @@ -102,20 +104,20 @@ public function load() $this->items = $cache->get($loader, array(), md5(get_class($this)), false); } - catch (\JCacheException $e) + catch (CacheExceptionInterface $e) { try { $this->items = $loader(); } - catch (\JDatabaseExceptionExecuting $databaseException) + catch (ExecutionFailureException $databaseException) { $this->app->enqueueMessage(Text::sprintf('JERROR_LOADING_MENUS', $databaseException->getMessage()), 'warning'); return false; } } - catch (\JDatabaseExceptionExecuting $e) + catch (ExecutionFailureException $e) { $this->app->enqueueMessage(Text::sprintf('JERROR_LOADING_MENUS', $e->getMessage()), 'warning'); From d63581f319ae26315538adc43069f8ba69c0df56 Mon Sep 17 00:00:00 2001 From: SharkyKZ Date: Thu, 21 Mar 2019 17:19:11 +0200 Subject: [PATCH 40/48] [4.0] Use namespaced classes in Helper library (#24221) --- libraries/src/Helper/AuthenticationHelper.php | 3 ++- libraries/src/Helper/LibraryHelper.php | 3 ++- libraries/src/Helper/ModuleHelper.php | 5 +++-- libraries/src/Helper/RouteHelper.php | 10 ++++++---- libraries/src/Helper/TagsHelper.php | 6 ++++-- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/libraries/src/Helper/AuthenticationHelper.php b/libraries/src/Helper/AuthenticationHelper.php index 15ab8783a97a1..7fb8dab68e739 100644 --- a/libraries/src/Helper/AuthenticationHelper.php +++ b/libraries/src/Helper/AuthenticationHelper.php @@ -13,6 +13,7 @@ use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; +use Joomla\CMS\Plugin\PluginHelper; /** * Authentication helper class @@ -31,7 +32,7 @@ abstract class AuthenticationHelper public static function getTwoFactorMethods() { // Get all the Two Factor Authentication plugins. - \JPluginHelper::importPlugin('twofactorauth'); + PluginHelper::importPlugin('twofactorauth'); // Trigger onUserTwofactorIdentify event and return the two factor enabled plugins. $identities = Factory::getApplication()->triggerEvent('onUserTwofactorIdentify', array()); diff --git a/libraries/src/Helper/LibraryHelper.php b/libraries/src/Helper/LibraryHelper.php index 82b4a4fe5935d..aca0fdcd7433d 100644 --- a/libraries/src/Helper/LibraryHelper.php +++ b/libraries/src/Helper/LibraryHelper.php @@ -12,6 +12,7 @@ use Joomla\CMS\Cache\CacheControllerFactoryInterface; use Joomla\CMS\Cache\Controller\CallbackController; +use Joomla\CMS\Cache\Exception\CacheExceptionInterface; use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; use Joomla\CMS\Log\Log; @@ -164,7 +165,7 @@ protected static function loadLibrary($element) { static::$libraries[$element] = $cache->get($loader, array($element), __METHOD__ . $element); } - catch (\JCacheException $e) + catch (CacheExceptionInterface $e) { static::$libraries[$element] = $loader($element); } diff --git a/libraries/src/Helper/ModuleHelper.php b/libraries/src/Helper/ModuleHelper.php index b355c9b40a808..4dd328a66be76 100644 --- a/libraries/src/Helper/ModuleHelper.php +++ b/libraries/src/Helper/ModuleHelper.php @@ -18,6 +18,7 @@ use Joomla\CMS\Language\LanguageHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Log\Log; +use Joomla\CMS\Profiler\Profiler; use Joomla\Registry\Registry; /** @@ -168,7 +169,7 @@ public static function renderModule($module, $attribs = array()) if (JDEBUG) { - \JProfiler::getInstance('Application')->mark('beforeRenderModule ' . $module->module . ' (' . $module->title . ')'); + Profiler::getInstance('Application')->mark('beforeRenderModule ' . $module->module . ' (' . $module->title . ')'); } // Record the scope. @@ -266,7 +267,7 @@ public static function renderModule($module, $attribs = array()) if (JDEBUG) { - \JProfiler::getInstance('Application')->mark('afterRenderModule ' . $module->module . ' (' . $module->title . ')'); + Profiler::getInstance('Application')->mark('afterRenderModule ' . $module->module . ' (' . $module->title . ')'); } return $module->content; diff --git a/libraries/src/Helper/RouteHelper.php b/libraries/src/Helper/RouteHelper.php index bebdc9c788d45..b99367ba4b422 100644 --- a/libraries/src/Helper/RouteHelper.php +++ b/libraries/src/Helper/RouteHelper.php @@ -10,6 +10,8 @@ defined('JPATH_PLATFORM') or die; +use Joomla\CMS\Categories\Categories; +use Joomla\CMS\Categories\CategoryNode; use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Factory; use Joomla\CMS\Language\Multilanguage; @@ -93,7 +95,7 @@ public function getRoute($id, $typealias, $link = '', $language = null, $catid = if ($catid > 1) { - $categories = \JCategories::getInstance($name); + $categories = Categories::getInstance($name); if ($categories) { @@ -227,7 +229,7 @@ protected function findItem($needles = array()) /** * Fetches the category route * - * @param mixed $catid Category ID or \JCategoryNode instance + * @param mixed $catid Category ID or CategoryNode instance * @param mixed $language Language code * @param string $extension Extension to lookup * @@ -245,7 +247,7 @@ public static function getCategoryRoute($catid, $language = 0, $extension = '') throw new \InvalidArgumentException(sprintf('$extension is a required argument in %s()', __METHOD__)); } - if ($catid instanceof \JCategoryNode) + if ($catid instanceof CategoryNode) { $id = $catid->id; $category = $catid; @@ -254,7 +256,7 @@ public static function getCategoryRoute($catid, $language = 0, $extension = '') { $extensionName = ucfirst(substr($extension, 4)); $id = (int) $catid; - $category = \JCategories::getInstance($extensionName)->get($id); + $category = Categories::getInstance($extensionName)->get($id); } if ($id < 1) diff --git a/libraries/src/Helper/TagsHelper.php b/libraries/src/Helper/TagsHelper.php index 1b2d784b9a7d1..79ee6480c2efa 100644 --- a/libraries/src/Helper/TagsHelper.php +++ b/libraries/src/Helper/TagsHelper.php @@ -15,6 +15,8 @@ use Joomla\CMS\Table\CoreContent; use Joomla\CMS\Table\Table; use Joomla\CMS\Table\TableInterface; +use Joomla\CMS\UCM\UCMContent; +use Joomla\CMS\UCM\UCMType; use Joomla\Utilities\ArrayHelper; /** @@ -65,7 +67,7 @@ public function addTagMapping($ucmId, TableInterface $table, $tags = array()) $db = $table->getDbo(); $key = $table->getKeyName(); $item = $table->$key; - $ucm = new \JUcmType($this->typeAlias, $db); + $ucm = new UCMType($this->typeAlias, $db); $typeId = $ucm->getTypeId(); // Insert the new tag maps @@ -750,7 +752,7 @@ public function postStoreProcess(TableInterface $table, $newTags = array(), $rep $data = $this->getRowData($table); $ucmContentTable = Table::getInstance('Corecontent'); - $ucm = new \JUcmContent($table, $this->typeAlias); + $ucm = new UCMContent($table, $this->typeAlias); $ucmData = $data ? $ucm->mapData($data) : $ucm->ucmData; $primaryId = $ucm->getPrimaryKey($ucmData['common']['core_type_id'], $ucmData['common']['core_content_item_id']); From a284adad75627ac4e266e560f105022e7b8cf2e3 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Thu, 21 Mar 2019 16:03:26 +0000 Subject: [PATCH 41/48] [4.0] Sidebar failure (#24289) Forgot to remove the `InstallerHelper::addSubmenu($vName);` from the controller for com_install --- .../components/com_installer/Controller/DisplayController.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/administrator/components/com_installer/Controller/DisplayController.php b/administrator/components/com_installer/Controller/DisplayController.php index 067b63b621333..0acfc8fd5ab88 100644 --- a/administrator/components/com_installer/Controller/DisplayController.php +++ b/administrator/components/com_installer/Controller/DisplayController.php @@ -58,8 +58,6 @@ public function display($cachable = false, $urlparams = false) // Push document object into the view. $view->document = $document; - // Load the submenu. - InstallerHelper::addSubmenu($vName); $view->display(); } From 69931c36391731e1003ed844527ae68f87ea105c Mon Sep 17 00:00:00 2001 From: SharkyKZ Date: Thu, 21 Mar 2019 18:11:19 +0200 Subject: [PATCH 42/48] [4.0][com_content] Remove column-related code. (#23123) --- administrator/language/en-GB/en-GB.ini | 6 -- components/com_content/Helper/QueryHelper.php | 91 ------------------- .../com_content/View/Category/HtmlView.php | 19 +--- .../com_content/View/Featured/HtmlView.php | 17 ---- .../com_content/tmpl/categories/default.xml | 17 ---- installation/sql/mysql/joomla.sql | 4 +- installation/sql/mysql/sample_testing.sql | 34 +++---- installation/sql/postgresql/joomla.sql | 4 +- .../sql/postgresql/sample_testing.sql | 34 +++---- installation/src/Model/LanguagesModel.php | 12 +-- plugins/sampledata/multilang/multilang.php | 8 +- 11 files changed, 49 insertions(+), 197 deletions(-) diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini index e28894ad943ac..aabe99e0334e3 100644 --- a/administrator/language/en-GB/en-GB.ini +++ b/administrator/language/en-GB/en-GB.ini @@ -263,7 +263,6 @@ JFIELD_VERSION_HISTORY_LABEL="Prior Versions" JFIELD_VERSION_HISTORY_SELECT="View Prior Versions" JFIELD_XREFERENCE_DESC="An optional field to allow this record to be cross-referenced to an external data system if required." JFIELD_XREFERENCE_LABEL="External Reference" -JGLOBAL_ACROSS="Across" JGLOBAL_ACTION_PERMISSIONS_LABEL="Permissions" JGLOBAL_ADD_CUSTOM_CATEGORY="Add new Category" JGLOBAL_ALL_ARTICLE="Max Levels Articles" @@ -343,7 +342,6 @@ JGLOBAL_DESCRIPTION="Description" JGLOBAL_DISPLAY_NUM="Display #" JGLOBAL_DISPLAY_SELECT_DESC="Show or hide the Display Select dropdown listbox." JGLOBAL_DISPLAY_SELECT_LABEL="Display Select" -JGLOBAL_DOWN="Down" JGLOBAL_EDIT_ITEM="Edit item" JGLOBAL_EDIT_PREFERENCES="Edit Preferences" JGLOBAL_EMAIL="Email" @@ -466,8 +464,6 @@ JGLOBAL_MODIFIED="Modified" JGLOBAL_MODIFIED_DATE="Modified Date" JGLOBAL_MOST_HITS="Most Hits" JGLOBAL_MOST_RECENT_FIRST="Most Recent First" -JGLOBAL_MULTI_COLUMN_ORDER_DESC="Order articles down or across columns." -JGLOBAL_MULTI_COLUMN_ORDER_LABEL="Multi Column Order" JGLOBAL_MULTI_LEVEL="Multi Level" JGLOBAL_NEWITEMSFIRST_DESC="New items default to the first position. The ordering can be changed after this item is saved." JGLOBAL_NEWITEMSLAST_DESC="New items default to the last position. The ordering can be changed after this item is saved." @@ -476,8 +472,6 @@ JGLOBAL_NO_ORDER="No Order" JGLOBAL_NOINDEX_FOLLOW="No index, follow" JGLOBAL_NOINDEX_NOFOLLOW="No index, no follow" JGLOBAL_NONAPPLICABLE="N/A" -JGLOBAL_NUM_COLUMNS_DESC="The number of columns in which to show Intro Articles. Normally 1, 2, or 3." -JGLOBAL_NUM_COLUMNS_LABEL="# Columns" JGLOBAL_NUM_INTRO_ARTICLES_DESC="Number of articles to show after the leading article. Articles will be shown in columns." JGLOBAL_NUM_INTRO_ARTICLES_LABEL="# Intro Articles" JGLOBAL_NUM_LEADING_ARTICLES_DESC="Number of leading articles to display as full-width at the beginning of the page." diff --git a/components/com_content/Helper/QueryHelper.php b/components/com_content/Helper/QueryHelper.php index bb374bbd1157e..212cec2efd673 100644 --- a/components/com_content/Helper/QueryHelper.php +++ b/components/com_content/Helper/QueryHelper.php @@ -231,95 +231,4 @@ public static function buildVotingQuery($params = null) return array('select' => $select, 'join' => $join); } - - /** - * Method to order the intro articles array for ordering - * down the columns instead of across. - * The layout always lays the introtext articles out across columns. - * Array is reordered so that, when articles are displayed in index order - * across columns in the layout, the result is that the - * desired article ordering is achieved down the columns. - * - * @param array &$articles Array of intro text articles - * @param integer $numColumns Number of columns in the layout - * - * @return array Reordered array to achieve desired ordering down columns - * - * @since 1.6 - */ - public static function orderDownColumns(&$articles, $numColumns = 1) - { - $count = count($articles); - - // Just return the same array if there is nothing to change - if ($numColumns == 1 || !is_array($articles) || $count <= $numColumns) - { - $return = $articles; - } - // We need to re-order the intro articles array - else - { - // We need to preserve the original array keys - $keys = array_keys($articles); - - $maxRows = ceil($count / $numColumns); - $numCells = $maxRows * $numColumns; - $numEmpty = $numCells - $count; - $index = array(); - - // Calculate number of empty cells in the array - - // Fill in all cells of the array - // Put -1 in empty cells so we can skip later - for ($row = 1, $i = 1; $row <= $maxRows; $row++) - { - for ($col = 1; $col <= $numColumns; $col++) - { - if ($numEmpty > ($numCells - $i)) - { - // Put -1 in empty cells - $index[$row][$col] = -1; - } - else - { - // Put in zero as placeholder - $index[$row][$col] = 0; - } - - $i++; - } - } - - // Layout the articles in column order, skipping empty cells - $i = 0; - - for ($col = 1; ($col <= $numColumns) && ($i < $count); $col++) - { - for ($row = 1; ($row <= $maxRows) && ($i < $count); $row++) - { - if ($index[$row][$col] != - 1) - { - $index[$row][$col] = $keys[$i]; - $i++; - } - } - } - - // Now read the $index back row by row to get articles in right row/col - // so that they will actually be ordered down the columns (when read by row in the layout) - $return = array(); - $i = 0; - - for ($row = 1; ($row <= $maxRows) && ($i < $count); $row++) - { - for ($col = 1; ($col <= $numColumns) && ($i < $count); $col++) - { - $return[$keys[$i]] = $articles[$index[$row][$col]]; - $i++; - } - } - } - - return $return; - } } diff --git a/components/com_content/View/Category/HtmlView.php b/components/com_content/View/Category/HtmlView.php index ead7c491f46a0..eb0a6c22a3de5 100644 --- a/components/com_content/View/Category/HtmlView.php +++ b/components/com_content/View/Category/HtmlView.php @@ -15,7 +15,6 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\View\CategoryView; use Joomla\CMS\Plugin\PluginHelper; -use Joomla\Component\Content\Site\Helper\QueryHelper; use Joomla\Registry\Registry; /** @@ -32,7 +31,7 @@ class HtmlView extends CategoryView protected $lead_items = array(); /** - * @var array Array of intro (multicolumn display) items for blog display + * @var array Array of intro items for blog display * @since 3.2 */ protected $intro_items = array(); @@ -43,12 +42,6 @@ class HtmlView extends CategoryView */ protected $link_items = array(); - /** - * @var integer Number of columns in a multi column display - * @since 3.2 - */ - protected $columns = 1; - /** * @var string The name of the extension for the category * @since 3.2 @@ -149,16 +142,6 @@ public function display($tpl = null) continue; } } - - $this->columns = max(1, $params->def('num_columns', 1)); - - $order = $params->def('multi_column_order', 1); - - if ($order == 0 && $this->columns > 1) - { - // Call order down helper - $this->intro_items = QueryHelper::orderDownColumns($this->intro_items, $this->columns); - } } // Because the application sets a default page title, diff --git a/components/com_content/View/Featured/HtmlView.php b/components/com_content/View/Featured/HtmlView.php index baa7ca8c376eb..7337d1edee677 100644 --- a/components/com_content/View/Featured/HtmlView.php +++ b/components/com_content/View/Featured/HtmlView.php @@ -16,7 +16,6 @@ use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Plugin\PluginHelper; use Joomla\CMS\Router\Route; -use Joomla\Component\Content\Site\Helper\QueryHelper; /** * Frontpage View class @@ -67,13 +66,6 @@ class HtmlView extends BaseHtmlView */ protected $link_items = array(); - /** - * The number of columns to show introduction articles in. - * - * @var integer - */ - protected $columns = 1; - /** * An instance of JDatabaseDriver. * @@ -192,15 +184,6 @@ public function display($tpl = null) $this->intro_items[$i] = &$items[$i]; } - $this->columns = max(1, $params->def('num_columns', 1)); - $order = $params->def('multi_column_order', 1); - - if ($order == 0 && $this->columns > 1) - { - // Call order down helper - $this->intro_items = QueryHelper::orderDownColumns($this->intro_items, $this->columns); - } - // The remainder are the links. for ($i = $numLeading + $numIntro; $i < $max; $i++) { diff --git a/components/com_content/tmpl/categories/default.xml b/components/com_content/tmpl/categories/default.xml index 67fd788bef057..7ea45a2e67d8c 100644 --- a/components/com_content/tmpl/categories/default.xml +++ b/components/com_content/tmpl/categories/default.xml @@ -217,13 +217,6 @@ useglobal="true" /> - - - - - - - 1, 'home' => 1, 'params' => '{"featured_categories":[""],"layout_type":"blog","num_leading_articles":"1",' - . '"num_intro_articles":"3","num_columns":"3","num_links":"0","orderby_pri":"","orderby_sec":"front",' - . '"order_date":"","multi_column_order":"1","show_pagination":"2","show_pagination_results":"1","show_noauth":"",' + . '"num_intro_articles":"3","num_links":"0","orderby_pri":"","orderby_sec":"front",' + . '"order_date":"","show_pagination":"2","show_pagination_results":"1","show_noauth":"",' . '"article-allow_ratings":"","article-allow_comments":"","show_feed_link":"1","feed_summary":"",' . '"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"",' . '"show_parent_category":"","link_parent_category":"","show_author":"","show_create_date":"",' @@ -997,8 +997,8 @@ public function addAllCategoriesMenuItem($itemLanguage) . '"show_empty_categories_cat":"","show_subcat_desc_cat":"","show_cat_num_articles_cat":"",' . '"show_category_title":"","show_description":"","show_description_image":"","maxLevel":"",' . '"show_empty_categories":"","show_no_articles":"","show_subcat_desc":"","show_cat_num_articles":"",' - . '"num_leading_articles":"","num_intro_articles":"","num_columns":"","num_links":"",' - . '"multi_column_order":"","show_subcategory_content":"","orderby_pri":"","orderby_sec":"",' + . '"num_leading_articles":"","num_intro_articles":"","num_links":"",' + . '"show_subcategory_content":"","orderby_pri":"","orderby_sec":"",' . '"order_date":"","show_pagination_limit":"","filter_field":"","show_headings":"",' . '"list_show_date":"","date_format":"","list_show_hits":"","list_show_author":"","display_num":"10",' . '"show_pagination":"","show_pagination_results":"","show_title":"","link_titles":"",' @@ -1351,8 +1351,8 @@ public function addBlogMenuItem($itemLanguage, $categoryId) 'params' => '{"layout_type":"blog","show_category_heading_title_text":"","show_category_title":"",' . '"show_description":"","show_description_image":"","maxLevel":"","show_empty_categories":"",' . '"show_no_articles":"","show_subcat_desc":"","show_cat_num_articles":"","show_cat_tags":"",' - . '"page_subheading":"","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3",' - . '"num_links":"0","multi_column_order":"1","show_subcategory_content":"","orderby_pri":"",' + . '"page_subheading":"","num_leading_articles":"1","num_intro_articles":"3",' + . '"num_links":"0","show_subcategory_content":"","orderby_pri":"",' . '"orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1",' . '"show_featured":"","show_title":"","link_titles":"","show_intro":"","info_block_position":"",' . '"info_block_show_title":"","show_category":"","link_category":"","show_parent_category":"",' diff --git a/plugins/sampledata/multilang/multilang.php b/plugins/sampledata/multilang/multilang.php index 214ee154a7420..6834565ea7d86 100644 --- a/plugins/sampledata/multilang/multilang.php +++ b/plugins/sampledata/multilang/multilang.php @@ -761,8 +761,8 @@ private function addAllCategoriesMenuItem($itemLanguage) . '"show_empty_categories_cat":"","show_subcat_desc_cat":"","show_cat_num_articles_cat":"",' . '"show_category_title":"","show_description":"","show_description_image":"","maxLevel":"",' . '"show_empty_categories":"","show_no_articles":"","show_subcat_desc":"","show_cat_num_articles":"",' - . '"num_leading_articles":"","num_intro_articles":"","num_columns":"","num_links":"",' - . '"multi_column_order":"","show_subcategory_content":"","orderby_pri":"","orderby_sec":"",' + . '"num_leading_articles":"","num_intro_articles":"","num_links":"",' + . '"show_subcategory_content":"","orderby_pri":"","orderby_sec":"",' . '"order_date":"","show_pagination_limit":"","filter_field":"","show_headings":"",' . '"list_show_date":"","date_format":"","list_show_hits":"","list_show_author":"","display_num":"10",' . '"show_pagination":"","show_pagination_results":"","show_title":"","link_titles":"",' @@ -842,8 +842,8 @@ private function addBlogMenuItem($itemLanguage, $categoryId) 'params' => '{"layout_type":"blog","show_category_heading_title_text":"","show_category_title":"",' . '"show_description":"","show_description_image":"","maxLevel":"","show_empty_categories":"",' . '"show_no_articles":"","show_subcat_desc":"","show_cat_num_articles":"","show_cat_tags":"",' - . '"page_subheading":"","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3",' - . '"num_links":"0","multi_column_order":"1","show_subcategory_content":"","orderby_pri":"",' + . '"page_subheading":"","num_leading_articles":"1","num_intro_articles":"3",' + . '"num_links":"0","show_subcategory_content":"","orderby_pri":"",' . '"orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1",' . '"show_featured":"","show_title":"","link_titles":"","show_intro":"","info_block_position":"",' . '"info_block_show_title":"","show_category":"","link_category":"","show_parent_category":"",' From 529f00cda4cb05733d87cd76210ab1c47ccfaa5f Mon Sep 17 00:00:00 2001 From: Robert Deutz Date: Fri, 22 Mar 2019 10:35:09 +0100 Subject: [PATCH 43/48] fix javascript linter failures (#24309) --- .drone.yml | 2 +- .../js/joomla-toolbar-button.w-c.es6.js | 4 +- package-lock.json | 3704 ++++++++--------- package.json | 16 +- plugins/system/stats/stats.php | 40 +- 5 files changed, 1673 insertions(+), 2093 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8bcb9ee57d68c..04370afd1bd4e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -64,7 +64,7 @@ pipeline: - Xvfb -screen 0 1024x768x24 -ac +extension GLX +render -noreset > /dev/null 2>&1 & - sleep 3 - fluxbox > /dev/null 2>&1 & - - cd /drone/src/github.com/joomla/joomla-cms && npm run lint:js + - npm run lint:js javascript-tests: image: joomlaprojects/docker-systemtests:develop diff --git a/build/media_source/system/js/joomla-toolbar-button.w-c.es6.js b/build/media_source/system/js/joomla-toolbar-button.w-c.es6.js index 173d5ae42aa91..046913a9c7217 100755 --- a/build/media_source/system/js/joomla-toolbar-button.w-c.es6.js +++ b/build/media_source/system/js/joomla-toolbar-button.w-c.es6.js @@ -24,7 +24,7 @@ window.customElements.define('joomla-toolbar-button', class extends HTMLElement if (!Joomla) { throw new Error('Joomla API is not properly initiated'); } - + this.onChange = this.onChange.bind(this); this.addEventListener('click', event => this.executeTask(event)); @@ -118,4 +118,4 @@ window.customElements.define('joomla-toolbar-button', class extends HTMLElement return true; } -}); \ No newline at end of file +}); diff --git a/package-lock.json b/package-lock.json index 8e6178d879b28..fb6a20f5693ce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,25 +13,105 @@ } }, "@babel/core": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.2.2.tgz", - "integrity": "sha512-59vB0RWt09cAct5EIe58+NzGP4TFSD3Bz//2/ELy3ZeTeKF6VTD1AXlH8BGGbCX0PuobZBsIzO7IAI9PH67eKw==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.4.0.tgz", + "integrity": "sha512-Dzl7U0/T69DFOTwqz/FJdnOSWS57NpjNfCwMKHABr589Lg8uX1RrlBIJ7L5Dubt/xkLsx0xH5EBFzlBVes1ayA==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.2.2", - "@babel/helpers": "^7.2.0", - "@babel/parser": "^7.2.2", - "@babel/template": "^7.2.2", - "@babel/traverse": "^7.2.2", - "@babel/types": "^7.2.2", + "@babel/generator": "^7.4.0", + "@babel/helpers": "^7.4.0", + "@babel/parser": "^7.4.0", + "@babel/template": "^7.4.0", + "@babel/traverse": "^7.4.0", + "@babel/types": "^7.4.0", "convert-source-map": "^1.1.0", "debug": "^4.1.0", "json5": "^2.1.0", - "lodash": "^4.17.10", + "lodash": "^4.17.11", "resolve": "^1.3.2", "semver": "^5.4.1", "source-map": "^0.5.0" + }, + "dependencies": { + "@babel/generator": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.0.tgz", + "integrity": "sha512-/v5I+a1jhGSKLgZDcmAUZ4K/VePi43eRkUs3yePW1HB1iANOD5tqJXwGSG4BZhSksP8J9ejSlwGeTiiOFZOrXQ==", + "dev": true, + "requires": { + "@babel/types": "^7.4.0", + "jsesc": "^2.5.1", + "lodash": "^4.17.11", + "source-map": "^0.5.0", + "trim-right": "^1.0.1" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz", + "integrity": "sha512-7Cuc6JZiYShaZnybDmfwhY4UYHzI6rlqhWjaIqbsJGsIqPimEYy5uh3akSRLMg65LSdSEnJ8a8/bWQN6u2oMGw==", + "dev": true, + "requires": { + "@babel/types": "^7.4.0" + } + }, + "@babel/helpers": { + "version": "7.4.2", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.4.2.tgz", + "integrity": "sha512-gQR1eQeroDzFBikhrCccm5Gs2xBjZ57DNjGbqTaHo911IpmSxflOQWMAHPw/TXk8L3isv7s9lYzUkexOeTQUYg==", + "dev": true, + "requires": { + "@babel/template": "^7.4.0", + "@babel/traverse": "^7.4.0", + "@babel/types": "^7.4.0" + } + }, + "@babel/parser": { + "version": "7.4.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.2.tgz", + "integrity": "sha512-9fJTDipQFvlfSVdD/JBtkiY0br9BtfvW2R8wo6CX/Ej2eMuV0gWPk1M67Mt3eggQvBqYW1FCEk8BN7WvGm/g5g==", + "dev": true + }, + "@babel/template": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.0.tgz", + "integrity": "sha512-SOWwxxClTTh5NdbbYZ0BmaBVzxzTh2tO/TeLTbF6MO6EzVhHTnff8CdBXx3mEtazFBoysmEM6GU/wF+SuSx4Fw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@babel/parser": "^7.4.0", + "@babel/types": "^7.4.0" + } + }, + "@babel/traverse": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.0.tgz", + "integrity": "sha512-/DtIHKfyg2bBKnIN+BItaIlEg5pjAnzHOIQe5w+rHAw/rg9g0V7T4rqPX8BJPfW11kt3koyjAnTNwCzb28Y1PA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@babel/generator": "^7.4.0", + "@babel/helper-function-name": "^7.1.0", + "@babel/helper-split-export-declaration": "^7.4.0", + "@babel/parser": "^7.4.0", + "@babel/types": "^7.4.0", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.11" + } + }, + "@babel/types": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz", + "integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.11", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/generator": { @@ -66,25 +146,96 @@ } }, "@babel/helper-call-delegate": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.1.0.tgz", - "integrity": "sha512-YEtYZrw3GUK6emQHKthltKNZwszBcHK58Ygcis+gVUrF4/FmTVr5CCqQNSfmvg2y+YDEANyYoaLz/SHsnusCwQ==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.4.0.tgz", + "integrity": "sha512-SdqDfbVdNQCBp3WhK2mNdDvHd3BD6qbmIc43CAyjnsfCmgHMeqgDcM3BzY2lchi7HBJGJ2CVdynLWbezaE4mmQ==", "dev": true, "requires": { - "@babel/helper-hoist-variables": "^7.0.0", - "@babel/traverse": "^7.1.0", - "@babel/types": "^7.0.0" + "@babel/helper-hoist-variables": "^7.4.0", + "@babel/traverse": "^7.4.0", + "@babel/types": "^7.4.0" + }, + "dependencies": { + "@babel/generator": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.0.tgz", + "integrity": "sha512-/v5I+a1jhGSKLgZDcmAUZ4K/VePi43eRkUs3yePW1HB1iANOD5tqJXwGSG4BZhSksP8J9ejSlwGeTiiOFZOrXQ==", + "dev": true, + "requires": { + "@babel/types": "^7.4.0", + "jsesc": "^2.5.1", + "lodash": "^4.17.11", + "source-map": "^0.5.0", + "trim-right": "^1.0.1" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz", + "integrity": "sha512-7Cuc6JZiYShaZnybDmfwhY4UYHzI6rlqhWjaIqbsJGsIqPimEYy5uh3akSRLMg65LSdSEnJ8a8/bWQN6u2oMGw==", + "dev": true, + "requires": { + "@babel/types": "^7.4.0" + } + }, + "@babel/parser": { + "version": "7.4.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.2.tgz", + "integrity": "sha512-9fJTDipQFvlfSVdD/JBtkiY0br9BtfvW2R8wo6CX/Ej2eMuV0gWPk1M67Mt3eggQvBqYW1FCEk8BN7WvGm/g5g==", + "dev": true + }, + "@babel/traverse": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.0.tgz", + "integrity": "sha512-/DtIHKfyg2bBKnIN+BItaIlEg5pjAnzHOIQe5w+rHAw/rg9g0V7T4rqPX8BJPfW11kt3koyjAnTNwCzb28Y1PA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@babel/generator": "^7.4.0", + "@babel/helper-function-name": "^7.1.0", + "@babel/helper-split-export-declaration": "^7.4.0", + "@babel/parser": "^7.4.0", + "@babel/types": "^7.4.0", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.11" + } + }, + "@babel/types": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz", + "integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.11", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/helper-define-map": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz", - "integrity": "sha512-yPPcW8dc3gZLN+U1mhYV91QU3n5uTbx7DUdf8NnPbjS0RMwBuHi9Xt2MUgppmNz7CJxTBWsGczTiEp1CSOTPRg==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.4.0.tgz", + "integrity": "sha512-wAhQ9HdnLIywERVcSvX40CEJwKdAa1ID4neI9NXQPDOHwwA+57DqwLiPEVy2AIyWzAk0CQ8qx4awO0VUURwLtA==", "dev": true, "requires": { "@babel/helper-function-name": "^7.1.0", - "@babel/types": "^7.0.0", - "lodash": "^4.17.10" + "@babel/types": "^7.4.0", + "lodash": "^4.17.11" + }, + "dependencies": { + "@babel/types": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz", + "integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.11", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/helper-explode-assignable-expression": { @@ -116,12 +267,25 @@ } }, "@babel/helper-hoist-variables": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0.tgz", - "integrity": "sha512-Ggv5sldXUeSKsuzLkddtyhyHe2YantsxWKNi7A+7LeD12ExRDWTRk29JCXpaHPAbMaIPZSil7n+lq78WY2VY7w==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.0.tgz", + "integrity": "sha512-/NErCuoe/et17IlAQFKWM24qtyYYie7sFIrW/tIQXpck6vAu2hhtYYsKLBWQV+BQZMbcIYPU/QMYuTufrY4aQw==", "dev": true, "requires": { - "@babel/types": "^7.0.0" + "@babel/types": "^7.4.0" + }, + "dependencies": { + "@babel/types": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz", + "integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.11", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/helper-member-expression-to-functions": { @@ -194,15 +358,73 @@ } }, "@babel/helper-replace-supers": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.2.3.tgz", - "integrity": "sha512-GyieIznGUfPXPWu0yLS6U55Mz67AZD9cUk0BfirOWlPrXlBcan9Gz+vHGz+cPfuoweZSnPzPIm67VtQM0OWZbA==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.4.0.tgz", + "integrity": "sha512-PVwCVnWWAgnal+kJ+ZSAphzyl58XrFeSKSAJRiqg5QToTsjL+Xu1f9+RJ+d+Q0aPhPfBGaYfkox66k86thxNSg==", "dev": true, "requires": { "@babel/helper-member-expression-to-functions": "^7.0.0", "@babel/helper-optimise-call-expression": "^7.0.0", - "@babel/traverse": "^7.2.3", - "@babel/types": "^7.0.0" + "@babel/traverse": "^7.4.0", + "@babel/types": "^7.4.0" + }, + "dependencies": { + "@babel/generator": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.0.tgz", + "integrity": "sha512-/v5I+a1jhGSKLgZDcmAUZ4K/VePi43eRkUs3yePW1HB1iANOD5tqJXwGSG4BZhSksP8J9ejSlwGeTiiOFZOrXQ==", + "dev": true, + "requires": { + "@babel/types": "^7.4.0", + "jsesc": "^2.5.1", + "lodash": "^4.17.11", + "source-map": "^0.5.0", + "trim-right": "^1.0.1" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz", + "integrity": "sha512-7Cuc6JZiYShaZnybDmfwhY4UYHzI6rlqhWjaIqbsJGsIqPimEYy5uh3akSRLMg65LSdSEnJ8a8/bWQN6u2oMGw==", + "dev": true, + "requires": { + "@babel/types": "^7.4.0" + } + }, + "@babel/parser": { + "version": "7.4.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.2.tgz", + "integrity": "sha512-9fJTDipQFvlfSVdD/JBtkiY0br9BtfvW2R8wo6CX/Ej2eMuV0gWPk1M67Mt3eggQvBqYW1FCEk8BN7WvGm/g5g==", + "dev": true + }, + "@babel/traverse": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.0.tgz", + "integrity": "sha512-/DtIHKfyg2bBKnIN+BItaIlEg5pjAnzHOIQe5w+rHAw/rg9g0V7T4rqPX8BJPfW11kt3koyjAnTNwCzb28Y1PA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@babel/generator": "^7.4.0", + "@babel/helper-function-name": "^7.1.0", + "@babel/helper-split-export-declaration": "^7.4.0", + "@babel/parser": "^7.4.0", + "@babel/types": "^7.4.0", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.11" + } + }, + "@babel/types": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz", + "integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.11", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/helper-simple-access": { @@ -282,9 +504,9 @@ } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.3.1.tgz", - "integrity": "sha512-Nmmv1+3LqxJu/V5jU9vJmxR/KIRWFk2qLHmbB56yRRRFhlaSuOVXscX3gUmhaKgUhzA3otOHVubbIEVYsZ0eZg==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.0.tgz", + "integrity": "sha512-uTNi8pPYyUH2eWHyYWWSYJKwKg34hhgl4/dbejEjL+64OhbHjTX7wEVWMQl82tEmdDsGeu77+s8HHLS627h6OQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", @@ -302,14 +524,14 @@ } }, "@babel/plugin-proposal-unicode-property-regex": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.2.0.tgz", - "integrity": "sha512-LvRVYb7kikuOtIoUeWTkOxQEV1kYvL5B6U3iWEGCzPNRus1MzJweFqORTj+0jkxozkTSYNJozPOddxmqdqsRpw==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.0.tgz", + "integrity": "sha512-h/KjEZ3nK9wv1P1FSNb9G079jXrNYR0Ko+7XkOx85+gM24iZbPn0rh4vCftk+5QKY7y1uByFataBTmX7irEF1w==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", "@babel/helper-regex": "^7.0.0", - "regexpu-core": "^4.2.0" + "regexpu-core": "^4.5.4" } }, "@babel/plugin-syntax-async-generators": { @@ -358,9 +580,9 @@ } }, "@babel/plugin-transform-async-to-generator": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.2.0.tgz", - "integrity": "sha512-CEHzg4g5UraReozI9D4fblBYABs7IM6UerAVG7EJVrTLC5keh00aEuLUT+O40+mJCEzaXkYfTCUKIyeDfMOFFQ==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.4.0.tgz", + "integrity": "sha512-EeaFdCeUULM+GPFEsf7pFcNSxM7hYjoj5fiYbyuiXobW4JhFnjAv9OWzNwHyHcKoPNpAfeRDuW6VyaXEDUBa7g==", "dev": true, "requires": { "@babel/helper-module-imports": "^7.0.0", @@ -378,29 +600,51 @@ } }, "@babel/plugin-transform-block-scoping": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.2.0.tgz", - "integrity": "sha512-vDTgf19ZEV6mx35yiPJe4fS02mPQUUcBNwWQSZFXSzTSbsJFQvHt7DqyS3LK8oOWALFOsJ+8bbqBgkirZteD5Q==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.4.0.tgz", + "integrity": "sha512-AWyt3k+fBXQqt2qb9r97tn3iBwFpiv9xdAiG+Gr2HpAZpuayvbL55yWrsV3MyHvXk/4vmSiedhDRl1YI2Iy5nQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "lodash": "^4.17.10" + "lodash": "^4.17.11" } }, "@babel/plugin-transform-classes": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.2.2.tgz", - "integrity": "sha512-gEZvgTy1VtcDOaQty1l10T3jQmJKlNVxLDCs+3rCVPr6nMkODLELxViq5X9l+rfxbie3XrfrMCYYY6eX3aOcOQ==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.4.0.tgz", + "integrity": "sha512-XGg1Mhbw4LDmrO9rSTNe+uI79tQPdGs0YASlxgweYRLZqo/EQktjaOV4tchL/UZbM0F+/94uOipmdNGoaGOEYg==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.0.0", - "@babel/helper-define-map": "^7.1.0", + "@babel/helper-define-map": "^7.4.0", "@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.1.0", - "@babel/helper-split-export-declaration": "^7.0.0", + "@babel/helper-replace-supers": "^7.4.0", + "@babel/helper-split-export-declaration": "^7.4.0", "globals": "^11.1.0" + }, + "dependencies": { + "@babel/helper-split-export-declaration": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz", + "integrity": "sha512-7Cuc6JZiYShaZnybDmfwhY4UYHzI6rlqhWjaIqbsJGsIqPimEYy5uh3akSRLMg65LSdSEnJ8a8/bWQN6u2oMGw==", + "dev": true, + "requires": { + "@babel/types": "^7.4.0" + } + }, + "@babel/types": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz", + "integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.11", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/plugin-transform-computed-properties": { @@ -413,9 +657,9 @@ } }, "@babel/plugin-transform-destructuring": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.2.0.tgz", - "integrity": "sha512-coVO2Ayv7g0qdDbrNiadE4bU7lvCd9H539m2gMknyVjjMdwF/iCOM7R+E8PkntoqLkltO0rk+3axhpp/0v68VQ==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.4.0.tgz", + "integrity": "sha512-HySkoatyYTY3ZwLI8GGvkRWCFrjAGXUHur5sMecmCIdIharnlcWWivOqDJI76vvmVZfzwb6G08NREsrY96RhGQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" @@ -452,9 +696,9 @@ } }, "@babel/plugin-transform-for-of": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.2.0.tgz", - "integrity": "sha512-Kz7Mt0SsV2tQk6jG5bBv5phVbkd0gd27SgYD4hH1aLMJRchM0dzHaXvrWhVZ+WxAlDoAKZ7Uy3jVTW2mKXQ1WQ==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.0.tgz", + "integrity": "sha512-vWdfCEYLlYSxbsKj5lGtzA49K3KANtb8qCPQ1em07txJzsBwY+cKJzBHizj5fl3CCx7vt+WPdgDLTHmydkbQSQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" @@ -490,9 +734,9 @@ } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.2.0.tgz", - "integrity": "sha512-V6y0uaUQrQPXUrmj+hgnks8va2L0zcZymeU7TtWEgdRLNkceafKXEduv7QzgQAE4lT+suwooG9dC7LFhdRAbVQ==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.0.tgz", + "integrity": "sha512-iWKAooAkipG7g1IY0eah7SumzfnIT3WNhT4uYB2kIsvHnNSB6MDYVa5qyICSwaTBDBY2c4SnJ3JtEa6ltJd6Jw==", "dev": true, "requires": { "@babel/helper-module-transforms": "^7.1.0", @@ -501,12 +745,12 @@ } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.2.0.tgz", - "integrity": "sha512-aYJwpAhoK9a+1+O625WIjvMY11wkB/ok0WClVwmeo3mCjcNRjt+/8gHWrB5i+00mUju0gWsBkQnPpdvQ7PImmQ==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.4.0.tgz", + "integrity": "sha512-gjPdHmqiNhVoBqus5qK60mWPp1CmYWp/tkh11mvb0rrys01HycEGD7NvvSoKXlWEfSM9TcL36CpsK8ElsADptQ==", "dev": true, "requires": { - "@babel/helper-hoist-variables": "^7.0.0", + "@babel/helper-hoist-variables": "^7.4.0", "@babel/helper-plugin-utils": "^7.0.0" } }, @@ -521,18 +765,18 @@ } }, "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.3.0.tgz", - "integrity": "sha512-NxIoNVhk9ZxS+9lSoAQ/LM0V2UEvARLttEHUrRDGKFaAxOYQcrkN/nLRE+BbbicCAvZPl7wMP0X60HsHE5DtQw==", + "version": "7.4.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.2.tgz", + "integrity": "sha512-NsAuliSwkL3WO2dzWTOL1oZJHm0TM8ZY8ZSxk2ANyKkt5SQlToGA4pzctmq1BEjoacurdwZ3xp2dCQWJkME0gQ==", "dev": true, "requires": { "regexp-tree": "^0.1.0" } }, "@babel/plugin-transform-new-target": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0.tgz", - "integrity": "sha512-yin069FYjah+LbqfGeTfzIBODex/e++Yfa0rH0fpfam9uTbuEeEOx5GLGr210ggOV77mVRNoeqSYqeuaqSzVSw==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.0.tgz", + "integrity": "sha512-6ZKNgMQmQmrEX/ncuCwnnw1yVGoaOW5KpxNhoWI7pCQdA0uZ0HqHGqenCUIENAnxRjy2WwNQ30gfGdIgqJXXqw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" @@ -549,23 +793,23 @@ } }, "@babel/plugin-transform-parameters": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.2.0.tgz", - "integrity": "sha512-kB9+hhUidIgUoBQ0MsxMewhzr8i60nMa2KgeJKQWYrqQpqcBYtnpR+JgkadZVZoaEZ/eKu9mclFaVwhRpLNSzA==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.0.tgz", + "integrity": "sha512-Xqv6d1X+doyiuCGDoVJFtlZx0onAX0tnc3dY8w71pv/O0dODAbusVv2Ale3cGOwfiyi895ivOBhYa9DhAM8dUA==", "dev": true, "requires": { - "@babel/helper-call-delegate": "^7.1.0", + "@babel/helper-call-delegate": "^7.4.0", "@babel/helper-get-function-arity": "^7.0.0", "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-regenerator": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0.tgz", - "integrity": "sha512-sj2qzsEx8KDVv1QuJc/dEfilkg3RRPvPYx/VnKLtItVQRWt1Wqf5eVCOLZm29CiGFfYYsA3VPjfizTCV0S0Dlw==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.0.tgz", + "integrity": "sha512-SZ+CgL4F0wm4npojPU6swo/cK4FcbLgxLd4cWpHaNXY/NJ2dpahODCqBbAwb2rDmVszVb3SSjnk9/vik3AYdBw==", "dev": true, "requires": { - "regenerator-transform": "^0.13.3" + "regenerator-transform": "^0.13.4" } }, "@babel/plugin-transform-shorthand-properties": { @@ -627,54 +871,69 @@ } }, "@babel/preset-env": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.3.1.tgz", - "integrity": "sha512-FHKrD6Dxf30e8xgHQO0zJZpUPfVZg+Xwgz5/RdSWCbza9QLNk4Qbp40ctRoqDxml3O8RMzB1DU55SXeDG6PqHQ==", + "version": "7.4.2", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.4.2.tgz", + "integrity": "sha512-OEz6VOZaI9LW08CWVS3d9g/0jZA6YCn1gsKIy/fut7yZCJti5Lm1/Hi+uo/U+ODm7g4I6gULrCP+/+laT8xAsA==", "dev": true, "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-json-strings": "^7.2.0", - "@babel/plugin-proposal-object-rest-spread": "^7.3.1", + "@babel/plugin-proposal-object-rest-spread": "^7.4.0", "@babel/plugin-proposal-optional-catch-binding": "^7.2.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.2.0", + "@babel/plugin-proposal-unicode-property-regex": "^7.4.0", "@babel/plugin-syntax-async-generators": "^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.2.0", + "@babel/plugin-transform-async-to-generator": "^7.4.0", "@babel/plugin-transform-block-scoped-functions": "^7.2.0", - "@babel/plugin-transform-block-scoping": "^7.2.0", - "@babel/plugin-transform-classes": "^7.2.0", + "@babel/plugin-transform-block-scoping": "^7.4.0", + "@babel/plugin-transform-classes": "^7.4.0", "@babel/plugin-transform-computed-properties": "^7.2.0", - "@babel/plugin-transform-destructuring": "^7.2.0", + "@babel/plugin-transform-destructuring": "^7.4.0", "@babel/plugin-transform-dotall-regex": "^7.2.0", "@babel/plugin-transform-duplicate-keys": "^7.2.0", "@babel/plugin-transform-exponentiation-operator": "^7.2.0", - "@babel/plugin-transform-for-of": "^7.2.0", + "@babel/plugin-transform-for-of": "^7.4.0", "@babel/plugin-transform-function-name": "^7.2.0", "@babel/plugin-transform-literals": "^7.2.0", "@babel/plugin-transform-modules-amd": "^7.2.0", - "@babel/plugin-transform-modules-commonjs": "^7.2.0", - "@babel/plugin-transform-modules-systemjs": "^7.2.0", + "@babel/plugin-transform-modules-commonjs": "^7.4.0", + "@babel/plugin-transform-modules-systemjs": "^7.4.0", "@babel/plugin-transform-modules-umd": "^7.2.0", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.3.0", - "@babel/plugin-transform-new-target": "^7.0.0", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.4.2", + "@babel/plugin-transform-new-target": "^7.4.0", "@babel/plugin-transform-object-super": "^7.2.0", - "@babel/plugin-transform-parameters": "^7.2.0", - "@babel/plugin-transform-regenerator": "^7.0.0", + "@babel/plugin-transform-parameters": "^7.4.0", + "@babel/plugin-transform-regenerator": "^7.4.0", "@babel/plugin-transform-shorthand-properties": "^7.2.0", "@babel/plugin-transform-spread": "^7.2.0", "@babel/plugin-transform-sticky-regex": "^7.2.0", "@babel/plugin-transform-template-literals": "^7.2.0", "@babel/plugin-transform-typeof-symbol": "^7.2.0", "@babel/plugin-transform-unicode-regex": "^7.2.0", - "browserslist": "^4.3.4", + "@babel/types": "^7.4.0", + "browserslist": "^4.4.2", + "core-js-compat": "^3.0.0", "invariant": "^2.2.2", "js-levenshtein": "^1.1.3", "semver": "^5.3.0" + }, + "dependencies": { + "@babel/types": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz", + "integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.11", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/template": { @@ -731,9 +990,9 @@ } }, "@types/q": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.1.tgz", - "integrity": "sha512-eqz8c/0kwNi/OEHQfvIuJVLTst3in0e7uTKeuY+WL/zfKn0xVujOTp42bS/vUUokhK5P2BppLd9JXMOMHcgbjA==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz", + "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==", "dev": true }, "@webcomponents/webcomponentsjs": { @@ -747,10 +1006,20 @@ "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=", "dev": true }, + "accepts": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz", + "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", + "dev": true, + "requires": { + "mime-types": "~2.1.18", + "negotiator": "0.6.1" + } + }, "acorn": { - "version": "6.0.6", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.6.tgz", - "integrity": "sha512-5M3G/A4uBSMIlfJ+h9W125vJvPFH/zirISsW5qfxF5YzEvXJCtolLoQvM5yZft0DvMcUrPGKPOlgEu55I6iUtA==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz", + "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==", "dev": true }, "acorn-jsx": { @@ -809,6 +1078,27 @@ "color-convert": "^1.9.0" } }, + "anymatch": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", + "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", + "dev": true, + "requires": { + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" + }, + "dependencies": { + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "requires": { + "remove-trailing-separator": "^1.0.1" + } + } + } + }, "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", @@ -834,6 +1124,12 @@ "sprintf-js": "~1.0.2" } }, + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true + }, "arr-flatten": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", @@ -852,16 +1148,16 @@ "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", "dev": true }, - "array-slice": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", - "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=", + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", "dev": true }, - "array-unique": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", + "arraybuffer.slice": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz", + "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==", "dev": true }, "asn1": { @@ -898,9 +1194,9 @@ "dev": true }, "async-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", - "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.2.tgz", + "integrity": "sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg==", "dev": true }, "async-foreach": { @@ -933,13 +1229,13 @@ "dev": true }, "autoprefixer": { - "version": "9.4.7", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.4.7.tgz", - "integrity": "sha512-qS5wW6aXHkm53Y4z73tFGsUhmZu4aMPV9iHXYlF0c/wxjknXNHuj/1cIQb+6YH692DbJGGWcckAXX+VxKvahMA==", + "version": "9.5.0", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.5.0.tgz", + "integrity": "sha512-hMKcyHsZn5+qL6AUeP3c8OyuteZ4VaUlg+fWbyl8z7PqsKHF/Bf8/px3K6AT8aMzDkBo8Bc11245MM+itDBOxQ==", "dev": true, "requires": { - "browserslist": "^4.4.1", - "caniuse-lite": "^1.0.30000932", + "browserslist": "^4.4.2", + "caniuse-lite": "^1.0.30000947", "normalize-range": "^0.1.2", "num2fraction": "^1.2.2", "postcss": "^7.0.14", @@ -947,7 +1243,7 @@ } }, "awesomplete": { - "version": "github:LeaVerou/awesomplete#d6df8a5bef1f6384544927fe1885acb9f8401ec4", + "version": "github:LeaVerou/awesomplete#f8bee8dabbb2be47e3fcef9dafabbdaaff9b20aa", "from": "github:LeaVerou/awesomplete" }, "aws-sign2": { @@ -976,7 +1272,7 @@ }, "babel-helper-is-nodes-equiv": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz", + "resolved": "http://registry.npmjs.org/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz", "integrity": "sha1-NOmzALFHnd2Y7HfqC76TQt/jloQ=", "dev": true }, @@ -1279,12 +1575,6 @@ "kind-of": "^6.0.2" } }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - }, "kind-of": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", @@ -1330,9 +1620,15 @@ } }, "binary-extensions": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.12.0.tgz", - "integrity": "sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==", + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.0.tgz", + "integrity": "sha512-EgmjVLMn22z7eGGv3kcnHwSnJXmFHjISTY9E/S5lIcTD3Oxw05QTcBLNkJFzcb3cNueUdF/IN4U+d78V0zO8Hw==", + "dev": true + }, + "blob": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz", + "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==", "dev": true }, "block-stream": { @@ -1415,15 +1711,33 @@ "concat-map": "0.0.1" } }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "requires": { + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" + } + }, "browserslist": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.4.1.tgz", - "integrity": "sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A==", + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.5.2.tgz", + "integrity": "sha512-zmJVLiKLrzko0iszd/V4SsjTaomFeoVzQGYYOYgRgsbh7WNh95RgDB0CmBdFWYs/3MyFSt69NypjL/h3iaddKQ==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30000929", - "electron-to-chromium": "^1.3.103", - "node-releases": "^1.1.3" + "caniuse-lite": "^1.0.30000951", + "electron-to-chromium": "^1.3.116", + "node-releases": "^1.1.11" } }, "buffer-alloc": { @@ -1475,14 +1789,6 @@ "to-object-path": "^0.3.0", "union-value": "^1.0.0", "unset-value": "^1.0.0" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - } } }, "caller-callsite": { @@ -1515,15 +1821,9 @@ "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=", "dev": true }, - "camelcase": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz", - "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==", - "dev": true - }, "camelcase-keys": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { @@ -1549,20 +1849,12 @@ "caniuse-lite": "^1.0.0", "lodash.memoize": "^4.1.2", "lodash.uniq": "^4.5.0" - }, - "dependencies": { - "lodash.memoize": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", - "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", - "dev": true - } } }, "caniuse-lite": { - "version": "1.0.30000932", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000932.tgz", - "integrity": "sha512-4bghJFItvzz8m0T3lLZbacmEY9X1Z2AtIzTr7s7byqZIOumASfr4ynDx7rtm0J85nDmx8vsgR6vnaSoeU8Oh0A==", + "version": "1.0.30000951", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000951.tgz", + "integrity": "sha512-eRhP+nQ6YUkIcNQ6hnvdhMkdc7n3zadog0KXNRxAZTT2kHjUb1yGn71OrPhSn8MOvlX97g5CR97kGVj8fMsXWg==", "dev": true }, "caseless": { @@ -1598,6 +1890,26 @@ "redux": "^3.3.1" } }, + "chokidar": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.2.tgz", + "integrity": "sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==", + "dev": true, + "requires": { + "anymatch": "^2.0.0", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "fsevents": "^1.2.7", + "glob-parent": "^3.1.0", + "inherits": "^2.0.3", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "normalize-path": "^3.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.2.1", + "upath": "^1.1.0" + } + }, "chosen-js": { "version": "1.6.2", "resolved": "https://registry.npmjs.org/chosen-js/-/chosen-js-1.6.2.tgz", @@ -1606,12 +1918,6 @@ "jquery": ">=1.4.4" } }, - "circular-json": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", - "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", - "dev": true - }, "class-utils": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", @@ -1622,23 +1928,6 @@ "define-property": "^0.2.5", "isobject": "^3.0.0", "static-extend": "^0.1.1" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - } } }, "classnames": { @@ -1655,34 +1944,12 @@ "restore-cursor": "^2.0.0" } }, - "cli-table3": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz", - "integrity": "sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==", - "dev": true, - "requires": { - "colors": "^1.1.2", - "object-assign": "^4.1.0", - "string-width": "^2.1.1" - } - }, "cli-width": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", "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==", - "dev": true, - "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" - } - }, "coa": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz", @@ -1754,15 +2021,6 @@ "integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==", "dev": true }, - "combine-lists": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz", - "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=", - "dev": true, - "requires": { - "lodash": "^4.5.0" - } - }, "combined-stream": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", @@ -1888,9 +2146,27 @@ } }, "core-js": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.3.tgz", - "integrity": "sha512-l00tmFFZOBHtYhN4Cz7k32VM7vTn3rE2ANjQDxdEN6zmXZ/xq1jQuutnmHvMG1ZJ7xd72+TA5YpUK8wz3rWsfQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.0.0.tgz", + "integrity": "sha512-WBmxlgH2122EzEJ6GH8o9L/FeoUKxxxZ6q6VUxoTlsE4EvbTWKJb447eyVxTEuq0LpXjlq/kCB2qgBvsYRkLvQ==", + "dev": true + }, + "core-js-compat": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.0.0.tgz", + "integrity": "sha512-W/Ppz34uUme3LmXWjMgFlYyGnbo1hd9JvA0LNQ4EmieqVjg2GPYbj3H6tcdP2QGPGWdRKUqZVbVKLNIFVs/HiA==", + "dev": true, + "requires": { + "browserslist": "^4.5.1", + "core-js": "3.0.0", + "core-js-pure": "3.0.0", + "semver": "^5.6.0" + } + }, + "core-js-pure": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.0.0.tgz", + "integrity": "sha512-yPiS3fQd842RZDgo/TAKGgS0f3p2nxssF1H65DIZvZv0Od5CygP8puHXn3IQiM/39VAvgCbdaMQpresrbGgt9g==", "dev": true }, "core-util-is": { @@ -1900,14 +2176,15 @@ "dev": true }, "cosmiconfig": { - "version": "5.0.7", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.0.7.tgz", - "integrity": "sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.1.0.tgz", + "integrity": "sha512-kCNPvthka8gvLtzAxQXvWo4FxqRB+ftRZyPZNuab5ngvM9Y7yw7hbEysglptLgpkGX9nAOKTBVkHUAe8xtYR6Q==", "dev": true, "requires": { "import-fresh": "^2.0.0", "is-directory": "^0.3.1", "js-yaml": "^3.9.0", + "lodash.get": "^4.4.2", "parse-json": "^4.0.0" } }, @@ -1994,14 +2271,14 @@ "dev": true }, "css-vars-ponyfill": { - "version": "1.16.3", - "resolved": "https://registry.npmjs.org/css-vars-ponyfill/-/css-vars-ponyfill-1.16.3.tgz", - "integrity": "sha512-JpMyaChvHNAGo21ap+NmzcALPq4fk8d5Yw8g92MCexMtGmKYXwX/53rMCnHDT/YpQIoW6URNpBENkMi+Wu4qkg==" + "version": "1.17.2", + "resolved": "https://registry.npmjs.org/css-vars-ponyfill/-/css-vars-ponyfill-1.17.2.tgz", + "integrity": "sha512-hhdJTdUd9UM0wewdO8+301kba6F5GdfPwIj/lFd13il3xn0yfEuRhrDmLPMfg6R9nPLgbcU0wAp0DRUO/ucE3Q==" }, "css-what": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.2.tgz", - "integrity": "sha512-wan8dMWQ0GUeF7DGEPVjhHemVW/vy6xUYmFzRY8RYqgA0JtXC9rJmbScBjqSu6dg9q0lwPQy6ZAmJVr3PPTvqQ==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz", + "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==", "dev": true }, "cssesc": { @@ -2011,52 +2288,52 @@ "dev": true }, "cssnano": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.8.tgz", - "integrity": "sha512-5GIY0VzAHORpbKiL3rMXp4w4M1Ki+XlXgEXyuWXVd3h6hlASb+9Vo76dNP56/elLMVBBsUfusCo1q56uW0UWig==", + "version": "4.1.10", + "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz", + "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==", "dev": true, "requires": { "cosmiconfig": "^5.0.0", - "cssnano-preset-default": "^4.0.6", + "cssnano-preset-default": "^4.0.7", "is-resolvable": "^1.0.0", "postcss": "^7.0.0" } }, "cssnano-preset-default": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.6.tgz", - "integrity": "sha512-UPboYbFaJFtDUhJ4fqctThWbbyF4q01/7UhsZbLzp35l+nUxtzh1SifoVlEfyLM3n3Z0htd8B1YlCxy9i+bQvg==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz", + "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==", "dev": true, "requires": { "css-declaration-sorter": "^4.0.1", "cssnano-util-raw-cache": "^4.0.1", "postcss": "^7.0.0", - "postcss-calc": "^7.0.0", - "postcss-colormin": "^4.0.2", + "postcss-calc": "^7.0.1", + "postcss-colormin": "^4.0.3", "postcss-convert-values": "^4.0.1", - "postcss-discard-comments": "^4.0.1", + "postcss-discard-comments": "^4.0.2", "postcss-discard-duplicates": "^4.0.2", "postcss-discard-empty": "^4.0.1", "postcss-discard-overridden": "^4.0.1", - "postcss-merge-longhand": "^4.0.10", - "postcss-merge-rules": "^4.0.2", + "postcss-merge-longhand": "^4.0.11", + "postcss-merge-rules": "^4.0.3", "postcss-minify-font-values": "^4.0.2", - "postcss-minify-gradients": "^4.0.1", - "postcss-minify-params": "^4.0.1", - "postcss-minify-selectors": "^4.0.1", + "postcss-minify-gradients": "^4.0.2", + "postcss-minify-params": "^4.0.2", + "postcss-minify-selectors": "^4.0.2", "postcss-normalize-charset": "^4.0.1", - "postcss-normalize-display-values": "^4.0.1", - "postcss-normalize-positions": "^4.0.1", - "postcss-normalize-repeat-style": "^4.0.1", - "postcss-normalize-string": "^4.0.1", - "postcss-normalize-timing-functions": "^4.0.1", + "postcss-normalize-display-values": "^4.0.2", + "postcss-normalize-positions": "^4.0.2", + "postcss-normalize-repeat-style": "^4.0.2", + "postcss-normalize-string": "^4.0.2", + "postcss-normalize-timing-functions": "^4.0.2", "postcss-normalize-unicode": "^4.0.1", "postcss-normalize-url": "^4.0.1", - "postcss-normalize-whitespace": "^4.0.1", - "postcss-ordered-values": "^4.1.1", - "postcss-reduce-initial": "^4.0.2", - "postcss-reduce-transforms": "^4.0.1", - "postcss-svgo": "^4.0.1", + "postcss-normalize-whitespace": "^4.0.2", + "postcss-ordered-values": "^4.1.2", + "postcss-reduce-initial": "^4.0.3", + "postcss-reduce-transforms": "^4.0.2", + "postcss-svgo": "^4.0.2", "postcss-unique-selectors": "^4.0.1" } }, @@ -2132,9 +2409,9 @@ } }, "date-format": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz", - "integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.0.0.tgz", + "integrity": "sha512-M6UqVvZVgFYqZL1SfHsRGIQSz3ZL+qgbsV5Lp1Vj61LZVYuEwcMXYay7DRDtYs2HQQBK5hQtQ0fD9aEJ89V0LA==", "dev": true }, "dateformat": { @@ -2183,56 +2460,12 @@ } }, "define-property": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", - "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" - }, - "dependencies": { - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - }, - "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 - } + "is-descriptor": "^0.1.0" } }, "delayed-stream": { @@ -2265,9 +2498,9 @@ "integrity": "sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA==" }, "doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", "dev": true, "requires": { "esutils": "^2.0.2" @@ -2286,21 +2519,13 @@ } }, "dom-serializer": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", - "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz", + "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==", "dev": true, "requires": { - "domelementtype": "~1.1.1", - "entities": "~1.1.1" - }, - "dependencies": { - "domelementtype": { - "version": "1.1.3", - "resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", - "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", - "dev": true - } + "domelementtype": "^1.3.0", + "entities": "^1.1.1" } }, "dom-walk": { @@ -2359,9 +2584,15 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.109", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.109.tgz", - "integrity": "sha512-1qhgVZD9KIULMyeBkbjU/dWmm30zpPUfdWZfVO3nPhbtqMHJqHr4Ua5wBcWtAymVFrUCuAJxjMF1OhG+bR21Ow==", + "version": "1.3.119", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.119.tgz", + "integrity": "sha512-3mtqcAWa4HgG+Djh/oNXlPH0cOH6MmtwxN1nHSaReb9P0Vn51qYPqYwLeoSuAX9loU1wrOBhFbiX3CkeIxPfgg==", + "dev": true + }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", "dev": true }, "encodeurl": { @@ -2370,13 +2601,84 @@ "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", "dev": true }, - "end-of-stream": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", - "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", + "engine.io": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz", + "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==", + "dev": true, + "requires": { + "accepts": "~1.3.4", + "base64id": "1.0.0", + "cookie": "0.3.1", + "debug": "~3.1.0", + "engine.io-parser": "~2.1.0", + "ws": "~3.3.1" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "engine.io-client": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz", + "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==", + "dev": true, + "requires": { + "component-emitter": "1.2.1", + "component-inherit": "0.0.3", + "debug": "~3.1.0", + "engine.io-parser": "~2.1.1", + "has-cors": "1.1.0", + "indexof": "0.0.1", + "parseqs": "0.0.5", + "parseuri": "0.0.5", + "ws": "~3.3.1", + "xmlhttprequest-ssl": "~1.5.4", + "yeast": "0.1.2" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "engine.io-parser": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz", + "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==", "dev": true, "requires": { - "once": "^1.4.0" + "after": "0.8.2", + "arraybuffer.slice": "~0.0.7", + "base64-arraybuffer": "0.1.5", + "blob": "0.0.5", + "has-binary2": "~1.0.2" } }, "ent": { @@ -2474,50 +2776,61 @@ } }, "eslint": { - "version": "5.12.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.12.1.tgz", - "integrity": "sha512-54NV+JkTpTu0d8+UYSA8mMKAG4XAsaOrozA9rCW7tgneg1mevcL7wIotPC+fZ0SkWwdhNqoXoxnQCTBp7UvTsg==", + "version": "5.15.3", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.15.3.tgz", + "integrity": "sha512-vMGi0PjCHSokZxE0NLp2VneGw5sio7SSiDNgIUn2tC0XkWJRNOIoHIg3CliLVfXnJsiHxGAYrkw0PieAu8+KYQ==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "ajv": "^6.5.3", + "ajv": "^6.9.1", "chalk": "^2.1.0", "cross-spawn": "^6.0.5", "debug": "^4.0.1", - "doctrine": "^2.1.0", - "eslint-scope": "^4.0.0", + "doctrine": "^3.0.0", + "eslint-scope": "^4.0.3", "eslint-utils": "^1.3.1", "eslint-visitor-keys": "^1.0.0", - "espree": "^5.0.0", + "espree": "^5.0.1", "esquery": "^1.0.1", "esutils": "^2.0.2", - "file-entry-cache": "^2.0.0", + "file-entry-cache": "^5.0.1", "functional-red-black-tree": "^1.0.1", "glob": "^7.1.2", "globals": "^11.7.0", "ignore": "^4.0.6", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", - "inquirer": "^6.1.0", + "inquirer": "^6.2.2", "js-yaml": "^3.12.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.3.0", - "lodash": "^4.17.5", + "lodash": "^4.17.11", "minimatch": "^3.0.4", "mkdirp": "^0.5.1", "natural-compare": "^1.4.0", "optionator": "^0.8.2", "path-is-inside": "^1.0.2", - "pluralize": "^7.0.0", "progress": "^2.0.0", "regexpp": "^2.0.1", "semver": "^5.5.1", "strip-ansi": "^4.0.0", "strip-json-comments": "^2.0.1", - "table": "^5.0.2", + "table": "^5.2.3", "text-table": "^0.2.0" }, "dependencies": { + "ajv": { + "version": "6.10.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz", + "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==", + "dev": true, + "requires": { + "fast-deep-equal": "^2.0.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, "import-fresh": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.0.0.tgz", @@ -2630,7 +2943,7 @@ }, "doctrine": { "version": "1.5.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", + "resolved": "http://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=", "dev": true, "requires": { @@ -2653,9 +2966,9 @@ "dev": true }, "eslint-scope": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz", - "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==", + "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", @@ -2675,12 +2988,12 @@ "dev": true }, "espree": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.0.tgz", - "integrity": "sha512-1MpUfwsdS9MMoN7ZXqAr9e9UKdVHDcvrJpyx7mm1WuQlx/ygErEQBzgi5Nh5qBHIoYweprhtMkTCb9GhcAIcsA==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz", + "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==", "dev": true, "requires": { - "acorn": "^6.0.2", + "acorn": "^6.0.7", "acorn-jsx": "^5.0.0", "eslint-visitor-keys": "^1.0.0" } @@ -2735,61 +3048,34 @@ "merge": "^1.2.0" } }, - "execa": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", - "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", - "dev": true, - "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - }, - "expand-braces": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz", - "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=", + "expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "dev": true, "requires": { - "array-slice": "^0.2.3", - "array-unique": "^0.2.1", - "braces": "^0.1.2" + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { - "braces": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz", - "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=", - "dev": true, - "requires": { - "expand-range": "^0.1.0" - } - }, - "expand-range": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz", - "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=", + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, "requires": { - "is-number": "^0.1.1", - "repeat-string": "^0.2.2" + "ms": "2.0.0" } }, - "is-number": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz", - "integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=", - "dev": true - }, - "repeat-string": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz", - "integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=", + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true } } @@ -2801,24 +3087,12 @@ "dev": true }, "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, - "requires": { - "is-plain-object": "^2.0.4" - } - } + "is-extendable": "^0.1.0" } }, "external-editor": { @@ -2832,6 +3106,68 @@ "tmp": "^0.0.33" } }, + "extglob": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", + "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "dev": true, + "requires": { + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, + "requires": { + "is-descriptor": "^1.0.0" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } + }, + "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 + } + } + }, "extsprintf": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", @@ -2866,13 +3202,24 @@ } }, "file-entry-cache": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz", - "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz", + "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", + "dev": true, + "requires": { + "flat-cache": "^2.0.1" + } + }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "flat-cache": "^1.2.1", - "object-assign": "^4.0.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" } }, "finalhandler": { @@ -2913,25 +3260,15 @@ } } }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "requires": { - "locate-path": "^3.0.0" - } - }, "flat-cache": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz", - "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", + "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", "dev": true, "requires": { - "circular-json": "^0.3.1", - "graceful-fs": "^4.1.2", - "rimraf": "~2.6.2", - "write": "^0.2.1" + "flatted": "^2.0.0", + "rimraf": "2.6.3", + "write": "1.0.3" } }, "flatted": { @@ -2946,28 +3283,22 @@ "integrity": "sha512-yo/njtk/BB4Z2euzaZe3CZrg4u5s5uEi7ZwbHBJS2quHx51N0mmcx9nTIiImUGlgy+vf26d0CcQluahBBBL/Fw==" }, "follow-redirects": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.6.1.tgz", - "integrity": "sha512-t2JCjbzxQpWvbhts3l6SH1DKzSrx8a+SsaVf4h6bG4kOXUuPYS/kg2Lr4gQSb7eemaHqJkOThF1BGyjlUkO1GQ==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz", + "integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==", "dev": true, "requires": { - "debug": "=3.1.0" + "debug": "^3.2.6" }, "dependencies": { "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { - "ms": "2.0.0" + "ms": "^2.1.1" } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true } } }, @@ -3044,29 +3375,25 @@ "dependencies": { "abbrev": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "bundled": true, "dev": true, "optional": true }, "ansi-regex": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "bundled": true, "dev": true, "optional": true }, "aproba": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", + "bundled": true, "dev": true, "optional": true }, "are-we-there-yet": { "version": "1.1.5", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", - "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3076,15 +3403,13 @@ }, "balanced-match": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "bundled": true, "dev": true, "optional": true }, "brace-expansion": { "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3094,43 +3419,37 @@ }, "chownr": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz", - "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==", + "bundled": true, "dev": true, "optional": true }, "code-point-at": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", + "bundled": true, "dev": true, "optional": true }, "concat-map": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "bundled": true, "dev": true, "optional": true }, "console-control-strings": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", + "bundled": true, "dev": true, "optional": true }, "core-util-is": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "bundled": true, "dev": true, "optional": true }, "debug": { "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3139,29 +3458,25 @@ }, "deep-extend": { "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "bundled": true, "dev": true, "optional": true }, "delegates": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", + "bundled": true, "dev": true, "optional": true }, "detect-libc": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", + "bundled": true, "dev": true, "optional": true }, "fs-minipass": { "version": "1.2.5", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz", - "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3170,15 +3485,13 @@ }, "fs.realpath": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "bundled": true, "dev": true, "optional": true }, "gauge": { "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3194,8 +3507,7 @@ }, "glob": { "version": "7.1.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3209,15 +3521,13 @@ }, "has-unicode": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", + "bundled": true, "dev": true, "optional": true }, "iconv-lite": { "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3226,8 +3536,7 @@ }, "ignore-walk": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", - "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3236,8 +3545,7 @@ }, "inflight": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3247,22 +3555,19 @@ }, "inherits": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "bundled": true, "dev": true, "optional": true }, "ini": { "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "bundled": true, "dev": true, "optional": true }, "is-fullwidth-code-point": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3271,15 +3576,13 @@ }, "isarray": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "bundled": true, "dev": true, "optional": true }, "minimatch": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3288,15 +3591,13 @@ }, "minimist": { "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "bundled": true, "dev": true, "optional": true }, "minipass": { "version": "2.3.5", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", - "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3306,8 +3607,7 @@ }, "minizlib": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz", - "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3316,8 +3616,7 @@ }, "mkdirp": { "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3326,15 +3625,13 @@ }, "ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "bundled": true, "dev": true, "optional": true }, "needle": { "version": "2.2.4", - "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz", - "integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3345,8 +3642,7 @@ }, "node-pre-gyp": { "version": "0.10.3", - "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz", - "integrity": "sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3364,8 +3660,7 @@ }, "nopt": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", - "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3375,15 +3670,13 @@ }, "npm-bundled": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz", - "integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==", + "bundled": true, "dev": true, "optional": true }, "npm-packlist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz", - "integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3393,8 +3686,7 @@ }, "npmlog": { "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3406,22 +3698,19 @@ }, "number-is-nan": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", + "bundled": true, "dev": true, "optional": true }, "object-assign": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "bundled": true, "dev": true, "optional": true }, "once": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3430,22 +3719,19 @@ }, "os-homedir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", + "bundled": true, "dev": true, "optional": true }, "os-tmpdir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", + "bundled": true, "dev": true, "optional": true }, "osenv": { "version": "0.1.5", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", - "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3455,22 +3741,19 @@ }, "path-is-absolute": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "bundled": true, "dev": true, "optional": true }, "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==", + "bundled": true, "dev": true, "optional": true }, "rc": { "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3482,8 +3765,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "bundled": true, "dev": true, "optional": true } @@ -3491,8 +3773,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3507,8 +3788,7 @@ }, "rimraf": { "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3517,50 +3797,43 @@ }, "safe-buffer": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "bundled": true, "dev": true, "optional": true }, "safer-buffer": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "bundled": true, "dev": true, "optional": true }, "sax": { "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", + "bundled": true, "dev": true, "optional": true }, "semver": { "version": "5.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", - "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==", + "bundled": true, "dev": true, "optional": true }, "set-blocking": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", + "bundled": true, "dev": true, "optional": true }, "signal-exit": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", + "bundled": true, "dev": true, "optional": true }, "string-width": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3571,8 +3844,7 @@ }, "string_decoder": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3581,8 +3853,7 @@ }, "strip-ansi": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3591,15 +3862,13 @@ }, "strip-json-comments": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "bundled": true, "dev": true, "optional": true }, "tar": { "version": "4.4.8", - "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz", - "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3614,15 +3883,13 @@ }, "util-deprecate": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "bundled": true, "dev": true, "optional": true }, "wide-align": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -3631,15 +3898,13 @@ }, "wrappy": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "bundled": true, "dev": true, "optional": true }, "yallist": { "version": "3.0.3", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", - "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", + "bundled": true, "dev": true, "optional": true } @@ -3748,15 +4013,6 @@ "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", "dev": true }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "dev": true, - "requires": { - "pump": "^3.0.0" - } - }, "get-value": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", @@ -3786,6 +4042,27 @@ "path-is-absolute": "^1.0.0" } }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "dev": true, + "requires": { + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" + }, + "dependencies": { + "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" + } + } + } + }, "global": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz", @@ -3955,14 +4232,6 @@ "get-value": "^2.0.6", "has-values": "^1.0.0", "isobject": "^3.0.0" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - } } }, "has-values": { @@ -3975,26 +4244,6 @@ "kind-of": "^4.0.0" }, "dependencies": { - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, "kind-of": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", @@ -4038,7 +4287,7 @@ }, "http-errors": { "version": "1.6.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", + "resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "dev": true, "requires": { @@ -4151,39 +4400,39 @@ "dev": true }, "inquirer": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.1.tgz", - "integrity": "sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.2.tgz", + "integrity": "sha512-Z2rREiXA6cHRR9KBOarR3WuLlFzlIfAEIiB45ll5SSadMg7WqOh1MKEjjndfuH5ewXdixWCxqnVfGOQzPeiztA==", "dev": true, "requires": { - "ansi-escapes": "^3.0.0", - "chalk": "^2.0.0", + "ansi-escapes": "^3.2.0", + "chalk": "^2.4.2", "cli-cursor": "^2.1.0", "cli-width": "^2.0.0", - "external-editor": "^3.0.0", + "external-editor": "^3.0.3", "figures": "^2.0.0", - "lodash": "^4.17.10", + "lodash": "^4.17.11", "mute-stream": "0.0.7", "run-async": "^2.2.0", - "rxjs": "^6.1.0", + "rxjs": "^6.4.0", "string-width": "^2.1.0", "strip-ansi": "^5.0.0", "through": "^2.3.6" }, "dependencies": { "ansi-regex": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz", - "integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", "dev": true }, "strip-ansi": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz", - "integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==", + "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": "^4.0.0" + "ansi-regex": "^4.1.0" } } } @@ -4197,12 +4446,6 @@ "loose-envify": "^1.0.0" } }, - "invert-kv": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", - "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", - "dev": true - }, "is-absolute-url": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", @@ -4241,7 +4484,7 @@ }, "is-builtin-module": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { @@ -4314,6 +4557,12 @@ "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", "dev": true }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true + }, "is-finite": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", @@ -4329,6 +4578,24 @@ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, + "is-glob": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", + "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", + "dev": true, + "requires": { + "is-extglob": "^2.1.1" + } + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "^3.0.2" + } + }, "is-obj": { "version": "1.0.1", "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", @@ -4342,14 +4609,6 @@ "dev": true, "requires": { "isobject": "^3.0.1" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - } } }, "is-promise": { @@ -4373,12 +4632,6 @@ "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", "dev": true }, - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", - "dev": true - }, "is-svg": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz", @@ -4441,6 +4694,12 @@ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + }, "isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", @@ -4708,28 +4967,27 @@ } }, "karma": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/karma/-/karma-4.0.0.tgz", - "integrity": "sha512-EFoFs3F6G0BcUGPNOn/YloGOb3h09hzTguyXlg6loHlKY76qbJikkcyPk43m2kfRF65TUGda/mig29QQtyhm1g==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/karma/-/karma-4.0.1.tgz", + "integrity": "sha512-ind+4s03BqIXas7ZmraV3/kc5+mnqwCd+VDX1FndS6jxbt03kQKX2vXrWxNLuCjVYmhMwOZosAEKMM0a2q7w7A==", "dev": true, "requires": { "bluebird": "^3.3.0", "body-parser": "^1.16.1", + "braces": "^2.3.2", "chokidar": "^2.0.3", "colors": "^1.1.0", - "combine-lists": "^1.0.0", "connect": "^3.6.0", "core-js": "^2.2.0", "di": "^0.0.1", "dom-serialize": "^2.2.0", - "expand-braces": "^0.1.1", "flatted": "^2.0.0", "glob": "^7.1.1", "graceful-fs": "^4.1.2", "http-proxy": "^1.13.0", "isbinaryfile": "^3.0.0", - "lodash": "^4.17.5", - "log4js": "^3.0.0", + "lodash": "^4.17.11", + "log4js": "^4.0.0", "mime": "^2.3.1", "minimatch": "^3.0.2", "optimist": "^0.6.1", @@ -4743,742 +5001,126 @@ "useragent": "2.3.0" }, "dependencies": { - "accepts": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz", - "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", - "dev": true, - "requires": { - "mime-types": "~2.1.18", - "negotiator": "0.6.1" - } - }, - "anymatch": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", - "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", - "dev": true, - "requires": { - "micromatch": "^3.1.4", - "normalize-path": "^2.1.1" - } - }, - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", - "dev": true - }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true - }, - "arraybuffer.slice": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz", - "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==", - "dev": true - }, - "blob": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz", - "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==", + "core-js": { + "version": "2.6.5", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz", + "integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==", "dev": true }, - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, - "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "chokidar": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz", - "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==", - "dev": true, - "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.0", - "braces": "^2.3.0", - "fsevents": "^1.2.2", - "glob-parent": "^3.1.0", - "inherits": "^2.0.1", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "lodash.debounce": "^4.0.8", - "normalize-path": "^2.1.1", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.0.0", - "upath": "^1.0.5" - } - }, - "circular-json": { - "version": "0.5.9", - "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz", - "integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==", + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "engine.io": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz", - "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==", - "dev": true, - "requires": { - "accepts": "~1.3.4", - "base64id": "1.0.0", - "cookie": "0.3.1", - "debug": "~3.1.0", - "engine.io-parser": "~2.1.0", - "ws": "~3.3.1" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } - } - }, - "engine.io-client": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz", - "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==", - "dev": true, - "requires": { - "component-emitter": "1.2.1", - "component-inherit": "0.0.3", - "debug": "~3.1.0", - "engine.io-parser": "~2.1.1", - "has-cors": "1.1.0", - "indexof": "0.0.1", - "parseqs": "0.0.5", - "parseuri": "0.0.5", - "ws": "~3.3.1", - "xmlhttprequest-ssl": "~1.5.4", - "yeast": "0.1.2" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } - } - }, - "engine.io-parser": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz", - "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==", + } + } + }, + "karma-coverage": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-1.1.2.tgz", + "integrity": "sha512-eQawj4Cl3z/CjxslYy9ariU4uDh7cCNFZHNWXWRpl0pNeblY/4wHR7M7boTYXWrn9bY0z2pZmr11eKje/S/hIw==", + "dev": true, + "requires": { + "dateformat": "^1.0.6", + "istanbul": "^0.4.0", + "lodash": "^4.17.0", + "minimatch": "^3.0.0", + "source-map": "^0.5.1" + } + }, + "karma-firefox-launcher": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-1.1.0.tgz", + "integrity": "sha512-LbZ5/XlIXLeQ3cqnCbYLn+rOVhuMIK9aZwlP6eOLGzWdo1UVp7t6CN3DP4SafiRLjexKwHeKHDm0c38Mtd3VxA==", + "dev": true + }, + "karma-fixture": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/karma-fixture/-/karma-fixture-0.2.6.tgz", + "integrity": "sha1-lxzqjCFtc/BwQ5ZMtz8Q4IMAGO8=", + "dev": true + }, + "karma-html2js-preprocessor": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/karma-html2js-preprocessor/-/karma-html2js-preprocessor-1.1.0.tgz", + "integrity": "sha1-/Ant8Eu+K7bu6boZaPgmtziAIL0=", + "dev": true + }, + "karma-jasmine": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-2.0.1.tgz", + "integrity": "sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==", + "dev": true, + "requires": { + "jasmine-core": "^3.3" + } + }, + "karma-jasmine-ajax": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/karma-jasmine-ajax/-/karma-jasmine-ajax-0.1.13.tgz", + "integrity": "sha1-eLuS2Jb+MqJaGACYxHci4dlgW/w=", + "dev": true, + "requires": { + "jasmine-ajax": "^3.0.0" + } + }, + "karma-json-fixtures-preprocessor": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/karma-json-fixtures-preprocessor/-/karma-json-fixtures-preprocessor-0.0.6.tgz", + "integrity": "sha1-T3ii6800OH+OVaur/2NGVRZMTHY=", + "dev": true + }, + "karma-verbose-reporter": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/karma-verbose-reporter/-/karma-verbose-reporter-0.0.6.tgz", + "integrity": "sha1-WQkFJFHGB/Aqx3x2N5Gi/hJRJgw=", + "dev": true, + "requires": { + "colors": ">=1.0" + } + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, + "requires": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + } + }, + "load-json-file": { + "version": "2.0.0", + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "strip-bom": "^3.0.0" + }, + "dependencies": { + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "after": "0.8.2", - "arraybuffer.slice": "~0.0.7", - "base64-arraybuffer": "0.1.5", - "blob": "0.0.5", - "has-binary2": "~1.0.2" - } - }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "dev": true, - "requires": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "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=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" - } - }, - "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 - } - } - }, - "extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "dev": true, - "requires": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "dev": true, - "requires": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" - }, - "dependencies": { - "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" - } - } - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true - }, - "is-glob": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", - "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", - "dev": true, - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "isarray": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz", - "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=", - "dev": true - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - }, - "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 - }, - "log4js": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/log4js/-/log4js-3.0.6.tgz", - "integrity": "sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==", - "dev": true, - "requires": { - "circular-json": "^0.5.5", - "date-format": "^1.2.0", - "debug": "^3.1.0", - "rfdc": "^1.1.2", - "streamroller": "0.7.0" - }, - "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true - } - } - }, - "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "dev": true, - "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" - } - }, - "mime": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz", - "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==", - "dev": true - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "socket.io": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz", - "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==", - "dev": true, - "requires": { - "debug": "~3.1.0", - "engine.io": "~3.2.0", - "has-binary2": "~1.0.2", - "socket.io-adapter": "~1.1.0", - "socket.io-client": "2.1.1", - "socket.io-parser": "~3.2.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } - } - }, - "socket.io-adapter": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz", - "integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=", - "dev": true - }, - "socket.io-client": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz", - "integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==", - "dev": true, - "requires": { - "backo2": "1.0.2", - "base64-arraybuffer": "0.1.5", - "component-bind": "1.0.0", - "component-emitter": "1.2.1", - "debug": "~3.1.0", - "engine.io-client": "~3.2.0", - "has-binary2": "~1.0.2", - "has-cors": "1.1.0", - "indexof": "0.0.1", - "object-component": "0.0.3", - "parseqs": "0.0.5", - "parseuri": "0.0.5", - "socket.io-parser": "~3.2.0", - "to-array": "0.1.4" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } - } - }, - "socket.io-parser": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz", - "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==", - "dev": true, - "requires": { - "component-emitter": "1.2.1", - "debug": "~3.1.0", - "isarray": "2.0.1" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "ultron": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", - "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==", - "dev": true - }, - "ws": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", - "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", - "dev": true, - "requires": { - "async-limiter": "~1.0.0", - "safe-buffer": "~5.1.0", - "ultron": "~1.1.0" - } - }, - "xmlhttprequest-ssl": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz", - "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=", - "dev": true - } - } - }, - "karma-coverage": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-1.1.2.tgz", - "integrity": "sha512-eQawj4Cl3z/CjxslYy9ariU4uDh7cCNFZHNWXWRpl0pNeblY/4wHR7M7boTYXWrn9bY0z2pZmr11eKje/S/hIw==", - "dev": true, - "requires": { - "dateformat": "^1.0.6", - "istanbul": "^0.4.0", - "lodash": "^4.17.0", - "minimatch": "^3.0.0", - "source-map": "^0.5.1" - } - }, - "karma-firefox-launcher": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-1.1.0.tgz", - "integrity": "sha512-LbZ5/XlIXLeQ3cqnCbYLn+rOVhuMIK9aZwlP6eOLGzWdo1UVp7t6CN3DP4SafiRLjexKwHeKHDm0c38Mtd3VxA==", - "dev": true - }, - "karma-fixture": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/karma-fixture/-/karma-fixture-0.2.6.tgz", - "integrity": "sha1-lxzqjCFtc/BwQ5ZMtz8Q4IMAGO8=", - "dev": true - }, - "karma-html2js-preprocessor": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/karma-html2js-preprocessor/-/karma-html2js-preprocessor-1.1.0.tgz", - "integrity": "sha1-/Ant8Eu+K7bu6boZaPgmtziAIL0=", - "dev": true - }, - "karma-jasmine": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-2.0.1.tgz", - "integrity": "sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==", - "dev": true, - "requires": { - "jasmine-core": "^3.3" - } - }, - "karma-jasmine-ajax": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/karma-jasmine-ajax/-/karma-jasmine-ajax-0.1.13.tgz", - "integrity": "sha1-eLuS2Jb+MqJaGACYxHci4dlgW/w=", - "dev": true, - "requires": { - "jasmine-ajax": "^3.0.0" - } - }, - "karma-json-fixtures-preprocessor": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/karma-json-fixtures-preprocessor/-/karma-json-fixtures-preprocessor-0.0.6.tgz", - "integrity": "sha1-T3ii6800OH+OVaur/2NGVRZMTHY=", - "dev": true - }, - "karma-verbose-reporter": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/karma-verbose-reporter/-/karma-verbose-reporter-0.0.6.tgz", - "integrity": "sha1-WQkFJFHGB/Aqx3x2N5Gi/hJRJgw=", - "dev": true, - "requires": { - "colors": ">=1.0" - } - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - }, - "lcid": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", - "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", - "dev": true, - "requires": { - "invert-kv": "^2.0.0" - } - }, - "levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "dev": true, - "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - } - }, - "load-json-file": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", - "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "strip-bom": "^3.0.0" - }, - "dependencies": { - "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "dev": true, - "requires": { - "error-ex": "^1.2.0" + "error-ex": "^1.2.0" } } } }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, "lodash": { "version": "4.17.11", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", @@ -5501,10 +5143,10 @@ "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", "dev": true }, - "lodash.debounce": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", + "lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", "dev": true }, "lodash.isplainobject": { @@ -5513,6 +5155,12 @@ "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=", "dev": true }, + "lodash.memoize": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", + "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", + "dev": true + }, "lodash.mergewith": { "version": "4.6.1", "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz", @@ -5531,6 +5179,30 @@ "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=", "dev": true }, + "log4js": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.0.2.tgz", + "integrity": "sha512-KE7HjiieVDPPdveA3bJZSuu0n8chMkFl8mIoisBFxwEJ9FmXe4YzNuiqSwYUiR1K8q8/5/8Yd6AClENY1RA9ww==", + "dev": true, + "requires": { + "date-format": "^2.0.0", + "debug": "^3.1.0", + "flatted": "^2.0.0", + "rfdc": "^1.1.2", + "streamroller": "^1.0.1" + }, + "dependencies": { + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + } + } + }, "loose-envify": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", @@ -5559,15 +5231,6 @@ "yallist": "^2.1.2" } }, - "map-age-cleaner": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", - "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", - "dev": true, - "requires": { - "p-defer": "^1.0.0" - } - }, "map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", @@ -5597,7 +5260,7 @@ }, "media-typer": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", "dev": true }, @@ -5609,20 +5272,9 @@ "global": "^4.3.1" } }, - "mem": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-4.1.0.tgz", - "integrity": "sha512-I5u6Q1x7wxO0kdOpYBB28xueHADYps5uty/zg936CiG8NTe5sJL8EjrCuLneuDW3PlMdZBGDIn8BirEVdovZvg==", - "dev": true, - "requires": { - "map-age-cleaner": "^0.1.1", - "mimic-fn": "^1.0.0", - "p-is-promise": "^2.0.0" - } - }, "meow": { "version": "3.7.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz", "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { @@ -5650,7 +5302,7 @@ }, "load-json-file": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { @@ -5733,6 +5385,99 @@ "resolved": "https://registry.npmjs.org/metismenujs/-/metismenujs-1.0.3.tgz", "integrity": "sha512-sAW2c6zu3AqOX3VDT0vhXw4lyJ2s84NfwlOAc7/xFj7N3ARgA3z6WuG8K+X58oNzrtq0iQwv//PhXI5l8vLZbQ==" }, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, + "requires": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" + }, + "dependencies": { + "define-property": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", + "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", + "dev": true, + "requires": { + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" + } + }, + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, + "requires": { + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } + }, + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "^2.0.4" + } + }, + "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 + } + } + }, + "mime": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz", + "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==", + "dev": true + }, "mime-db": { "version": "1.37.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz", @@ -5805,7 +5550,7 @@ }, "mkdirp": { "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, "requires": { @@ -5856,17 +5601,63 @@ "to-regex": "^3.0.1" }, "dependencies": { - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", - "dev": true + "define-property": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", + "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", + "dev": true, + "requires": { + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" + } }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, + "requires": { + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } + }, + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "^2.0.4" + } }, "kind-of": { "version": "6.0.2", @@ -5923,9 +5714,9 @@ } }, "node-releases": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.6.tgz", - "integrity": "sha512-lODUVHEIZutZx+TDdOk47qLik8FJMXzJ+WnyUGci1MTvTOyzZrz5eVPIIpc5Hb3NfHZGeGHeuwrRYVI1PEITWg==", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.11.tgz", + "integrity": "sha512-8v1j5KfP+s5WOTa1spNUAOfreajQPN12JXbRR0oDE+YrJBQCXBnNqUDj27EKpPLOoSiU3tKi3xGPB+JaOdUEQQ==", "dev": true, "requires": { "semver": "^5.3.0" @@ -6032,13 +5823,10 @@ } }, "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "requires": { - "remove-trailing-separator": "^1.0.1" - } + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true }, "normalize-range": { "version": "0.1.2", @@ -6052,15 +5840,6 @@ "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==", "dev": true }, - "npm-run-path": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", - "dev": true, - "requires": { - "path-key": "^2.0.0" - } - }, "npmlog": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", @@ -6116,22 +5895,11 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", - "dev": true, - "requires": { - "copy-descriptor": "^0.1.0", - "define-property": "^0.2.5", - "kind-of": "^3.0.3" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - } + "dev": true, + "requires": { + "copy-descriptor": "^0.1.0", + "define-property": "^0.2.5", + "kind-of": "^3.0.3" } }, "object-keys": { @@ -6147,14 +5915,6 @@ "dev": true, "requires": { "isobject": "^3.0.0" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - } } }, "object.assign": { @@ -6198,14 +5958,6 @@ "dev": true, "requires": { "isobject": "^3.0.1" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - } } }, "object.values": { @@ -6295,24 +6047,13 @@ }, "os-homedir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true }, - "os-locale": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", - "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", - "dev": true, - "requires": { - "execa": "^1.0.0", - "lcid": "^2.0.0", - "mem": "^4.0.0" - } - }, "os-tmpdir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true }, @@ -6326,48 +6067,6 @@ "os-tmpdir": "^1.0.0" } }, - "p-defer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", - "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=", - "dev": true - }, - "p-finally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", - "dev": true - }, - "p-is-promise": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz", - "integrity": "sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==", - "dev": true - }, - "p-limit": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz", - "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "requires": { - "p-limit": "^2.0.0" - } - }, - "p-try": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz", - "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==", - "dev": true - }, "parent-module": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.0.tgz", @@ -6466,7 +6165,7 @@ }, "path-is-absolute": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true }, @@ -6504,7 +6203,7 @@ }, "pify": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true }, @@ -6577,12 +6276,6 @@ } } }, - "pluralize": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", - "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==", - "dev": true - }, "popper.js": { "version": "1.14.7", "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.7.tgz", @@ -6635,9 +6328,9 @@ } }, "postcss-colormin": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.2.tgz", - "integrity": "sha512-1QJc2coIehnVFsz0otges8kQLsryi4lo19WD+U5xCWvXd0uw/Z+KKYnbiNDCnO9GP+PvErPHCG0jNvWTngk9Rw==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz", + "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==", "dev": true, "requires": { "browserslist": "^4.0.0", @@ -6658,9 +6351,9 @@ } }, "postcss-discard-comments": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.1.tgz", - "integrity": "sha512-Ay+rZu1Sz6g8IdzRjUgG2NafSNpp2MSMOQUb+9kkzzzP+kh07fP0yNbhtFejURnyVXSX3FYy2nVNW1QTnNjgBQ==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz", + "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==", "dev": true, "requires": { "postcss": "^7.0.0" @@ -6694,9 +6387,9 @@ } }, "postcss-merge-longhand": { - "version": "4.0.10", - "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.10.tgz", - "integrity": "sha512-hME10s6CSjm9nlVIcO1ukR7Jr5RisTaaC1y83jWCivpuBtPohA3pZE7cGTIVSYjXvLnXozHTiVOkG4dnnl756g==", + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz", + "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==", "dev": true, "requires": { "css-color-names": "0.0.4", @@ -6706,9 +6399,9 @@ } }, "postcss-merge-rules": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.2.tgz", - "integrity": "sha512-UiuXwCCJtQy9tAIxsnurfF0mrNHKc4NnNx6NxqmzNNjXpQwLSukUxELHTRF0Rg1pAmcoKLih8PwvZbiordchag==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz", + "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==", "dev": true, "requires": { "browserslist": "^4.0.0", @@ -6743,9 +6436,9 @@ } }, "postcss-minify-gradients": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.1.tgz", - "integrity": "sha512-pySEW3E6Ly5mHm18rekbWiAjVi/Wj8KKt2vwSfVFAWdW6wOIekgqxKxLU7vJfb107o3FDNPkaYFCxGAJBFyogA==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz", + "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==", "dev": true, "requires": { "cssnano-util-get-arguments": "^4.0.0", @@ -6755,9 +6448,9 @@ } }, "postcss-minify-params": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.1.tgz", - "integrity": "sha512-h4W0FEMEzBLxpxIVelRtMheskOKKp52ND6rJv+nBS33G1twu2tCyurYj/YtgU76+UDCvWeNs0hs8HFAWE2OUFg==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz", + "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==", "dev": true, "requires": { "alphanum-sort": "^1.0.0", @@ -6769,9 +6462,9 @@ } }, "postcss-minify-selectors": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.1.tgz", - "integrity": "sha512-8+plQkomve3G+CodLCgbhAKrb5lekAnLYuL1d7Nz+/7RANpBEVdgBkPNwljfSKvZ9xkkZTZITd04KP+zeJTJqg==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz", + "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==", "dev": true, "requires": { "alphanum-sort": "^1.0.0", @@ -6803,9 +6496,9 @@ } }, "postcss-normalize-display-values": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.1.tgz", - "integrity": "sha512-R5mC4vaDdvsrku96yXP7zak+O3Mm9Y8IslUobk7IMP+u/g+lXvcN4jngmHY5zeJnrQvE13dfAg5ViU05ZFDwdg==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz", + "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==", "dev": true, "requires": { "cssnano-util-get-match": "^4.0.0", @@ -6814,9 +6507,9 @@ } }, "postcss-normalize-positions": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.1.tgz", - "integrity": "sha512-GNoOaLRBM0gvH+ZRb2vKCIujzz4aclli64MBwDuYGU2EY53LwiP7MxOZGE46UGtotrSnmarPPZ69l2S/uxdaWA==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz", + "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==", "dev": true, "requires": { "cssnano-util-get-arguments": "^4.0.0", @@ -6826,9 +6519,9 @@ } }, "postcss-normalize-repeat-style": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.1.tgz", - "integrity": "sha512-fFHPGIjBUyUiswY2rd9rsFcC0t3oRta4wxE1h3lpwfQZwFeFjXFSiDtdJ7APCmHQOnUZnqYBADNRPKPwFAONgA==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz", + "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==", "dev": true, "requires": { "cssnano-util-get-arguments": "^4.0.0", @@ -6838,9 +6531,9 @@ } }, "postcss-normalize-string": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.1.tgz", - "integrity": "sha512-IJoexFTkAvAq5UZVxWXAGE0yLoNN/012v7TQh5nDo6imZJl2Fwgbhy3J2qnIoaDBrtUP0H7JrXlX1jjn2YcvCQ==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz", + "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==", "dev": true, "requires": { "has": "^1.0.0", @@ -6849,9 +6542,9 @@ } }, "postcss-normalize-timing-functions": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.1.tgz", - "integrity": "sha512-1nOtk7ze36+63ONWD8RCaRDYsnzorrj+Q6fxkQV+mlY5+471Qx9kspqv0O/qQNMeApg8KNrRf496zHwJ3tBZ7w==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz", + "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==", "dev": true, "requires": { "cssnano-util-get-match": "^4.0.0", @@ -6883,9 +6576,9 @@ } }, "postcss-normalize-whitespace": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.1.tgz", - "integrity": "sha512-U8MBODMB2L+nStzOk6VvWWjZgi5kQNShCyjRhMT3s+W9Jw93yIjOnrEkKYD3Ul7ChWbEcjDWmXq0qOL9MIAnAw==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz", + "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==", "dev": true, "requires": { "postcss": "^7.0.0", @@ -6893,9 +6586,9 @@ } }, "postcss-ordered-values": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.1.tgz", - "integrity": "sha512-PeJiLgJWPzkVF8JuKSBcylaU+hDJ/TX3zqAMIjlghgn1JBi6QwQaDZoDIlqWRcCAI8SxKrt3FCPSRmOgKRB97Q==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz", + "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==", "dev": true, "requires": { "cssnano-util-get-arguments": "^4.0.0", @@ -6904,9 +6597,9 @@ } }, "postcss-reduce-initial": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.2.tgz", - "integrity": "sha512-epUiC39NonKUKG+P3eAOKKZtm5OtAtQJL7Ye0CBN1f+UQTHzqotudp+hki7zxXm7tT0ZAKDMBj1uihpPjP25ug==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz", + "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==", "dev": true, "requires": { "browserslist": "^4.0.0", @@ -6916,9 +6609,9 @@ } }, "postcss-reduce-transforms": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.1.tgz", - "integrity": "sha512-sZVr3QlGs0pjh6JAIe6DzWvBaqYw05V1t3d9Tp+VnFRT5j+rsqoWsysh/iSD7YNsULjq9IAylCznIwVd5oU/zA==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz", + "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==", "dev": true, "requires": { "cssnano-util-get-match": "^4.0.0", @@ -6939,9 +6632,9 @@ } }, "postcss-svgo": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.1.tgz", - "integrity": "sha512-YD5uIk5NDRySy0hcI+ZJHwqemv2WiqqzDgtvgMzO8EGSkK5aONyX8HMVFRFJSdO8wUWTuisUFn/d7yRRbBr5Qw==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz", + "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==", "dev": true, "requires": { "is-svg": "^3.0.0", @@ -7008,16 +6701,6 @@ "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==", "dev": true }, - "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, "punycode": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", @@ -7138,7 +6821,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { @@ -7171,297 +6854,6 @@ "graceful-fs": "^4.1.11", "micromatch": "^3.1.10", "readable-stream": "^2.0.2" - }, - "dependencies": { - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", - "dev": true - }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true - }, - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, - "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "dev": true, - "requires": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "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=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" - } - }, - "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 - } - } - }, - "extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "dev": true, - "requires": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - }, - "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 - }, - "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "dev": true, - "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } } }, "recursive-readdir": { @@ -7501,18 +6893,18 @@ "dev": true }, "regenerate-unicode-properties": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz", - "integrity": "sha512-s5NGghCE4itSlUS+0WUj88G6cfMVMmH8boTPNvABf8od+2dhT9WDlWu8n01raQAJZMOK8Ch6jSexaRO7swd6aw==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.0.2.tgz", + "integrity": "sha512-SbA/iNrBUf6Pv2zU8Ekv1Qbhv92yxL4hiDa2siuxs4KKn4oOoMDHXjAf7+Nz9qinUQ46B1LcWEi/PhJfPWpZWQ==", "dev": true, "requires": { "regenerate": "^1.4.0" } }, "regenerator-transform": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.3.tgz", - "integrity": "sha512-5ipTrZFSq5vU2YoGoww4uaRVAK4wyYC4TSICibbfEPOruUu8FFP7ErV0BjmbIOEpn3O/k9na9UEdYR/3m7N6uA==", + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.4.tgz", + "integrity": "sha512-T0QMBjK3J0MtxjPmdIMXm72Wvj2Abb0Bd4HADdfijwMdoIsyQZ6fWC7kDFhk2YinBBEMZDL7Y7wh0J1sGx3S4A==", "dev": true, "requires": { "private": "^0.1.6" @@ -7526,18 +6918,34 @@ "requires": { "extend-shallow": "^3.0.2", "safe-regex": "^1.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, + "requires": { + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" + } + }, + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "^2.0.4" + } + } } }, "regexp-tree": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.1.tgz", - "integrity": "sha512-HwRjOquc9QOwKTgbxvZTcddS5mlNlwePMQ3NFL8broajMLD5CXDAqas8Y5yxJH5QtZp5iRor3YCILd5pz71Cgw==", - "dev": true, - "requires": { - "cli-table3": "^0.5.0", - "colors": "^1.1.2", - "yargs": "^12.0.5" - } + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.5.tgz", + "integrity": "sha512-nUmxvfJyAODw+0B13hj8CFVAxhe7fDEAgJgaotBu3nnR+IgGgZq59YedJP5VYTlkEfqjuK6TuRpnymKdatLZfQ==", + "dev": true }, "regexpp": { "version": "2.0.1", @@ -7546,17 +6954,17 @@ "dev": true }, "regexpu-core": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.4.0.tgz", - "integrity": "sha512-eDDWElbwwI3K0Lo6CqbQbA6FwgtCz4kYTarrri1okfkRLZAqstU+B3voZBCjg8Fl6iq0gXrJG6MvRgLthfvgOA==", + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz", + "integrity": "sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==", "dev": true, "requires": { "regenerate": "^1.4.0", - "regenerate-unicode-properties": "^7.0.0", + "regenerate-unicode-properties": "^8.0.2", "regjsgen": "^0.5.0", "regjsparser": "^0.6.0", "unicode-match-property-ecmascript": "^1.0.4", - "unicode-match-property-value-ecmascript": "^1.0.2" + "unicode-match-property-value-ecmascript": "^1.1.0" } }, "regjsgen": { @@ -7743,7 +7151,7 @@ }, "safe-regex": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "dev": true, "requires": { @@ -7988,7 +7396,7 @@ "dependencies": { "source-map": { "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { @@ -8015,20 +7423,9 @@ "dev": true, "requires": { "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.3", + "split-string": "^3.0.1" } }, "setprototypeof": { @@ -8111,24 +7508,6 @@ "ms": "2.0.0" } }, - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -8186,12 +7565,6 @@ "kind-of": "^6.0.2" } }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - }, "kind-of": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", @@ -8209,6 +7582,116 @@ "kind-of": "^3.2.0" } }, + "socket.io": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz", + "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==", + "dev": true, + "requires": { + "debug": "~3.1.0", + "engine.io": "~3.2.0", + "has-binary2": "~1.0.2", + "socket.io-adapter": "~1.1.0", + "socket.io-client": "2.1.1", + "socket.io-parser": "~3.2.0" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "socket.io-adapter": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz", + "integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=", + "dev": true + }, + "socket.io-client": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz", + "integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==", + "dev": true, + "requires": { + "backo2": "1.0.2", + "base64-arraybuffer": "0.1.5", + "component-bind": "1.0.0", + "component-emitter": "1.2.1", + "debug": "~3.1.0", + "engine.io-client": "~3.2.0", + "has-binary2": "~1.0.2", + "has-cors": "1.1.0", + "indexof": "0.0.1", + "object-component": "0.0.3", + "parseqs": "0.0.5", + "parseuri": "0.0.5", + "socket.io-parser": "~3.2.0", + "to-array": "0.1.4" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "socket.io-parser": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz", + "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==", + "dev": true, + "requires": { + "component-emitter": "1.2.1", + "debug": "~3.1.0", + "isarray": "2.0.1" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "isarray": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz", + "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=", + "dev": true + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", @@ -8272,6 +7755,27 @@ "dev": true, "requires": { "extend-shallow": "^3.0.0" + }, + "dependencies": { + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, + "requires": { + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" + } + }, + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "^2.0.4" + } + } } }, "sprintf-js": { @@ -8311,17 +7815,6 @@ "requires": { "define-property": "^0.2.5", "object-copy": "^0.1.0" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - } } }, "statuses": { @@ -8340,17 +7833,27 @@ } }, "streamroller": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz", - "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.3.tgz", + "integrity": "sha512-P7z9NwP51EltdZ81otaGAN3ob+/F88USJE546joNq7bqRNTe6jc74fTBDyynxP4qpIfKlt/CesEYicuMzI0yJg==", "dev": true, "requires": { - "date-format": "^1.2.0", + "async": "^2.6.1", + "date-format": "^2.0.0", "debug": "^3.1.0", - "mkdirp": "^0.5.1", - "readable-stream": "^2.3.0" + "fs-extra": "^7.0.0", + "lodash": "^4.17.10" }, "dependencies": { + "async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz", + "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==", + "dev": true, + "requires": { + "lodash": "^4.17.11" + } + }, "debug": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", @@ -8387,12 +7890,6 @@ "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", "dev": true }, - "strip-eof": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", - "dev": true - }, "strip-indent": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", @@ -8409,9 +7906,9 @@ "dev": true }, "stylehacks": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.1.tgz", - "integrity": "sha512-TK5zEPeD9NyC1uPIdjikzsgWxdQQN/ry1X3d1iOz1UkYDCmcr928gWD1KHgyC27F50UnE0xCTrBOO1l6KR8M4w==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz", + "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==", "dev": true, "requires": { "browserslist": "^4.0.0", @@ -8441,33 +7938,25 @@ } }, "svgo": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.1.1.tgz", - "integrity": "sha512-GBkJbnTuFpM4jFbiERHDWhZc/S/kpHToqmZag3aEBjPYK44JAN2QBjvrGIxLOoCyMZjuFQIfTO2eJd8uwLY/9g==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.2.0.tgz", + "integrity": "sha512-xBfxJxfk4UeVN8asec9jNxHiv3UAMv/ujwBWGYvQhhMb2u3YTGKkiybPcLFDLq7GLLWE9wa73e0/m8L5nTzQbw==", "dev": true, "requires": { - "coa": "~2.0.1", - "colors": "~1.1.2", + "chalk": "^2.4.1", + "coa": "^2.0.2", "css-select": "^2.0.0", - "css-select-base-adapter": "~0.1.0", + "css-select-base-adapter": "^0.1.1", "css-tree": "1.0.0-alpha.28", "css-url-regex": "^1.1.0", - "csso": "^3.5.0", + "csso": "^3.5.1", "js-yaml": "^3.12.0", "mkdirp": "~0.5.1", - "object.values": "^1.0.4", + "object.values": "^1.1.0", "sax": "~1.2.4", - "stable": "~0.1.6", + "stable": "^0.1.8", "unquote": "~1.1.1", "util.promisify": "~1.0.0" - }, - "dependencies": { - "colors": { - "version": "1.1.2", - "resolved": "http://registry.npmjs.org/colors/-/colors-1.1.2.tgz", - "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", - "dev": true - } } }, "symbol-observable": { @@ -8476,20 +7965,60 @@ "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==" }, "table": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/table/-/table-5.2.2.tgz", - "integrity": "sha512-f8mJmuu9beQEDkKHLzOv4VxVYlU68NpdzjbGPl69i4Hx0sTopJuNxuzJd17iV2h24dAfa93u794OnDA5jqXvfQ==", + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/table/-/table-5.2.3.tgz", + "integrity": "sha512-N2RsDAMvDLvYwFcwbPyF3VmVSSkuF+G1e+8inhBLtHpvwXGw4QRPEZhihQNeEN0i1up6/f6ObCJXNdlRG3YVyQ==", "dev": true, "requires": { - "ajv": "^6.6.1", + "ajv": "^6.9.1", "lodash": "^4.17.11", - "slice-ansi": "^2.0.0", - "string-width": "^2.1.1" + "slice-ansi": "^2.1.0", + "string-width": "^3.0.0" + }, + "dependencies": { + "ajv": { + "version": "6.10.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz", + "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==", + "dev": true, + "requires": { + "fast-deep-equal": "^2.0.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "string-width": { + "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": "^5.1.0" + } + }, + "strip-ansi": { + "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": "^4.1.0" + } + } } }, "tar": { "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", + "resolved": "http://registry.npmjs.org/tar/-/tar-2.2.1.tgz", "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", "dev": true, "requires": { @@ -8506,7 +8035,7 @@ }, "through": { "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", "dev": true }, @@ -8565,6 +8094,72 @@ "extend-shallow": "^3.0.2", "regex-not": "^1.0.2", "safe-regex": "^1.1.0" + }, + "dependencies": { + "define-property": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", + "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", + "dev": true, + "requires": { + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" + } + }, + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, + "requires": { + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } + }, + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "^2.0.4" + } + }, + "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 + } } }, "to-regex-range": { @@ -8575,17 +8170,6 @@ "requires": { "is-number": "^3.0.0", "repeat-string": "^1.6.1" - }, - "dependencies": { - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } - } } }, "tough-cookie": { @@ -8688,6 +8272,12 @@ "integrity": "sha512-J2SQ2QLjiknNGbNdScaNZsXgmMGI0kYNrXaDlr4obnPW9ni1jljb1NeEVWAiTgZ8z+EBWP2ozfT9vpy03rjlMQ==", "dev": true }, + "ultron": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", + "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==", + "dev": true + }, "unicode-canonical-property-names-ecmascript": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz", @@ -8705,15 +8295,15 @@ } }, "unicode-match-property-value-ecmascript": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz", - "integrity": "sha512-Rx7yODZC1L/T8XKo/2kNzVAQaRE88AaMvI1EF/Xnj3GW2wzN6fop9DDWuFAKUVFH7vozkz26DzP0qyWLKLIVPQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz", + "integrity": "sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==", "dev": true }, "unicode-property-aliases-ecmascript": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz", - "integrity": "sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz", + "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==", "dev": true }, "union-value": { @@ -8728,15 +8318,6 @@ "set-value": "^0.4.3" }, "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, "set-value": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", @@ -8818,19 +8399,13 @@ "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", "dev": true - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true } } }, "upath": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz", - "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz", + "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==", "dev": true }, "uri-js": { @@ -8952,12 +8527,6 @@ "isexe": "^2.0.0" } }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, "wide-align": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", @@ -9027,18 +8596,29 @@ "dev": true }, "write": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz", - "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz", + "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==", "dev": true, "requires": { "mkdirp": "^0.5.1" } }, - "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==", + "ws": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", + "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", + "dev": true, + "requires": { + "async-limiter": "~1.0.0", + "safe-buffer": "~5.1.0", + "ultron": "~1.1.0" + } + }, + "xmlhttprequest-ssl": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz", + "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=", "dev": true }, "yallist": { @@ -9047,36 +8627,6 @@ "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", "dev": true }, - "yargs": { - "version": "12.0.5", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", - "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", - "dev": true, - "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.2.0", - "find-up": "^3.0.0", - "get-caller-file": "^1.0.1", - "os-locale": "^3.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1 || ^4.0.0", - "yargs-parser": "^11.1.1" - } - }, - "yargs-parser": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", - "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - }, "yeast": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz", diff --git a/package.json b/package.json index b50cddbbc8eee..152911d1a812d 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "chosen-js": "1.6.2", "codemirror": "5.38.0", "cropperjs": "1.2.2", - "css-vars-ponyfill": "^1.9.0", + "css-vars-ponyfill": "^1.17.2", "diff": "3.4.0", "dragula": "3.7.2", "focus-visible": "^4.1.4", @@ -46,25 +46,25 @@ "tinymce": "4.8.3" }, "devDependencies": { - "@babel/core": "^7.2.2", - "@babel/plugin-transform-classes": "^7.2.2", - "@babel/preset-env": "^7.3.1", + "@babel/core": "^7.4.0", + "@babel/plugin-transform-classes": "^7.4.0", + "@babel/preset-env": "^7.4.2", "@gfx/zopfli": "^1.0.11", - "autoprefixer": "^9.4.7", + "autoprefixer": "^9.5.0", "babel-plugin-add-header-comment": "^1.0.3", "babel-preset-minify": "^0.4.3", "babelify": "^10.0.0", "commander": "^2.19.0", "copy-dir": "^0.4.0", - "cssnano": "^4.1.8", - "eslint": "^5.12.1", + "cssnano": "^4.1.10", + "eslint": "^5.15.3", "eslint-config-airbnb-base": "^13.1.0", "eslint-plugin-import": "^2.16.0", "fs": "0.0.1-security", "fs-extra": "^7.0.1", "ini": "^1.3.5", "jasmine-core": "^3.3.0", - "karma": "^4.0.0", + "karma": "^4.0.1", "karma-coverage": "^1.1.2", "karma-firefox-launcher": "^1.1.0", "karma-fixture": "^0.2.6", diff --git a/plugins/system/stats/stats.php b/plugins/system/stats/stats.php index 6deba1f9f8037..16b8e2aad7c3f 100644 --- a/plugins/system/stats/stats.php +++ b/plugins/system/stats/stats.php @@ -106,6 +106,36 @@ public function onAfterInitialise() // Load plugin language files only when needed (ex: they are not needed in site client). $this->loadLanguage(); + } + + /** + * Listener for the `onAfterDispatch` event + * + * @return void + * + * @since __DEPLOY_VERSION__ + */ + public function onAfterDispatch() + { + if (!$this->app->isClient('administrator') || !$this->isAllowedUser()) + { + return; + } + + if (!$this->isDebugEnabled() && !$this->isUpdateRequired()) + { + return; + } + + if (Uri::getInstance()->getVar('tmpl') === 'component') + { + return; + } + + if ($this->app->getDocument()->getType() !== 'html') + { + return; + } HTMLHelper::_('script', 'plg_system_stats/stats-message.js', array('version' => 'auto', 'relative' => true)); } @@ -450,11 +480,11 @@ private function saveParams() $this->params->set('interval', $interval ?: 12); $query = $this->db->getQuery(true) - ->update($this->db->quoteName('#__extensions')) - ->set($this->db->quoteName('params') . ' = ' . $this->db->quote($this->params->toString('JSON'))) - ->where($this->db->quoteName('type') . ' = ' . $this->db->quote('plugin')) - ->where($this->db->quoteName('folder') . ' = ' . $this->db->quote('system')) - ->where($this->db->quoteName('element') . ' = ' . $this->db->quote('stats')); + ->update($this->db->quoteName('#__extensions')) + ->set($this->db->quoteName('params') . ' = ' . $this->db->quote($this->params->toString('JSON'))) + ->where($this->db->quoteName('type') . ' = ' . $this->db->quote('plugin')) + ->where($this->db->quoteName('folder') . ' = ' . $this->db->quote('system')) + ->where($this->db->quoteName('element') . ' = ' . $this->db->quote('stats')); try { From 9f934a366e8311296fbf04fb6840a0e7cb2dcf61 Mon Sep 17 00:00:00 2001 From: SharkyKZ Date: Fri, 22 Mar 2019 12:17:13 +0200 Subject: [PATCH 44/48] [4.0] Webcomponents not loading without media version (#24301) --- build/media_source/system/js/core.es6.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/media_source/system/js/core.es6.js b/build/media_source/system/js/core.es6.js index f8c6a06c2bdca..d9c41c72d0093 100644 --- a/build/media_source/system/js/core.es6.js +++ b/build/media_source/system/js/core.es6.js @@ -1091,14 +1091,14 @@ window.Joomla.Modal = window.Joomla.Modal || { // Load it from the right place. const replacement = `media/vendor/webcomponentsjs/js/webcomponents-${polyfills.join('-')}.min.js`; - const mediaVersion = script.src.match(/\?.*/)[0]; + const mediaVersion = script.src.match(/\?.*/); const base = Joomla.getOptions('system.paths'); if (!base) { throw new Error('core(.min).js is not registered correctly!'); } - newScript.src = base.rootFull + replacement + (mediaVersion || ''); + newScript.src = base.rootFull + replacement + (mediaVersion ? mediaVersion[0] : ''); // if readyState is 'loading', this script is synchronous if (document.readyState === 'loading') { From c6d5af65b3b7ba9c83eb1303386d8d0d57a6f084 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Fri, 22 Mar 2019 11:40:13 +0000 Subject: [PATCH 45/48] [4.0] Date in example string (#24310) * [4.0] Date in example string The current string is > The date of birth entered should use the format Year-Month-Day, ie 0000-00-00 this PR uses a better example date to further clarify that it is YMD * eg --- administrator/language/en-GB/en-GB.plg_user_profile.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/language/en-GB/en-GB.plg_user_profile.ini b/administrator/language/en-GB/en-GB.plg_user_profile.ini index aede58783926c..9fd6f73d91a02 100644 --- a/administrator/language/en-GB/en-GB.plg_user_profile.ini +++ b/administrator/language/en-GB/en-GB.plg_user_profile.ini @@ -29,5 +29,5 @@ PLG_USER_PROFILE_FILL_FIELD_DESC_SITE="If required, please fill this field." PLG_USER_PROFILE_OPTION_AGREE="Agree" PLG_USER_PROFILE_SLIDER_LABEL="User Profile" ; Adapt the following string to the format you entered in the 'DATE_FORMAT_CALENDAR_DATE' -PLG_USER_PROFILE_SPACER_DOB="The date of birth entered should use the format Year-Month-Day, ie 0000-00-00" +PLG_USER_PROFILE_SPACER_DOB="The date of birth entered should use the format Year-Month-Day, eg 2019-01-27." PLG_USER_PROFILE_XML_DESCRIPTION="User Profile Plugin" From 5a3bfc6c1526dd11b60f8d740f68427085b09de9 Mon Sep 17 00:00:00 2001 From: Quy Date: Fri, 22 Mar 2019 08:16:26 -0700 Subject: [PATCH 46/48] Move defined statement (#24313) --- .../com_config/tmpl/application/default_ftplogin.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/administrator/components/com_config/tmpl/application/default_ftplogin.php b/administrator/components/com_config/tmpl/application/default_ftplogin.php index 8321c4fa0da25..d5c610f45268a 100644 --- a/administrator/components/com_config/tmpl/application/default_ftplogin.php +++ b/administrator/components/com_config/tmpl/application/default_ftplogin.php @@ -7,9 +7,10 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +defined('_JEXEC') or die; + use Joomla\CMS\Language\Text; -defined('_JEXEC') or die; ?>
    From 0f07f580804b3a0ed6a24139190c8c81e54ea7f8 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Fri, 22 Mar 2019 15:37:36 +0000 Subject: [PATCH 47/48] [4.0] com_admin.ini review (#24296) Remove some more unused strings from this language file --- administrator/language/en-GB/en-GB.com_admin.ini | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/administrator/language/en-GB/en-GB.com_admin.ini b/administrator/language/en-GB/en-GB.com_admin.ini index d3eae9c254bec..15c389bbc5af3 100644 --- a/administrator/language/en-GB/en-GB.com_admin.ini +++ b/administrator/language/en-GB/en-GB.com_admin.ini @@ -6,7 +6,6 @@ COM_ADMIN="System Information" COM_ADMIN_ALPHABETICAL_INDEX="Alphabetical Index" COM_ADMIN_CACHE_DIRECTORY="(Cache Folder)" -COM_ADMIN_CLEAR_RESULTS="Clear results" COM_ADMIN_CONFIGURATION_FILE="Configuration File" COM_ADMIN_DATABASE_COLLATION="Database Collation" COM_ADMIN_DATABASE_CONNECTION_COLLATION="Database Connection Collation" @@ -21,7 +20,6 @@ COM_ADMIN_DOWNLOAD_SYSTEM_INFORMATION_JSON="Download as JSON" COM_ADMIN_EXTENSIONS="Extensions" COM_ADMIN_FILE_UPLOADS="File Uploads" COM_ADMIN_GLOSSARY="Glossary" -COM_ADMIN_GO="Go" COM_ADMIN_HELP="Joomla! Help" COM_ADMIN_HELP_COMPONENTS_ASSOCIATIONS="Multilingual Associations" COM_ADMIN_HELP_COMPONENTS_ASSOCIATIONS_EDIT="Multilingual Associations: Select" @@ -107,15 +105,12 @@ COM_ADMIN_HELP_USERS_USER_NOTES_EDIT="Users: User Notes - New/Edit" COM_ADMIN_HELP_USERS_USER_MANAGER="Users" COM_ADMIN_HELP_USERS_USER_MANAGER_EDIT="Users: New/Edit" COM_ADMIN_ICONV_AVAILABLE="Iconv Available" -COM_ADMIN_INFORMATION="System Information" COM_ADMIN_JOOMLA_VERSION="Joomla! Version" COM_ADMIN_LATEST_VERSION_CHECK="Latest Version Check" COM_ADMIN_LICENSE="License" COM_ADMIN_LOG_DIRECTORY="(Log folder)" -COM_ADMIN_MAGIC_QUOTES="Magic Quotes" COM_ADMIN_MAX_INPUT_VARS="Maximum Input Variables" COM_ADMIN_MBSTRING_ENABLED="Multibyte String (mbstring) Enabled" -COM_ADMIN_MCRYPT_ENABLED="Mcrypt Enabled" COM_ADMIN_MEDIA_CACHE_DIRECTORY="Cached Media Directory" COM_ADMIN_NA="n/a" COM_ADMIN_OPEN_BASEDIR="Open basedir" @@ -125,16 +120,12 @@ COM_ADMIN_PHP_INFORMATION="PHP Information" COM_ADMIN_PHP_SETTINGS="PHP Settings" COM_ADMIN_PHP_VERSION="PHP Version" COM_ADMIN_PHPINFO_DISABLED="The built in phpinfo() function has been disabled by your host." -COM_ADMIN_PLATFORM_VERSION="Joomla! Platform Version" -COM_ADMIN_RELEVANT_PHP_SETTINGS="Relevant PHP Settings" -COM_ADMIN_SEARCH="Search" COM_ADMIN_SESSION_AUTO_START="Session Auto Start" COM_ADMIN_SESSION_SAVE_PATH="Session Save Path" COM_ADMIN_SETTING="Setting" COM_ADMIN_SHORT_OPEN_TAGS="Short Open Tags" COM_ADMIN_START_HERE="Start here" COM_ADMIN_STATUS="Status" -COM_ADMIN_SYSTEM_INFO="System Info" COM_ADMIN_SYSTEM_INFORMATION="System Information" COM_ADMIN_TEMP_DIRECTORY="(Temp folder)" COM_ADMIN_UNWRITABLE="Unwritable" @@ -147,4 +138,3 @@ COM_ADMIN_XML_DESCRIPTION="Administration system information component." COM_ADMIN_XML_ENABLED="XML Enabled" COM_ADMIN_ZIP_ENABLED="Native ZIP Enabled" COM_ADMIN_ZLIB_ENABLED="Zlib Enabled" - From 8e3243b185af59164958eae7e5195f32d46fe870 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Sat, 23 Mar 2019 18:01:18 +0000 Subject: [PATCH 48/48] [4.0] Remove magic quotes (#24320) Final removal of remnants of magic quotes related code as magic quotes was completely removed in php 5.4 there can never be an instance when it will be triggered in j4 --- administrator/language/en-GB/en-GB.ini | 1 - tests/Unit/bootstrap.php | 3 --- 2 files changed, 4 deletions(-) diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini index aabe99e0334e3..27e82cc1e0a27 100644 --- a/administrator/language/en-GB/en-GB.ini +++ b/administrator/language/en-GB/en-GB.ini @@ -171,7 +171,6 @@ JERROR_LAYOUT_PREVIOUS_ERROR="Previous Error" JERROR_LOADFILE_FAILED="Error loading form file" JERROR_LOADING_MENUS="Error loading Menus: %s" JERROR_LOGIN_DENIED="You do not have access to the Administrator section of this site." -JERROR_MAGIC_QUOTES="Your host needs to disable magic_quotes_gpc to run this version of Joomla!" JERROR_NO_ITEMS_SELECTED="No item(s) selected." JERROR_NOLOGIN_BLOCKED="Login denied! Your account has either been blocked or you have not activated it yet." JERROR_SENDING_EMAIL="Email could not be sent." diff --git a/tests/Unit/bootstrap.php b/tests/Unit/bootstrap.php index 8831de0e61fea..450db1c7ac901 100644 --- a/tests/Unit/bootstrap.php +++ b/tests/Unit/bootstrap.php @@ -11,9 +11,6 @@ define('_JEXEC', 1); -// Fix magic quotes. -ini_set('magic_quotes_runtime', 0); - // Maximise error reporting. ini_set('zend.ze1_compatibility_mode', '0'); error_reporting(E_ALL);